This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[10/16][binutils][AARCH64]Add relocation support for large memory model. [LD]Add BFD_RELOC_AARCH64_TLSGD_MOVW_G0_NC support.
- From: Renlin Li <renlin dot li at arm dot com>
- To: "binutils at sourceware dot org" <binutils at sourceware dot org>
- Cc: Marcus Shawcroft <Marcus dot Shawcroft at arm dot com>, Nicholas Clifton <nickc at redhat dot com>, Jiong Wang <jiong dot wang at arm dot com>
- Date: Tue, 08 Sep 2015 18:53:32 +0100
- Subject: [10/16][binutils][AARCH64]Add relocation support for large memory model. [LD]Add BFD_RELOC_AARCH64_TLSGD_MOVW_G0_NC support.
- Authentication-results: sourceware.org; auth=none
Hi all,
This patch adds BFD_RELOC_AARCH64_TLSGD_MOVW_G0_NC to binutils linker.
The following code sequence should be generated to access TLS variable
in General Dynamic TLS Model.
movz a0, #:tlsgd_g1:x R_AARCH64_TLSGD_MOVW_G1
movk a0, #:tlsgd_g0_nc:x R_AARCH64_TLSGD_MOVW_G0_NC
add a0, gp, a0
bl __tls_get_addr R_AARCH64_CALL26
nop
Binutils and ld regression test done without new failures. Okay to commit?
Regards,
Renlin
bfd/ChangeLog:
2015-09-08 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/ChangeLog:
2015-09-08 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/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index e373986..874f07e 100644
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -4238,6 +4238,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:
@@ -5225,6 +5226,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;
@@ -5713,6 +5715,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:
@@ -6249,6 +6252,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:
@@ -6723,6 +6727,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 3ff5f77..2707bde 100644
--- a/bfd/elfxx-aarch64.c
+++ b/bfd/elfxx-aarch64.c
@@ -320,6 +320,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_TLSLE_MOVW_TPREL_G0_NC:
case BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G1_NC:
@@ -406,6 +407,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_LO12:
value = value + addend;
diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
index dd0ea0f..66cc7bb 100644
--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp
+++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp
@@ -122,6 +122,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-529"
run_dump_test "emit-relocs-529-overflow"
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 0000000..f641d35
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-516.d
@@ -0,0 +1,36 @@
+#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
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_ - .