Merge GDB 7.5.1

gdb/testsuite/gdb.arch/mips16-thunks-inmain.c

Index: gdb/testsuite/gdb.arch/mips16-thunks-inmain.c
diff --git a/gdb/testsuite/gdb.python/py-progspace.c b/gdb/testsuite/gdb.arch/mips16-thunks-inmain.c
similarity index 91%
copy from gdb/testsuite/gdb.python/py-progspace.c
copy to gdb/testsuite/gdb.arch/mips16-thunks-inmain.c
index 53825a6abefc9207eb89acb38fa6942120477ef5..86ff4bc9cabb43b8c9f96946bc50a8c7d77f9a85 100644
--- a/gdb/testsuite/gdb.python/py-progspace.c
+++ b/gdb/testsuite/gdb.arch/mips16-thunks-inmain.c
@@ -1,6 +1,6 @@
 /* This testcase is part of GDB, the GNU debugger.
 
-   Copyright 2010-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,7 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 int
-main ()
+inmain (void)
 {
   return 0;
 }