diff options
| author | Lars Kanis <lars@greiz-reinsdorf.de> | 2023-04-16 21:30:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-16 21:30:31 +0200 |
| commit | 54651da39fccc1ecd881adeb221b5bf073f34516 (patch) | |
| tree | 56883a20caf1cf33679768129b6441cf94436161 | |
| parent | 0398a0892e3d80b2d1d9d67af0f682a3f5d2d493 (diff) | |
| parent | 55e2b5921b7ca73b8a6b7bfb7f8e0b3889d9a74b (diff) | |
| download | ffi-54651da39fccc1ecd881adeb221b5bf073f34516.tar.gz | |
Merge pull request #1020 from larskanis/update-libffi
Update libffi
| -rw-r--r-- | ext/ffi_c/MethodHandle.c | 4 | ||||
| m--------- | ext/ffi_c/libffi | 0 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ext/ffi_c/MethodHandle.c b/ext/ffi_c/MethodHandle.c index d047e10..83f7b77 100644 --- a/ext/ffi_c/MethodHandle.c +++ b/ext/ffi_c/MethodHandle.c @@ -77,7 +77,9 @@ static bool prep_trampoline(void* ctx, void* code, Closure* closure, char* errmsg, size_t errmsgsize); static long trampoline_size(void); -#if defined(__x86_64__) && (defined(__linux__) || defined(__APPLE__)) +#if defined(__x86_64__) && \ + (defined(__linux__) || defined(__APPLE__)) && \ + !USE_FFI_ALLOC # define CUSTOM_TRAMPOLINE 1 #endif diff --git a/ext/ffi_c/libffi b/ext/ffi_c/libffi -Subproject 5c63b463b87d3c06102a4a7f05f395929d9ea79 +Subproject ac598b7f5272d536b75f4b3833a4610cf4cd940 |