[LD][AARCH64]Add BFD_RELOC_AARCH64_TLSGD_MOVW_G1 support.

bfd/

2015-10-02  Renlin Li <renlin.li@arm.com>

	* elfnn-aarch64.c (aarch64_reloc_got_type): Add
	BFD_RELOC_AARCH64_TLSGD_MOVW_G1 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 <renlin.li@arm.com>

	* ld-aarch64/emit-relocs-515.d: New.
	* ld-aarch64/emit-relocs-515.s: New.
	* ld-aarch64/aarch64-elf.exp: Run new test.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 329c42c60c8d35c7675cb641586caafb6faee6a7..6fabefa1886f45b71abf0653f1c67bd271a2c7e1 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,14 @@
+2015-10-02  Renlin Li  <renlin.li@arm.com>
+
+       * elfnn-aarch64.c (aarch64_reloc_got_type): Add
+       BFD_RELOC_AARCH64_TLSGD_MOVW_G1 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  <renlin.li@arm.com>
 
        * reloc.c (BFD_RELOC_AARCH64_TLSGD_MOVW_G1): New entry.

diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 8f3f75cf24228f570e4580168895682ee1488edc..7977588295c0ef567d5601d3b7da3feaf83d536a 100644 (file)
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -4470,6 +4470,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_G1:
     case BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC:
     case BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21:
     case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21:
@@ -5456,6 +5457,16 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
       *unresolved_reloc_p = FALSE;
       break;
 
+    case BFD_RELOC_AARCH64_TLSGD_MOVW_G1:
+      if (globals->root.sgot == NULL)
+       return bfd_reloc_notsupported;
+
+      value = symbol_got_offset (input_bfd, h, r_symndx);
+      value = _bfd_aarch64_elf_resolve_relocation (bfd_r_type, place, value,
+                                                  0, weak_undef_p);
+      *unresolved_reloc_p = FALSE;
+      break;
+
     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:
@@ -5994,6 +6005,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_G1:
        case BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC:
        case BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21:
        case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21:
@@ -6529,6 +6541,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_G1:
        case BFD_RELOC_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21:
        case BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC:
        case BFD_RELOC_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC:
@@ -7002,6 +7015,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_G1:
        case BFD_RELOC_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21:
        case BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC:
        case BFD_RELOC_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC:

diff --git a/bfd/elfxx-aarch64.c b/bfd/elfxx-aarch64.c
index 5fe1b07c7359d703a121561c8212b920af149170..b5ff8af54f1d46b25129a037eabc7c081fbe372c 100644 (file)
--- 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_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:
@@ -420,6 +421,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_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 a6d4a3b158cc00facc0b01b992feb8b6cfac7989..528de1bea10530c94688a4622fa33494f6664cd8 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-02  Renlin Li  <renlin.li@arm.com>
+
+       * ld-aarch64/emit-relocs-515.d: New.
+       * ld-aarch64/emit-relocs-515.s: New.
+       * ld-aarch64/aarch64-elf.exp: Run new test.
+
 2015-10-02  Renlin Li  <renlin.li@arm.com>
 
        * ld-aarch64/aarch64-elf.exp: Run new test.

diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
index 4c41bc9bf22dae63881858a3f7a4bdb810aa4b1c..1451054672967c38cd4f495afb2ccc96fd8d0ce6 100644 (file)
--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp
+++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp
@@ -128,6 +128,7 @@ run_dump_test "emit-relocs-310"
 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-523"
 run_dump_test "emit-relocs-524"
 run_dump_test "emit-relocs-525"

diff --git a/ld/testsuite/ld-aarch64/emit-relocs-515.d b/ld/testsuite/ld-aarch64/emit-relocs-515.d
new file mode 100644 (file)
index 0000000..b8cd352
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-515.d
@@ -0,0 +1,33 @@
+#source: emit-relocs-515.s
+#ld: -shared -T relocs.ld -e0
+#objdump: -dr
+#...
+
+Disassembly of section .text:
+
+0000000000010000 \<test\>:
+   10000:      580000e1        ldr     x1, 1001c \<test\+0x1c\>
+   10004:      100000c2        adr     x2, 1001c \<test\+0x1c\>
+   10008:      8b020021        add     x1, x1, x2
+   1000c:      d2a00000        movz    x0, #0x0, lsl #16
+   10010:      8b000020        add     x0, x1, x0
+   10014:      9400000c        bl      10044 \<test\+0x44\>
+   10018:      d503201f        nop
+   1001c:      0000ffe4        .word   0x0000ffe4
+   10020:      00000000        .word   0x00000000
+
+Disassembly of section .plt:
+
+0000000000010024 \<.plt\>:
+   10024:      a9bf7bf0        stp     x16, x30, \[sp,#-16\]!
+   10028:      90000090        adrp    x16, 20000 \<_GLOBAL_OFFSET_TABLE_\>
+   1002c:      f9401611        ldr     x17, \[x16,#40\]
+   10030:      9100a210        add     x16, x16, #0x28
+   10034:      d61f0220        br      x17
+   10038:      d503201f        nop
+   1003c:      d503201f        nop
+   10040:      d503201f        nop
+   10044:      90000090        adrp    x16, 20000 \<_GLOBAL_OFFSET_TABLE_\>
+   10048:      f9401a11        ldr     x17, \[x16,#48\]
+   1004c:      9100c210        add     x16, x16, #0x30
+   10050:      d61f0220        br      x17

diff --git a/ld/testsuite/ld-aarch64/emit-relocs-515.s b/ld/testsuite/ld-aarch64/emit-relocs-515.s
new file mode 100644 (file)
index 0000000..535b96c
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-515.s
@@ -0,0 +1,13 @@
+       .global var
+       .text
+test:
+       ldr x1, .Lgot
+       adr x2, .Lgot
+       add x1, x1, x2
+
+       movz x0, #:tlsgd_g1:var
+       add x0, x1, x0
+       bl   __tls_get_addr
+       nop
+
+.Lgot: .xword _GLOBAL_OFFSET_TABLE_ - .