diff options
| -rw-r--r-- | gas/ChangeLog | 4 | ||||
| -rw-r--r-- | gas/config/tc-aarch64.c | 10 | ||||
| -rw-r--r-- | gas/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gas/testsuite/gas/aarch64/reloc-insn.s | 2 | ||||
| -rw-r--r-- | ld/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/emit-relocs-309.s | 2 | ||||
| -rw-r--r-- | ld/testsuite/ld-aarch64/gc-relocs-309.s | 3 |
7 files changed, 19 insertions, 11 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 diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 54e7a78..a463570 100644 --- 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 d66c64b..edf47cd 100644 --- 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 06901bf..cdafc9c 100644 --- 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 |