diff options
| author | Elliott Hughes <enh@google.com> | 2014-02-19 16:53:20 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-02-20 13:51:26 -0800 |
| commit | 851e68a2402fa414544e66650e09dfdaac813e51 (patch) | |
| tree | baec353c8e9b6f24e885459b20a8748fc5c39468 /libc/arch-mips/bionic/futex_mips.S | |
| parent | 22c6b7ffd36fe8b34b677eea94d00aef2624e4e8 (diff) | |
| download | bionic-851e68a2402fa414544e66650e09dfdaac813e51.zip bionic-851e68a2402fa414544e66650e09dfdaac813e51.tar.gz bionic-851e68a2402fa414544e66650e09dfdaac813e51.tar.bz2 | |
Unify our assembler macros.
Our <machine/asm.h> files were modified from upstream, to the extent
that no architecture was actually using the upstream ENTRY or END macros,
assuming that architecture even had such a macro upstream. This patch moves
everyone to the same macros, with just a few tweaks remaining in the
<machine/asm.h> files, which no one should now use directly.
I've removed most of the unused cruft from the <machine/asm.h> files, though
there's still rather a lot in the mips/mips64 ones.
Bug: 12229603
Change-Id: I2fff287dc571ac1087abe9070362fb9420d85d6d
Diffstat (limited to 'libc/arch-mips/bionic/futex_mips.S')
| -rw-r--r-- | libc/arch-mips/bionic/futex_mips.S | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/libc/arch-mips/bionic/futex_mips.S b/libc/arch-mips/bionic/futex_mips.S index 285beac..7626a7c 100644 --- a/libc/arch-mips/bionic/futex_mips.S +++ b/libc/arch-mips/bionic/futex_mips.S @@ -32,11 +32,7 @@ #define FUTEX_WAKE 1 // int __futex_wait(volatile void* ftx, int val, const struct timespec* timeout) - .type __futex_wait, @function - .global __futex_wait - .align 4 - .ent __futex_wait -__futex_wait: +ENTRY(__futex_wait) subu sp,4*6 sw $0,20(sp) /* val3 */ sw $0,16(sp) /* addr2 */ @@ -54,14 +50,10 @@ __futex_wait: .set reorder addu sp,4*6 j ra - .end __futex_wait +END(__futex_wait) // int __futex_wake(volatile void* ftx, int count) - .type __futex_wake, @function - .globl __futex_wake - .align 4 - .ent __futex_wake -__futex_wake: +ENTRY(__futex_wake) subu sp,4*6 sw $0,20(sp) /* val3 */ sw $0,16(sp) /* addr2 */ @@ -79,14 +71,10 @@ __futex_wake: .set reorder addu sp,4*6 j ra - .end __futex_wake +END(__futex_wake) // int __futex_syscall3(volatile void* ftx, int op, int count) - .type __futex_syscall3, @function - .global __futex_syscall3 - .align 4 - .ent __futex_syscall3 -__futex_syscall3: +ENTRY(__futex_syscall3) subu sp,4*6 sw $0,20(sp) /* val3 */ sw $0,16(sp) /* addr2 */ @@ -104,14 +92,10 @@ __futex_syscall3: .set reorder addu sp,4*6 j ra - .end __futex_syscall3 +END(__futex_syscall3) // int __futex_syscall4(volatile void* ftx, int op, int val, const struct timespec* timeout) - .type __futex_syscall4, @function - .global __futex_syscall4 - .align 4 - .ent __futex_syscall4 -__futex_syscall4: +ENTRY(__futex_syscall4) subu sp,4*6 sw $0,20(sp) /* val3 */ sw $0,16(sp) /* addr2 */ @@ -129,4 +113,4 @@ __futex_syscall4: .set reorder addu sp,4*6 j ra - .end __futex_syscall4 +END(__futex_syscall4) |