[PATCH, COMMITTED] [AArch64] Replace the :got_prel19: address modifier with :got:

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3eb87ec0ad3c0a4f9ea5308a170ae2be1eb091a2..4551f9996f1f6f23f64f676ed7a5fc4204fd0946 100644 (file)
--- 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 2665b75675ceec67e1f2f804f1e252ac24e01168..7b21396fb22289c135c4153b6069898058f178b0 100644 (file)
--- 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 e309d0ea0bafed26e806dece96f42315e11d63f7..e48f88c4deb23cdcfdbda39f43965975fa5b41d0 100644 (file)
--- 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 1d13900c30f28ab867898c4037e75b42d2094250..99ca9659de0901b5a055db408147b3375cb62f28 100644 (file)
--- 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

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 54e7a78ef6ee48342248767fd75626abf7eaa79b..a4635705f728a84a775082b27d7f2dc7d3173cce 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-03  Marcus Shawcroft  <marcus.shawcroft@arm.com>
+
+       * ld-aarch64/emit-relocs-309.s: Replace got_prel19 with got.
+       * ld-aarch64/gc-relocs-309.s: Likewise.
+
 2013-07-02  Marcus Shawcroft  <marcus.shawcroft@arm.com>
 
        * ld-aarch64/gc-plt-relocs.d: Adjust expected .got offsets.

diff --git a/ld/testsuite/ld-aarch64/emit-relocs-309.s b/ld/testsuite/ld-aarch64/emit-relocs-309.s
index d66c64b1c5cd1ee706d2f9699bd271306d81da36..edf47cdbd2823e23e9f15eed1425568959c8e301 100644 (file)
--- a/ld/testsuite/ld-aarch64/emit-relocs-309.s
+++ b/ld/testsuite/ld-aarch64/emit-relocs-309.s
@@ -11,4 +11,4 @@
 
 _start:
        nop
-       ldr     x0, :got_prel19:src
+       ldr     x0, :got:src

diff --git a/ld/testsuite/ld-aarch64/gc-relocs-309.s b/ld/testsuite/ld-aarch64/gc-relocs-309.s
index 06901bf224e700ebe7e9eade3ae859f9931f86b3..cdafc9c6560e173f40ebe1cd9f37d0e0d8e96e3c 100644 (file)
--- a/ld/testsuite/ld-aarch64/gc-relocs-309.s
+++ b/ld/testsuite/ld-aarch64/gc-relocs-309.s
@@ -3,5 +3,4 @@
 .text
 _test_gc_rel309:
        nop
-       ldr     x1, :got_prel19:sym309_notused
-
+       ldr     x1, :got:sym309_notused