Merge "Make mips/mips64 syscall stubs more like the other architectures."

libc/arch-mips/bionic/futex_mips.S

@@ -37,23 +37,23 @@
 	.align	4
 	.ent	__futex_wait
 __futex_wait:
-	subu	$sp,4*6
-	sw	$0,20($sp)	/* val3 */
-	sw	$0,16($sp)	/* addr2 */
-	move	$a3,$a2		/* timespec */
-	move	$a2,$a1		/* val */
-	li	$a1,FUTEX_WAIT	/* op */
-#	move	$a0,$a0		/* ftx */
-	li	$v0,__NR_futex
+	subu	sp,4*6
+	sw	$0,20(sp)	/* val3 */
+	sw	$0,16(sp)	/* addr2 */
+	move	a3,a2		/* timespec */
+	move	a2,a1		/* val */
+	li	a1,FUTEX_WAIT	/* op */
+#	move	a0,a0		/* ftx */
+	li	v0,__NR_futex
 	syscall
 	.set noreorder
-	bnez	$a3, 1f		/* Check for error */
-         neg	$v0		/* Negate error number if it's valid */
-	move	$v0,$0		/* Otherwise return 0 */
+	bnez	a3, 1f		/* Check for error */
+         neg	v0		/* Negate error number if it's valid */
+	move	v0,$0		/* Otherwise return 0 */
 1:
 	.set reorder
-	addu	$sp,4*6
-	j	$ra
+	addu	sp,4*6
+	j	ra
 	.end	__futex_wait
 
 // int __futex_wake(volatile void* ftx, int count)
@@ -62,23 +62,23 @@ __futex_wait:
 	.align	4
 	.ent	__futex_wake
 __futex_wake:
-	subu	$sp,4*6
-	sw	$0,20($sp)	/* val3 */
-	sw	$0,16($sp)	/* addr2 */
-	move	$a3,$0		/* timespec */
-	move	$a2,$a1		/* val */
-	li	$a1,FUTEX_WAKE	/* op */
-#	move	$a0,$a0		/* ftx */
-	li	$v0,__NR_futex
+	subu	sp,4*6
+	sw	$0,20(sp)	/* val3 */
+	sw	$0,16(sp)	/* addr2 */
+	move	a3,$0		/* timespec */
+	move	a2,a1		/* val */
+	li	a1,FUTEX_WAKE	/* op */
+#	move	a0,a0		/* ftx */
+	li	v0,__NR_futex
 	syscall
 	.set noreorder
-	bnez	$a3, 1f		/* Check for error */
-         neg	$v0		/* Negate error number if it's valid */
-	move	$v0,$0		/* Otherwise return 0 */
+	bnez	a3, 1f		/* Check for error */
+         neg	v0		/* Negate error number if it's valid */
+	move	v0,$0		/* Otherwise return 0 */
 1:
 	.set reorder
-	addu	$sp,4*6
-	j	$ra
+	addu	sp,4*6
+	j	ra
 	.end	__futex_wake
 
 // int __futex_syscall3(volatile void* ftx, int op, int count)
@@ -87,23 +87,23 @@ __futex_wake:
 	.align	4
 	.ent	__futex_syscall3
 __futex_syscall3:
-	subu	$sp,4*6
-	sw	$0,20($sp)	/* val3 */
-	sw	$0,16($sp)	/* addr2 */
-	move	$a3,$0		/* timespec */
-#	move	$a2,$a2		/* val */
-#	li	$a1,$a1		/* op */
-#	move	$a0,$a0		/* ftx */
-	li	$v0,__NR_futex
+	subu	sp,4*6
+	sw	$0,20(sp)	/* val3 */
+	sw	$0,16(sp)	/* addr2 */
+	move	a3,$0		/* timespec */
+#	move	a2,a2		/* val */
+#	li	a1,a1		/* op */
+#	move	a0,a0		/* ftx */
+	li	v0,__NR_futex
 	syscall
 	.set noreorder
-	bnez	$a3, 1f		/* Check for error */
-         neg	$v0		/* Negate error number if it's valid */
-	move	$v0,$0		/* Otherwise return 0 */
+	bnez	a3, 1f		/* Check for error */
+         neg	v0		/* Negate error number if it's valid */
+	move	v0,$0		/* Otherwise return 0 */
 1:
 	.set reorder
-	addu	$sp,4*6
-	j	$ra
+	addu	sp,4*6
+	j	ra
 	.end	__futex_syscall3
 
 // int __futex_syscall4(volatile void* ftx, int op, int val, const struct timespec* timeout)
@@ -112,21 +112,21 @@ __futex_syscall3:
 	.align	4
 	.ent	__futex_syscall4
 __futex_syscall4:
-	subu	$sp,4*6
-	sw	$0,20($sp)	/* val3 */
-	sw	$0,16($sp)	/* addr2 */
-#	move	$a3,$a3		/* timespec */
-#	move	$a2,$a2		/* val */
-#	li	$a1,$a1		/* op */
-#	move	$a0,$a0		/* ftx */
-	li	$v0,__NR_futex
+	subu	sp,4*6
+	sw	$0,20(sp)	/* val3 */
+	sw	$0,16(sp)	/* addr2 */
+#	move	a3,a3		/* timespec */
+#	move	a2,a2		/* val */
+#	li	a1,a1		/* op */
+#	move	a0,a0		/* ftx */
+	li	v0,__NR_futex
 	syscall
 	.set noreorder
-	bnez	$a3, 1f		/* Check for error */
-         neg	$v0		/* Negate error number if it's valid */
-	move	$v0,$0		/* Otherwise return 0 */
+	bnez	a3, 1f		/* Check for error */
+         neg	v0		/* Negate error number if it's valid */
+	move	v0,$0		/* Otherwise return 0 */
 1:
 	.set reorder
-	addu	$sp,4*6
-	j	$ra
+	addu	sp,4*6
+	j	ra
 	.end	__futex_syscall4

libc/arch-mips/syscalls/__brk.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __brk
-    .align 4
-    .ent __brk
+#include <private/bionic_asm.h>
 
