Revert "bfd_elf_sym_name_raw"

This reverts commit 265757dc6e4d011a1b33ef1b3bfcd7f100f12f64.

diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
index cb147b4eb84fa5860c3cb4b27cd6e3cdffe434d1..b89d3dda05d337e7134dd93a30c4dc79c29a9e98 100644 (file)
--- a/bfd/elf-bfd.h
+++ b/bfd/elf-bfd.h
@@ -2277,8 +2277,6 @@ extern Elf_Internal_Sym *bfd_elf_get_elf_syms
   (bfd *, Elf_Internal_Shdr *, size_t, size_t, Elf_Internal_Sym *, void *,
    Elf_External_Sym_Shndx *);
 extern char * bfd_elf_get_str_section (bfd *, unsigned int);
-extern const char *bfd_elf_sym_name_raw
-  (bfd *, Elf_Internal_Shdr *, Elf_Internal_Sym *);
 extern const char *bfd_elf_sym_name
   (bfd *, Elf_Internal_Shdr *, Elf_Internal_Sym *, asection *);
 

diff --git a/bfd/elf.c b/bfd/elf.c
index 38bfb1c2064d06d6ae70a1c47dd9db4abea01da0..7d3d2063130bd3d5bd988207ca68b15f76ac85c8 100644 (file)
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -531,10 +531,12 @@ bfd_elf_get_elf_syms (bfd *ibfd,
 
 /* Look up a symbol name.  */
 const char *
-bfd_elf_sym_name_raw (bfd *abfd,
-                     Elf_Internal_Shdr *symtab_hdr,
-                     Elf_Internal_Sym *isym)
+bfd_elf_sym_name (bfd *abfd,
+                 Elf_Internal_Shdr *symtab_hdr,
+                 Elf_Internal_Sym *isym,
+                 asection *sym_sec)
 {
+  const char *name;
   unsigned int iname = isym->st_name;
   unsigned int shindex = symtab_hdr->sh_link;
 
@@ -546,19 +548,8 @@ bfd_elf_sym_name_raw (bfd *abfd,
       shindex = elf_elfheader (abfd)->e_shstrndx;
     }
 
-  return bfd_elf_string_from_elf_section (abfd, shindex, iname);
-}
-
-const char *
-bfd_elf_sym_name (bfd *abfd,
-                 Elf_Internal_Shdr *symtab_hdr,
-                 Elf_Internal_Sym *isym,
-                 asection *sym_sec)
-{
-  const char *name = bfd_elf_sym_name_raw (abfd, symtab_hdr, isym);
-  if (name == NULL)
-    name = "<null>";
-  else if (sym_sec && *name == '\0')
+  name = bfd_elf_string_from_elf_section (abfd, shindex, iname);
+  if (sym_sec && name && *name == '\0')
     name = bfd_section_name (sym_sec);
 
   return name;
@@ -590,7 +581,7 @@ group_signature (bfd *abfd, Elf_Internal_Shdr *ghdr)
                            &isym, esym, &eshndx) == NULL)
     return NULL;
 
-  return bfd_elf_sym_name_raw (abfd, hdr, &isym);
+  return bfd_elf_sym_name (abfd, hdr, &isym, NULL);
 }
 
 static bool

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 2e8d59518aca123c17cec8c792f008728ee3a3cd..f27c0621a9317b32524e1b197318578d42e36e53 100644 (file)
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -1723,7 +1723,7 @@ elf_i386_scan_relocs (bfd *abfd,
                      name = h->root.root.string;
                    else
                      name = bfd_elf_sym_name (abfd, symtab_hdr, isym,
-                                              NULL);
+                                            NULL);
                    _bfd_error_handler
                      /* xgettext:c-format */
                      (_("%pB: `%s' accessed both as normal and "

diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index 6aebcc6e60230f72bac8b8aba84b5d703f731a2b..3dcba4c4fd7728db09684f75a77804dc8ab507e4 100644 (file)
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -1355,7 +1355,7 @@ elf_slurp_symbol_table (bfd *abfd, asymbol **symptrs, bool dynamic)
            sym->symbol.name = (elf_tdata (abfd)->dt_strtab
                                + isym->st_name);
          else
-           sym->symbol.name = bfd_elf_sym_name_raw (abfd, hdr, isym);
+           sym->symbol.name = bfd_elf_sym_name (abfd, hdr, isym, NULL);
          sym->symbol.value = isym->st_value;
 
          if (isym->st_shndx == SHN_UNDEF)