Merge GDB 7.5.1

gdb/testsuite/gdb.base/macscp1.c

 #include <stdio.h>
 
 #define SPLICE(a, b) INNER_SPLICE(a, b)
 #define INNER_SPLICE(a, b) a ## b
 #define STRINGIFY(a) INNER_STRINGIFY(a)
 #define INNER_STRINGIFY(a) #a
 
 #define FIFTY_SEVEN 57
 
 #define FORTY_EIGHT 48
@@ skipping 71 matching lines @@
   puts ("macscp1_3");
 }
 
 void
 macscp_expr (void)
 {
   int foo = -1;
 
   foo = 0;  /* set breakpoint here */
 #define MACRO_TO_EXPAND foo
-  foo = 1;
+  foo = 1;                      /* set second breakpoint here */
 #undef MACRO_TO_EXPAND
-  foo = 2;
+  foo = 2;                      /* stopping point for line test */
 }
 
 #define TWENTY_THREE 23
 
 int
 main (int argc, char **argv)
 {
   macscp1_1 ();
   macscp2_1 ();
   macscp4_1_from_macscp2 ();
   macscp4_2_from_macscp2 ();
   macscp2_2 ();
   macscp1_2 ();
   macscp3_1 ();
   macscp4_1_from_macscp3 ();
   macscp4_2_from_macscp3 ();
   macscp3_2 ();
   macscp1_3 ();
   macscp_expr ();
 }