gdb/

	Fix regression of displaying the debug format.
	* buildsym.c (end_symtab): Set symtab's debugformat and producer from
	subfile.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 161f4bf..777947d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-06  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       Fix regression of displaying the debug format.
+       * buildsym.c (end_symtab): Set symtab's debugformat and producer from
+       subfile.
+
 2011-04-04  Tom Tromey  <tromey@redhat.com>
 
        * cli/cli-interp.c (struct captured_execute_command_args):

diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index 1b73884..31880b8 100644 (file)
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -1109,6 +1109,12 @@ end_symtab (CORE_ADDR end_addr, struct objfile *objfile, int section)
             the symbols.  */
          symtab->language = subfile->language;
 
+         /* Save the debug format string (if any) in the symtab.  */
+         symtab->debugformat = subfile->debugformat;
+
+         /* Similarly for the producer.  */
+         symtab->producer = subfile->producer;
+
          /* All symtabs for the main file and the subfiles share a
             blockvector, so we need to clear primary for everything
             but the main file.  */