Fixed build with old version libffi #14
Conversation
| @@ -5468,7 +5468,8 @@ void zend_ffi_make_func_type(zend_ffi_dcl *dcl, HashTable *args) /* {{{ */ | |||
| case ZEND_FFI_ABI_CDECL: | |||
| type->func.abi = FFI_DEFAULT_ABI; | |||
| break; | |||
| #ifndef _WIN64 | |||
| #ifdef X86_WIN32 | |||
| # ifndef _WIN64 | |||
There was a problem hiding this comment.
I'm not completely sure, if this is right. Do you disable "fastcall" for non-windows?
There was a problem hiding this comment.
acrtually, I am not sure neither, but THISCALL, FASTCALL are defined only in X86_WIN32
ffitarget.h:
typedef enum ffi_abi {
FFI_FIRST_ABI = 0,
/* ---- Intel x86 Win32 ---------- */
#ifdef X86_WIN32
FFI_SYSV,
FFI_STDCALL,
FFI_THISCALL,
FFI_FASTCALL,
FFI_MS_CDECL,
FFI_LAST_ABI,There was a problem hiding this comment.
In my ffitarget-i386.h FFI_FASTCALL declared twice
#ifdef X86_WIN32
FFI_SYSV,
FFI_STDCALL,
FFI_THISCALL,
FFI_FASTCALL,
FFI_MS_CDECL,
FFI_LAST_ABI,
#ifdef _MSC_VER
FFI_DEFAULT_ABI = FFI_MS_CDECL
#else
FFI_DEFAULT_ABI = FFI_SYSV
#endif
#elif defined(X86_WIN64)
FFI_WIN64,
FFI_LAST_ABI,
FFI_DEFAULT_ABI = FFI_WIN64
#else
/* ---- Intel x86 and AMD x86-64 - /
FFI_SYSV,
FFI_UNIX64, / Unix variants all use the same ABI for x86-64 */
FFI_THISCALL,
FFI_FASTCALL,
FFI_STDCALL,
FFI_LAST_ABI,
#if defined(i386) || defined(__i386)
FFI_DEFAULT_ABI = FFI_SYSV
#else
FFI_DEFAULT_ABI = FFI_UNIX64
#endif
#endif
There was a problem hiding this comment.
it must be version difference, libffi-3.0.11
typedef enum ffi_abi {
FFI_FIRST_ABI = 0,
/* ---- Intel x86 Win32 ---------- */
#ifdef X86_WIN32
FFI_SYSV,
FFI_STDCALL,
FFI_THISCALL,
FFI_FASTCALL,
FFI_MS_CDECL,
FFI_LAST_ABI,
#ifdef _MSC_VER
FFI_DEFAULT_ABI = FFI_MS_CDECL
#else
FFI_DEFAULT_ABI = FFI_SYSV
#endif
#elif defined(X86_WIN64)
FFI_WIN64,
FFI_LAST_ABI,
FFI_DEFAULT_ABI = FFI_WIN64
#else
/* ---- Intel x86 and AMD x86-64 - */
FFI_SYSV,
FFI_UNIX64, /* Unix variants all use the same ABI for x86-64 */
FFI_LAST_ABI,
#if defined(__i386__) || defined(__i386)
FFI_DEFAULT_ABI = FFI_SYSV
#else
FFI_DEFAULT_ABI = FFI_UNIX64
#endif
#endif
} ffi_abi;There was a problem hiding this comment.
BTW, do you know how to detect libffi's version? I don't see any thing I can use to do that.
There was a problem hiding this comment.
No, But I think, it's possible to verify if libffi provides ZEND_FFI_ABI_CDECL and others, using try_compile.
_Alignof requires C11
build broken with libffi below 3.0.11