Merge GDB 7.5.1

gdb/testsuite/gdb.cp/dispcxx.cc

Index: gdb/testsuite/gdb.cp/dispcxx.cc
diff --git a/gdb/testsuite/gdb.base/prelink-lib.c b/gdb/testsuite/gdb.cp/dispcxx.cc
similarity index 71%
copy from gdb/testsuite/gdb.base/prelink-lib.c
copy to gdb/testsuite/gdb.cp/dispcxx.cc
index b3f77e6ff5c5dd23dc1583c259f7f8516e3ae671..2bc15e479367061f3a8ed5d825488569c9cc4d9a 100644
--- a/gdb/testsuite/gdb.base/prelink-lib.c
+++ b/gdb/testsuite/gdb.cp/dispcxx.cc
@@ -1,6 +1,6 @@
-/* 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
@@ -16,20 +16,24 @@
    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;
 
-void
-f(void (*p)(void)) {
-  g (p);
-}
+  K() : k(23) { }
+
+  int m2 ()
+  {
+    k += 7;			// Break here
+    return k;
+  }
+};
 
-void (*h (void)) (void (*p)(void))
-{
-  return f;
+int main() {
+  K k;
+
+  k.method();
+  return k.m2();
 }
+