X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=clrdefinitions.cmake;h=a976e7713bf8445d1990e6b67f98307a235cff2b;hb=11f58cb707092055ad8519723b45b72def099300;hp=b4ccfec6f6ead603fe0d3065a11da7057aa40409;hpb=96e8c58d77762497a8333e675db2fd396887decb;p=platform%2Fupstream%2Fcoreclr.git

diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake
index b4ccfec..a976e77 100644
--- a/clrdefinitions.cmake
+++ b/clrdefinitions.cmake
@@ -2,48 +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_UTF8STRING=1)  
-  # add_definitions(-DFEATURE_XXX=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)
@@ -81,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
@@ -122,8 +124,8 @@ if(FEATURE_DBGIPC)
 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)
@@ -138,7 +140,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)
@@ -160,6 +162,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)
@@ -175,11 +181,13 @@ endif(CLR_CMAKE_PLATFORM_UNIX)
 if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD)
     add_definitions(-DFEATURE_PERFMAP)
 endif(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD)
-add_definitions(-DFEATURE_PREJIT)
+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)
@@ -194,6 +202,9 @@ 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)
@@ -234,3 +245,7 @@ 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)