Merge GDB 7.5.1

gdb/testsuite/gdb.base/watch_thread_num.exp

Index: gdb/testsuite/gdb.base/watch_thread_num.exp
diff --git a/gdb/testsuite/gdb.base/watch_thread_num.exp b/gdb/testsuite/gdb.base/watch_thread_num.exp
index dbf37582f7c0f7770da2adebad26b0559b5eaab8..487c2fd7f9e98117106bebee88e4fcbf64597c87 100644
--- a/gdb/testsuite/gdb.base/watch_thread_num.exp
+++ b/gdb/testsuite/gdb.base/watch_thread_num.exp
@@ -19,10 +19,6 @@
 #                        watch commands.
 #
 
-if $tracelevel then {
-	strace $tracelevel
-}
-
 # This test verifies that a watchpoint is detected in the proper thread
 # so the test is only meaningful on a system with hardware watchpoints.
 if {[skip_hw_watchpoint_tests]} {
@@ -35,7 +31,7 @@ set binfile ${objdir}/${subdir}/${testfile}
 
 # What compiler are we using?
 #
-if [get_compiler_info ${binfile}] {
+if [get_compiler_info] {
     return -1
 }