diff options
author | Jiyoung Yun <jy910.yun@samsung.com> | 2017-04-13 14:17:19 +0900 |
---|---|---|
committer | Jiyoung Yun <jy910.yun@samsung.com> | 2017-04-13 14:17:19 +0900 |
commit | a56e30c8d33048216567753d9d3fefc2152af8ac (patch) | |
tree | 7e5d979695fc4a431740982eb1cfecc2898b23a5 /clrdefinitions.cmake | |
parent | 4b11dc566a5bbfa1378d6266525c281b028abcc8 (diff) | |
download | coreclr-a56e30c8d33048216567753d9d3fefc2152af8ac.tar.gz coreclr-a56e30c8d33048216567753d9d3fefc2152af8ac.tar.bz2 coreclr-a56e30c8d33048216567753d9d3fefc2152af8ac.zip |
Imported Upstream version 2.0.0.11353upstream/2.0.0.11353
Diffstat (limited to 'clrdefinitions.cmake')
-rw-r--r-- | clrdefinitions.cmake | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index 7f5686afed..c4bfb8ea39 100644 --- a/clrdefinitions.cmake +++ b/clrdefinitions.cmake @@ -91,13 +91,14 @@ endif(WIN32) add_definitions(-DFEATURE_APPDOMAIN_RESOURCE_MONITORING) if(WIN32) - add_definitions(-DFEATURE_APPX) -endif(WIN32) -if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARGET_ARCH_ARM64) + add_definitions(-DFEATURE_APPX) + if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARGET_ARCH_ARM64) add_definitions(-DFEATURE_ARRAYSTUB_AS_IL) -endif() + endif() +else(WIN32) + add_definitions(-DFEATURE_ARRAYSTUB_AS_IL) +endif(WIN32) -add_definitions(-DFEATURE_ASYNC_IO) add_definitions(-DFEATURE_COLLECTIBLE_TYPES) if(WIN32) @@ -114,26 +115,25 @@ if (CLR_CMAKE_PLATFORM_UNIX) endif(CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_CORESYSTEM) add_definitions(-DFEATURE_CORRUPTING_EXCEPTIONS) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_PLATFORM_UNIX AND (NOT CLR_CMAKE_PLATFORM_ANDROID)) add_definitions(-DFEATURE_DBGIPC_TRANSPORT_DI) add_definitions(-DFEATURE_DBGIPC_TRANSPORT_VM) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_PLATFORM_UNIX AND (NOT CLR_CMAKE_PLATFORM_ANDROID)) if(FEATURE_EVENT_TRACE) add_definitions(-DFEATURE_EVENT_TRACE=1) endif(FEATURE_EVENT_TRACE) +add_definitions(-DFEATURE_PERFTRACING) if(CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_EVENTSOURCE_XPLAT=1) endif(CLR_CMAKE_PLATFORM_UNIX) -add_definitions(-DFEATURE_EXCEPTIONDISPATCHINFO) -add_definitions(-DFEATURE_EXCEPTION_NOTIFICATIONS) +add_definitions(-DFEATURE_TIERED_COMPILATION) # NetBSD doesn't implement this feature if(NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) add_definitions(-DFEATURE_HIJACK) endif(NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) -add_definitions(-DFEATURE_HOST_ASSEMBLY_RESOLVER) add_definitions(-DFEATURE_ICASTABLE) if (WIN32 AND (CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386)) -add_definitions(-DFEATURE_INTEROP_DEBUGGING) + add_definitions(-DFEATURE_INTEROP_DEBUGGING) endif (WIN32 AND (CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386)) if (CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_TARGET_ARCH_ARM64) add_definitions(-DFEATURE_IMPLICIT_TLS) @@ -142,18 +142,14 @@ endif(CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_TARGET_ARCH_ARM64) add_definitions(-DFEATURE_ISYM_READER) add_definitions(-DFEATURE_LOADER_OPTIMIZATION) if (NOT CLR_CMAKE_PLATFORM_UNIX) -add_definitions(-DFEATURE_MANAGED_ETW) + add_definitions(-DFEATURE_MANAGED_ETW) endif(NOT CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_MANAGED_ETW_CHANNELS) -add_definitions(-DFEATURE_MAIN_CLR_MODULE_USES_CORE_NAME) -add_definitions(-DFEATURE_MERGE_CULTURE_SUPPORT_AND_ENGINE) if(FEATURE_MERGE_JIT_AND_ENGINE) - # Disable the following for UNIX altjit on Windows add_definitions(-DFEATURE_MERGE_JIT_AND_ENGINE) endif(FEATURE_MERGE_JIT_AND_ENGINE) add_definitions(-DFEATURE_MULTICOREJIT) -add_definitions(-DFEATURE_NORM_IDNA_ONLY) if(CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_PAL) add_definitions(-DFEATURE_PAL_SXS) @@ -180,18 +176,19 @@ if (CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_TARGET_ARCH_ARM64) endif () add_definitions(-DFEATURE_SVR_GC) add_definitions(-DFEATURE_SYMDIFF) -add_definitions(-DFEATURE_SYNCHRONIZATIONCONTEXT_WAIT) -add_definitions(-DFEATURE_SYNTHETIC_CULTURES) +if (CLR_CMAKE_PLATFORM_ARCH_AMD64) + # Enable the AMD64 Unix struct passing JIT-EE interface for all AMD64 platforms, to enable altjit. + add_definitions(-DFEATURE_UNIX_AMD64_STRUCT_PASSING_ITF) +endif (CLR_CMAKE_PLATFORM_ARCH_AMD64) if(CLR_CMAKE_PLATFORM_UNIX_AMD64) add_definitions(-DFEATURE_MULTIREG_RETURN) add_definitions(-DFEATURE_UNIX_AMD64_STRUCT_PASSING) - add_definitions(-DFEATURE_UNIX_AMD64_STRUCT_PASSING_ITF) endif (CLR_CMAKE_PLATFORM_UNIX_AMD64) add_definitions(-DFEATURE_USE_ASM_GC_WRITE_BARRIERS) if(CLR_CMAKE_PLATFORM_ARCH_AMD64 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) -add_definitions(-DFEATURE_VERSIONING) if(WIN32) add_definitions(-DFEATURE_VERSIONING_LOG) endif(WIN32) @@ -204,5 +201,3 @@ add_definitions(-DFEATURE_WINMD_RESILIENT) add_definitions(-D_SECURE_SCL=0) add_definitions(-DUNICODE) add_definitions(-D_UNICODE) - -add_definitions(-DFEATURE_SPAN_OF_T) |