* testsuite/libffi.call/ffitest.h (ffi_type_mylong): Remove definition.

	* testsuite/libffi.call/cls_align_uint16.c (main): Use correct type
	specifiers.
	* testsuite/libffi.call/nested_struct1.c (main): Ditto.
	* testsuite/libffi.call/cls_sint.c (main): Ditto.
	* testsuite/libffi.call/nested_struct9.c (main): Ditto.
	* testsuite/libffi.call/cls_20byte1.c (main): Ditto.
	* testsuite/libffi.call/cls_9byte1.c (main): Ditto.
	* testsuite/libffi.call/closure_fn1.c (main): Ditto.
	* testsuite/libffi.call/closure_fn3.c (main): Ditto.
	* testsuite/libffi.call/return_dbl2.c (main): Ditto.
	* testsuite/libffi.call/cls_sshort.c (main): Ditto.
	* testsuite/libffi.call/return_fl3.c (main): Ditto.
	* testsuite/libffi.call/closure_fn5.c (main): Ditto.
	* testsuite/libffi.call/nested_struct.c (main): Ditto.
	* testsuite/libffi.call/nested_struct10.c (main): Ditto.
	* testsuite/libffi.call/return_ll1.c (main): Ditto.
	* testsuite/libffi.call/cls_8byte.c (main): Ditto.
	* testsuite/libffi.call/cls_align_uint32.c (main): Ditto.
	* testsuite/libffi.call/cls_align_sint16.c (main): Ditto.
	* testsuite/libffi.call/cls_20byte.c (main): Ditto.
	* testsuite/libffi.call/nested_struct2.c (main): Ditto.
	* testsuite/libffi.call/cls_24byte.c (main): Ditto.
	* testsuite/libffi.call/nested_struct6.c (main): Ditto.
	* testsuite/libffi.call/cls_uint.c (main): Ditto.
	* testsuite/libffi.call/cls_12byte.c (main): Ditto.
	* testsuite/libffi.call/cls_16byte.c (main): Ditto.
	* testsuite/libffi.call/closure_fn0.c (main): Ditto.
	* testsuite/libffi.call/cls_9byte2.c (main): Ditto.
	* testsuite/libffi.call/closure_fn2.c (main): Ditto.
	* testsuite/libffi.call/return_dbl1.c (main): Ditto.
	* testsuite/libffi.call/closure_fn4.c (main): Ditto.
	* testsuite/libffi.call/closure_fn6.c (main): Ditto.
	* testsuite/libffi.call/cls_align_sint32.c (main): Ditto.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127312 138bc75d-0d04-0410-961f-82ee72b054a4

34 files changed, 104 insertions, 78 deletions

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 73b737fd81f..947621fc249 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,40 @@
+2007-08-08  David Daney  <ddaney@avtrex.com>
+
+	* testsuite/libffi.call/ffitest.h (ffi_type_mylong): Remove definition.
+	* testsuite/libffi.call/cls_align_uint16.c (main): Use correct type
+	specifiers.
+	* testsuite/libffi.call/nested_struct1.c (main): Ditto.
+	* testsuite/libffi.call/cls_sint.c (main): Ditto.
+	* testsuite/libffi.call/nested_struct9.c (main): Ditto.
+	* testsuite/libffi.call/cls_20byte1.c (main): Ditto.
+	* testsuite/libffi.call/cls_9byte1.c (main): Ditto.
+	* testsuite/libffi.call/closure_fn1.c (main): Ditto.
+	* testsuite/libffi.call/closure_fn3.c (main): Ditto.
+	* testsuite/libffi.call/return_dbl2.c (main): Ditto.
+	* testsuite/libffi.call/cls_sshort.c (main): Ditto.
+	* testsuite/libffi.call/return_fl3.c (main): Ditto.
+	* testsuite/libffi.call/closure_fn5.c (main): Ditto.
+	* testsuite/libffi.call/nested_struct.c (main): Ditto.
+	* testsuite/libffi.call/nested_struct10.c (main): Ditto.
+	* testsuite/libffi.call/return_ll1.c (main): Ditto.
+	* testsuite/libffi.call/cls_8byte.c (main): Ditto.
+	* testsuite/libffi.call/cls_align_uint32.c (main): Ditto.
+	* testsuite/libffi.call/cls_align_sint16.c (main): Ditto.
+	* testsuite/libffi.call/cls_20byte.c (main): Ditto.
+	* testsuite/libffi.call/nested_struct2.c (main): Ditto.
+	* testsuite/libffi.call/cls_24byte.c (main): Ditto.
+	* testsuite/libffi.call/nested_struct6.c (main): Ditto.
+	* testsuite/libffi.call/cls_uint.c (main): Ditto.
+	* testsuite/libffi.call/cls_12byte.c (main): Ditto.
+	* testsuite/libffi.call/cls_16byte.c (main): Ditto.
+	* testsuite/libffi.call/closure_fn0.c (main): Ditto.
+	* testsuite/libffi.call/cls_9byte2.c (main): Ditto.
+	* testsuite/libffi.call/closure_fn2.c (main): Ditto.
+	* testsuite/libffi.call/return_dbl1.c (main): Ditto.
+	* testsuite/libffi.call/closure_fn4.c (main): Ditto.
+	* testsuite/libffi.call/closure_fn6.c (main): Ditto.
+	* testsuite/libffi.call/cls_align_sint32.c (main): Ditto.
+
 2007-08-07  Andrew Haley  <aph@redhat.com>
 
 	* src/x86/sysv.S (ffi_closure_raw_SYSV): Fix typo in previous
