Merge GDB 7.5.1

gdb/testsuite/gdb.cp/extern-c.exp

Index: gdb/testsuite/gdb.cp/extern-c.exp
diff --git a/gdb/testsuite/gdb.cp/extern-c.exp b/gdb/testsuite/gdb.cp/extern-c.exp
index 70c8f93d6ab7aedbe23b560b39429f97573812b6..eecccc6256370dd67ddaa52d31958b7912e8a4b4 100644
--- a/gdb/testsuite/gdb.cp/extern-c.exp
+++ b/gdb/testsuite/gdb.cp/extern-c.exp
@@ -17,22 +17,12 @@
 
 if { [skip_cplus_tests] } { continue }
 
-set testfile "extern-c"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .cc
 
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     untested extern-c.exp
-     return -1
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
+    return -1
 }
 
-# Start with a fresh gdb
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 runto_main
 
 if { [gdb_breakpoint "c_func"] == 1 } {