Merge GDB 7.5.1

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

 /* 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
    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/>.  */
 
-#include <unistd.h>
+#ifndef VERSION
+#error VERSION macro is not defined.
+#endif
 
-int
-main (void)
-{
-  sleep (600);
-  return 0;
-}
+int this_version_num = VERSION;