diff --git a/libffi/testsuite/libffi.call/closure_fn0.c b/libffi/testsuite/libffi.call/closure_fn0.c
index 929b0dd39ce..e3fd57f1391 100644
--- a/libffi/testsuite/libffi.call/closure_fn0.c
+++ b/libffi/testsuite/libffi.call/closure_fn0.c
@@ -63,21 +63,21 @@ int main (void)
 #endif
 
   cl_arg_types[0] = &ffi_type_uint64;
-  cl_arg_types[1] = &ffi_type_uint;
+  cl_arg_types[1] = &ffi_type_sint;
   cl_arg_types[2] = &ffi_type_uint64;
-  cl_arg_types[3] = &ffi_type_uint;
+  cl_arg_types[3] = &ffi_type_sint;
   cl_arg_types[4] = &ffi_type_sshort;
   cl_arg_types[5] = &ffi_type_uint64;
-  cl_arg_types[6] = &ffi_type_uint;
-  cl_arg_types[7] = &ffi_type_uint;
+  cl_arg_types[6] = &ffi_type_sint;
+  cl_arg_types[7] = &ffi_type_sint;
   cl_arg_types[8] = &ffi_type_double;
-  cl_arg_types[9] = &ffi_type_uint;
-  cl_arg_types[10] = &ffi_type_uint;
+  cl_arg_types[9] = &ffi_type_sint;
+  cl_arg_types[10] = &ffi_type_sint;
   cl_arg_types[11] = &ffi_type_float;
-  cl_arg_types[12] = &ffi_type_uint;
-  cl_arg_types[13] = &ffi_type_uint;
-  cl_arg_types[14] = &ffi_type_uint;
-  cl_arg_types[15] = &ffi_type_uint;
+  cl_arg_types[12] = &ffi_type_sint;
+  cl_arg_types[13] = &ffi_type_sint;
+  cl_arg_types[14] = &ffi_type_sint;
+  cl_arg_types[15] = &ffi_type_sint;
   cl_arg_types[16] = NULL;
 
   /* Initialize the cif */
diff --git a/libffi/testsuite/libffi.call/closure_fn1.c b/libffi/testsuite/libffi.call/closure_fn1.c
index e12917bbab0..b0c97d4b28e 100644
--- a/libffi/testsuite/libffi.call/closure_fn1.c
+++ b/libffi/testsuite/libffi.call/closure_fn1.c
@@ -61,15 +61,15 @@ int main (void)
   cl_arg_types[4] = &ffi_type_sshort;
   cl_arg_types[5] = &ffi_type_float;
   cl_arg_types[6] = &ffi_type_float;
-  cl_arg_types[7] = &ffi_type_uint;
+  cl_arg_types[7] = &ffi_type_sint;
   cl_arg_types[8] = &ffi_type_double;
-  cl_arg_types[9] = &ffi_type_uint;
-  cl_arg_types[10] = &ffi_type_uint;
+  cl_arg_types[9] = &ffi_type_sint;
+  cl_arg_types[10] = &ffi_type_sint;
   cl_arg_types[11] = &ffi_type_float;
-  cl_arg_types[12] = &ffi_type_uint;
-  cl_arg_types[13] = &ffi_type_uint;
-  cl_arg_types[14] = &ffi_type_uint;
-  cl_arg_types[15] = &ffi_type_uint;
+  cl_arg_types[12] = &ffi_type_sint;
+  cl_arg_types[13] = &ffi_type_sint;
+  cl_arg_types[14] = &ffi_type_sint;
+  cl_arg_types[15] = &ffi_type_sint;
   cl_arg_types[16] = NULL;
 
   /* Initialize the cif */
