Merge GDB 7.5.1

gdb/testsuite/gdb.base/info-macros.exp

 # Copyright 2011-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/>.
 
 set testfile "info-macros"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
-get_compiler_info ${binfile}
-if [test_compiler_info gcc*] {
-    lappend options additional_flags=-g3
-} else {
+
+get_compiler_info
+if ![test_compiler_info gcc*] {
   untested ${testfile}.exp
   return -1
 }
 
+set options "debug additional_flags=-g3"
+
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $options] } {
     untested ${testfile}.exp
     return -1
 }
 
 if ![runto_main] {
     untested ${testfile}.exp
     return -1
 }
 
@@ skipping 239 matching lines @@
 }
 
 set test "info macros info-macros.c:42"
 
 set r1 ".*define DEF_MACROS"
 set r2 ".*define ONE"
 # info macros on the line where the #define or #include is
 # fails to find the macro defined (though it works on the next line.)
 setup_kfail "gdb/NNNN" *-*-*
 gdb_test "$test" "$r1$r2" "$test"