diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-07-18 19:19:34 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-07-18 19:19:34 +0000 |
| commit | bfa8abb5f475bf454b32dc70cc1b8b32bdb16c54 (patch) | |
| tree | 8121169af11323343950f632b8de29278a188cfb /libffi | |
| parent | b64804e9d5a63d112f71a5fba88b4ea0e912a6e8 (diff) | |
| download | gcc-bfa8abb5f475bf454b32dc70cc1b8b32bdb16c54.tar.gz | |
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
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ChangeLog.libgcj | 8 | ||||
| -rw-r--r-- | libffi/src/x86/ffitarget.h | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libffi/ChangeLog.libgcj b/libffi/ChangeLog.libgcj index 21d7ccf070a..e0aaa83c2ab 100644 --- 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 54a61212e4f..fc015410970 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 |