* MAINTAINERS: Change my e-mail address.

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

diff --git a/gdb/minsyms.c b/gdb/minsyms.c
index d8569ff2aff4c14136ec69fc44b9fbd386f32d98..319865f6faf52a6689c69345627c9a3beadc3775 100644 (file)
--- a/gdb/minsyms.c
+++ b/gdb/minsyms.c
@@ -189,7 +189,15 @@ lookup_minimal_symbol (register const char *name, const char *sfile,
 
             while (msymbol != NULL && found_symbol == NULL)
                {
-                if (DEPRECATED_SYMBOL_MATCHES_NAME (msymbol, name))
+                 /* FIXME: carlton/2003-02-27: This is an unholy
+                    mixture of linkage names and natural names.  If
+                    you want to test the linkage names with strcmp,
+                    do that.  If you want to test the natural names
+                    with strcmp_iw, use SYMBOL_MATCHES_NATURAL_NAME.  */
+                 if (strcmp (DEPRECATED_SYMBOL_NAME (msymbol), (name)) == 0
+                     || (SYMBOL_DEMANGLED_NAME (msymbol) != NULL
+                         && strcmp_iw (SYMBOL_DEMANGLED_NAME (msymbol),
+                                       (name)) == 0))
                    {
                     switch (MSYMBOL_TYPE (msymbol))
                       {
@@ -395,13 +403,23 @@ lookup_minimal_symbol_by_pc_section (CORE_ADDR pc, asection *section)
   struct objfile *objfile;
   struct minimal_symbol *msymbol;
   struct minimal_symbol *best_symbol = NULL;
+  struct obj_section *pc_section;
 
   /* pc has to be in a known section. This ensures that anything beyond
      the end of the last segment doesn't appear to be part of the last
      function in the last segment.  */
-  if (find_pc_section (pc) == NULL)
+  pc_section = find_pc_section (pc);
+  if (pc_section == NULL)
     return NULL;
 
+  /* If no section was specified, then just make sure that the PC is in
+     the same section as the minimal symbol we find.  */
+  if (section == NULL)
+    section = pc_section->the_bfd_section;
+
+  /* FIXME drow/2003-07-19: Should we also check that PC is in SECTION
+     if we were passed a non-NULL SECTION argument?  */
+
   for (objfile = object_files;
        objfile != NULL;
        objfile = objfile->next)
@@ -920,8 +938,14 @@ install_minimal_symbols (struct objfile *objfile)
 
        for (i = 0; i < mcount; i++)
          {
+           /* If a symbol's name starts with _Z and was successfully
+              demangled, then we can assume we've found a GNU v3 symbol.
+              For now we set the C++ ABI globally; if the user is
+              mixing ABIs then the user will need to "set cp-abi"
+              manually.  */
            const char *name = SYMBOL_LINKAGE_NAME (&objfile->msymbols[i]);
-           if (name[0] == '_' && name[1] == 'Z')
+           if (name[0] == '_' && name[1] == 'Z'
+               && SYMBOL_DEMANGLED_NAME (&objfile->msymbols[i]) != NULL)
              {
                set_cp_abi_as_auto_default ("gnu-v3");
                break;