[AArch64] 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
	* elfnn-aarch64.c (elf_backend_extern_protected_data): Define.

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

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 553b8c92d6dd117926f5bde042092f68be8be5e2..afe2f0fa3ce6b712838b21461a2dfe73fd526edd 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-27  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+       PR ld/18705
+       * elfnn-aarch64.c (elf_backend_extern_protected_data): Define.
+
 2015-07-27  Szabolcs Nagy  <szabolcs.nagy@arm.com>
 
        PR ld/18705

diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 3471d7e0948445217ac99b8cdc46a5f27fc52754..97122535d27a774a17cf9dddceed185d1197850f 100644 (file)
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -8655,6 +8655,7 @@ const struct elf_size_info elfNN_aarch64_size_info =
 #define elf_backend_rela_normal        1
 #define elf_backend_got_header_size (GOT_ENTRY_SIZE * 3)
 #define elf_backend_default_execstack  0
+#define elf_backend_extern_protected_data 1
 
 #undef  elf_backend_obj_attrs_section
 #define elf_backend_obj_attrs_section          ".ARM.attributes"

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 734fe69cddffc6f59837a40e7139018473132995..db1302ff35056d46f2c350f0d49b0991b5611270 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-aarch64/protected-data.d: New.
+       * ld-aarch64/protected-data.s: New.
+       * ld-aarch64/aarch64-elf.exp: Add new test.
+
 2015-07-27  Szabolcs Nagy  <szabolcs.nagy@arm.com>
 
        PR ld/18705

diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
index de3dcf7f02cb38f3c1c582254e3afb610f376504..ab2fa49d8158d55c9facd35bbff8a4f7d4e86db0 100644 (file)
--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp
+++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp
@@ -157,6 +157,7 @@ run_dump_test "gc-relocs-257"
 run_dump_test "pr17415"
 run_dump_test "tprel_g2_overflow"
 run_dump_test "tprel_add_lo12_overflow"
+run_dump_test "protected-data"
 
 # ifunc tests
 run_dump_test "ifunc-1"

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

diff --git a/ld/testsuite/ld-aarch64/protected-data.s b/ld/testsuite/ld-aarch64/protected-data.s
new file mode 100644 (file)
index 0000000..4878f05
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/protected-data.s
@@ -0,0 +1,18 @@
+       .data
+       .protected      var
+       .global var
+       .align  2
+       .type   var, %object
+       .size   var, 4
+var:
+       .word   1
+
+       .text
+       .align  2
+       .global getaddr
+       .type   getaddr, %function
+getaddr:
+       adrp    x0, :got:var
+       ldr     x0, [x0, #:got_lo12:var]
+       ret
+       .size   getaddr, .-getaddr