Merge GDB 7.5.1

gdb/testsuite/gdb.threads/schedlock.exp

Index: gdb/testsuite/gdb.threads/schedlock.exp
diff --git a/gdb/testsuite/gdb.threads/schedlock.exp b/gdb/testsuite/gdb.threads/schedlock.exp
index 2c34a89f1177592b7bb01abc5ef0481fdaa58426..2d0552afcb5fa8fdfa3db58d68db443e139ebb92 100644
--- a/gdb/testsuite/gdb.threads/schedlock.exp
+++ b/gdb/testsuite/gdb.threads/schedlock.exp
@@ -19,19 +19,13 @@
 #
 # This test covers the various forms of "set scheduler-locking".
 
-if $tracelevel then {
-	strace $tracelevel
-}
-
 
-set testfile "schedlock"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
 
 # The number of threads, including the main thread.
 set NUM 2
 
-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
 }