Merge GDB 7.5.1

gdb/testsuite/gdb.base/catch-load-so.c

Index: gdb/testsuite/gdb.base/catch-load-so.c
diff --git a/gdb/testsuite/gdb.cp/readnow-language.cc b/gdb/testsuite/gdb.base/catch-load-so.c
similarity index 91%
copy from gdb/testsuite/gdb.cp/readnow-language.cc
copy to gdb/testsuite/gdb.base/catch-load-so.c
index 2ff0d4fb79cce534d3e1f38c945005529de38c76..9676479f67f07b98bb251550f1220b76c6b0c525 100644
--- a/gdb/testsuite/gdb.cp/readnow-language.cc
+++ b/gdb/testsuite/gdb.base/catch-load-so.c
@@ -1,6 +1,6 @@
 /* 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
@@ -16,6 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 int
-main ()
+f(void)
 {
+  return 23;
 }