diff options
| author | Jiyoung Yun <jy910.yun@samsung.com> | 2017-06-13 18:47:36 +0900 |
|---|---|---|
| committer | Jiyoung Yun <jy910.yun@samsung.com> | 2017-06-13 18:47:36 +0900 |
| commit | 61d6a817e39d3bae0f47dbc09838d51db22a5d30 (patch) | |
| tree | cb37caa1784bc738b976273335d6ed04a7cc80b0 /clrdefinitions.cmake | |
| parent | 5b975f8233e8c8d17b215372f89ca713b45d6a0b (diff) | |
| download | coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.tar.gz coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.tar.bz2 coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.zip | |
Imported Upstream version 2.0.0.11992upstream/2.0.0.11992
Diffstat (limited to 'clrdefinitions.cmake')
| -rw-r--r-- | clrdefinitions.cmake | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index 838be56f62..6db2b24483 100644 --- a/clrdefinitions.cmake +++ b/clrdefinitions.cmake @@ -1,9 +1,3 @@ -if(WIN32 AND CLR_CMAKE_TARGET_ARCH_I386 AND BUILD_JIT32) - set(CLR_BUILD_JIT32 1) -else() - set(CLR_BUILD_JIT32 0) -endif() - include(clrfeatures.cmake) if (CLR_CMAKE_TARGET_ARCH_AMD64) @@ -117,7 +111,9 @@ endif(FEATURE_DBGIPC) if(FEATURE_EVENT_TRACE) add_definitions(-DFEATURE_EVENT_TRACE=1) endif(FEATURE_EVENT_TRACE) -add_definitions(-DFEATURE_PERFTRACING) +if(CLR_CMAKE_PLATFORM_LINUX) + add_definitions(-DFEATURE_PERFTRACING) +endif(CLR_CMAKE_PLATFORM_LINUX) if(CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_EVENTSOURCE_XPLAT=1) endif(CLR_CMAKE_PLATFORM_UNIX) @@ -139,15 +135,18 @@ if(FEATURE_INTERPRETER) endif(FEATURE_INTERPRETER) add_definitions(-DFEATURE_ISYM_READER) add_definitions(-DFEATURE_LOADER_OPTIMIZATION) -if (NOT CLR_CMAKE_PLATFORM_UNIX) +if (CLR_CMAKE_PLATFORM_LINUX OR WIN32) add_definitions(-DFEATURE_MANAGED_ETW) -endif(NOT CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_PLATFORM_LINUX OR WIN32) add_definitions(-DFEATURE_MANAGED_ETW_CHANNELS) if(FEATURE_MERGE_JIT_AND_ENGINE) add_definitions(-DFEATURE_MERGE_JIT_AND_ENGINE) endif(FEATURE_MERGE_JIT_AND_ENGINE) add_definitions(-DFEATURE_MULTICOREJIT) +if (FEATURE_NI_BIND_FALLBACK) + add_definitions(-DFEATURE_NI_BIND_FALLBACK) +endif(FEATURE_NI_BIND_FALLBACK) if(CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_PAL) add_definitions(-DFEATURE_PAL_SXS) @@ -183,10 +182,10 @@ if(CLR_CMAKE_PLATFORM_UNIX_AMD64) add_definitions(-DFEATURE_UNIX_AMD64_STRUCT_PASSING) endif (CLR_CMAKE_PLATFORM_UNIX_AMD64) add_definitions(-DFEATURE_USE_ASM_GC_WRITE_BARRIERS) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64 AND NOT WIN32) +if((CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_ARM64) AND NOT WIN32) add_definitions(-DFEATURE_MANUALLY_MANAGED_CARD_BUNDLES) add_definitions(-DFEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP) -endif(CLR_CMAKE_PLATFORM_ARCH_AMD64 AND NOT WIN32) +endif((CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_ARM64) AND NOT WIN32) if(WIN32) add_definitions(-DFEATURE_VERSIONING_LOG) endif(WIN32) |