Update missing changes for 3.0.9r4.

2009-12-24 00:22:00 -05:00
parent f8c7a245bf
commit 115ab36fce
88 changed files with 19142 additions and 22010 deletions
--- a/testsuite/libffi.call/.svn/entries
+++ b/testsuite/libffi.call/.svn/entries
--- a/testsuite/libffi.call/.svn/text-base/cls_align_longdouble_split.c.svn-base
+++ b/testsuite/libffi.call/.svn/text-base/cls_align_longdouble_split.c.svn-base
@@ -5,7 +5,7 @@
   Originator:	<hos@tamanegi.org> 20031203	 */

 /* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
-/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
+/* { dg-do run { xfail arm*-*-* strongarm*-*-* xscale*-*-* } } */
 /* { dg-options -mlong-double-128 { target powerpc64*-*-* } } */
 /* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */

--- a/testsuite/libffi.call/.svn/text-base/cls_align_longdouble_split2.c.svn-base
+++ b/testsuite/libffi.call/.svn/text-base/cls_align_longdouble_split2.c.svn-base
@@ -6,7 +6,7 @@
 */

 /* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
-/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* } } */
+/* { dg-do run { xfail arm*-*-* strongarm*-*-* } } */
 /* { dg-options -mlong-double-128 { target powerpc64*-*-* } } */
 /* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */

--- a/testsuite/libffi.call/.svn/text-base/cls_dbls_struct.c.svn-base
+++ b/testsuite/libffi.call/.svn/text-base/cls_dbls_struct.c.svn-base
@@ -57,7 +57,7 @@ int main(int argc __UNUSED__, char** argv __UNUSED__)
 	CHECK(ffi_prep_closure_loc(pcl, &cif, closure_test_gn, NULL, code) == FFI_OK);

 	((void*(*)(Dbls))(code))(arg);
-	/* { dg-output "1.0 2.0\n" { xfail x86_64-*-linux-* } } */
+	/* { dg-output "1.0 2.0\n" } */

 	closure_test_fn(arg);
 	/* { dg-output "1.0 2.0\n" } */
--- a/testsuite/libffi.call/.svn/text-base/cls_longdouble_va.c.svn-base
+++ b/testsuite/libffi.call/.svn/text-base/cls_longdouble_va.c.svn-base
@@ -26,7 +26,7 @@ int main (void)
 	void* args[3];
 	ffi_type* arg_types[3];

-	char*		format	= "%L.1f\n";
+	char*		format	= "%.1Lf\n";
 	long double	ldArg	= 7;
 	ffi_arg		res		= 0;

@@ -42,9 +42,9 @@ int main (void)
 	args[2] = NULL;

 	ffi_call(&cif, FFI_FN(printf), &res, args);
-	// { dg-output "7.0" { xfail i*86-*-linux-* x86_64-*-linux-* } }
+	// { dg-output "7.0" }
 	printf("res: %d\n", (int) res);
-	// { dg-output "\nres: 4" { xfail i*86-*-linux-* x86_64-*-linux-* } }
+	// { dg-output "\nres: 4" }

 	CHECK(ffi_prep_closure_loc(pcl, &cif, cls_longdouble_va_fn, NULL, code) == FFI_OK);

--- a/testsuite/libffi.call/.svn/text-base/ffitest.h.svn-base
+++ b/testsuite/libffi.call/.svn/text-base/ffitest.h.svn-base
@@ -54,6 +54,20 @@
 #define PRIuLL "llu"
 #endif

+/* PA HP-UX kludge.  */
+#if defined(__hppa__) && defined(__hpux__) && !defined(PRIuPTR)
+#define PRIuPTR "lu"
+#endif
+
+/* Solaris < 10 kludge.  */
+#if defined(__sun__) && defined(__svr4__) && !defined(PRIuPTR)
+#if defined(__arch64__) || defined (__x86_64__)
+#define PRIuPTR "lu"
+#else
+#define PRIuPTR "u"
+#endif
+#endif
+
 #ifdef USING_MMAP
 static inline void *
 allocate_mmap (size_t size)
--- a/testsuite/libffi.call/.svn/text-base/stret_large.c.svn-base
+++ b/testsuite/libffi.call/.svn/text-base/stret_large.c.svn-base
@@ -6,7 +6,7 @@
   PR:			none.
   Originator:	Blake Chaffin	6/21/2007	*/

