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 27d1b713de20a9325e11637687b109fecb376f8e..351fc6201ec2069f50b1a96bbf868fe1cb97f2f8 100644 (file)
--- a/sysdeps/arm/__longjmp.S
+++ b/sysdeps/arm/__longjmp.S
@@ -83,7 +83,7 @@ ENTRY (__longjmp)
        add     a4, a4, a3
        ldr     a4, [a4, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET]
 # else
-#  ifdef PIC
+#  ifdef SHARED
        ldr     a4, 1f
        ldr     a3, .Lrtld_global_ro
 0:     add     a4, pc, a4
@@ -144,7 +144,7 @@ ENTRY (__longjmp)
 .Lrtld_local_ro:
        .long   C_SYMBOL_NAME(_rtld_local_ro)(GOTOFF)
 # else
-#  ifdef PIC
+#  ifdef SHARED
 1:     .long   _GLOBAL_OFFSET_TABLE_ - 0b - PC_OFS
 .Lrtld_global_ro:
        .long   C_SYMBOL_NAME(_rtld_global_ro)(GOT)

diff --git a/sysdeps/arm/setjmp.S b/sysdeps/arm/setjmp.S
index 17a16c9b5dd9ea148cf5ba20ae1b0183bcee583b..cf4ff861faa33083ed44dfc29d710c054f63c086 100644 (file)
--- a/sysdeps/arm/setjmp.S
+++ b/sysdeps/arm/setjmp.S
@@ -64,7 +64,7 @@ ENTRY (__sigsetjmp)
        add     a3, a3, a4
        ldr     a3, [a3, #RTLD_GLOBAL_RO_DL_HWCAP_OFFSET]
 # else
-#  ifdef PIC
+#  ifdef SHARED
        ldr     a3, 1f
        ldr     a4, .Lrtld_global_ro
 0:     add     a3, pc, a3
@@ -120,7 +120,7 @@ ENTRY (__sigsetjmp)
 .Lrtld_local_ro:
        .long   C_SYMBOL_NAME(_rtld_local_ro)(GOTOFF)
 # else
-#  ifdef PIC
+#  ifdef SHARED
 1:     .long   _GLOBAL_OFFSET_TABLE_ - 0b - PC_OFS
 .Lrtld_global_ro:
        .long   C_SYMBOL_NAME(_rtld_global_ro)(GOT)