aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bfd/ChangeLog11
-rw-r--r--bfd/elfnn-aarch64.c14
-rw-r--r--bfd/elfxx-aarch64.c2
-rw-r--r--ld/testsuite/ChangeLog6
-rw-r--r--ld/testsuite/ld-aarch64/aarch64-elf.exp1
-rw-r--r--ld/testsuite/ld-aarch64/emit-relocs-515.d33
-rw-r--r--ld/testsuite/ld-aarch64/emit-relocs-515.s13
7 files changed, 80 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 329c42c..6fabefa 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,16 @@
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.
* elfnn-aarch64.c (elfNN_aarch64_howto_table): New entry for
BFD_RELOC_AARCH64_TLSGD_MOVW_G1.
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 8f3f75c..7977588 100644
--- 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 5fe1b07..b5ff8af 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_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 a6d4a3b..528de1b 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,11 @@
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.
* ld-aarch64/emit-relocs-301.d: New.
* ld-aarch64/emit-relocs-301.s: New.
diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
index 4c41bc9..1451054 100644
--- 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
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
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_ - .
generated by cgit v1.1 at 2024-07-12 22:29:59 +0000