-__brk:
+ENTRY(__brk)
     .set noreorder
     .cpload t9
     li v0, __NR_brk
@@ -22,4 +16,4 @@ __brk:
     j t9
     nop
     .set reorder
-    .end __brk
+END(__brk)

libc/arch-mips/syscalls/__epoll_pwait.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __epoll_pwait
-    .align 4
-    .ent __epoll_pwait
+#include <private/bionic_asm.h>
 
-__epoll_pwait:
+ENTRY(__epoll_pwait)
     .set noreorder
     .cpload t9
     li v0, __NR_epoll_pwait
@@ -22,4 +16,4 @@ __epoll_pwait:
     j t9
     nop
     .set reorder
-    .end __epoll_pwait
+END(__epoll_pwait)

libc/arch-mips/syscalls/__exit.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __exit
-    .align 4
-    .ent __exit
+#include <private/bionic_asm.h>
 
-__exit:
+ENTRY(__exit)
     .set noreorder
     .cpload t9
     li v0, __NR_exit
@@ -22,4 +16,4 @@ __exit:
     j t9
     nop
     .set reorder
-    .end __exit
+END(__exit)

libc/arch-mips/syscalls/__fcntl64.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __fcntl64
-    .align 4
-    .ent __fcntl64
+#include <private/bionic_asm.h>
 
-__fcntl64:
+ENTRY(__fcntl64)
     .set noreorder
     .cpload t9
     li v0, __NR_fcntl64
@@ -22,4 +16,4 @@ __fcntl64:
     j t9
     nop
     .set reorder
-    .end __fcntl64
+END(__fcntl64)

libc/arch-mips/syscalls/__fstatfs64.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __fstatfs64
-    .align 4
-    .ent __fstatfs64
+#include <private/bionic_asm.h>
 
-__fstatfs64:
+ENTRY(__fstatfs64)
     .set noreorder
     .cpload t9
     li v0, __NR_fstatfs64
@@ -22,4 +16,4 @@ __fstatfs64:
     j t9
     nop
     .set reorder
-    .end __fstatfs64
+END(__fstatfs64)

libc/arch-mips/syscalls/__getcpu.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __getcpu
-    .align 4
-    .ent __getcpu
+#include <private/bionic_asm.h>
 
-__getcpu:
+ENTRY(__getcpu)
     .set noreorder
     .cpload t9
     li v0, __NR_getcpu
@@ -22,4 +16,4 @@ __getcpu:
     j t9
     nop
     .set reorder
-    .end __getcpu
+END(__getcpu)

libc/arch-mips/syscalls/__getcwd.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __getcwd
-    .align 4
-    .ent __getcwd
+#include <private/bionic_asm.h>
 
-__getcwd:
+ENTRY(__getcwd)
     .set noreorder
     .cpload t9
     li v0, __NR_getcwd
@@ -22,4 +16,4 @@ __getcwd:
     j t9
     nop
     .set reorder
-    .end __getcwd
+END(__getcwd)

libc/arch-mips/syscalls/__getpriority.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __getpriority
-    .align 4
-    .ent __getpriority
+#include <private/bionic_asm.h>
 
-__getpriority:
+ENTRY(__getpriority)
     .set noreorder
     .cpload t9
     li v0, __NR_getpriority
@@ -22,4 +16,4 @@ __getpriority:
     j t9
     nop
     .set reorder
-    .end __getpriority
+END(__getpriority)

libc/arch-mips/syscalls/__ioctl.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __ioctl
-    .align 4
-    .ent __ioctl
+#include <private/bionic_asm.h>
 
-__ioctl:
+ENTRY(__ioctl)
     .set noreorder
     .cpload t9
     li v0, __NR_ioctl
@@ -22,4 +16,4 @@ __ioctl:
     j t9
     nop
     .set reorder
-    .end __ioctl
+END(__ioctl)

libc/arch-mips/syscalls/__llseek.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __llseek
-    .align 4
-    .ent __llseek
+#include <private/bionic_asm.h>
 
-__llseek:
+ENTRY(__llseek)
     .set noreorder
     .cpload t9
     li v0, __NR__llseek
@@ -22,4 +16,4 @@ __llseek:
     j t9
     nop
     .set reorder
-    .end __llseek
+END(__llseek)

libc/arch-mips/syscalls/__mmap2.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __mmap2
-    .align 4
-    .ent __mmap2
+#include <private/bionic_asm.h>
 
-__mmap2:
+ENTRY(__mmap2)
     .set noreorder
     .cpload t9
     li v0, __NR_mmap2
@@ -22,4 +16,4 @@ __mmap2:
     j t9
     nop
     .set reorder
-    .end __mmap2
+END(__mmap2)

libc/arch-mips/syscalls/__openat.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __openat
-    .align 4
-    .ent __openat
+#include <private/bionic_asm.h>
 
-__openat:
+ENTRY(__openat)
     .set noreorder
     .cpload t9
     li v0, __NR_openat
@@ -22,4 +16,4 @@ __openat:
     j t9
     nop
     .set reorder
-    .end __openat
+END(__openat)

libc/arch-mips/syscalls/__ppoll.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __ppoll
-    .align 4
-    .ent __ppoll
+#include <private/bionic_asm.h>
 
-__ppoll:
+ENTRY(__ppoll)
     .set noreorder
     .cpload t9
     li v0, __NR_ppoll
@@ -22,4 +16,4 @@ __ppoll:
     j t9
     nop
     .set reorder
-    .end __ppoll
+END(__ppoll)

libc/arch-mips/syscalls/__pselect6.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __pselect6
-    .align 4
-    .ent __pselect6
+#include <private/bionic_asm.h>
 
-__pselect6:
+ENTRY(__pselect6)
     .set noreorder
     .cpload t9
     li v0, __NR_pselect6
@@ -22,4 +16,4 @@ __pselect6:
     j t9
     nop
     .set reorder
-    .end __pselect6
+END(__pselect6)

libc/arch-mips/syscalls/__ptrace.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __ptrace
-    .align 4
-    .ent __ptrace
+#include <private/bionic_asm.h>
 
-__ptrace:
+ENTRY(__ptrace)
     .set noreorder
     .cpload t9
     li v0, __NR_ptrace
