Merge GDB 7.5.1

gdb/testsuite/gdb.arch/i386-bp_permanent.exp

 # Copyright (C) 2008-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
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # This file is part of the gdb testsuite.
 
-if $tracelevel {
-    strace $tracelevel
-}
-
 # Test stepping over permanent breakpoints on i386.
 
 if {(![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"]) || ![is_ilp32_target] } then {
     verbose "Skipping skip over permanent breakpoint on i386 tests."
     return
 }
 
 set testfile "i386-bp_permanent"
 set srcfile i386-prologue.c
 set binfile ${objdir}/${subdir}/${testfile}
@@ skipping 58 matching lines @@
 
 gdb_test "continue" "Breakpoint .*, $address in $function.*" \
          "Stop at permanent breakpoint."
 
 gdb_test "stepi" "$address1|$address2 in $function.*" \
          "Single stepping past permanent breakpoint."
 
 gdb_test "print \$esp" ".*$start_esp.*" \
          "ESP value does not match - step_permanent_breakpoint wrong."