Merge GDB 7.5.1

gdb/testsuite/gdb.arch/i386-disp-step.exp

 # Copyright 2009-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.
 
 # Test i386 displaced stepping.
 
-if $tracelevel {
-    strace $tracelevel
-}
-
 
 if {(![istarget "x86_64-*-*"] && ![istarget "i?86-*-*"]) || ![is_ilp32_target] } then {
     verbose "Skipping x86 displaced stepping tests."
     return
 }
 
 set testfile "i386-disp-step"
 set srcfile ${testfile}.S
 set binfile ${objdir}/${subdir}/${testfile}
 
@@ skipping 125 matching lines @@
 
 gdb_test "continue" \
     "Continuing.*Breakpoint.*, test_int3_end ().*" \
     "continue to test_int3_end"
 
 ##########################################
 
 # Done, run program to exit.
 
 gdb_continue_to_end "i386-disp-step"