This is the mail archive of the binutils-cvs@sourceware.org mailing list for the binutils project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
[binutils-gdb] [AArch64][8/8] LD support BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12

From: Jiong Wang <jiwang at sourceware dot org>
To: bfd-cvs at sourceware dot org
Date: 11 Aug 2015 20:30:11 -0000
Subject: [binutils-gdb] [AArch64][8/8] LD support BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=40fbed84815b00960f7fac8d2e7857942df4308c

commit 40fbed84815b00960f7fac8d2e7857942df4308c
Author: Jiong Wang <jiong.wang@arm.com>
Date:   Tue Aug 11 17:44:30 2015 +0100

    [AArch64][8/8] LD support BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12
    
    2015-08-11  Jiong Wang  <jiong.wang@arm.com>
    
    bfd/
      * elfnn-aarch64.c (IS_AARCH64_TLS_RELOC): Recognize
      BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12.
      (aarch64_reloc_got_type): Likewise.
      (elfNN_aarch64_final_link_relocate): Likewise.
      (elfNN_aarch64_relocate_section): Likewise.
      * elfxx-aarch64.c (_bfd_aarch64_elf_put_addend): Likewise.
      (_bfd_aarch64_elf_resolve_relocation): Likewise.
    
    ld/testsuite/
      * ld-aarch64/emit-relocs-529.s: New testcase.
      * ld-aarch64/emit-relocs-529-overflow.s: Likewise.
      * ld-aarch64/emit-relocs-86.s: Likewise.
      * ld-aarch64/emit-relocs-86-overflow.s: Likewise.
      * ld-aarch64/emit-relocs-529.d: New expectation file.
      * ld-aarch64/emit-relocs-529-overflow.d: Likewise.
      * ld-aarch64/emit-relocs-86.d: Likewise.
      * ld-aarch64/emit-relocs-86-overflow.d: Likewise.
      * ld-aarch64/aarch64-elf.exp: Run new testcases.

Diff:
---
 bfd/ChangeLog                                      | 10 ++++++++++
 bfd/elfnn-aarch64.c                                |  8 ++++++++
 bfd/elfxx-aarch64.c                                |  2 ++
 ld/testsuite/ChangeLog                             | 12 ++++++++++++
 ld/testsuite/ld-aarch64/aarch64-elf.exp            |  4 ++++
 ld/testsuite/ld-aarch64/emit-relocs-529-overflow.d |  4 ++++
 ld/testsuite/ld-aarch64/emit-relocs-529-overflow.s | 11 +++++++++++
 ld/testsuite/ld-aarch64/emit-relocs-529.d          |  7 +++++++
 ld/testsuite/ld-aarch64/emit-relocs-529.s          | 10 ++++++++++
 ld/testsuite/ld-aarch64/emit-relocs-86-overflow.d  |  5 +++++
 ld/testsuite/ld-aarch64/emit-relocs-86-overflow.s  | 11 +++++++++++
 ld/testsuite/ld-aarch64/emit-relocs-86.d           |  8 ++++++++
 ld/testsuite/ld-aarch64/emit-relocs-86.s           | 10 ++++++++++
 13 files changed, 102 insertions(+)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 61554a7..97fffdd 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,15 @@
 2015-08-11  Jiong Wang  <jiong.wang@arm.com>
 
+	* elfnn-aarch64.c (IS_AARCH64_TLS_RELOC): Recognize
+	BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12.
+	(aarch64_reloc_got_type): Likewise.
+	(elfNN_aarch64_final_link_relocate): Likewise.
+	(elfNN_aarch64_relocate_section): Likewise.
+	* elfxx-aarch64.c (_bfd_aarch64_elf_put_addend): Likewise.
+	(_bfd_aarch64_elf_resolve_relocation): Likewise.
+
+2015-08-11  Jiong Wang  <jiong.wang@arm.com>
+
 	* reloc.c (BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12): New entry.
 	* bfd-in2.h: Regenerate.
 	* libbfd.h: Regenerate.
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 80beda7..c8ad421 100644
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -174,6 +174,7 @@
    || (R_TYPE) == BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19	\
    || (R_TYPE) == BFD_RELOC_AARCH64_TLSIE_MOVW_GOTTPREL_G0_NC	\
    || (R_TYPE) == BFD_RELOC_AARCH64_TLSIE_MOVW_GOTTPREL_G1	\
