Merge pull request #1020 from larskanis/update-libffi

Update libffi
ffi · Apr 16, 2023 · 54651da · 54651da
2 parents 0398a08 + 55e2b59
commit 54651da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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