@@ -1,3 +1,8 @@
+2012-07-16 H.J. Lu <hongjiu.lu@intel.com>
+
+ * src/x86//ffitarget.h (FFI_SIZEOF_JAVA_RAW): Defined to 4 for
+ x32.
+
2012-05-05 Nicolas Lelong
* libffi.xcodeproj/project.pbxproj: Fixes.
@@ -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