Merge GDB 7.5.1

gdb/testsuite/gdb.base/store.exp

 # This testcase is part of GDB, the GNU debugger.
 
 # Copyright 2002-2004, 2007-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
 # (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/>.
 
-if $tracelevel {
-    strace $tracelevel
-}
-
 #
 # test running programs
 #
 
 set testfile "store"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested store.exp
     return -1
 }
 
-if [get_compiler_info ${binfile}] {
+if [get_compiler_info] {
     return -1;
 }
 
 gdb_exit
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
 #
 # set it up at a breakpoint so we can play with the variable values
 #
 
 if ![runto_main] then {
     perror "couldn't run to breakpoint"
     continue
 }
 
 #
 
 proc check_set { t l r new add } {
+    global gdb_prompt
+
     set prefix "var ${t} l"
     gdb_test "tbreak wack_${t}"
-    gdb_test "continue" "register ${t} l = u, r = v;" \
-        "continue to wack_${t}"
-    gdb_test "next" "l = add_${t} .l, r.;" \
-        "${prefix}; next ${t}"
+
+    set test "continue to wack_${t}"
+    gdb_test_multiple "continue" $test {
+        -re "register ${t} l = u, r = v;\r\n$gdb_prompt $" {
+            # See GCC PR debug/53948.
+            send_gdb "next\n"
+            exp_continue
+        }
+        -re "l = add_${t} .l, r.;\r\n$gdb_prompt $" {
+            pass $test
+        }
+    }
+
     gdb_test "print l" " = ${l}" \
         "${prefix}; print old l, expecting ${l}"
     gdb_test "print r" " = ${r}" \
         "${prefix}; print old r, expecting ${r}"
     gdb_test_no_output "set variable l = 4" \
         "${prefix}; setting l to 4"
     gdb_test "print l" " = ${new}" \
         "${prefix}; print new l, expecting ${new}"
     gdb_test "next" "return l \\+ r;" \
         "${prefix}; next over add call"
@@ skipping 120 matching lines @@
 check_field 1
 check_field 2
 check_field 3
 check_field 4
 
 #
 
 # WANTED: A fairly portable way of convincing the compiler to split a
 # value across memory and registers.