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][2/3] GAS support BFD_RELOC_AARCH64_TLSLD_ADR_PREL21

From: Jiong Wang <jiwang at sourceware dot org>
To: bfd-cvs at sourceware dot org
Date: 16 Jul 2015 14:47:06 -0000
Subject: [binutils-gdb] [AArch64][2/3] GAS support BFD_RELOC_AARCH64_TLSLD_ADR_PREL21
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6c37fedc41b028905cc828c0eccd3a8720512e4e

commit 6c37fedc41b028905cc828c0eccd3a8720512e4e
Author: Jiong Wang <jiong.wang@arm.com>
Date:   Thu Jul 16 15:43:21 2015 +0100

    [AArch64][2/3] GAS support BFD_RELOC_AARCH64_TLSLD_ADR_PREL21

Diff:
---
 bfd/ChangeLog                                    |  8 ++++++++
 bfd/bfd-in2.h                                    |  3 +++
 bfd/elfnn-aarch64.c                              | 14 ++++++++++++++
 bfd/libbfd.h                                     |  1 +
 bfd/reloc.c                                      |  4 ++++
 gas/ChangeLog                                    |  6 ++++++
 gas/config/tc-aarch64.c                          | 15 +++++++++++++++
 gas/testsuite/ChangeLog                          |  7 +++++++
 gas/testsuite/gas/aarch64/reloc-tlsldm-1.d       | 10 ++++++++++
 gas/testsuite/gas/aarch64/reloc-tlsldm-1.s       |  6 ++++++
 gas/testsuite/gas/aarch64/reloc-tlsldm-ilp32-1.d | 11 +++++++++++
 gas/testsuite/gas/aarch64/reloc-tlsldm-ilp32-1.s |  6 ++++++
 12 files changed, 91 insertions(+)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b552c9f..ffb470f 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2015-07-16  Jiong Wang  <jiong.wang@arm.com>
+
+	* reloc.c (BFD_RELOC_AARCH64_TLSLD_ADR_PREL21): New entry.
+	* bfd-in2.h: Regenerate.
+	* libbfd.h: Regenerate.
+	* elfnn-aarch64.c (elfNN_aarch64_howto_table): New entry for
+	BFD_RELOC_AARCH64_TLSLD_ADR_PREL21.
+
 2015-07-10  H.J. Lu  <hongjiu.lu@intel.com>
 
 	 PR binutils/18656
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index e963687..c27db8d 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -5794,6 +5794,9 @@ BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21.  */
 /* AArch64 TLS INITIAL EXEC relocation.  */
   BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19,
 
+/* GOT entry address for AArch64 TLS Local Dynamic, used with ADR instruction.  */
+  BFD_RELOC_AARCH64_TLSLD_ADR_PREL21,
+
 /* AArch64 TLS LOCAL EXEC relocation.  */
   BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G2,
 
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index b13f5db..a1d926f 100644
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -1024,6 +1024,20 @@ static reloc_howto_type elfNN_aarch64_howto_table[] =
 	 0x1ffffc,		/* dst_mask */
 	 FALSE),		/* pcrel_offset */
 
+  HOWTO (AARCH64_R (TLSLD_ADR_PREL21),	/* type */
+	 0,			/* rightshift */
+	 2,			/* size (0 = byte, 1 = short, 2 = long) */
+	 21,			/* bitsize */
+	 TRUE,			/* pc_relative */
+	 0,			/* bitpos */
+	 complain_overflow_signed,	/* complain_on_overflow */
+	 bfd_elf_generic_reloc,	/* special_function */
+	 AARCH64_R_STR (TLSLD_ADR_PREL21),	/* name */
+	 FALSE,			/* partial_inplace */
+	 0x1fffff,		/* src_mask */
+	 0x1fffff,		/* dst_mask */
+	 TRUE),			/* pcrel_offset */
+
   HOWTO64 (AARCH64_R (TLSLE_MOVW_TPREL_G2),	/* type */
 	 32,			/* rightshift */
 	 2,			/* size (0 = byte, 1 = short, 2 = long) */
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index 39c5e71..18e3c40 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -2759,6 +2759,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
   "BFD_RELOC_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC",
   "BFD_RELOC_AARCH64_TLSIE_LD32_GOTTPREL_LO12_NC",
   "BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19",
+  "BFD_RELOC_AARCH64_TLSLD_ADR_PREL21",
   "BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G2",
   "BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G1",
   "BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G1_NC",
diff --git a/bfd/reloc.c b/bfd/reloc.c
index 1d16670..3478006 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -6844,6 +6844,10 @@ ENUM
 ENUMDOC
   AArch64 TLS INITIAL EXEC relocation.
 ENUM
+  BFD_RELOC_AARCH64_TLSLD_ADR_PREL21
+ENUMDOC
+  GOT entry address for AArch64 TLS Local Dynamic, used with ADR instruction.
+ENUM
   BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G2
 ENUMDOC
   AArch64 TLS LOCAL EXEC relocation.
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
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]