From f955cccff399ccc4e16b8e90f140f2e9a785a07b Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 13 Mar 2017 09:58:04 +0000 Subject: 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. --- gas/testsuite/gas/aarch64/tls.d | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gas/testsuite') 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 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 -- cgit v1.1