summaryrefslogtreecommitdiff
path: root/src/utilcode
diff options
context:
space:
mode:
authorJan Vorlicek <janvorli@microsoft.com>2017-09-14 16:43:13 +0200
committerGitHub <noreply@github.com>2017-09-14 16:43:13 +0200
commit3452efb58d2f3be867080f8627417b264fcbd73c (patch)
tree6b20e07a13ff43c13c37eacac5ccb44ee3ace954 /src/utilcode
parent46fcf059d51766e36ab59cb95c53b435a6991603 (diff)
downloadcoreclr-3452efb58d2f3be867080f8627417b264fcbd73c.tar.gz
coreclr-3452efb58d2f3be867080f8627417b264fcbd73c.tar.bz2
coreclr-3452efb58d2f3be867080f8627417b264fcbd73c.zip
Fix crossgen memory mappings (#13972)
This change removes executable memory mappings from crossgen. Now it can be run on systems with PAX set to prevent executable mappings without any marking using the paxctl.
Diffstat (limited to 'src/utilcode')
-rw-r--r--src/utilcode/loaderheap.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/utilcode/loaderheap.cpp b/src/utilcode/loaderheap.cpp
index 2603a8ec33..ca1ed666f4 100644
--- a/src/utilcode/loaderheap.cpp
+++ b/src/utilcode/loaderheap.cpp
@@ -944,8 +944,12 @@ UnlockedLoaderHeap::UnlockedLoaderHeap(DWORD dwReserveBlockSize,
m_pPrivatePerfCounter_LoaderBytes = pPrivatePerfCounter_LoaderBytes;
m_Options = 0;
+
+#ifndef CROSSGEN_COMPILE
if (fMakeExecutable)
m_Options |= LHF_EXECUTABLE;
+#endif // CROSSGEN_COMPILE
+
if (fZeroInit)
m_Options |= LHF_ZEROINIT;