diff options
| author | Bruce Forstall <brucefo@microsoft.com> | 2016-11-22 16:42:57 -0800 |
|---|---|---|
| committer | Bruce Forstall <brucefo@microsoft.com> | 2016-11-23 14:31:00 -0800 |
| commit | aad84026d7c5dc10b877bec263f4456a31584772 (patch) | |
| tree | 65d14bacd30f614153859a20bcaf3c34f1fcd8bf /src/jit/protojit | |
| parent | 965e50d7ee6f860fd71d40dd74af74b87dcc930b (diff) | |
| download | coreclr-aad84026d7c5dc10b877bec263f4456a31584772.tar.gz coreclr-aad84026d7c5dc10b877bec263f4456a31584772.tar.bz2 coreclr-aad84026d7c5dc10b877bec263f4456a31584772.zip | |
Make RyuJIT/x86 the default x86 JIT
JIT32 becomes compatjit.dll and RyuJIT LEGACY_BACKEND becomes legacyjit.dll
(and is an altjit).
If JIT32 is not being built, then RyuJIT LEGACY_BACKEND becomes compatjit.dll
and is a normal jit (not an altjit).
Both clrjit.dll and compatjit.dll are added to the JIT NuGet package.
Diffstat (limited to 'src/jit/protojit')
| -rw-r--r-- | src/jit/protojit/CMakeLists.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/jit/protojit/CMakeLists.txt b/src/jit/protojit/CMakeLists.txt index 259c7da6b2..91c69e9a83 100644 --- a/src/jit/protojit/CMakeLists.txt +++ b/src/jit/protojit/CMakeLists.txt @@ -6,11 +6,9 @@ add_definitions(-DSELF_NO_HOST) add_definitions(-DFEATURE_READYTORUN_COMPILER) remove_definitions(-DFEATURE_MERGE_JIT_AND_ENGINE) -# Enable SIMD support for RyuJIT/x86. -if (CLR_CMAKE_TARGET_ARCH_I386) - add_definitions(-DFEATURE_SIMD) - add_definitions(-DFEATURE_AVX_SUPPORT) -endif (CLR_CMAKE_TARGET_ARCH_I386) +if(WIN32) + add_definitions(-DFX_VER_INTERNALNAME_STR=protojit.dll) +endif(WIN32) add_library_clr(protojit SHARED @@ -35,7 +33,8 @@ if(CLR_CMAKE_PLATFORM_UNIX) ) else() list(APPEND RYUJIT_LINK_LIBRARIES - msvcrt.lib + ${STATIC_MT_CRT_LIB} + ${STATIC_MT_VCRT_LIB} kernel32.lib advapi32.lib ole32.lib |