* symtab.c (symbol_set_names): Correctly set 'name' on symbol when

	lookup name differs.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3d98d1bc0541df4eed6edc7ddab84215583f7056..494e78ede536cd7d5dc09ef7676088cbd6bd7668 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-18  Tom Tromey  <tromey@redhat.com>
+
+       * symtab.c (symbol_set_names): Correctly set 'name' on symbol when
+       lookup name differs.
+
 2009-11-18  Tristan Gingold  <gingold@adacore.com>
 
        * machoread.c (macho_oso_symfile): Fix typo.  Add comments.

diff --git a/gdb/symtab.c b/gdb/symtab.c
index b512bf3e8c9cd9049a272c6e9ebbacf953d905b0..950be267f60c159cd33a122dd4167f1b49c3f79f 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -676,7 +676,7 @@ symbol_set_names (struct general_symbol_info *gsymbol,
        (*slot)->demangled[0] = '\0';
     }
 
-  gsymbol->name = (*slot)->mangled;
+  gsymbol->name = (*slot)->mangled + lookup_len - len;
   if ((*slot)->demangled[0] != '\0')
     gsymbol->language_specific.cplus_specific.demangled_name
       = (*slot)->demangled;