@@ -22,4 +16,4 @@ __ptrace:
     j t9
     nop
     .set reorder
-    .end __ptrace
+END(__ptrace)

libc/arch-mips/syscalls/__reboot.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __reboot
-    .align 4
-    .ent __reboot
+#include <private/bionic_asm.h>
 
-__reboot:
+ENTRY(__reboot)
     .set noreorder
     .cpload t9
     li v0, __NR_reboot
@@ -22,4 +16,4 @@ __reboot:
     j t9
     nop
     .set reorder
-    .end __reboot
+END(__reboot)

libc/arch-mips/syscalls/__rt_sigaction.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __rt_sigaction
-    .align 4
-    .ent __rt_sigaction
+#include <private/bionic_asm.h>
 
-__rt_sigaction:
+ENTRY(__rt_sigaction)
     .set noreorder
     .cpload t9
     li v0, __NR_rt_sigaction
@@ -22,4 +16,4 @@ __rt_sigaction:
     j t9
     nop
     .set reorder
-    .end __rt_sigaction
+END(__rt_sigaction)

libc/arch-mips/syscalls/__rt_sigpending.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __rt_sigpending
-    .align 4
-    .ent __rt_sigpending
+#include <private/bionic_asm.h>
 
-__rt_sigpending:
+ENTRY(__rt_sigpending)
     .set noreorder
     .cpload t9
     li v0, __NR_rt_sigpending
@@ -22,4 +16,4 @@ __rt_sigpending:
     j t9
     nop
     .set reorder
-    .end __rt_sigpending
+END(__rt_sigpending)

libc/arch-mips/syscalls/__rt_sigprocmask.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __rt_sigprocmask
-    .align 4
-    .ent __rt_sigprocmask
+#include <private/bionic_asm.h>
 
-__rt_sigprocmask:
+ENTRY(__rt_sigprocmask)
     .set noreorder
     .cpload t9
     li v0, __NR_rt_sigprocmask
@@ -22,4 +16,4 @@ __rt_sigprocmask:
     j t9
     nop
     .set reorder
-    .end __rt_sigprocmask
+END(__rt_sigprocmask)

libc/arch-mips/syscalls/__rt_sigsuspend.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __rt_sigsuspend
-    .align 4
-    .ent __rt_sigsuspend
+#include <private/bionic_asm.h>
 
-__rt_sigsuspend:
+ENTRY(__rt_sigsuspend)
     .set noreorder
     .cpload t9
     li v0, __NR_rt_sigsuspend
@@ -22,4 +16,4 @@ __rt_sigsuspend:
     j t9
     nop
     .set reorder
-    .end __rt_sigsuspend
+END(__rt_sigsuspend)

libc/arch-mips/syscalls/__rt_sigtimedwait.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __rt_sigtimedwait
-    .align 4
-    .ent __rt_sigtimedwait
+#include <private/bionic_asm.h>
 
-__rt_sigtimedwait:
+ENTRY(__rt_sigtimedwait)
     .set noreorder
     .cpload t9
     li v0, __NR_rt_sigtimedwait
@@ -22,4 +16,4 @@ __rt_sigtimedwait:
     j t9
     nop
     .set reorder
-    .end __rt_sigtimedwait
+END(__rt_sigtimedwait)

libc/arch-mips/syscalls/__sched_getaffinity.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __sched_getaffinity
-    .align 4
-    .ent __sched_getaffinity
+#include <private/bionic_asm.h>
 
-__sched_getaffinity:
+ENTRY(__sched_getaffinity)
     .set noreorder
     .cpload t9
     li v0, __NR_sched_getaffinity
@@ -22,4 +16,4 @@ __sched_getaffinity:
     j t9
     nop
     .set reorder
-    .end __sched_getaffinity
+END(__sched_getaffinity)

libc/arch-mips/syscalls/__set_thread_area.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __set_thread_area
-    .align 4
-    .ent __set_thread_area
+#include <private/bionic_asm.h>
 
-__set_thread_area:
+ENTRY(__set_thread_area)
     .set noreorder
     .cpload t9
     li v0, __NR_set_thread_area
@@ -22,4 +16,4 @@ __set_thread_area:
     j t9
     nop
     .set reorder
-    .end __set_thread_area
+END(__set_thread_area)

libc/arch-mips/syscalls/__set_tid_address.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __set_tid_address
-    .align 4
-    .ent __set_tid_address
+#include <private/bionic_asm.h>
 
-__set_tid_address:
+ENTRY(__set_tid_address)
     .set noreorder
     .cpload t9
     li v0, __NR_set_tid_address
@@ -22,4 +16,4 @@ __set_tid_address:
     j t9
     nop
     .set reorder
-    .end __set_tid_address
+END(__set_tid_address)

libc/arch-mips/syscalls/__sigaction.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __sigaction
-    .align 4
-    .ent __sigaction
+#include <private/bionic_asm.h>
 
-__sigaction:
+ENTRY(__sigaction)
     .set noreorder
     .cpload t9
     li v0, __NR_sigaction
@@ -22,4 +16,4 @@ __sigaction:
     j t9
     nop
     .set reorder
-    .end __sigaction
+END(__sigaction)

libc/arch-mips/syscalls/__statfs64.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __statfs64
-    .align 4
-    .ent __statfs64
+#include <private/bionic_asm.h>
 
-__statfs64:
+ENTRY(__statfs64)
     .set noreorder
     .cpload t9
     li v0, __NR_statfs64
@@ -22,4 +16,4 @@ __statfs64:
     j t9
     nop
     .set reorder
-    .end __statfs64
+END(__statfs64)

libc/arch-mips/syscalls/__syslog.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __syslog
-    .align 4
-    .ent __syslog
+#include <private/bionic_asm.h>
 
-__syslog:
+ENTRY(__syslog)
     .set noreorder
     .cpload t9
     li v0, __NR_syslog
@@ -22,4 +16,4 @@ __syslog:
     j t9
     nop
     .set reorder
-    .end __syslog
+END(__syslog)

