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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@189626 138bc75d-0d04-0410-961f-82ee72b054a4
liangminghuang · Jul 18, 2012 · bfa8abb · bfa8abb
1 parent b64804e
commit bfa8abb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/libffi/ChangeLog.libgcj b/libffi/ChangeLog.libgcj
@@ -1,3 +1,11 @@
+2012-07-18  H.J. Lu  <[email protected]>
+
+	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  <[email protected]>
 
 	* configure: Regenerated.

diff --git 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