summaryrefslogtreecommitdiff
path: root/src/zap/zapimage.cpp
diff options
context:
space:
mode:
authorGleb Balykov <g.balykov@samsung.com>2019-06-21 03:55:10 +0300
committerJan Kotas <jkotas@microsoft.com>2019-06-20 17:55:09 -0700
commit86e600cef40a650a8ffb294dd195186b1679609b (patch)
tree307be15524980c95e50958f31b7080b6c28b0cd6 /src/zap/zapimage.cpp
parent9bd2787a9dd2aa4d2b7d4f72afebc3dbe896e896 (diff)
downloadcoreclr-86e600cef40a650a8ffb294dd195186b1679609b.tar.gz
coreclr-86e600cef40a650a8ffb294dd195186b1679609b.tar.bz2
coreclr-86e600cef40a650a8ffb294dd195186b1679609b.zip
Add custom default base address option to crossgen (#25227)
* Add crossgen option to setup default base address for native image This is enabled only with -DFEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION. * Mmap native images at default base address if env variable COMPlus_UseDefaultBaseAddr=0x1 is setup. This is enabled only with -DFEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION.
Diffstat (limited to 'src/zap/zapimage.cpp')
-rw-r--r--src/zap/zapimage.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/zap/zapimage.cpp b/src/zap/zapimage.cpp
index c498719bf7..4a11405a73 100644
--- a/src/zap/zapimage.cpp
+++ b/src/zap/zapimage.cpp
@@ -1282,6 +1282,12 @@ void ZapImage::CalculateZapBaseAddress()
}
}
+ if (m_zapper->GetCustomBaseAddress() != 0)
+ {
+ //set baseAddress here from crossgen options
+ baseAddress = m_zapper->GetCustomBaseAddress();
+ }
+
// Round to a multiple of 64K
// 64K is the allocation granularity of VirtualAlloc. (Officially this number is not a constant -
// we should be querying the system for its allocation granularity, but we do this all over the place