From 7ba7cfe43195305f5efa887ebbffb53a724aaac6 Mon Sep 17 00:00:00 2001 From: Renlin Li Date: Fri, 2 Oct 2015 16:37:22 +0100 Subject: [PATCH] [LD][AARCH64]Add BFD_RELOC_AARCH64_TLSGD_MOVW_G0_NC support. bfd/ 2015-10-02 Renlin Li * elfnn-aarch64.c (aarch64_reloc_got_type): Add BFD_RELOC_AARCH64_TLSGD_MOVW_G0_NC support. (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/ 2015-10-02 Renlin Li * ld-aarch64/emit-relocs-516.d: New. * ld-aarch64/emit-relocs-516.s: New. * ld-aarch64/aarch64-elf.exp: Run new test. --- bfd/ChangeLog | 11 ++++++++ bfd/elfnn-aarch64.c | 5 ++++ bfd/elfxx-aarch64.c | 2 ++ ld/testsuite/ChangeLog | 6 ++++ ld/testsuite/ld-aarch64/aarch64-elf.exp | 1 + ld/testsuite/ld-aarch64/emit-relocs-516.d | 34 +++++++++++++++++++++++ ld/testsuite/ld-aarch64/emit-relocs-516.s | 15 ++++++++++ 7 files changed, 74 insertions(+) create mode 100644 ld/testsuite/ld-aarch64/emit-relocs-516.d create mode 100644 ld/testsuite/ld-aarch64/emit-relocs-516.s diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 1b56c3d74c..a028589662 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,14 @@ +2015-10-02 Renlin Li + + * elfnn-aarch64.c (aarch64_reloc_got_type): Add + BFD_RELOC_AARCH64_TLSGD_MOVW_G0_NC support. + (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-10-02 Renlin Li * reloc.c (BFD_RELOC_AARCH64_TLSGD_MOVW_G0_NC): New entry. diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 519aa51be5..7c9310f684 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -4486,6 +4486,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_TLSGD_MOVW_G0_NC: case BFD_RELOC_AARCH64_TLSGD_MOVW_G1: case BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC: case BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21: @@ -5473,6 +5474,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, *unresolved_reloc_p = FALSE; break; + case BFD_RELOC_AARCH64_TLSGD_MOVW_G0_NC: case BFD_RELOC_AARCH64_TLSGD_MOVW_G1: if (globals->root.sgot == NULL) return bfd_reloc_notsupported; @@ -6021,6 +6023,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_TLSGD_MOVW_G0_NC: case BFD_RELOC_AARCH64_TLSGD_MOVW_G1: case BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC: case BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21: @@ -6557,6 +6560,7 @@ elfNN_aarch64_gc_sweep_hook (bfd *abfd, 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_TLSGD_MOVW_G0_NC: case BFD_RELOC_AARCH64_TLSGD_MOVW_G1: case BFD_RELOC_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21: case BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC: @@ -7031,6 +7035,7 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, 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_TLSGD_MOVW_G0_NC: case BFD_RELOC_AARCH64_TLSGD_MOVW_G1: case BFD_RELOC_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21: case BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC: diff --git a/bfd/elfxx-aarch64.c b/bfd/elfxx-aarch64.c index b5ff8af54f..b57471e381 100644 --- a/bfd/elfxx-aarch64.c +++ b/bfd/elfxx-aarch64.c @@ -333,6 +333,7 @@ _bfd_aarch64_elf_put_addend (bfd *abfd, case BFD_RELOC_AARCH64_MOVW_G3: case BFD_RELOC_AARCH64_MOVW_GOTOFF_G0_NC: case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1: + case BFD_RELOC_AARCH64_TLSGD_MOVW_G0_NC: case BFD_RELOC_AARCH64_TLSGD_MOVW_G1: case BFD_RELOC_AARCH64_TLSLD_MOVW_DTPREL_G0_NC: case BFD_RELOC_AARCH64_TLSLD_MOVW_DTPREL_G1_NC: @@ -421,6 +422,7 @@ _bfd_aarch64_elf_resolve_relocation (bfd_reloc_code_real_type r_type, case BFD_RELOC_AARCH64_MOVW_G3: case BFD_RELOC_AARCH64_MOVW_GOTOFF_G0_NC: case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1: + case BFD_RELOC_AARCH64_TLSGD_MOVW_G0_NC: case BFD_RELOC_AARCH64_TLSGD_MOVW_G1: case BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_HI12: case BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12: diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 528de1bea1..e755b8a58a 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2015-10-02 Renlin Li + + * ld-aarch64/emit-relocs-516.d: New. + * ld-aarch64/emit-relocs-516.s: New. + * ld-aarch64/aarch64-elf.exp: Run new test. + 2015-10-02 Renlin Li * ld-aarch64/emit-relocs-515.d: New. diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp index 1451054672..3cafff3fe3 100644 --- a/ld/testsuite/ld-aarch64/aarch64-elf.exp +++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp @@ -129,6 +129,7 @@ run_dump_test "emit-relocs-311" run_dump_test "emit-relocs-312" run_dump_test "emit-relocs-313" run_dump_test "emit-relocs-515" +run_dump_test "emit-relocs-516" run_dump_test "emit-relocs-523" run_dump_test "emit-relocs-524" run_dump_test "emit-relocs-525" diff --git a/ld/testsuite/ld-aarch64/emit-relocs-516.d b/ld/testsuite/ld-aarch64/emit-relocs-516.d new file mode 100644 index 0000000000..180f60b685 --- /dev/null +++ b/ld/testsuite/ld-aarch64/emit-relocs-516.d @@ -0,0 +1,34 @@ +#source: emit-relocs-516.s +#ld: -shared -T relocs.ld -e0 +#objdump: -dr +#... + +Disassembly of section .text: + +0000000000010000 \: + 10000: 58000101 ldr x1, 10020 \ + 10004: 100000e2 adr x2, 10020 \ + 10008: 8b020021 add x1, x1, x2 + 1000c: f2800100 movk x0, #0x8 + 10010: f2800300 movk x0, #0x18 + 10014: 8b000020 add x0, x1, x0 + 10018: 9400000c bl 10048 \ + 1001c: d503201f nop + 10020: 0000ffe0 .word 0x0000ffe0 + 10024: 00000000 .word 0x00000000 + +Disassembly of section .plt: + +0000000000010028 \<.plt\>: + 10028: a9bf7bf0 stp x16, x30, \[sp,#-16\]! + 1002c: 90000090 adrp x16, 20000 \<_GLOBAL_OFFSET_TABLE_\> + 10030: f9401e11 ldr x17, \[x16,#56\] + 10034: 9100e210 add x16, x16, #0x38 + 10038: d61f0220 br x17 + 1003c: d503201f nop + 10040: d503201f nop + 10044: d503201f nop + 10048: 90000090 adrp x16, 20000 \<_GLOBAL_OFFSET_TABLE_\> + 1004c: f9402211 ldr x17, \[x16,#64\] + 10050: 91010210 add x16, x16, #0x40 + 10054: d61f0220 br x17 diff --git a/ld/testsuite/ld-aarch64/emit-relocs-516.s b/ld/testsuite/ld-aarch64/emit-relocs-516.s new file mode 100644 index 0000000000..b998adcec6 --- /dev/null +++ b/ld/testsuite/ld-aarch64/emit-relocs-516.s @@ -0,0 +1,15 @@ + .global var + .global dummy + .text +test: + ldr x1, .Lgot + adr x2, .Lgot + add x1, x1, x2 + + movk x0, #:tlsgd_g0_nc:var + movk x0, #:tlsgd_g0_nc:dummy + add x0, x1, x0 + bl __tls_get_addr + nop + +.Lgot: .xword _GLOBAL_OFFSET_TABLE_ - .