Merge GDB 7.5.1

gdb/testsuite/gdb.objc/nondebug.exp

Index: gdb/testsuite/gdb.objc/nondebug.exp
diff --git a/gdb/testsuite/gdb.objc/nondebug.exp b/gdb/testsuite/gdb.objc/nondebug.exp
index d901b81b66a24f90901b1d6187cf0b55c1723231..bca897f7a3b2a784e945e0374f92ad77a56e9526 100644
--- a/gdb/testsuite/gdb.objc/nondebug.exp
+++ b/gdb/testsuite/gdb.objc/nondebug.exp
@@ -17,13 +17,7 @@
 
 # This file was written by Adam Fedor (fedor@gnu.org)
 
-if $tracelevel then {
-	strace $tracelevel
-}
-
-set testfile "nondebug"
-set srcfile ${testfile}.m
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .m
 
 #
 # Objective-C program compilation isn't standard. We need to figure out
@@ -35,7 +29,6 @@ if {[gdb_compile_objc "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [
 
 proc do_objc_tests {} {
     global subdir
-    global objdir
     global srcdir
     global binfile
     global gdb_prompt