Merge GDB 7.5.1

gdb/testsuite/gdb.base/lineinc.exp

 # Test macro handling of #included files.
 # Copyright 2003, 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
@@ skipping 59 matching lines @@
 # #included by a given source file in a list sorted by the line at
 # which they were #included; this gives GDB the chance to detect
 # multiple #inclusions at the same line, complain, and assign
 # distinct, albiet incorrect, line numbers to each #inclusion.
 #
 # However, at one point GDB was sorting the list in reverse order,
 # while the code to assign new, distinct line numbers assumed it was
 # sorted in ascending order; GDB would get an internal error trying to
 # read the above debugging info.
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 
 set testfile "lineinc"
 set binfile ${objdir}/${subdir}/${testfile}
 
 
 if {[gdb_compile "${srcdir}/${subdir}/${testfile}.c" ${binfile} executable {debug}] != ""} {
     untested lineinc.exp
     return -1
 }
 
@@ skipping 18 matching lines @@
                 exp_continue
             }
             -re "$gdb_prompt" {
             }                
             timeout {
                 fail "$test_name (timeout)"
             }
         }
     }
 }