Merge GDB 7.5.1

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

Index: gdb/testsuite/gdb.base/info-macros.exp
diff --git a/gdb/testsuite/gdb.base/info-macros.exp b/gdb/testsuite/gdb.base/info-macros.exp
index d175e9fb460a60fce60b13aeb50ca61fe343005b..c87f1043ff9e1917a4a2357cff19d0da717126c7 100644
--- a/gdb/testsuite/gdb.base/info-macros.exp
+++ b/gdb/testsuite/gdb.base/info-macros.exp
@@ -16,14 +16,15 @@
 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