Merge GDB 7.5.1

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

Index: gdb/testsuite/gdb.base/ctxobj-v.c
diff --git a/gdb/testsuite/gdb.base/attach-pie-noexec.c b/gdb/testsuite/gdb.base/ctxobj-v.c
similarity index 83%
copy from gdb/testsuite/gdb.base/attach-pie-noexec.c
copy to gdb/testsuite/gdb.base/ctxobj-v.c
index 4de16282835399b3bcee85a664c0a9374fa54d64..6d3a8d0b27d61de8a0a0da868485cc4db9f6ec73 100644
--- a/gdb/testsuite/gdb.base/attach-pie-noexec.c
+++ b/gdb/testsuite/gdb.base/ctxobj-v.c
@@ -1,6 +1,5 @@
 /* This testcase is part of GDB, the GNU debugger.
-
-   Copyright 2011-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,11 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <unistd.h>
+#ifndef VERSION
+#error VERSION macro is not defined.
+#endif
 
-int
-main (void)
-{
-  sleep (600);
-  return 0;
-}
+int this_version_num = VERSION;