diff options
| author | Nick Clifton <nickc@redhat.com> | 2017-03-13 09:58:04 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2017-03-13 09:58:04 +0000 |
| commit | f955cccff399ccc4e16b8e90f140f2e9a785a07b (patch) | |
| tree | 0e29d41c5217fb0e4ebebed6b54aed12a5c994ee /gas | |
| parent | d40e34db392f834793fb9af487121776b4cec6e7 (diff) | |
| download | gdb-f955cccff399ccc4e16b8e90f140f2e9a785a07b.zip gdb-f955cccff399ccc4e16b8e90f140f2e9a785a07b.tar.gz gdb-f955cccff399ccc4e16b8e90f140f2e9a785a07b.tar.bz2 | |
Rename R_AARCH64_TLSDESC_LD64_LO12_NC to R_AARCH64_TLSDESC_LD64_LO12 and R_AARCH64_TLSDESC_ADD_LO12_NC to R_AARCH64_TLSDESC_ADD_LO12.
PR binutils/21202
include * elf/aarch64.h (R_AARCH64_TLSDESC_LD64_LO12_NC): Rename to
R_AARCH64_TLSDESC_LD64_LO12.
(R_AARCH64_TLSDESC_ADD_LO12_NC): Rename to
R_AARCH64_TLSDESC_ADD_LO12_NC.
bfd * reloc.c (BFD_RELOC_AARCH64_TLSDESC_LD64_LO12_NC): Rename to
BFD_RELOC_AARCH64_TLSDESC_LD64_LO12.
(BFD_RELOC_AARCH64_TLSDESC_ADD_LO12_NC): Rename to
BFD_RELOC_AARCH64_TLSDESC_ADD_LO12.
* bfd-in2.h: Regenerate.
* libbfd.h: Regenerate.
* elfnn-aarch64.c (IS_AARCH64_TLS_RELAX_RELOC): Update reloc
names.
(IS_AARCH64_TLSDESC_RELOC): Likewise.
(elfNN_aarch64_howto_table): Likewise.
(aarch64_tls_transition_without_check): Likewise.
(aarch64_reloc_got_type): Likewise.
(elfNN_aarch64_final_link_relocate): Likewise.
(elfNN_aarch64_tls_relax): Likewise.
(elfNN_aarch64_relocate_section): Likewise.
(elfNN_aarch64_gc_sweep_hook): Likewise.
(elfNN_aarch64_check_relocs): Likewise.
* elfxx-aarch64.c (_bfd_aarch64_elf_put_addend): Likewise.
(_bfd_aarch64_elf_resolve_relocation): Likewise.
gas * config/tc-aarch64.c (reloc_table): Rename
BFD_RELOC_AARCH64_TLSDESC_LD64_LO12_NC to
BFD_RELOC_AARCH64_TLSDESC_LD64_LO12. Rname
BFD_RELOC_AARCH64_TLSDESC_ADD_LO12_NC to
BFD_RELOC_AARCH64_TLSDESC_ADD_LO12.
(md_apply_fix): Likewise.
(aarch64_force_relocation): Likewise.
* testsuite/gas/aarch64/tls.d: Update regexp.
ld * testsuite/ld-aarch64/ifunc-5r-local.d: Update regexp.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 12 | ||||
| -rw-r--r-- | gas/config/tc-aarch64.c | 12 | ||||
| -rw-r--r-- | gas/testsuite/gas/aarch64/tls.d | 4 |
3 files changed, 20 insertions, 8 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 3673fd6..4d6dd4e 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,15 @@ +2017-03-13 Nick Clifton <nickc@redhat.com> + + PR binutils/21202 + * config/tc-aarch64.c (reloc_table): Rename + BFD_RELOC_AARCH64_TLSDESC_LD64_LO12_NC to + BFD_RELOC_AARCH64_TLSDESC_LD64_LO12. Rname + BFD_RELOC_AARCH64_TLSDESC_ADD_LO12_NC to + BFD_RELOC_AARCH64_TLSDESC_ADD_LO12. + (md_apply_fix): Likewise. + (aarch64_force_relocation): Likewise. + * testsuite/gas/aarch64/tls.d: Update regexp. + 2017-03-10 Tobin C. Harding <me@tobin.cc> Nick Clifton <nickc@redhat.com> diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c index 969c18c..a9dbd54 100644 --- a/gas/config/tc-aarch64.c +++ b/gas/config/tc-aarch64.c @@ -2679,7 +2679,7 @@ static struct reloc_table_entry reloc_table[] = { 0, /* adr_type */ 0, 0, - BFD_RELOC_AARCH64_TLSDESC_ADD_LO12_NC, + BFD_RELOC_AARCH64_TLSDESC_ADD_LO12, BFD_RELOC_AARCH64_TLSDESC_LD_LO12_NC, 0}, @@ -7677,7 +7677,7 @@ md_apply_fix (fixS * fixP, valueT * valP, segT seg) case BFD_RELOC_AARCH64_TLSDESC_LD_LO12_NC: fixP->fx_r_type = (ilp32_p ? BFD_RELOC_AARCH64_TLSDESC_LD32_LO12_NC - : BFD_RELOC_AARCH64_TLSDESC_LD64_LO12_NC); + : BFD_RELOC_AARCH64_TLSDESC_LD64_LO12); S_SET_THREAD_LOCAL (fixP->fx_addsy); /* Should always be exported to object file, see aarch64_force_relocation(). */ @@ -7685,11 +7685,11 @@ md_apply_fix (fixS * fixP, valueT * valP, segT seg) gas_assert (seg->use_rela_p); break; - case BFD_RELOC_AARCH64_TLSDESC_ADD_LO12_NC: + case BFD_RELOC_AARCH64_TLSDESC_ADD_LO12: case BFD_RELOC_AARCH64_TLSDESC_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSDESC_ADR_PREL21: case BFD_RELOC_AARCH64_TLSDESC_LD32_LO12_NC: - case BFD_RELOC_AARCH64_TLSDESC_LD64_LO12_NC: + case BFD_RELOC_AARCH64_TLSDESC_LD64_LO12: case BFD_RELOC_AARCH64_TLSDESC_LD_PREL19: case BFD_RELOC_AARCH64_TLSGD_ADD_LO12_NC: case BFD_RELOC_AARCH64_TLSGD_ADR_PAGE21: @@ -7917,11 +7917,11 @@ aarch64_force_relocation (struct fix *fixp) case BFD_RELOC_AARCH64_LDST32_LO12: case BFD_RELOC_AARCH64_LDST64_LO12: case BFD_RELOC_AARCH64_LDST8_LO12: - case BFD_RELOC_AARCH64_TLSDESC_ADD_LO12_NC: + case BFD_RELOC_AARCH64_TLSDESC_ADD_LO12: case BFD_RELOC_AARCH64_TLSDESC_ADR_PAGE21: case BFD_RELOC_AARCH64_TLSDESC_ADR_PREL21: case BFD_RELOC_AARCH64_TLSDESC_LD32_LO12_NC: - case BFD_RELOC_AARCH64_TLSDESC_LD64_LO12_NC: + case BFD_RELOC_AARCH64_TLSDESC_LD64_LO12: case BFD_RELOC_AARCH64_TLSDESC_LD_PREL19: case BFD_RELOC_AARCH64_TLSDESC_OFF_G0_NC: case BFD_RELOC_AARCH64_TLSDESC_OFF_G1: diff --git a/gas/testsuite/gas/aarch64/tls.d b/gas/testsuite/gas/aarch64/tls.d index 92932e6..dc18949 100644 --- a/gas/testsuite/gas/aarch64/tls.d +++ b/gas/testsuite/gas/aarch64/tls.d @@ -8,9 +8,9 @@ Disassembly of section \.text: 0: 90000000 adrp x0, 0 <var> 0: R_AARCH64_(P32_|)TLSDESC_ADR_PAGE21 var 4: f9400001 ldr x1, \[x0\] - 4: R_AARCH64_(P32_|)TLSDESC_LD(64|32)_LO12_NC var + 4: R_AARCH64_(P32_|)TLSDESC_LD(64|32)_LO12(_NC|) var 8: 91000000 add x0, x0, #0x0 - 8: R_AARCH64_(P32_|)TLSDESC_ADD_LO12_NC var + 8: R_AARCH64_(P32_|)TLSDESC_ADD_LO12 var c: d63f0020 blr x1 c: R_AARCH64_(P32_|)TLSDESC_CALL var 10: 90000000 adrp x0, 0 <var> |