Merge GDB 7.5.1

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

Index: gdb/testsuite/gdb.arch/mips16-thunks-main.c
diff --git a/gdb/testsuite/gdb.base/watchpoint-hw.c b/gdb/testsuite/gdb.arch/mips16-thunks-main.c
similarity index 89%
copy from gdb/testsuite/gdb.base/watchpoint-hw.c
copy to gdb/testsuite/gdb.arch/mips16-thunks-main.c
index c86c7cefc099a2a91beaae4fc16ade43db44a70b..37239b1a3eb82e3ac16b8bac30c01482e8e6d0fc 100644
--- a/gdb/testsuite/gdb.base/watchpoint-hw.c
+++ b/gdb/testsuite/gdb.arch/mips16-thunks-main.c
@@ -1,6 +1,6 @@
 /* This testcase is part of GDB, the GNU debugger.
 
-   Copyright 2008-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,10 +15,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-int watchee;
+int inmain (void);
 
 int
 main (void)
 {
-  return 0;
+  return inmain ();
 }