diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-04-09 19:13:58 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-04-09 19:13:58 -0300 |
| commit | f4e6e30c630e8540068ce3c2032dbb34c00ce5db (patch) | |
| tree | 1990b0ab10b1d72ce3a74e0bfd5ae5ae8eb272cd /testing/polyml/fix-build-libffi-3.3.patch | |
| parent | 69254fa46edc6d4ceb8419daf903724d0b863875 (diff) | |
| download | aports-f4e6e30c630e8540068ce3c2032dbb34c00ce5db.tar.bz2 aports-f4e6e30c630e8540068ce3c2032dbb34c00ce5db.tar.xz | |
testing/polyml: try fixing build in x86 with libffi>=3.3-r0
Diffstat (limited to 'testing/polyml/fix-build-libffi-3.3.patch')
| -rw-r--r-- | testing/polyml/fix-build-libffi-3.3.patch | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/testing/polyml/fix-build-libffi-3.3.patch b/testing/polyml/fix-build-libffi-3.3.patch index 56b957bcf5..c0d1a990ef 100644 --- a/testing/polyml/fix-build-libffi-3.3.patch +++ b/testing/polyml/fix-build-libffi-3.3.patch @@ -1,19 +1,16 @@ ---- a/libpolyml/polyffi.cpp 2019-04-05 23:10:23.509729312 +0200 -+++ b/libpolyml/polyffi.cpp 2019-04-05 23:10:38.895485058 +0200 -@@ -89,7 +89,6 @@ - // Unfortunately the ABI entries are enums rather than #defines so we - // can't test individual entries. - #ifdef X86_WIN32 -- {"sysv", FFI_SYSV}, - {"stdcall", FFI_STDCALL}, - {"thiscall", FFI_THISCALL}, - {"fastcall", FFI_FASTCALL}, -@@ -97,7 +96,6 @@ +diff --git a/libpolyml/polyffi.cpp b/libpolyml/polyffi.cpp +index 5424dd8..a11987f 100644 +--- a/libpolyml/polyffi.cpp ++++ b/libpolyml/polyffi.cpp +@@ -110,9 +110,10 @@ static struct _abiTable { const char *abiName; ffi_abi abiCode; } abiTable[] = + {"ms_cdecl", FFI_MS_CDECL}, #elif defined(X86_WIN64) {"win64", FFI_WIN64}, ++#elif defined(X86_64) ++ {"unix64", FFI_UNIX64}, #elif defined(X86_ANY) -- {"sysv", FFI_SYSV}, - {"unix64", FFI_UNIX64}, + {"sysv", FFI_SYSV}, +- {"unix64", FFI_UNIX64}, #endif { "default", FFI_DEFAULT_ABI} - + }; |