Merge "Switch x86 syscall stubs over to the ENTER/END style of the ARM stubs."

libc/arch-x86/include/machine/asm.h

@@ -1,5 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.8 2004/06/13 21:49:16 niklas Exp $	*/
+/*	$NetBSD: asm.h,v 1.40 2011/06/16 13:16:20 joerg Exp $	*/
-/*	$NetBSD: asm.h,v 1.7 1994/10/27 04:15:56 cgd Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -38,24 +37,17 @@
 #ifndef _I386_ASM_H_
 #define _I386_ASM_H_
 
-/* This is borrowed from FreeBSD /src/sys/i386/include/asmacros.h v1.27 */
+#ifdef _KERNEL_OPT
-/*
+#include "opt_multiprocessor.h"
- * CNAME and HIDENAME manage the relationship between symbol names in C
+#endif
- * and the equivalent assembly language names.  CNAME is given a name as
- * it would be used in a C program.  It expands to the equivalent assembly
- * language name.  HIDENAME is given an assembly-language name, and expands
- * to a possibly-modified form that will be invisible to C programs.
- */
-#define CNAME(csym)             csym
-#define HIDENAME(asmsym)        .asmsym
 
 #ifdef PIC
 #define PIC_PROLOGUE	\
 	pushl	%ebx;	\
-	call	666f;	\
+	call	1f;	\
-666:			\
+1:			\
 	popl	%ebx;	\
-	addl	$_C_LABEL(_GLOBAL_OFFSET_TABLE_)+[.-666b], %ebx
+	addl	$_GLOBAL_OFFSET_TABLE_+[.-1b], %ebx
 #define PIC_EPILOGUE	\
 	popl	%ebx
 #define PIC_PLT(x)	x@PLT
@@ -69,10 +61,18 @@
 #define PIC_GOTOFF(x)	x
 #endif
 
-#define _C_LABEL(name)	name
+#ifdef __ELF__
+# define _C_LABEL(x)	x
+#else
+# ifdef __STDC__
+#  define _C_LABEL(x)	_ ## x
+# else
+#  define _C_LABEL(x)	_/**/x
+# endif
+#endif
 #define	_ASM_LABEL(x)	x
 
-#define CVAROFF(x, y)	_C_LABEL(x) + y
+#define CVAROFF(x, y)		_C_LABEL(x) + y
 
 #ifdef __STDC__
 # define __CONCAT(x,y)	x ## y
@@ -82,53 +82,137 @@
 # define __STRING(x)	"x"
 #endif
 
-/*
- * WEAK ALIAS: create a weak alias
- */
-#define WEAK_ALIAS(alias,sym) \
-	.weak alias; \
-	alias = sym
-
-/*
- * WARN_REFERENCES: create a warning if the specified symbol is referenced
- */
-#define WARN_REFERENCES(_sym,_msg)	\
-	.section .gnu.warning. ## _sym ; .ascii _msg ; .text
-
 /* let kernels and others override entrypoint alignment */
-#ifndef _ALIGN_TEXT
+#if !defined(_ALIGN_TEXT) && !defined(_KERNEL)
-# define _ALIGN_TEXT .align 2, 0x90
+# ifdef _STANDALONE
+#  define _ALIGN_TEXT .align 1
+# elif defined __ELF__
+#  define _ALIGN_TEXT .align 16
+# else
+#  define _ALIGN_TEXT .align 4
+# endif
 #endif
 
 #define _ENTRY(x) \
 	.text; _ALIGN_TEXT; .globl x; .type x,@function; x:
+#define _LABEL(x) \
+	.globl x; x:
 
-#define _ASM_SIZE(x)    .size x, .-x;
+#ifdef _KERNEL
 
-#define _END(x) \
+#define CPUVAR(off) %fs:__CONCAT(CPU_INFO_,off)
-	.fnend; \
+
-	_ASM_SIZE(x)
+/* XXX Can't use __CONCAT() here, as it would be evaluated incorrectly. */
+#ifdef __ELF__
+#ifdef __STDC__
+#define	IDTVEC(name) \
+	ALIGN_TEXT; .globl X ## name; .type X ## name,@function; X ## name:
+#define	IDTVEC_END(name) \
+	.size X ## name, . - X ## name
+#else 
+#define	IDTVEC(name) \
+	ALIGN_TEXT; .globl X/**/name; .type X/**/name,@function; X/**/name:
+#define	IDTVEC_END(name) \
+	.size X/**/name, . - X/**/name
+#endif /* __STDC__ */ 
+#else 
+#ifdef __STDC__
+#define	IDTVEC(name) \
+	ALIGN_TEXT; .globl _X ## name; .type _X ## name,@function; _X ## name: 
+#define	IDTVEC_END(name) \
+	.size _X ## name, . - _X ## name
+#else
+#define	IDTVEC(name) \
+	ALIGN_TEXT; .globl _X/**/name; .type _X/**/name,@function; _X/**/name:
+#define	IDTVEC_END(name) \
+	.size _X/**/name, . - _X/**/name
+#endif /* __STDC__ */
+#endif /* __ELF__ */
+
+#ifdef _STANDALONE
+#define ALIGN_DATA	.align	4
+#define ALIGN_TEXT	.align	4	/* 4-byte boundaries */
+#define SUPERALIGN_TEXT	.align	16	/* 15-byte boundaries */
+#elif defined __ELF__
+#define ALIGN_DATA	.align	4
+#define ALIGN_TEXT	.align	16	/* 16-byte boundaries */
+#define SUPERALIGN_TEXT	.align	16	/* 16-byte boundaries */
+#else
+#define ALIGN_DATA	.align	2
+#define ALIGN_TEXT	.align	4	/* 16-byte boundaries */
+#define SUPERALIGN_TEXT	.align	4	/* 16-byte boundaries */
+#endif /* __ELF__ */
+
+#define _ALIGN_TEXT ALIGN_TEXT
 
 #ifdef GPROF