libc/arch-mips/syscalls/__timer_create.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __timer_create
-    .align 4
-    .ent __timer_create
+#include <private/bionic_asm.h>
 
-__timer_create:
+ENTRY(__timer_create)
     .set noreorder
     .cpload t9
     li v0, __NR_timer_create
@@ -22,4 +16,4 @@ __timer_create:
     j t9
     nop
     .set reorder
-    .end __timer_create
+END(__timer_create)

libc/arch-mips/syscalls/__timer_delete.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __timer_delete
-    .align 4
-    .ent __timer_delete
+#include <private/bionic_asm.h>
 
-__timer_delete:
+ENTRY(__timer_delete)
     .set noreorder
     .cpload t9
     li v0, __NR_timer_delete
@@ -22,4 +16,4 @@ __timer_delete:
     j t9
     nop
     .set reorder
-    .end __timer_delete
+END(__timer_delete)

libc/arch-mips/syscalls/__timer_getoverrun.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __timer_getoverrun
-    .align 4
-    .ent __timer_getoverrun
+#include <private/bionic_asm.h>
 
-__timer_getoverrun:
+ENTRY(__timer_getoverrun)
     .set noreorder
     .cpload t9
     li v0, __NR_timer_getoverrun
@@ -22,4 +16,4 @@ __timer_getoverrun:
     j t9
     nop
     .set reorder
-    .end __timer_getoverrun
+END(__timer_getoverrun)

libc/arch-mips/syscalls/__timer_gettime.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __timer_gettime
-    .align 4
-    .ent __timer_gettime
+#include <private/bionic_asm.h>
 
-__timer_gettime:
+ENTRY(__timer_gettime)
     .set noreorder
     .cpload t9
     li v0, __NR_timer_gettime
@@ -22,4 +16,4 @@ __timer_gettime:
     j t9
     nop
     .set reorder
-    .end __timer_gettime
+END(__timer_gettime)

libc/arch-mips/syscalls/__timer_settime.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __timer_settime
-    .align 4
-    .ent __timer_settime
+#include <private/bionic_asm.h>
 
-__timer_settime:
+ENTRY(__timer_settime)
     .set noreorder
     .cpload t9
     li v0, __NR_timer_settime
@@ -22,4 +16,4 @@ __timer_settime:
     j t9
     nop
     .set reorder
-    .end __timer_settime
+END(__timer_settime)

libc/arch-mips/syscalls/__waitid.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl __waitid
-    .align 4
-    .ent __waitid
+#include <private/bionic_asm.h>
 
-__waitid:
+ENTRY(__waitid)
     .set noreorder
     .cpload t9
     li v0, __NR_waitid
@@ -22,4 +16,4 @@ __waitid:
     j t9
     nop
     .set reorder
-    .end __waitid
+END(__waitid)

libc/arch-mips/syscalls/_exit.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl _exit
-    .align 4
-    .ent _exit
+#include <private/bionic_asm.h>
 
-_exit:
+ENTRY(_exit)
     .set noreorder
     .cpload t9
     li v0, __NR_exit_group
@@ -22,4 +16,4 @@ _exit:
     j t9
     nop
     .set reorder
-    .end _exit
+END(_exit)

libc/arch-mips/syscalls/_flush_cache.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl _flush_cache
-    .align 4
-    .ent _flush_cache
+#include <private/bionic_asm.h>
 
-_flush_cache:
+ENTRY(_flush_cache)
     .set noreorder
     .cpload t9
     li v0, __NR_cacheflush
@@ -22,4 +16,4 @@ _flush_cache:
     j t9
     nop
     .set reorder
-    .end _flush_cache
+END(_flush_cache)

libc/arch-mips/syscalls/accept.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl accept
-    .align 4
-    .ent accept
+#include <private/bionic_asm.h>
 
-accept:
+ENTRY(accept)
     .set noreorder
     .cpload t9
     li v0, __NR_accept
@@ -22,4 +16,4 @@ accept:
     j t9
     nop
     .set reorder
-    .end accept
+END(accept)

libc/arch-mips/syscalls/acct.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl acct
-    .align 4
-    .ent acct
+#include <private/bionic_asm.h>
 
-acct:
+ENTRY(acct)
     .set noreorder
     .cpload t9
     li v0, __NR_acct
@@ -22,4 +16,4 @@ acct:
     j t9
     nop
     .set reorder
-    .end acct
+END(acct)

libc/arch-mips/syscalls/bind.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl bind
-    .align 4
-    .ent bind
+#include <private/bionic_asm.h>
 
-bind:
+ENTRY(bind)
     .set noreorder
     .cpload t9
     li v0, __NR_bind
@@ -22,4 +16,4 @@ bind:
     j t9
     nop
     .set reorder
-    .end bind
+END(bind)

libc/arch-mips/syscalls/capget.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl capget
-    .align 4
-    .ent capget
+#include <private/bionic_asm.h>
 
-capget:
+ENTRY(capget)
     .set noreorder
     .cpload t9
     li v0, __NR_capget
@@ -22,4 +16,4 @@ capget:
     j t9
     nop
     .set reorder
-    .end capget
+END(capget)

libc/arch-mips/syscalls/capset.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl capset
-    .align 4
-    .ent capset
+#include <private/bionic_asm.h>
 
-capset:
+ENTRY(capset)
     .set noreorder
     .cpload t9
     li v0, __NR_capset
@@ -22,4 +16,4 @@ capset:
     j t9
     nop
     .set reorder
-    .end capset
+END(capset)

libc/arch-mips/syscalls/chdir.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl chdir
-    .align 4
-    .ent chdir
+#include <private/bionic_asm.h>
 
-chdir:
+ENTRY(chdir)
     .set noreorder
     .cpload t9
     li v0, __NR_chdir
@@ -22,4 +16,4 @@ chdir:
     j t9
     nop
     .set reorder
-    .end chdir
+END(chdir)

libc/arch-mips/syscalls/chroot.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl chroot
-    .align 4
-    .ent chroot
+#include <private/bionic_asm.h>
 
-chroot:
+ENTRY(chroot)
     .set noreorder
     .cpload t9
     li v0, __NR_chroot
