PR corefiles/14983:

	* dwarf2read.c (process_full_comp_unit): Always create a static
	block.
gdb/testsuite
	* gdb.dwarf2/nostaticblock.exp: New file.

4 files changed, 70 insertions, 2 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3b546d1..401e435 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-25  Andreas Kaufmann  <Andreas.Kaufmann@synopsys.com>
+
+	PR corefiles/14983:
+	* dwarf2read.c (process_full_comp_unit): Always create a static
+	block.
+
 2013-04-25  Hui Zhu  <hui@codesourcery.com>
 
 	* breakpoint.c (build_target_command_list): Change loc->cond_bytecode
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 3c9972b..37b7dc4 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -7132,8 +7132,7 @@ process_full_comp_unit (struct dwarf2_per_cu_data *per_cu,
   get_scope_pc_bounds (cu->dies, &lowpc, &highpc, cu);
 
   static_block
-    = end_symtab_get_static_block (highpc + baseaddr, objfile, 0,
-				   per_cu->imported_symtabs != NULL);
+    = end_symtab_get_static_block (highpc + baseaddr, objfile, 0, 1);
 
   /* If the comp unit has DW_AT_ranges, it may have discontiguous ranges.
      Also, DW_AT_ranges may record ranges not belonging to any child DIEs
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 70e33a6..b278717 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-25  Tom Tromey  <tromey@redhat.com>
+
+	* gdb.dwarf2/nostaticblock.exp: New file.
+
 2013-04-24  Muhammad Bilal  <mbilal@codesourcery.com>
 
 	PR gdb/10462
diff --git a/gdb/testsuite/gdb.dwarf2/nostaticblock.exp b/gdb/testsuite/gdb.dwarf2/nostaticblock.exp
new file mode 100644
index 0000000..69e4c60
--- /dev/null
+++ b/gdb/testsuite/gdb.dwarf2/nostaticblock.exp
@@ -0,0 +1,59 @@
+# Copyright 2013 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+load_lib dwarf.exp
+
+# This test can only be run on targets which support DWARF-2 and use gas.
+if {![dwarf2_support]} {
+    return 0  
+}
+
+if { [skip_cplus_tests] } { continue }
+
+standard_testfile main.c .S
+
+# Make some DWARF for the test.
+set asm_file [standard_output_file $srcfile2]
+Dwarf::assemble $asm_file {
+    cu 0 2 8 {
+ 	compile_unit {
+	    {low_pc 0x104320 DW_FORM_addr}
+	    {high_pc 0x1045ed DW_FORM_addr}
+	} {
+	}
+    }
+}
+
+if  {[gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile}1.o \
+	  object {nodebug}] != ""} {
+    return -1
+}
+
+if  {[gdb_compile $asm_file ${binfile}2.o object {nodebug}] != ""} {
+    return -1
+}
+
+if  {[gdb_compile [list ${binfile}1.o ${binfile}2.o] \
+	  "${binfile}" executable {c++}] != ""} {
+    return -1
+}
+
+clean_restart ${testfile}
+
+set saved_gdbflags $GDBFLAGS
+set GDBFLAGS "$GDBFLAGS --readnow"
+clean_restart $testfile
+set GDBFLAGS $saved_gdbflags
+
+gdb_test "p 1" " = 1" "alive"