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

diff --git a/sysdeps/arm/__longjmp.S b/sysdeps/arm/__longjmp.S
index fc60a5d42410015f8073a2c69d1eea6adfbdf0b9..1033e134cd28ae8aa8d50041fd5dc76638504b3b 100644 (file)
--- 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 e44beb45a8030e2740d0560d74750063ade21834..be0a4ecba8606d512774971066e16dba3fcddbee 100644 (file)
--- 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