@@ -22,4 +16,4 @@ chroot:
     j t9
     nop
     .set reorder
-    .end chroot
+END(chroot)

libc/arch-mips/syscalls/clock_getres.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl clock_getres
-    .align 4
-    .ent clock_getres
+#include <private/bionic_asm.h>
 
-clock_getres:
+ENTRY(clock_getres)
     .set noreorder
     .cpload t9
     li v0, __NR_clock_getres
@@ -22,4 +16,4 @@ clock_getres:
     j t9
     nop
     .set reorder
-    .end clock_getres
+END(clock_getres)

libc/arch-mips/syscalls/clock_gettime.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl clock_gettime
-    .align 4
-    .ent clock_gettime
+#include <private/bionic_asm.h>
 
-clock_gettime:
+ENTRY(clock_gettime)
     .set noreorder
     .cpload t9
     li v0, __NR_clock_gettime
@@ -22,4 +16,4 @@ clock_gettime:
     j t9
     nop
     .set reorder
-    .end clock_gettime
+END(clock_gettime)

libc/arch-mips/syscalls/clock_nanosleep.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl clock_nanosleep
-    .align 4
-    .ent clock_nanosleep
+#include <private/bionic_asm.h>
 
-clock_nanosleep:
+ENTRY(clock_nanosleep)
     .set noreorder
     .cpload t9
     li v0, __NR_clock_nanosleep
@@ -22,4 +16,4 @@ clock_nanosleep:
     j t9
     nop
     .set reorder
-    .end clock_nanosleep
+END(clock_nanosleep)

libc/arch-mips/syscalls/clock_settime.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl clock_settime
-    .align 4
-    .ent clock_settime
+#include <private/bionic_asm.h>
 
-clock_settime:
+ENTRY(clock_settime)
     .set noreorder
     .cpload t9
     li v0, __NR_clock_settime
@@ -22,4 +16,4 @@ clock_settime:
     j t9
     nop
     .set reorder
-    .end clock_settime
+END(clock_settime)

libc/arch-mips/syscalls/close.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl close
-    .align 4
-    .ent close
+#include <private/bionic_asm.h>
 
-close:
+ENTRY(close)
     .set noreorder
     .cpload t9
     li v0, __NR_close
@@ -22,4 +16,4 @@ close:
     j t9
     nop
     .set reorder
-    .end close
+END(close)

libc/arch-mips/syscalls/connect.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl connect
-    .align 4
-    .ent connect
+#include <private/bionic_asm.h>
 
-connect:
+ENTRY(connect)
     .set noreorder
     .cpload t9
     li v0, __NR_connect
@@ -22,4 +16,4 @@ connect:
     j t9
     nop
     .set reorder
-    .end connect
+END(connect)

libc/arch-mips/syscalls/delete_module.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl delete_module
-    .align 4
-    .ent delete_module
+#include <private/bionic_asm.h>
 
-delete_module:
+ENTRY(delete_module)
     .set noreorder
     .cpload t9
     li v0, __NR_delete_module
@@ -22,4 +16,4 @@ delete_module:
     j t9
     nop
     .set reorder
-    .end delete_module
+END(delete_module)

libc/arch-mips/syscalls/dup.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl dup
-    .align 4
-    .ent dup
+#include <private/bionic_asm.h>
 
-dup:
+ENTRY(dup)
     .set noreorder
     .cpload t9
     li v0, __NR_dup
@@ -22,4 +16,4 @@ dup:
     j t9
     nop
     .set reorder
-    .end dup
+END(dup)

libc/arch-mips/syscalls/dup3.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl dup3
-    .align 4
-    .ent dup3
+#include <private/bionic_asm.h>
 
-dup3:
+ENTRY(dup3)
     .set noreorder
     .cpload t9
     li v0, __NR_dup3
@@ -22,4 +16,4 @@ dup3:
     j t9
     nop
     .set reorder
-    .end dup3
+END(dup3)

libc/arch-mips/syscalls/epoll_create1.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl epoll_create1
-    .align 4
-    .ent epoll_create1
+#include <private/bionic_asm.h>
 
-epoll_create1:
+ENTRY(epoll_create1)
     .set noreorder
     .cpload t9
     li v0, __NR_epoll_create1
@@ -22,4 +16,4 @@ epoll_create1:
     j t9
     nop
     .set reorder
-    .end epoll_create1
+END(epoll_create1)

libc/arch-mips/syscalls/epoll_ctl.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl epoll_ctl
-    .align 4
-    .ent epoll_ctl
+#include <private/bionic_asm.h>
 
-epoll_ctl:
+ENTRY(epoll_ctl)
     .set noreorder
     .cpload t9
     li v0, __NR_epoll_ctl
@@ -22,4 +16,4 @@ epoll_ctl:
     j t9
     nop
     .set reorder
-    .end epoll_ctl
+END(epoll_ctl)

libc/arch-mips/syscalls/eventfd.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl eventfd
-    .align 4
-    .ent eventfd
+#include <private/bionic_asm.h>
 
-eventfd:
+ENTRY(eventfd)
     .set noreorder
     .cpload t9
     li v0, __NR_eventfd2
@@ -22,4 +16,4 @@ eventfd:
     j t9
     nop
     .set reorder
-    .end eventfd
+END(eventfd)

libc/arch-mips/syscalls/execve.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl execve
-    .align 4
-    .ent execve
+#include <private/bionic_asm.h>
 
-execve:
+ENTRY(execve)
     .set noreorder
     .cpload t9
     li v0, __NR_execve
@@ -22,4 +16,4 @@ execve:
     j t9
     nop
     .set reorder
-    .end execve
+END(execve)

libc/arch-mips/syscalls/faccessat.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl faccessat
-    .align 4
-    .ent faccessat
+#include <private/bionic_asm.h>
 
-faccessat:
+ENTRY(faccessat)
     .set noreorder
     .cpload t9
     li v0, __NR_faccessat
@@ -22,4 +16,4 @@ faccessat:
     j t9
     nop
     .set reorder
-    .end faccessat
+END(faccessat)

libc/arch-mips/syscalls/fallocate64.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl fallocate64
-    .align 4
-    .ent fallocate64
+#include <private/bionic_asm.h>
 
