Revert "is_target_special_symbol fixes for commit 68bbe1183379"

This reverts commit 6e40f9bb31be2f3656df97a1fcba4d6a30081e24.

diff --git a/bfd/elf.c b/bfd/elf.c
index 4012d994272183f3c30aae46f1d2a54afcfed6de..39ee641097b357be97392d925603154b6d02dd41 100644 (file)
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -9725,9 +9725,6 @@ bool
 _bfd_elf_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED,
                              const char *name)
 {
-  if (!name)
-    return false;
-
   /* Normal local symbols start with ``.L''.  */
   if (name[0] == '.' && name[1] == 'L')
     return true;

diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c
index 8d61ebb6754953606030c39fa0092ceeefce7bf2..85cbcbc3505f07227412df556fcb6ea73af320fb 100644 (file)
--- a/bfd/elf32-v850.c
+++ b/bfd/elf32-v850.c
@@ -1933,13 +1933,8 @@ v850_elf_info_to_howto_rela (bfd *abfd,
 static bool
 v850_elf_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED, const char *name)
 {
-  if (!name)
-    return false;
-  if (name[0] == '.' && (name[1] == 'L' || name[1] == '.'))
-    return true;
-  if (name[0] == '_' && name[1] == '.' && name[2] == 'L' && name[3] == '_')
-    return true;
-  return false;
+  return (   (name[0] == '.' && (name[1] == 'L' || name[1] == '.'))
+         || (name[0] == '_' &&  name[1] == '.' && name[2] == 'L' && name[3] == '_'));
 }
 
 static bool

diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c
index 4844412a4d45854adf8ce6717d1d307f77ddbde6..90ecc276f3161dc5c250b55eb791ee6dba5115a9 100644 (file)
--- a/bfd/elfnn-riscv.c
+++ b/bfd/elfnn-riscv.c
@@ -5610,11 +5610,9 @@ riscv_maybe_function_sym (const asymbol *sym,
 static bool
 riscv_elf_is_target_special_symbol (bfd *abfd, asymbol *sym)
 {
-  if (!sym->name)
-    return false;
   /* PR27584, local and empty symbols.  Since they are usually
      generated for pcrel relocations.  */
-  return (!sym->name[0]
+  return (!strcmp (sym->name, "")
          || _bfd_elf_is_local_label_name (abfd, sym->name)
          /* PR27916, mapping symbols.  */
          || riscv_elf_is_mapping_symbols (sym->name));