-/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-*  } } */
+/* { dg-do run { xfail arm*-*-* strongarm*-*-* xscale*-*-*  } } */
 #include "ffitest.h"

 // 13 FPRs: 104 bytes
--- a/testsuite/libffi.call/.svn/text-base/stret_large2.c.svn-base
+++ b/testsuite/libffi.call/.svn/text-base/stret_large2.c.svn-base
@@ -6,7 +6,7 @@
   PR:			none.
   Originator:	Blake Chaffin	6/21/2007	*/

-/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-*  } } */
+/* { dg-do run { xfail arm*-*-* strongarm*-*-* xscale*-*-*  } } */
 #include "ffitest.h"

 // 13 FPRs: 104 bytes
--- a/testsuite/libffi.call/.svn/text-base/stret_medium.c.svn-base
+++ b/testsuite/libffi.call/.svn/text-base/stret_medium.c.svn-base
@@ -6,7 +6,7 @@
   PR:			none.
   Originator:	Blake Chaffin	6/21/2007	*/

-/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-*  } } */
+/* { dg-do run { xfail arm*-*-* strongarm*-*-* xscale*-*-*  } } */
 #include "ffitest.h"

 typedef struct struct_72byte {
--- a/testsuite/libffi.call/.svn/text-base/stret_medium2.c.svn-base
+++ b/testsuite/libffi.call/.svn/text-base/stret_medium2.c.svn-base
@@ -6,7 +6,7 @@
   PR:			none.
   Originator:	Blake Chaffin	6/21/2007	*/

-/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-*  } } */
+/* { dg-do run { xfail arm*-*-* strongarm*-*-* xscale*-*-*  } } */
 #include "ffitest.h"

 typedef struct struct_72byte {
--- a/testsuite/libffi.call/call.exp
+++ b/testsuite/libffi.call/call.exp
@@ -1,8 +1,8 @@
-# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006, 2009 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,8 +11,8 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.

 # libffi testsuite that uses the 'dg.exp' driver.

--- a/testsuite/libffi.call/cls_align_longdouble_split.c
+++ b/testsuite/libffi.call/cls_align_longdouble_split.c
@@ -5,7 +5,7 @@
   Originator:	<hos@tamanegi.org> 20031203	 */

 /* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
-/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
+/* { dg-do run { xfail arm*-*-* strongarm*-*-* xscale*-*-* } } */
 /* { dg-options -mlong-double-128 { target powerpc64*-*-* } } */
 /* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */

--- a/testsuite/libffi.call/cls_align_longdouble_split2.c
+++ b/testsuite/libffi.call/cls_align_longdouble_split2.c
@@ -6,7 +6,7 @@
 */

 /* { dg-excess-errors "no long double format" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */
-/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* } } */
+/* { dg-do run { xfail arm*-*-* strongarm*-*-* } } */
 /* { dg-options -mlong-double-128 { target powerpc64*-*-* } } */
 /* { dg-output "" { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */

--- a/testsuite/libffi.call/cls_dbls_struct.c
+++ b/testsuite/libffi.call/cls_dbls_struct.c
@@ -57,7 +57,7 @@ int main(int argc __UNUSED__, char** argv __UNUSED__)
 	CHECK(ffi_prep_closure_loc(pcl, &cif, closure_test_gn, NULL, code) == FFI_OK);

 	((void*(*)(Dbls))(code))(arg);
-	/* { dg-output "1.0 2.0\n" { xfail avr32-*-* x86_64-*-linux-* } } */
+	/* { dg-output "1.0 2.0\n" } */

 	closure_test_fn(arg);
 	/* { dg-output "1.0 2.0\n" } */
--- a/testsuite/libffi.call/cls_double_va.c
+++ b/testsuite/libffi.call/cls_double_va.c
@@ -5,7 +5,6 @@
   Originator:	Blake Chaffin 6/6/2007	 */

 /* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
-/* { dg-output "" { xfail avr32-*-* } } */
 #include "ffitest.h"

 static void