-fallocate64:
+ENTRY(fallocate64)
     .set noreorder
     .cpload t9
     li v0, __NR_fallocate
@@ -22,4 +16,4 @@ fallocate64:
     j t9
     nop
     .set reorder
-    .end fallocate64
+END(fallocate64)

libc/arch-mips/syscalls/fchdir.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl fchdir
-    .align 4
-    .ent fchdir
+#include <private/bionic_asm.h>
 
-fchdir:
+ENTRY(fchdir)
     .set noreorder
     .cpload t9
     li v0, __NR_fchdir
@@ -22,4 +16,4 @@ fchdir:
     j t9
     nop
     .set reorder
-    .end fchdir
+END(fchdir)

libc/arch-mips/syscalls/fchmod.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl fchmod
-    .align 4
-    .ent fchmod
+#include <private/bionic_asm.h>
 
-fchmod:
+ENTRY(fchmod)
     .set noreorder
     .cpload t9
     li v0, __NR_fchmod
@@ -22,4 +16,4 @@ fchmod:
     j t9
     nop
     .set reorder
-    .end fchmod
+END(fchmod)

libc/arch-mips/syscalls/fchmodat.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl fchmodat
-    .align 4
-    .ent fchmodat
+#include <private/bionic_asm.h>
 
-fchmodat:
+ENTRY(fchmodat)
     .set noreorder
     .cpload t9
     li v0, __NR_fchmodat
@@ -22,4 +16,4 @@ fchmodat:
     j t9
     nop
     .set reorder
-    .end fchmodat
+END(fchmodat)

libc/arch-mips/syscalls/fchown.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl fchown
-    .align 4
-    .ent fchown
+#include <private/bionic_asm.h>
 
-fchown:
+ENTRY(fchown)
     .set noreorder
     .cpload t9
     li v0, __NR_fchown
@@ -22,4 +16,4 @@ fchown:
     j t9
     nop
     .set reorder
-    .end fchown
+END(fchown)

libc/arch-mips/syscalls/fchownat.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl fchownat
-    .align 4
-    .ent fchownat
+#include <private/bionic_asm.h>
 
-fchownat:
+ENTRY(fchownat)
     .set noreorder
     .cpload t9
     li v0, __NR_fchownat
@@ -22,4 +16,4 @@ fchownat:
     j t9
     nop
     .set reorder
-    .end fchownat
+END(fchownat)

libc/arch-mips/syscalls/fdatasync.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl fdatasync
-    .align 4
-    .ent fdatasync
+#include <private/bionic_asm.h>
 
-fdatasync:
+ENTRY(fdatasync)
     .set noreorder
     .cpload t9
     li v0, __NR_fdatasync
@@ -22,4 +16,4 @@ fdatasync:
     j t9
     nop
     .set reorder
-    .end fdatasync
+END(fdatasync)

libc/arch-mips/syscalls/fgetxattr.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl fgetxattr
-    .align 4
-    .ent fgetxattr
+#include <private/bionic_asm.h>
 
-fgetxattr:
+ENTRY(fgetxattr)
     .set noreorder
     .cpload t9
     li v0, __NR_fgetxattr
@@ -22,4 +16,4 @@ fgetxattr:
     j t9
     nop
     .set reorder
-    .end fgetxattr
+END(fgetxattr)

libc/arch-mips/syscalls/flistxattr.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl flistxattr
-    .align 4
-    .ent flistxattr
+#include <private/bionic_asm.h>
 
-flistxattr:
+ENTRY(flistxattr)
     .set noreorder
     .cpload t9
     li v0, __NR_flistxattr
@@ -22,4 +16,4 @@ flistxattr:
     j t9
     nop
     .set reorder
-    .end flistxattr
+END(flistxattr)

libc/arch-mips/syscalls/flock.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl flock
-    .align 4
-    .ent flock
+#include <private/bionic_asm.h>
 
-flock:
+ENTRY(flock)
     .set noreorder
     .cpload t9
     li v0, __NR_flock
@@ -22,4 +16,4 @@ flock:
     j t9
     nop
     .set reorder
-    .end flock
+END(flock)

libc/arch-mips/syscalls/fremovexattr.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl fremovexattr
-    .align 4
-    .ent fremovexattr
+#include <private/bionic_asm.h>
 
-fremovexattr:
+ENTRY(fremovexattr)
     .set noreorder
     .cpload t9
     li v0, __NR_fremovexattr
@@ -22,4 +16,4 @@ fremovexattr:
     j t9
     nop
     .set reorder
-    .end fremovexattr
+END(fremovexattr)

libc/arch-mips/syscalls/fsetxattr.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl fsetxattr
-    .align 4
-    .ent fsetxattr
+#include <private/bionic_asm.h>
 
-fsetxattr:
+ENTRY(fsetxattr)
     .set noreorder
     .cpload t9
     li v0, __NR_fsetxattr
@@ -22,4 +16,4 @@ fsetxattr:
     j t9
     nop
     .set reorder
-    .end fsetxattr
+END(fsetxattr)

libc/arch-mips/syscalls/fstat64.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl fstat64
-    .align 4
-    .ent fstat64
+#include <private/bionic_asm.h>
 
-fstat64:
+ENTRY(fstat64)
     .set noreorder
     .cpload t9
     li v0, __NR_fstat64
@@ -22,7 +16,7 @@ fstat64:
     j t9
     nop
     .set reorder
-    .end fstat64
+END(fstat64)
 
     .globl fstat
     .equ fstat, fstat64

libc/arch-mips/syscalls/fstatat64.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl fstatat64
-    .align 4
-    .ent fstatat64
+#include <private/bionic_asm.h>
 
-fstatat64:
+ENTRY(fstatat64)
     .set noreorder
     .cpload t9
     li v0, __NR_fstatat64
@@ -22,7 +16,7 @@ fstatat64:
     j t9
     nop
     .set reorder
-    .end fstatat64
+END(fstatat64)
 
     .globl fstatat
     .equ fstatat, fstatat64

libc/arch-mips/syscalls/fsync.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl fsync
-    .align 4
-    .ent fsync
+#include <private/bionic_asm.h>
 
