18697N/A--- libffi-3.0.9/src/x86/ffitarget.h.orig 2009-12-29 23:22:26.000000000 +0800

18697N/A+++ libffi-3.0.9/src/x86/ffitarget.h 2010-04-28 16:30:53.542909753 +0800

14032N/A@@ -31,7 +31,7 @@

14032N/A

14032N/A /* ---- System specific configurations ----------------------------------- */

14032N/A

14032N/A-#if defined (X86_64) && defined (__i386__)

14032N/A+#if defined (X86_64) && (defined (__i386__) || defined (__i386))

14032N/A #undef X86_64

14032N/A #define X86

14032N/A #endif

18697N/A@@ -74,10 +74,10 @@

18697N/A #else

14032N/A

14032N/A /* ---- Intel x86 and AMD x86-64 - */

14032N/A-#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__))

18697N/A+#if !defined(X86_WIN32) && (defined(__i386__) || defined(__i386) || defined(__x86_64__))

14032N/A FFI_SYSV,

14032N/A FFI_UNIX64, /* Unix variants all use the same ABI for x86-64 */

14032N/A-#ifdef __i386__

18697N/A+#if defined(__i386__) || defined(__i386)

14032N/A FFI_DEFAULT_ABI = FFI_SYSV,

14032N/A #else

14032N/A FFI_DEFAULT_ABI = FFI_UNIX64,