From c1229f84a41a6aba5b7df1f4261a9336347b068a Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 16 Sep 2020 09:25:56 +0930 Subject: [PATCH] Tidy elf_symbol_from bfd/ * elf-bfd.h (elf_symbol_from): Remove unused ABFD parameter. * elf.c (ignore_section_sym, _bfd_elf_copy_private_symbol_data), (swap_out_syms): Adjust elf_symbol_from invocation. binutils/ * nm.c (print_symbol): Adjust elf_symbol_from invocation. * objcopy.c (is_hidden_symbol): Likewise. gas/ * config/obj-elf.c (obj_elf_visibility, elf_frob_symbol): Adjust elf_symbol_from invocation. * config/tc-aarch64.c (s_variant_pcs): Likewise. * config/tc-m68hc11.c (s_m68hc11_mark_symbol): Likewise. * config/tc-ppc.c (ppc_elf_localentry, ppc_force_relocation), (ppc_fix_adjustable): Likewise. * config/tc-xgate.c (xgate_frob_symbol): Likewise. ld/ * plugin.c (asymbol_from_plugin_symbol): Adjust elf_symbol_from invocation. opcodes/ * ppc-dis.c (ppc_symbol_is_valid): Adjust elf_symbol_from invocation. --- bfd/ChangeLog | 6 ++++++ bfd/elf-bfd.h | 2 +- bfd/elf.c | 8 ++++---- binutils/ChangeLog | 5 +++++ binutils/nm.c | 2 +- binutils/objcopy.c | 2 +- gas/ChangeLog | 10 ++++++++++ gas/config/obj-elf.c | 5 ++--- gas/config/tc-aarch64.c | 2 +- gas/config/tc-m68hc11.c | 2 +- gas/config/tc-ppc.c | 8 +++----- gas/config/tc-xgate.c | 2 +- ld/ChangeLog | 5 +++++ ld/plugin.c | 2 +- opcodes/ChangeLog | 4 ++++ opcodes/ppc-dis.c | 2 +- 16 files changed, 47 insertions(+), 20 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 09e4a5fdd4e..b01cd958714 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2020-09-16 Alan Modra + + * elf-bfd.h (elf_symbol_from): Remove unused ABFD parameter. + * elf.c (ignore_section_sym, _bfd_elf_copy_private_symbol_data), + (swap_out_syms): Adjust elf_symbol_from invocation. + 2020-09-16 Alan Modra PR 26623 diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index 9b0a2028d35..140a98594d7 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -791,7 +791,7 @@ struct elf_size_info { (bfd *, const Elf_Internal_Rela *, bfd_byte *); }; -#define elf_symbol_from(ABFD,S) \ +#define elf_symbol_from(S) \ ((((S)->flags & BSF_SYNTHETIC) == 0 \ && (S)->the_bfd != NULL \ && (S)->the_bfd->xvec->flavour == bfd_target_elf_flavour \ diff --git a/bfd/elf.c b/bfd/elf.c index 5a02f8dc309..00594020c93 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -4102,7 +4102,7 @@ ignore_section_sym (bfd *abfd, asymbol *sym) if (sym->section == NULL) return TRUE; - type_ptr = elf_symbol_from (abfd, sym); + type_ptr = elf_symbol_from (sym); return ((type_ptr != NULL && type_ptr->internal_elf_sym.st_shndx != 0 && bfd_is_abs_section (sym->section)) @@ -8025,8 +8025,8 @@ _bfd_elf_copy_private_symbol_data (bfd *ibfd, || bfd_get_flavour (obfd) != bfd_target_elf_flavour) return TRUE; - isym = elf_symbol_from (ibfd, isymarg); - osym = elf_symbol_from (obfd, osymarg); + isym = elf_symbol_from (isymarg); + osym = elf_symbol_from (osymarg); if (isym != NULL && isym->internal_elf_sym.st_shndx != 0 @@ -8191,7 +8191,7 @@ swap_out_syms (bfd *abfd, goto error_return; } - type_ptr = elf_symbol_from (abfd, syms[idx]); + type_ptr = elf_symbol_from (syms[idx]); if ((flags & BSF_SECTION_SYM) == 0 && bfd_is_com_section (syms[idx]->section)) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 98823188e9c..dbbe29b1782 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2020-09-16 Alan Modra + + * nm.c (print_symbol): Adjust elf_symbol_from invocation. + * objcopy.c (is_hidden_symbol): Likewise. + 2020-09-15 Nick Clifton * README-how-to-make-a-release (https): Add a reminder to create a diff --git a/binutils/nm.c b/binutils/nm.c index 3501f48d29e..cf2c02b1296 100644 --- a/binutils/nm.c +++ b/binutils/nm.c @@ -899,7 +899,7 @@ print_symbol (bfd * abfd, } else { - info.elfinfo = elf_symbol_from (abfd, sym); + info.elfinfo = elf_symbol_from (sym); info.coffinfo = coff_symbol_from (sym); } diff --git a/binutils/objcopy.c b/binutils/objcopy.c index 1cbcd17a7ec..1a6fc8a4f59 100644 --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -1443,7 +1443,7 @@ is_hidden_symbol (asymbol *sym) { elf_symbol_type *elf_sym; - elf_sym = elf_symbol_from (sym->the_bfd, sym); + elf_sym = elf_symbol_from (sym); if (elf_sym != NULL) switch (ELF_ST_VISIBILITY (elf_sym->internal_elf_sym.st_other)) { diff --git a/gas/ChangeLog b/gas/ChangeLog index 71e4e8bd2dc..4852d4ab177 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,13 @@ +2020-09-16 Alan Modra + + * config/obj-elf.c (obj_elf_visibility, elf_frob_symbol): Adjust + elf_symbol_from invocation. + * config/tc-aarch64.c (s_variant_pcs): Likewise. + * config/tc-m68hc11.c (s_m68hc11_mark_symbol): Likewise. + * config/tc-ppc.c (ppc_elf_localentry, ppc_force_relocation), + (ppc_fix_adjustable): Likewise. + * config/tc-xgate.c (xgate_frob_symbol): Likewise. + 2020-09-15 H.J. Lu * testsuite/gas/cfi/reloc-pe-i386.d: Updated. diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c index 9e397078010..b1c99020a32 100644 --- a/gas/config/obj-elf.c +++ b/gas/config/obj-elf.c @@ -482,7 +482,7 @@ obj_elf_visibility (int visibility) symbolP = get_sym_from_input_line_and_check (); bfdsym = symbol_get_bfdsym (symbolP); - elfsym = elf_symbol_from (bfd_asymbol_bfd (bfdsym), bfdsym); + elfsym = elf_symbol_from (bfdsym); gas_assert (elfsym); @@ -2565,8 +2565,7 @@ elf_frob_symbol (symbolS *symp, int *puntp) break; case visibility_hidden: bfdsym = symbol_get_bfdsym (symp); - elfsym = elf_symbol_from (bfd_asymbol_bfd (bfdsym), - bfdsym); + elfsym = elf_symbol_from (bfdsym); elfsym->internal_elf_sym.st_other &= ~3; elfsym->internal_elf_sym.st_other |= STV_HIDDEN; break; diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c index 391746e3e07..57a2b4e997c 100644 --- a/gas/config/tc-aarch64.c +++ b/gas/config/tc-aarch64.c @@ -2001,7 +2001,7 @@ s_variant_pcs (int ignored ATTRIBUTE_UNUSED) restore_line_pointer (c); demand_empty_rest_of_line (); bfdsym = symbol_get_bfdsym (sym); - elfsym = elf_symbol_from (bfd_asymbol_bfd (bfdsym), bfdsym); + elfsym = elf_symbol_from (bfdsym); gas_assert (elfsym); elfsym->internal_elf_sym.st_other |= STO_AARCH64_VARIANT_PCS; } diff --git a/gas/config/tc-m68hc11.c b/gas/config/tc-m68hc11.c index 5735ff844e3..11cb6cd4a68 100644 --- a/gas/config/tc-m68hc11.c +++ b/gas/config/tc-m68hc11.c @@ -3766,7 +3766,7 @@ s_m68hc11_mark_symbol (int mark) SKIP_WHITESPACE (); bfdsym = symbol_get_bfdsym (symbolP); - elfsym = elf_symbol_from (bfd_asymbol_bfd (bfdsym), bfdsym); + elfsym = elf_symbol_from (bfdsym); gas_assert (elfsym); diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c index 441818215e1..b26760d45c9 100644 --- a/gas/config/tc-ppc.c +++ b/gas/config/tc-ppc.c @@ -2464,7 +2464,7 @@ ppc_elf_localentry (int ignore ATTRIBUTE_UNUSED) if (ok) { bfdsym = symbol_get_bfdsym (sym); - elfsym = elf_symbol_from (bfd_asymbol_bfd (bfdsym), bfdsym); + elfsym = elf_symbol_from (bfdsym); gas_assert (elfsym); elfsym->internal_elf_sym.st_other &= ~STO_PPC64_LOCAL_MASK; elfsym->internal_elf_sym.st_other |= encoded; @@ -6161,8 +6161,7 @@ ppc_force_relocation (fixS *fix) if (fix->fx_addsy) { asymbol *bfdsym = symbol_get_bfdsym (fix->fx_addsy); - elf_symbol_type *elfsym - = elf_symbol_from (bfd_asymbol_bfd (bfdsym), bfdsym); + elf_symbol_type *elfsym = elf_symbol_from (bfdsym); gas_assert (elfsym); if ((STO_PPC64_LOCAL_MASK & elfsym->internal_elf_sym.st_other) != 0) return 1; @@ -6198,8 +6197,7 @@ ppc_fix_adjustable (fixS *fix) if (fix->fx_addsy) { asymbol *bfdsym = symbol_get_bfdsym (fix->fx_addsy); - elf_symbol_type *elfsym - = elf_symbol_from (bfd_asymbol_bfd (bfdsym), bfdsym); + elf_symbol_type *elfsym = elf_symbol_from (bfdsym); gas_assert (elfsym); if ((STO_PPC64_LOCAL_MASK & elfsym->internal_elf_sym.st_other) != 0) return 0; diff --git a/gas/config/tc-xgate.c b/gas/config/tc-xgate.c index b936865d085..646be64ab93 100644 --- a/gas/config/tc-xgate.c +++ b/gas/config/tc-xgate.c @@ -1007,7 +1007,7 @@ xgate_frob_symbol (symbolS *sym) elf_symbol_type *elfsym; bfdsym = symbol_get_bfdsym (sym); - elfsym = elf_symbol_from (bfd_asymbol_bfd (bfdsym), bfdsym); + elfsym = elf_symbol_from (bfdsym); gas_assert (elfsym); diff --git a/ld/ChangeLog b/ld/ChangeLog index 01587d86214..b61c3fd0db0 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2020-09-16 Alan Modra + + * plugin.c (asymbol_from_plugin_symbol): Adjust elf_symbol_from + invocation. + 2020-09-15 H.J. Lu * ldelf.c (ldelf_after_open): Check bfd_target_elf_flavour first. diff --git a/ld/plugin.c b/ld/plugin.c index d709ee10fe7..5640b8975b9 100644 --- a/ld/plugin.c +++ b/ld/plugin.c @@ -415,7 +415,7 @@ asymbol_from_plugin_symbol (bfd *abfd, asymbol *asym, if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) { - elf_symbol_type *elfsym = elf_symbol_from (abfd, asym); + elf_symbol_type *elfsym = elf_symbol_from (asym); unsigned char visibility; if (!elfsym) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index d4d1865b584..532dde412e4 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2020-09-16 Alan Modra + + * ppc-dis.c (ppc_symbol_is_valid): Adjust elf_symbol_from invocation. + 2020-09-10 Nick Clifton * ppc-dis.c (ppc_symbol_is_valid): New function. Returns false diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c index 4e8e3cb4628..f3c84e06452 100644 --- a/opcodes/ppc-dis.c +++ b/opcodes/ppc-dis.c @@ -408,7 +408,7 @@ ppc_symbol_is_valid (asymbol *sym, if (sym == NULL) return FALSE; - est = elf_symbol_from (NULL, sym); + est = elf_symbol_from (sym); /* Ignore ELF hidden, local, no-type symbols. These are generated by annobin. */ -- 2.30.2