diff options
| author | Russ Keldorph <Russ.Keldorph@microsoft.com> | 2018-03-17 11:37:41 +0000 |
|---|---|---|
| committer | Russ Keldorph <Russ.Keldorph@microsoft.com> | 2018-03-17 11:37:41 +0000 |
| commit | a10ed8021d0cf7e11447c3a498e360ced4f960be (patch) | |
| tree | e2ca6efdb28ec05f91acdb8b5e15d16ec5ec41e9 /clrdefinitions.cmake | |
| parent | cd8af80c29379c69997106d1d347a2b4ab02693b (diff) | |
| parent | cea438a8e885cc11f96671367bebf23137f45a5a (diff) | |
| download | coreclr-a10ed8021d0cf7e11447c3a498e360ced4f960be.tar.gz coreclr-a10ed8021d0cf7e11447c3a498e360ced4f960be.tar.bz2 coreclr-a10ed8021d0cf7e11447c3a498e360ced4f960be.zip | |
Merge commit 'cea438a8e885cc11f96671367bebf23137f45a5a' into release/2.1
Diffstat (limited to 'clrdefinitions.cmake')
| -rw-r--r-- | clrdefinitions.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index a5ad5198dc..918b94985f 100644 --- a/clrdefinitions.cmake +++ b/clrdefinitions.cmake @@ -14,6 +14,7 @@ if (CLR_CMAKE_TARGET_ARCH_AMD64) 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) @@ -22,6 +23,7 @@ elseif (CLR_CMAKE_TARGET_ARCH_ARM64) add_definitions(-DDBG_TARGET_ARM64_UNIX) 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) @@ -205,10 +207,13 @@ 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 OR (CLR_CMAKE_PLATFORM_ARCH_ARM64 AND NOT WIN32)) + 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)) 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 OR CLR_CMAKE_PLATFORM_ARCH_ARM64) AND NOT WIN32) + if(WIN32) add_definitions(-DFEATURE_VERSIONING_LOG) endif(WIN32) |