aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorMarcus Shawcroft <mshawcroft@sourceware.org>2013-07-03 17:26:36 +0000
committerMarcus Shawcroft <mshawcroft@sourceware.org>2013-07-03 17:26:36 +0000
commit4aa2c5e2cb4076f2b82a3de5c0ef8ddd13467506 (patch)
tree9f64ae94ae884be2b29f6108fbb0b1fcde04bf0c /gas
parent2c0a3565e50d7b794b4e32c8e6499d53189409fc (diff)
downloadgdb-4aa2c5e2cb4076f2b82a3de5c0ef8ddd13467506.zip
gdb-4aa2c5e2cb4076f2b82a3de5c0ef8ddd13467506.tar.gz
gdb-4aa2c5e2cb4076f2b82a3de5c0ef8ddd13467506.tar.bz2
[PATCH, COMMITTED] [AArch64] Replace the :got_prel19: address modifier with :got:
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog4
-rw-r--r--gas/config/tc-aarch64.c10
-rw-r--r--gas/testsuite/ChangeLog4
-rw-r--r--gas/testsuite/gas/aarch64/reloc-insn.s2
4 files changed, 12 insertions, 8 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3eb87ec..4551f99 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,9 @@
2013-07-03 Marcus Shawcroft <marcus.shawcroft@arm.com>
+ * config/tc-aarch64.c (reloc_table): Merge got_prel19 into got.
+
+2013-07-02 Marcus Shawcroft <marcus.shawcroft@arm.com>
+
* config/tc-aarch64.c (md_apply_fix): Reorder case values.
(aarch64_force_relocation): Likewise.
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index 2665b75..7b21396 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -2360,18 +2360,14 @@ static struct reloc_table_entry reloc_table[] = {
BFD_RELOC_AARCH64_MOVW_G3,
0,
0},
- /* Get to the GOT entry for a symbol. */
- {"got_prel19", 0,
- 0,
- 0,
- 0,
- BFD_RELOC_AARCH64_GOT_LD_PREL19},
+
/* Get to the page containing GOT entry for a symbol. */
{"got", 1,
BFD_RELOC_AARCH64_ADR_GOT_PAGE,
0,
0,
- 0},
+ BFD_RELOC_AARCH64_GOT_LD_PREL19},
+
/* 12 bit offset into the page containing GOT entry for that symbol. */
{"got_lo12", 0,
0,
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index e309d0e..e48f88c 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-03 Marcus Shawcroft <marcus.shawcroft@arm.com>
+
+ * gas/aarch64/reloc-insn.s (func): Replace :got_prel19: with :got:.
+
2013-06-26 Yufeng Zhang <yufeng.zhang@arm.com>
* gas/aarch64/ilp32-basic.d: New file.
diff --git a/gas/testsuite/gas/aarch64/reloc-insn.s b/gas/testsuite/gas/aarch64/reloc-insn.s
index 1d13900..99ca965 100644
--- a/gas/testsuite/gas/aarch64/reloc-insn.s
+++ b/gas/testsuite/gas/aarch64/reloc-insn.s
@@ -178,7 +178,7 @@ func:
prfm pstl1keep, [x7, #:lo12:ldata+4100]
// BFD_RELOC_AARCH64_GOT_LD_PREL19
- ldr x0, :got_prel19:cdata
+ ldr x0, :got:cdata
ldrb w1, [x0]
ret