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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 09e4a5fdd4ec9ad32c23dabb59b0613025916ffd..b01cd9587143e4f841975e1eaa2c04f1e1ac85e2 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2020-09-16  Alan Modra  <amodra@gmail.com>
+
+       * 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  <amodra@gmail.com>
 
        PR 26623

diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
index 9b0a2028d35fda8353a3355f9171ec77601160cb..140a98594d7cd0cf533ad0430b31a2f05c1addac 100644 (file)
--- 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 5a02f8dc309a6f09414f0815e2fa85cef2d00934..00594020c93038e312d52e67f03f07c67e4e7dc6 100644 (file)
--- 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 98823188e9c53a64d13bf2a74b9e52291691f267..dbbe29b17824d71e14d6696bc02afe2bf3891758 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2020-09-16  Alan Modra  <amodra@gmail.com>
+
+       * nm.c (print_symbol): Adjust elf_symbol_from invocation.
+       * objcopy.c (is_hidden_symbol): Likewise.
+
 2020-09-15  Nick Clifton  <nickc@redhat.com>
 
        * README-how-to-make-a-release (https): Add a reminder to create a

diff --git a/binutils/nm.c b/binutils/nm.c
index 3501f48d29eff43d0ef027c00dbaec05adcfed20..cf2c02b1296412b06974a6668a09c91816e18651 100644 (file)
--- 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 1cbcd17a7ec63dcec0236c91f1ba89d4b63d3c16..1a6fc8a4f59b0358ba96e00ef1105543591a652a 100644 (file)
--- 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 71e4e8bd2dc0c126e68a0d55178aedc61139c16f..4852d4ab177cd3b8af9adbe37d84eaab7c76ee51 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,13 @@
+2020-09-16  Alan Modra  <amodra@gmail.com>
+
+       * 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  <hongjiu.lu@intel.com>
 
        * testsuite/gas/cfi/reloc-pe-i386.d: Updated.

diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c
index 9e3970780101819bb0b4b930aa0aa065fa52bb0e..b1c99020a320368bea7f47d6934242f06c1fd875 100644 (file)
--- 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 391746e3e077f159b5461b0961b52c410f4b3ffa..57a2b4e997ce235536b9ff9819b28b466e9ad669 100644 (file)
--- 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 5735ff844e38f9434b2f491a72cc41a71621fae1..11cb6cd4a6834194b4b6ef36b5dbfaa0a5494afd 100644 (file)
--- 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 441818215e1bd160db0fe107241283702678ecfe..b26760d45c9c520187be68d34062cb54d975c3b5 100644 (file)
--- 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 b936865d085aa9decca167c3e49a576d6a70e637..646be64ab93edf45851a49441aaf8f5c2ff692b6 100644 (file)
--- 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 01587d86214511f60fdd9c9e62550b2eee8f4783..b61c3fd0db0944c401f004f043ed15b19b715bab 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2020-09-16  Alan Modra  <amodra@gmail.com>
+
+       * plugin.c (asymbol_from_plugin_symbol): Adjust elf_symbol_from
+       invocation.
+
 2020-09-15  H.J. Lu  <hongjiu.lu@intel.com>
 
        * ldelf.c (ldelf_after_open): Check bfd_target_elf_flavour first.

diff --git a/ld/plugin.c b/ld/plugin.c
index d709ee10fe74628cb5bd3a6b81bbf77884744970..5640b8975b998bc0adb14340a16792beaae78ee4 100644 (file)
--- 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 d4d1865b584813111c3ad5a43f2c977db94f85ea..532dde412e40339a1837aa983cf56c91b68881b1 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2020-09-16  Alan Modra  <amodra@gmail.com>
+
+       * ppc-dis.c (ppc_symbol_is_valid): Adjust elf_symbol_from invocation.
+
 2020-09-10  Nick Clifton  <nickc@redhat.com>
 
        * ppc-dis.c (ppc_symbol_is_valid): New function.  Returns false

diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c
index 4e8e3cb462835bbdb9e87b6af40c5fdeaf86d3b8..f3c84e06452dc2872f855cc7113f259e351a3d08 100644 (file)
--- 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.  */