Merge GDB 7.5.1

gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02.exp

 # Test reading debug information from in object files.
 
 if { [skip_hp_tests] } { continue }
 
 if { ![istarget "hppa*-*-hpux*"] } {
     verbose "HPUX test ignored for non-hppa targets."
     return 0
 }
 
 set testfile "test"
 set srcsubdir ${srcdir}/${subdir}/objdbg02
 set objdbgdir ${objdir}/${subdir}/objdbg02
 set binfile ${objdbgdir}/${testfile}
 set toolssubdir ${srcdir}/${subdir}/tools
 
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
-if [get_compiler_info ${binfile}] {
+if [get_compiler_info] {
     return -1
 }
 
 if {!$hp_aCC_compiler && !$hp_cc_compiler} {
   return 0
 }
 
 if { [gdb_compile "${toolssubdir}/test-objdbg.cc" "${objdbgdir}/test-objdbg.o" object "debug c++ {additional_flags=-I${toolssubdir} +objdebug}"] != "" } {
     untested objdbg02.exp
     return -1
@@ skipping 48 matching lines @@
 gdb_test "s 1" "main .*/x1.cc:15.*"
 gdb_test "s 1" ".*16.*"
 if [istarget "hppa64-*-*"] {
     gdb_test "s 1" "0x\[0-9a-f\]+ in .*START.*"
     gdb_continue_to_end
 } else {
     gdb_test "s 1" "0x\[0-9a-f\]+ in _start .*"
     gdb_continue_to_end "" "s 1"
 }