-# define _PROF_PROLOGUE	\
+#ifdef __ELF__
+#define	MCOUNT_ASM	call	_C_LABEL(__mcount)
+#else /* __ELF__ */
+#define	MCOUNT_ASM	call	_C_LABEL(mcount)
+#endif /* __ELF__ */
+#else /* GPROF */
+#define	MCOUNT_ASM	/* nothing */
+#endif /* GPROF */
+
+#endif /* _KERNEL */
+
+
+
+#ifdef GPROF
+# ifdef __ELF__
+#  define _PROF_PROLOGUE	\
+	pushl %ebp; movl %esp,%ebp; call PIC_PLT(__mcount); popl %ebp
+# else 
+#  define _PROF_PROLOGUE	\
 	pushl %ebp; movl %esp,%ebp; call PIC_PLT(mcount); popl %ebp
+# endif
 #else
 # define _PROF_PROLOGUE
 #endif
 
 #define	ENTRY(y)	_ENTRY(_C_LABEL(y)); _PROF_PROLOGUE
 #define	NENTRY(y)	_ENTRY(_C_LABEL(y))
-#define	END(y)		_END(_C_LABEL(y))
 #define	ASENTRY(y)	_ENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE
-
+#define	LABEL(y)	_LABEL(_C_LABEL(y))
-#define ENTRY_PRIVATE(y)  ENTRY(y); .hidden _C_LABEL(y)
+#define	END(y)		.size y, . - y
-
-
-#define	ALTENTRY(name)	.globl _C_LABEL(name); _C_LABEL(name):
 
 #define	ASMSTR		.asciz
 
+#ifdef __ELF__
+#define RCSID(x)	.pushsection ".ident"; .asciz x; .popsection
+#else
 #define RCSID(x)	.text; .asciz x
-#define __FBSDID(x)     RCSID(x)
+#endif
+
+#ifdef NO_KERNEL_RCSIDS
+#define	__KERNEL_RCSID(_n, _s)	/* nothing */
+#else
+#define	__KERNEL_RCSID(_n, _s)	RCSID(_s)
+#endif
+
+#ifdef __ELF__
+#define	WEAK_ALIAS(alias,sym)						\
+	.weak alias;							\
+	alias = sym
+#endif
+/*
+ * STRONG_ALIAS: create a strong alias.
+ */
+#define STRONG_ALIAS(alias,sym)						\
+	.globl alias;							\
+	alias = sym
+
+#ifdef __STDC__
+#define	WARN_REFERENCES(sym,msg)					\
+	.pushsection .gnu.warning. ## sym;				\
+	.ascii msg;							\
+	.popsection
+#else
+#define	WARN_REFERENCES(sym,msg)					\
+	.pushsection .gnu.warning./**/sym;				\
+	.ascii msg;							\
+	.popsection
+#endif /* __STDC__ */
 
 #endif /* !_I386_ASM_H_ */

libc/arch-x86/syscalls/__brk.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__brk)
-    .type __brk, @function
-    .globl __brk
-    .align 4
-
-__brk:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_brk, %eax
@@ -21,3 +17,4 @@ __brk:
 1:
     popl    %ebx
     ret
+END(__brk)

libc/arch-x86/syscalls/__fcntl.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__fcntl)
-    .type __fcntl, @function
-    .globl __fcntl
-    .align 4
-
-__fcntl:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ __fcntl:
     popl    %ecx
     popl    %ebx
     ret
+END(__fcntl)

libc/arch-x86/syscalls/__fcntl64.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__fcntl64)
-    .type __fcntl64, @function
-    .globl __fcntl64
-    .align 4
-
-__fcntl64:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ __fcntl64:
     popl    %ecx
     popl    %ebx
     ret
+END(__fcntl64)

