From 4542038cd0ec8359d9faa21699c85d025c5ec8ca Mon Sep 17 00:00:00 2001 From: Skyler Saleh Date: Sat, 17 Apr 2021 16:18:18 -0700 Subject: [PATCH] Apple M1: OS version checking for MAP_JIT - Added MacOS version checking around MAP_JIT to prepare code for x86 MAP_JIT --- Source/Core/Common/MemoryUtil.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp index d1e9d25785..e81637912e 100644 --- a/Source/Core/Common/MemoryUtil.cpp +++ b/Source/Core/Common/MemoryUtil.cpp @@ -41,7 +41,9 @@ void* AllocateExecutableMemory(size_t size) #else int map_flags = MAP_ANON | MAP_PRIVATE; #if defined(_M_ARM_64) && defined(__APPLE__) - map_flags |= MAP_JIT; + // This check is in place to prepare for x86_64 MAP_JIT support. + if (__builtin_available(macOS 10.14, *)) + map_flags |= MAP_JIT; #endif void* ptr = mmap(nullptr, size, PROT_READ | PROT_WRITE | PROT_EXEC, map_flags, -1, 0); if (ptr == MAP_FAILED)