Merge GDB 7.5.1

gdb/testsuite/gdb.dwarf2/pr13961.exp

Index: gdb/testsuite/gdb.dwarf2/pr13961.exp
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp b/gdb/testsuite/gdb.dwarf2/pr13961.exp
similarity index 68%
copy from gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp
copy to gdb/testsuite/gdb.dwarf2/pr13961.exp
index 9df6a7e6df955427a73ecaae545e062f76509170..1dc6f0a0a764ce2f85a7f00ba5c3529f6671daba 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp
+++ b/gdb/testsuite/gdb.dwarf2/pr13961.exp
@@ -1,5 +1,5 @@
-# Copyright 2011-2012 Free Software Foundation, Inc.
-#
+# Copyright 2012 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
@@ -12,18 +12,23 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# A testcase to trigger the code path in bug 13961.
+
 load_lib dwarf.exp
 
 # This test can only be run on targets which support DWARF-2 and use gas.
 if {![dwarf2_support]} {
-    return 0  
+    return 0
 }
 
-set testfile dw2-var-zero-addr
-if [prepare_for_testing ${testfile}.exp ${testfile} [list ${testfile}.S main.c] {nodebug}] {
+standard_testfile .S
+
+if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] == -1 } {
     return -1
 }
 
-# FAIL was: = (int *) 0x0
-# Such DIE record can be produced using: gcc -fdata-sections -Wl,-gc-sections
-gdb_test "print &var" {No symbol "var" in current context\.}
+gdb_test "break main" "Breakpoint.*at.*"
+
+# If we get this far gdb didn't crash.
+pass $testfile