diff --git a/libffi/testsuite/libffi.call/closure_fn2.c b/libffi/testsuite/libffi.call/closure_fn2.c
index 498173ce6b8..c0d2b30e73a 100644
--- a/libffi/testsuite/libffi.call/closure_fn2.c
+++ b/libffi/testsuite/libffi.call/closure_fn2.c
@@ -61,15 +61,15 @@ int main (void)
   cl_arg_types[4] = &ffi_type_sshort;
   cl_arg_types[5] = &ffi_type_double;
   cl_arg_types[6] = &ffi_type_double;
-  cl_arg_types[7] = &ffi_type_uint;
+  cl_arg_types[7] = &ffi_type_sint;
   cl_arg_types[8] = &ffi_type_double;
-  cl_arg_types[9] = &ffi_type_uint;
-  cl_arg_types[10] = &ffi_type_uint;
+  cl_arg_types[9] = &ffi_type_sint;
+  cl_arg_types[10] = &ffi_type_sint;
   cl_arg_types[11] = &ffi_type_float;
-  cl_arg_types[12] = &ffi_type_uint;
+  cl_arg_types[12] = &ffi_type_sint;
   cl_arg_types[13] = &ffi_type_float;
-  cl_arg_types[14] = &ffi_type_uint;
-  cl_arg_types[15] = &ffi_type_uint;
+  cl_arg_types[14] = &ffi_type_sint;
+  cl_arg_types[15] = &ffi_type_sint;
   cl_arg_types[16] = NULL;
 
   /* Initialize the cif */
diff --git a/libffi/testsuite/libffi.call/closure_fn3.c b/libffi/testsuite/libffi.call/closure_fn3.c
index cd95dc4f044..e46cba6e3ff 100644
--- a/libffi/testsuite/libffi.call/closure_fn3.c
+++ b/libffi/testsuite/libffi.call/closure_fn3.c
@@ -64,13 +64,13 @@ int main (void)
   cl_arg_types[6] = &ffi_type_float;
   cl_arg_types[7] = &ffi_type_float;
   cl_arg_types[8] = &ffi_type_double;
-  cl_arg_types[9] = &ffi_type_uint;
+  cl_arg_types[9] = &ffi_type_sint;
   cl_arg_types[10] = &ffi_type_float;
   cl_arg_types[11] = &ffi_type_float;
-  cl_arg_types[12] = &ffi_type_uint;
+  cl_arg_types[12] = &ffi_type_sint;
   cl_arg_types[13] = &ffi_type_float;
   cl_arg_types[14] = &ffi_type_float;
-  cl_arg_types[15] = &ffi_type_uint;
+  cl_arg_types[15] = &ffi_type_sint;
   cl_arg_types[16] = NULL;
 
   /* Initialize the cif */
diff --git a/libffi/testsuite/libffi.call/closure_fn4.c b/libffi/testsuite/libffi.call/closure_fn4.c
index 65ff2be1058..8a46c534917 100644
--- a/libffi/testsuite/libffi.call/closure_fn4.c
+++ b/libffi/testsuite/libffi.call/closure_fn4.c
@@ -76,7 +76,7 @@ int main (void)
   for (i = 0; i < 15; i++) {
     cl_arg_types[i] = &ffi_type_uint64;
   }
-  cl_arg_types[15] = &ffi_type_uint;
+  cl_arg_types[15] = &ffi_type_sint;
   cl_arg_types[16] = NULL;
 
   /* Initialize the cif */
diff --git a/libffi/testsuite/libffi.call/closure_fn5.c b/libffi/testsuite/libffi.call/closure_fn5.c
index 2ad0aed21c2..dc449dc37ea 100644
--- a/libffi/testsuite/libffi.call/closure_fn5.c
+++ b/libffi/testsuite/libffi.call/closure_fn5.c
@@ -74,11 +74,11 @@ int main (void)
   for (i = 0; i < 10; i++) {
     cl_arg_types[i] = &ffi_type_uint64;
   }
-  cl_arg_types[10] = &ffi_type_uint;
+  cl_arg_types[10] = &ffi_type_sint;
   for (i = 11; i < 15; i++) {
     cl_arg_types[i] = &ffi_type_uint64;
   }
-  cl_arg_types[15] = &ffi_type_uint;
+  cl_arg_types[15] = &ffi_type_sint;
   cl_arg_types[16] = NULL;
 
   /* Initialize the cif */
