From f69e49203b49b7353748b78a9d8111440d9ac291 Mon Sep 17 00:00:00 2001 From: Jiong Wang Date: Tue, 11 Aug 2015 17:05:34 +0100 Subject: [PATCH] [AArch64][3/8] LD support BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21 2015-08-11 Jiong Wang bfd/ * elfnn-aarch64.c (IS_AARCH64_TLS_RELOC): Recognize BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21. (aarch64_reloc_got_type): Likewise. (elfNN_aarch64_final_link_relocate): Likewise. (elfNN_aarch64_relocate_section): Likewise. (elfNN_aarch64_gc_sweep_hook): Likewise. (elfNN_aarch64_check_relocs): Likewise. * elfxx-aarch64.c (_bfd_aarch64_elf_put_addend): Likewise. (_bfd_aarch64_elf_resolve_relocation): Likewise. ld/testsuite/ * ld-aarch64/tls-small-ld.s: New file. * ld-aarch64/tls-small-ld.d: Likewise. * ld-aarch64/aarch64-elf.exp: Run new test. --- bfd/ChangeLog | 12 ++++++++++++ bfd/elfnn-aarch64.c | 13 +++++++++++-- bfd/elfxx-aarch64.c | 2 ++ ld/testsuite/ChangeLog | 6 ++++++ ld/testsuite/ld-aarch64/aarch64-elf.exp | 1 + ld/testsuite/ld-aarch64/tls-small-ld.d | 9 +++++++++ ld/testsuite/ld-aarch64/tls-small-ld.s | 7 +++++++ 7 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 ld/testsuite/ld-aarch64/tls-small-ld.d create mode 100644 ld/testsuite/ld-aarch64/tls-small-ld.s diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 666b3cd..01a29c8 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,17 @@ 2015-08-11 Jiong Wang + * elfnn-aarch64.c (IS_AARCH64_TLS_RELOC): Recognize + BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21. + (aarch64_reloc_got_type): Likewise. + (elfNN_aarch64_final_link_relocate): Likewise. + (elfNN_aarch64_relocate_section): Likewise. + (elfNN_aarch64_gc_sweep_hook): Likewise. + (elfNN_aarch64_check_relocs): Likewise. + * elfxx-aarch64.c (_bfd_aarch64_elf_put_addend): Likewise. + (_bfd_aarch64_elf_resolve_relocation): Likewise. + +2015-08-11 Jiong Wang + * reloc.c (BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21): New entry. * bfd-in2.h: Regenerate. * libbfd.h: Regenerate. diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 16769bc..ff56701 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -174,6 +174,7 @@ || (R_TYPE) == BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19 \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSIE_MOVW_GOTTPREL_G0_NC \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSIE_MOVW_GOTTPREL_G1 \ + || (R_TYPE) == BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21 \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSLD_ADR_PREL21 \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12 \ || (R_TYPE) == BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12 \ @@ -4122,6 +4123,7 @@ aarch64_reloc_got_type (bfd_reloc_code_real_type r_type) case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC: case BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSGD_ADR_PREL21: + case BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21: return GOT_TLS_GD; @@ -5029,6 +5031,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, case BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC: case BFD_RELOC_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC: case BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19: + case BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21: if (globals->root.sgot == NULL) return bfd_reloc_notsupported; @@ -5514,6 +5517,7 @@ elfNN_aarch64_relocate_section (bfd *output_bfd, case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC: case BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSGD_ADR_PREL21: + case BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21: if (! symbol_got_offset_mark_p (input_bfd, h, r_symndx)) { @@ -5547,8 +5551,11 @@ elfNN_aarch64_relocate_section (bfd *output_bfd, * RELOC_SIZE (htab); bfd_elfNN_swap_reloca_out (output_bfd, &rela, loc); - if (elfNN_aarch64_bfd_reloc_from_type (r_type) - == BFD_RELOC_AARCH64_TLSLD_ADR_PREL21) + bfd_reloc_code_real_type real_type = + elfNN_aarch64_bfd_reloc_from_type (r_type); + + if (real_type == BFD_RELOC_AARCH64_TLSLD_ADR_PREL21 + || real_type == BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21) { /* For local dynamic, don't generate DTPREL in any case. Initialize the DTPREL slot into zero, so we get module @@ -6041,6 +6048,7 @@ elfNN_aarch64_gc_sweep_hook (bfd *abfd, case BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC: case BFD_RELOC_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC: case BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19: + case BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21: case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12: case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12: @@ -6514,6 +6522,7 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, case BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC: case BFD_RELOC_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC: case BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19: + case BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21: case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12: case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12: diff --git a/bfd/elfxx-aarch64.c b/bfd/elfxx-aarch64.c index 5b2af2a..3186d8e 100644 --- a/bfd/elfxx-aarch64.c +++ b/bfd/elfxx-aarch64.c @@ -241,6 +241,7 @@ _bfd_aarch64_elf_put_addend (bfd *abfd, case BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSGD_ADR_PREL21: case BFD_RELOC_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21: + case BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21: contents = _bfd_aarch64_reencode_adr_imm (contents, addend); break; @@ -414,6 +415,7 @@ _bfd_aarch64_elf_resolve_relocation (bfd_reloc_code_real_type r_type, case BFD_RELOC_AARCH64_TLSDESC_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21: + case BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21: value = PG (value + addend) - PG (place); break; diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index f719db7..99e87f7 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2015-08-11 Jiong Wang + + * ld-aarch64/tls-small-ld.s: New file. + * ld-aarch64/tls-small-ld.d: Likewise. + * ld-aarch64/aarch64-elf.exp: Run new test. + 2015-08-11 H.J. Lu PR ld/18808 diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp index ab2fa49..0c06610 100644 --- a/ld/testsuite/ld-aarch64/aarch64-elf.exp +++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp @@ -147,6 +147,7 @@ run_dump_test "tls-tiny-desc-ie" run_dump_test "tls-tiny-desc-le" run_dump_test "tls-tiny-ie" run_dump_test "tls-tiny-ld" +run_dump_test "tls-small-ld" run_dump_test "tlsle" run_dump_test "tlsle-symbol-offset" run_dump_test "gc-got-relocs" diff --git a/ld/testsuite/ld-aarch64/tls-small-ld.d b/ld/testsuite/ld-aarch64/tls-small-ld.d new file mode 100644 index 0000000..74cf256 --- /dev/null +++ b/ld/testsuite/ld-aarch64/tls-small-ld.d @@ -0,0 +1,9 @@ +#source: tls-small-ld.s +#ld: -T relocs.ld -shared +#readelf: -Wr + +Relocation section '\.rela\.dyn' at offset 0x10070 contains 2 entries: + Offset Info Type Symbol's Value Symbol's Name \+ Addend +0000000000000000 0000000000000000 R_AARCH64_NONE 0 +0000000000020008 0000000200000404 R_AARCH64_TLS_DTPMOD64 0000000000000000 dummy \+ 0 + diff --git a/ld/testsuite/ld-aarch64/tls-small-ld.s b/ld/testsuite/ld-aarch64/tls-small-ld.s new file mode 100644 index 0000000..0a8b6b9 --- /dev/null +++ b/ld/testsuite/ld-aarch64/tls-small-ld.s @@ -0,0 +1,7 @@ +// Test file for AArch64 LD -- reloc 518 + + .text +func: + add x1, x2, x3 + // BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21 + adrp x0, :tlsldm:dummy -- 2.7.4