-fsync:
+ENTRY(fsync)
     .set noreorder
     .cpload t9
     li v0, __NR_fsync
@@ -22,4 +16,4 @@ fsync:
     j t9
     nop
     .set reorder
-    .end fsync
+END(fsync)

libc/arch-mips/syscalls/ftruncate.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl ftruncate
-    .align 4
-    .ent ftruncate
+#include <private/bionic_asm.h>
 
-ftruncate:
+ENTRY(ftruncate)
     .set noreorder
     .cpload t9
     li v0, __NR_ftruncate
@@ -22,4 +16,4 @@ ftruncate:
     j t9
     nop
     .set reorder
-    .end ftruncate
+END(ftruncate)

libc/arch-mips/syscalls/ftruncate64.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl ftruncate64
-    .align 4
-    .ent ftruncate64
+#include <private/bionic_asm.h>
 
-ftruncate64:
+ENTRY(ftruncate64)
     .set noreorder
     .cpload t9
     li v0, __NR_ftruncate64
@@ -22,4 +16,4 @@ ftruncate64:
     j t9
     nop
     .set reorder
-    .end ftruncate64
+END(ftruncate64)

libc/arch-mips/syscalls/futex.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl futex
-    .align 4
-    .ent futex
+#include <private/bionic_asm.h>
 
-futex:
+ENTRY(futex)
     .set noreorder
     .cpload t9
     li v0, __NR_futex
@@ -22,4 +16,4 @@ futex:
     j t9
     nop
     .set reorder
-    .end futex
+END(futex)

libc/arch-mips/syscalls/getdents.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getdents
-    .align 4
-    .ent getdents
+#include <private/bionic_asm.h>
 
-getdents:
+ENTRY(getdents)
     .set noreorder
     .cpload t9
     li v0, __NR_getdents64
@@ -22,4 +16,4 @@ getdents:
     j t9
     nop
     .set reorder
-    .end getdents
+END(getdents)

libc/arch-mips/syscalls/getegid.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getegid
-    .align 4
-    .ent getegid
+#include <private/bionic_asm.h>
 
-getegid:
+ENTRY(getegid)
     .set noreorder
     .cpload t9
     li v0, __NR_getegid
@@ -22,4 +16,4 @@ getegid:
     j t9
     nop
     .set reorder
-    .end getegid
+END(getegid)

libc/arch-mips/syscalls/geteuid.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl geteuid
-    .align 4
-    .ent geteuid
+#include <private/bionic_asm.h>
 
-geteuid:
+ENTRY(geteuid)
     .set noreorder
     .cpload t9
     li v0, __NR_geteuid
@@ -22,4 +16,4 @@ geteuid:
     j t9
     nop
     .set reorder
-    .end geteuid
+END(geteuid)

libc/arch-mips/syscalls/getgid.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getgid
-    .align 4
-    .ent getgid
+#include <private/bionic_asm.h>
 
-getgid:
+ENTRY(getgid)
     .set noreorder
     .cpload t9
     li v0, __NR_getgid
@@ -22,4 +16,4 @@ getgid:
     j t9
     nop
     .set reorder
-    .end getgid
+END(getgid)

libc/arch-mips/syscalls/getgroups.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getgroups
-    .align 4
-    .ent getgroups
+#include <private/bionic_asm.h>
 
-getgroups:
+ENTRY(getgroups)
     .set noreorder
     .cpload t9
     li v0, __NR_getgroups
@@ -22,4 +16,4 @@ getgroups:
     j t9
     nop
     .set reorder
-    .end getgroups
+END(getgroups)

libc/arch-mips/syscalls/getitimer.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getitimer
-    .align 4
-    .ent getitimer
+#include <private/bionic_asm.h>
 
-getitimer:
+ENTRY(getitimer)
     .set noreorder
     .cpload t9
     li v0, __NR_getitimer
@@ -22,4 +16,4 @@ getitimer:
     j t9
     nop
     .set reorder
-    .end getitimer
+END(getitimer)

libc/arch-mips/syscalls/getpeername.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getpeername
-    .align 4
-    .ent getpeername
+#include <private/bionic_asm.h>
 
-getpeername:
+ENTRY(getpeername)
     .set noreorder
     .cpload t9
     li v0, __NR_getpeername
@@ -22,4 +16,4 @@ getpeername:
     j t9
     nop
     .set reorder
-    .end getpeername
+END(getpeername)

libc/arch-mips/syscalls/getpgid.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getpgid
-    .align 4
-    .ent getpgid
+#include <private/bionic_asm.h>
 
-getpgid:
+ENTRY(getpgid)
     .set noreorder
     .cpload t9
     li v0, __NR_getpgid
@@ -22,4 +16,4 @@ getpgid:
     j t9
     nop
     .set reorder
-    .end getpgid
+END(getpgid)

libc/arch-mips/syscalls/getpid.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getpid
-    .align 4
-    .ent getpid
+#include <private/bionic_asm.h>
 
-getpid:
+ENTRY(getpid)
     .set noreorder
     .cpload t9
     li v0, __NR_getpid
@@ -22,4 +16,4 @@ getpid:
     j t9
     nop
     .set reorder
-    .end getpid
+END(getpid)

libc/arch-mips/syscalls/getppid.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getppid
-    .align 4
-    .ent getppid
+#include <private/bionic_asm.h>
 
-getppid:
+ENTRY(getppid)
     .set noreorder
     .cpload t9
     li v0, __NR_getppid
@@ -22,4 +16,4 @@ getppid:
     j t9
     nop
     .set reorder
-    .end getppid
+END(getppid)

libc/arch-mips/syscalls/getresgid.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getresgid
-    .align 4
-    .ent getresgid
+#include <private/bionic_asm.h>
 
-getresgid:
+ENTRY(getresgid)
     .set noreorder
     .cpload t9
     li v0, __NR_getresgid
@@ -22,4 +16,4 @@ getresgid:
     j t9
     nop
     .set reorder
-    .end getresgid
+END(getresgid)

libc/arch-mips/syscalls/getresuid.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getresuid
-    .align 4
-    .ent getresuid
+#include <private/bionic_asm.h>
 