libc/arch-x86/syscalls/__fork.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__fork)
-    .type __fork, @function
-    .globl __fork
-    .align 4
-
-__fork:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_fork, %eax
@@ -21,3 +17,4 @@ __fork:
 1:
     popl    %ebx
     ret
+END(__fork)

libc/arch-x86/syscalls/__fstatfs64.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__fstatfs64)
-    .type __fstatfs64, @function
-    .globl __fstatfs64
-    .align 4
-
-__fstatfs64:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ __fstatfs64:
     popl    %ecx
     popl    %ebx
     ret
+END(__fstatfs64)

libc/arch-x86/syscalls/__getcpu.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__getcpu)
-    .type __getcpu, @function
-    .globl __getcpu
-    .align 4
-
-__getcpu:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ __getcpu:
     popl    %ecx
     popl    %ebx
     ret
+END(__getcpu)

libc/arch-x86/syscalls/__getcwd.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__getcwd)
-    .type __getcwd, @function
-    .globl __getcwd
-    .align 4
-
-__getcwd:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ __getcwd:
     popl    %ecx
     popl    %ebx
     ret
+END(__getcwd)

libc/arch-x86/syscalls/__getpriority.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__getpriority)
-    .type __getpriority, @function
-    .globl __getpriority
-    .align 4
-
-__getpriority:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ __getpriority:
     popl    %ecx
     popl    %ebx
     ret
+END(__getpriority)

libc/arch-x86/syscalls/__ioctl.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__ioctl)
-    .type __ioctl, @function
-    .globl __ioctl
-    .align 4
-
-__ioctl:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ __ioctl:
     popl    %ecx
     popl    %ebx
     ret
+END(__ioctl)

libc/arch-x86/syscalls/__llseek.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__llseek)
-    .type __llseek, @function
-    .globl __llseek
-    .align 4
-
-__llseek:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -33,3 +29,4 @@ __llseek:
     popl    %ecx
     popl    %ebx
     ret
+END(__llseek)

libc/arch-x86/syscalls/__mmap2.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__mmap2)
-    .type __mmap2, @function
-    .globl __mmap2
-    .align 4
-
-__mmap2:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -36,3 +32,4 @@ __mmap2:
     popl    %ecx
     popl    %ebx
     ret
+END(__mmap2)

libc/arch-x86/syscalls/__open.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__open)
-    .type __open, @function
-    .globl __open
-    .align 4
-
-__open:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ __open:
     popl    %ecx
     popl    %ebx
     ret
+END(__open)

libc/arch-x86/syscalls/__openat.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__openat)
-    .type __openat, @function
-    .globl __openat
-    .align 4
-
-__openat:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -30,3 +26,4 @@ __openat:
     popl    %ecx
     popl    %ebx
     ret
+END(__openat)

libc/arch-x86/syscalls/__ptrace.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__ptrace)
-    .type __ptrace, @function
-    .globl __ptrace
-    .align 4
-
-__ptrace:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -30,3 +26,4 @@ __ptrace:
     popl    %ecx
     popl    %ebx
     ret
+END(__ptrace)

libc/arch-x86/syscalls/__reboot.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__reboot)
-    .type __reboot, @function
-    .globl __reboot
-    .align 4
-
-__reboot:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -30,3 +26,4 @@ __reboot:
     popl    %ecx
     popl    %ebx
     ret
+END(__reboot)

libc/arch-x86/syscalls/__rt_sigaction.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__rt_sigaction)
-    .type __rt_sigaction, @function
-    .globl __rt_sigaction
-    .align 4
-
-__rt_sigaction:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -30,3 +26,4 @@ __rt_sigaction:
     popl    %ecx
     popl    %ebx
     ret
+END(__rt_sigaction)

libc/arch-x86/syscalls/__rt_sigprocmask.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__rt_sigprocmask)
-    .type __rt_sigprocmask, @function
-    .globl __rt_sigprocmask
-    .align 4
-
-__rt_sigprocmask:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -30,3 +26,4 @@ __rt_sigprocmask:
     popl    %ecx
     popl    %ebx
     ret
+END(__rt_sigprocmask)

libc/arch-x86/syscalls/__rt_sigtimedwait.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__rt_sigtimedwait)
-    .type __rt_sigtimedwait, @function
-    .globl __rt_sigtimedwait
-    .align 4
-
-__rt_sigtimedwait:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -30,3 +26,4 @@ __rt_sigtimedwait:
     popl    %ecx
     popl    %ebx
     ret
+END(__rt_sigtimedwait)

libc/arch-x86/syscalls/__sched_getaffinity.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__sched_getaffinity)
-    .type __sched_getaffinity, @function
-    .globl __sched_getaffinity
-    .align 4
-
-__sched_getaffinity:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ __sched_getaffinity:
     popl    %ecx
     popl    %ebx
     ret
+END(__sched_getaffinity)