diff --git a/libffi/testsuite/libffi.call/closure_fn6.c b/libffi/testsuite/libffi.call/closure_fn6.c
index e701a1f6e86..c2e412657ad 100644
--- a/libffi/testsuite/libffi.call/closure_fn6.c
+++ b/libffi/testsuite/libffi.call/closure_fn6.c
@@ -67,16 +67,16 @@ int main (void)
   cl_arg_types[1] = &ffi_type_uint64;
   cl_arg_types[2] = &ffi_type_uint64;
   cl_arg_types[3] = &ffi_type_uint64;
-  cl_arg_types[4] = &ffi_type_uint;
+  cl_arg_types[4] = &ffi_type_sint;
   cl_arg_types[5] = &ffi_type_double;
   cl_arg_types[6] = &ffi_type_double;
   cl_arg_types[7] = &ffi_type_float;
   cl_arg_types[8] = &ffi_type_double;
   cl_arg_types[9] = &ffi_type_double;
-  cl_arg_types[10] = &ffi_type_uint;
+  cl_arg_types[10] = &ffi_type_sint;
   cl_arg_types[11] = &ffi_type_float;
-  cl_arg_types[12] = &ffi_type_uint;
-  cl_arg_types[13] = &ffi_type_uint;
+  cl_arg_types[12] = &ffi_type_sint;
+  cl_arg_types[13] = &ffi_type_sint;
   cl_arg_types[14] = &ffi_type_double;
   cl_arg_types[15] = &ffi_type_double;
   cl_arg_types[16] = NULL;
diff --git a/libffi/testsuite/libffi.call/cls_12byte.c b/libffi/testsuite/libffi.call/cls_12byte.c
index e436721e752..29b85abd46a 100644
--- a/libffi/testsuite/libffi.call/cls_12byte.c
+++ b/libffi/testsuite/libffi.call/cls_12byte.c
@@ -66,9 +66,9 @@ int main (void)
   struct cls_struct_12byte j_dbl = { 1, 5, 3 };
   struct cls_struct_12byte res_dbl;
 
-  cls_struct_fields[0] = &ffi_type_uint32;
-  cls_struct_fields[1] = &ffi_type_uint32;
-  cls_struct_fields[2] = &ffi_type_uint32;
+  cls_struct_fields[0] = &ffi_type_sint;
+  cls_struct_fields[1] = &ffi_type_sint;
+  cls_struct_fields[2] = &ffi_type_sint;
   cls_struct_fields[3] = NULL;
 
   dbl_arg_types[0] = &cls_struct_type;
diff --git a/libffi/testsuite/libffi.call/cls_16byte.c b/libffi/testsuite/libffi.call/cls_16byte.c
index 466aa877ca4..a1c16a91ec5 100644
--- a/libffi/testsuite/libffi.call/cls_16byte.c
+++ b/libffi/testsuite/libffi.call/cls_16byte.c
@@ -67,9 +67,9 @@ int main (void)
   struct cls_struct_16byte j_dbl = { 1, 9.0, 3 };
   struct cls_struct_16byte res_dbl;
 
-  cls_struct_fields[0] = &ffi_type_uint32;
+  cls_struct_fields[0] = &ffi_type_sint;
   cls_struct_fields[1] = &ffi_type_double;
-  cls_struct_fields[2] = &ffi_type_uint32;
+  cls_struct_fields[2] = &ffi_type_sint;
   cls_struct_fields[3] = NULL;
 
   dbl_arg_types[0] = &cls_struct_type;
diff --git a/libffi/testsuite/libffi.call/cls_20byte.c b/libffi/testsuite/libffi.call/cls_20byte.c
index b12d4b17bbf..44a5759ec44 100644
--- a/libffi/testsuite/libffi.call/cls_20byte.c
+++ b/libffi/testsuite/libffi.call/cls_20byte.c
@@ -69,7 +69,7 @@ int main (void)
 
   cls_struct_fields[0] = &ffi_type_double;
   cls_struct_fields[1] = &ffi_type_double;
-  cls_struct_fields[2] = &ffi_type_uint32;
+  cls_struct_fields[2] = &ffi_type_sint;
   cls_struct_fields[3] = NULL;
 
   dbl_arg_types[0] = &cls_struct_type;
diff --git a/libffi/testsuite/libffi.call/cls_20byte1.c b/libffi/testsuite/libffi.call/cls_20byte1.c
index 978a51a970d..5d657d96ef0 100644
--- a/libffi/testsuite/libffi.call/cls_20byte1.c
+++ b/libffi/testsuite/libffi.call/cls_20byte1.c
@@ -69,7 +69,7 @@ int main (void)
   struct cls_struct_20byte f_dbl = { 4, 5.0, 7.0 };
   struct cls_struct_20byte res_dbl;
 
