Merge GDB 7.5.1

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

Index: gdb/testsuite/gdb.arch/mips16-thunks-sinfrob.c
diff --git a/gdb/testsuite/gdb.cp/paren-type.cc b/gdb/testsuite/gdb.arch/mips16-thunks-sinfrob.c
similarity index 77%
copy from gdb/testsuite/gdb.cp/paren-type.cc
copy to gdb/testsuite/gdb.arch/mips16-thunks-sinfrob.c
index 4f7e808df2ad06737671100c6702c90a9e7fd77f..cad50c5663d532b2cd304fb0c6f33093296bdc78 100644
--- a/gdb/testsuite/gdb.cp/paren-type.cc
+++ b/gdb/testsuite/gdb.arch/mips16-thunks-sinfrob.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
@@ -15,19 +15,24 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-class C
-{
-public:
-  static void f (short x);
-};
+#include <math.h>
+
+extern long i;
 
-void
-C::f (short x)
+double
+sinfrob (double d)
 {
+  i++;
+  d = sin (d);
+  i++;
+  return d;
 }
 
-int
-main ()
+double
+sinblah (double d)
 {
-  C::f(1);
+  i++;
+  d = sin (d);
+  i++;
+  return d;
 }