libc/arch-x86/syscalls/__set_thread_area.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__set_thread_area)
-    .type __set_thread_area, @function
-    .globl __set_thread_area
-    .align 4
-
-__set_thread_area:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_set_thread_area, %eax
@@ -21,3 +17,4 @@ __set_thread_area:
 1:
     popl    %ebx
     ret
+END(__set_thread_area)

libc/arch-x86/syscalls/__setresuid.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__setresuid)
-    .type __setresuid, @function
-    .globl __setresuid
-    .align 4
-
-__setresuid:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ __setresuid:
     popl    %ecx
     popl    %ebx
     ret
+END(__setresuid)

libc/arch-x86/syscalls/__setreuid.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__setreuid)
-    .type __setreuid, @function
-    .globl __setreuid
-    .align 4
-
-__setreuid:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ __setreuid:
     popl    %ecx
     popl    %ebx
     ret
+END(__setreuid)

libc/arch-x86/syscalls/__setuid.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__setuid)
-    .type __setuid, @function
-    .globl __setuid
-    .align 4
-
-__setuid:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_setuid32, %eax
@@ -21,3 +17,4 @@ __setuid:
 1:
     popl    %ebx
     ret
+END(__setuid)

libc/arch-x86/syscalls/__sigsuspend.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__sigsuspend)
-    .type __sigsuspend, @function
-    .globl __sigsuspend
-    .align 4
-
-__sigsuspend:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ __sigsuspend:
     popl    %ecx
     popl    %ebx
     ret
+END(__sigsuspend)

libc/arch-x86/syscalls/__statfs64.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__statfs64)
-    .type __statfs64, @function
-    .globl __statfs64
-    .align 4
-
-__statfs64:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ __statfs64:
     popl    %ecx
     popl    %ebx
     ret
+END(__statfs64)

libc/arch-x86/syscalls/__sys_clone.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__sys_clone)
-    .type __sys_clone, @function
-    .globl __sys_clone
-    .align 4
-
-__sys_clone:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -33,3 +29,4 @@ __sys_clone:
     popl    %ecx
     popl    %ebx
     ret
+END(__sys_clone)

libc/arch-x86/syscalls/__syslog.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__syslog)
-    .type __syslog, @function
-    .globl __syslog
-    .align 4
-
-__syslog:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ __syslog:
     popl    %ecx
     popl    %ebx
     ret
+END(__syslog)

libc/arch-x86/syscalls/__timer_create.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__timer_create)
-    .type __timer_create, @function
-    .globl __timer_create
-    .align 4
-
-__timer_create:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ __timer_create:
     popl    %ecx
     popl    %ebx
     ret
+END(__timer_create)

libc/arch-x86/syscalls/__timer_delete.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__timer_delete)
-    .type __timer_delete, @function
-    .globl __timer_delete
-    .align 4
-
-__timer_delete:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_timer_delete, %eax
@@ -21,3 +17,4 @@ __timer_delete:
 1:
     popl    %ebx
     ret
+END(__timer_delete)

libc/arch-x86/syscalls/__timer_getoverrun.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__timer_getoverrun)
-    .type __timer_getoverrun, @function
-    .globl __timer_getoverrun
-    .align 4
-
-__timer_getoverrun:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_timer_getoverrun, %eax
@@ -21,3 +17,4 @@ __timer_getoverrun:
 1:
     popl    %ebx
     ret
+END(__timer_getoverrun)

libc/arch-x86/syscalls/__timer_gettime.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__timer_gettime)
-    .type __timer_gettime, @function
-    .globl __timer_gettime
-    .align 4
-
-__timer_gettime:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ __timer_gettime:
     popl    %ecx
     popl    %ebx
     ret
+END(__timer_gettime)

libc/arch-x86/syscalls/__timer_settime.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__timer_settime)
-    .type __timer_settime, @function
-    .globl __timer_settime
-    .align 4
-
-__timer_settime:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -30,3 +26,4 @@ __timer_settime:
     popl    %ecx
     popl    %ebx
     ret
+END(__timer_settime)

libc/arch-x86/syscalls/__wait4.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__wait4)
-    .type __wait4, @function
-    .globl __wait4
-    .align 4
-
-__wait4:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -30,3 +26,4 @@ __wait4:
     popl    %ecx
     popl    %ebx
     ret
+END(__wait4)

libc/arch-x86/syscalls/__waitid.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(__waitid)
-    .type __waitid, @function
-    .globl __waitid
-    .align 4
-
-__waitid:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -33,3 +29,4 @@ __waitid:
     popl    %ecx
     popl    %ebx
     ret
+END(__waitid)

libc/arch-x86/syscalls/_exit.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(_exit)
-    .type _exit, @function
-    .globl _exit
-    .align 4
-
-_exit:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_exit_group, %eax
@@ -21,3 +17,4 @@ _exit:
 1:
     popl    %ebx
     ret
+END(_exit)