-  cls_struct_fields[0] = &ffi_type_uint32;
+  cls_struct_fields[0] = &ffi_type_sint;
   cls_struct_fields[1] = &ffi_type_double;
   cls_struct_fields[2] = &ffi_type_double;
   cls_struct_fields[3] = NULL;
diff --git a/libffi/testsuite/libffi.call/cls_24byte.c b/libffi/testsuite/libffi.call/cls_24byte.c
index 9aa0c065097..e8e2da69426 100644
--- a/libffi/testsuite/libffi.call/cls_24byte.c
+++ b/libffi/testsuite/libffi.call/cls_24byte.c
@@ -82,7 +82,7 @@ int main (void)
 
   cls_struct_fields[0] = &ffi_type_double;
   cls_struct_fields[1] = &ffi_type_double;
-  cls_struct_fields[2] = &ffi_type_uint32;
+  cls_struct_fields[2] = &ffi_type_sint;
   cls_struct_fields[3] = &ffi_type_float;
   cls_struct_fields[4] = NULL;
 
diff --git a/libffi/testsuite/libffi.call/cls_8byte.c b/libffi/testsuite/libffi.call/cls_8byte.c
index 46ef1a73c3b..317b98597f4 100644
--- a/libffi/testsuite/libffi.call/cls_8byte.c
+++ b/libffi/testsuite/libffi.call/cls_8byte.c
@@ -66,7 +66,7 @@ int main (void)
   struct cls_struct_8byte f_dbl = { 4, 5.0 };
   struct cls_struct_8byte res_dbl;
 
-  cls_struct_fields[0] = &ffi_type_uint32;
+  cls_struct_fields[0] = &ffi_type_sint;
   cls_struct_fields[1] = &ffi_type_float;
   cls_struct_fields[2] = NULL;
 
diff --git a/libffi/testsuite/libffi.call/cls_9byte1.c b/libffi/testsuite/libffi.call/cls_9byte1.c
index 6070fbe998d..ee708cc1c9e 100644
--- a/libffi/testsuite/libffi.call/cls_9byte1.c
+++ b/libffi/testsuite/libffi.call/cls_9byte1.c
@@ -67,7 +67,7 @@ int main (void)
   struct cls_struct_9byte j_dbl = { 1, 9.0};
   struct cls_struct_9byte res_dbl;
 
-  cls_struct_fields[0] = &ffi_type_uint32;
+  cls_struct_fields[0] = &ffi_type_sint;
   cls_struct_fields[1] = &ffi_type_double;
   cls_struct_fields[2] = NULL;
 
diff --git a/libffi/testsuite/libffi.call/cls_9byte2.c b/libffi/testsuite/libffi.call/cls_9byte2.c
index c4c8935db84..34519631a89 100644
--- a/libffi/testsuite/libffi.call/cls_9byte2.c
+++ b/libffi/testsuite/libffi.call/cls_9byte2.c
@@ -68,7 +68,7 @@ int main (void)
   struct cls_struct_9byte res_dbl;
 
   cls_struct_fields[0] = &ffi_type_double;
-  cls_struct_fields[1] = &ffi_type_uint32;
+  cls_struct_fields[1] = &ffi_type_sint;
   cls_struct_fields[2] = NULL;
 
   dbl_arg_types[0] = &cls_struct_type;
diff --git a/libffi/testsuite/libffi.call/cls_align_sint16.c b/libffi/testsuite/libffi.call/cls_align_sint16.c
index fe2cb04fd91..d5f4ae60ca4 100644
--- a/libffi/testsuite/libffi.call/cls_align_sint16.c
+++ b/libffi/testsuite/libffi.call/cls_align_sint16.c
@@ -68,7 +68,7 @@ int main (void)
   struct cls_struct_align res_dbl;
 
   cls_struct_fields[0] = &ffi_type_uchar;
-  cls_struct_fields[1] = &ffi_type_sint16;
+  cls_struct_fields[1] = &ffi_type_sshort;
   cls_struct_fields[2] = &ffi_type_uchar;
   cls_struct_fields[3] = NULL;
 
