pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

With libstdc++ in libc, __futex_wait and __futex_wake can be hidden. 

This patch is conservative and just touches LP64. (But not because we
know of anyone using this in LP32.)

Bug: 13367666
Change-Id: Id45652debc4534584479b16b501401f6f23acea9
This commit is contained in:
Elliott Hughes 2014-05-14 18:22:58 -07:00
parent bc7f8a791b
commit 879180c3ac
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)
// int __futex_wait(volatile void* ftx, int val, const struct timespec* timeout)
ENTRY(__futex_wait)
ENTRY_PRIVATE(__futex_wait)
stp x29, x30, [sp, #-16]!
mov x29, sp
@ -69,7 +69,7 @@ ENTRY(__futex_wait)
END(__futex_wait)
// int __futex_wake(volatile void* ftx, int count)
ENTRY(__futex_wake)
ENTRY_PRIVATE(__futex_wake)
stp x29, x30, [sp, #-16]!
mov x29, sp

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

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