diff options
| author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2015-07-27 11:48:48 +0100 |
|---|---|---|
| committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2015-07-27 11:48:48 +0100 |
| commit | 32f573bcb3aaa1c9defcad79dbb5851fcc02ae2d (patch) | |
| tree | af0f7a43f27080ec94da5a622c47f0b76fd02478 | |
| parent | b68a20d6675f1360ea4db50a9835c073675b9889 (diff) | |
| download | binutils-gdb-32f573bcb3aaa1c9defcad79dbb5851fcc02ae2d.tar.gz | |
[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.
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elfnn-aarch64.c | 1 | ||||
| -rw-r--r-- | ld/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/aarch64-elf.exp | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/protected-data.d | 4 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/protected-data.s | 18 |
6 files changed, 36 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 553b8c92d6d..afe2f0fa3ce 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,6 +1,11 @@ 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 * elf32-arm.c (elf_backend_extern_protected_data): Define. 2015-07-25 H.J. Lu <hongjiu.lu@intel.com> diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 3471d7e0948..97122535d27 100644 --- 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 734fe69cddf..db1302ff350 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,6 +1,13 @@ 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 * ld-arm/protected-data.d: New. * ld-arm/protected-data.s: New. * ld-arm/arm-elf.exp: Add new test. diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp index de3dcf7f02c..ab2fa49d815 100644 --- 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 index 00000000000..df106dc9519 --- /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 index 00000000000..4878f05ef3c --- /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 |