diff --git a/libffi/testsuite/libffi.call/cls_align_sint32.c b/libffi/testsuite/libffi.call/cls_align_sint32.c
index a9a17f3eda5..6bf3c7f1fc1 100644
--- a/libffi/testsuite/libffi.call/cls_align_sint32.c
+++ b/libffi/testsuite/libffi.call/cls_align_sint32.c
@@ -68,7 +68,7 @@ int main (void)
   struct cls_struct_align res_dbl;
 
   cls_struct_fields[0] = &ffi_type_uchar;
-  cls_struct_fields[1] = &ffi_type_sint32;
+  cls_struct_fields[1] = &ffi_type_sint;
   cls_struct_fields[2] = &ffi_type_uchar;
   cls_struct_fields[3] = NULL;
 
diff --git a/libffi/testsuite/libffi.call/cls_align_uint16.c b/libffi/testsuite/libffi.call/cls_align_uint16.c
index 2e383adf7f7..b340ce61998 100644
--- a/libffi/testsuite/libffi.call/cls_align_uint16.c
+++ b/libffi/testsuite/libffi.call/cls_align_uint16.c
@@ -68,7 +68,7 @@ int main (void)
   struct cls_struct_align res_dbl;
 
   cls_struct_fields[0] = &ffi_type_uchar;
-  cls_struct_fields[1] = &ffi_type_uint16;
+  cls_struct_fields[1] = &ffi_type_ushort;
   cls_struct_fields[2] = &ffi_type_uchar;
   cls_struct_fields[3] = NULL;
 
diff --git a/libffi/testsuite/libffi.call/cls_align_uint32.c b/libffi/testsuite/libffi.call/cls_align_uint32.c
index dadb458def4..85f8279a4aa 100644
--- a/libffi/testsuite/libffi.call/cls_align_uint32.c
+++ b/libffi/testsuite/libffi.call/cls_align_uint32.c
@@ -68,7 +68,7 @@ int main (void)
   struct cls_struct_align res_dbl;
 
   cls_struct_fields[0] = &ffi_type_uchar;
-  cls_struct_fields[1] = &ffi_type_uint32;
+  cls_struct_fields[1] = &ffi_type_uint;
   cls_struct_fields[2] = &ffi_type_uchar;
   cls_struct_fields[3] = NULL;
 
diff --git a/libffi/testsuite/libffi.call/cls_sint.c b/libffi/testsuite/libffi.call/cls_sint.c
index 35e5012c020..f8964abbb94 100644
--- a/libffi/testsuite/libffi.call/cls_sint.c
+++ b/libffi/testsuite/libffi.call/cls_sint.c
@@ -32,12 +32,12 @@ int main (void)
   pcl = &cl;
 #endif
 
-  cl_arg_types[0] = &ffi_type_sint32;
+  cl_arg_types[0] = &ffi_type_sint;
   cl_arg_types[1] = NULL;
 
   /* Initialize the cif */
   CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1,
-		     &ffi_type_sint32, cl_arg_types) == FFI_OK);
+		     &ffi_type_sint, cl_arg_types) == FFI_OK);
 
   CHECK(ffi_prep_closure(pcl, &cif, cls_ret_sint_fn, NULL)  == FFI_OK);
 
diff --git a/libffi/testsuite/libffi.call/cls_sshort.c b/libffi/testsuite/libffi.call/cls_sshort.c
index 81c8b95b0ee..d363d27eb9b 100644
--- a/libffi/testsuite/libffi.call/cls_sshort.c
+++ b/libffi/testsuite/libffi.call/cls_sshort.c
@@ -32,12 +32,12 @@ int main (void)
   pcl = &cl;
 #endif
 
-  cl_arg_types[0] = &ffi_type_sint16;
+  cl_arg_types[0] = &ffi_type_sshort;
   cl_arg_types[1] = NULL;
 
   /* Initialize the cif */
   CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1,
-		     &ffi_type_sint16, cl_arg_types) == FFI_OK);
+		     &ffi_type_sshort, cl_arg_types) == FFI_OK);
 
   CHECK(ffi_prep_closure(pcl, &cif, cls_ret_sshort_fn, NULL)  == FFI_OK);
 
diff --git a/libffi/testsuite/libffi.call/cls_uint.c b/libffi/testsuite/libffi.call/cls_uint.c
index 0f8189c1085..0bdfede07cb 100644
--- a/libffi/testsuite/libffi.call/cls_uint.c
+++ b/libffi/testsuite/libffi.call/cls_uint.c
@@ -33,12 +33,12 @@ int main (void)
   pcl = &cl;
 #endif
 
-  cl_arg_types[0] = &ffi_type_uint32;
+  cl_arg_types[0] = &ffi_type_uint;
   cl_arg_types[1] = NULL;
 
   /* Initialize the cif */
   CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 1,