libc/arch-x86/syscalls/_exit_thread.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(_exit_thread)
-    .type _exit_thread, @function
-    .globl _exit_thread
-    .align 4
-
-_exit_thread:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_exit, %eax
@@ -21,3 +17,4 @@ _exit_thread:
 1:
     popl    %ebx
     ret
+END(_exit_thread)

libc/arch-x86/syscalls/_waitpid.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(_waitpid)
-    .type _waitpid, @function
-    .globl _waitpid
-    .align 4
-
-_waitpid:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -30,3 +26,4 @@ _waitpid:
     popl    %ecx
     popl    %ebx
     ret
+END(_waitpid)

libc/arch-x86/syscalls/accept.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(accept)
-    .type accept, @function
-    .globl accept
-    .align 4
-
-accept:
     pushl   %ebx
     pushl   %ecx
     mov     $5, %ebx
@@ -25,3 +21,4 @@ accept:
     popl    %ecx
     popl    %ebx
     ret
+END(accept)

libc/arch-x86/syscalls/access.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(access)
-    .type access, @function
-    .globl access
-    .align 4
-
-access:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ access:
     popl    %ecx
     popl    %ebx
     ret
+END(access)

libc/arch-x86/syscalls/acct.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(acct)
-    .type acct, @function
-    .globl acct
-    .align 4
-
-acct:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_acct, %eax
@@ -21,3 +17,4 @@ acct:
 1:
     popl    %ebx
     ret
+END(acct)

libc/arch-x86/syscalls/bind.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(bind)
-    .type bind, @function
-    .globl bind
-    .align 4
-
-bind:
     pushl   %ebx
     pushl   %ecx
     mov     $2, %ebx
@@ -25,3 +21,4 @@ bind:
     popl    %ecx
     popl    %ebx
     ret
+END(bind)

libc/arch-x86/syscalls/capget.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(capget)
-    .type capget, @function
-    .globl capget
-    .align 4
-
-capget:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ capget:
     popl    %ecx
     popl    %ebx
     ret
+END(capget)

libc/arch-x86/syscalls/capset.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(capset)
-    .type capset, @function
-    .globl capset
-    .align 4
-
-capset:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ capset:
     popl    %ecx
     popl    %ebx
     ret
+END(capset)

libc/arch-x86/syscalls/chdir.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(chdir)
-    .type chdir, @function
-    .globl chdir
-    .align 4
-
-chdir:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_chdir, %eax
@@ -21,3 +17,4 @@ chdir:
 1:
     popl    %ebx
     ret
+END(chdir)

libc/arch-x86/syscalls/chmod.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(chmod)
-    .type chmod, @function
-    .globl chmod
-    .align 4
-
-chmod:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ chmod:
     popl    %ecx
     popl    %ebx
     ret
+END(chmod)

libc/arch-x86/syscalls/chown.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(chown)
-    .type chown, @function
-    .globl chown
-    .align 4
-
-chown:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ chown:
     popl    %ecx
     popl    %ebx
     ret
+END(chown)

libc/arch-x86/syscalls/chroot.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(chroot)
-    .type chroot, @function
-    .globl chroot
-    .align 4
-
-chroot:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_chroot, %eax
@@ -21,3 +17,4 @@ chroot:
 1:
     popl    %ebx
     ret
+END(chroot)

libc/arch-x86/syscalls/clock_getres.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(clock_getres)
-    .type clock_getres, @function
-    .globl clock_getres
-    .align 4
-
-clock_getres:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ clock_getres:
     popl    %ecx
     popl    %ebx
     ret
+END(clock_getres)

libc/arch-x86/syscalls/clock_gettime.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(clock_gettime)
-    .type clock_gettime, @function
-    .globl clock_gettime
-    .align 4
-
-clock_gettime:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ clock_gettime:
     popl    %ecx
     popl    %ebx
     ret
+END(clock_gettime)

libc/arch-x86/syscalls/clock_nanosleep.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(clock_nanosleep)
-    .type clock_nanosleep, @function
-    .globl clock_nanosleep
-    .align 4
-
-clock_nanosleep:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -30,3 +26,4 @@ clock_nanosleep:
     popl    %ecx
     popl    %ebx
     ret
+END(clock_nanosleep)

libc/arch-x86/syscalls/clock_settime.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(clock_settime)
-    .type clock_settime, @function
-    .globl clock_settime
-    .align 4
-
-clock_settime:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ clock_settime:
     popl    %ecx
     popl    %ebx
     ret
+END(clock_settime)

libc/arch-x86/syscalls/close.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(close)
-    .type close, @function
-    .globl close
-    .align 4
-
-close:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_close, %eax
@@ -21,3 +17,4 @@ close:
 1:
     popl    %ebx
     ret
+END(close)

libc/arch-x86/syscalls/connect.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(connect)
-    .type connect, @function
-    .globl connect
-    .align 4
-
-connect:
     pushl   %ebx
     pushl   %ecx
     mov     $3, %ebx
