This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[commit] Re: [patch] regression on gfortran-4.5: stopped language detection
- From: Jan Kratochvil <jan dot kratochvil at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Sun, 17 Oct 2010 20:51:23 +0200
- Subject: [commit] Re: [patch] regression on gfortran-4.5: stopped language detection
- References: <20100919163507.GA2742@host1.dyn.jankratochvil.net>
On Sun, 19 Sep 2010 18:35:08 +0200, Jan Kratochvil wrote:
> with gcc-4.5.x there is a regression:
> FAIL: gdb.fortran/module.exp: stopped language detection
Checked-in.
(change: set_main_name now always resets LANGUAGE_OF_MAIN)
Thanks,
Jan
http://sourceware.org/ml/gdb-cvs/2010-10/msg00103.html
--- src/gdb/ChangeLog 2010/10/17 18:24:46 1.12267
+++ src/gdb/ChangeLog 2010/10/17 18:49:46 1.12268
@@ -1,4 +1,14 @@
2010-10-17 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ Fix the `stopped language detection' testcase for gcc-4.5.
+ * dwarf2read.c (read_partial_die): Set also LANGUAGE_OF_MAIN.
+ * symfile.c (set_initial_language): Move variable filename to a more
+ inner block. Prefer LANGUAGE_OF_MAIN.
+ * symtab.c (language_of_main): New variable.
+ (set_main_name): Always reset LANGUAGE_OF_MAIN.
+ * symtab.h (language_of_main): New declaration.
+
+2010-10-17 Jan Kratochvil <jan.kratochvil@redhat.com>
Pedro Alves <pedro@codesourcery.com>
* gdbthread.h (currently_stepping): New declaration.
--- src/gdb/dwarf2read.c 2010/10/07 17:23:30 1.471
+++ src/gdb/dwarf2read.c 2010/10/17 18:49:46 1.472
@@ -8880,7 +8880,13 @@
practice. */
if (DW_UNSND (&attr) == DW_CC_program
&& cu->language == language_fortran)
- set_main_name (part_die->name);
+ {
+ set_main_name (part_die->name);
+
+ /* As this DIE has a static linkage the name would be difficult
+ to look up later. */
+ language_of_main = language_fortran;
+ }
break;
default:
break;
--- src/gdb/symfile.c 2010/10/17 17:45:16 1.298
+++ src/gdb/symfile.c 2010/10/17 18:49:46 1.299
@@ -1568,12 +1568,18 @@
void
set_initial_language (void)
{
- const char *filename;
enum language lang = language_unknown;
- filename = find_main_filename ();
- if (filename != NULL)
- lang = deduce_language_from_filename (filename);
+ if (language_of_main != language_unknown)
+ lang = language_of_main;
+ else
+ {
+ const char *filename;
+
+ filename = find_main_filename ();
+ if (filename != NULL)
+ lang = deduce_language_from_filename (filename);
+ }
if (lang == language_unknown)
{
--- src/gdb/symtab.c 2010/09/08 17:17:42 1.253
+++ src/gdb/symtab.c 2010/10/17 18:49:46 1.254
@@ -4389,6 +4389,7 @@
/* Track MAIN */
static char *name_of_main;
+enum language language_of_main = language_unknown;
void
set_main_name (const char *name)
@@ -4397,10 +4398,12 @@
{
xfree (name_of_main);
name_of_main = NULL;
+ language_of_main = language_unknown;
}
if (name != NULL)
{
name_of_main = xstrdup (name);
+ language_of_main = language_unknown;
}
}
--- src/gdb/symtab.h 2010/10/17 17:45:16 1.164
+++ src/gdb/symtab.h 2010/10/17 18:49:47 1.165
@@ -1238,6 +1238,7 @@
const. */
extern void set_main_name (const char *name);
extern /*const */ char *main_name (void);
+extern enum language language_of_main;
/* Check global symbols in objfile. */
struct symbol *lookup_global_symbol_from_objfile (const struct objfile *objfile,