diff options
| author | Elliott Hughes <enh@google.com> | 2014-09-08 15:25:01 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-09-08 16:46:50 -0700 |
| commit | 011e111d299284b65af07add523a9dccac356244 (patch) | |
| tree | 2b30ac16dffb0cda5da6de86f73075813447ee5b /libc/arch-arm/bionic | |
| parent | 201f36d23bb778b29c8d305fa40a41990e0487bc (diff) | |
| download | bionic-011e111d299284b65af07add523a9dccac356244.zip bionic-011e111d299284b65af07add523a9dccac356244.tar.gz bionic-011e111d299284b65af07add523a9dccac356244.tar.bz2 | |
Ensure __set_errno is still visible on LP32.
The use of the .hidden directive to avoid going via the PLT for
__set_errno had the side-effect of actually making __set_errno
hidden (which is odd because assembler directives don't usually
affect symbols defined in a different file --- you can't even
create a weak reference to a symbol that's defined in a different
file).
This change switches the system call stubs over to a new always-hidden
__set_errno_internal and has a visible __set_errno on LP32 just for
binary compatibility with old NDK apps.
(cherry-pick of 7efad83d430f4d824f2aaa75edea5106f6ff8aae.)
Bug: 17423135
Change-Id: I6b6d7a05dda85f923d22e5ffd169a91e23499b7b
Diffstat (limited to 'libc/arch-arm/bionic')
| -rw-r--r-- | libc/arch-arm/bionic/__bionic_clone.S | 2 | ||||
| -rw-r--r-- | libc/arch-arm/bionic/syscall.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libc/arch-arm/bionic/__bionic_clone.S b/libc/arch-arm/bionic/__bionic_clone.S index 48f2f98..f5cf9e0 100644 --- a/libc/arch-arm/bionic/__bionic_clone.S +++ b/libc/arch-arm/bionic/__bionic_clone.S @@ -57,7 +57,7 @@ ENTRY(__bionic_clone) cmn r0, #(MAX_ERRNO + 1) bxls lr neg r0, r0 - b __set_errno + b __set_errno_internal 1: # The child. # Setting lr to 0 will make the unwinder stop at __start_thread diff --git a/libc/arch-arm/bionic/syscall.S b/libc/arch-arm/bionic/syscall.S index 8647718..d0df379 100644 --- a/libc/arch-arm/bionic/syscall.S +++ b/libc/arch-arm/bionic/syscall.S @@ -47,5 +47,5 @@ ENTRY(syscall) cmn r0, #(MAX_ERRNO + 1) bxls lr neg r0, r0 - b __set_errno + b __set_errno_internal END(syscall) |