summaryrefslogtreecommitdiff
path: root/clrdefinitions.cmake
diff options
context:
space:
mode:
authorJiyoung Yun <jy910.yun@samsung.com>2017-02-10 11:35:12 (GMT)
committerJiyoung Yun <jy910.yun@samsung.com>2017-02-10 11:35:12 (GMT)
commit4b11dc566a5bbfa1378d6266525c281b028abcc8 (patch)
treeb48831a898906734f8884d08b6e18f1144ee2b82 /clrdefinitions.cmake
parentdb20f3f1bb8595633a7e16c8900fd401a453a6b5 (diff)
downloadcoreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.zip
coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.tar.gz
coreclr-4b11dc566a5bbfa1378d6266525c281b028abcc8.tar.bz2
Imported Upstream version 1.0.0.9910upstream/1.0.0.9910
Diffstat (limited to 'clrdefinitions.cmake')
-rw-r--r--clrdefinitions.cmake11
1 files changed, 4 insertions, 7 deletions
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake
index 91346ec..7f5686a 100644
--- a/clrdefinitions.cmake
+++ b/clrdefinitions.cmake
@@ -53,10 +53,12 @@ if (CLR_CMAKE_PLATFORM_UNIX)
add_definitions(-D_XOPEN_SOURCE)
endif(CLR_CMAKE_PLATFORM_DARWIN)
- if (CLR_CMAKE_PLATFORM_UNIX_AMD64)
+ if (CLR_CMAKE_TARGET_ARCH_AMD64)
add_definitions(-DUNIX_AMD64_ABI)
- elseif (CLR_CMAKE_PLATFORM_UNIX_ARM)
+ elseif (CLR_CMAKE_TARGET_ARCH_ARM)
add_definitions(-DUNIX_ARM_ABI)
+ elseif (CLR_CMAKE_TARGET_ARCH_I386)
+ add_definitions(-DUNIX_X86_ABI)
endif()
endif(CLR_CMAKE_PLATFORM_UNIX)
@@ -96,7 +98,6 @@ if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARGET_
endif()
add_definitions(-DFEATURE_ASYNC_IO)
-add_definitions(-DFEATURE_BCL_FORMATTING)
add_definitions(-DFEATURE_COLLECTIBLE_TYPES)
if(WIN32)
@@ -167,10 +168,6 @@ add_definitions(-DFEATURE_RANDOMIZED_STRING_HASHING)
add_definitions(-DFEATURE_READYTORUN)
set(FEATURE_READYTORUN 1)
-if (FEATURE_STANDALONE_GC)
- add_definitions(-DFEATURE_STANDALONE_GC)
-endif(FEATURE_STANDALONE_GC)
-
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)