Define FFI_SIZEOF_JAVA_RAW to 4 for x32

	PR libffi/53982
	PR libffi/53973
	* src/x86/ffitarget.h: Check __ILP32__ instead of __LP64__ for
	x32.
	(FFI_SIZEOF_JAVA_RAW): Defined to 4 for x32.

From-SVN: r189626

diff --git a/libffi/ChangeLog.libgcj b/libffi/ChangeLog.libgcj
index 21d7ccf070a92de2884398cfe61899514df45e43..e0aaa83c2ab9483c723422e184d5fd463cb2d948 100644 (file)
--- a/libffi/ChangeLog.libgcj
+++ b/libffi/ChangeLog.libgcj
@@ -1,3 +1,11 @@
+2012-07-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR libffi/53982
+       PR libffi/53973
+       * src/x86/ffitarget.h: Check __ILP32__ instead of __LP64__ for
+       x32.
+       (FFI_SIZEOF_JAVA_RAW): Defined to 4 for x32.
+
 2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 
        * configure: Regenerated.

diff --git a/libffi/src/x86/ffitarget.h b/libffi/src/x86/ffitarget.h
index 54a61212e4f9a9a03470810503ecec7d0239d114..fc01541097035d7a2e3b761165c5ac1c7e60804e 100644 (file)
--- a/libffi/src/x86/ffitarget.h
+++ b/libffi/src/x86/ffitarget.h
@@ -61,8 +61,9 @@ typedef unsigned long long     ffi_arg;
 typedef long long              ffi_sarg;
 #endif
 #else
-#if defined __x86_64__ && !defined __LP64__
+#if defined __x86_64__ && defined __ILP32__
 #define FFI_SIZEOF_ARG 8
+#define FFI_SIZEOF_JAVA_RAW  4
 typedef unsigned long long     ffi_arg;
 typedef long long              ffi_sarg;
 #else