From: Tom Tromey <tromey@redhat.com>
Date: Wed, 18 Nov 2009 16:28:42 +0000 (+0000)
Subject: 	* symtab.c (symbol_set_names): Correctly set 'name' on symbol when
X-Git-Tag: cgen-snapshot-20091201~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72dcaf823ddd60a00635876657ba9233935a2256;p=thirdparty%2Fbinutils-gdb.git

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3d98d1bc054..494e78ede53 100644
--- 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 b512bf3e8c9..950be267f60 100644
--- 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;