diff options
author | Anthony Green <green@moxielogic.com> | 2013-01-02 07:34:03 -0500 |
---|---|---|
committer | Anthony Green <green@moxielogic.com> | 2013-01-02 07:34:03 -0500 |
commit | 981c32ee115e9f0d6546a74592875e138222a9d1 (patch) | |
tree | a18380a3fe95a008f2172d7b131c24efecc4c5e8 /patches/fix-huge_struct-test | |
parent | 61a054929517fb80c437ba71c91f3e20cfff581a (diff) | |
download | libffi-981c32ee115e9f0d6546a74592875e138222a9d1.tar.gz |
Merge with GCC. Eliminate quilt bits.
Diffstat (limited to 'patches/fix-huge_struct-test')
-rw-r--r-- | patches/fix-huge_struct-test | 133 |
1 files changed, 0 insertions, 133 deletions
diff --git a/patches/fix-huge_struct-test b/patches/fix-huge_struct-test deleted file mode 100644 index 6118b32..0000000 --- a/patches/fix-huge_struct-test +++ /dev/null @@ -1,133 +0,0 @@ -Index: libffi/ChangeLog.libffi -=================================================================== ---- libffi.orig/ChangeLog.libffi -+++ libffi/ChangeLog.libffi -@@ -1,3 +1,14 @@ -+2009-12-24 Anthony Green <green@redhat.com> -+ -+ * testsuite/libffi.call/huge_struct.c: Fix printf format, and -+ don't xfail x86 Linux. -+ * testsuite/libffi.call/huge_struct.c: Don't xfail mips. -+ * testsuite/libffi.call/cls_pointer.c: Ditto. -+ * testsuite/libffi.call/cls_pointer_stack.c: Ditto. -+ * testsuite/libffi.call/cls_longdouble_va.c: Ditto. -+ * testsuite/libffi.call/cls_longdouble.c: Ditto. -+ * testsuite/libffi.call/cls_double_va.c: Ditto. -+ - 2009-06-16 Andrew Haley <aph@redhat.com> - - * testsuite/libffi.call/cls_align_sint64.c, -@@ -173,20 +184,20 @@ - 2008-12-22 Timothy Wall <twall@users.sf.net> - - * testsuite/libffi.call/closure_fn0.c, -- testsuite/libffi.call/closure_fn1.c, -- testsuite/libffi.call/closure_fn2.c, -- testsuite/libffi.call/closure_fn3.c, -- testsuite/libffi.call/closure_fn4.c, -- testsuite/libffi.call/closure_fn5.c, -- testsuite/libffi.call/closure_fn6.c, -- testsuite/libffi.call/closure_loc_fn0.c, -- testsuite/libffi.call/closure_stdcall.c, -- testsuite/libffi.call/cls_align_pointer.c, -- testsuite/libffi.call/cls_pointer.c, -+ testsuite/libffi.call/closure_fn1.c, -+ testsuite/libffi.call/closure_fn2.c, -+ testsuite/libffi.call/closure_fn3.c, -+ testsuite/libffi.call/closure_fn4.c, -+ testsuite/libffi.call/closure_fn5.c, -+ testsuite/libffi.call/closure_fn6.c, -+ testsuite/libffi.call/closure_loc_fn0.c, -+ testsuite/libffi.call/closure_stdcall.c, -+ testsuite/libffi.call/cls_align_pointer.c, -+ testsuite/libffi.call/cls_pointer.c, - testsuite/libffi.call/cls_pointer_stack.c: use portable cast from - pointer to integer (intptr_t). - * testsuite/libffi.call/cls_longdouble.c: disable for win64. -- -+ - 2008-12-19 Anthony Green <green@redhat.com> - - * configure.ac: Bump version to 3.0.8. -Index: libffi/testsuite/libffi.call/huge_struct.c -=================================================================== ---- libffi.orig/testsuite/libffi.call/huge_struct.c -+++ libffi/testsuite/libffi.call/huge_struct.c -@@ -5,10 +5,10 @@ - Originator: Blake Chaffin 6/18/2007 - */ - --/* { dg-excess-errors "" { target avr32-*-* x86_64-*-mingw* x86_64-*-cygwin* i*86-*-linux-* x86_64-*-linux-* } } */ --/* { dg-do run { xfail mips*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */ -+/* { dg-excess-errors "" { target avr32-*-* x86_64-*-mingw* x86_64-*-cygwin* } } */ -+/* { dg-do run { xfail arm*-*-* strongarm*-*-* xscale*-*-* } } */ - /* { dg-options -mlong-double-128 { target powerpc64*-*-* } } */ --/* { dg-output "" { xfail avr32-*-* x86_64-*-mingw* x86_64-*-cygwin* i*86-*-linux-* x86_64-*-linux-* } } */ -+/* { dg-output "" { xfail avr32-*-* x86_64-*-mingw* x86_64-*-cygwin* } } */ - - #include <stdint.h> - -@@ -131,14 +131,14 @@ test_large_fn( - ui64_4 + 4, si64_4 + 4, f_4 + 4, d_4 + 4, ld_4 + 4, (char*)((intptr_t)p_4 + 4), - ui8_5 + 5, si8_5 + 5}; - -- printf("%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %L.0f %p " -- "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %L.0f %p " -- "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %L.0f %p " -- "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %L.0f %p %hhu %hhd: " -- "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %L.0f %p " -- "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %L.0f %p " -- "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %L.0f %p " -- "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %L.0f %p %hhu %hhd\n", -+ printf("%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %.0Lf %p " -+ "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %.0Lf %p " -+ "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %.0Lf %p " -+ "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %.0Lf %p %hhu %hhd: " -+ "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %.0Lf %p " -+ "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %.0Lf %p " -+ "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %.0Lf %p " -+ "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %.0Lf %p %hhu %hhd\n", - ui8_1, si8_1, ui16_1, si16_1, ui32_1, si32_1, ui64_1, si64_1, f_1, d_1, ld_1, p_1, - ui8_2, si8_2, ui16_2, si16_2, ui32_2, si32_2, ui64_2, si64_2, f_2, d_2, ld_2, p_2, - ui8_3, si8_3, ui16_3, si16_3, ui32_3, si32_3, ui64_3, si64_3, f_3, d_3, ld_3, p_3, -@@ -229,7 +229,9 @@ main(int argc __UNUSED__, const char** a - - ffi_type ret_struct_type; - ffi_type* st_fields[51]; -- BigStruct retVal = {0}; -+ BigStruct retVal; -+ -+ memset (&retVal, 0, sizeof(retVal)); - - ret_struct_type.size = 0; - ret_struct_type.alignment = 0; -@@ -296,10 +298,10 @@ main(int argc __UNUSED__, const char** a - - ffi_call(&cif, FFI_FN(test_large_fn), &retVal, argValues); - // { dg-output "1 2 3 4 5 6 7 8 9 10 11 0x12345678 1 2 3 4 5 6 7 8 9 10 11 0x12345678 1 2 3 4 5 6 7 8 9 10 11 0x12345678 1 2 3 4 5 6 7 8 9 10 11 0x12345678 1 2: 2 3 4 5 6 7 8 9 10 11 12 0x12345679 3 4 5 6 7 8 9 10 11 12 13 0x1234567a 4 5 6 7 8 9 10 11 12 13 14 0x1234567b 5 6 7 8 9 10 11 12 13 14 15 0x1234567c 6 7" } -- printf("res: %hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %L.0f %p " -- "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %L.0f %p " -- "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %L.0f %p " -- "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %L.0f %p %hhu %hhd\n", -+ printf("res: %hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %.0Lf %p " -+ "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %.0Lf %p " -+ "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %.0Lf %p " -+ "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %.0Lf %p %hhu %hhd\n", - retVal.a, retVal.b, retVal.c, retVal.d, retVal.e, retVal.f, - retVal.g, retVal.h, retVal.i, retVal.j, retVal.k, retVal.l, - retVal.m, retVal.n, retVal.o, retVal.p, retVal.q, retVal.r, -@@ -324,10 +326,10 @@ main(int argc __UNUSED__, const char** a - ui8, si8, ui16, si16, ui32, si32, ui64, si64, f, d, ld, p, - ui8, si8); - // { dg-output "\n1 2 3 4 5 6 7 8 9 10 11 0x12345678 1 2 3 4 5 6 7 8 9 10 11 0x12345678 1 2 3 4 5 6 7 8 9 10 11 0x12345678 1 2 3 4 5 6 7 8 9 10 11 0x12345678 1 2: 2 3 4 5 6 7 8 9 10 11 12 0x12345679 3 4 5 6 7 8 9 10 11 12 13 0x1234567a 4 5 6 7 8 9 10 11 12 13 14 0x1234567b 5 6 7 8 9 10 11 12 13 14 15 0x1234567c 6 7" } -- printf("res: %hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %L.0f %p " -- "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %L.0f %p " -- "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %L.0f %p " -- "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %L.0f %p %hhu %hhd\n", -+ printf("res: %hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %.0Lf %p " -+ "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %.0Lf %p " -+ "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %.0Lf %p " -+ "%hhu %hhd %hu %hd %u %d %" PRIu64 " %" PRId64 " %.0f %.0f %.0Lf %p %hhu %hhd\n", - retVal.a, retVal.b, retVal.c, retVal.d, retVal.e, retVal.f, - retVal.g, retVal.h, retVal.i, retVal.j, retVal.k, retVal.l, - retVal.m, retVal.n, retVal.o, retVal.p, retVal.q, retVal.r, |