From 1a9d2d0118d41791a2cb3788a3c9b2c5f1814d42 Mon Sep 17 00:00:00 2001 From: dzaima Date: Sun, 3 Jul 2022 02:18:14 +0300 Subject: [PATCH] apparently apple clang 11.0.3 infinite-loops on mmap_nvm too --- src/ffi.c | 3 +++ src/jit/nvm_x86_64.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ffi.c b/src/ffi.c index 13724fa0..e6eb0470 100644 --- a/src/ffi.c +++ b/src/ffi.c @@ -8,6 +8,9 @@ #include "utils/file.h" #include #if FFI==2 +#if !__has_include() +#error " not found. Either install libffi into $PATH, or add 'FFI=0' as a make argument to disable FFI" +#endif #include #include "utils/mut.h" #include "ns.h" diff --git a/src/jit/nvm_x86_64.c b/src/jit/nvm_x86_64.c index ec6065a5..530be104 100644 --- a/src/jit/nvm_x86_64.c +++ b/src/jit/nvm_x86_64.c @@ -29,7 +29,7 @@ u64 mmX_ctrs[64]; static u64 nvm_mmap_seed = 0; #ifdef __clang__ -#if __clang_major__ < 11 // clang 10 gets stuck in an infinite loop while optimizing this +#if __clang_major__ <= 12 // old clang versions get stuck in an infinite loop while optimizing this __attribute__((optnone)) #endif #endif