From 74a1bfe1d6e7e85fffad518f50575a44630d9293 Mon Sep 17 00:00:00 2001 From: Renlin Li Date: Fri, 2 Oct 2015 15:29:41 +0100 Subject: [PATCH] [LD][AARCH64]Add BFD_RELOC_AARCH64_MOVW_GOTOFF_G1 Support. bfd/ 2015-10-02 Renlin Li * elfnn-aarch64.c (aarch64_reloc_got_type): Add support for BFD_RELOC_AARCH64_MOVW_GOTOFF_G1. (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 (elfNN_aarch64_final_link_relocate): Calculate offset within GOT. ld/testsuite/ 2015-10-02 Renlin Li * ld-aarch64/emit-relocs-302.d: New. * ld-aarch64/emit-relocs-302.s: New. * ld-aarch64/aarch64-elf.exp: Run the new test. --- bfd/ChangeLog | 10 ++++++++++ bfd/elfnn-aarch64.c | 7 +++++++ bfd/elfxx-aarch64.c | 2 ++ ld/testsuite/ChangeLog | 6 ++++++ ld/testsuite/ld-aarch64/aarch64-elf.exp | 4 +++- ld/testsuite/ld-aarch64/emit-relocs-302.d | 22 ++++++++++++++++++++++ ld/testsuite/ld-aarch64/emit-relocs-302.s | 12 ++++++++++++ 7 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 ld/testsuite/ld-aarch64/emit-relocs-302.d create mode 100644 ld/testsuite/ld-aarch64/emit-relocs-302.s diff --git a/bfd/ChangeLog b/bfd/ChangeLog index c3b0cc9414..f92ef661a7 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2015-10-02 Renlin Li + + * elfnn-aarch64.c (aarch64_reloc_got_type): Add support + for BFD_RELOC_AARCH64_MOVW_GOTOFF_G1. + (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 + (elfNN_aarch64_final_link_relocate): Likewise + 2015-010-02 Renlin Li * reloc.c (BFD_RELOC_AARCH64_MOVW_GOTOFF_G1): New. diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 7349ad7b0f..715eff6218 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -4432,6 +4432,7 @@ aarch64_reloc_got_type (bfd_reloc_code_real_type r_type) case BFD_RELOC_AARCH64_LD64_GOTOFF_LO15: case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15: case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC: + case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1: return GOT_NORMAL; case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC: @@ -4979,6 +4980,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, case BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14: case BFD_RELOC_AARCH64_LD32_GOT_LO12_NC: case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15: + case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1: case BFD_RELOC_AARCH64_LD64_GOTOFF_LO15: case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC: base_got = globals->root.sgot; @@ -5047,6 +5049,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, addend = (globals->root.sgot->output_section->vma + globals->root.sgot->output_offset); break; + case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1: case BFD_RELOC_AARCH64_LD64_GOTOFF_LO15: value = (value - globals->root.sgot->output_section->vma - globals->root.sgot->output_offset); @@ -5332,6 +5335,7 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto, break; case BFD_RELOC_AARCH64_LD64_GOTOFF_LO15: + case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1: if (h != NULL) value = aarch64_calculate_got_entry_vma (h, globals, info, value, output_bfd, @@ -6479,6 +6483,7 @@ elfNN_aarch64_gc_sweep_hook (bfd *abfd, case BFD_RELOC_AARCH64_LD64_GOTOFF_LO15: case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15: case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC: + case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1: case BFD_RELOC_AARCH64_TLSDESC_ADD_LO12_NC: case BFD_RELOC_AARCH64_TLSDESC_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSDESC_ADR_PREL21: @@ -6834,6 +6839,7 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, case BFD_RELOC_AARCH64_LD64_GOTOFF_LO15: case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15: case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC: + case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1: case BFD_RELOC_AARCH64_NN: if (htab->root.dynobj == NULL) htab->root.dynobj = abfd; @@ -6948,6 +6954,7 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info, case BFD_RELOC_AARCH64_LD64_GOTOFF_LO15: case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15: case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC: + case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1: case BFD_RELOC_AARCH64_TLSDESC_ADD_LO12_NC: case BFD_RELOC_AARCH64_TLSDESC_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSDESC_ADR_PREL21: diff --git a/bfd/elfxx-aarch64.c b/bfd/elfxx-aarch64.c index c831f600a9..ac0ec81533 100644 --- a/bfd/elfxx-aarch64.c +++ b/bfd/elfxx-aarch64.c @@ -331,6 +331,7 @@ _bfd_aarch64_elf_put_addend (bfd *abfd, case BFD_RELOC_AARCH64_MOVW_G2: case BFD_RELOC_AARCH64_MOVW_G2_NC: case BFD_RELOC_AARCH64_MOVW_G3: + case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1: case BFD_RELOC_AARCH64_TLSLD_MOVW_DTPREL_G0_NC: case BFD_RELOC_AARCH64_TLSLD_MOVW_DTPREL_G1_NC: case BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G0_NC: @@ -416,6 +417,7 @@ _bfd_aarch64_elf_resolve_relocation (bfd_reloc_code_real_type r_type, case BFD_RELOC_AARCH64_MOVW_G2_NC: case BFD_RELOC_AARCH64_MOVW_G2_S: case BFD_RELOC_AARCH64_MOVW_G3: + case BFD_RELOC_AARCH64_MOVW_GOTOFF_G1: case BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_HI12: case BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12: case BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12_NC: diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index d1446a7d76..b5981b4bbf 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2015-10-02 Renlin Li + + * ld-aarch64/emit-relocs-302.d: New. + * ld-aarch64/emit-relocs-302.s: New. + * ld-aarch64/aarch64-elf.exp: Run the test. + 2015-10-02 Renlin Li * ld-aarch64/emit-relocs-310.d: New. diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp index 1f68c17d26..c7d9fbadc6 100644 --- a/ld/testsuite/ld-aarch64/aarch64-elf.exp +++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp @@ -116,7 +116,9 @@ run_dump_test "emit-relocs-286" run_dump_test "emit-relocs-286-bad" # 287-298 are not done yet run_dump_test "emit-relocs-299" -# 300-308 are not done yet +# 300-301 are not done yet +run_dump_test "emit-relocs-302" +# 303-308 are not done yet run_dump_test "emit-relocs-309-up" run_dump_test "emit-relocs-309-low" run_dump_test "emit-relocs-309-up-bad" diff --git a/ld/testsuite/ld-aarch64/emit-relocs-302.d b/ld/testsuite/ld-aarch64/emit-relocs-302.d new file mode 100644 index 0000000000..40ad22b18f --- /dev/null +++ b/ld/testsuite/ld-aarch64/emit-relocs-302.d @@ -0,0 +1,22 @@ +#source: emit-relocs-302.s +#ld: -T relocs.ld --defsym globala=0x11000 --defsym globalb=0x45000 --defsym globalc=0x1234 -e0 --emit-relocs +#objdump: -dr + +.*: +file format .* + +Disassembly of section .text: + +0000000000010000 <\.text>: + 10000: 580000e1 ldr x1, 1001c <\.text\+0x1c> + 10004: 100000c2 adr x2, 1001c <\.text\+0x1c> + 10008: 8b010041 add x1, x2, x1 + 1000c: d2a00000 movz x0, #0x0, lsl #16 + 1000c: R_AARCH64_MOVW_GOTOFF_G1 globala + 10010: d2a00000 movz x0, #0x0, lsl #16 + 10010: R_AARCH64_MOVW_GOTOFF_G1 globalb + 10014: d2a00000 movz x0, #0x0, lsl #16 + 10014: R_AARCH64_MOVW_GOTOFF_G1 globalc + 10018: f8606820 ldr x0, \[x1,x0\] + 1001c: 0000ffe4 \.word 0x0000ffe4 + 1001c: R_AARCH64_PREL64 _GLOBAL_OFFSET_TABLE_ + 10020: 00000000 \.word 0x00000000 diff --git a/ld/testsuite/ld-aarch64/emit-relocs-302.s b/ld/testsuite/ld-aarch64/emit-relocs-302.s new file mode 100644 index 0000000000..b2fd407a5e --- /dev/null +++ b/ld/testsuite/ld-aarch64/emit-relocs-302.s @@ -0,0 +1,12 @@ + .text + ldr x1, .Lgot + adr x2, .Lgot + add x1, x2, x1 + + movz x0, #:gotoff_g1:globala + movz x0, #:gotoff_g1:globalb + movz x0, #:gotoff_g1:globalc + ldr x0, [x1, x0] + +.Lgot: + .dword _GLOBAL_OFFSET_TABLE_ - .