X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=clrdefinitions.cmake;h=9120caddcb06e4359b8ab94f2aaa4a0d5325e16a;hb=864b5fdd9ec9433e6439d4e9107bf560ceecfdac;hp=8319f0ad89ec49d3ae405d05f4a9755842ae3980;hpb=019d2ba578c7f710319d03fe409e871e1fb90058;p=platform%2Fupstream%2Fcoreclr.git diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index 8319f0a..9120cad 100644 --- a/clrdefinitions.cmake +++ b/clrdefinitions.cmake @@ -2,47 +2,50 @@ include(clrfeatures.cmake) # If set, indicates that this is not an officially supported release # Keep in sync with IsPrerelease in dir.props -set(PRERELEASE 1) +set(PRERELEASE 0) # Features we're currently flighting, but don't intend to ship in officially supported releases if (PRERELEASE) - add_definitions(-DFEATURE_DEFAULT_INTERFACES=1) + add_definitions(-DFEATURE_UTF8STRING) + # add_definitions(-DFEATURE_XXX) endif (PRERELEASE) if (CLR_CMAKE_TARGET_ARCH_AMD64) if (CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DDBG_TARGET_AMD64_UNIX) endif() - add_definitions(-D_TARGET_AMD64_=1) - add_definitions(-D_TARGET_64BIT_=1) - add_definitions(-DDBG_TARGET_64BIT=1) - add_definitions(-DDBG_TARGET_AMD64=1) - add_definitions(-DDBG_TARGET_WIN64=1) + add_definitions(-D_TARGET_AMD64_) + add_definitions(-D_TARGET_64BIT_) + add_definitions(-DDBG_TARGET_64BIT) + add_definitions(-DDBG_TARGET_AMD64) + add_definitions(-DDBG_TARGET_WIN64) elseif (CLR_CMAKE_TARGET_ARCH_ARM64) if (CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DDBG_TARGET_ARM64_UNIX) + add_definitions(-DFEATURE_EMULATE_SINGLESTEP) endif() - add_definitions(-D_TARGET_ARM64_=1) - add_definitions(-D_TARGET_64BIT_=1) - add_definitions(-DDBG_TARGET_64BIT=1) - add_definitions(-DDBG_TARGET_ARM64=1) - add_definitions(-DDBG_TARGET_WIN64=1) + add_definitions(-D_TARGET_ARM64_) + add_definitions(-D_TARGET_64BIT_) + add_definitions(-DDBG_TARGET_64BIT) + add_definitions(-DDBG_TARGET_ARM64) + add_definitions(-DDBG_TARGET_WIN64) add_definitions(-DFEATURE_MULTIREG_RETURN) elseif (CLR_CMAKE_TARGET_ARCH_ARM) if (CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DDBG_TARGET_ARM_UNIX) elseif (WIN32 AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) # Set this to ensure we can use Arm SDK for Desktop binary linkage when doing native (Arm32) build - add_definitions(-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1) + add_definitions(-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE) add_definitions(-D_ARM_WORKAROUND_) endif (CLR_CMAKE_PLATFORM_UNIX) - add_definitions(-D_TARGET_ARM_=1) - add_definitions(-DDBG_TARGET_32BIT=1) - add_definitions(-DDBG_TARGET_ARM=1) + add_definitions(-D_TARGET_ARM_) + add_definitions(-DDBG_TARGET_32BIT) + add_definitions(-DDBG_TARGET_ARM) + add_definitions(-DFEATURE_EMULATE_SINGLESTEP) elseif (CLR_CMAKE_TARGET_ARCH_I386) - add_definitions(-D_TARGET_X86_=1) - add_definitions(-DDBG_TARGET_32BIT=1) - add_definitions(-DDBG_TARGET_X86=1) + add_definitions(-D_TARGET_X86_) + add_definitions(-DDBG_TARGET_32BIT) + add_definitions(-DDBG_TARGET_X86) else () clr_unknown_arch() endif (CLR_CMAKE_TARGET_ARCH_AMD64) @@ -80,7 +83,7 @@ if(WIN32) add_definitions(-D_WIN32) add_definitions(-DWINVER=0x0602) add_definitions(-D_WIN32_WINNT=0x0602) - add_definitions(-DWIN32_LEAN_AND_MEAN=1) + add_definitions(-DWIN32_LEAN_AND_MEAN) add_definitions(-D_CRT_SECURE_NO_WARNINGS) if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386) # Only enable edit and continue on windows x86 and x64 @@ -90,10 +93,6 @@ if(WIN32) endif(WIN32) # Features - please keep them alphabetically sorted -if (FEATURE_APPDOMAIN_RESOURCE_MONITORING) - add_definitions(-DFEATURE_APPDOMAIN_RESOURCE_MONITORING) -endif(FEATURE_APPDOMAIN_RESOURCE_MONITORING) - if(WIN32) add_definitions(-DFEATURE_APPX) if(NOT CLR_CMAKE_TARGET_ARCH_I386) @@ -104,6 +103,15 @@ else(WIN32) add_definitions(-DFEATURE_ARRAYSTUB_AS_IL) add_definitions(-DFEATURE_MULTICASTSTUB_AS_IL) endif(WIN32) + +if(NOT CLR_CMAKE_TARGET_ARCH_I386) + add_definitions(-DFEATURE_PORTABLE_SHUFFLE_THUNKS) +endif() + +if(CLR_CMAKE_PLATFORM_UNIX OR NOT CLR_CMAKE_TARGET_ARCH_I386) + add_definitions(-DFEATURE_INSTANTIATINGSTUB_AS_IL) +endif() + add_definitions(-DFEATURE_CODE_VERSIONING) add_definitions(-DFEATURE_COLLECTIBLE_TYPES) @@ -115,19 +123,18 @@ if(WIN32) add_definitions(-DFEATURE_COMINTEROP_WINRT_MANAGED_ACTIVATION) endif(WIN32) +add_definitions(-DFEATURE_BASICFREEZE) add_definitions(-DFEATURE_CORECLR) -if (CLR_CMAKE_PLATFORM_UNIX) - add_definitions(-DFEATURE_COREFX_GLOBALIZATION) -endif(CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_CORESYSTEM) add_definitions(-DFEATURE_CORRUPTING_EXCEPTIONS) if(FEATURE_DBGIPC) add_definitions(-DFEATURE_DBGIPC_TRANSPORT_DI) add_definitions(-DFEATURE_DBGIPC_TRANSPORT_VM) endif(FEATURE_DBGIPC) +add_definitions(-DFEATURE_DEFAULT_INTERFACES) if(FEATURE_EVENT_TRACE) - add_definitions(-DFEATURE_EVENT_TRACE=1) - add_definitions(-DFEATURE_PERFTRACING=1) + add_definitions(-DFEATURE_EVENT_TRACE) + add_definitions(-DFEATURE_PERFTRACING) endif(FEATURE_EVENT_TRACE) if(FEATURE_GDBJIT) add_definitions(-DFEATURE_GDBJIT) @@ -142,7 +149,7 @@ if(FEATURE_GDBJIT_SYMTAB) add_definitions(-DFEATURE_GDBJIT_SYMTAB) endif(FEATURE_GDBJIT_SYMTAB) if(CLR_CMAKE_PLATFORM_UNIX) - add_definitions(-DFEATURE_EVENTSOURCE_XPLAT=1) + add_definitions(-DFEATURE_EVENTSOURCE_XPLAT) endif(CLR_CMAKE_PLATFORM_UNIX) # NetBSD doesn't implement this feature if(NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) @@ -164,6 +171,10 @@ if (CLR_CMAKE_PLATFORM_LINUX OR WIN32) endif(CLR_CMAKE_PLATFORM_LINUX OR WIN32) add_definitions(-DFEATURE_MANAGED_ETW_CHANNELS) +if(FEATURE_IBCLOGGER) + add_definitions(-DFEATURE_IBCLOGGER) +endif(FEATURE_IBCLOGGER) + if(FEATURE_MERGE_JIT_AND_ENGINE) add_definitions(-DFEATURE_MERGE_JIT_AND_ENGINE) endif(FEATURE_MERGE_JIT_AND_ENGINE) @@ -176,14 +187,16 @@ if(CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_PAL_SXS) add_definitions(-DFEATURE_PAL_ANSI) endif(CLR_CMAKE_PLATFORM_UNIX) -if(CLR_CMAKE_PLATFORM_LINUX) +if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD) add_definitions(-DFEATURE_PERFMAP) -endif(CLR_CMAKE_PLATFORM_LINUX) -add_definitions(-DFEATURE_PREJIT) +endif(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD) +if(FEATURE_PREJIT) + add_definitions(-DFEATURE_PREJIT) +endif(FEATURE_PREJIT) -if(NOT CLR_CMAKE_PLATFORM_UNIX) +if(WIN32 OR CLR_CMAKE_PLATFORM_LINUX) add_definitions(-DFEATURE_PROFAPI_ATTACH_DETACH) -endif(NOT CLR_CMAKE_PLATFORM_UNIX) +endif(WIN32 OR CLR_CMAKE_PLATFORM_LINUX) add_definitions(-DFEATURE_READYTORUN) set(FEATURE_READYTORUN 1) @@ -192,15 +205,15 @@ if (CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386) add_definitions(-DFEATURE_REJIT) endif(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386) -add_definitions(-DFEATURE_STANDALONE_SN) -add_definitions(-DFEATURE_STRONGNAME_DELAY_SIGNING_ALLOWED) -add_definitions(-DFEATURE_STRONGNAME_MIGRATION) if (CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_TARGET_ARCH_ARM64) add_definitions(-DFEATURE_STUBS_AS_IL) endif () if (FEATURE_NGEN_RELOCS_OPTIMIZATIONS) add_definitions(-DFEATURE_NGEN_RELOCS_OPTIMIZATIONS) endif(FEATURE_NGEN_RELOCS_OPTIMIZATIONS) +if (FEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION) + add_definitions(-DFEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION) +endif(FEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION) add_definitions(-DFEATURE_SVR_GC) add_definitions(-DFEATURE_SYMDIFF) add_definitions(-DFEATURE_TIERED_COMPILATION) @@ -218,9 +231,9 @@ if(CLR_CMAKE_PLATFORM_UNIX AND CLR_CMAKE_TARGET_ARCH_AMD64) add_definitions(-DUNIX_AMD64_ABI) endif(CLR_CMAKE_PLATFORM_UNIX AND CLR_CMAKE_TARGET_ARCH_AMD64) add_definitions(-DFEATURE_USE_ASM_GC_WRITE_BARRIERS) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR (CLR_CMAKE_PLATFORM_ARCH_ARM64 AND NOT WIN32)) +if(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_ARM64) add_definitions(-DFEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP) -endif(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR (CLR_CMAKE_PLATFORM_ARCH_ARM64 AND NOT WIN32)) +endif(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_ARM64) if((CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_ARM64) AND NOT WIN32) add_definitions(-DFEATURE_MANUALLY_MANAGED_CARD_BUNDLES) endif((CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_ARM64) AND NOT WIN32) @@ -231,8 +244,6 @@ endif(WIN32) if(NOT CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_WIN32_REGISTRY) endif(NOT CLR_CMAKE_PLATFORM_UNIX) -add_definitions(-DFEATURE_LEGACYNETCF_DBG_HOST_CONTROL) -add_definitions(-DFEATURE_WINDOWSPHONE) add_definitions(-DFEATURE_WINMD_RESILIENT) add_definitions(-D_SECURE_SCL=0) add_definitions(-DUNICODE) @@ -243,3 +254,11 @@ if(WIN32) add_definitions(-DFEATURE_DATABREAKPOINT) endif(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386) endif(WIN32) + +if(CLR_CMAKE_PLATFORM_DARWIN) + add_definitions(-DFEATURE_WRITEBARRIER_COPY) +endif(CLR_CMAKE_PLATFORM_DARWIN) + +if(TIZEN_AGGRESSIVE_INLINING_GENERIC) + add_definitions(-DTIZEN_AGGRESSIVE_INLINING_GENERIC) +endif(TIZEN_AGGRESSIVE_INLINING_GENERIC)