diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1b037b951c..e63d10ed2f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-21  Tom Tromey  <tromey@redhat.com>
+
+	* dwarf2read.c (new_symbol_full): Remove cast.
+	* symtab.c (symbol_set_demangled_name): Make 'name' const.
+	* symtab.h (symbol_set_demangled_name): Update.
+
 2013-01-21  Tom Tromey  <tromey@redhat.com>
 
 	* main.c (captured_main): Call bfd_init.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 364e6af76b..c78a46643d 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -15767,7 +15767,7 @@ new_symbol_full (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
       if (cu->language == language_fortran
           && symbol_get_demangled_name (&(sym->ginfo)) == NULL)
 	symbol_set_demangled_name (&(sym->ginfo),
-				   (char *) dwarf2_full_name (name, die, cu),
+				   dwarf2_full_name (name, die, cu),
 	                           NULL);
 
       /* Default assumptions.
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 770f9e0bda..68d654db2c 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -465,7 +465,7 @@ symbol_init_cplus_specific (struct general_symbol_info *gsymbol,
 
 void
 symbol_set_demangled_name (struct general_symbol_info *gsymbol,
-                           char *name,
+                           const char *name,
                            struct objfile *objfile)
 {
   if (gsymbol->language == language_cplus)
diff --git a/gdb/symtab.h b/gdb/symtab.h
index b992266f26..3861051390 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -167,7 +167,8 @@ struct general_symbol_info
   struct obj_section *obj_section;
 };
 
-extern void symbol_set_demangled_name (struct general_symbol_info *, char *,
+extern void symbol_set_demangled_name (struct general_symbol_info *,
+				       const char *,
                                        struct objfile *);
 
 extern const char *symbol_get_demangled_name