Merge GDB 7.5.1

gdb/testsuite/gdb.base/info-fun-solib.c

Index: gdb/testsuite/gdb.base/info-fun-solib.c
diff --git a/gdb/testsuite/gdb.mi/solib-lib.c b/gdb/testsuite/gdb.base/info-fun-solib.c
similarity index 87%
copy from gdb/testsuite/gdb.mi/solib-lib.c
copy to gdb/testsuite/gdb.base/info-fun-solib.c
index daad4682f67b34fd27b0e87f1af2daefc9e32c63..835940661a239ecfffacae52bb87a6792623a235 100644
--- a/gdb/testsuite/gdb.mi/solib-lib.c
+++ b/gdb/testsuite/gdb.base/info-fun-solib.c
@@ -1,4 +1,4 @@
-/* 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
@@ -11,9 +11,10 @@
    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/>.
-*/
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-void solibfunction(void)
+int
+foo (void)
 {
+  return 0;
 }