From d6a89122a6b776d0465666d6c0a6163135454545 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hongjiu.lu@intel.com>
Date: Wed, 18 Jul 2012 19:19:34 +0000
Subject: 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
---
 libffi/src/x86/ffitarget.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libffi/src')

diff --git a/libffi/src/x86/ffitarget.h b/libffi/src/x86/ffitarget.h
index 54a61212..fc01541 100644
--- 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
-- 
cgit v1.1