-		     &ffi_type_uint32, cl_arg_types) == FFI_OK);
+		     &ffi_type_uint, cl_arg_types) == FFI_OK);
 
   CHECK(ffi_prep_closure(pcl, &cif, cls_ret_uint_fn, NULL)  == FFI_OK);
 
diff --git a/libffi/testsuite/libffi.call/ffitest.h b/libffi/testsuite/libffi.call/ffitest.h
index 42fce0489f1..e73f758f586 100644
--- a/libffi/testsuite/libffi.call/ffitest.h
+++ b/libffi/testsuite/libffi.call/ffitest.h
@@ -9,17 +9,6 @@
 
 #define CHECK(x) !(x) ? abort() : 0
 
-/* Define our own long for easier handling on multilib targets.  */
-#if LONG_MAX == 2147483647
-#define ffi_type_mylong ffi_type_uint32
-#else
-#if LONG_MAX == 9223372036854775807
-#define ffi_type_mylong ffi_type_uint64
-#else
-#error "Error, size LONG not defined as expected"
-#endif
-#endif
-
 /* Define __UNUSED__ that also other compilers than gcc can run the tests.  */
 #undef __UNUSED__
 #if defined(__GNUC__)
diff --git a/libffi/testsuite/libffi.call/nested_struct.c b/libffi/testsuite/libffi.call/nested_struct.c
index 6a9b7c78d8a..2ac5f990353 100644
--- a/libffi/testsuite/libffi.call/nested_struct.c
+++ b/libffi/testsuite/libffi.call/nested_struct.c
@@ -108,10 +108,10 @@ int main (void)
 
   cls_struct_fields[0] = &ffi_type_double;
   cls_struct_fields[1] = &ffi_type_float;
-  cls_struct_fields[2] = &ffi_type_uint32;
+  cls_struct_fields[2] = &ffi_type_sint;
   cls_struct_fields[3] = NULL;
 
-  cls_struct_fields1[0] = &ffi_type_uint32;
+  cls_struct_fields1[0] = &ffi_type_sint;
   cls_struct_fields1[1] = &ffi_type_double;
   cls_struct_fields1[2] = &ffi_type_float;
   cls_struct_fields1[3] = NULL;
diff --git a/libffi/testsuite/libffi.call/nested_struct1.c b/libffi/testsuite/libffi.call/nested_struct1.c
index 835e978ad52..fc39ad9523f 100644
--- a/libffi/testsuite/libffi.call/nested_struct1.c
+++ b/libffi/testsuite/libffi.call/nested_struct1.c
@@ -113,10 +113,10 @@ int main (void)
 
   cls_struct_fields[0] = &ffi_type_double;
   cls_struct_fields[1] = &ffi_type_float;
-  cls_struct_fields[2] = &ffi_type_uint32;
+  cls_struct_fields[2] = &ffi_type_sint;
   cls_struct_fields[3] = NULL;
 
-  cls_struct_fields1[0] = &ffi_type_uint32;
+  cls_struct_fields1[0] = &ffi_type_sint;
   cls_struct_fields1[1] = &ffi_type_double;
   cls_struct_fields1[2] = &ffi_type_float;
   cls_struct_fields1[3] = NULL;
diff --git a/libffi/testsuite/libffi.call/nested_struct10.c b/libffi/testsuite/libffi.call/nested_struct10.c
index 9faf9bf6543..145bdc94f3b 100644
--- a/libffi/testsuite/libffi.call/nested_struct10.c
+++ b/libffi/testsuite/libffi.call/nested_struct10.c
@@ -102,7 +102,7 @@ int main (void)
 
   cls_struct_fields1[0] = &ffi_type_uchar;
   cls_struct_fields1[1] = &cls_struct_type;
-  cls_struct_fields1[2] = &ffi_type_uint32;
+  cls_struct_fields1[2] = &ffi_type_uint;
   cls_struct_fields1[3] = NULL;
 
   cls_struct_fields2[0] = &ffi_type_uint64;
diff --git a/libffi/testsuite/libffi.call/nested_struct2.c b/libffi/testsuite/libffi.call/nested_struct2.c
index 933d3bbad35..2ca69c80301 100644
--- a/libffi/testsuite/libffi.call/nested_struct2.c
+++ b/libffi/testsuite/libffi.call/nested_struct2.c
@@ -80,7 +80,7 @@ int main (void)
 
   struct B res_dbl;
 
