* srec.c (srec_write_symbols): Use bfd_is_local_label rather than

        an ad-hoc test.  Kill bogus #if 0 code.
        * syms.c (bfd_is_local_label): Consider BSF_DEBUGGING symbols local.

PR 13455

1 files changed, 6 insertions, 4 deletions

diff --git a/bfd/syms.c b/bfd/syms.c
index 0feacbc..30fb74c 100644
--- a/bfd/syms.c
+++ b/bfd/syms.c
@@ -354,6 +354,8 @@ bfd_is_local_label (abfd, sym)
     return false;
   if (sym->name == NULL)
     return false;
+  if (sym->flags & BSF_DEBUGGING)
+    return true;
   return bfd_is_local_label_name (abfd, sym->name);
 }
 
@@ -728,9 +730,9 @@ struct indexentry
   bfd_vma val;
   bfd_byte *stab;
   bfd_byte *str;
-  bfd_byte *directory_name;
-  bfd_byte *file_name;
-  bfd_byte *function_name;
+  char *directory_name;
+  char *file_name;
+  char *function_name;
 };
 
 /* Compare two indexentry structures.  This is called via qsort.  */
@@ -774,7 +776,7 @@ struct stab_find_info
   struct indexentry *cached_indexentry;
   bfd_vma cached_offset;
   bfd_byte *cached_stab;
-  bfd_byte *cached_file_name;
+  char *cached_file_name;
 #endif
 
   /* Saved ptr to malloc'ed filename.  */