diff options
| author | David Lamparter <equinox-gentoo@diac24.net> | 2013-08-16 15:06:34 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-02-09 09:59:12 -0500 |
| commit | 6d234be2fbd744d252c17cc1ee79010f3b3d88dc (patch) | |
| tree | 359cb2ecc967e309e21c2581cf8604736cacb53d | |
| parent | 0106d3b598e45ba1332f3198edd20d4119d36d0c (diff) | |
| download | glibc-6d234be2fbd744d252c17cc1ee79010f3b3d88dc.tar glibc-6d234be2fbd744d252c17cc1ee79010f3b3d88dc.tar.gz glibc-6d234be2fbd744d252c17cc1ee79010f3b3d88dc.tar.bz2 glibc-6d234be2fbd744d252c17cc1ee79010f3b3d88dc.zip | |
arm: fix PIC vs SHARED typos
the logic in setjmp/__longjmp incorrectly tie to "PIC" to figure out
whether the code is going into a shared library when it should be using
"SHARED". otherwise, building static PIC code goes wrong.
https://bugs.gentoo.org/336914
http://sourceware.org/ml/libc-ports/2011-09/msg00018.html
2011-09-19 David Lamparter <equinox-gentoo@diac24.net>
* sysdeps/arm/setjmp.S: Change PIC to SHARED.
* sysdeps/arm/__longjmp.S: Likewise
| -rw-r--r-- | sysdeps/arm/__longjmp.S | 2 | ||||
| -rw-r--r-- | sysdeps/arm/setjmp.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/arm/__longjmp.S b/sysdeps/arm/__longjmp.S index fc60a5d424..1033e134cd 100644 --- a/sysdeps/arm/__longjmp.S +++ b/sysdeps/arm/__longjmp.S @@ -81,7 +81,7 @@ ENTRY (__longjmp) C_SYMBOL_NAME(_rtld_local_ro) \ + RTLD_GLOBAL_RO_DL_HWCAP_OFFSET) # else -# ifdef PIC +# ifdef SHARED LDR_GLOBAL (a4, a3, C_SYMBOL_NAME(_rtld_global_ro), \ RTLD_GLOBAL_RO_DL_HWCAP_OFFSET) # else diff --git a/sysdeps/arm/setjmp.S b/sysdeps/arm/setjmp.S index e44beb45a8..be0a4ecba8 100644 --- a/sysdeps/arm/setjmp.S +++ b/sysdeps/arm/setjmp.S @@ -62,7 +62,7 @@ ENTRY (__sigsetjmp) C_SYMBOL_NAME(_rtld_local_ro) \ + RTLD_GLOBAL_RO_DL_HWCAP_OFFSET) # else -# ifdef PIC +# ifdef SHARED LDR_GLOBAL (a3, a4, C_SYMBOL_NAME(_rtld_global_ro), \ RTLD_GLOBAL_RO_DL_HWCAP_OFFSET) # else |