aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bfd/ChangeLog8
-rw-r--r--bfd/bfd-in2.h4
-rw-r--r--bfd/elfnn-aarch64.c16
-rw-r--r--bfd/libbfd.h1
-rw-r--r--bfd/reloc.c5
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/config/tc-aarch64.c4
-rw-r--r--gas/testsuite/ChangeLog7
-rw-r--r--gas/testsuite/gas/aarch64/reloc-tlsldm-page-1.d10
-rw-r--r--gas/testsuite/gas/aarch64/reloc-tlsldm-page-1.s6
-rw-r--r--gas/testsuite/gas/aarch64/reloc-tlsldm-page-ilp32-1.d12
-rw-r--r--gas/testsuite/gas/aarch64/reloc-tlsldm-page-ilp32-1.s6
12 files changed, 84 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7912368..666b3cd 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2015-08-11 Jiong Wang <jiong.wang@arm.com>
+
+ * reloc.c (BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21): New entry.
+ * bfd-in2.h: Regenerate.
+ * libbfd.h: Regenerate.
+ * elfnn-aarch64.c (elfNN_aarch64_howto_table): New entry for
+ BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21.
+
2015-08-11 H.J. Lu <hongjiu.lu@intel.com>
PR ld/18808
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index c27db8d..43e1324 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -5794,6 +5794,10 @@ BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21. */
/* AArch64 TLS INITIAL EXEC relocation. */
BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19,
+/* GOT entry page address for AArch64 TLS Local Dynamic, used with ADRP
+instruction. */
+ BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21,
+
/* GOT entry address for AArch64 TLS Local Dynamic, used with ADR instruction. */
BFD_RELOC_AARCH64_TLSLD_ADR_PREL21,
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 9712253..16769bc 100644
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -1025,6 +1025,22 @@ static reloc_howto_type elfNN_aarch64_howto_table[] =
0x1ffffc, /* dst_mask */
FALSE), /* pcrel_offset */
+ /* Get to the page for the GOT entry for the symbol
+ (G(S) - P) using an ADRP instruction. */
+ HOWTO (AARCH64_R (TLSLD_ADR_PAGE21), /* type */
+ 12, /* 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_PAGE21), /* name */
+ FALSE, /* partial_inplace */
+ 0x1fffff, /* src_mask */
+ 0x1fffff, /* dst_mask */
+ TRUE), /* pcrel_offset */
+
HOWTO (AARCH64_R (TLSLD_ADR_PREL21), /* type */
0, /* rightshift */
2, /* size (0 = byte, 1 = short, 2 = long) */
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index 18e3c40..03e9393 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_PAGE21",
"BFD_RELOC_AARCH64_TLSLD_ADR_PREL21",
"BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G2",
"BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G1",
diff --git a/bfd/reloc.c b/bfd/reloc.c
index 3478006..d6252c8 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -6844,6 +6844,11 @@ ENUM
ENUMDOC
AArch64 TLS INITIAL EXEC relocation.
ENUM
+ BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21
+ENUMDOC
+ GOT entry page address for AArch64 TLS Local Dynamic, used with ADRP
+ instruction.
+ENUM
BFD_RELOC_AARCH64_TLSLD_ADR_PREL21
ENUMDOC
GOT entry address for AArch64 TLS Local Dynamic, used with ADR instruction.
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9cf4ab4..a97108a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-11 Jiong Wang <jiong.wang@arm.com>
+
+ * config/tc-aarch64.c (reloc_table): New relocation modifiers.
+ (md_apply_fix): Support BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21.
+ (aarch64_force_relocation): Likewise.
+
2015-08-11 Nick Clifton <nickc@redhat.com>
PR gas/18765
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index 8d403f3..c01ec6d 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -2507,7 +2507,7 @@ static struct reloc_table_entry reloc_table[] = {
zero without any outstanding runtime relocation. */
{"tlsldm", 0,
BFD_RELOC_AARCH64_TLSLD_ADR_PREL21, /* adr_type */
- 0,
+ BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21,
0,
0,
0,
@@ -6778,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_PAGE21:
case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21:
case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12:
case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12:
@@ -6988,6 +6989,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_PAGE21:
case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21:
case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12:
case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_LO12:
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index e2e3fd4..b790d4a 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2015-08-11 Jiong Wang <jiong.wang@arm.com>
+
+ * gas/aarch64/reloc-tlsldm-page-1.s: New testcase.
+ * gas/aarch64/reloc-tlsldm-page-ilp32-1.s: Likewise.
+ * gas/aarch64/reloc-tlsldm-page-1.d: New expectation file.
+ * gas/aarch64/reloc-tlsldm-page-ilp32-1.d: Likewise.
+
2015-08-10 Robert Suchanek <robert.suchanek@imgtec.com>
* gas/mips/r6.s: Add tests for "sigrie".
diff --git a/gas/testsuite/gas/aarch64/reloc-tlsldm-page-1.d b/gas/testsuite/gas/aarch64/reloc-tlsldm-page-1.d
new file mode 100644
index 0000000..5d757a4
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-tlsldm-page-1.d
@@ -0,0 +1,10 @@
+#objdump: -dr
+
+.*: file format .*
+
+Disassembly of section \.text:
+
+0000000000000000 <.*>:
+ 0: 8b030041 add x1, x2, x3
+ 4: 90000000 adrp x0, 0 <dummy>
+ 4: R_AARCH64_TLSLD_ADR_PAGE21 dummy
diff --git a/gas/testsuite/gas/aarch64/reloc-tlsldm-page-1.s b/gas/testsuite/gas/aarch64/reloc-tlsldm-page-1.s
new file mode 100644
index 0000000..8e7ffab
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-tlsldm-page-1.s
@@ -0,0 +1,6 @@
+// Test file for AArch64 GAS -- tlsldm page
+
+func:
+ add x1, x2, x3
+ // BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21
+ adrp x0, :tlsldm:dummy
diff --git a/gas/testsuite/gas/aarch64/reloc-tlsldm-page-ilp32-1.d b/gas/testsuite/gas/aarch64/reloc-tlsldm-page-ilp32-1.d
new file mode 100644
index 0000000..e2c81ef
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-tlsldm-page-ilp32-1.d
@@ -0,0 +1,12 @@
+#as: -mabi=ilp32
+#objdump: -dr
+
+.*: file format .*
+
+Disassembly of section \.text:
+
+00000000 <.*>:
+ 0: 0b030041 add w1, w2, w3
+ 4: 90000000 adrp x0, 0 <dummy>
+ 4: R_AARCH64_P32_TLSLD_ADR_PAGE21 dummy
+
diff --git a/gas/testsuite/gas/aarch64/reloc-tlsldm-page-ilp32-1.s b/gas/testsuite/gas/aarch64/reloc-tlsldm-page-ilp32-1.s
new file mode 100644
index 0000000..ad9d29b
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-tlsldm-page-ilp32-1.s
@@ -0,0 +1,6 @@
+// Test file for AArch64 GAS -- tlsldm page ILP32
+
+func:
+ add w1, w2, w3
+ // BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21
+ adrp x0, :tlsldm:dummy
generated by cgit v1.1 at 2024-12-15 07:15:50 +0000