From ac33b731d214d79738ca04d27f7464d4482f6a01 Mon Sep 17 00:00:00 2001 From: Jiong Wang Date: Thu, 10 Nov 2016 09:25:17 +0000 Subject: [PATCH] [AArch64] Bind defined symbol locally in PIE bfd/ PR target/20737 * elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Bind defined symbol locally in PIE. ld/ * testsuite/ld-aarch64/pie-bind-locally-a.s: New test source. * testsuite/ld-aarch64/pie-bind-locally-b.s: Likewise. * testsuite/ld-aarch64/pie-bind-locally.d: New testcase. * testsuite/ld-aarch64/aarch64-elf.exp: Run new testcase. --- bfd/ChangeLog | 6 ++++++ bfd/elfnn-aarch64.c | 3 ++- ld/ChangeLog | 8 ++++++++ ld/testsuite/ld-aarch64/aarch64-elf.exp | 2 ++ ld/testsuite/ld-aarch64/pie-bind-locally-a.s | 5 +++++ ld/testsuite/ld-aarch64/pie-bind-locally-b.s | 6 ++++++ ld/testsuite/ld-aarch64/pie-bind-locally.d | 9 +++++++++ 7 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 ld/testsuite/ld-aarch64/pie-bind-locally-a.s create mode 100644 ld/testsuite/ld-aarch64/pie-bind-locally-b.s create mode 100644 ld/testsuite/ld-aarch64/pie-bind-locally.d diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 9fd5841136d..9d97c64d356 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2016-11-10 Jiong Wang + + PR target/20737 + * elfnn-aarch64.c (elfNN_aarch64_final_link_relocate): Bind defined + symbol locally in PIE. + 2016-11-08 Pedro Alves * dwarf2.c (struct funcinfo) : Type is bfd_boolean, diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 544a8ea19df..4ebdbe20d71 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -5193,7 +5193,8 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, else if (h != NULL && h->dynindx != -1 && (!bfd_link_pic (info) - || !SYMBOLIC_BIND (info, h) + || !(bfd_link_pie (info) + || SYMBOLIC_BIND (info, h)) || !h->def_regular)) outrel.r_info = ELFNN_R_INFO (h->dynindx, r_type); else diff --git a/ld/ChangeLog b/ld/ChangeLog index 9d04123a2f1..e1cdb05dbcd 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,11 @@ +2016-11-10 Jiong Wang + + PR target/20737 + * testsuite/ld-aarch64/pie-bind-locally-a.s: New test source. + * testsuite/ld-aarch64/pie-bind-locally-b.s: Likewise. + * testsuite/ld-aarch64/pie-bind-locally.d: New testcase. + * testsuite/ld-aarch64/aarch64-elf.exp: Run new testcase. + 2016-11-07 Nick Clifton PR ld/20784 diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp index ab84f01258d..d4d7f5a0b8f 100644 --- a/ld/testsuite/ld-aarch64/aarch64-elf.exp +++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp @@ -287,6 +287,8 @@ run_dump_test "rela-abs-relative" run_dump_test "rela-abs-relative-be" run_dump_test "rela-abs-relative-opt" +run_dump_test "pie-bind-locally" + set aarch64elflinktests { {"ld-aarch64/so with global symbol" "-shared" "" "" {copy-reloc-so.s} {} "copy-reloc-so.so"} diff --git a/ld/testsuite/ld-aarch64/pie-bind-locally-a.s b/ld/testsuite/ld-aarch64/pie-bind-locally-a.s new file mode 100644 index 00000000000..f64d48de5ac --- /dev/null +++ b/ld/testsuite/ld-aarch64/pie-bind-locally-a.s @@ -0,0 +1,5 @@ + .text + .align 2 + .global _start +_start: + ldr x0, [x0, #:got_lo12:_start] diff --git a/ld/testsuite/ld-aarch64/pie-bind-locally-b.s b/ld/testsuite/ld-aarch64/pie-bind-locally-b.s new file mode 100644 index 00000000000..6083941e0f3 --- /dev/null +++ b/ld/testsuite/ld-aarch64/pie-bind-locally-b.s @@ -0,0 +1,6 @@ + .section .data.rel,"aw",%progbits + .align 3 + .type q, %object + .size q, 8 +q: + .xword _start diff --git a/ld/testsuite/ld-aarch64/pie-bind-locally.d b/ld/testsuite/ld-aarch64/pie-bind-locally.d new file mode 100644 index 00000000000..3689543a9fa --- /dev/null +++ b/ld/testsuite/ld-aarch64/pie-bind-locally.d @@ -0,0 +1,9 @@ +#source: pie-bind-locally-a.s +#source: pie-bind-locally-b.s +#ld: -pie +#readelf: -Wr + +Relocation section '\.rela\.dyn' at offset .* contains 2 entries: +[ ]+Offset[ ]+Info[ ]+Type[ ]+.* +[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_AARCH64_RELATIVE[ ].* +[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_AARCH64_RELATIVE[ ].* -- 2.30.2