Merge GDB 7.5.1

gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp

Index: gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp
diff --git a/gdb/testsuite/gdb.arch/amd64-prologue-xmm.exp b/gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp
similarity index 56%
copy from gdb/testsuite/gdb.arch/amd64-prologue-xmm.exp
copy to gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp
index ecd3b523ceab56f7afd0fcf8495ab6965aac1db2..8460893fa3d337e5fe726e0e3194d735a7e290c3 100644
--- a/gdb/testsuite/gdb.arch/amd64-prologue-xmm.exp
+++ b/gdb/testsuite/gdb.arch/amd64-tailcall-ret.exp
@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -13,24 +13,19 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Test GCC PR debug/48827 workaround in GDB.
-
-set testfile "amd64-prologue-xmm"
-set srcfile ${testfile}.s
-set csrcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}.x
 set opts {}
+standard_testfile .S
 
 if [info exists COMPILE] {
-    # make check RUNTESTFLAGS='gdb.arch/amd64-prologue-xmm.exp COMPILE=1'
-    set srcfile ${csrcfile}
-    lappend opts debug optimize=-O0
+    # make check RUNTESTFLAGS="gdb.arch/amd64-tailcall-ret.exp COMPILE=1"
+    standard_testfile
+    lappend opts debug optimize=-O2
 } elseif { ![istarget x86_64-*-* ] || ![is_lp64_target] } {
-    verbose "Skipping amd64-prologue-xmm test."
-    return 0
+    verbose "Skipping ${testfile}."
+    return
 }
 
-if {[prepare_for_testing ${testfile}.exp ${testfile} $srcfile $opts]} {
+if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $opts] } {
     return -1
 }
 
@@ -38,9 +33,12 @@ if ![runto_main] {
     return -1
 }
 
-gdb_breakpoint "func"
-gdb_breakpoint "marker"
+gdb_breakpoint "g"
+gdb_continue_to_breakpoint "g" ".* v = 2;"
+
+gdb_test "return" { f \(\); /\* second \*/} "return" \
+         {Make g return now\? \(y or n\) } "y"
 
-gdb_continue_to_breakpoint "func"
+gdb_continue_to_breakpoint "g" ".* v = 2;"
 
-gdb_test "p fail" " = 0" "stopped at func"
+gdb_test "finish" " v = 3;"