summaryrefslogtreecommitdiff
path: root/libffi
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2013-01-17 18:24:08 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2013-01-17 18:24:08 +0000
commitbda7c755766f978c47db4a05771adbd3fc492707 (patch)
tree8ed88253035862ed61ad3b2a2d81d36deefffe12 /libffi
parent73263209353c576036c925ab80ed2a2b63155ea1 (diff)
downloadgcc-bda7c755766f978c47db4a05771adbd3fc492707.tar.gz
2013-01-07 Thorsten Glaser <tg@mirbsd.org>
PR middle-end/56000 * testsuite/libffi.call/cls_uchar_va.c, testsuite/libffi.call/cls_ushort_va.c, testsuite/libffi.call/va_1.c: Testsuite fixes. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195277 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libffi')
-rw-r--r--libffi/ChangeLog6
-rw-r--r--libffi/testsuite/libffi.call/cls_uchar_va.c4
-rw-r--r--libffi/testsuite/libffi.call/cls_ushort_va.c4
-rw-r--r--libffi/testsuite/libffi.call/va_1.c10
4 files changed, 15 insertions, 9 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 01088f231ba..e53ac5fddbc 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-07 Thorsten Glaser <tg@mirbsd.org>
+
+ * testsuite/libffi.call/cls_uchar_va.c,
+ testsuite/libffi.call/cls_ushort_va.c,
+ testsuite/libffi.call/va_1.c: Testsuite fixes.
+
2012-12-29 Andreas Schwab <schwab@linux-m68k.org>
* Makefile.am (ACLOCAL_AMFLAGS, TEXINFO_TEX, MAKEINFOFLAGS)
diff --git a/libffi/testsuite/libffi.call/cls_uchar_va.c b/libffi/testsuite/libffi.call/cls_uchar_va.c
index 19cd4f375e6..6491c5b3df1 100644
--- a/libffi/testsuite/libffi.call/cls_uchar_va.c
+++ b/libffi/testsuite/libffi.call/cls_uchar_va.c
@@ -12,9 +12,9 @@ typedef unsigned char 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/libffi/testsuite/libffi.call/cls_ushort_va.c b/libffi/testsuite/libffi.call/cls_ushort_va.c
index b2b5a3b4627..37aa1064ea7 100644
--- a/libffi/testsuite/libffi.call/cls_ushort_va.c
+++ b/libffi/testsuite/libffi.call/cls_ushort_va.c
@@ -12,9 +12,9 @@ typedef unsigned short 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/libffi/testsuite/libffi.call/va_1.c b/libffi/testsuite/libffi.call/va_1.c
index 5c7cce9f7f1..cf4dd85cede 100644
--- a/libffi/testsuite/libffi.call/va_1.c
+++ b/libffi/testsuite/libffi.call/va_1.c
@@ -5,7 +5,7 @@
Originator: ARM Ltd. */
/* { dg-do run } */
-/* { dg-output "" { xfail avr32*-*-* x86_64-*-*-* } } */
+/* { dg-output "" { xfail avr32*-*-* } } */
#include "ffitest.h"
#include <stdarg.h>
@@ -132,10 +132,10 @@ main (void)
arg_types[1] = &s_type;
arg_types[2] = &l_type;
arg_types[3] = &s_type;
- arg_types[4] = &ffi_type_uint;
- arg_types[5] = &ffi_type_sint;
- arg_types[6] = &ffi_type_uint;
- arg_types[7] = &ffi_type_sint;
+ arg_types[4] = &ffi_type_uchar;
+ arg_types[5] = &ffi_type_schar;
+ arg_types[6] = &ffi_type_ushort;
+ arg_types[7] = &ffi_type_sshort;
arg_types[8] = &ffi_type_uint;
arg_types[9] = &ffi_type_sint;
arg_types[10] = &ffi_type_ulong;