Merge GDB 7.5.1

gdb/testsuite/gdb.base/store.exp

Index: gdb/testsuite/gdb.base/store.exp
diff --git a/gdb/testsuite/gdb.base/store.exp b/gdb/testsuite/gdb.base/store.exp
index ebb198a3ceb1bd8138bafd3562c1617cbfcbfb4f..913c70524b1ca1d2b8f3246a8a40b00bc89b9894 100644
--- a/gdb/testsuite/gdb.base/store.exp
+++ b/gdb/testsuite/gdb.base/store.exp
@@ -15,10 +15,6 @@
 # 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
 #
@@ -31,7 +27,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     return -1
 }
 
-if [get_compiler_info ${binfile}] {
+if [get_compiler_info] {
     return -1;
 }
 
@@ -52,12 +48,23 @@ if ![runto_main] then {
 #
 
 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}" \