Merge GDB 7.5.1

gdb/testsuite/gdb.cp/ovldbreak.cc

 #include <stddef.h>
 
 class foo {
 public:
   foo  (int);
   foo  (int, const char *);
   foo  (foo&);
   ~foo ();
   void foofunc (int);
   void foofunc (int, signed char *);
@@ skipping 71 matching lines @@
     foo_instance1.overloadargs(1, 2, 3, 4);
     foo_instance1.overloadargs(1, 2, 3, 4, 5);
     foo_instance1.overloadargs(1, 2, 3, 4, 5, 6);
     foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7);
     foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7, 8);
     foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7, 8, 9);
     foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
     foo_instance1.overloadargs(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11);
    
 
-    #ifdef usestubs
-       set_debug_traps();
-       breakpoint();
-    #endif
 
 
     marker1();
     return 0; 
 }
 
 foo::foo  (int i)                  { ifoo = i;}
 foo::foo  (int i, const char *ccp) { ifoo = i; ccpfoo = ccp; }
 foo::foo  (foo& afoo)              { ifoo = afoo.ifoo; ccpfoo = afoo.ccpfoo;}
 foo::~foo ()                       {}
 
 
 /* Some functions to test overloading by varying one argument type. */
 
-int foo::overload1arg (void)                {  return 1; }
-int foo::overload1arg (char arg)            { arg = 0; return 2;}
-int foo::overload1arg (signed char arg)     { arg = 0; return 3;}
-int foo::overload1arg (unsigned char arg)   { arg = 0; return 4;}
-int foo::overload1arg (short arg)           { arg = 0; return 5;}
-int foo::overload1arg (unsigned short arg)  { arg = 0; return 6;}
-int foo::overload1arg (int arg)             { arg = 0; return 7;}
-int foo::overload1arg (unsigned int arg)    { arg = 0; return 8;}
-int foo::overload1arg (long arg)            { arg = 0; return 9;}
-int foo::overload1arg (unsigned long arg)   { arg = 0; return 10;}
-int foo::overload1arg (float arg)           { arg = 0; return 11;}
-int foo::overload1arg (double arg)          { arg = 0; return 12;}
+int foo::overload1arg (void)
+{ return 1; } /* fo1 void */
+
+int foo::overload1arg (char arg)
+{ arg = 0; return 2; } /* fo1 char */
+
+int foo::overload1arg (signed char arg)
+{ arg = 0; return 3; } /* fo1 signed_char */
+
+int foo::overload1arg (unsigned char arg)
+{ arg = 0; return 4; } /* fo1 unsigned_char */
+
+int foo::overload1arg (short arg)
+{ arg = 0; return 5; } /* fo1 short_int */
+
+int foo::overload1arg (unsigned short arg)
+{ arg = 0; return 6; } /* fo1 unsigned_short_int */
+
+int foo::overload1arg (int arg)
+{ arg = 0; return 7; } /* fo1 int */
+
+int foo::overload1arg (unsigned int arg)
+{ arg = 0; return 8; } /* fo1 unsigned_int */
+
+int foo::overload1arg (long arg)
+{ arg = 0; return 9; } /* fo1 long_int */
+
+int foo::overload1arg (unsigned long arg)
+{ arg = 0; return 10; } /* fo1 unsigned_long_int */
+
+int foo::overload1arg (float arg)
+{ arg = 0; return 11; } /* fo1 float */
+
+int foo::overload1arg (double arg)
+{ arg = 0; return 12; } /* fo1 double */
 
 
 /* Some functions to test overloading by varying argument count. */
 
 int foo::overloadargs (int a1)                 
 { a1 = 0; 
 return 1;}
 
 int foo::overloadargs (int a1, int a2)          
 { a1 = a2 = 0; 
@@ skipping 43 matching lines @@
 
 
 void foo::foofunc (int a)
 {
 }
 
 void foo::foofunc (int b, signed char *c)
 {
 }