pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
llvm-netbsd: Remove local patches
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Fri Jul 28 14:54:10 2017 +0200
Changeset: 281cc66df984c35428b2ff1886413efa4f17005d
Modified Files:
llvm-netbsd/distinfo
Removed Files:
llvm-netbsd/patches/patch-include_llvm_ExecutionEngine_Orc_IndirectionUtils.h
llvm-netbsd/patches/patch-include_llvm_ExecutionEngine_Orc_OrcRemoteTargetServer.h
llvm-netbsd/patches/patch-lib_ExecutionEngine_Orc_OrcABISupport.cpp
llvm-netbsd/patches/patch-lib_ExecutionEngine_SectionMemoryManager.cpp
llvm-netbsd/patches/patch-lib_Support_Unix_Signals.inc
llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_InstrProfiling.cpp
llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp
llvm-netbsd/patches/patch-unittests_Support_MemoryTest.cpp
Log Message:
llvm-netbsd: Remove local patches
They will be refactored and redone from scratch to address comments in review.
Sponsored by <The NetBSD Foundation>
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=281cc66df984c35428b2ff1886413efa4f17005d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
llvm-netbsd/distinfo | 9 ---
...ude_llvm_ExecutionEngine_Orc_IndirectionUtils.h | 52 -----------------
...lvm_ExecutionEngine_Orc_OrcRemoteTargetServer.h | 66 ----------------------
...patch-lib_ExecutionEngine_Orc_OrcABISupport.cpp | 61 --------------------
...ch-lib_ExecutionEngine_SectionMemoryManager.cpp | 28 ---------
.../patches/patch-lib_Support_Unix_Signals.inc | 15 -----
...Transforms_Instrumentation_AddressSanitizer.cpp | 29 ----------
...b_Transforms_Instrumentation_InstrProfiling.cpp | 12 ----
..._Transforms_Instrumentation_MemorySanitizer.cpp | 47 ---------------
.../patches/patch-unittests_Support_MemoryTest.cpp | 31 ----------
10 files changed, 350 deletions(-)
diffs:
diff --git a/llvm-netbsd/distinfo b/llvm-netbsd/distinfo
index fcbeb9c6d5..7931384fd5 100644
--- a/llvm-netbsd/distinfo
+++ b/llvm-netbsd/distinfo
@@ -12,12 +12,3 @@ Size (libcxx-3.6.2.src.tar.xz) = 944020 bytes
SHA1 (llvm-3.6.2.src.tar.xz) = 7a00257eb2bc9431e4c77c3a36b033072c54bc7e
RMD160 (llvm-3.6.2.src.tar.xz) = 521cbc5fe2925ea3c6e90c7a31f752a04045c972
Size (llvm-3.6.2.src.tar.xz) = 12802380 bytes
-SHA1 (patch-include_llvm_ExecutionEngine_Orc_IndirectionUtils.h) = 0834e9a010f37e7b33ebb1013b87997c3028aed8
-SHA1 (patch-include_llvm_ExecutionEngine_Orc_OrcRemoteTargetServer.h) = bec17a6bfc251d9600ce5d219b6c01b14db8449e
-SHA1 (patch-lib_ExecutionEngine_Orc_OrcABISupport.cpp) = 1a13d52f56d90a97bf5a1ecaeefee64ec4730300
-SHA1 (patch-lib_ExecutionEngine_SectionMemoryManager.cpp) = c534e7930de24c2058363c3888d7c68a40b36ca0
-SHA1 (patch-lib_Support_Unix_Signals.inc) = 7e3fa55c7e32171454a065c6e38d8189ffdfb6ca
-SHA1 (patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp) = 67eee29c4d8525b603e6b7c0a52278bdf3353687
-SHA1 (patch-lib_Transforms_Instrumentation_InstrProfiling.cpp) = 871b474f415d9dc468cc07477101f88d7a20868b
-SHA1 (patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp) = 64fdbb55c77d5f5f73152d2f8daa28adfc428e40
-SHA1 (patch-unittests_Support_MemoryTest.cpp) = 049a278007e8dcb77acb92223d7d6b5d61cb0b48
diff --git a/llvm-netbsd/patches/patch-include_llvm_ExecutionEngine_Orc_IndirectionUtils.h b/llvm-netbsd/patches/patch-include_llvm_ExecutionEngine_Orc_IndirectionUtils.h
deleted file mode 100644
index 81adddca1b..0000000000
--- a/llvm-netbsd/patches/patch-include_llvm_ExecutionEngine_Orc_IndirectionUtils.h
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD$
-
---- include/llvm/ExecutionEngine/Orc/IndirectionUtils.h.orig 2017-07-05 18:41:32.000000000 +0000
-+++ include/llvm/ExecutionEngine/Orc/IndirectionUtils.h
-@@ -164,15 +164,16 @@ public:
- LocalJITCompileCallbackManager(JITTargetAddress ErrorHandlerAddress)
- : JITCompileCallbackManager(ErrorHandlerAddress) {
- /// Set up the resolver block.
-- std::error_code EC;
-- ResolverBlock = sys::OwningMemoryBlock(sys::Memory::allocateMappedMemory(
-- TargetT::ResolverCodeSize, nullptr,
-- sys::Memory::MF_READ | sys::Memory::MF_WRITE, EC));
-- assert(!EC && "Failed to allocate resolver block");
-+ std::string Err;
-+ ResolverBlock = sys::OwningMemoryBlock(sys::Memory::AllocateRWX(
-+ TargetT::ResolverCodeSize, nullptr, &Err));
-+ if (!ResolverBlock.base())
-+ report_fatal_error("Can't allocate enough memory: " + Err);
-
- TargetT::writeResolverCode(static_cast<uint8_t *>(ResolverBlock.base()),
- &reenter, this);
-
-+ std::error_code EC;
- EC = sys::Memory::protectMappedMemory(ResolverBlock.getMemoryBlock(),
- sys::Memory::MF_READ |
- sys::Memory::MF_EXEC);
-@@ -191,12 +192,12 @@ private:
- void grow() override {
- assert(this->AvailableTrampolines.empty() && "Growing prematurely?");
-
-- std::error_code EC;
-+ std::string Err;
- auto TrampolineBlock =
-- sys::OwningMemoryBlock(sys::Memory::allocateMappedMemory(
-- sys::Process::getPageSize(), nullptr,
-- sys::Memory::MF_READ | sys::Memory::MF_WRITE, EC));
-- assert(!EC && "Failed to allocate trampoline block");
-+ sys::OwningMemoryBlock(sys::Memory::AllocateRWX(
-+ sys::Process::getPageSize(), nullptr, &Err));
-+ if (!TrampolineBlock.base())
-+ report_fatal_error("Can't allocate enough memory: " + Err);
-
- unsigned NumTrampolines =
- (sys::Process::getPageSize() - TargetT::PointerSize) /
-@@ -211,6 +212,7 @@ private:
- static_cast<JITTargetAddress>(reinterpret_cast<uintptr_t>(
- TrampolineMem + (I * TargetT::TrampolineSize))));
-
-+ std::error_code EC;
- EC = sys::Memory::protectMappedMemory(TrampolineBlock.getMemoryBlock(),
- sys::Memory::MF_READ |
- sys::Memory::MF_EXEC);
diff --git a/llvm-netbsd/patches/patch-include_llvm_ExecutionEngine_Orc_OrcRemoteTargetServer.h b/llvm-netbsd/patches/patch-include_llvm_ExecutionEngine_Orc_OrcRemoteTargetServer.h
deleted file mode 100644
index 380dc91009..0000000000
--- a/llvm-netbsd/patches/patch-include_llvm_ExecutionEngine_Orc_OrcRemoteTargetServer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD$
-
---- include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h.orig 2017-07-05 18:41:32.000000000 +0000
-+++ include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h
-@@ -115,11 +115,11 @@ private:
- }
-
- Error allocate(void *&Addr, size_t Size, uint32_t Align) {
-- std::error_code EC;
-- sys::MemoryBlock MB = sys::Memory::allocateMappedMemory(
-- Size, nullptr, sys::Memory::MF_READ | sys::Memory::MF_WRITE, EC);
-- if (EC)
-- return errorCodeToError(EC);
-+ std::string Err;
-+ sys::MemoryBlock MB = sys::Memory::AllocateRWX(
-+ Size, nullptr, &Err);
-+ if (!MB.base())
-+ report_fatal_error("Can't allocate enough memory: " + Err);
-
- Addr = MB.base();
- assert(Allocs.find(MB.base()) == Allocs.end() && "Duplicate alloc");
-@@ -277,12 +277,11 @@ private:
- }
-
- Error handleEmitResolverBlock() {
-- std::error_code EC;
-- ResolverBlock = sys::OwningMemoryBlock(sys::Memory::allocateMappedMemory(
-- TargetT::ResolverCodeSize, nullptr,
-- sys::Memory::MF_READ | sys::Memory::MF_WRITE, EC));
-- if (EC)
-- return errorCodeToError(EC);
-+ std::string Err;
-+ ResolverBlock = sys::OwningMemoryBlock(sys::Memory::AllocateRWX(
-+ TargetT::ResolverCodeSize, nullptr, &Err));
-+ if (!ResolverBlock.base())
-+ report_fatal_error("Can't allocate enough memory: " + Err);
-
- TargetT::writeResolverCode(static_cast<uint8_t *>(ResolverBlock.base()),
- &reenter, this);
-@@ -293,13 +292,12 @@ private:
- }
-
- Expected<std::tuple<JITTargetAddress, uint32_t>> handleEmitTrampolineBlock() {
-- std::error_code EC;
-+ std::string Err;
- auto TrampolineBlock =
-- sys::OwningMemoryBlock(sys::Memory::allocateMappedMemory(
-- sys::Process::getPageSize(), nullptr,
-- sys::Memory::MF_READ | sys::Memory::MF_WRITE, EC));
-- if (EC)
-- return errorCodeToError(EC);
-+ sys::OwningMemoryBlock(sys::Memory::AllocateRWX(
-+ sys::Process::getPageSize(), nullptr, &Err));
-+ if (!TrampolineBlock.base())
-+ report_fatal_error("Can't allocate enough memory: " + Err);
-
- uint32_t NumTrampolines =
- (sys::Process::getPageSize() - TargetT::PointerSize) /
-@@ -309,6 +307,7 @@ private:
- TargetT::writeTrampolines(TrampolineMem, ResolverBlock.base(),
- NumTrampolines);
-
-+ std::error_code EC;
- EC = sys::Memory::protectMappedMemory(TrampolineBlock.getMemoryBlock(),
- sys::Memory::MF_READ |
- sys::Memory::MF_EXEC);
diff --git a/llvm-netbsd/patches/patch-lib_ExecutionEngine_Orc_OrcABISupport.cpp b/llvm-netbsd/patches/patch-lib_ExecutionEngine_Orc_OrcABISupport.cpp
deleted file mode 100644
index d1ff2df2fb..0000000000
--- a/llvm-netbsd/patches/patch-lib_ExecutionEngine_Orc_OrcABISupport.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD$
-
---- lib/ExecutionEngine/Orc/OrcABISupport.cpp.orig 2017-07-05 18:38:00.000000000 +0000
-+++ lib/ExecutionEngine/Orc/OrcABISupport.cpp
-@@ -154,13 +154,11 @@ Error OrcAArch64::emitIndirectStubsBlock
- unsigned NumStubs = (NumPages * PageSize) / StubSize;
-
- // Allocate memory for stubs and pointers in one call.
-- std::error_code EC;
-- auto StubsMem = sys::OwningMemoryBlock(sys::Memory::allocateMappedMemory(
-- 2 * NumPages * PageSize, nullptr,
-- sys::Memory::MF_READ | sys::Memory::MF_WRITE, EC));
--
-- if (EC)
-- return errorCodeToError(EC);
-+ std::string Err;
-+ auto StubsMem = sys::OwningMemoryBlock(sys::Memory::AllocateRWX(
-+ 2 * NumPages * PageSize, nullptr, &Err));
-+ if (!StubsMem.base())
-+ report_fatal_error("Can't allocate enough memory: " + Err);
-
- // Create separate MemoryBlocks representing the stubs and pointers.
- sys::MemoryBlock StubsBlock(StubsMem.base(), NumPages * PageSize);
-@@ -236,13 +234,11 @@ Error OrcX86_64_Base::emitIndirectStubsB
- unsigned NumStubs = (NumPages * PageSize) / StubSize;
-
- // Allocate memory for stubs and pointers in one call.
-- std::error_code EC;
-- auto StubsMem = sys::OwningMemoryBlock(sys::Memory::allocateMappedMemory(
-- 2 * NumPages * PageSize, nullptr,
-- sys::Memory::MF_READ | sys::Memory::MF_WRITE, EC));
--
-- if (EC)
-- return errorCodeToError(EC);
-+ std::string Err;
-+ auto StubsMem = sys::OwningMemoryBlock(sys::Memory::AllocateRWX(
-+ 2 * NumPages * PageSize, nullptr, &Err));
-+ if (!StubsMem.base())
-+ report_fatal_error("Can't allocate enough memory: " + Err);
-
- // Create separate MemoryBlocks representing the stubs and pointers.
- sys::MemoryBlock StubsBlock(StubsMem.base(), NumPages * PageSize);
-@@ -504,13 +500,11 @@ Error OrcI386::emitIndirectStubsBlock(In
- unsigned NumStubs = (NumPages * PageSize) / StubSize;
-
- // Allocate memory for stubs and pointers in one call.
-- std::error_code EC;
-- auto StubsMem = sys::OwningMemoryBlock(sys::Memory::allocateMappedMemory(
-- 2 * NumPages * PageSize, nullptr,
-- sys::Memory::MF_READ | sys::Memory::MF_WRITE, EC));
--
-- if (EC)
-- return errorCodeToError(EC);
-+ std::string Err;
-+ auto StubsMem = sys::OwningMemoryBlock(sys::Memory::AllocateRWX(
-+ 2 * NumPages * PageSize, nullptr, &Err));
-+ if (!StubsMem.base())
-+ report_fatal_error("Can't allocate enough memory: " + Err);
-
- // Create separate MemoryBlocks representing the stubs and pointers.
- sys::MemoryBlock StubsBlock(StubsMem.base(), NumPages * PageSize);
diff --git a/llvm-netbsd/patches/patch-lib_ExecutionEngine_SectionMemoryManager.cpp b/llvm-netbsd/patches/patch-lib_ExecutionEngine_SectionMemoryManager.cpp
deleted file mode 100644
index ee715fad45..0000000000
--- a/llvm-netbsd/patches/patch-lib_ExecutionEngine_SectionMemoryManager.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
---- lib/ExecutionEngine/SectionMemoryManager.cpp.orig 2017-07-05 18:38:00.000000000 +0000
-+++ lib/ExecutionEngine/SectionMemoryManager.cpp
-@@ -83,16 +83,13 @@ uint8_t *SectionMemoryManager::allocateS
- //
- // FIXME: Initialize the Near member for each memory group to avoid
- // interleaving.
-- std::error_code ec;
-- sys::MemoryBlock MB = sys::Memory::allocateMappedMemory(RequiredSize,
-- &MemGroup.Near,
-- sys::Memory::MF_READ |
-- sys::Memory::MF_WRITE,
-- ec);
-- if (ec) {
-- // FIXME: Add error propagation to the interface.
-- return nullptr;
-- }
-+ std::string Err;
-+ sys::MemoryBlock MB = sys::Memory::AllocateRWX(RequiredSize,
-+ &MemGroup.Near,
-+ &Err);
-+ if (!MB.base())
-+ report_fatal_error("Can't allocate enough memory: " + Err);
-+
-
- // Save this address as the basis for our next request
- MemGroup.Near = MB;
diff --git a/llvm-netbsd/patches/patch-lib_Support_Unix_Signals.inc b/llvm-netbsd/patches/patch-lib_Support_Unix_Signals.inc
deleted file mode 100644
index 1f7c52f6b3..0000000000
--- a/llvm-netbsd/patches/patch-lib_Support_Unix_Signals.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- lib/Support/Unix/Signals.inc.orig 2017-07-17 14:09:08.907201312 +0000
-+++ lib/Support/Unix/Signals.inc
-@@ -158,8 +158,8 @@ static void RegisterHandlers() {
- // be able to reliably handle signals due to stack overflow.
- CreateSigAltStack();
-
-- for (auto S : IntSigs) RegisterHandler(S);
-- for (auto S : KillSigs) RegisterHandler(S);
-+// for (auto S : IntSigs) RegisterHandler(S);
-+// for (auto S : KillSigs) RegisterHandler(S);
- }
-
- static void UnregisterHandlers() {
diff --git a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
deleted file mode 100644
index a28fed92ae..0000000000
--- a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_AddressSanitizer.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
---- lib/Transforms/Instrumentation/AddressSanitizer.cpp.orig 2017-05-29 09:26:46.000000000 +0000
-+++ lib/Transforms/Instrumentation/AddressSanitizer.cpp
-@@ -80,6 +80,7 @@ static const uint64_t kMIPS64_ShadowOffs
- static const uint64_t kAArch64_ShadowOffset64 = 1ULL << 36;
- static const uint64_t kFreeBSD_ShadowOffset32 = 1ULL << 30;
- static const uint64_t kFreeBSD_ShadowOffset64 = 1ULL << 46;
-+static const uint64_t kNetBSD_ShadowOffset64 = 1ULL << 46;
- static const uint64_t kPS4CPU_ShadowOffset64 = 1ULL << 40;
- static const uint64_t kWindowsShadowOffset32 = 3ULL << 28;
- // The shadow memory space is dynamically allocated.
-@@ -394,6 +395,7 @@ static ShadowMapping getShadowMapping(Tr
- bool IsAndroid = TargetTriple.isAndroid();
- bool IsIOS = TargetTriple.isiOS() || TargetTriple.isWatchOS();
- bool IsFreeBSD = TargetTriple.isOSFreeBSD();
-+ bool IsNetBSD = TargetTriple.isOSNetBSD();
- bool IsPS4CPU = TargetTriple.isPS4CPU();
- bool IsLinux = TargetTriple.isOSLinux();
- bool IsPPC64 = TargetTriple.getArch() == llvm::Triple::ppc64 ||
-@@ -438,6 +440,8 @@ static ShadowMapping getShadowMapping(Tr
- Mapping.Offset = kSystemZ_ShadowOffset64;
- else if (IsFreeBSD)
- Mapping.Offset = kFreeBSD_ShadowOffset64;
-+ else if (IsNetBSD)
-+ Mapping.Offset = kNetBSD_ShadowOffset64;
- else if (IsPS4CPU)
- Mapping.Offset = kPS4CPU_ShadowOffset64;
- else if (IsLinux && IsX86_64) {
diff --git a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_InstrProfiling.cpp b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_InstrProfiling.cpp
deleted file mode 100644
index e8229cc198..0000000000
--- a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_InstrProfiling.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- lib/Transforms/Instrumentation/InstrProfiling.cpp.orig 2017-06-17 16:34:37.000000000 +0000
-+++ lib/Transforms/Instrumentation/InstrProfiling.cpp
-@@ -394,6 +394,7 @@ static bool needsRuntimeRegistrationOfSe
- // Use linker script magic to get data/cnts/name start/end.
- if (Triple(M.getTargetTriple()).isOSLinux() ||
- Triple(M.getTargetTriple()).isOSFreeBSD() ||
-+ Triple(M.getTargetTriple()).isOSNetBSD() ||
- Triple(M.getTargetTriple()).isPS4CPU())
- return false;
-
diff --git a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp b/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp
deleted file mode 100644
index 4ef2227185..0000000000
--- a/llvm-netbsd/patches/patch-lib_Transforms_Instrumentation_MemorySanitizer.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD$
-
---- lib/Transforms/Instrumentation/MemorySanitizer.cpp.orig 2017-06-12 00:24:36.000000000 +0000
-+++ lib/Transforms/Instrumentation/MemorySanitizer.cpp
-@@ -280,6 +280,14 @@ static const MemoryMapParams FreeBSD_X86
- 0x380000000000, // OriginBase
- };
-
-+// x86_64 NetBSD
-+static const MemoryMapParams NetBSD_X86_64_MemoryMapParams = {
-+ 0xc00000000000, // AndMask
-+ 0x200000000000, // XorMask
-+ 0x100000000000, // ShadowBase
-+ 0x380000000000, // OriginBase
-+};
-+
- static const PlatformMemoryMapParams Linux_X86_MemoryMapParams = {
- &Linux_I386_MemoryMapParams,
- &Linux_X86_64_MemoryMapParams,
-@@ -305,6 +313,11 @@ static const PlatformMemoryMapParams Fre
- &FreeBSD_X86_64_MemoryMapParams,
- };
-
-+static const PlatformMemoryMapParams NetBSD_X86_MemoryMapParams = {
-+ nullptr,
-+ &NetBSD_X86_64_MemoryMapParams,
-+};
-+
- /// \brief An instrumentation pass implementing detection of uninitialized
- /// reads.
- ///
-@@ -515,6 +528,15 @@ bool MemorySanitizer::doInitialization(M
- report_fatal_error("unsupported architecture");
- }
- break;
-+ case Triple::NetBSD:
-+ switch (TargetTriple.getArch()) {
-+ case Triple::x86_64:
-+ MapParams = NetBSD_X86_MemoryMapParams.bits64;
-+ break;
-+ default:
-+ report_fatal_error("unsupported architecture");
-+ }
-+ break;
- case Triple::Linux:
- switch (TargetTriple.getArch()) {
- case Triple::x86_64:
diff --git a/llvm-netbsd/patches/patch-unittests_Support_MemoryTest.cpp b/llvm-netbsd/patches/patch-unittests_Support_MemoryTest.cpp
deleted file mode 100644
index 24d8d15a81..0000000000
--- a/llvm-netbsd/patches/patch-unittests_Support_MemoryTest.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
---- unittests/Support/MemoryTest.cpp.orig 2017-07-05 18:41:47.000000000 +0000
-+++ unittests/Support/MemoryTest.cpp
-@@ -33,9 +33,8 @@ protected:
- case Memory::MF_READ|Memory::MF_WRITE:
- return Memory::MF_READ|Memory::MF_WRITE;
- case Memory::MF_READ|Memory::MF_EXEC:
-- case Memory::MF_READ|Memory::MF_WRITE|Memory::MF_EXEC:
- case Memory::MF_EXEC:
-- return Memory::MF_READ|Memory::MF_WRITE|Memory::MF_EXEC;
-+ return Memory::MF_READ|Memory::MF_EXEC;
- }
- // Default in case values are added to the enum, as required by some compilers
- return Memory::MF_READ|Memory::MF_WRITE;
-@@ -349,13 +348,13 @@ TEST_P(MappedMemoryTest, UnalignedNear)
-
- // Note that Memory::MF_WRITE is not supported exclusively across
- // operating systems and architectures and can imply MF_READ|MF_WRITE
-+// RWX mapping is not allowed on all operating systems (W^X restrictions)
- unsigned MemoryFlags[] = {
- Memory::MF_READ,
- Memory::MF_WRITE,
- Memory::MF_READ|Memory::MF_WRITE,
- Memory::MF_EXEC,
-- Memory::MF_READ|Memory::MF_EXEC,
-- Memory::MF_READ|Memory::MF_WRITE|Memory::MF_EXEC
-+ Memory::MF_READ|Memory::MF_EXEC
- };
-
- INSTANTIATE_TEST_CASE_P(AllocationTests,
Home |
Main Index |
Thread Index |
Old Index