Lint fixes from Paul Eggert (eggert@twinsun.com):

[deliverable/binutils-gdb.git] / gdb / symfile.c

diff --git a/gdb/symfile.c b/gdb/symfile.c
index 1c8fe1d8ca489cbb7a893a727662c461079a6dfb..06bce27a034906cdc7d01f199f9938537cee7c29 100644 (file)
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -440,21 +440,40 @@ syms_from_objfile (objfile, addr, mainline, verbo)
        addr -= bfd_section_vma (objfile->obfd, lowest_sect);
     }
 
+  {
   /* Debugging check inserted for testing elimination of NAMES_HAVE_UNDERSCORE.
      Complain if the dynamic setting of NAMES_HAVE_UNDERSCORE from BFD
-     doesn't match the static setting from the GDB config files.
+     doesn't match the static setting from the GDB config files, but only
+     if we are using the first BFD target (the default target selected by
+     the same configuration that decided whether NAMES_HAVE_UNDERSCORE is
+     defined or not).  For other targets (such as when the user sets GNUTARGET
+     or we are reading a "foreign" object file), it is likely that the value
+     of bfd_get_symbol_leading_char has no relation to the value of
+     NAMES_HAVE_UNDERSCORE for the target for which this gdb was built.
+     Hack alert: the only way to currently do this with bfd is to ask it to
+     produce a list of known target names and compare the first one in the
+     list with the one for the bfd we are using.
      FIXME:  Remove this check after a round of testing.  
                                                -- gnu@cygnus.com, 16dec92 */
+    CONST char **targets = bfd_target_list ();
+    if (targets != NULL && *targets != NULL)
+      {
+       if (bfd_get_symbol_leading_char (objfile->obfd) !=
 #ifdef NAMES_HAVE_UNDERSCORE
-  if (bfd_get_symbol_leading_char(objfile->obfd) != '_')
+           '_'
 #else
-  if (bfd_get_symbol_leading_char(objfile->obfd) != 0)
+           0
 #endif
-    fprintf (stderr,
- "GDB internal error!  NAMES_HAVE_UNDERSCORE set wrong for %s BFD:\n%s\n",
-             objfile->obfd->xvec->name,
-             objfile->obfd->filename);
-  /* End of debugging check.  FIXME.  */
+           && STREQ (bfd_get_target (objfile->obfd), *targets))
+         {
+           fprintf (stderr, "GDB internal error!  NAMES_HAVE_UNDERSCORE set wrong for %s BFD:\n%s\n",
+                    bfd_get_target (objfile->obfd),
+                    bfd_get_filename (objfile->obfd));
+         }
+       free (targets);
+      }
+    /* End of debugging check.  FIXME.  */
+  }
 
   /* Initialize symbol reading routines for this objfile, allow complaints to
      appear for this new file, and record how verbose to be, then do the
@@ -1326,22 +1345,7 @@ add_psymbol_to_list (name, namelength, namespace, class, list, val, language,
   SYMBOL_LANGUAGE (psym) = language;
   PSYMBOL_NAMESPACE (psym) = namespace;
   PSYMBOL_CLASS (psym) = class;
-  if (language == language_cplus)
-    {
-      demangled_name =
-       cplus_demangle (SYMBOL_NAME (psym), DMGL_PARAMS | DMGL_ANSI);
-      if (demangled_name == NULL)
-       {
-         SYMBOL_DEMANGLED_NAME (psym) = NULL;
-       }
-      else
-       {
-         SYMBOL_DEMANGLED_NAME (psym) =
-           obsavestring (demangled_name, strlen (demangled_name),
-                         &objfile->psymbol_obstack);
-         free (demangled_name);
-       }
-    }  
+  SYMBOL_INIT_DEMANGLED_NAME (psym, &objfile->psymbol_obstack);
 }
 
 /* Add a symbol with a CORE_ADDR value to a psymtab. */
@@ -1375,22 +1379,7 @@ add_psymbol_addr_to_list (name, namelength, namespace, class, list, val,
   SYMBOL_LANGUAGE (psym) = language;
   PSYMBOL_NAMESPACE (psym) = namespace;
   PSYMBOL_CLASS (psym) = class;
-  if (language == language_cplus)
-    {
-      demangled_name =
-       cplus_demangle (SYMBOL_NAME (psym), DMGL_PARAMS | DMGL_ANSI);
-      if (demangled_name == NULL)
-       {
-         SYMBOL_DEMANGLED_NAME (psym) = NULL;
-       }
-      else
-       {
-         SYMBOL_DEMANGLED_NAME (psym) =
-           obsavestring (demangled_name, strlen (demangled_name),
-                         &objfile->psymbol_obstack);
-         free (demangled_name);
-       }
-    }  
+  SYMBOL_INIT_DEMANGLED_NAME (psym, &objfile->psymbol_obstack);
 }
 
 #endif /* !INLINE_ADD_PSYMBOL */