[LD][AARCH64]Add BFD_RELOC_AARCH64_TLSGD_MOVW_G0_NC support.

bfd/

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

	* 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 <renlin.li@arm.com>

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

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1b56c3d74c78dcd52ae378415d8d937d68adf5ad..a02858966273de341d20e08015683bf7e29580ae 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_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  <renlin.li@arm.com>
 
        * reloc.c (BFD_RELOC_AARCH64_TLSGD_MOVW_G0_NC): New entry.

diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 519aa51be5888c6b552287a49e59453ac9f9d4a8..7c9310f6842b0d40dedeea31524f740e7d46e9b1 100644 (file)
--- 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 b5ff8af54f1d46b25129a037eabc7c081fbe372c..b57471e381816a472a291d08926eb72549322240 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_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 528de1bea10530c94688a4622fa33494f6664cd8..e755b8a58a60e7f6584751f602ff11cd668d5a74 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-516.d: New.
+       * ld-aarch64/emit-relocs-516.s: New.
+       * ld-aarch64/aarch64-elf.exp: Run new test.
+
 2015-10-02  Renlin Li  <renlin.li@arm.com>
 
        * 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 1451054672967c38cd4f495afb2ccc96fd8d0ce6..3cafff3fe3f26c2e38d87db3de9ba70fa664108c 100644 (file)
--- 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 (file)
index 0000000..180f60b
--- /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 \<test\>:
+   10000:      58000101        ldr     x1, 10020 \<test\+0x20\>
+   10004:      100000e2        adr     x2, 10020 \<test\+0x20\>
+   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 \<test\+0x48\>
+   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 (file)
index 0000000..b998adc
--- /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_ - .