Merge GDB 7.5.1

gdb/testsuite/gdb.cp/dispcxx.cc

-/* This testcase is part of GDB, the GNU debugger.
+/* Test for displays in C++.
 
-   Copyright 2006-2012 Free Software Foundation, Inc.
+   Copyright 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/>.
 */
 
-int copyreloc = 1;
+struct K {
+  void method () { }
 
-int
-g (void (*p)(void))
-{
-  p ();
+  int k;
+
+  K() : k(23) { }
+
+  int m2 ()
+  {
+    k += 7;                     // Break here
+    return k;
+  }
+};
+
+int main() {
+  K k;
+
+  k.method();
+  return k.m2();
 }
 
-void
-f(void (*p)(void)) {
-  g (p);
-}
-
-void (*h (void)) (void (*p)(void))
-{
-  return f;
-}