+   || (R_TYPE) == BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12	\
    || (R_TYPE) == BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC		\
    || (R_TYPE) == BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21		\
    || (R_TYPE) == BFD_RELOC_AARCH64_TLSLD_ADR_PREL21		\
@@ -4174,6 +4175,7 @@ aarch64_reloc_got_type (bfd_reloc_code_real_type r_type)
     case BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19:
       return GOT_TLS_IE;
 
+    case BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12:
     case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12:
     case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12:
     case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12_NC:
@@ -5078,6 +5080,12 @@ elfNN_aarch64_final_link_relocate (reloc_howto_type *howto,
       *unresolved_reloc_p = FALSE;
       break;
 
+    case BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12:
+      value = _bfd_aarch64_elf_resolve_relocation (bfd_r_type, place, value,
+						   signed_addend - dtpoff_base (info),
+						   weak_undef_p);
+      break;
+
     case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12:
     case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12:
     case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12_NC:
diff --git a/bfd/elfxx-aarch64.c b/bfd/elfxx-aarch64.c
index 75f518d..a861773 100644
--- a/bfd/elfxx-aarch64.c
+++ b/bfd/elfxx-aarch64.c
@@ -249,6 +249,7 @@ _bfd_aarch64_elf_put_addend (bfd *abfd,
     case BFD_RELOC_AARCH64_ADD_LO12:
     case BFD_RELOC_AARCH64_TLSDESC_ADD_LO12_NC:
     case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC:
+    case BFD_RELOC_AARCH64_TLSLD_ADD_DTPREL_LO12:
     case BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC:
     case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12:
     case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12:
@@ -398,6 +399,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_TLSLD_ADD_DTPREL_LO12:
       value = value + addend;
       break;
 
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index d618866..dae1cbb 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,17 @@
 2015-08-11  Jiong Wang  <jiong.wang@arm.com>
 
+	* ld-aarch64/emit-relocs-529.s: New testcase.
+	* ld-aarch64/emit-relocs-529-overflow.s: Likewise.
+	* ld-aarch64/emit-relocs-86.s: Likewise.
+	* ld-aarch64/emit-relocs-86-overflow.s: Likewise.
+	* ld-aarch64/emit-relocs-529.d: New expectation file.
+	* ld-aarch64/emit-relocs-529-overflow.d: Likewise.
+	* ld-aarch64/emit-relocs-86.d: Likewise.
+	* ld-aarch64/emit-relocs-86-overflow.d: Likewise.
+	* ld-aarch64/aarch64-elf.exp: Run new testcases.
+
+2015-08-11  Jiong Wang  <jiong.wang@arm.com>
+
 	* ld-aarch64/tls-small-ld.s: Update testcase.
 
 2015-08-11  Jiong Wang  <jiong.wang@arm.com>
diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
index 0c06610..c8a8aae 100644
--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp
+++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp
@@ -59,6 +59,8 @@ run_dump_test "erratum843419"
 # Relocation Tests
 run_dump_test "weak-undefined"
 run_dump_test "emit-relocs-28"
+run_dump_test "emit-relocs-86"
+run_dump_test "emit-relocs-86-overflow"
 run_dump_test "emit-relocs-257"
 run_dump_test "emit-relocs-257-be"
 # 258 is tested in 257
@@ -109,6 +111,8 @@ run_dump_test "emit-relocs-309-low-bad"
 run_dump_test "emit-relocs-311"
 run_dump_test "emit-relocs-312"
 run_dump_test "emit-relocs-313"
+run_dump_test "emit-relocs-529"
+run_dump_test "emit-relocs-529-overflow"
 
 # test addend correctness when --emit-relocs specified for non-relocatable obj.
 run_dump_test "emit-relocs-local-addend"
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-529-overflow.d b/ld/testsuite/ld-aarch64/emit-relocs-529-overflow.d
new file mode 100644
index 0000000..6635905
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-529-overflow.d
@@ -0,0 +1,4 @@
+#source: emit-relocs-529-overflow.s
+#ld: -T relocs.ld -e0 --emit-relocs
+#objdump: -dr
+#error: .*\(.text\+0x\d+\): relocation truncated to fit: R_AARCH64_TLSLD_ADD_DTPREL_LO12 against symbol `v2' .*
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-529-overflow.s b/ld/testsuite/ld-aarch64/emit-relocs-529-overflow.s
new file mode 100644
index 0000000..deddcbf
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-529-overflow.s
@@ -0,0 +1,11 @@
+	.global	v1
+	.size	v1, 4096
+	.global	v2
+	.section	.tdata,"awT",%progbits
+v1:
+	.zero	4096
+v2:
+	.word	0xcafecafe
+
+	.text
+	add	x20, x9, #:dtprel_lo12:v2
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-529.d b/ld/testsuite/ld-aarch64/emit-relocs-529.d
new file mode 100644
index 0000000..e2286e5
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-529.d
@@ -0,0 +1,7 @@
+#source: emit-relocs-529.s
+#ld: -T relocs.ld -e0 --emit-relocs
+#objdump: -dr
+#...
+0000000000010000 <.text>:
+   10000:	91001134 	add	x20, x9, #0x4
+			10000: R_AARCH64_TLSLD_ADD_DTPREL_LO12	v2
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-529.s b/ld/testsuite/ld-aarch64/emit-relocs-529.s
new file mode 100644
index 0000000..ec84f57
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-529.s
@@ -0,0 +1,10 @@
+	.global	v1
+	.global	v2
+	.section	.tdata,"awT",%progbits
+v1:
+	.word	0xdeaddead
+v2:
+	.word	0xcafecafe
+
+	.text
+	add	x20, x9, #:dtprel_lo12:v2
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-86-overflow.d b/ld/testsuite/ld-aarch64/emit-relocs-86-overflow.d
new file mode 100644
index 0000000..fb727b3
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-86-overflow.d
@@ -0,0 +1,5 @@
+#source: emit-relocs-86-overflow.s
+#as: -mabi=ilp32
+#ld: -m aarch64linux32 -e0 --emit-relocs
+#objdump: -dr
+#error: .*\(.text\+0x\d+\): relocation truncated to fit: R_AARCH64_P32_TLSLD_ADD_DTPREL_LO12 against symbol `v2' .*
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-86-overflow.s b/ld/testsuite/ld-aarch64/emit-relocs-86-overflow.s
new file mode 100644
index 0000000..945a66c
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-86-overflow.s
@@ -0,0 +1,11 @@
+	.global	v1
+	.size	v1, 4096
+	.global	v2
+	.section	.tdata,"awT",%progbits
+v1:
+	.zero	4096
+v2:
+	.word	0xcafecafe
+
+	.text
+	add	w20, w9, #:dtprel_lo12:v2
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-86.d b/ld/testsuite/ld-aarch64/emit-relocs-86.d
new file mode 100644
index 0000000..c0f5aca
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-86.d
@@ -0,0 +1,8 @@
+#source: emit-relocs-86.s
+#as: -mabi=ilp32
+#ld: -m aarch64linux32 -e0 --emit-relocs
+#objdump: -dr
+#...
+00400094 <.text>:
+  400094:	11001134 	add	w20, w9, #0x4
+			400094: R_AARCH64_P32_TLSLD_ADD_DTPREL_LO12	v2
diff --git a/ld/testsuite/ld-aarch64/emit-relocs-86.s b/ld/testsuite/ld-aarch64/emit-relocs-86.s
new file mode 100644
index 0000000..d56d864
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/emit-relocs-86.s
@@ -0,0 +1,10 @@
+	.global	v1
+	.global	v2
+	.section	.tdata,"awT",%progbits
+v1:
+	.word	0xdeaddead
+v2:
+	.word	0xcafecafe
+
+	.text
+	add	w20, w9, #:dtprel_lo12:v2
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]