Merge GDB 7.5.1

gdb/testsuite/gdb.cp/temargs.exp

Index: gdb/testsuite/gdb.cp/temargs.exp
diff --git a/gdb/testsuite/gdb.cp/temargs.exp b/gdb/testsuite/gdb.cp/temargs.exp
index 37c13363e981f7005cd633319fa6462c0e89b707..8c89002772fa592676d6aeb1c6624b3d1e3c8176 100644
--- a/gdb/testsuite/gdb.cp/temargs.exp
+++ b/gdb/testsuite/gdb.cp/temargs.exp
@@ -17,16 +17,11 @@
 
 # This file is part of the gdb testsuite.
 
-if {$tracelevel} {
-    strace $tracelevel
-}
-
 if {[skip_cplus_tests]} {
     continue
 }
 
-set testfile "temargs"
-set srcfile "${testfile}.cc"
+standard_testfile .cc
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
     return -1
@@ -176,7 +171,7 @@ if $have_older_template_gcc { setup_xfail "*-*-*" }
 gdb_test "ptype F" "type = void \\\(S::\\\*\\\)\\\(S \\\* const\\\)" \
     "test type of F in k2_m"
 
-setup_kfail gcc/49366 "*-*-*"
+setup_xfail gcc/49366 "*-*-*"
 gdb_test "print F" "&S::somefunc" "test value of F in k2_m"
 
 #
@@ -189,10 +184,10 @@ gdb_test "print F" "&S::somefunc" "test value of F in k2_m"
 gdb_continue_to_breakpoint "continue to sixth breakpoint for temargs"
 
 if $have_older_template_gcc { setup_xfail "*-*-*"
-} else { setup_kfail gcc/49546 "*-*-*" }
+} else { setup_xfail gcc/49546 "*-*-*" }
 gdb_test "ptype F" {type = void \(\*\)\(int\)} "test type of F in k3_m"
 
 if $have_older_template_gcc { setup_xfail "*-*-*"
-} else { setup_kfail gcc/49546 "*-*-*" }
+} else { setup_xfail gcc/49546 "*-*-*" }
 gdb_test "print F" { = \(void \(\*\)\(int\)\) 0x[0-9a-f]+ <S3::m\(int\)>} \
 	 "test value of F in k3_m"