Enable compiling ReJIT functionality in CoreCLR

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba328f4..d9836ba 100644 (file)
--- 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 078f572..3897b89 100644 (file)
--- 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 6ff5234..436203d 100644 (file)
--- 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
 )