[ARM] Fix extern protected data handling

Emit *GLOB_DAT instead of *RELATIVE relocs for protected data
in shared objects.

This is needed for the fix of glibc bug 17711:
https://sourceware.org/bugzilla/show_bug.cgi?id=17711

bfd:
	PR ld/18705
	* elf32-arm.c (elf_backend_extern_protected_data): Define.

ld/testsuite:
	PR ld/18705
	* ld-arm/protected-data.d: New.
	* ld-arm/protected-data.s: New.
	* ld-arm/arm-elf.exp: Add new test.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1d1a1d28c10c6358be31c39fbab90a383782b6de..553b8c92d6dd117926f5bde042092f68be8be5e2 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-27  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+       PR ld/18705
+       * elf32-arm.c (elf_backend_extern_protected_data): Define.
+
 2015-07-25  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/18718

diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 367dff38c0d8398d227cf66e06b6d01b4b716198..ff69728729765f0f64446b3c8fd8d13b8ae5b3c2 100644 (file)
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -16236,6 +16236,7 @@ elf32_arm_get_synthetic_symtab (bfd *abfd,
 #define elf_backend_default_use_rela_p 0
 
 #define elf_backend_got_header_size    12
+#define elf_backend_extern_protected_data 1
 
 #undef  elf_backend_obj_attrs_vendor
 #define elf_backend_obj_attrs_vendor           "aeabi"

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index de0ad1b3f5ca8c4eb6bba80f4d294f841b5061ea..734fe69cddffc6f59837a40e7139018473132995 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-27  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+       PR ld/18705
+       * ld-arm/protected-data.d: New.
+       * ld-arm/protected-data.s: New.
+       * ld-arm/arm-elf.exp: Add new test.
+
 2015-07-26  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/18718

diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp
index 28b41ca4a6107624cfc2005dbaa7f48ac64b0efe..882f5cb99e823e27bdb58d18a9265d0ed9376fe4 100644 (file)
--- a/ld/testsuite/ld-arm/arm-elf.exp
+++ b/ld/testsuite/ld-arm/arm-elf.exp
@@ -904,3 +904,4 @@ if { ![istarget "arm*-*-nacl*"] } {
 }
 run_dump_test "unresolved-2"
 run_dump_test "gc-hidden-1"
+run_dump_test "protected-data"

diff --git a/ld/testsuite/ld-arm/protected-data.d b/ld/testsuite/ld-arm/protected-data.d
new file mode 100644 (file)
index 0000000..51c51c6
--- /dev/null
+++ b/ld/testsuite/ld-arm/protected-data.d
@@ -0,0 +1,4 @@
+#ld: -shared
+#readelf: -r -W
+#...
+.* R_ARM_GLOB_DAT .* var.*

diff --git a/ld/testsuite/ld-arm/protected-data.s b/ld/testsuite/ld-arm/protected-data.s
new file mode 100644 (file)
index 0000000..8c8072d
--- /dev/null
+++ b/ld/testsuite/ld-arm/protected-data.s
@@ -0,0 +1,29 @@
+       .syntax unified
+
+       .data
+       .protected      var
+       .global var
+       .align  2
+       .type   var, %object
+       .size   var, 4
+var:
+       .word   1
+
+       .text
+       .align  2
+       .global getaddr
+       .thumb
+       .thumb_func
+       .type   getaddr, %function
+getaddr:
+       ldr     r3, 2f
+       ldr     r2, 2f+4
+1:
+       add     r3, pc
+       ldr     r0, [r3, r2]
+       bx      lr
+       .align  2
+2:
+       .word   _GLOBAL_OFFSET_TABLE_-(1b+4)
+       .word   var(GOT)
+       .size   getaddr, .-getaddr