Merge GDB 7.5.1

gdb/testsuite/gdb.base/watchpoints.exp

Index: gdb/testsuite/gdb.base/watchpoints.exp
diff --git a/gdb/testsuite/gdb.base/watchpoints.exp b/gdb/testsuite/gdb.base/watchpoints.exp
index b8b27dc514462d74354c574b5247ef92eaef08aa..57500b0519440b1a9724ce1f6157e4ea3fa65bb4 100644
--- a/gdb/testsuite/gdb.base/watchpoints.exp
+++ b/gdb/testsuite/gdb.base/watchpoints.exp
@@ -15,10 +15,6 @@
 
 # This file was written by Pierre Muller. (muller@ics.u-strasbg.fr)
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 
 set testfile "watchpoints"
 set srcfile ${testfile}.c
@@ -26,7 +22,7 @@ set binfile ${objdir}/${subdir}/${testfile}
 
 set wp_set 1
 
-if [get_compiler_info ${binfile}] {
+if [get_compiler_info] {
     return -1
 }