Fix broken test cases

diff --git a/ChangeLog b/ChangeLog
index a789f85bfd664d3ccc8f3162c5f41538dbc41ada..ad13df5d27b239271f86d9ca3602b746afd9ab93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-11-15  Andrew Haley  <aph@redhat.com>
+
+       * testsuite/libffi.call/va_struct1.c (main): Fix broken test.
+       * testsuite/libffi.call/cls_uint_va.c (cls_ret_T_fn): Likewise
+       * testsuite/libffi.call/cls_struct_va1.c (test_fn): Likewise.
+       * testsuite/libffi.call/va_1.c (main): Likewise.
+
 2013-11-14  David Schneider  <david.schneider@bivab.de>
 
        * src/arm/ffi.c: Fix register allocation for mixed float and

diff --git a/testsuite/libffi.call/cls_struct_va1.c b/testsuite/libffi.call/cls_struct_va1.c
index 175ed96178025eca08b607c73820cc2b03b2c7a8..6d1fdaeb606ac90f09cdd1ec2408e67a846d0681 100644 (file)
--- a/testsuite/libffi.call/cls_struct_va1.c
+++ b/testsuite/libffi.call/cls_struct_va1.c
@@ -35,7 +35,7 @@ test_fn (ffi_cif* cif __UNUSED__, void* resp,
   printf ("%d %d %d %d %d %d %d %d %d %d\n", n, s1.a, s1.b,
          l1.a, l1.b, l1.c, l1.d, l1.e,
          s2.a, s2.b);
-  * (int*) resp = 42;
+  * (ffi_arg*) resp = 42;
 }
 
 int

diff --git a/testsuite/libffi.call/cls_uint_va.c b/testsuite/libffi.call/cls_uint_va.c
index 150fddd515db36346203ab35c8136b14eccc4074..b04cfd19c2ce42fbd08906fd8e72aa7eac928f90 100644 (file)
--- a/testsuite/libffi.call/cls_uint_va.c
+++ b/testsuite/libffi.call/cls_uint_va.c
@@ -13,9 +13,9 @@ typedef unsigned int T;
 static void cls_ret_T_fn(ffi_cif* cif __UNUSED__, void* resp, void** args,
                         void* userdata __UNUSED__)
  {
-   *(T *)resp = *(T *)args[0];
+   *(ffi_arg *)resp = *(T *)args[0];
 
-   printf("%d: %d %d\n", *(T *)resp, *(T *)args[0], *(T *)args[1]);
+   printf("%d: %d %d\n", (int)*(ffi_arg *)resp, *(T *)args[0], *(T *)args[1]);
  }
 
 typedef T (*cls_ret_T)(T, ...);

diff --git a/testsuite/libffi.call/va_1.c b/testsuite/libffi.call/va_1.c
index cf4dd85cedeff3743db63722758a07d555a5b391..7f96809ea9ecf180805c5ace9f57a342ab591992 100644 (file)
--- a/testsuite/libffi.call/va_1.c
+++ b/testsuite/libffi.call/va_1.c
@@ -94,7 +94,7 @@ main (void)
   struct large_tag l1;
 
   int n;
-  int res;
+  ffi_arg res;
 
   unsigned char uc;
   signed char sc;

diff --git a/testsuite/libffi.call/va_struct1.c b/testsuite/libffi.call/va_struct1.c
index 11d1f10e5c69e695ee6a1acd2dfc17dbfa2298fe..e6452061c1d3b5427c41b062186a329e080a9f41 100644 (file)
--- a/testsuite/libffi.call/va_struct1.c
+++ b/testsuite/libffi.call/va_struct1.c
@@ -61,7 +61,7 @@ main (void)
   struct large_tag l1;
 
   int n;
-  int res;
+  ffi_arg res;
 
   s_type.size = 0;
   s_type.alignment = 0;