Merge GDB 7.5.1

gdb/testsuite/gdb.threads/thread_check.exp

Index: gdb/testsuite/gdb.threads/thread_check.exp
diff --git a/gdb/testsuite/gdb.threads/thread_check.exp b/gdb/testsuite/gdb.threads/thread_check.exp
index 18446ca9452918df67eeef03d42406b0445288d5..8d94046925b381d324fe29f5a6f6bcd5e5adc82b 100644
--- a/gdb/testsuite/gdb.threads/thread_check.exp
+++ b/gdb/testsuite/gdb.threads/thread_check.exp
@@ -31,23 +31,15 @@
 # - delete all breakpoints 
 # - exit gdb.
 
-if $tracelevel then {
-        strace $tracelevel
-}
-
 
-set testfile "thread_check"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
 
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
+if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
     return -1
 }
 
 
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${binfile}
 
 if ![runto_main] then {
    fail "Can't run to main"