Merge GDB 7.5.1

gdb/testsuite/gdb.base/shlib-call.exp

 #   Copyright 1997-2000, 2004, 2007-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 10 matching lines @@
 # shr2.c (shared lib)
 # ss.h (header for shr2.c)
 #
 # file written by Elena Zannoni: elz@ch.apollo.com
 #
 
 #debug shmain
 #prop lib shr1.sl
 #prop lib shr2.sl
 
-if $tracelevel then {
-        strace $tracelevel
-}
-
 
 if {[skip_shlib_tests]} {
     return 0
 }
 
 set testfile "shmain"
 set libfile1 "shr1"
 set libfile2 "shr2"
 set srcfile  ${srcdir}/${subdir}/${testfile}.c
 set lib1src  ${srcdir}/${subdir}/${libfile1}.c
 set lib2src  ${srcdir}/${subdir}/${libfile2}.c
 set lib1     ${objdir}/${subdir}/${libfile1}.sl
 set lib2     ${objdir}/${subdir}/${libfile2}.sl
 set binfile  ${objdir}/${subdir}/${testfile}
 
 set lib_opts "debug"
 set exec_opts [list debug shlib=${lib1} shlib=${lib2}]
 
-if [get_compiler_info ${binfile}] {
+if [get_compiler_info] {
     return -1
 }
 
 if { [gdb_compile_shlib ${lib1src} ${lib1} $lib_opts] != ""
      || [gdb_compile_shlib ${lib2src} ${lib2} $lib_opts] != ""
      || [gdb_compile ${srcfile} ${binfile} executable $exec_opts] != ""} {
     untested "Could not compile $lib1, $lib2, or $srcfile."
     return -1
 }
 
@@ skipping 119 matching lines @@
 
   gdb_continue_to_end "" continue 1
 
   gdb_test "run" "Starting program:.*Breakpoint .,.*" \
         "re-run to bp in shared library (PR's 16495, 18213)"
 
   gdb_continue_to_end "" continue 1
 }
 
 return 0