From 9182c5bc256d7aee1964ce5b0cb9f93475713496 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Wed, 6 Apr 2011 00:07:06 +0000 Subject: [PATCH] gdb/ Fix regression of displaying the debug format. * buildsym.c (end_symtab): Set symtab's debugformat and producer from subfile. --- gdb/ChangeLog | 6 ++++++ gdb/buildsym.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 161f4bf..777947d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2011-04-06 Jan Kratochvil + + Fix regression of displaying the debug format. + * buildsym.c (end_symtab): Set symtab's debugformat and producer from + subfile. + 2011-04-04 Tom Tromey * cli/cli-interp.c (struct captured_execute_command_args): diff --git a/gdb/buildsym.c b/gdb/buildsym.c index 1b73884..31880b8 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. */ -- 2.7.4