-  cls_struct_fields[0] = &ffi_type_mylong;
+  cls_struct_fields[0] = &ffi_type_ulong;
   cls_struct_fields[1] = &ffi_type_uchar;
   cls_struct_fields[2] = NULL;
 
diff --git a/libffi/testsuite/libffi.call/nested_struct6.c b/libffi/testsuite/libffi.call/nested_struct6.c
index 059389b3d0a..7e0def79cc9 100644
--- a/libffi/testsuite/libffi.call/nested_struct6.c
+++ b/libffi/testsuite/libffi.call/nested_struct6.c
@@ -103,7 +103,7 @@ int main (void)
   cls_struct_fields1[1] = &ffi_type_uchar;
   cls_struct_fields1[2] = NULL;
 
-  cls_struct_fields2[0] = &ffi_type_mylong;
+  cls_struct_fields2[0] = &ffi_type_slong;
   cls_struct_fields2[1] = &ffi_type_uchar;
   cls_struct_fields2[2] = NULL;
 
diff --git a/libffi/testsuite/libffi.call/nested_struct9.c b/libffi/testsuite/libffi.call/nested_struct9.c
index b936d16d1e4..7c4adfb1bbe 100644
--- a/libffi/testsuite/libffi.call/nested_struct9.c
+++ b/libffi/testsuite/libffi.call/nested_struct9.c
@@ -103,7 +103,7 @@ int main (void)
   cls_struct_fields1[1] = &ffi_type_uchar;
   cls_struct_fields1[2] = NULL;
 
-  cls_struct_fields2[0] = &ffi_type_mylong;
+  cls_struct_fields2[0] = &ffi_type_ulong;
   cls_struct_fields2[1] = &ffi_type_uchar;
   cls_struct_fields2[2] = NULL;
 
diff --git a/libffi/testsuite/libffi.call/return_dbl1.c b/libffi/testsuite/libffi.call/return_dbl1.c
index a6c1cfca2da..0ea5d50551a 100644
--- a/libffi/testsuite/libffi.call/return_dbl1.c
+++ b/libffi/testsuite/libffi.call/return_dbl1.c
@@ -21,7 +21,7 @@ int main (void)
   unsigned int in3;
   args[0] = &ffi_type_double;
   args[1] = &ffi_type_float;
-  args[2] = &ffi_type_uint32;
+  args[2] = &ffi_type_uint;
   args[3] = &ffi_type_double;
   values[0] = &dbl1;
   values[1] = &fl2;
diff --git a/libffi/testsuite/libffi.call/return_dbl2.c b/libffi/testsuite/libffi.call/return_dbl2.c
index 51af3bad8ca..b3818f866b5 100644
--- a/libffi/testsuite/libffi.call/return_dbl2.c
+++ b/libffi/testsuite/libffi.call/return_dbl2.c
@@ -20,7 +20,7 @@ int main (void)
   unsigned int in3;
   args[0] = &ffi_type_double;
   args[1] = &ffi_type_double;
-  args[2] = &ffi_type_uint32;
+  args[2] = &ffi_type_uint;
   args[3] = &ffi_type_double;
   values[0] = &dbl1;
   values[1] = &dbl2;
diff --git a/libffi/testsuite/libffi.call/return_fl3.c b/libffi/testsuite/libffi.call/return_fl3.c
index c3d2f120380..c37877b18ec 100644
--- a/libffi/testsuite/libffi.call/return_fl3.c
+++ b/libffi/testsuite/libffi.call/return_fl3.c
@@ -20,7 +20,7 @@ int main (void)
   unsigned int in3;
   args[0] = &ffi_type_float;
   args[1] = &ffi_type_float;
-  args[2] = &ffi_type_uint32;
+  args[2] = &ffi_type_uint;
   args[3] = &ffi_type_float;
   values[0] = &fl1;
   values[1] = &fl2;
diff --git a/libffi/testsuite/libffi.call/return_ll1.c b/libffi/testsuite/libffi.call/return_ll1.c
index 32fdfa122ff..5681d84b407 100644
--- a/libffi/testsuite/libffi.call/return_ll1.c
+++ b/libffi/testsuite/libffi.call/return_ll1.c
@@ -20,9 +20,9 @@ int main (void)
   long long ll1;
   unsigned ll0, ll2;
 
-  args[0] = &ffi_type_uint32;
+  args[0] = &ffi_type_sint;
   args[1] = &ffi_type_sint64;
-  args[2] = &ffi_type_uint32;
+  args[2] = &ffi_type_sint;
   values[0] = &ll0;
   values[1] = &ll1;
   values[2] = &ll2;