mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Get libffi 3.0.8 building on OS/2. b=522118, r=dwitte
This commit is contained in:
parent
a221dcf2a1
commit
c74fe7e4a8
@ -164,7 +164,7 @@ GetABI(JSContext* cx, jsval aCallType, ffi_abi& aResult)
|
||||
case ABI_default_abi:
|
||||
aResult = FFI_DEFAULT_ABI;
|
||||
return true;
|
||||
#if defined(_WIN32) && !defined(_WIN64)
|
||||
#if (defined(_WIN32) && !defined(_WIN64)) || defined(_OS2)
|
||||
case ABI_stdcall_abi:
|
||||
aResult = FFI_STDCALL;
|
||||
return true;
|
||||
|
@ -99,6 +99,11 @@ LOCAL_INCLUDES = \
|
||||
-Ilibffi/include \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
libffi/.libs/ffi.$(LIB_SUFFIX): libffi/.libs/$(LIB_PREFIX)ffi.a
|
||||
emxomf $<
|
||||
endif
|
||||
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
libffi/.libs/$(LIB_PREFIX)ffi.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
2
js/ctypes/libffi/configure
vendored
2
js/ctypes/libffi/configure
vendored
@ -20989,7 +20989,7 @@ case "$host" in
|
||||
i386-*-freebsd* | i386-*-openbsd*)
|
||||
TARGET=X86_FREEBSD; TARGETDIR=x86
|
||||
;;
|
||||
i?86-win32* | i?86-*-cygwin* | i?86-*-mingw*)
|
||||
i?86-win32* | i?86-*-cygwin* | i?86-*-mingw* | i?86-*-os2*)
|
||||
TARGET=X86_WIN32; TARGETDIR=x86
|
||||
;;
|
||||
i?86-*-darwin*)
|
||||
|
@ -74,7 +74,7 @@ case "$host" in
|
||||
i386-*-freebsd* | i386-*-openbsd*)
|
||||
TARGET=X86_FREEBSD; TARGETDIR=x86
|
||||
;;
|
||||
i?86-win32* | i?86-*-cygwin* | i?86-*-mingw*)
|
||||
i?86-win32* | i?86-*-cygwin* | i?86-*-mingw* | i?86-*-os2*)
|
||||
TARGET=X86_WIN32; TARGETDIR=x86
|
||||
;;
|
||||
i?86-*-darwin*)
|
||||
|
@ -33,8 +33,6 @@
|
||||
|
||||
.text
|
||||
|
||||
.globl ffi_prep_args
|
||||
|
||||
# This assumes we are using gas.
|
||||
.balign 16
|
||||
.globl _ffi_call_SYSV
|
||||
|
Loading…
Reference in New Issue
Block a user