diff options
| author | mjsabby <mjsabby@gmail.com> | 2016-03-22 18:18:58 -0700 |
|---|---|---|
| committer | mjsabby <mjsabby@gmail.com> | 2016-03-22 18:32:14 -0700 |
| commit | 7671c879a20621d91b8d3b5076a1e0089c8d248b (patch) | |
| tree | bcbba60fb1de93f3ca0e8f954c026cf0181a405f | |
| parent | f755ab7fadd9dc53e66bd86ce8909954b6d72485 (diff) | |
| download | coreclr-7671c879a20621d91b8d3b5076a1e0089c8d248b.tar.gz coreclr-7671c879a20621d91b8d3b5076a1e0089c8d248b.tar.bz2 coreclr-7671c879a20621d91b8d3b5076a1e0089c8d248b.zip | |
Enable compiling ReJIT functionality in CoreCLR
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | clr.defines.targets | 1 | ||||
| -rw-r--r-- | crossgen.cmake | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ba328f48be..d9836ba8cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -828,6 +828,13 @@ if(NOT DEFINED CLR_CMAKE_PLATFORM_ARCH_ARM64) add_definitions(-DFEATURE_READYTORUN) set(FEATURE_READYTORUN 1) endif(NOT DEFINED CLR_CMAKE_PLATFORM_ARCH_ARM64) + +if (WIN32) + if (CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_I386) + add_definitions(-DFEATURE_REJIT) + endif(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_I386) +endif(WIN32) + add_definitions(-DFEATURE_STANDALONE_SN) add_definitions(-DFEATURE_STRONGNAME_DELAY_SIGNING_ALLOWED) add_definitions(-DFEATURE_STRONGNAME_MIGRATION) diff --git a/clr.defines.targets b/clr.defines.targets index 078f5728ca..3897b89e22 100644 --- a/clr.defines.targets +++ b/clr.defines.targets @@ -215,6 +215,7 @@ <DefineConstants Condition="'$(FeatureX509Securestrings)' == 'true'">$(DefineConstants);FEATURE_X509_SECURESTRINGS</DefineConstants> <DefineConstants Condition="'$(ProfilingSupportedBuild)' == 'true'">$(DefineConstants);PROFILING_SUPPORTED</DefineConstants> <DefineConstants Condition="'$(FeatureMulticoreJIT)' == 'true'">$(DefineConstants);FEATURE_MULTICOREJIT</DefineConstants> + <DefineConstants Condition="'$(FeatureReJIT)' == 'true'">$(DefineConstants);FEATURE_REJIT</DefineConstants> <DefineConstants Condition="'$(FeatureUseAsmGCWriteBarriers)' == 'true'">$(DefineConstants);FEATURE_USE_ASM_GC_WRITE_BARRIERS</DefineConstants> <DefineConstants Condition="'$(BinderDebugLog)' == 'true'">$(DefineConstants);BINDER_DEBUG_LOG</DefineConstants> <DefineConstants Condition="'$(FeatureSymDiff)' == 'true'">$(DefineConstants);FEATURE_SYMDIFF</DefineConstants> diff --git a/crossgen.cmake b/crossgen.cmake index 6ff52347c1..436203dab6 100644 --- a/crossgen.cmake +++ b/crossgen.cmake @@ -14,6 +14,7 @@ remove_definitions( -DFEATURE_MULTICOREJIT -DFEATURE_PERFMAP -DFEATURE_RANDOMIZED_STRING_HASHING + -DFEATURE_REJIT -DFEATURE_VERSIONING_LOG ) |