* breakpoint.c, breakpoint.h (breakpoint_init_inferior): New function

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

diff --git a/gdb/symtab.c b/gdb/symtab.c
index e6cbbc61100def998586440120d92a2db896a18f..b5906a65224f1a2f71373e38c30e422d9c19bdde 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -258,13 +258,13 @@ gdb_mangle_name (type, i, j)
   char *field_name = TYPE_FN_FIELDLIST_NAME (type, i);
   char *physname = TYPE_FN_FIELD_PHYSNAME (f, j);
   char *newname = type_name_no_tag (type);
-  int is_constructor = newname != NULL && STREQ (field_name, newname);
-  int is_destructor = is_constructor && DESTRUCTOR_PREFIX_P (physname);
+  int is_constructor = (physname[0]=='_' && physname[1]=='_');
+  int is_destructor = DESTRUCTOR_PREFIX_P (physname);
   /* Need a new type prefix.  */
   char *const_prefix = method->is_const ? "C" : "";
   char *volatile_prefix = method->is_volatile ? "V" : "";
   char buf[20];
-#ifndef GCC_MANGLE_BUG
+#ifdef GCC_MANGLE_BUG
   int len = newname == NULL ? 0 : strlen (newname);
 
   if (is_destructor)
@@ -305,9 +305,10 @@ gdb_mangle_name (type, i, j)
   strcat (mangled_name, buf);
   /* If the class doesn't have a name, i.e. newname NULL, then we just
      mangle it using 0 for the length of the class.  Thus it gets mangled
-     as something starting with `::' rather than `classname::'.  */
+     as something starting with `::' rather than `classname::'. */ 
   if (newname != NULL)
     strcat (mangled_name, newname);
+
 #else
   char *opname;
 
@@ -972,7 +973,8 @@ find_pc_symtab (pc)
           will cause a core dump), but maybe we can successfully
           continue, so let's not.  */
        warning ("\
-(Internal error: pc 0x%x in read in psymtab, but not in symtab.)\n", pc);
+(Internal error: pc 0x%lx in read in psymtab, but not in symtab.)\n",
+                (unsigned long) pc);
       s = PSYMTAB_TO_SYMTAB (ps);
     }
   return (s);
@@ -2585,8 +2587,8 @@ list_symbols (regexp, class, bpt)
                              printf_filtered ("\nNon-debugging symbols:\n");
                              found_in_file = 1;
                            }
-                         printf_filtered ("    %08x  %s\n",
-                                          SYMBOL_VALUE_ADDRESS (msymbol),
+                         printf_filtered ("    %08lx  %s\n",
+                                          (unsigned long) SYMBOL_VALUE_ADDRESS (msymbol),
                                           SYMBOL_SOURCE_NAME (msymbol));
                        }
                    }