diff options
author | Jarret Shook <jarret_shook@outlook.com> | 2015-12-02 15:48:45 -0800 |
---|---|---|
committer | jashook <jashoo@microsoft.com> | 2015-12-15 12:51:38 -0800 |
commit | b2e88514d55b718b40c012209b62e060efed9945 (patch) | |
tree | 305a2af1ab3cf0100c2dd33c928e906f82cda070 /src | |
parent | b171cfd0c7179c39e8959d42aa3505ccfea1e834 (diff) | |
download | coreclr-b2e88514d55b718b40c012209b62e060efed9945.tar.gz coreclr-b2e88514d55b718b40c012209b62e060efed9945.tar.bz2 coreclr-b2e88514d55b718b40c012209b62e060efed9945.zip |
Build the legacy jit for x86 and arm.
Small changes to cmake to allow us to build the legacy jit as the fallback
jit for both x86 and arm.
Diffstat (limited to 'src')
-rw-r--r-- | src/jit/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/jit/crossgen/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/jit/dll/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/jit/protojit/CMakeLists.txt | 46 |
4 files changed, 60 insertions, 0 deletions
diff --git a/src/jit/CMakeLists.txt b/src/jit/CMakeLists.txt index b46adec89a..957619598d 100644 --- a/src/jit/CMakeLists.txt +++ b/src/jit/CMakeLists.txt @@ -88,6 +88,8 @@ elseif(CLR_CMAKE_PLATFORM_ARCH_I386) targetx86.cpp lowerxarch.cpp codegenxarch.cpp + codegenlegacy.cpp + stackfp.cpp ) elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) set( ARCH_SOURCES @@ -137,3 +139,7 @@ set(CLR_EXPORTED_SYMBOL_FILE ${CLRJIT_EXPORTS_DEF}) add_subdirectory(dll) add_subdirectory(crossgen) add_subdirectory(standalone) + +if (CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_ARM) + add_subdirectory(protojit) +endif (CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_ARM) diff --git a/src/jit/crossgen/CMakeLists.txt b/src/jit/crossgen/CMakeLists.txt index 8b9c3a3690..5bbd30cbdc 100644 --- a/src/jit/crossgen/CMakeLists.txt +++ b/src/jit/crossgen/CMakeLists.txt @@ -1,3 +1,7 @@ include(${CLR_DIR}/crossgen.cmake) +if(CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_ARM) + add_definitions(-DLEGACY_BACKEND) +endif(CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_ARM) + add_library(jit_crossgen ${SOURCES}) diff --git a/src/jit/dll/CMakeLists.txt b/src/jit/dll/CMakeLists.txt index 00e343dfe2..8ab402709b 100644 --- a/src/jit/dll/CMakeLists.txt +++ b/src/jit/dll/CMakeLists.txt @@ -1,5 +1,9 @@ project(ClrJit) +if(CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_ARM) + add_definitions(-DLEGACY_BACKEND) +endif(CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_ARM) + # Disable the following for UNIX altjit on Windows if(CLR_CMAKE_PLATFORM_UNIX) add_compile_options(-fPIC) diff --git a/src/jit/protojit/CMakeLists.txt b/src/jit/protojit/CMakeLists.txt new file mode 100644 index 0000000000..cc74b43731 --- /dev/null +++ b/src/jit/protojit/CMakeLists.txt @@ -0,0 +1,46 @@ +project(protojit) + +remove_definitions(-DFEATURE_MERGE_JIT_AND_ENGINE) + +add_library(protojit + SHARED + ${SHARED_LIB_SOURCES} +) + +set(RYUJIT_LINK_LIBRARIES + utilcodestaticnohost + gcinfo +) + +if(CLR_CMAKE_PLATFORM_UNIX) + list(APPEND RYUJIT_LINK_LIBRARIES + mscorrc_debug + coreclrpal + palrt + ) +else() + list(APPEND RYUJIT_LINK_LIBRARIES + msvcrt.lib + kernel32.lib + advapi32.lib + ole32.lib + oleaut32.lib + uuid.lib + user32.lib + version.lib + shlwapi.lib + bcrypt.lib + crypt32.lib + RuntimeObject.lib + ) +endif(CLR_CMAKE_PLATFORM_UNIX) + +target_link_libraries(protojit + ${RYUJIT_LINK_LIBRARIES} +) + +# add the install targets +install (TARGETS protojit DESTINATION .) +if(WIN32) + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/protojit.pdb DESTINATION PDB) +endif(WIN32) |