aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bfd/ChangeLog8
-rw-r--r--bfd/bfd-in2.h5
-rw-r--r--bfd/elfnn-aarch64.c15
-rw-r--r--bfd/libbfd.h1
-rw-r--r--bfd/reloc.c6
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/config/tc-aarch64.c11
-rw-r--r--gas/testsuite/ChangeLog7
-rw-r--r--gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-1.d10
-rw-r--r--gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-1.s5
-rw-r--r--gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.d11
-rw-r--r--gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.s5
12 files changed, 90 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 01a29c8..6e12da3 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,13 @@
2015-08-11 Jiong Wang <jiong.wang@arm.com>
+ * reloc.c (BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC): New entry.
+ * bfd-in2.h: Regenerate.
+ * libbfd.h: Regenerate.
+ * elfnn-aarch64.c (elfNN_aarch64_howto_table): New entry for
+ BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC.
+
+2015-08-11 Jiong Wang <jiong.wang@arm.com>
+
* elfnn-aarch64.c (IS_AARCH64_TLS_RELOC): Recognize
BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21.
(aarch64_reloc_got_type): Likewise.
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 43e1324..350b955 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -5794,6 +5794,11 @@ BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21. */
/* AArch64 TLS INITIAL EXEC relocation. */
BFD_RELOC_AARCH64_TLSIE_LD_GOTTPREL_PREL19,
+/* Unsigned 12 bit byte offset to global offset table entry for a symbols
+tls_index structure. Used in conjunction with
+BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21. */
+ BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC,
+
/* GOT entry page address for AArch64 TLS Local Dynamic, used with ADRP
instruction. */
BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21,
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index ff56701..12c1220 100644
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -1026,6 +1026,21 @@ static reloc_howto_type elfNN_aarch64_howto_table[] =
0x1ffffc, /* dst_mask */
FALSE), /* pcrel_offset */
+ /* ADD: GOT offset G(S) & 0xff8 [no overflow check] */
+ HOWTO (AARCH64_R (TLSLD_ADD_LO12_NC), /* type */
+ 0, /* rightshift */
+ 2, /* size (0 = byte, 1 = short, 2 = long) */
+ 12, /* bitsize */
+ FALSE, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_dont, /* complain_on_overflow */
+ bfd_elf_generic_reloc, /* special_function */
+ AARCH64_R_STR (TLSLD_ADD_LO12_NC), /* name */
+ FALSE, /* partial_inplace */
+ 0xfff, /* src_mask */
+ 0xfff, /* 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 */
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index 03e9393..d6ed8fd 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_ADD_LO12_NC",
"BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21",
"BFD_RELOC_AARCH64_TLSLD_ADR_PREL21",
"BFD_RELOC_AARCH64_TLSLE_MOVW_TPREL_G2",
diff --git a/bfd/reloc.c b/bfd/reloc.c
index d6252c8..df22f9b 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -6844,6 +6844,12 @@ ENUM
ENUMDOC
AArch64 TLS INITIAL EXEC relocation.
ENUM
+ BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC
+ENUMDOC
+ Unsigned 12 bit byte offset to global offset table entry for a symbols
+ tls_index structure. Used in conjunction with
+ BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21.
+ENUM
BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21
ENUMDOC
GOT entry page address for AArch64 TLS Local Dynamic, used with ADRP
diff --git a/gas/ChangeLog b/gas/ChangeLog
index a97108a..314735a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,6 +1,12 @@
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_ADD_LO12_NC.
+ (aarch64_force_relocation): Likewise.
+
+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.
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index c01ec6d..a633b04 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -2513,6 +2513,15 @@ static struct reloc_table_entry reloc_table[] = {
0,
0},
+ /* 12 bit offset into the page containing GOT TLS entry for a symbol */
+ {"tlsldm_lo12_nc", 0,
+ 0, /* adr_type */
+ 0,
+ 0,
+ BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC,
+ 0,
+ 0},
+
/* Get to the page containing GOT TLS entry for a symbol */
{"gottprel", 0,
0, /* adr_type */
@@ -6778,6 +6787,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_ADD_LO12_NC:
case BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21:
case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21:
case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12:
@@ -6989,6 +6999,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_ADD_LO12_NC:
case BFD_RELOC_AARCH64_TLSLD_ADR_PAGE21:
case BFD_RELOC_AARCH64_TLSLD_ADR_PREL21:
case BFD_RELOC_AARCH64_TLSLE_ADD_TPREL_HI12:
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index b790d4a..9449f1d 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,12 @@
2015-08-11 Jiong Wang <jiong.wang@arm.com>
+ * gas/aarch64/reloc-tlsldm_lo12_nc-1.s: New testcase.
+ * gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.s: Likewise.
+ * gas/aarch64/reloc-tlsldm_lo12_nc-1.d: New expectation file.
+ * gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.d: Likewise.
+
+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.
diff --git a/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-1.d b/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-1.d
new file mode 100644
index 0000000..9054036
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-1.d
@@ -0,0 +1,10 @@
+#objdump: -dr
+
+.*: file format .*
+
+Disassembly of section \.text:
+
+0000000000000000 <.*>:
+ 0: 91000000 add x0, x0, #0x0
+ 0: R_AARCH64_TLSLD_ADD_LO12_NC x
+
diff --git a/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-1.s b/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-1.s
new file mode 100644
index 0000000..676bbfc
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-1.s
@@ -0,0 +1,5 @@
+// Test file for AArch64 GAS -- reloc 519
+
+func:
+ // BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC
+ add x0, x0, #:tlsldm_lo12_nc:x
diff --git a/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.d b/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.d
new file mode 100644
index 0000000..f068cfb
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.d
@@ -0,0 +1,11 @@
+#as: -mabi=ilp32
+#objdump: -dr
+
+.*: file format .*
+
+Disassembly of section \.text:
+
+00000000 <.*>:
+ 0: 91000000 add x0, x0, #0x0
+ 0: R_AARCH64_P32_TLSLD_ADD_LO12_NC x
+
diff --git a/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.s b/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.s
new file mode 100644
index 0000000..2556276
--- /dev/null
+++ b/gas/testsuite/gas/aarch64/reloc-tlsldm_lo12_nc-ilp32-1.s
@@ -0,0 +1,5 @@
+// Test file for AArch64 GAS -- reloc 85
+
+func:
+ // BFD_RELOC_AARCH64_TLSLD_ADD_LO12_NC
+ add x0, x0, #:tlsldm_lo12_nc:x
generated by cgit v1.1 at 2024-11-23 09:05:11 +0000