From 879180c3ac6e532d76a8fc663718b1e3c75bc419 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 14 May 2014 18:22:58 -0700 Subject: [PATCH] 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 --- libc/arch-arm64/bionic/futex_arm64.S | 4 ++-- libc/arch-x86_64/bionic/futex_x86_64.S | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libc/arch-arm64/bionic/futex_arm64.S b/libc/arch-arm64/bionic/futex_arm64.S index d452771ee..5a478261a 100644 --- a/libc/arch-arm64/bionic/futex_arm64.S +++ b/libc/arch-arm64/bionic/futex_arm64.S @@ -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 diff --git a/libc/arch-x86_64/bionic/futex_x86_64.S b/libc/arch-x86_64/bionic/futex_x86_64.S index f85d583bd..25cdf1bb5 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 @@ 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