@@ -25,3 +21,4 @@ connect:
     popl    %ecx
     popl    %ebx
     ret
+END(connect)

libc/arch-x86/syscalls/delete_module.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(delete_module)
-    .type delete_module, @function
-    .globl delete_module
-    .align 4
-
-delete_module:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ delete_module:
     popl    %ecx
     popl    %ebx
     ret
+END(delete_module)

libc/arch-x86/syscalls/dup.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(dup)
-    .type dup, @function
-    .globl dup
-    .align 4
-
-dup:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_dup, %eax
@@ -21,3 +17,4 @@ dup:
 1:
     popl    %ebx
     ret
+END(dup)

libc/arch-x86/syscalls/dup2.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(dup2)
-    .type dup2, @function
-    .globl dup2
-    .align 4
-
-dup2:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ dup2:
     popl    %ecx
     popl    %ebx
     ret
+END(dup2)

libc/arch-x86/syscalls/epoll_create.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(epoll_create)
-    .type epoll_create, @function
-    .globl epoll_create
-    .align 4
-
-epoll_create:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_epoll_create, %eax
@@ -21,3 +17,4 @@ epoll_create:
 1:
     popl    %ebx
     ret
+END(epoll_create)

libc/arch-x86/syscalls/epoll_ctl.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(epoll_ctl)
-    .type epoll_ctl, @function
-    .globl epoll_ctl
-    .align 4
-
-epoll_ctl:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -30,3 +26,4 @@ epoll_ctl:
     popl    %ecx
     popl    %ebx
     ret
+END(epoll_ctl)

libc/arch-x86/syscalls/epoll_wait.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(epoll_wait)
-    .type epoll_wait, @function
-    .globl epoll_wait
-    .align 4
-
-epoll_wait:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -30,3 +26,4 @@ epoll_wait:
     popl    %ecx
     popl    %ebx
     ret
+END(epoll_wait)

libc/arch-x86/syscalls/eventfd.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(eventfd)
-    .type eventfd, @function
-    .globl eventfd
-    .align 4
-
-eventfd:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ eventfd:
     popl    %ecx
     popl    %ebx
     ret
+END(eventfd)

libc/arch-x86/syscalls/execve.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(execve)
-    .type execve, @function
-    .globl execve
-    .align 4
-
-execve:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ execve:
     popl    %ecx
     popl    %ebx
     ret
+END(execve)

libc/arch-x86/syscalls/faccessat.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(faccessat)
-    .type faccessat, @function
-    .globl faccessat
-    .align 4
-
-faccessat:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -30,3 +26,4 @@ faccessat:
     popl    %ecx
     popl    %ebx
     ret
+END(faccessat)

libc/arch-x86/syscalls/fchdir.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(fchdir)
-    .type fchdir, @function
-    .globl fchdir
-    .align 4
-
-fchdir:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_fchdir, %eax
@@ -21,3 +17,4 @@ fchdir:
 1:
     popl    %ebx
     ret
+END(fchdir)

libc/arch-x86/syscalls/fchmod.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(fchmod)
-    .type fchmod, @function
-    .globl fchmod
-    .align 4
-
-fchmod:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ fchmod:
     popl    %ecx
     popl    %ebx
     ret
+END(fchmod)

libc/arch-x86/syscalls/fchmodat.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(fchmodat)
-    .type fchmodat, @function
-    .globl fchmodat
-    .align 4
-
-fchmodat:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -30,3 +26,4 @@ fchmodat:
     popl    %ecx
     popl    %ebx
     ret
+END(fchmodat)

libc/arch-x86/syscalls/fchown.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(fchown)
-    .type fchown, @function
-    .globl fchown
-    .align 4
-
-fchown:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ fchown:
     popl    %ecx
     popl    %ebx
     ret
+END(fchown)

libc/arch-x86/syscalls/fchownat.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(fchownat)
-    .type fchownat, @function
-    .globl fchownat
-    .align 4
-
-fchownat:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -33,3 +29,4 @@ fchownat:
     popl    %ecx
     popl    %ebx
     ret
+END(fchownat)

libc/arch-x86/syscalls/fdatasync.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(fdatasync)
-    .type fdatasync, @function
-    .globl fdatasync
-    .align 4
-
-fdatasync:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_fdatasync, %eax
@@ -21,3 +17,4 @@ fdatasync:
 1:
     popl    %ebx
     ret
+END(fdatasync)

libc/arch-x86/syscalls/fgetxattr.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(fgetxattr)
-    .type fgetxattr, @function
-    .globl fgetxattr
-    .align 4
-
-fgetxattr:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -30,3 +26,4 @@ fgetxattr:
     popl    %ecx
     popl    %ebx
     ret
+END(fgetxattr)

