* dwarf2read.c (dw2_find_symbol_file): Unconditionally use

	init_cutu_and_read_dies.
testsuite
	* gdb.cp/namespace.exp: Add "show lang" test.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 32620a2af2665fa0ebc8765807b292a288dfa617..a877d0b30feeaa19ec0793c710c14179bfc09bdd 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-15  Tom Tromey  <[email protected]>
+
+       * dwarf2read.c (dw2_find_symbol_file): Unconditionally use
+       init_cutu_and_read_dies.
+
 2012-06-15  Iain Sandoe <[email protected]>
 
        * MAINTAINERS (Write After Approval): Add myself to the list.

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 1fdd81916c263bfaf5ba9b8108b637c33f74c13d..a8cd1584bfc1c18a8c1bd206b5ea891eba507ec5 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2906,12 +2906,8 @@ dw2_find_symbol_file (struct objfile *objfile, const char *name)
   if (per_cu->v.quick->symtab != NULL)
     return per_cu->v.quick->symtab->filename;
 
-  if (per_cu->is_debug_types)
-    init_cutu_and_read_dies (per_cu, 0, 0, dw2_get_primary_filename_reader,
-                            &filename);
-  else
-    init_cutu_and_read_dies_simple (per_cu, dw2_get_primary_filename_reader,
-                                   &filename);
+  init_cutu_and_read_dies (per_cu, 0, 0, dw2_get_primary_filename_reader,
+                          &filename);
 
   return filename;
 }

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1e018e277659935a1616f1dc2db1dcb5a3413517..613dc65edd9c08ec0514279c3166351c0648a4c5 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Tom Tromey  <[email protected]>
+
+       * gdb.cp/namespace.exp: Add "show lang" test.
+
 2012-06-15  Iain Sandoe <[email protected]>
 
        * gdb.base/list.exp (test_listsize): Remove $use_gdb_stub special

diff --git a/gdb/testsuite/gdb.cp/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp
index cf5a85899e5b06b0a10a885fafb5710a4feb0c34..82018c6441b141f4b96a945ea4584bf300159709 100644 (file)
--- a/gdb/testsuite/gdb.cp/namespace.exp
+++ b/gdb/testsuite/gdb.cp/namespace.exp
@@ -66,6 +66,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
+gdb_test "show lang" "auto; currently c\\+\\+.*"
 
 #
 # set it up at a breakpoint so we can play with the variable values