--- a/testsuite/libffi.call/cls_longdouble_va.c
+++ b/testsuite/libffi.call/cls_longdouble_va.c
@@ -5,7 +5,7 @@
   Originator:	Blake Chaffin 6/6/2007	 */

 /* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
-/* { dg-output "" { xfail avr32-*-* x86_64-*-mingw* } } */
+/* { dg-output "" { xfail x86_64-*-mingw* } } */
 #include "ffitest.h"

 static void
@@ -26,7 +26,7 @@ int main (void)
 	void* args[3];
 	ffi_type* arg_types[3];

-	char*		format	= "%L.1f\n";
+	char*		format	= "%.1Lf\n";
 	long double	ldArg	= 7;
 	ffi_arg		res		= 0;

@@ -42,9 +42,9 @@ int main (void)
 	args[2] = NULL;

 	ffi_call(&cif, FFI_FN(printf), &res, args);
-	// { dg-output "7.0" { xfail i*86-*-linux-* x86_64-*-linux-* } }
+	// { dg-output "7.0" }
 	printf("res: %d\n", (int) res);
-	// { dg-output "\nres: 4" { xfail i*86-*-linux-* x86_64-*-linux-* } }
+	// { dg-output "\nres: 4" }

 	CHECK(ffi_prep_closure_loc(pcl, &cif, cls_longdouble_va_fn, NULL, code) == FFI_OK);

--- a/testsuite/libffi.call/ffitest.h
+++ b/testsuite/libffi.call/ffitest.h
@@ -54,6 +54,20 @@
 #define PRIuLL "llu"
 #endif

+/* PA HP-UX kludge.  */
+#if defined(__hppa__) && defined(__hpux__) && !defined(PRIuPTR)
+#define PRIuPTR "lu"
+#endif
+
+/* Solaris < 10 kludge.  */
+#if defined(__sun__) && defined(__svr4__) && !defined(PRIuPTR)
+#if defined(__arch64__) || defined (__x86_64__)
+#define PRIuPTR "lu"
+#else
+#define PRIuPTR "u"
+#endif
+#endif
+
 #ifdef USING_MMAP
 static inline void *
 allocate_mmap (size_t size)
--- a/testsuite/libffi.call/float2.c
+++ b/testsuite/libffi.call/float2.c
@@ -4,7 +4,7 @@
   PR:		none.
   Originator:	From the original ffitest.c  */

-/* { dg-excess-errors "" { target x86_64-*-mingw* x86_64-*-cygwin* } } */
+/* { dg-excess-errors "fails" { target x86_64-*-mingw* x86_64-*-cygwin* } } */
 /* { dg-do run { xfail x86_64-*-mingw* x86_64-*-cygwin* } } */

 #include "ffitest.h"
--- a/testsuite/libffi.call/stret_large.c
+++ b/testsuite/libffi.call/stret_large.c
@@ -6,7 +6,7 @@
   PR:			none.
   Originator:	Blake Chaffin	6/21/2007	*/

-/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-*  } } */
+/* { dg-do run { xfail arm*-*-* strongarm*-*-* xscale*-*-*  } } */
 #include "ffitest.h"

 // 13 FPRs: 104 bytes
--- a/testsuite/libffi.call/stret_large2.c
+++ b/testsuite/libffi.call/stret_large2.c
@@ -6,7 +6,7 @@
   PR:			none.
   Originator:	Blake Chaffin	6/21/2007	*/

-/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-*  } } */
+/* { dg-do run { xfail arm*-*-* strongarm*-*-* xscale*-*-*  } } */
 #include "ffitest.h"

 // 13 FPRs: 104 bytes
--- a/testsuite/libffi.call/stret_medium.c
+++ b/testsuite/libffi.call/stret_medium.c
@@ -6,7 +6,7 @@
   PR:			none.
   Originator:	Blake Chaffin	6/21/2007	*/

-/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-*  } } */
+/* { dg-do run { xfail arm*-*-* strongarm*-*-* xscale*-*-*  } } */
 #include "ffitest.h"

 typedef struct struct_72byte {
--- a/testsuite/libffi.call/stret_medium2.c
+++ b/testsuite/libffi.call/stret_medium2.c
@@ -6,7 +6,7 @@
   PR:			none.
   Originator:	Blake Chaffin	6/21/2007	*/

-/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-*  } } */
+/* { dg-do run { xfail arm*-*-* strongarm*-*-* xscale*-*-*  } } */
 #include "ffitest.h"

 typedef struct struct_72byte {