libc/arch-x86/syscalls/flistxattr.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(flistxattr)
-    .type flistxattr, @function
-    .globl flistxattr
-    .align 4
-
-flistxattr:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ flistxattr:
     popl    %ecx
     popl    %ebx
     ret
+END(flistxattr)

libc/arch-x86/syscalls/flock.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(flock)
-    .type flock, @function
-    .globl flock
-    .align 4
-
-flock:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ flock:
     popl    %ecx
     popl    %ebx
     ret
+END(flock)

libc/arch-x86/syscalls/fremovexattr.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(fremovexattr)
-    .type fremovexattr, @function
-    .globl fremovexattr
-    .align 4
-
-fremovexattr:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ fremovexattr:
     popl    %ecx
     popl    %ebx
     ret
+END(fremovexattr)

libc/arch-x86/syscalls/fsetxattr.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(fsetxattr)
-    .type fsetxattr, @function
-    .globl fsetxattr
-    .align 4
-
-fsetxattr:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -33,3 +29,4 @@ fsetxattr:
     popl    %ecx
     popl    %ebx
     ret
+END(fsetxattr)

libc/arch-x86/syscalls/fstat.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(fstat)
-    .type fstat, @function
-    .globl fstat
-    .align 4
-
-fstat:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ fstat:
     popl    %ecx
     popl    %ebx
     ret
+END(fstat)

libc/arch-x86/syscalls/fstatat.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(fstatat)
-    .type fstatat, @function
-    .globl fstatat
-    .align 4
-
-fstatat:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -30,3 +26,4 @@ fstatat:
     popl    %ecx
     popl    %ebx
     ret
+END(fstatat)

libc/arch-x86/syscalls/fsync.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(fsync)
-    .type fsync, @function
-    .globl fsync
-    .align 4
-
-fsync:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_fsync, %eax
@@ -21,3 +17,4 @@ fsync:
 1:
     popl    %ebx
     ret
+END(fsync)

libc/arch-x86/syscalls/ftruncate.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(ftruncate)
-    .type ftruncate, @function
-    .globl ftruncate
-    .align 4
-
-ftruncate:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ ftruncate:
     popl    %ecx
     popl    %ebx
     ret
+END(ftruncate)

libc/arch-x86/syscalls/ftruncate64.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(ftruncate64)
-    .type ftruncate64, @function
-    .globl ftruncate64
-    .align 4
-
-ftruncate64:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ ftruncate64:
     popl    %ecx
     popl    %ebx
     ret
+END(ftruncate64)

libc/arch-x86/syscalls/futex.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(futex)
-    .type futex, @function
-    .globl futex
-    .align 4
-
-futex:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -36,3 +32,4 @@ futex:
     popl    %ecx
     popl    %ebx
     ret
+END(futex)

libc/arch-x86/syscalls/getdents.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(getdents)
-    .type getdents, @function
-    .globl getdents
-    .align 4
-
-getdents:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ getdents:
     popl    %ecx
     popl    %ebx
     ret
+END(getdents)

libc/arch-x86/syscalls/getegid.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(getegid)
-    .type getegid, @function
-    .globl getegid
-    .align 4
-
-getegid:
     movl    $__NR_getegid32, %eax
     int     $0x80
     cmpl    $-129, %eax
@@ -18,3 +14,4 @@ getegid:
     orl     $-1, %eax
 1:
     ret
+END(getegid)

libc/arch-x86/syscalls/geteuid.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(geteuid)
-    .type geteuid, @function
-    .globl geteuid
-    .align 4
-
-geteuid:
     movl    $__NR_geteuid32, %eax
     int     $0x80
     cmpl    $-129, %eax
@@ -18,3 +14,4 @@ geteuid:
     orl     $-1, %eax
 1:
     ret
+END(geteuid)

libc/arch-x86/syscalls/getgid.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(getgid)
-    .type getgid, @function
-    .globl getgid
-    .align 4
-
-getgid:
     movl    $__NR_getgid32, %eax
     int     $0x80
     cmpl    $-129, %eax
@@ -18,3 +14,4 @@ getgid:
     orl     $-1, %eax
 1:
     ret
+END(getgid)

libc/arch-x86/syscalls/getgroups.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(getgroups)
-    .type getgroups, @function
-    .globl getgroups
-    .align 4
-
-getgroups:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ getgroups:
     popl    %ecx
     popl    %ebx
     ret
+END(getgroups)

libc/arch-x86/syscalls/getitimer.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(getitimer)
-    .type getitimer, @function
-    .globl getitimer
-    .align 4
-
-getitimer:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ getitimer:
     popl    %ecx
     popl    %ebx
     ret
+END(getitimer)

libc/arch-x86/syscalls/getpeername.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(getpeername)
-    .type getpeername, @function
-    .globl getpeername
-    .align 4
-
-getpeername:
     pushl   %ebx
     pushl   %ecx
     mov     $7, %ebx
