Merge GDB 7.5.1

gdb/testsuite/gdb.base/ctxobj-f.c

Index: gdb/testsuite/gdb.base/ctxobj-f.c
diff --git a/gdb/testsuite/gdb.base/expand-psymtabs.c b/gdb/testsuite/gdb.base/ctxobj-f.c
similarity index 74%
copy from gdb/testsuite/gdb.base/expand-psymtabs.c
copy to gdb/testsuite/gdb.base/ctxobj-f.c
index 8829312871883d2bb7ec0afcab7fa0da449f4d11..56d1aba3aa5cba9d2ac80ee9429445e0fff4895f 100644
--- a/gdb/testsuite/gdb.base/expand-psymtabs.c
+++ b/gdb/testsuite/gdb.base/ctxobj-f.c
@@ -1,6 +1,5 @@
 /* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2007-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
@@ -15,26 +14,19 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-extern void foo (void);
+extern int this_version_num;
+
+#ifndef GET_VERSION
+#error GET_VERSION macro is undefined
+#endif
 
-#ifdef FIRST
 int
-main (void)
-  {
-    foo ();
-    return 0;
-  }
-
-#else
-void
-bar (void)
-  {
-  }
-
-void
-foo (void)
-  {
-    bar(); /* Break here  */
-  }
+GET_VERSION (void)
+{
+  int v = this_version_num;
 
-#endif
+  if (v > 999)
+    v = 999;
+
+  return v;  /* STOP */
+}