Merge pull request #887 from janvorli/windows-readytorun

Enable ReadyToRun for Windows CoreCLR

5 files changed, 16 insertions, 0 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3377d90d3..3ca0f0403f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -453,6 +453,7 @@ add_definitions(-DFEATURE_NORM_IDNA_ONLY)
 add_definitions(-DFEATURE_PREJIT)
 if(WIN32)
     add_definitions(-DFEATURE_RANDOMIZED_STRING_HASHING)
+    add_definitions(-DFEATURE_READYTORUN)
 endif(WIN32)
 add_definitions(-DFEATURE_STANDALONE_SN)
 add_definitions(-DFEATURE_STRONGNAME_DELAY_SIGNING_ALLOWED)
diff --git a/crossgen.cmake b/crossgen.cmake
index af285fceea..d377044302 100644
--- a/crossgen.cmake
+++ b/crossgen.cmake
@@ -19,4 +19,5 @@ remove_definitions(
 
 if(WIN32)
     add_definitions(-MT)
+    add_definitions(-DFEATURE_READYTORUN_COMPILER)
 endif(WIN32)
diff --git a/src/vm/CMakeLists.txt b/src/vm/CMakeLists.txt
index c29ae78184..cad60fdcd1 100644
--- a/src/vm/CMakeLists.txt
+++ b/src/vm/CMakeLists.txt
@@ -253,6 +253,7 @@ set(VM_SOURCES_DAC_AND_WKS_WIN32
     clrtocomcall.cpp
     comtoclrcall.cpp
     rcwwalker.cpp
+    readytoruninfo.cpp
     umthunkhash.cpp #" Condition="'$(FeatureMixedMode)' == 'true'
     winrttypenameconverter.cpp
 )
diff --git a/src/vm/crossgen/CMakeLists.txt b/src/vm/crossgen/CMakeLists.txt
index 5f0b230f65..afb7f7414b 100644
--- a/src/vm/crossgen/CMakeLists.txt
+++ b/src/vm/crossgen/CMakeLists.txt
@@ -101,6 +101,12 @@ set(VM_CROSSGEN_SOURCES
     ../crossgencompile.cpp
 )
 
+if (WIN32)
+  list(APPEND VM_CROSSGEN_SOURCES
+      ../readytoruninfo.cpp
+  )
+endif (WIN32)
+
 include_directories(BEFORE ..)
 include_directories(${CLR_DIR}/src/gc)
 include_directories(../amd64)
diff --git a/src/zap/crossgen/CMakeLists.txt b/src/zap/crossgen/CMakeLists.txt
index dc7d0e8794..cebcd8c274 100644
--- a/src/zap/crossgen/CMakeLists.txt
+++ b/src/zap/crossgen/CMakeLists.txt
@@ -17,5 +17,12 @@ set(ZAP_SOURCES
     ../nativeformatwriter.cpp
 )
 
+if (WIN32)
+    list(APPEND ZAP_SOURCES
+        ../zapreadytorun.cpp
+        ../nativeformatwriter.cpp
+    )
+endif (WIN32)
+
 add_precompiled_header(common.h ../common.cpp ZAP_SOURCES)
 add_library(corzap_crossgen STATIC ${ZAP_SOURCES})