Merge GDB 7.5.1

gdb/testsuite/gdb.base/expand-psymtabs.exp

Index: gdb/testsuite/gdb.base/expand-psymtabs.exp
diff --git a/gdb/testsuite/gdb.base/expand-psymtabs.exp b/gdb/testsuite/gdb.base/expand-psymtabs.exp
index 93ea864abe7b024ecad8dd9577f052c427125f0e..6632736adc31d80977244020a5b98db3f9f89388 100644
--- a/gdb/testsuite/gdb.base/expand-psymtabs.exp
+++ b/gdb/testsuite/gdb.base/expand-psymtabs.exp
@@ -16,10 +16,6 @@
 #
 # This file is part of the gdb testsuite.
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 # It's possible to have a program that contains two compilation units
 # for the same source file name, that have code at different lines.
 # For example, in this test, we compile expand-psymtabs.c twice with
@@ -40,7 +36,7 @@ set binfile_1 ${objdir}/${subdir}/${testfile}_1.o
 set binfile_2 ${objdir}/${subdir}/${testfile}_2.o
 
 # What compiler are we using?
-if [get_compiler_info ${binfile}] {
+if [get_compiler_info] {
     return -1
 }