From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: sin-ack Date: Sat, 1 Oct 2022 20:05:52 +0000 Subject: [PATCH] [llvm] Prevent the use of POSIX shm on Minerva POSIX shm is not supported by Minerva yet, so this causes a compilation error. --- llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp | 2 +- .../Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp b/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp index b457c7297..5e2907f0c 100644 --- a/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp +++ b/llvm/lib/ExecutionEngine/Orc/MemoryMapper.cpp @@ -215,7 +215,7 @@ SharedMemoryMapper::Create(ExecutorProcessControl &EPC, SymbolAddrs SAs) { void SharedMemoryMapper::reserve(size_t NumBytes, OnReservedFunction OnReserved) { -#if (defined(LLVM_ON_UNIX) && !defined(__ANDROID__)) || defined(_WIN32) +#if (defined(LLVM_ON_UNIX) && !(defined(__ANDROID__) || defined(__minerva__))) || defined(_WIN32) EPC.callSPSWrapperAsync< rt::SPSExecutorSharedMemoryMapperServiceReserveSignature>( diff --git a/llvm/lib/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp index 147f915f6..ca773e1ca 100644 --- a/llvm/lib/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp +++ b/llvm/lib/ExecutionEngine/Orc/TargetProcess/ExecutorSharedMemoryMapperService.cpp @@ -47,7 +47,7 @@ static DWORD getWindowsProtectionFlags(MemProt MP) { Expected> ExecutorSharedMemoryMapperService::reserve(uint64_t Size) { -#if (defined(LLVM_ON_UNIX) && !defined(__ANDROID__)) || defined(_WIN32) +#if (defined(LLVM_ON_UNIX) && !(defined(__ANDROID__) || defined(__minerva__))) || defined(_WIN32) #if defined(LLVM_ON_UNIX)