This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] [AArch64] GAS support BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14
- From: Jiong Wang <jiwang at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 1 Jun 2015 14:46:27 -0000
- Subject: [binutils-gdb] [AArch64] GAS support BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=3d715ce4202ef799e288261d08a5438c82e7c21e
commit 3d715ce4202ef799e288261d08a5438c82e7c21e
Author: Jiong Wang <jiong.wang@arm.com>
Date: Mon Jun 1 15:41:54 2015 +0100
[AArch64] GAS support BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14
This patch add BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14 support in Gas.
The relocation modifier
===
:gotpage_lo14:symbol
2015-06-01 Jiong.Wang <jiong.wang@arm.com>
bfd/
* reloc.c (BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14): New entry.
* bfd-in2.h: Regenerate.
* libbfd.h: Regenerate.
* elfnn-aarch64.c (elfNN_aarch64_howto_table): New entry for
BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14.
gas/
* config/tc-aarch64.c (reloc_table): New relocation modifiers.
(md_apply_fix): Support BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14.
(aarch64_force_relocation): Ditto.
gas/testsuite/
* gas/aarch64/ilp32-basic.s: New testcase.
* gas/aarch64/ilp32-basic.d: Ditto.
Diff:
---
bfd/ChangeLog | 8 ++++++++
bfd/bfd-in2.h | 3 +++
bfd/elfnn-aarch64.c | 16 ++++++++++++++++
bfd/libbfd.h | 1 +
bfd/reloc.c | 4 ++++
gas/ChangeLog | 6 ++++++
gas/config/tc-aarch64.c | 11 +++++++++++
gas/testsuite/ChangeLog | 5 +++++
gas/testsuite/gas/aarch64/ilp32-basic.d | 2 ++
gas/testsuite/gas/aarch64/ilp32-basic.s | 1 +
10 files changed, 57 insertions(+)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 678f0cc..e1ce381 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,13 @@
2015-06-01 Jiong Wang <jiong.wang@arm.com>
+ * reloc.c (BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14): New entry.
+ * bfd-in2.h: Regenerate.
+ * libbfd.h: Regenerate.
+ * elfnn-aarch64.c (elfNN_aarch64_howto_table): New entry for
+ BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14.
+
+2015-06-01 Jiong Wang <jiong.wang@arm.com>
+
* elfnn-aarch64.c (elfNN_aarch64_howto_table): Set overflow type to
complain_overflow_unsigned for BFD_RELOC_AARCH64_TLSLE_ADD_LO12.
* elfxx-aarch64.c (_bfd_aarch64_elf_resolve_relocation): Don't use
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 804820e..09331bd 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -5737,6 +5737,9 @@ the GOT entry for this symbol. Used in conjunction with
BFD_RELOC_AARCH64_ADR_GOTPAGE. Valid in ILP32 ABI only. */
BFD_RELOC_AARCH64_LD32_GOT_LO12_NC,
+/* Scaled 14 bit byte offset to the page base of the global offset table. */
+ BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14,
+
/* Scaled 15 bit byte offset to the page base of the global offset table. */
BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15,
diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
index 26f20c5..3104de7 100644
--- a/bfd/elfnn-aarch64.c
+++ b/bfd/elfnn-aarch64.c
@@ -848,6 +848,22 @@ static reloc_howto_type elfNN_aarch64_howto_table[] =
0xffc, /* dst_mask */
FALSE), /* pcrel_offset */
+ /* LD32: GOT offset to the page address of GOT table.
+ (G(S) - PAGE (_GLOBAL_OFFSET_TABLE_)) & 0x5ffc. */
+ HOWTO32 (AARCH64_R (LD32_GOTPAGE_LO14), /* type */
+ 2, /* rightshift */
+ 2, /* size (0 = byte, 1 = short, 2 = long) */
+ 12, /* bitsize */
+ FALSE, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_unsigned, /* complain_on_overflow */
+ bfd_elf_generic_reloc, /* special_function */
+ AARCH64_R_STR (LD32_GOTPAGE_LO14), /* name */
+ FALSE, /* partial_inplace */
+ 0x5ffc, /* src_mask */
+ 0x5ffc, /* dst_mask */
+ FALSE), /* pcrel_offset */
+
/* LD64: GOT offset to the page address of GOT table.
(G(S) - PAGE (_GLOBAL_OFFSET_TABLE_)) & 0x7ff8. */
HOWTO64 (AARCH64_R (LD64_GOTPAGE_LO15), /* type */
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index 73a5803..b2a0979 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -2733,6 +2733,7 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
"BFD_RELOC_AARCH64_ADR_GOT_PAGE",
"BFD_RELOC_AARCH64_LD64_GOT_LO12_NC",
"BFD_RELOC_AARCH64_LD32_GOT_LO12_NC",
+ "BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14",
"BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15",
"BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21",
"BFD_RELOC_AARCH64_TLSGD_ADR_PREL21",
diff --git a/bfd/reloc.c b/bfd/reloc.c
index 4ee384f..7f2b31e 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -6762,6 +6762,10 @@ ENUMDOC
the GOT entry for this symbol. Used in conjunction with
BFD_RELOC_AARCH64_ADR_GOTPAGE. Valid in ILP32 ABI only.
ENUM
+ BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14
+ENUMDOC
+ Scaled 14 bit byte offset to the page base of the global offset table.
+ENUM
BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15
ENUMDOC
Scaled 15 bit byte offset to the page base of the global offset table.
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4d06707..3b606ea 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,6 +1,12 @@
2015-06-01 Jiong Wang <jiong.wang@arm.com>
* config/tc-aarch64.c (reloc_table): New relocation modifiers.
+ (md_apply_fix): Support BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14.
+ (aarch64_force_relocation): Ditto.
+
+2015-06-01 Jiong Wang <jiong.wang@arm.com>
+
+ * config/tc-aarch64.c (reloc_table): New relocation modifiers.
(md_apply_fix): Support BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15.
(aarch64_force_relocation): Ditto.
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index 2139f9d..2782a2a 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -2598,6 +2598,15 @@ static struct reloc_table_entry reloc_table[] = {
0,
BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15,
0},
+
+ /* 14bit offset from got entry to base address of GOT table. */
+ {"gotpage_lo14", 0,
+ 0,
+ 0,
+ 0,
+ 0,
+ BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14,
+ 0},
};
/* Given the address of a pointer pointing to the textual name of a
@@ -6767,6 +6776,7 @@ md_apply_fix (fixS * fixP, valueT * valP, segT seg)
case BFD_RELOC_AARCH64_ADR_HI21_PCREL:
case BFD_RELOC_AARCH64_GOT_LD_PREL19:
case BFD_RELOC_AARCH64_LD32_GOT_LO12_NC:
+ case BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14:
case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15:
case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC:
case BFD_RELOC_AARCH64_LDST128_LO12:
@@ -6921,6 +6931,7 @@ aarch64_force_relocation (struct fix *fixp)
case BFD_RELOC_AARCH64_ADR_HI21_PCREL:
case BFD_RELOC_AARCH64_GOT_LD_PREL19:
case BFD_RELOC_AARCH64_LD32_GOT_LO12_NC:
+ case BFD_RELOC_AARCH64_LD32_GOTPAGE_LO14:
case BFD_RELOC_AARCH64_LD64_GOTPAGE_LO15:
case BFD_RELOC_AARCH64_LD64_GOT_LO12_NC:
case BFD_RELOC_AARCH64_LDST128_LO12:
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 83a73d1..38751eb 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2015-06-01 Jiong Wang <jiong.wang@arm.com>
+ * gas/aarch64/ilp32-basic.s: New testcase.
+ * gas/aarch64/ilp32-basic.d: Ditto.
+
+2015-06-01 Jiong Wang <jiong.wang@arm.com>
+
* gas/aarch64/reloc-insn.s: New testcase.
* gas/aarch64/reloc-insn.d: Ditto.
diff --git a/gas/testsuite/gas/aarch64/ilp32-basic.d b/gas/testsuite/gas/aarch64/ilp32-basic.d
index 2e5146a..3caef3e 100644
--- a/gas/testsuite/gas/aarch64/ilp32-basic.d
+++ b/gas/testsuite/gas/aarch64/ilp32-basic.d
@@ -21,3 +21,5 @@ Disassembly of section \.text:
18: R_AARCH64_P32_LD32_GOT_LO12_NC ptrs
1c: 2a0403e0 mov w0, w4
20: d65f03c0 ret
+ 24: f9400083 ldr x3, \[x4\]
+ 24: R_AARCH64_P32_LD32_GOTPAGE_LO14 ptrs
diff --git a/gas/testsuite/gas/aarch64/ilp32-basic.s b/gas/testsuite/gas/aarch64/ilp32-basic.s
index 790dcdf..ab11ea8 100644
--- a/gas/testsuite/gas/aarch64/ilp32-basic.s
+++ b/gas/testsuite/gas/aarch64/ilp32-basic.s
@@ -13,5 +13,6 @@ foo:
ldr x3, [x4,#:got_lo12:ptrs]
mov w0, w4
ret
+ ldr x3, [x4,#:gotpage_lo14:ptrs]
.size foo, .-foo
.comm ptrs,12,8