Merge GDB 7.5.1

gdb/testsuite/gdb.cp/virtfunc.cc

 /* This test script is part of GDB, the GNU debugger.
 
    Copyright 1993-1994, 1997-1999, 2003-2004, 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.
 
@@ skipping 93 matching lines @@
 D*  ppd = ⅆ
 AD* pAd = ⅆ
 
 A   a;
 B   b;
 C   c;
 D   d;
 E   e;
 V   v;
 VB  vb;
+VA  va;
 
 
 A*      pAa     =       &a;
 A*      pAe     =       &e;
 
 B*      pBe     =       &e;
 
 D*      pDd     =       &d;
 D*      pDe     =       &e;
 
@@ skipping 51 matching lines @@
 
         TEST(pBe->vvb(), 411);
         TEST(pDe->vvb(), 411);
 
         TEST(pEe->vd(), 282);
         TEST(pEe->fvb(), 311);
     
         TEST(pEe->D::vg(), 102);
         printf("Did %d tests, of which %d failed.\n", all_count, failed_count);
 }
-#ifdef usestubs
-extern "C" {
-  void set_debug_traps();
-  void breakpoint();
-};
-#endif
 
 int main()
 {
-#ifdef usestubs
-   set_debug_traps();
-   breakpoint();
-#endif
     init();
 
     e.w = 7;
     e.vb = 11;
 
     test_calls();
     return 0;
     
 }
 
 int A::f() {return 1;}
 int B::f() {return 2;}
 void D::s() {}
 int E::f() {return 20;}
 int D::vg() {return 100+d;}
 int E::vg() {return 200+d;}
 int V::f() {return 600+w;}
 int V::vv() {return 400+w;}
 int E::vv() {return 450+w;}
 int D::fd() {return 250+d;}
 int D::vd() {return 280+d;}
 int VB::fvb() {return 300+vb;}
 int VB::vvb() {return 400+vb;}