Merge GDB 7.5.1

gdb/testsuite/gdb.threads/interrupted-hand-call.exp

Index: gdb/testsuite/gdb.threads/interrupted-hand-call.exp
diff --git a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
index 8c22bd3c85128c4a23ce02646dbbb7eafcd5d963..7b838afce4b881d7b22e3b2bc1bbd8a6d9f08737 100644
--- a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
+++ b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp
@@ -19,15 +19,9 @@
 
 set NR_THREADS 4
 
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set testfile "interrupted-hand-call"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
 
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}" "additional_flags=-DNR_THREADS=$NR_THREADS"]] != "" } {
+if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "additional_flags=-DNR_THREADS=$NR_THREADS"]] != "" } {
     return -1
 }
 
@@ -39,10 +33,7 @@ if [target_info exists gdb,cannot_call_functions] {
     continue
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${binfile}
 
 if { ![runto_main] } {
     fail "Can't run to main"