-getresuid:
+ENTRY(getresuid)
     .set noreorder
     .cpload t9
     li v0, __NR_getresuid
@@ -22,4 +16,4 @@ getresuid:
     j t9
     nop
     .set reorder
-    .end getresuid
+END(getresuid)

libc/arch-mips/syscalls/getrlimit.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getrlimit
-    .align 4
-    .ent getrlimit
+#include <private/bionic_asm.h>
 
-getrlimit:
+ENTRY(getrlimit)
     .set noreorder
     .cpload t9
     li v0, __NR_getrlimit
@@ -22,4 +16,4 @@ getrlimit:
     j t9
     nop
     .set reorder
-    .end getrlimit
+END(getrlimit)

libc/arch-mips/syscalls/getrusage.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getrusage
-    .align 4
-    .ent getrusage
+#include <private/bionic_asm.h>
 
-getrusage:
+ENTRY(getrusage)
     .set noreorder
     .cpload t9
     li v0, __NR_getrusage
@@ -22,4 +16,4 @@ getrusage:
     j t9
     nop
     .set reorder
-    .end getrusage
+END(getrusage)

libc/arch-mips/syscalls/getsid.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getsid
-    .align 4
-    .ent getsid
+#include <private/bionic_asm.h>
 
-getsid:
+ENTRY(getsid)
     .set noreorder
     .cpload t9
     li v0, __NR_getsid
@@ -22,4 +16,4 @@ getsid:
     j t9
     nop
     .set reorder
-    .end getsid
+END(getsid)

libc/arch-mips/syscalls/getsockname.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getsockname
-    .align 4
-    .ent getsockname
+#include <private/bionic_asm.h>
 
-getsockname:
+ENTRY(getsockname)
     .set noreorder
     .cpload t9
     li v0, __NR_getsockname
@@ -22,4 +16,4 @@ getsockname:
     j t9
     nop
     .set reorder
-    .end getsockname
+END(getsockname)

libc/arch-mips/syscalls/getsockopt.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getsockopt
-    .align 4
-    .ent getsockopt
+#include <private/bionic_asm.h>
 
-getsockopt:
+ENTRY(getsockopt)
     .set noreorder
     .cpload t9
     li v0, __NR_getsockopt
@@ -22,4 +16,4 @@ getsockopt:
     j t9
     nop
     .set reorder
-    .end getsockopt
+END(getsockopt)

libc/arch-mips/syscalls/gettid.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl gettid
-    .align 4
-    .ent gettid
+#include <private/bionic_asm.h>
 
-gettid:
+ENTRY(gettid)
     .set noreorder
     .cpload t9
     li v0, __NR_gettid
@@ -22,4 +16,4 @@ gettid:
     j t9
     nop
     .set reorder
-    .end gettid
+END(gettid)

libc/arch-mips/syscalls/gettimeofday.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl gettimeofday
-    .align 4
-    .ent gettimeofday
+#include <private/bionic_asm.h>
 
-gettimeofday:
+ENTRY(gettimeofday)
     .set noreorder
     .cpload t9
     li v0, __NR_gettimeofday
@@ -22,4 +16,4 @@ gettimeofday:
     j t9
     nop
     .set reorder
-    .end gettimeofday
+END(gettimeofday)

libc/arch-mips/syscalls/getuid.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getuid
-    .align 4
-    .ent getuid
+#include <private/bionic_asm.h>
 
-getuid:
+ENTRY(getuid)
     .set noreorder
     .cpload t9
     li v0, __NR_getuid
@@ -22,4 +16,4 @@ getuid:
     j t9
     nop
     .set reorder
-    .end getuid
+END(getuid)

libc/arch-mips/syscalls/getxattr.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl getxattr
-    .align 4
-    .ent getxattr
+#include <private/bionic_asm.h>
 
-getxattr:
+ENTRY(getxattr)
     .set noreorder
     .cpload t9
     li v0, __NR_getxattr
@@ -22,4 +16,4 @@ getxattr:
     j t9
     nop
     .set reorder
-    .end getxattr
+END(getxattr)

libc/arch-mips/syscalls/init_module.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl init_module
-    .align 4
-    .ent init_module
+#include <private/bionic_asm.h>
 
-init_module:
+ENTRY(init_module)
     .set noreorder
     .cpload t9
     li v0, __NR_init_module
@@ -22,4 +16,4 @@ init_module:
     j t9
     nop
     .set reorder
-    .end init_module
+END(init_module)

libc/arch-mips/syscalls/inotify_add_watch.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl inotify_add_watch
-    .align 4
-    .ent inotify_add_watch
+#include <private/bionic_asm.h>
 
-inotify_add_watch:
+ENTRY(inotify_add_watch)
     .set noreorder
     .cpload t9
     li v0, __NR_inotify_add_watch
@@ -22,4 +16,4 @@ inotify_add_watch:
     j t9
     nop
     .set reorder
-    .end inotify_add_watch
+END(inotify_add_watch)

libc/arch-mips/syscalls/inotify_init1.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl inotify_init1
-    .align 4
-    .ent inotify_init1
+#include <private/bionic_asm.h>
 
-inotify_init1:
+ENTRY(inotify_init1)
     .set noreorder
     .cpload t9
     li v0, __NR_inotify_init1
@@ -22,4 +16,4 @@ inotify_init1:
     j t9
     nop
     .set reorder
-    .end inotify_init1
+END(inotify_init1)

libc/arch-mips/syscalls/inotify_rm_watch.S

@@ -1,14 +1,8 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <machine/asm.h>
-#include <machine/regdef.h>
-    .text
-    .globl inotify_rm_watch
-    .align 4
-    .ent inotify_rm_watch
+#include <private/bionic_asm.h>
 
-inotify_rm_watch:
+ENTRY(inotify_rm_watch)
     .set noreorder
     .cpload t9
     li v0, __NR_inotify_rm_watch
@@ -22,4 +16,4 @@ inotify_rm_watch:
     j t9
     nop
     .set reorder
-    .end inotify_rm_watch
+END(inotify_rm_watch)