[AArch64][2/3] GAS support BFD_RELOC_AARCH64_TLSLD_ADR_PREL21

7 files changed, 61 insertions, 0 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 09ee2cb..d024f40 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-16  Jiong Wang  <jiong.wang@arm.com>
+
+	* config/tc-aarch64.c (reloc_table): New relocation modifiers.
+	(md_apply_fix): Support BFD_RELOC_AARCH64_TLSLD_ADR_PREL21.
+	(aarch64_force_relocation): Ditto.
+
 2015-07-16  Matthew Wahab  <matthew.wahab@arm.com>
 
 	* config/tc-arm.c (arm_fpus): Add crypto-neon-fp-armv8.1.
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index 7d4ec29..8d403f3 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -2500,6 +2500,19 @@ static struct reloc_table_entry reloc_table[] = {
    BFD_RELOC_AARCH64_TLSDESC_LD_LO12_NC,
    0},
 
+  /* Get to the page containing GOT TLS entry for a symbol.
+     The same as GD, we allocate two consecutive GOT slots
+     for module index and module offset, the only difference
+     with GD is the module offset should be intialized to
+     zero without any outstanding runtime relocation. */
+  {"tlsldm", 0,
+   BFD_RELOC_AARCH64_TLSLD_ADR_PREL21, /* adr_type */
+   0,
+   0,
+   0,
+   0,
+   0},
+
   /* Get to the page containing GOT TLS entry for a symbol */
   {"gottprel", 0,
    0,				/* adr_type */
@@ -6765,6 +6778,7 @@ md_apply_fix (fixS * fixP, valueT * valP, segT seg)
     case BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC:
     case BFD_RELOC_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC:
     case BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19:
+    case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21:
     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:
@@ -6974,6 +6988,7 @@ aarch64_force_relocation (struct fix *fixp)
     case BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC:
     case BFD_RELOC_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC:
     case BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19:
+    case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21:
     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/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index da6536b..8b3d015 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-16  Jiong Wang  <jiong.wang@arm.com>
+
+	* gas/aarch64/reloc-tlsldm-1.s: New testcase.
+	* gas/aarch64/reloc-tlsldm-ilp32-1.s: Ditto.
+	* gas/aarch64/reloc-tlsldm-1.d: New expectation file.
+	* gas/aarch64/reloc-tlsldm-ilp32-1.d: Ditto.
+
 2015-07-16  James Greenhalgh  <james.greenhalgh@arm.com>
 
 	* gas/arm/arch7em-bad.l: Update expected errors.
diff --git a/gas/testsuite/gas/aarch64/reloc-tlsldm-1.d b/gas/testsuite/gas/aarch64/reloc-tlsldm-1.d
new file mode 100644
index 0000000..30276d1
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-tlsldm-1.d
@@ -0,0 +1,10 @@
+#objdump: -dr
+
+.*:     file format .*
+
+Disassembly of section \.text:
+
+0000000000000000 <.*>:
+   0:	8b030041 	add	x1, x2, x3
+   4:	10000000 	adr	x0, 0 <dummy>
+			4: R_AARCH64_TLSLD_ADR_PREL21	dummy
diff --git a/gas/testsuite/gas/aarch64/reloc-tlsldm-1.s b/gas/testsuite/gas/aarch64/reloc-tlsldm-1.s
new file mode 100644
index 0000000..80512b1
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-tlsldm-1.s
@@ -0,0 +1,6 @@
+// Test file for AArch64 GAS -- tlsldm
+
+func:
+	add	x1, x2, x3
+	// BFD_RELOC_AARCH64_TLSLD_ADR_PREL21
+	adr	x0, :tlsldm:dummy
diff --git a/gas/testsuite/gas/aarch64/reloc-tlsldm-ilp32-1.d b/gas/testsuite/gas/aarch64/reloc-tlsldm-ilp32-1.d
new file mode 100644
index 0000000..28686cd
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-tlsldm-ilp32-1.d
@@ -0,0 +1,11 @@
+#as: -mabi=ilp32
+#objdump: -dr
+
+.*:     file format .*
+
+Disassembly of section \.text:
+
+00000000 <.*>:
+   0:	8b030041 	add	x1, x2, x3
+   4:	10000000 	adr	x0, 0 <dummy>
+			4: R_AARCH64_P32_TLSLD_ADR_PREL21	dummy
diff --git a/gas/testsuite/gas/aarch64/reloc-tlsldm-ilp32-1.s b/gas/testsuite/gas/aarch64/reloc-tlsldm-ilp32-1.s
new file mode 100644
index 0000000..b0c5942
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-tlsldm-ilp32-1.s
@@ -0,0 +1,6 @@
+// Test file for AArch64 GAS -- tlsldm ILP32
+
+func:
+	add	x1, x2, x3
+	// BFD_RELOC_AARCH64_TLSLD_ADR_PREL21
+	adr	x0, :tlsldm:dummy