generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 9700b6ca: am 22ade3c3: Merge "With libstdc++ in libc, __futex_wait and __futex_wake can be hidden."

Browse Source 
* commit '9700b6ca97736062348469a83ede28dc1310d2db':
  With libstdc++ in libc, __futex_wait and __futex_wake can be hidden.
This commit is contained in:
Elliott Hughes 2014-05-16 18:07:04 +00:00 committed by Android Git Automerger
commit 0178eba213
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libc/arch-arm64/bionic/futex_arm64.S
View File

@ -51,7 +51,7 @@ ENTRY(__futex_syscall3)
END(__futex_syscall3) END(__futex_syscall3)
// int __futex_wait(volatile void* ftx, int val, const struct timespec* timeout) // int __futex_wait(volatile void* ftx, int val, const struct timespec* timeout)
ENTRY(__futex_wait) ENTRY_PRIVATE(__futex_wait)
stp x29, x30, [sp, #-16]! stp x29, x30, [sp, #-16]!
mov x29, sp mov x29, sp
@ -69,7 +69,7 @@ ENTRY(__futex_wait)
END(__futex_wait) END(__futex_wait)
// int __futex_wake(volatile void* ftx, int count) // int __futex_wake(volatile void* ftx, int count)
ENTRY(__futex_wake) ENTRY_PRIVATE(__futex_wake)
stp x29, x30, [sp, #-16]! stp x29, x30, [sp, #-16]!
mov x29, sp mov x29, sp

4
libc/arch-x86_64/bionic/futex_x86_64.S
View File

@ -32,7 +32,7 @@
#define FUTEX_WAKE 1 #define FUTEX_WAKE 1
// int __futex_wait(volatile void* ftx, int val, const struct timespec* timeout) // int __futex_wait(volatile void* ftx, int val, const struct timespec* timeout)
ENTRY(__futex_wait) ENTRY_PRIVATE(__futex_wait)
mov %rdx, %r10 /* timeout */ mov %rdx, %r10 /* timeout */
mov %esi, %edx /* val */ mov %esi, %edx /* val */
mov $FUTEX_WAIT, %esi /* op */ mov $FUTEX_WAIT, %esi /* op */
@ -42,7 +42,7 @@ ENTRY(__futex_wait)
END(__futex_wait) END(__futex_wait)
// int __futex_wake(volatile void* ftx, int count) // int __futex_wake(volatile void* ftx, int count)
ENTRY(__futex_wake) ENTRY_PRIVATE(__futex_wake)
mov %esi, %edx mov %esi, %edx
mov $FUTEX_WAKE, %esi mov $FUTEX_WAKE, %esi
mov $__NR_futex, %eax mov $__NR_futex, %eax