@@ -25,3 +21,4 @@ getpeername:
     popl    %ecx
     popl    %ebx
     ret
+END(getpeername)

libc/arch-x86/syscalls/getpgid.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(getpgid)
-    .type getpgid, @function
-    .globl getpgid
-    .align 4
-
-getpgid:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_getpgid, %eax
@@ -21,3 +17,4 @@ getpgid:
 1:
     popl    %ebx
     ret
+END(getpgid)

libc/arch-x86/syscalls/getpid.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(getpid)
-    .type getpid, @function
-    .globl getpid
-    .align 4
-
-getpid:
     movl    $__NR_getpid, %eax
     int     $0x80
     cmpl    $-129, %eax
@@ -18,3 +14,4 @@ getpid:
     orl     $-1, %eax
 1:
     ret
+END(getpid)

libc/arch-x86/syscalls/getppid.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(getppid)
-    .type getppid, @function
-    .globl getppid
-    .align 4
-
-getppid:
     movl    $__NR_getppid, %eax
     int     $0x80
     cmpl    $-129, %eax
@@ -18,3 +14,4 @@ getppid:
     orl     $-1, %eax
 1:
     ret
+END(getppid)

libc/arch-x86/syscalls/getresgid.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(getresgid)
-    .type getresgid, @function
-    .globl getresgid
-    .align 4
-
-getresgid:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ getresgid:
     popl    %ecx
     popl    %ebx
     ret
+END(getresgid)

libc/arch-x86/syscalls/getresuid.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(getresuid)
-    .type getresuid, @function
-    .globl getresuid
-    .align 4
-
-getresuid:
     pushl   %ebx
     pushl   %ecx
     pushl   %edx
@@ -27,3 +23,4 @@ getresuid:
     popl    %ecx
     popl    %ebx
     ret
+END(getresuid)

libc/arch-x86/syscalls/getrlimit.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(getrlimit)
-    .type getrlimit, @function
-    .globl getrlimit
-    .align 4
-
-getrlimit:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ getrlimit:
     popl    %ecx
     popl    %ebx
     ret
+END(getrlimit)

libc/arch-x86/syscalls/getrusage.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(getrusage)
-    .type getrusage, @function
-    .globl getrusage
-    .align 4
-
-getrusage:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ getrusage:
     popl    %ecx
     popl    %ebx
     ret
+END(getrusage)

libc/arch-x86/syscalls/getsid.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(getsid)
-    .type getsid, @function
-    .globl getsid
-    .align 4
-
-getsid:
     pushl   %ebx
     mov     8(%esp), %ebx
     movl    $__NR_getsid, %eax
@@ -21,3 +17,4 @@ getsid:
 1:
     popl    %ebx
     ret
+END(getsid)

libc/arch-x86/syscalls/getsockname.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(getsockname)
-    .type getsockname, @function
-    .globl getsockname
-    .align 4
-
-getsockname:
     pushl   %ebx
     pushl   %ecx
     mov     $6, %ebx
@@ -25,3 +21,4 @@ getsockname:
     popl    %ecx
     popl    %ebx
     ret
+END(getsockname)

libc/arch-x86/syscalls/getsockopt.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(getsockopt)
-    .type getsockopt, @function
-    .globl getsockopt
-    .align 4
-
-getsockopt:
     pushl   %ebx
     pushl   %ecx
     mov     $15, %ebx
@@ -25,3 +21,4 @@ getsockopt:
     popl    %ecx
     popl    %ebx
     ret
+END(getsockopt)

libc/arch-x86/syscalls/gettid.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(gettid)
-    .type gettid, @function
-    .globl gettid
-    .align 4
-
-gettid:
     movl    $__NR_gettid, %eax
     int     $0x80
     cmpl    $-129, %eax
@@ -18,3 +14,4 @@ gettid:
     orl     $-1, %eax
 1:
     ret
+END(gettid)

libc/arch-x86/syscalls/gettimeofday.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(gettimeofday)
-    .type gettimeofday, @function
-    .globl gettimeofday
-    .align 4
-
-gettimeofday:
     pushl   %ebx
     pushl   %ecx
     mov     12(%esp), %ebx
@@ -24,3 +20,4 @@ gettimeofday:
     popl    %ecx
     popl    %ebx
     ret
+END(gettimeofday)

libc/arch-x86/syscalls/getuid.S

@@ -1,12 +1,8 @@
 /* autogenerated by gensyscalls.py */
+#include <machine/asm.h>
 #include <sys/linux-syscalls.h>
 
-    .text
+ENTRY(getuid)
-    .type getuid, @function
-    .globl getuid
-    .align 4
-
-getuid:
     movl    $__NR_getuid32, %eax
     int     $0x80
     cmpl    $-129, %eax
@@ -18,3 +14,4 @@ getuid:
     orl     $-1, %eax
 1:
     ret
+END(getuid)