Merge GDB 7.5.1

gdb/testsuite/gdb.threads/staticthreads.exp

Index: gdb/testsuite/gdb.threads/staticthreads.exp
diff --git a/gdb/testsuite/gdb.threads/staticthreads.exp b/gdb/testsuite/gdb.threads/staticthreads.exp
index bb65156b3a99102d055665ee360b39b3994c894a..d26f3e8c52d6498d5f1f100bc146f708f9a9439f 100644
--- a/gdb/testsuite/gdb.threads/staticthreads.exp
+++ b/gdb/testsuite/gdb.threads/staticthreads.exp
@@ -18,26 +18,18 @@
 # Based on manythreads written by Jeff Johnston, contributed by Red
 # Hat.
 
-if $tracelevel then {
-	strace $tracelevel
-}
-
 
-set testfile "staticthreads"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
 set static_flag "-static"
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	 executable \
-	 [list debug "incdir=${objdir}" "additional_flags=${static_flag}" \
+	 [list debug "additional_flags=${static_flag}" \
 	     ]] != "" } {
     return -1
 }
 
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${binfile}
 gdb_test_no_output "set print sevenbit-strings"