From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed, 6 Apr 2011 00:07:06 +0000 (+0000)
Subject: gdb/
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9182c5bc256d7aee1964ce5b0cb9f93475713496;p=binutils-gdb.git

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 161f4bf4741..777947dc9bc 100644
--- 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 1b7388464e7..31880b8d6fa 100644
--- 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.  */