diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2016-04-22 12:24:51 -0700 |
|---|---|---|
| committer | Gaurav Khanna <gkhanna@microsoft.com> | 2016-04-26 08:08:20 -0700 |
| commit | 140396f479d5d33bca0daef1f072eef4992ed78e (patch) | |
| tree | 691bb2faa922940c1de7363fd51ac109495e6473 /src/jit | |
| parent | b0d809bd6ae65e85591af504e1797b115ea25b23 (diff) | |
| download | coreclr-140396f479d5d33bca0daef1f072eef4992ed78e.tar.gz coreclr-140396f479d5d33bca0daef1f072eef4992ed78e.tar.bz2 coreclr-140396f479d5d33bca0daef1f072eef4992ed78e.zip | |
Keep FEATURE_MERGE_JIT_AND_ENGINE with refactored approach
Diffstat (limited to 'src/jit')
| -rw-r--r-- | src/jit/dll/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/jit/standalone/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/jit/dll/CMakeLists.txt b/src/jit/dll/CMakeLists.txt index 583bc98a53..01e58dbbb8 100644 --- a/src/jit/dll/CMakeLists.txt +++ b/src/jit/dll/CMakeLists.txt @@ -7,7 +7,6 @@ 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) - add_definitions(-DFEATURE_MERGE_JIT_AND_ENGINE) add_library_clr(${JIT_BASE_NAME}_static STATIC diff --git a/src/jit/standalone/CMakeLists.txt b/src/jit/standalone/CMakeLists.txt index c98dab5d28..4e70b9ef74 100644 --- a/src/jit/standalone/CMakeLists.txt +++ b/src/jit/standalone/CMakeLists.txt @@ -4,6 +4,10 @@ add_definitions(-DSELF_NO_HOST) add_definitions(-DFEATURE_READYTORUN_COMPILER) remove_definitions(-DFEATURE_MERGE_JIT_AND_ENGINE) +if(CLR_CMAKE_TARGET_ARCH_I386 OR CLR_CMAKE_TARGET_ARCH_ARM) + add_definitions(-DLEGACY_BACKEND) +endif() + if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD) # This is required to force using our own PAL, not one that we are loaded with. set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions") |