commit 22ade3c30d83407d19cd3a2b49ead66e6c5e3cf0
author Elliott Hughes <enh@google.com> Fri May 16 18:00:51 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 16 18:00:51 2014 +0000
tree 88fe1b0524d4ea18ac31ff68f8a30b412aac8794
parent 2a60227223da700e4ae1b5436f61aea99fc7a5aa
parent 879180c3ac6e532d76a8fc663718b1e3c75bc419

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

libc/arch-arm64/bionic/futex_arm64.S

diff --git a/libc/arch-arm64/bionic/futex_arm64.S b/libc/arch-arm64/bionic/futex_arm64.S
index d452771..5a47826 100644
--- a/libc/arch-arm64/bionic/futex_arm64.S
+++ b/libc/arch-arm64/bionic/futex_arm64.S
@@ -51,7 +51,7 @@
 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 @@
 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
 

libc/arch-x86_64/bionic/futex_x86_64.S

diff --git a/libc/arch-x86_64/bionic/futex_x86_64.S b/libc/arch-x86_64/bionic/futex_x86_64.S
index f85d583..25cdf1b 100644
--- a/libc/arch-x86_64/bionic/futex_x86_64.S
+++ b/libc/arch-x86_64/bionic/futex_x86_64.S
@@ -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 @@
 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