Commit a098b44f4c592c2192fcdef4fad6108eb3f4301c
2012-04-06T17:04:35
Reapply missing testsuite changes for arm
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218
diff --git a/.pc/applied-patches b/.pc/applied-patches
index 5bb67d7..088a2d8 100644
--- a/.pc/applied-patches
+++ b/.pc/applied-patches
@@ -11,3 +11,4 @@ apple-fixes
dist-tests
icc128
x32libtool
+arm-test-fix
diff --git a/.pc/arm-test-fix/.timestamp b/.pc/arm-test-fix/.timestamp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.pc/arm-test-fix/.timestamp
diff --git a/.pc/arm-test-fix/testsuite/libffi.call/cls_double_va.c b/.pc/arm-test-fix/testsuite/libffi.call/cls_double_va.c
new file mode 100644
index 0000000..67e44a4
--- /dev/null
+++ b/.pc/arm-test-fix/testsuite/libffi.call/cls_double_va.c
@@ -0,0 +1,64 @@
+/* Area: ffi_call, closure_call
+ Purpose: Test doubles passed in variable argument lists.
+ Limitations: none.
+ PR: none.
+ Originator: Blake Chaffin 6/6/2007 */
+
+/* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */
+/* { dg-output "" { xfail avr32*-*-* } } */
+/* { dg-output "" { xfail mips-sgi-irix6* } } PR libffi/46660 */
+/* { dg-skip-if "" arm*-*-* { "-mfloat-abi=hard" } { "" } } */
+
+#include "ffitest.h"
+
+static void
+cls_double_va_fn(ffi_cif* cif __UNUSED__, void* resp,
+ void** args, void* userdata __UNUSED__)
+{
+ char* format = *(char**)args[0];
+ double doubleValue = *(double*)args[1];
+
+ *(ffi_arg*)resp = printf(format, doubleValue);
+}
+
+int main (void)
+{
+ ffi_cif cif;
+ void *code;
+ ffi_closure *pcl = ffi_closure_alloc(sizeof(ffi_closure), &code);
+ void* args[3];
+ ffi_type* arg_types[3];
+
+ char* format = "%.1f\n";
+ double doubleArg = 7;
+ ffi_arg res = 0;
+
+ arg_types[0] = &ffi_type_pointer;
+ arg_types[1] = &ffi_type_double;
+ arg_types[2] = NULL;
+
+ /* This printf call is variadic */
+ CHECK(ffi_prep_cif_var(&cif, FFI_DEFAULT_ABI, 1, 2, &ffi_type_sint,
+ arg_types) == FFI_OK);
+
+ args[0] = &format;
+ args[1] = &doubleArg;
+ args[2] = NULL;
+
+ ffi_call(&cif, FFI_FN(printf), &res, args);
+ // { dg-output "7.0" }
+ printf("res: %d\n", (int) res);
+ // { dg-output "\nres: 4" }
+
+ /* The call to cls_double_va_fn is static, so have to use a normal prep_cif */
+ CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 2, &ffi_type_sint, arg_types) == FFI_OK);
+
+ CHECK(ffi_prep_closure_loc(pcl, &cif, cls_double_va_fn, NULL, code) == FFI_OK);
+
+ res = ((int(*)(char*, double))(code))(format, doubleArg);
+ // { dg-output "\n7.0" }
+ printf("res: %d\n", (int) res);
+ // { dg-output "\nres: 4" }
+
+ exit(0);
+}
diff --git a/.pc/arm-test-fix/testsuite/libffi.call/cls_longdouble_va.c b/.pc/arm-test-fix/testsuite/libffi.call/cls_longdouble_va.c
new file mode 100644
index 0000000..6b8484a
--- /dev/null
+++ b/.pc/arm-test-fix/testsuite/libffi.call/cls_longdouble_va.c
@@ -0,0 +1,65 @@
+/* Area: ffi_call, closure_call
+ Purpose: Test long doubles passed in variable argument lists.
+ Limitations: none.
+ PR: none.
+ Originator: Blake Chaffin 6/6/2007 */
+
+/* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */
+/* { dg-output "" { xfail avr32*-*-* x86_64-*-mingw* } } */
+/* { dg-output "" { xfail mips-sgi-irix6* } } PR libffi/46660 */
+/* { dg-skip-if "" arm*-*-* { "-mfloat-abi=hard" } { "" } } */
+
+#include "ffitest.h"
+
+static void
+cls_longdouble_va_fn(ffi_cif* cif __UNUSED__, void* resp,
+ void** args, void* userdata __UNUSED__)
+{
+ char* format = *(char**)args[0];
+ long double ldValue = *(long double*)args[1];
+
+ *(ffi_arg*)resp = printf(format, ldValue);
+}
+
+int main (void)
+{
+ ffi_cif cif;
+ void *code;
+ ffi_closure *pcl = ffi_closure_alloc(sizeof(ffi_closure), &code);
+ void* args[3];
+ ffi_type* arg_types[3];
+
+ char* format = "%.1Lf\n";
+ long double ldArg = 7;
+ ffi_arg res = 0;
+
+ arg_types[0] = &ffi_type_pointer;
+ arg_types[1] = &ffi_type_longdouble;
+ arg_types[2] = NULL;
+
+ /* This printf call is variadic */
+ CHECK(ffi_prep_cif_var(&cif, FFI_DEFAULT_ABI, 1, 2, &ffi_type_sint,
+ arg_types) == FFI_OK);
+
+ args[0] = &format;
+ args[1] = &ldArg;
+ args[2] = NULL;
+
+ ffi_call(&cif, FFI_FN(printf), &res, args);
+ // { dg-output "7.0" }
+ printf("res: %d\n", (int) res);
+ // { dg-output "\nres: 4" }
+
+ /* The call to cls_longdouble_va_fn is static, so have to use a normal prep_cif */
+ CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 2, &ffi_type_sint,
+ arg_types) == FFI_OK);
+
+ CHECK(ffi_prep_closure_loc(pcl, &cif, cls_longdouble_va_fn, NULL, code) == FFI_OK);
+
+ res = ((int(*)(char*, long double))(code))(format, ldArg);
+ // { dg-output "\n7.0" }
+ printf("res: %d\n", (int) res);
+ // { dg-output "\nres: 4" }
+
+ exit(0);
+}
diff --git a/patches/arm-test-fix b/patches/arm-test-fix
new file mode 100644
index 0000000..8417d92
--- /dev/null
+++ b/patches/arm-test-fix
@@ -0,0 +1,24 @@
+Index: libffi/testsuite/libffi.call/cls_double_va.c
+===================================================================
+--- libffi.orig/testsuite/libffi.call/cls_double_va.c
++++ libffi/testsuite/libffi.call/cls_double_va.c
+@@ -7,7 +7,6 @@
+ /* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */
+ /* { dg-output "" { xfail avr32*-*-* } } */
+ /* { dg-output "" { xfail mips-sgi-irix6* } } PR libffi/46660 */
+-/* { dg-skip-if "" arm*-*-* { "-mfloat-abi=hard" } { "" } } */
+
+ #include "ffitest.h"
+
+Index: libffi/testsuite/libffi.call/cls_longdouble_va.c
+===================================================================
+--- libffi.orig/testsuite/libffi.call/cls_longdouble_va.c
++++ libffi/testsuite/libffi.call/cls_longdouble_va.c
+@@ -7,7 +7,6 @@
+ /* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */
+ /* { dg-output "" { xfail avr32*-*-* x86_64-*-mingw* } } */
+ /* { dg-output "" { xfail mips-sgi-irix6* } } PR libffi/46660 */
+-/* { dg-skip-if "" arm*-*-* { "-mfloat-abi=hard" } { "" } } */
+
+ #include "ffitest.h"
+
diff --git a/patches/series b/patches/series
index e45ad78..f2322ce 100644
--- a/patches/series
+++ b/patches/series
@@ -12,3 +12,4 @@ apple-fixes
dist-tests
icc128
x32libtool
+arm-test-fix
diff --git a/testsuite/libffi.call/cls_double_va.c b/testsuite/libffi.call/cls_double_va.c
index 67e44a4..dbf2000 100644
--- a/testsuite/libffi.call/cls_double_va.c
+++ b/testsuite/libffi.call/cls_double_va.c
@@ -7,7 +7,6 @@
/* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */
/* { dg-output "" { xfail avr32*-*-* } } */
/* { dg-output "" { xfail mips-sgi-irix6* } } PR libffi/46660 */
-/* { dg-skip-if "" arm*-*-* { "-mfloat-abi=hard" } { "" } } */
#include "ffitest.h"
diff --git a/testsuite/libffi.call/cls_longdouble_va.c b/testsuite/libffi.call/cls_longdouble_va.c
index 6b8484a..4fa1ea2 100644
--- a/testsuite/libffi.call/cls_longdouble_va.c
+++ b/testsuite/libffi.call/cls_longdouble_va.c
@@ -7,7 +7,6 @@
/* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */
/* { dg-output "" { xfail avr32*-*-* x86_64-*-mingw* } } */
/* { dg-output "" { xfail mips-sgi-irix6* } } PR libffi/46660 */
-/* { dg-skip-if "" arm*-*-* { "-mfloat-abi=hard" } { "" } } */
#include "ffitest.h"