diff options
| author | Steve MacLean <Steve.MacLean@microsoft.com> | 2020-01-21 23:36:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-21 23:36:37 +0300 |
| commit | 696e72b14d29979d7dab11eb4384ae656fdfaba6 (patch) | |
| tree | 2bc7cdf02f65770853cdf9f58526db1dbf340808 /src | |
| parent | 644bdd98151ccf64c230a2d646ed2be0e3f2d77b (diff) | |
Rename CLR_CMAKE_PLATFORM* CLR_CMAKE_HOST* (#1974)
The term platform was ambiguous. Migrate to using common terminology for
cross compilation.
Host is the platfrom which will execute the code
Target is the platform which will be debugged or for which code will be generated.
In most cases HOST == TARGET. The exceptions are the cross component crossgen
tools and the future cross DAC.
Diffstat (limited to 'src')
55 files changed, 316 insertions, 316 deletions
diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt index 2929f7eda5b..8b83a03c5b4 100644 --- a/src/coreclr/CMakeLists.txt +++ b/src/coreclr/CMakeLists.txt @@ -134,10 +134,10 @@ include(pgosupport.cmake) # - project which require platform header not clr's # - do not depend on clr's compile definitions #----------------------------------------- -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) add_subdirectory(src/pal) add_subdirectory(src/hosts) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) # Add this subdir. We install the headers for the jit. add_subdirectory(src/pal/prebuilt/inc) @@ -177,11 +177,11 @@ if(FEATURE_STANDALONE_GC) add_subdirectory(src/gc) endif(FEATURE_STANDALONE_GC) -if (CLR_CMAKE_PLATFORM_UNIX) +if (CLR_CMAKE_HOST_UNIX) include_directories("src/pal/inc") include_directories("src/pal/inc/rt") include_directories("src/pal/src/safecrt") -endif (CLR_CMAKE_PLATFORM_UNIX) +endif (CLR_CMAKE_HOST_UNIX) #------------------------------ # Add Product Directory diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake index 23328f0e126..58706f86158 100644 --- a/src/coreclr/clrdefinitions.cmake +++ b/src/coreclr/clrdefinitions.cmake @@ -17,7 +17,7 @@ add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>:FEATURE_ add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>:SELF_NO_HOST>) if (CLR_CMAKE_TARGET_ARCH_AMD64) - if (CLR_CMAKE_PLATFORM_UNIX) + if (CLR_CMAKE_HOST_UNIX) add_definitions(-DDBG_TARGET_AMD64_UNIX) endif() add_definitions(-D_TARGET_AMD64_) @@ -25,7 +25,7 @@ if (CLR_CMAKE_TARGET_ARCH_AMD64) add_definitions(-DDBG_TARGET_64BIT) add_definitions(-DDBG_TARGET_AMD64) elseif (CLR_CMAKE_TARGET_ARCH_ARM64) - if (CLR_CMAKE_PLATFORM_UNIX) + if (CLR_CMAKE_HOST_UNIX) add_definitions(-DDBG_TARGET_ARM64_UNIX) add_definitions(-DFEATURE_EMULATE_SINGLESTEP) endif() @@ -35,13 +35,13 @@ elseif (CLR_CMAKE_TARGET_ARCH_ARM64) add_definitions(-DDBG_TARGET_ARM64) add_definitions(-DFEATURE_MULTIREG_RETURN) elseif (CLR_CMAKE_TARGET_ARCH_ARM) - if (CLR_CMAKE_PLATFORM_UNIX) + if (CLR_CMAKE_HOST_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) add_definitions(-D_ARM_WORKAROUND_) - endif (CLR_CMAKE_PLATFORM_UNIX) + endif (CLR_CMAKE_HOST_UNIX) add_definitions(-D_TARGET_ARM_) add_definitions(-DDBG_TARGET_32BIT) add_definitions(-DDBG_TARGET_ARM) @@ -54,12 +54,12 @@ else () clr_unknown_arch() endif (CLR_CMAKE_TARGET_ARCH_AMD64) -if (CLR_CMAKE_PLATFORM_UNIX) +if (CLR_CMAKE_HOST_UNIX) - if(CLR_CMAKE_PLATFORM_DARWIN) + if(CLR_CMAKE_HOST_DARWIN) add_definitions(-D_XOPEN_SOURCE) add_definitions(-DFEATURE_DATATARGET4) - endif(CLR_CMAKE_PLATFORM_DARWIN) + endif(CLR_CMAKE_HOST_DARWIN) if (CLR_CMAKE_TARGET_ARCH_AMD64) add_definitions(-DUNIX_AMD64_ABI) @@ -69,13 +69,13 @@ if (CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DUNIX_X86_ABI) endif() -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) -if(CLR_CMAKE_PLATFORM_ALPINE_LINUX) +if(CLR_CMAKE_HOST_ALPINE_LINUX) # Alpine Linux doesn't have fixed stack limit, this define disables some stack pointer # sanity checks in debug / checked build that rely on a fixed stack limit add_definitions(-DNO_FIXED_STACK_LIMIT) -endif(CLR_CMAKE_PLATFORM_ALPINE_LINUX) +endif(CLR_CMAKE_HOST_ALPINE_LINUX) add_definitions(-D_BLD_CLR) add_definitions(-DDEBUGGING_SUPPORTED) @@ -112,7 +112,7 @@ 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) +if(CLR_CMAKE_HOST_UNIX OR NOT CLR_CMAKE_TARGET_ARCH_I386) add_definitions(-DFEATURE_INSTANTIATINGSTUB_AS_IL) endif() @@ -152,9 +152,9 @@ endif(FEATURE_GDBJIT_LANGID_CS) if(FEATURE_GDBJIT_SYMTAB) add_definitions(-DFEATURE_GDBJIT_SYMTAB) endif(FEATURE_GDBJIT_SYMTAB) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) add_definitions(-DFEATURE_EVENTSOURCE_XPLAT) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) # NetBSD doesn't implement this feature if(NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) add_definitions(-DFEATURE_HIJACK) @@ -167,34 +167,34 @@ if(FEATURE_INTERPRETER) add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_INTERPRETER>) endif(FEATURE_INTERPRETER) add_definitions(-DFEATURE_ISYM_READER) -if (CLR_CMAKE_PLATFORM_LINUX OR WIN32) +if (CLR_CMAKE_HOST_LINUX OR WIN32) add_definitions(-DFEATURE_MANAGED_ETW) -endif(CLR_CMAKE_PLATFORM_LINUX OR WIN32) +endif(CLR_CMAKE_HOST_LINUX OR WIN32) add_definitions(-DFEATURE_MANAGED_ETW_CHANNELS) if(FEATURE_MERGE_JIT_AND_ENGINE) add_definitions(-DFEATURE_MERGE_JIT_AND_ENGINE) endif(FEATURE_MERGE_JIT_AND_ENGINE) add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_MULTICOREJIT>) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) add_definitions(-DFEATURE_PAL) add_definitions(-DFEATURE_PAL_ANSI) -endif(CLR_CMAKE_PLATFORM_UNIX) -if(CLR_CMAKE_PLATFORM_LINUX) +endif(CLR_CMAKE_HOST_UNIX) +if(CLR_CMAKE_HOST_LINUX) add_definitions(-DFEATURE_PERFMAP) -endif(CLR_CMAKE_PLATFORM_LINUX) -if(CLR_CMAKE_PLATFORM_FREEBSD) +endif(CLR_CMAKE_HOST_LINUX) +if(CLR_CMAKE_HOST_FREEBSD) add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_PERFMAP>) -endif(CLR_CMAKE_PLATFORM_FREEBSD) +endif(CLR_CMAKE_HOST_FREEBSD) if(FEATURE_PREJIT) add_definitions(-DFEATURE_PREJIT) else() add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>:FEATURE_PREJIT>) endif(FEATURE_PREJIT) -if(WIN32 OR CLR_CMAKE_PLATFORM_LINUX) +if(WIN32 OR CLR_CMAKE_HOST_LINUX) add_compile_definitions($<$<AND:$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>,$<NOT:$<BOOL:$<TARGET_PROPERTY:DAC_COMPONENT>>>>:FEATURE_PROFAPI_ATTACH_DETACH>) -endif(WIN32 OR CLR_CMAKE_PLATFORM_LINUX) +endif(WIN32 OR CLR_CMAKE_HOST_LINUX) add_compile_definitions($<$<BOOL:$<TARGET_PROPERTY:DAC_COMPONENT>>:DATA_PROFAPI_ATTACH_DETACH>) @@ -205,7 +205,7 @@ set(FEATURE_READYTORUN 1) add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_REJIT>) -if (CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_TARGET_ARCH_ARM64) +if (CLR_CMAKE_HOST_UNIX OR CLR_CMAKE_TARGET_ARCH_ARM64) add_definitions(-DFEATURE_STUBS_AS_IL) endif () if (FEATURE_NGEN_RELOCS_OPTIMIZATIONS) @@ -220,27 +220,27 @@ add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:F if (WIN32) add_definitions(-DFEATURE_TYPEEQUIVALENCE) endif(WIN32) -if (CLR_CMAKE_PLATFORM_ARCH_AMD64) +if (CLR_CMAKE_HOST_ARCH_AMD64) # Enable the AMD64 Unix struct passing JIT-EE interface for all AMD64 platforms, to enable altjit. add_definitions(-DUNIX_AMD64_ABI_ITF) -endif (CLR_CMAKE_PLATFORM_ARCH_AMD64) -if(CLR_CMAKE_PLATFORM_UNIX_AMD64) +endif (CLR_CMAKE_HOST_ARCH_AMD64) +if(CLR_CMAKE_HOST_UNIX_AMD64) add_definitions(-DFEATURE_MULTIREG_RETURN) -endif (CLR_CMAKE_PLATFORM_UNIX_AMD64) -if(CLR_CMAKE_PLATFORM_UNIX AND CLR_CMAKE_TARGET_ARCH_AMD64) +endif (CLR_CMAKE_HOST_UNIX_AMD64) +if(CLR_CMAKE_HOST_UNIX AND CLR_CMAKE_TARGET_ARCH_AMD64) add_definitions(-DUNIX_AMD64_ABI) -endif(CLR_CMAKE_PLATFORM_UNIX AND CLR_CMAKE_TARGET_ARCH_AMD64) +endif(CLR_CMAKE_HOST_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) +if(CLR_CMAKE_HOST_ARCH_AMD64 OR CLR_CMAKE_HOST_ARCH_ARM64) add_definitions(-DFEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP) -endif(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_ARM64) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_ARM64) +endif(CLR_CMAKE_HOST_ARCH_AMD64 OR CLR_CMAKE_HOST_ARCH_ARM64) +if(CLR_CMAKE_HOST_ARCH_AMD64 OR CLR_CMAKE_HOST_ARCH_ARM64) add_definitions(-DFEATURE_MANUALLY_MANAGED_CARD_BUNDLES) -endif(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_ARM64) +endif(CLR_CMAKE_HOST_ARCH_AMD64 OR CLR_CMAKE_HOST_ARCH_ARM64) -if(NOT CLR_CMAKE_PLATFORM_UNIX) +if(NOT CLR_CMAKE_HOST_UNIX) add_definitions(-DFEATURE_WIN32_REGISTRY) -endif(NOT CLR_CMAKE_PLATFORM_UNIX) +endif(NOT CLR_CMAKE_HOST_UNIX) add_definitions(-DFEATURE_WINMD_RESILIENT) add_definitions(-D_SECURE_SCL=0) add_definitions(-DUNICODE) @@ -252,9 +252,9 @@ if(WIN32) endif(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386) endif(WIN32) -if(CLR_CMAKE_PLATFORM_DARWIN) +if(CLR_CMAKE_HOST_DARWIN) add_definitions(-DFEATURE_WRITEBARRIER_COPY) -endif(CLR_CMAKE_PLATFORM_DARWIN) +endif(CLR_CMAKE_HOST_DARWIN) if (NOT CLR_CMAKE_TARGET_ARCH_I386 OR NOT WIN32) add_definitions(-DFEATURE_EH_FUNCLETS) diff --git a/src/coreclr/clrfeatures.cmake b/src/coreclr/clrfeatures.cmake index 03267629716..dd8df938db1 100644 --- a/src/coreclr/clrfeatures.cmake +++ b/src/coreclr/clrfeatures.cmake @@ -11,7 +11,7 @@ if(NOT DEFINED FEATURE_PERFTRACING AND FEATURE_EVENT_TRACE) endif(NOT DEFINED FEATURE_PERFTRACING AND FEATURE_EVENT_TRACE) if(NOT DEFINED FEATURE_DBGIPC) - if(CLR_CMAKE_PLATFORM_UNIX AND (NOT CLR_CMAKE_PLATFORM_ANDROID)) + if(CLR_CMAKE_HOST_UNIX AND (NOT CLR_CMAKE_HOST_ANDROID)) set(FEATURE_DBGIPC 1) endif() endif(NOT DEFINED FEATURE_DBGIPC) diff --git a/src/coreclr/configurecompiler.cmake b/src/coreclr/configurecompiler.cmake index e3436bf8b6a..3c75a20783a 100644 --- a/src/coreclr/configurecompiler.cmake +++ b/src/coreclr/configurecompiler.cmake @@ -26,21 +26,21 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) # - for windows we use the passed in parameter to CMAKE to determine build arch #---------------------------------------- if(CMAKE_SYSTEM_NAME STREQUAL Linux) - set(CLR_CMAKE_PLATFORM_UNIX 1) + set(CLR_CMAKE_HOST_UNIX 1) if(CLR_CROSS_COMPONENTS_BUILD) # CMAKE_HOST_SYSTEM_PROCESSOR returns the value of `uname -p` on host. if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL amd64) if(CLR_CMAKE_TARGET_ARCH STREQUAL "arm" OR CLR_CMAKE_TARGET_ARCH STREQUAL "armel") if(CMAKE_CROSSCOMPILING) - set(CLR_CMAKE_PLATFORM_UNIX_X86 1) + set(CLR_CMAKE_HOST_UNIX_X86 1) else() - set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) + set(CLR_CMAKE_HOST_UNIX_AMD64 1) endif() else() - set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) + set(CLR_CMAKE_HOST_UNIX_AMD64 1) endif() elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL i686) - set(CLR_CMAKE_PLATFORM_UNIX_X86 1) + set(CLR_CMAKE_HOST_UNIX_X86 1) else() clr_unknown_arch() endif() @@ -50,20 +50,20 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) # Linux and Darwin identify it as "x86_64" while FreeBSD and netbsd uses the # "amd64" string. Accept either of the two here. if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL amd64) - set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) + set(CLR_CMAKE_HOST_UNIX_AMD64 1) elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l) - set(CLR_CMAKE_PLATFORM_UNIX_ARM 1) + set(CLR_CMAKE_HOST_UNIX_ARM 1) elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL arm) - set(CLR_CMAKE_PLATFORM_UNIX_ARM 1) + set(CLR_CMAKE_HOST_UNIX_ARM 1) elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) - set(CLR_CMAKE_PLATFORM_UNIX_ARM64 1) + set(CLR_CMAKE_HOST_UNIX_ARM64 1) elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL i686) - set(CLR_CMAKE_PLATFORM_UNIX_X86 1) + set(CLR_CMAKE_HOST_UNIX_X86 1) else() clr_unknown_arch() endif() endif() - set(CLR_CMAKE_PLATFORM_LINUX 1) + set(CLR_CMAKE_HOST_LINUX 1) # Detect Linux ID set(LINUX_ID_FILE "/etc/os-release") @@ -80,52 +80,52 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) if(CLR_CMAKE_LINUX_ID STREQUAL tizen) set(CLR_CMAKE_TARGET_TIZEN_LINUX 1) elseif(CLR_CMAKE_LINUX_ID STREQUAL alpine) - set(CLR_CMAKE_PLATFORM_ALPINE_LINUX 1) + set(CLR_CMAKE_HOST_ALPINE_LINUX 1) endif() endif(DEFINED CLR_CMAKE_LINUX_ID) endif(CMAKE_SYSTEM_NAME STREQUAL Linux) if(CMAKE_SYSTEM_NAME STREQUAL Darwin) - set(CLR_CMAKE_PLATFORM_UNIX 1) - set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) - set(CLR_CMAKE_PLATFORM_DARWIN 1) + set(CLR_CMAKE_HOST_UNIX 1) + set(CLR_CMAKE_HOST_UNIX_AMD64 1) + set(CLR_CMAKE_HOST_DARWIN 1) set(CMAKE_ASM_COMPILE_OBJECT "${CMAKE_C_COMPILER} <FLAGS> <DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>") endif(CMAKE_SYSTEM_NAME STREQUAL Darwin) if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) - set(CLR_CMAKE_PLATFORM_UNIX 1) - set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) - set(CLR_CMAKE_PLATFORM_FREEBSD 1) + set(CLR_CMAKE_HOST_UNIX 1) + set(CLR_CMAKE_HOST_UNIX_AMD64 1) + set(CLR_CMAKE_HOST_FREEBSD 1) endif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) if(CMAKE_SYSTEM_NAME STREQUAL OpenBSD) - set(CLR_CMAKE_PLATFORM_UNIX 1) - set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) - set(CLR_CMAKE_PLATFORM_OPENBSD 1) + set(CLR_CMAKE_HOST_UNIX 1) + set(CLR_CMAKE_HOST_UNIX_AMD64 1) + set(CLR_CMAKE_HOST_OPENBSD 1) endif(CMAKE_SYSTEM_NAME STREQUAL OpenBSD) if(CMAKE_SYSTEM_NAME STREQUAL NetBSD) - set(CLR_CMAKE_PLATFORM_UNIX 1) - set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) - set(CLR_CMAKE_PLATFORM_NETBSD 1) + set(CLR_CMAKE_HOST_UNIX 1) + set(CLR_CMAKE_HOST_UNIX_AMD64 1) + set(CLR_CMAKE_HOST_NETBSD 1) endif(CMAKE_SYSTEM_NAME STREQUAL NetBSD) if(CMAKE_SYSTEM_NAME STREQUAL SunOS) - set(CLR_CMAKE_PLATFORM_UNIX 1) + set(CLR_CMAKE_HOST_UNIX 1) EXECUTE_PROCESS( COMMAND isainfo -n OUTPUT_VARIABLE SUNOS_NATIVE_INSTRUCTION_SET ) if(SUNOS_NATIVE_INSTRUCTION_SET MATCHES "amd64") - set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) + set(CLR_CMAKE_HOST_UNIX_AMD64 1) set(CMAKE_SYSTEM_PROCESSOR "amd64") else() clr_unknown_arch() endif() - set(CLR_CMAKE_PLATFORM_SUNOS 1) + set(CLR_CMAKE_HOST_SUNOS 1) endif(CMAKE_SYSTEM_NAME STREQUAL SunOS) -# "configureoptimization.cmake" must be included after CLR_CMAKE_PLATFORM_UNIX has been set. +# "configureoptimization.cmake" must be included after CLR_CMAKE_HOST_UNIX has been set. include(${CMAKE_CURRENT_LIST_DIR}/configureoptimization.cmake) #-------------------------------------------- @@ -139,28 +139,28 @@ include(${CMAKE_CURRENT_LIST_DIR}/configureoptimization.cmake) # - for complete list of such binaries refer to file crosscomponents.cmake #------------------------------------------------------------- # Set HOST architecture variables -if(CLR_CMAKE_PLATFORM_UNIX_ARM) - set(CLR_CMAKE_PLATFORM_ARCH_ARM 1) +if(CLR_CMAKE_HOST_UNIX_ARM) + set(CLR_CMAKE_HOST_ARCH_ARM 1) set(CLR_CMAKE_HOST_ARCH "arm") -elseif(CLR_CMAKE_PLATFORM_UNIX_ARM64) - set(CLR_CMAKE_PLATFORM_ARCH_ARM64 1) +elseif(CLR_CMAKE_HOST_UNIX_ARM64) + set(CLR_CMAKE_HOST_ARCH_ARM64 1) set(CLR_CMAKE_HOST_ARCH "arm64") -elseif(CLR_CMAKE_PLATFORM_UNIX_AMD64) - set(CLR_CMAKE_PLATFORM_ARCH_AMD64 1) +elseif(CLR_CMAKE_HOST_UNIX_AMD64) + set(CLR_CMAKE_HOST_ARCH_AMD64 1) set(CLR_CMAKE_HOST_ARCH "x64") -elseif(CLR_CMAKE_PLATFORM_UNIX_X86) - set(CLR_CMAKE_PLATFORM_ARCH_I386 1) +elseif(CLR_CMAKE_HOST_UNIX_X86) + set(CLR_CMAKE_HOST_ARCH_I386 1) set(CLR_CMAKE_HOST_ARCH "x86") elseif(WIN32) # CLR_CMAKE_HOST_ARCH is passed in as param to cmake if (CLR_CMAKE_HOST_ARCH STREQUAL x64) - set(CLR_CMAKE_PLATFORM_ARCH_AMD64 1) + set(CLR_CMAKE_HOST_ARCH_AMD64 1) elseif(CLR_CMAKE_HOST_ARCH STREQUAL x86) - set(CLR_CMAKE_PLATFORM_ARCH_I386 1) + set(CLR_CMAKE_HOST_ARCH_I386 1) elseif(CLR_CMAKE_HOST_ARCH STREQUAL arm) - set(CLR_CMAKE_PLATFORM_ARCH_ARM 1) + set(CLR_CMAKE_HOST_ARCH_ARM 1) elseif(CLR_CMAKE_HOST_ARCH STREQUAL arm64) - set(CLR_CMAKE_PLATFORM_ARCH_ARM64 1) + set(CLR_CMAKE_HOST_ARCH_ARM64 1) else() clr_unknown_arch() endif() @@ -191,7 +191,7 @@ endif() # check if host & target arch combination are valid if(NOT(CLR_CMAKE_TARGET_ARCH STREQUAL CLR_CMAKE_HOST_ARCH)) - if(NOT((CLR_CMAKE_PLATFORM_ARCH_AMD64 AND CLR_CMAKE_TARGET_ARCH_ARM64) OR (CLR_CMAKE_PLATFORM_ARCH_I386 AND CLR_CMAKE_TARGET_ARCH_ARM) OR (CLR_CMAKE_PLATFORM_ARCH_AMD64 AND CLR_CMAKE_TARGET_ARCH_ARM))) + if(NOT((CLR_CMAKE_HOST_ARCH_AMD64 AND CLR_CMAKE_TARGET_ARCH_ARM64) OR (CLR_CMAKE_HOST_ARCH_I386 AND CLR_CMAKE_TARGET_ARCH_ARM) OR (CLR_CMAKE_HOST_ARCH_AMD64 AND CLR_CMAKE_TARGET_ARCH_ARM))) message(FATAL_ERROR "Invalid host and target arch combination") endif() endif() @@ -202,7 +202,7 @@ endif() if(MSVC) add_compile_options(/Zi /FC /Zc:strictStrings) -elseif (CLR_CMAKE_PLATFORM_UNIX) +elseif (CLR_CMAKE_HOST_UNIX) add_compile_options(-g) add_compile_options(-Wall) if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") @@ -233,9 +233,9 @@ if (MSVC) # set (WINDOWS_SUBSYSTEM_VERSION 6.01) - if (CLR_CMAKE_PLATFORM_ARCH_ARM) + if (CLR_CMAKE_HOST_ARCH_ARM) set(WINDOWS_SUBSYSTEM_VERSION 6.02) #windows subsystem - arm minimum is 6.02 - elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) + elseif(CLR_CMAKE_HOST_ARCH_ARM64) set(WINDOWS_SUBSYSTEM_VERSION 6.03) #windows subsystem - arm64 minimum is 6.03 endif () @@ -283,7 +283,7 @@ if (MSVC) # Force uCRT to be dynamically linked for Release build add_link_options("$<$<CONFIG:RELEASE>:/NODEFAULTLIB:libucrt.lib;/DEFAULTLIB:ucrt.lib>") -elseif (CLR_CMAKE_PLATFORM_UNIX) +elseif (CLR_CMAKE_HOST_UNIX) # Set the values to display when interactively configuring CMAKE_BUILD_TYPE set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "DEBUG;CHECKED;RELEASE;RELWITHDEBINFO") @@ -355,67 +355,67 @@ endif(MSVC) # For example: # ./build-native.sh cmakeargs "-DCLR_ADDITIONAL_COMPILER_OPTIONS=<...>" cmakeargs "-DCLR_ADDITIONAL_LINKER_FLAGS=<...>" # -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) add_link_options(${CLR_ADDITIONAL_LINKER_FLAGS}) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) -if(CLR_CMAKE_PLATFORM_LINUX) +if(CLR_CMAKE_HOST_LINUX) add_compile_options($<$<COMPILE_LANGUAGE:ASM>:-Wa,--noexecstack>) add_link_options(-Wl,--build-id=sha1 -Wl,-z,relro,-z,now) -endif(CLR_CMAKE_PLATFORM_LINUX) -if(CLR_CMAKE_PLATFORM_FREEBSD) +endif(CLR_CMAKE_HOST_LINUX) +if(CLR_CMAKE_HOST_FREEBSD) add_compile_options($<$<COMPILE_LANGUAGE:ASM>:-Wa,--noexecstack>) add_link_options(-fuse-ld=lld LINKER:--build-id=sha1) -endif(CLR_CMAKE_PLATFORM_FREEBSD) +endif(CLR_CMAKE_HOST_FREEBSD) #------------------------------------ # Definitions (for platform) #----------------------------------- -if (CLR_CMAKE_PLATFORM_ARCH_AMD64) +if (CLR_CMAKE_HOST_ARCH_AMD64) add_definitions(-D_AMD64_) add_definitions(-DBIT64) -elseif (CLR_CMAKE_PLATFORM_ARCH_I386) +elseif (CLR_CMAKE_HOST_ARCH_I386) add_definitions(-D_X86_) -elseif (CLR_CMAKE_PLATFORM_ARCH_ARM) +elseif (CLR_CMAKE_HOST_ARCH_ARM) add_definitions(-D_ARM_) -elseif (CLR_CMAKE_PLATFORM_ARCH_ARM64) +elseif (CLR_CMAKE_HOST_ARCH_ARM64) add_definitions(-D_ARM64_) add_definitions(-DBIT64) else () clr_unknown_arch() endif () -if (CLR_CMAKE_PLATFORM_UNIX) - if(CLR_CMAKE_PLATFORM_LINUX) - if(CLR_CMAKE_PLATFORM_UNIX_AMD64) +if (CLR_CMAKE_HOST_UNIX) + if(CLR_CMAKE_HOST_LINUX) + if(CLR_CMAKE_HOST_UNIX_AMD64) message("Detected Linux x86_64") - elseif(CLR_CMAKE_PLATFORM_UNIX_ARM) + elseif(CLR_CMAKE_HOST_UNIX_ARM) message("Detected Linux ARM") - elseif(CLR_CMAKE_PLATFORM_UNIX_ARM64) + elseif(CLR_CMAKE_HOST_UNIX_ARM64) message("Detected Linux ARM64") - elseif(CLR_CMAKE_PLATFORM_UNIX_X86) + elseif(CLR_CMAKE_HOST_UNIX_X86) message("Detected Linux i686") else() clr_unknown_arch() endif() - endif(CLR_CMAKE_PLATFORM_LINUX) -endif(CLR_CMAKE_PLATFORM_UNIX) + endif(CLR_CMAKE_HOST_LINUX) +endif(CLR_CMAKE_HOST_UNIX) -if (CLR_CMAKE_PLATFORM_UNIX) +if (CLR_CMAKE_HOST_UNIX) add_definitions(-DPLATFORM_UNIX) - if(CLR_CMAKE_PLATFORM_DARWIN) + if(CLR_CMAKE_HOST_DARWIN) message("Detected OSX x86_64") - endif(CLR_CMAKE_PLATFORM_DARWIN) + endif(CLR_CMAKE_HOST_DARWIN) - if(CLR_CMAKE_PLATFORM_FREEBSD) + if(CLR_CMAKE_HOST_FREEBSD) message("Detected FreeBSD amd64") - endif(CLR_CMAKE_PLATFORM_FREEBSD) + endif(CLR_CMAKE_HOST_FREEBSD) - if(CLR_CMAKE_PLATFORM_NETBSD) + if(CLR_CMAKE_HOST_NETBSD) message("Detected NetBSD amd64") - endif(CLR_CMAKE_PLATFORM_NETBSD) -endif(CLR_CMAKE_PLATFORM_UNIX) + endif(CLR_CMAKE_HOST_NETBSD) +endif(CLR_CMAKE_HOST_UNIX) if (WIN32) add_definitions(-DPLATFORM_WINDOWS) @@ -442,7 +442,7 @@ endif () #-------------------------------------- # Compile Options #-------------------------------------- -if (CLR_CMAKE_PLATFORM_UNIX) +if (CLR_CMAKE_HOST_UNIX) # Disable frame pointer optimizations so profilers can get better call stacks add_compile_options(-fno-omit-frame-pointer) @@ -455,7 +455,7 @@ if (CLR_CMAKE_PLATFORM_UNIX) # using twos-complement representation (this is normally undefined according to the C++ spec). add_compile_options(-fwrapv) - if(CLR_CMAKE_PLATFORM_DARWIN) + if(CLR_CMAKE_HOST_DARWIN) # We cannot enable "stack-protector-strong" on OS X due to a bug in clang compiler (current version 7.0.2) add_compile_options(-fstack-protector) else() @@ -463,7 +463,7 @@ if (CLR_CMAKE_PLATFORM_UNIX) if (COMPILER_SUPPORTS_F_STACK_PROTECTOR_STRONG) add_compile_options(-fstack-protector-strong) endif() - endif(CLR_CMAKE_PLATFORM_DARWIN) + endif(CLR_CMAKE_HOST_DARWIN) # Contracts are disabled on UNIX. add_definitions(-DDISABLE_CONTRACTS) @@ -523,14 +523,14 @@ if (CLR_CMAKE_PLATFORM_UNIX) add_compile_options(-fvisibility=hidden) # Specify the minimum supported version of macOS - if(CLR_CMAKE_PLATFORM_DARWIN) + if(CLR_CMAKE_HOST_DARWIN) set(MACOS_VERSION_MIN_FLAGS -mmacosx-version-min=10.12) add_compile_options(${MACOS_VERSION_MIN_FLAGS}) add_link_options(${MACOS_VERSION_MIN_FLAGS}) - endif(CLR_CMAKE_PLATFORM_DARWIN) -endif(CLR_CMAKE_PLATFORM_UNIX) + endif(CLR_CMAKE_HOST_DARWIN) +endif(CLR_CMAKE_HOST_UNIX) -if(CLR_CMAKE_PLATFORM_UNIX_ARM) +if(CLR_CMAKE_HOST_UNIX_ARM) if (NOT DEFINED CLR_ARM_FPU_TYPE) set(CLR_ARM_FPU_TYPE vfpv3) endif(NOT DEFINED CLR_ARM_FPU_TYPE) @@ -548,11 +548,11 @@ if(CLR_CMAKE_PLATFORM_UNIX_ARM) add_definitions(-DARM_SOFTFP) add_compile_options(-mfloat-abi=softfp) endif(ARM_SOFTFP) -endif(CLR_CMAKE_PLATFORM_UNIX_ARM) +endif(CLR_CMAKE_HOST_UNIX_ARM) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) add_compile_options(${CLR_ADDITIONAL_COMPILER_OPTIONS}) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) if (MSVC) # Compile options for targeting windows @@ -583,17 +583,17 @@ if (MSVC) add_compile_options(/ZH:SHA_256) # use SHA256 for generating hashes of compiler processed source files. add_compile_options(/source-charset:utf-8) # Force MSVC to compile source as UTF-8. - if (CLR_CMAKE_PLATFORM_ARCH_I386) + if (CLR_CMAKE_HOST_ARCH_I386) add_compile_options(/Gz) - endif (CLR_CMAKE_PLATFORM_ARCH_I386) + endif (CLR_CMAKE_HOST_ARCH_I386) add_compile_options($<$<OR:$<CONFIG:Release>,$<CONFIG:Relwithdebinfo>>:/GL>) add_compile_options($<$<OR:$<OR:$<CONFIG:Release>,$<CONFIG:Relwithdebinfo>>,$<CONFIG:Checked>>:/O1>) - if (CLR_CMAKE_PLATFORM_ARCH_AMD64) + if (CLR_CMAKE_HOST_ARCH_AMD64) # The generator expression in the following command means that the /homeparams option is added only for debug builds add_compile_options($<$<CONFIG:Debug>:/homeparams>) # Force parameters passed in registers to be written to the stack - endif (CLR_CMAKE_PLATFORM_ARCH_AMD64) + endif (CLR_CMAKE_HOST_ARCH_AMD64) # enable control-flow-guard support for native components for non-Arm64 builds # Added using variables instead of add_compile_options to let individual projects override it @@ -621,7 +621,7 @@ endif (MSVC) if(CLR_CMAKE_ENABLE_CODE_COVERAGE) - if(CLR_CMAKE_PLATFORM_UNIX) + if(CLR_CMAKE_HOST_UNIX) string(TOUPPER ${CMAKE_BUILD_TYPE} UPPERCASE_CMAKE_BUILD_TYPE) if(NOT UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG) message( WARNING "Code coverage results with an optimised (non-Debug) build may be misleading" ) @@ -632,10 +632,10 @@ if(CLR_CMAKE_ENABLE_CODE_COVERAGE) add_link_options(--coverage) else() message(FATAL_ERROR "Code coverage builds not supported on current platform") - endif(CLR_CMAKE_PLATFORM_UNIX) + endif(CLR_CMAKE_HOST_UNIX) endif(CLR_CMAKE_ENABLE_CODE_COVERAGE) if (CMAKE_BUILD_TOOL STREQUAL nmake) set(CMAKE_RC_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}") -endif(CMAKE_BUILD_TOOL STREQUAL nmake)
\ No newline at end of file +endif(CMAKE_BUILD_TOOL STREQUAL nmake) diff --git a/src/coreclr/configureoptimization.cmake b/src/coreclr/configureoptimization.cmake index 71a04e7daf8..302788809ea 100644 --- a/src/coreclr/configureoptimization.cmake +++ b/src/coreclr/configureoptimization.cmake @@ -3,7 +3,7 @@ if(WIN32) add_compile_options($<$<CONFIG:Checked>:/O1>) add_compile_options($<$<CONFIG:Release>:/Ox>) add_compile_options($<$<CONFIG:RelWithDebInfo>:/O2>) -elseif(CLR_CMAKE_PLATFORM_UNIX) +elseif(CLR_CMAKE_HOST_UNIX) add_compile_options($<$<CONFIG:Debug>:-O0>) add_compile_options($<$<CONFIG:Checked>:-O2>) add_compile_options($<$<CONFIG:Release>:-O3>) diff --git a/src/coreclr/crosscomponents.cmake b/src/coreclr/crosscomponents.cmake index 80c7dfead02..8bacac00995 100644 --- a/src/coreclr/crosscomponents.cmake +++ b/src/coreclr/crosscomponents.cmake @@ -1,15 +1,15 @@ add_definitions(-DCROSS_COMPILE) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64 AND CLR_CMAKE_TARGET_ARCH_ARM) +if(CLR_CMAKE_HOST_ARCH_AMD64 AND CLR_CMAKE_TARGET_ARCH_ARM) set(FEATURE_CROSSBITNESS 1) -endif(CLR_CMAKE_PLATFORM_ARCH_AMD64 AND CLR_CMAKE_TARGET_ARCH_ARM) +endif(CLR_CMAKE_HOST_ARCH_AMD64 AND CLR_CMAKE_TARGET_ARCH_ARM) set (CLR_CROSS_COMPONENTS_LIST crossgen clrjit ) -if(NOT CLR_CMAKE_PLATFORM_LINUX AND NOT FEATURE_CROSSBITNESS) +if(NOT CLR_CMAKE_HOST_LINUX AND NOT FEATURE_CROSSBITNESS) list (APPEND CLR_CROSS_COMPONENTS_LIST mscordaccore mscordbi diff --git a/src/coreclr/functions.cmake b/src/coreclr/functions.cmake index 3d07f7fc357..f11c56c8283 100644 --- a/src/coreclr/functions.cmake +++ b/src/coreclr/functions.cmake @@ -54,11 +54,11 @@ function(get_include_directories IncludeDirectories) get_directory_property(dirs INCLUDE_DIRECTORIES) foreach(dir IN LISTS dirs) - if (CLR_CMAKE_PLATFORM_ARCH_ARM AND WIN32) + if (CLR_CMAKE_HOST_ARCH_ARM AND WIN32) list(APPEND INC_DIRECTORIES /I${dir}) else() list(APPEND INC_DIRECTORIES -I${dir}) - endif(CLR_CMAKE_PLATFORM_ARCH_ARM AND WIN32) + endif(CLR_CMAKE_HOST_ARCH_ARM AND WIN32) endforeach() set(${IncludeDirectories} ${INC_DIRECTORIES} PARENT_SCOPE) @@ -68,12 +68,12 @@ endfunction(get_include_directories) function(get_include_directories_asm IncludeDirectories) get_directory_property(dirs INCLUDE_DIRECTORIES) - if (CLR_CMAKE_PLATFORM_ARCH_ARM AND WIN32) + if (CLR_CMAKE_HOST_ARCH_ARM AND WIN32) list(APPEND INC_DIRECTORIES "-I ") endif() foreach(dir IN LISTS dirs) - if (CLR_CMAKE_PLATFORM_ARCH_ARM AND WIN32) + if (CLR_CMAKE_HOST_ARCH_ARM AND WIN32) list(APPEND INC_DIRECTORIES ${dir};) else() list(APPEND INC_DIRECTORIES -I${dir}) @@ -251,7 +251,7 @@ function(target_precompile_header) endfunction() function(strip_symbols targetName outputFilename skipStrip) - if (CLR_CMAKE_PLATFORM_UNIX) + if (CLR_CMAKE_HOST_UNIX) if (STRIP_SYMBOLS) set(strip_source_file $<TARGET_FILE:${targetName}>) @@ -286,7 +286,7 @@ function(strip_symbols targetName outputFilename skipStrip) set(${outputFilename} ${strip_destination_file} PARENT_SCOPE) endif (STRIP_SYMBOLS) - endif(CLR_CMAKE_PLATFORM_UNIX) + endif(CLR_CMAKE_HOST_UNIX) endfunction() # install_clr(TARGETS TARGETS targetName [targetName2 ...] [DESTINATION destination] [SKIP_STRIP]) diff --git a/src/coreclr/src/CMakeLists.txt b/src/coreclr/src/CMakeLists.txt index a6dbbd869ec..9babcfdf958 100644 --- a/src/coreclr/src/CMakeLists.txt +++ b/src/coreclr/src/CMakeLists.txt @@ -14,10 +14,10 @@ if(WIN32 AND FEATURE_EVENT_TRACE) endif(WIN32 AND FEATURE_EVENT_TRACE) -if(CLR_CMAKE_PLATFORM_UNIX) - if(CLR_CMAKE_PLATFORM_LINUX AND NOT CLR_CMAKE_PLATFORM_UNIX_X86) +if(CLR_CMAKE_HOST_UNIX) + if(CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_UNIX_X86) add_subdirectory(debug/createdump) - endif(CLR_CMAKE_PLATFORM_LINUX AND NOT CLR_CMAKE_PLATFORM_UNIX_X86) + endif(CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_UNIX_X86) # Include the dummy c++ include files include_directories("pal/inc/rt/cpp") @@ -56,7 +56,7 @@ if(CLR_CMAKE_PLATFORM_UNIX) endfunction() add_subdirectory(nativeresources) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) add_subdirectory(utilcode) add_subdirectory(gcinfo) @@ -74,8 +74,8 @@ add_subdirectory(unwinder) add_subdirectory(ildasm) add_subdirectory(ilasm) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) add_subdirectory(palrt) elseif(WIN32) add_subdirectory(hosts) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) diff --git a/src/coreclr/src/ToolBox/superpmi/mcs/CMakeLists.txt b/src/coreclr/src/ToolBox/superpmi/mcs/CMakeLists.txt index 5a6a0e3515a..158bef6b348 100644 --- a/src/coreclr/src/ToolBox/superpmi/mcs/CMakeLists.txt +++ b/src/coreclr/src/ToolBox/superpmi/mcs/CMakeLists.txt @@ -48,7 +48,7 @@ _add_executable(mcs ) target_precompile_header(TARGET mcs HEADER standardpch.h) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) target_link_libraries(mcs utilcodestaticnohost mscorrc_debug @@ -63,6 +63,6 @@ else() ) _install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/mcs.pdb DESTINATION PDB) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) _install (TARGETS mcs DESTINATION .) diff --git a/src/coreclr/src/ToolBox/superpmi/superpmi-shim-collector/CMakeLists.txt b/src/coreclr/src/ToolBox/superpmi/superpmi-shim-collector/CMakeLists.txt index 5faf3be4cdb..e252b2bc3af 100644 --- a/src/coreclr/src/ToolBox/superpmi/superpmi-shim-collector/CMakeLists.txt +++ b/src/coreclr/src/ToolBox/superpmi/superpmi-shim-collector/CMakeLists.txt @@ -48,7 +48,7 @@ _add_library(superpmi-shim-collector target_precompile_header(TARGET superpmi-shim-collector HEADER standardpch.h) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) target_link_libraries(superpmi-shim-collector utilcodestaticnohost mscorrc_debug @@ -63,6 +63,6 @@ else() ) _install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/superpmi-shim-collector.pdb DESTINATION PDB) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) _install (TARGETS superpmi-shim-collector DESTINATION .) diff --git a/src/coreclr/src/ToolBox/superpmi/superpmi-shim-counter/CMakeLists.txt b/src/coreclr/src/ToolBox/superpmi/superpmi-shim-counter/CMakeLists.txt index 2c0a27cc125..9e087a62fee 100644 --- a/src/coreclr/src/ToolBox/superpmi/superpmi-shim-counter/CMakeLists.txt +++ b/src/coreclr/src/ToolBox/superpmi/superpmi-shim-counter/CMakeLists.txt @@ -50,7 +50,7 @@ _add_library(superpmi-shim-counter target_precompile_header(TARGET superpmi-shim-counter HEADER standardpch.h) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) target_link_libraries(superpmi-shim-counter utilcodestaticnohost mscorrc_debug @@ -65,6 +65,6 @@ else() ) _install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/superpmi-shim-counter.pdb DESTINATION PDB) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) _install (TARGETS superpmi-shim-counter DESTINATION .) diff --git a/src/coreclr/src/ToolBox/superpmi/superpmi-shim-simple/CMakeLists.txt b/src/coreclr/src/ToolBox/superpmi/superpmi-shim-simple/CMakeLists.txt index f97d57f42e9..f53b41e126e 100644 --- a/src/coreclr/src/ToolBox/superpmi/superpmi-shim-simple/CMakeLists.txt +++ b/src/coreclr/src/ToolBox/superpmi/superpmi-shim-simple/CMakeLists.txt @@ -49,7 +49,7 @@ _add_library(superpmi-shim-simple target_precompile_header(TARGET superpmi-shim-simple HEADER standardpch.h) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) target_link_libraries(superpmi-shim-simple utilcodestaticnohost mscorrc_debug @@ -64,6 +64,6 @@ else() ) _install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/superpmi-shim-simple.pdb DESTINATION PDB) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) _install (TARGETS superpmi-shim-simple DESTINATION .) diff --git a/src/coreclr/src/ToolBox/superpmi/superpmi/CMakeLists.txt b/src/coreclr/src/ToolBox/superpmi/superpmi/CMakeLists.txt index 956760879ea..e98e74a7518 100644 --- a/src/coreclr/src/ToolBox/superpmi/superpmi/CMakeLists.txt +++ b/src/coreclr/src/ToolBox/superpmi/superpmi/CMakeLists.txt @@ -49,7 +49,7 @@ _add_executable(superpmi target_precompile_header(TARGET superpmi HEADER standardpch.h) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) target_link_libraries(superpmi utilcodestaticnohost mscorrc_debug @@ -65,6 +65,6 @@ else() ) _install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/superpmi.pdb DESTINATION PDB) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) _install (TARGETS superpmi DESTINATION .) diff --git a/src/coreclr/src/debug/createdump/CMakeLists.txt b/src/coreclr/src/debug/createdump/CMakeLists.txt index eea3e123d68..16f79702aab 100644 --- a/src/coreclr/src/debug/createdump/CMakeLists.txt +++ b/src/coreclr/src/debug/createdump/CMakeLists.txt @@ -6,11 +6,11 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) # For more information: http://www.cmake.org/Wiki/CMake_RPATH_handling. if (CORECLR_SET_RPATH) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) - if(CLR_CMAKE_PLATFORM_DARWIN) + if(CLR_CMAKE_HOST_DARWIN) set(CMAKE_INSTALL_RPATH "@loader_path") else() set(CMAKE_INSTALL_RPATH "\$ORIGIN") - endif(CLR_CMAKE_PLATFORM_DARWIN) + endif(CLR_CMAKE_HOST_DARWIN) endif (CORECLR_SET_RPATH) remove_definitions(-DUNICODE) diff --git a/src/coreclr/src/debug/daccess/CMakeLists.txt b/src/coreclr/src/debug/daccess/CMakeLists.txt index bad942e86fa..dcd6fa1fdd8 100644 --- a/src/coreclr/src/debug/daccess/CMakeLists.txt +++ b/src/coreclr/src/debug/daccess/CMakeLists.txt @@ -6,9 +6,9 @@ include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CLR_DIR}/src/debug/ee) include_directories(${CLR_DIR}/src/gcdump) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) include_directories(${GENERATED_INCLUDE_DIR}) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) set(DACCESS_SOURCES dacdbiimpl.cpp @@ -41,7 +41,7 @@ target_precompile_header(TARGET daccess HEADER stdafx.h) add_dependencies(daccess eventing_headers) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) add_custom_command( OUTPUT ${GENERATED_INCLUDE_DIR}/dactablerva.h DEPENDS coreclr @@ -61,4 +61,4 @@ if(CLR_CMAKE_PLATFORM_UNIX) ) add_dependencies(daccess dactablerva_header) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) diff --git a/src/coreclr/src/debug/debug-pal/CMakeLists.txt b/src/coreclr/src/debug/debug-pal/CMakeLists.txt index cea36b76442..0208b6b028e 100644 --- a/src/coreclr/src/debug/debug-pal/CMakeLists.txt +++ b/src/coreclr/src/debug/debug-pal/CMakeLists.txt @@ -15,7 +15,7 @@ if(WIN32) ) endif(WIN32) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) add_definitions(-DFEATURE_PAL) add_definitions(-DPAL_IMPLEMENTATION) @@ -27,6 +27,6 @@ if(CLR_CMAKE_PLATFORM_UNIX) unix/processdescriptor.cpp ) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) _add_library(debug-pal STATIC ${TWO_WAY_PIPE_SOURCES}) diff --git a/src/coreclr/src/debug/di/CMakeLists.txt b/src/coreclr/src/debug/di/CMakeLists.txt index 7f0ca8b042f..08d1d2ee008 100644 --- a/src/coreclr/src/debug/di/CMakeLists.txt +++ b/src/coreclr/src/debug/di/CMakeLists.txt @@ -61,7 +61,7 @@ if(WIN32) convert_to_absolute_path(CORDBDI_SOURCES_ASM_FILE ${CORDBDI_SOURCES_ASM_FILE}) preprocess_compile_asm(ASM_FILES ${CORDBDI_SOURCES_ASM_FILE} OUTPUT_OBJECTS CORDBDI_SOURCES_ASM_FILE) endif() -elseif(CLR_CMAKE_PLATFORM_UNIX) +elseif(CLR_CMAKE_HOST_UNIX) if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_ARM64 OR CLR_CMAKE_TARGET_ARCH_ARM) set(CORDBDI_SOURCES_ASM_FILE diff --git a/src/coreclr/src/debug/ee/CMakeLists.txt b/src/coreclr/src/debug/ee/CMakeLists.txt index 383ab24cfbd..a593c3ad2ba 100644 --- a/src/coreclr/src/debug/ee/CMakeLists.txt +++ b/src/coreclr/src/debug/ee/CMakeLists.txt @@ -45,11 +45,11 @@ set(CORDBEE_HEADERS_DAC ${CORDBEE_HEADERS_DAC_AND_WKS} ) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) list(APPEND CORDBEE_SOURCES_WKS dactable.cpp ) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) if(CLR_CMAKE_TARGET_ARCH_AMD64) list(APPEND CORDBEE_SOURCES_WKS diff --git a/src/coreclr/src/debug/ee/wks/CMakeLists.txt b/src/coreclr/src/debug/ee/wks/CMakeLists.txt index 05156420e4e..a5ba2490aa5 100644 --- a/src/coreclr/src/debug/ee/wks/CMakeLists.txt +++ b/src/coreclr/src/debug/ee/wks/CMakeLists.txt @@ -7,7 +7,7 @@ if (WIN32) set(ASM_FILE ${CORDBEE_DIR}/${ARCH_SOURCES_DIR}/dbghelpers.asm) - if(CLR_CMAKE_PLATFORM_ARCH_ARM OR CLR_CMAKE_PLATFORM_ARCH_ARM64) + if(CLR_CMAKE_HOST_ARCH_ARM OR CLR_CMAKE_HOST_ARCH_ARM64) preprocess_compile_asm(ASM_FILES ${ASM_FILE} OUTPUT_OBJECTS ASM_OBJECTS) @@ -17,9 +17,9 @@ if (WIN32) set(ASM_OPTIONS /c /Zi /W3 /errorReport:prompt) - if (CLR_CMAKE_PLATFORM_ARCH_I386) + if (CLR_CMAKE_HOST_ARCH_I386) list (APPEND ASM_OPTIONS /safeseh) - endif (CLR_CMAKE_PLATFORM_ARCH_I386) + endif (CLR_CMAKE_HOST_ARCH_I386) set_source_files_properties(${ASM_FILE} PROPERTIES COMPILE_OPTIONS "${ASM_OPTIONS}") @@ -29,7 +29,7 @@ if (WIN32) else () - if(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_ARM OR CLR_CMAKE_PLATFORM_ARCH_ARM64 OR CLR_CMAKE_PLATFORM_ARCH_I386) + if(CLR_CMAKE_HOST_ARCH_AMD64 OR CLR_CMAKE_HOST_ARCH_ARM OR CLR_CMAKE_HOST_ARCH_ARM64 OR CLR_CMAKE_HOST_ARCH_I386) add_library_clr(cordbee_wks ${CORDBEE_SOURCES_WKS} ../${ARCH_SOURCES_DIR}/dbghelpers.S) else() message(FATAL_ERROR "Unknown platform") diff --git a/src/coreclr/src/dlls/dbgshim/CMakeLists.txt b/src/coreclr/src/dlls/dbgshim/CMakeLists.txt index 3e9b088a852..aba60bd0757 100644 --- a/src/coreclr/src/dlls/dbgshim/CMakeLists.txt +++ b/src/coreclr/src/dlls/dbgshim/CMakeLists.txt @@ -24,29 +24,29 @@ else(WIN32) generate_exports_file(${DEF_SOURCES} ${EXPORTS_FILE}) endif(WIN32) -if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD OR CLR_CMAKE_PLATFORM_NETBSD) +if(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) # This option is necessary to ensure that the overloaded delete operator defined inside # of the utilcode will be used instead of the standard library delete operator. set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Xlinker -Bsymbolic-functions") # Add linker exports file option set(EXPORTS_LINKER_OPTION -Wl,--version-script=${EXPORTS_FILE}) -endif(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD OR CLR_CMAKE_PLATFORM_NETBSD) +endif(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) -if(CLR_CMAKE_PLATFORM_DARWIN) +if(CLR_CMAKE_HOST_DARWIN) # Add linker exports file option set(EXPORTS_LINKER_OPTION -Wl,-exported_symbols_list,${EXPORTS_FILE}) -endif(CLR_CMAKE_PLATFORM_DARWIN) +endif(CLR_CMAKE_HOST_DARWIN) add_library_clr(dbgshim SHARED ${DBGSHIM_SOURCES}) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) add_custom_target(dbgshim_exports DEPENDS ${EXPORTS_FILE}) add_dependencies(dbgshim dbgshim_exports) set_property(TARGET dbgshim APPEND_STRING PROPERTY LINK_FLAGS ${EXPORTS_LINKER_OPTION}) set_property(TARGET dbgshim APPEND_STRING PROPERTY LINK_DEPENDS ${EXPORTS_FILE}) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) set(DBGSHIM_LIBRARIES debug-pal diff --git a/src/coreclr/src/dlls/mscordac/CMakeLists.txt b/src/coreclr/src/dlls/mscordac/CMakeLists.txt index 348b663c8d1..b663e29bb7e 100644 --- a/src/coreclr/src/dlls/mscordac/CMakeLists.txt +++ b/src/coreclr/src/dlls/mscordac/CMakeLists.txt @@ -31,18 +31,18 @@ else(WIN32) # Add dependency on export file add_custom_target(mscordaccore_exports DEPENDS ${EXPORTS_FILE}) - if(CLR_CMAKE_PLATFORM_DARWIN OR CLR_CMAKE_PLATFORM_FREEBSD OR CLR_CMAKE_PLATFORM_NETBSD) + if(CLR_CMAKE_HOST_DARWIN OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) generate_exports_file(${DEF_SOURCES} ${EXPORTS_FILE}) - endif(CLR_CMAKE_PLATFORM_DARWIN OR CLR_CMAKE_PLATFORM_FREEBSD OR CLR_CMAKE_PLATFORM_NETBSD) + endif(CLR_CMAKE_HOST_DARWIN OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) - if(CLR_CMAKE_PLATFORM_LINUX) + if(CLR_CMAKE_HOST_LINUX) # Generate DAC export file with the DAC_ prefix generate_exports_file_prefix(${DEF_SOURCES} ${EXPORTS_FILE} DAC_) set(REDEFINES_FILE_AWK_SCRIPT ${CMAKE_SOURCE_DIR}/generateredefinesfile.awk) - if (CLR_CMAKE_PLATFORM_ARCH_ARM OR CLR_CMAKE_PLATFORM_ARCH_ARM64) + if (CLR_CMAKE_HOST_ARCH_ARM OR CLR_CMAKE_HOST_ARCH_ARM64) set(JUMP_INSTRUCTION b) else() set(JUMP_INSTRUCTION jmp) @@ -70,10 +70,10 @@ else(WIN32) # Add lib redefines file to DAC list(APPEND CLR_DAC_SOURCES libredefines.S) - endif(CLR_CMAKE_PLATFORM_LINUX) + endif(CLR_CMAKE_HOST_LINUX) endif(WIN32) -if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD OR CLR_CMAKE_PLATFORM_NETBSD) +if(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) # This option is necessary to ensure that the overloaded delete operator defined inside # of the utilcode will be used instead of the standard library delete operator. set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Xlinker -Bsymbolic-functions") @@ -89,12 +89,12 @@ if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD OR CLR_CMAKE_PLATFORM_ # Add linker exports file option set(EXPORTS_LINKER_OPTION -Wl,--version-script=${EXPORTS_FILE}) -endif(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD OR CLR_CMAKE_PLATFORM_NETBSD) +endif(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) -if(CLR_CMAKE_PLATFORM_DARWIN) +if(CLR_CMAKE_HOST_DARWIN) # Add linker exports file option set(EXPORTS_LINKER_OPTION -Wl,-exported_symbols_list,${EXPORTS_FILE}) -endif(CLR_CMAKE_PLATFORM_DARWIN) +endif(CLR_CMAKE_HOST_DARWIN) # Create object library to enable creation of proper dependency of mscordaccore.exp on mscordac.obj and # mscordaccore on both the mscordaccore.exp and mscordac.obj. @@ -104,15 +104,15 @@ add_library_clr(mscordaccore SHARED ${CLR_DAC_SOURCES} $<TARGET_OBJECTS:mscordac set_target_properties(mscordacobj mscordaccore PROPERTIES DAC_COMPONENT TRUE) -if(CLR_CMAKE_PLATFORM_LINUX) +if(CLR_CMAKE_HOST_LINUX) add_dependencies(mscordaccore lib_redefines_inc) -endif(CLR_CMAKE_PLATFORM_LINUX) +endif(CLR_CMAKE_HOST_LINUX) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) add_dependencies(mscordaccore mscordaccore_exports) set_property(TARGET mscordaccore APPEND_STRING PROPERTY LINK_FLAGS ${EXPORTS_LINKER_OPTION}) set_property(TARGET mscordaccore APPEND_STRING PROPERTY LINK_DEPENDS ${EXPORTS_FILE}) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) # IMPORTANT! Please do not rearrange the order of the libraries. The linker on Linux is # order dependent and changing the order can result in undefined symbols in the shared @@ -188,7 +188,7 @@ install_clr(TARGETS mscordaccore DESTINATION sharedFramework SKIP_STRIP) if(WIN32) set(LONG_NAME_HOST_ARCH ${CLR_CMAKE_HOST_ARCH}) set(LONG_NAME_TARGET_ARCH ${CLR_CMAKE_TARGET_ARCH}) - if (CLR_CMAKE_PLATFORM_ARCH_AMD64) + if (CLR_CMAKE_HOST_ARCH_AMD64) set(LONG_NAME_HOST_ARCH "amd64") set(LONG_NAME_TARGET_ARCH "amd64") endif() diff --git a/src/coreclr/src/dlls/mscordbi/CMakeLists.txt b/src/coreclr/src/dlls/mscordbi/CMakeLists.txt index ad9460723f3..613e526972e 100644 --- a/src/coreclr/src/dlls/mscordbi/CMakeLists.txt +++ b/src/coreclr/src/dlls/mscordbi/CMakeLists.txt @@ -3,11 +3,11 @@ # For more information: http://www.cmake.org/Wiki/CMake_RPATH_handling. if(CORECLR_SET_RPATH) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) - if(CLR_CMAKE_PLATFORM_DARWIN) + if(CLR_CMAKE_HOST_DARWIN) set(CMAKE_INSTALL_RPATH "@loader_path") else() set(CMAKE_INSTALL_RPATH "\$ORIGIN") - endif(CLR_CMAKE_PLATFORM_DARWIN) + endif(CLR_CMAKE_HOST_DARWIN) endif(CORECLR_SET_RPATH) set(MSCORDBI_SOURCES @@ -15,9 +15,9 @@ set(MSCORDBI_SOURCES ) # Add the DAC PAL export mapping file -if(CLR_CMAKE_PLATFORM_LINUX) +if(CLR_CMAKE_HOST_LINUX) list(APPEND MSCORDBI_SOURCES ${PAL_REDEFINES_FILE}) -endif(CLR_CMAKE_PLATFORM_LINUX) +endif(CLR_CMAKE_HOST_LINUX) if(WIN32) add_definitions(-DFX_VER_INTERNALNAME_STR=mscordbi.dll) @@ -41,30 +41,30 @@ else(WIN32) generate_exports_file(${DEF_SOURCES} ${EXPORTS_FILE}) endif(WIN32) -if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD OR CLR_CMAKE_PLATFORM_NETBSD) +if(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) # This option is necessary to ensure that the overloaded new/delete operators defined inside # of the utilcode will be used instead of the standard library delete operator. set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Xlinker -Bsymbolic-functions") # Add linker exports file option set(EXPORTS_LINKER_OPTION -Wl,--version-script=${EXPORTS_FILE}) -endif(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD OR CLR_CMAKE_PLATFORM_NETBSD) +endif(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) -if(CLR_CMAKE_PLATFORM_DARWIN) +if(CLR_CMAKE_HOST_DARWIN) # Add linker exports file option set(EXPORTS_LINKER_OPTION -Wl,-exported_symbols_list,${EXPORTS_FILE}) -endif(CLR_CMAKE_PLATFORM_DARWIN) +endif(CLR_CMAKE_HOST_DARWIN) add_library_clr(mscordbi SHARED ${MSCORDBI_SOURCES}) target_precompile_header(TARGET mscordbi HEADER stdafx.h) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) add_custom_target(mscordbi_exports DEPENDS ${EXPORTS_FILE}) add_dependencies(mscordbi mscordbi_exports) set_property(TARGET mscordbi APPEND_STRING PROPERTY LINK_FLAGS ${EXPORTS_LINKER_OPTION}) set_property(TARGET mscordbi APPEND_STRING PROPERTY LINK_DEPENDS ${EXPORTS_FILE}) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) set(COREDBI_LIBRARIES debug-pal @@ -95,7 +95,7 @@ if(WIN32) target_link_libraries(mscordbi ${COREDBI_LIBRARIES}) -elseif(CLR_CMAKE_PLATFORM_UNIX) +elseif(CLR_CMAKE_HOST_UNIX) list(APPEND COREDBI_LIBRARIES mdhotdata_full @@ -111,9 +111,9 @@ elseif(CLR_CMAKE_PLATFORM_UNIX) add_dependencies(mscordbi mscordaccore) - if(CLR_CMAKE_PLATFORM_LINUX) + if(CLR_CMAKE_HOST_LINUX) add_dependencies(mscordbi pal_redefines_file) - endif(CLR_CMAKE_PLATFORM_LINUX) + endif(CLR_CMAKE_HOST_LINUX) endif(WIN32) diff --git a/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt b/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt index dc47ac521f9..82348133f60 100644 --- a/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt +++ b/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt @@ -66,9 +66,9 @@ add_dependencies(coreclr coreclr_exports) set_property(TARGET coreclr APPEND_STRING PROPERTY LINK_FLAGS ${EXPORTS_LINKER_OPTION}) set_property(TARGET coreclr APPEND_STRING PROPERTY LINK_DEPENDS ${EXPORTS_FILE}) -if (CLR_CMAKE_PLATFORM_UNIX) +if (CLR_CMAKE_HOST_UNIX) set(LIB_UNWINDER unwinder_wks) -endif (CLR_CMAKE_PLATFORM_UNIX) +endif (CLR_CMAKE_HOST_UNIX) if(FEATURE_MERGE_JIT_AND_ENGINE) set(CLRJIT_STATIC clrjit_static) @@ -141,11 +141,11 @@ if(FEATURE_PERFTRACING) endif(FEATURE_PERFTRACING) if(FEATURE_EVENT_TRACE) - if(CLR_CMAKE_PLATFORM_UNIX) + if(CLR_CMAKE_HOST_UNIX) list(APPEND CORECLR_LIBRARIES eventprovider # On Windows this library contains only macros ) - endif(CLR_CMAKE_PLATFORM_UNIX) + endif(CLR_CMAKE_HOST_UNIX) endif(FEATURE_EVENT_TRACE) target_link_libraries(coreclr ${CORECLR_LIBRARIES}) @@ -161,13 +161,13 @@ if(WIN32) list(APPEND INC_DIR -I${CLR_DIR}/src/vm -I${CLR_DIR}/src/vm/${ARCH_SOURCES_DIR} -I${CLR_DIR}/src/debug/ee -I${CLR_DIR}/src/gc) list(APPEND PREPROCESS_DEFINITIONS -DDACCESS_COMPILE -DDBG_TARGET_64BIT) - if (CLR_CMAKE_PLATFORM_ARCH_AMD64) + if (CLR_CMAKE_HOST_ARCH_AMD64) list(APPEND PREPROCESS_DEFINITIONS -DDBG_TARGET_AMD64) - elseif (CLR_CMAKE_PLATFORM_ARCH_ARM64) + elseif (CLR_CMAKE_HOST_ARCH_ARM64) list(APPEND PREPROCESS_DEFINITIONS -DDBG_TARGET_ARM64) - elseif (CLR_CMAKE_PLATFORM_ARCH_ARM) + elseif (CLR_CMAKE_HOST_ARCH_ARM) list(APPEND PREPROCESS_DEFINITIONS -DDBG_TARGET_ARM) - elseif (CLR_CMAKE_PLATFORM_ARCH_I386) + elseif (CLR_CMAKE_HOST_ARCH_I386) list(APPEND PREPROCESS_DEFINITIONS -DDBG_TARGET_X86) else() clr_unknown_arch() diff --git a/src/coreclr/src/gc/CMakeLists.txt b/src/coreclr/src/gc/CMakeLists.txt index 14bcea0d16e..9735808084c 100644 --- a/src/coreclr/src/gc/CMakeLists.txt +++ b/src/coreclr/src/gc/CMakeLists.txt @@ -26,7 +26,7 @@ set( GC_SOURCES gcload.cpp handletablecache.cpp) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) include(unix/configure.cmake) set ( GC_SOURCES ${GC_SOURCES} @@ -37,7 +37,7 @@ else() set ( GC_SOURCES ${GC_SOURCES} windows/gcenv.windows.cpp) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) if (WIN32) set(GC_HEADERS @@ -96,18 +96,18 @@ add_dependencies(clrgc eventing_headers) target_link_libraries(clrgc ${GC_LINK_LIBRARIES}) install_clr(TARGETS clrgc) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) # dprintf causes many warnings (https://github.com/dotnet/coreclr/issues/13367) add_compile_options(-Wno-format) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) add_definitions(-DBUILD_AS_STANDALONE) -if(CLR_CMAKE_PLATFORM_DARWIN) +if(CLR_CMAKE_HOST_DARWIN) # The implementation of GCToOSInterface on MacOS makes use of non-POSIX # pthreads APIs, which by default are not included in the pthreads header # unless we define this macro. add_definitions(-D_DARWIN_C_SOURCE) -endif(CLR_CMAKE_PLATFORM_DARWIN) +endif(CLR_CMAKE_HOST_DARWIN) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/env) diff --git a/src/coreclr/src/gcinfo/CMakeLists.txt b/src/coreclr/src/gcinfo/CMakeLists.txt index 970b1a91218..e206558121b 100644 --- a/src/coreclr/src/gcinfo/CMakeLists.txt +++ b/src/coreclr/src/gcinfo/CMakeLists.txt @@ -29,17 +29,17 @@ add_library_clr(gcinfo_crossgen set_target_properties(gcinfo_crossgen PROPERTIES CROSSGEN_COMPONENT TRUE) -if (CLR_CMAKE_PLATFORM_ARCH_I386) +if (CLR_CMAKE_HOST_ARCH_I386) # On x86, build RyuJIT/ARM32 cross-compiling altjit. add_subdirectory(gcinfo_arm) endif () -if (CLR_CMAKE_PLATFORM_ARCH_I386 AND WIN32) +if (CLR_CMAKE_HOST_ARCH_I386 AND WIN32) # On x86, build Linux x86 cross-compiling altjit. add_subdirectory(gcinfo_linuxx86) endif () -if (CLR_CMAKE_PLATFORM_ARCH_AMD64) +if (CLR_CMAKE_HOST_ARCH_AMD64) # On amd64, build RyuJIT/ARM64 cross-compiling altjit. add_subdirectory(gcinfo_arm64) endif () diff --git a/src/coreclr/src/hosts/CMakeLists.txt b/src/coreclr/src/hosts/CMakeLists.txt index c27ba16c565..0788469fe5d 100644 --- a/src/coreclr/src/hosts/CMakeLists.txt +++ b/src/coreclr/src/hosts/CMakeLists.txt @@ -8,7 +8,7 @@ else(WIN32) add_subdirectory(unixcoreruncommon) add_subdirectory(unixcorerun) add_subdirectory(unixcoreconsole) - if(CLR_CMAKE_PLATFORM_DARWIN) + if(CLR_CMAKE_HOST_DARWIN) add_subdirectory(osxbundlerun) - endif(CLR_CMAKE_PLATFORM_DARWIN) + endif(CLR_CMAKE_HOST_DARWIN) endif(WIN32) diff --git a/src/coreclr/src/hosts/coreconsole/CMakeLists.txt b/src/coreclr/src/hosts/coreconsole/CMakeLists.txt index 092d8e31f2c..5d8aa8c742c 100644 --- a/src/coreclr/src/hosts/coreconsole/CMakeLists.txt +++ b/src/coreclr/src/hosts/coreconsole/CMakeLists.txt @@ -7,7 +7,7 @@ set(CoreConsole_RESOURCES native.rc) add_definitions(-DFX_VER_INTERNALNAME_STR=CoreConsole.exe) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) # This does not compile on Linux yet if(CAN_BE_COMPILED_ON_LINUX) _add_executable(CoreConsole @@ -30,4 +30,4 @@ else() # Can't compile on linux yet so only add for windows install_clr(TARGETS CoreConsole) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) diff --git a/src/coreclr/src/hosts/corerun/CMakeLists.txt b/src/coreclr/src/hosts/corerun/CMakeLists.txt index e18030219f8..d8fb5ff6f27 100644 --- a/src/coreclr/src/hosts/corerun/CMakeLists.txt +++ b/src/coreclr/src/hosts/corerun/CMakeLists.txt @@ -7,7 +7,7 @@ set(CoreRun_RESOURCES native.rc) add_definitions(-DFX_VER_INTERNALNAME_STR=CoreRun.exe) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) # This does not compile on Linux yet if(CAN_BE_COMPILED_ON_LINUX) _add_executable(CoreRun @@ -35,4 +35,4 @@ else() # Can't compile on linux yet so only add for windows install_clr(TARGETS CoreRun) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) diff --git a/src/coreclr/src/hosts/unixcoreconsole/CMakeLists.txt b/src/coreclr/src/hosts/unixcoreconsole/CMakeLists.txt index 23546c606e8..d2f2c2ebb50 100644 --- a/src/coreclr/src/hosts/unixcoreconsole/CMakeLists.txt +++ b/src/coreclr/src/hosts/unixcoreconsole/CMakeLists.txt @@ -23,7 +23,7 @@ target_link_libraries(coreconsole unixcoreruncommon ) -if(NOT CLR_CMAKE_PLATFORM_ANDROID) +if(NOT CLR_CMAKE_HOST_ANDROID) target_link_libraries(coreconsole pthread ) diff --git a/src/coreclr/src/hosts/unixcorerun/CMakeLists.txt b/src/coreclr/src/hosts/unixcorerun/CMakeLists.txt index eff7a9aa76a..ed253da29ba 100644 --- a/src/coreclr/src/hosts/unixcorerun/CMakeLists.txt +++ b/src/coreclr/src/hosts/unixcorerun/CMakeLists.txt @@ -24,7 +24,7 @@ target_link_libraries(corerun ) # Android implements pthread natively -if(NOT CLR_CMAKE_PLATFORM_ANDROID) +if(NOT CLR_CMAKE_HOST_ANDROID) target_link_libraries(corerun pthread ) diff --git a/src/coreclr/src/hosts/unixcoreruncommon/CMakeLists.txt b/src/coreclr/src/hosts/unixcoreruncommon/CMakeLists.txt index c859b0a3127..7e6930f6eeb 100644 --- a/src/coreclr/src/hosts/unixcoreruncommon/CMakeLists.txt +++ b/src/coreclr/src/hosts/unixcoreruncommon/CMakeLists.txt @@ -9,6 +9,6 @@ _add_library(unixcoreruncommon coreruncommon.cpp ) -if(CLR_CMAKE_PLATFORM_LINUX) +if(CLR_CMAKE_HOST_LINUX) target_link_libraries(unixcoreruncommon dl) -endif(CLR_CMAKE_PLATFORM_LINUX) +endif(CLR_CMAKE_HOST_LINUX) diff --git a/src/coreclr/src/ilasm/CMakeLists.txt b/src/coreclr/src/ilasm/CMakeLists.txt index 5c56d1269cf..7122988f06e 100644 --- a/src/coreclr/src/ilasm/CMakeLists.txt +++ b/src/coreclr/src/ilasm/CMakeLists.txt @@ -42,7 +42,7 @@ if(WIN32) endif(WIN32) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) # Need generate a right form of asmparse.cpp to avoid the following options. # Clang also produces a bad-codegen on this prebuilt file with optimization. # https://github.com/dotnet/coreclr/issues/2305 @@ -50,9 +50,9 @@ if(CLR_CMAKE_PLATFORM_UNIX) add_compile_options(-Wno-array-bounds) add_compile_options(-Wno-unused-label) set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" ) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) -if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD OR CLR_CMAKE_PLATFORM_NETBSD) +if(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) # This option is necessary to ensure that the overloaded delete operator defined inside # of the utilcode will be used instead of the standard library delete operator. set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Xlinker -Bsymbolic-functions") @@ -61,7 +61,7 @@ if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD OR CLR_CMAKE_PLATFORM_ # ensure proper resolving of circular references between a subset of the libraries. set(START_LIBRARY_GROUP -Wl,--start-group) set(END_LIBRARY_GROUP -Wl,--end-group) -endif(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD OR CLR_CMAKE_PLATFORM_NETBSD) +endif(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) _add_executable(ilasm @@ -108,7 +108,7 @@ else() endif(WIN32) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) target_link_libraries(ilasm ${ILASM_LINK_LIBRARIES} utilcodestaticnohost @@ -130,6 +130,6 @@ else() oleaut32 shell32 ) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) install_clr(TARGETS ilasm) diff --git a/src/coreclr/src/ildasm/exe/CMakeLists.txt b/src/coreclr/src/ildasm/exe/CMakeLists.txt index c2bdc7417f6..c69e970975f 100644 --- a/src/coreclr/src/ildasm/exe/CMakeLists.txt +++ b/src/coreclr/src/ildasm/exe/CMakeLists.txt @@ -9,7 +9,7 @@ add_definitions(-DFEATURE_CORECLR) include_directories(..) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) build_resources(${CMAKE_CURRENT_SOURCE_DIR}/../dasm.rc dasm_rc TARGET_CPP_FILE) set(ILDASM_RESOURCES @@ -18,7 +18,7 @@ if(CLR_CMAKE_PLATFORM_UNIX) else() set(ILDASM_RESOURCES ../dasm.rc) add_definitions(-DFX_VER_INTERNALNAME_STR=ildasm.exe) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) set(ILDASM_SOURCES ../ceeload.cpp @@ -47,7 +47,7 @@ if (WIN32) list(APPEND ILDASM_SOURCES ${ILDASM_HEADERS}) endif(WIN32) -if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD OR CLR_CMAKE_PLATFORM_NETBSD) +if(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) # This option is necessary to ensure that the overloaded delete operator defined inside # of the utilcode will be used instead of the standard library delete operator. set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Xlinker -Bsymbolic-functions") @@ -56,7 +56,7 @@ if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD OR CLR_CMAKE_PLATFORM_ # ensure proper resolving of circular references between a subset of the libraries. set(START_LIBRARY_GROUP -Wl,--start-group) set(END_LIBRARY_GROUP -Wl,--end-group) -endif(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD OR CLR_CMAKE_PLATFORM_NETBSD) +endif(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) _add_executable(ildasm ${ILDASM_SOURCES} @@ -99,7 +99,7 @@ else() ) endif(WIN32) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) target_link_libraries(ildasm ${ILDASM_LINK_LIBRARIES} mscorrc_debug @@ -120,6 +120,6 @@ else() oleaut32 shell32 ) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) install_clr(TARGETS ildasm) diff --git a/src/coreclr/src/jit/CMakeLists.txt b/src/coreclr/src/jit/CMakeLists.txt index 18a38fd3681..326851d7f24 100644 --- a/src/coreclr/src/jit/CMakeLists.txt +++ b/src/coreclr/src/jit/CMakeLists.txt @@ -10,7 +10,7 @@ endif() add_compile_options($<$<CXX_COMPILER_ID:MSVC>:-W4>) -if (CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_ARM64 OR (CLR_CMAKE_TARGET_ARCH_I386 AND NOT CLR_CMAKE_PLATFORM_UNIX)) +if (CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_ARM64 OR (CLR_CMAKE_TARGET_ARCH_I386 AND NOT CLR_CMAKE_HOST_UNIX)) add_definitions(-DFEATURE_SIMD) add_definitions(-DFEATURE_HW_INTRINSICS) endif () @@ -331,7 +331,7 @@ set(JIT_ARCH_LINK_LIBRARIES gcinfo ) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) list(APPEND JIT_LINK_LIBRARIES mscorrc_debug coreclrpal @@ -353,7 +353,7 @@ else() crypt32.lib RuntimeObject.lib ) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) # Shared function for generating JIT function(add_jit jitName) @@ -395,18 +395,18 @@ endif (FEATURE_MERGE_JIT_AND_ENGINE) add_subdirectory(standalone) -if (CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_AMD64) +if (CLR_CMAKE_HOST_ARCH_I386 OR CLR_CMAKE_HOST_ARCH_AMD64) # On x86, build RyuJIT/ARM32 cross-compiling altjit. # On amd64, build RyuJIT/ARM64 cross-compiling altjit. add_subdirectory(protononjit) endif () -if (CLR_CMAKE_PLATFORM_ARCH_I386) +if (CLR_CMAKE_HOST_ARCH_I386) # On x86, build RyuJIT/ARM32 cross-compiling altjit for ARM_SOFTFP (armel). add_subdirectory(armelnonjit) endif () -if ((CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_AMD64) AND WIN32) +if ((CLR_CMAKE_HOST_ARCH_I386 OR CLR_CMAKE_HOST_ARCH_AMD64) AND WIN32) # On Windows, build altjit that targets the Linux ABI: # On x86, build Linux/x86 altjit. This enables UNIX_X86_ABI. # On amd64, build Linux/AMD64 altjit. This enables UNIX_AMD64_ABI. diff --git a/src/coreclr/src/jit/armelnonjit/CMakeLists.txt b/src/coreclr/src/jit/armelnonjit/CMakeLists.txt index e118abc3643..2283fb19431 100644 --- a/src/coreclr/src/jit/armelnonjit/CMakeLists.txt +++ b/src/coreclr/src/jit/armelnonjit/CMakeLists.txt @@ -12,14 +12,14 @@ if(FEATURE_READYTORUN) add_definitions(-DFEATURE_READYTORUN_COMPILER) endif(FEATURE_READYTORUN) -if (CLR_CMAKE_PLATFORM_ARCH_I386) +if (CLR_CMAKE_HOST_ARCH_I386) remove_definitions(-D_TARGET_X86_) add_definitions(-D_TARGET_ARM_) add_definitions(-DARM_SOFTFP) add_definitions(-DFEATURE_EH_FUNCLETS) set(JIT_ARCH_SOURCES ${JIT_ARM_SOURCES}) set(JIT_ARCH_LINK_LIBRARIES gcinfo_arm) -elseif(CLR_CMAKE_PLATFORM_ARCH_AMD64) +elseif(CLR_CMAKE_HOST_ARCH_AMD64) remove_definitions(-D_TARGET_AMD64_) add_definitions(-D_TARGET_ARM64_) set(JIT_ARCH_SOURCES ${JIT_ARM64_SOURCES}) @@ -29,9 +29,9 @@ else() endif() if (NOT WIN32) - if (CLR_CMAKE_PLATFORM_ARCH_I386) + if (CLR_CMAKE_HOST_ARCH_I386) remove_definitions(-DUNIX_X86_ABI) - elseif(CLR_CMAKE_PLATFORM_ARCH_AMD64) + elseif(CLR_CMAKE_HOST_ARCH_AMD64) remove_definitions(-DUNIX_AMD64_ABI) else() clr_unknown_arch() diff --git a/src/coreclr/src/jit/dll/CMakeLists.txt b/src/coreclr/src/jit/dll/CMakeLists.txt index 2e8a254ca6d..ec7cddc78ed 100644 --- a/src/coreclr/src/jit/dll/CMakeLists.txt +++ b/src/coreclr/src/jit/dll/CMakeLists.txt @@ -2,7 +2,7 @@ project(ClrJit) set_source_files_properties(${JIT_EXPORTS_FILE} PROPERTIES GENERATED TRUE) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) add_library_clr(clrjit_static STATIC ${SHARED_LIB_SOURCES} @@ -14,5 +14,5 @@ else() ${SHARED_LIB_SOURCES} ${JIT_ARCH_SOURCES} ) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) target_precompile_header(TARGET clrjit_static HEADER jitpch.h ADDITIONAL_INCLUDE_DIRECTORIES ${JIT_SOURCE_DIR}) diff --git a/src/coreclr/src/jit/linuxnonjit/CMakeLists.txt b/src/coreclr/src/jit/linuxnonjit/CMakeLists.txt index 465fc64b450..951b757a6a7 100644 --- a/src/coreclr/src/jit/linuxnonjit/CMakeLists.txt +++ b/src/coreclr/src/jit/linuxnonjit/CMakeLists.txt @@ -9,13 +9,13 @@ if(FEATURE_READYTORUN) add_definitions(-DFEATURE_READYTORUN_COMPILER) endif(FEATURE_READYTORUN) -if (CLR_CMAKE_PLATFORM_ARCH_I386) +if (CLR_CMAKE_HOST_ARCH_I386) remove_definitions(-DFEATURE_SIMD) remove_definitions(-DFEATURE_HW_INTRINSICS) add_definitions(-DUNIX_X86_ABI) set(JIT_ARCH_SOURCES ${JIT_I386_SOURCES}) set(JIT_ARCH_LINK_LIBRARIES gcinfo_linuxx86) -elseif(CLR_CMAKE_PLATFORM_ARCH_AMD64) +elseif(CLR_CMAKE_HOST_ARCH_AMD64) add_definitions(-DUNIX_AMD64_ABI) set(JIT_ARCH_SOURCES ${JIT_AMD64_SOURCES}) set(JIT_ARCH_LINK_LIBRARIES gcinfo) diff --git a/src/coreclr/src/jit/protononjit/CMakeLists.txt b/src/coreclr/src/jit/protononjit/CMakeLists.txt index 3512ce73e1d..101ff259fa2 100644 --- a/src/coreclr/src/jit/protononjit/CMakeLists.txt +++ b/src/coreclr/src/jit/protononjit/CMakeLists.txt @@ -9,7 +9,7 @@ if(FEATURE_READYTORUN) add_definitions(-DFEATURE_READYTORUN_COMPILER) endif(FEATURE_READYTORUN) -if (CLR_CMAKE_PLATFORM_ARCH_I386) +if (CLR_CMAKE_HOST_ARCH_I386) remove_definitions(-D_TARGET_X86_) remove_definitions(-DFEATURE_SIMD) remove_definitions(-DFEATURE_HW_INTRINSICS) @@ -17,7 +17,7 @@ if (CLR_CMAKE_PLATFORM_ARCH_I386) add_definitions(-DFEATURE_EH_FUNCLETS) set(JIT_ARCH_SOURCES ${JIT_ARM_SOURCES}) set(JIT_ARCH_LINK_LIBRARIES gcinfo_arm) -elseif(CLR_CMAKE_PLATFORM_ARCH_AMD64) +elseif(CLR_CMAKE_HOST_ARCH_AMD64) remove_definitions(-D_TARGET_AMD64_) add_definitions(-D_TARGET_ARM64_) set(JIT_ARCH_SOURCES ${JIT_ARM64_SOURCES}) @@ -27,9 +27,9 @@ else() endif() if (NOT WIN32) - if (CLR_CMAKE_PLATFORM_ARCH_I386) + if (CLR_CMAKE_HOST_ARCH_I386) remove_definitions(-DUNIX_X86_ABI) - elseif(CLR_CMAKE_PLATFORM_ARCH_AMD64) + elseif(CLR_CMAKE_HOST_ARCH_AMD64) remove_definitions(-DUNIX_AMD64_ABI) else() clr_unknown_arch() diff --git a/src/coreclr/src/pal/src/CMakeLists.txt b/src/coreclr/src/pal/src/CMakeLists.txt index 095b1941a3a..55c66b44d95 100644 --- a/src/coreclr/src/pal/src/CMakeLists.txt +++ b/src/coreclr/src/pal/src/CMakeLists.txt @@ -140,18 +140,18 @@ elseif(PAL_CMAKE_PLATFORM_ARCH_I386) set(PAL_ARCH_SOURCES_DIR i386) endif() -if(PAL_CMAKE_PLATFORM_ARCH_AMD64 AND CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT CLR_CMAKE_PLATFORM_ALPINE_LINUX) +if(PAL_CMAKE_PLATFORM_ARCH_AMD64 AND CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT CLR_CMAKE_HOST_ALPINE_LINUX) # Currently the _xstate is not available on Alpine Linux add_definitions(-DXSTATE_SUPPORTED) -endif(PAL_CMAKE_PLATFORM_ARCH_AMD64 AND CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT CLR_CMAKE_PLATFORM_ALPINE_LINUX) +endif(PAL_CMAKE_PLATFORM_ARCH_AMD64 AND CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT CLR_CMAKE_HOST_ALPINE_LINUX) -if(CLR_CMAKE_PLATFORM_ALPINE_LINUX) +if(CLR_CMAKE_HOST_ALPINE_LINUX) # Setting RLIMIT_NOFILE breaks debugging of coreclr on Alpine Linux for some reason add_definitions(-DDONT_SET_RLIMIT_NOFILE) # On Alpine Linux, we need to ensure that the reported stack range for the primary thread is # larger than the initial committed stack size. add_definitions(-DENSURE_PRIMARY_STACK_SIZE) -endif(CLR_CMAKE_PLATFORM_ALPINE_LINUX) +endif(CLR_CMAKE_HOST_ALPINE_LINUX) # turn off capability to remove unused functions (which was enabled in debug build with sanitizers) set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} -Wl,--no-gc-sections") @@ -327,7 +327,7 @@ endif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) if(CMAKE_SYSTEM_NAME STREQUAL Linux) # On Android, we don't need to link with gcc_s, pthread and rt - if(NOT CLR_CMAKE_PLATFORM_ANDROID) + if(NOT CLR_CMAKE_HOST_ANDROID) target_link_libraries(coreclrpal gcc_s pthread @@ -335,7 +335,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) ) endif() - if(CLR_CMAKE_PLATFORM_ANDROID) + if(CLR_CMAKE_HOST_ANDROID) find_library(LZMA NAMES lzma) if(LZMA STREQUAL LZMA-NOTFOUND) diff --git a/src/coreclr/src/pal/src/configure.cmake b/src/coreclr/src/pal/src/configure.cmake index 6c6b5024c66..5e58e5ebb05 100644 --- a/src/coreclr/src/pal/src/configure.cmake +++ b/src/coreclr/src/pal/src/configure.cmake @@ -16,7 +16,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin AND NOT CMAKE_SYSTEM_NAME STREQUAL Free set(CMAKE_REQUIRED_DEFINITIONS "-D_BSD_SOURCE -D_SVID_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L") endif() -if(CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT CLR_CMAKE_PLATFORM_ANDROID) +if(CMAKE_SYSTEM_NAME STREQUAL Linux AND NOT CLR_CMAKE_HOST_ANDROID) set(CMAKE_RT_LIBS rt) elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD) set(CMAKE_RT_LIBS rt) @@ -1146,7 +1146,7 @@ int main() }" HAVE_FULLY_FEATURED_PTHREAD_MUTEXES) set(CMAKE_REQUIRED_LIBRARIES) -if(NOT CLR_CMAKE_PLATFORM_ARCH_ARM AND NOT CLR_CMAKE_PLATFORM_ARCH_ARM64) +if(NOT CLR_CMAKE_HOST_ARCH_ARM AND NOT CLR_CMAKE_HOST_ARCH_ARM64) set(CMAKE_REQUIRED_LIBRARIES pthread) check_cxx_source_runs(" // This test case verifies the pthread process-shared robust mutex's cross-process abandon detection. The parent process starts diff --git a/src/coreclr/src/pal/src/eventprovider/CMakeLists.txt b/src/coreclr/src/pal/src/eventprovider/CMakeLists.txt index 3f5b0310d62..aaf420458a6 100644 --- a/src/coreclr/src/pal/src/eventprovider/CMakeLists.txt +++ b/src/coreclr/src/pal/src/eventprovider/CMakeLists.txt @@ -1,6 +1,6 @@ set(EVENT_MANIFEST ${VM_DIR}/ClrEtwAll.man) -if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_FREEBSD) +if(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD) add_subdirectory(lttngprovider) else() add_subdirectory(dummyprovider) diff --git a/src/coreclr/src/pal/src/libunwind/CMakeLists.txt b/src/coreclr/src/pal/src/libunwind/CMakeLists.txt index b33c0ae4433..5c66b90fdb0 100644 --- a/src/coreclr/src/pal/src/libunwind/CMakeLists.txt +++ b/src/coreclr/src/pal/src/libunwind/CMakeLists.txt @@ -2,13 +2,13 @@ add_subdirectory(src) # define variables for the configure_file below -if (CLR_CMAKE_PLATFORM_ARCH_AMD64) +if (CLR_CMAKE_HOST_ARCH_AMD64) set(arch x86_64) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) +elseif(CLR_CMAKE_HOST_ARCH_ARM64) set(arch aarch64) elseif(CLR_CMAKE_PLATFROM_ARCH_ARM) set(arch arm) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) +elseif(CLR_CMAKE_HOST_ARCH_I386) set(arch x86) endif() diff --git a/src/coreclr/src/pal/src/libunwind/src/CMakeLists.txt b/src/coreclr/src/pal/src/libunwind/src/CMakeLists.txt index 99ba79b2038..a29d9762429 100644 --- a/src/coreclr/src/pal/src/libunwind/src/CMakeLists.txt +++ b/src/coreclr/src/pal/src/libunwind/src/CMakeLists.txt @@ -26,7 +26,7 @@ elseif() add_compile_options(-Wno-unused-value) endif() -if(CLR_CMAKE_PLATFORM_ARCH_ARM) +if(CLR_CMAKE_HOST_ARCH_ARM) # Ensure that the remote and local unwind code can reside in the same binary without name clashing add_definitions("-Darm_search_unwind_table=UNW_OBJ(arm_search_unwind_table)") if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") @@ -45,14 +45,14 @@ if(CLR_CMAKE_PLATFORM_ARCH_ARM) # in include/tdep like it works for similar files on other architectures. So we need to add # the include/tdep-arm to include directories include_directories(../include/tdep-arm) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) +elseif(CLR_CMAKE_HOST_ARCH_ARM64) if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") # Disable warning due to labs function called on unsigned argument add_compile_options(-Wno-absolute-value) endif() # We compile code with -std=c99 and the asm keyword is not recognized as it is a gnu extension add_definitions(-Dasm=__asm__) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) +elseif(CLR_CMAKE_HOST_ARCH_I386) # Disable warning for a bug in the libunwind source src/x86/Gos-linux.c, but not in code that we exercise add_compile_options(-Wno-incompatible-pointer-types) endif() @@ -114,7 +114,7 @@ SET(libunwind_la_SOURCES_os_freebsd_local # Nothing ) -if(CLR_CMAKE_PLATFORM_LINUX) +if(CLR_CMAKE_HOST_LINUX) SET(libunwind_la_SOURCES_os ${libunwind_la_SOURCES_os_linux}) SET(libunwind_la_SOURCES_os_local ${libunwind_la_SOURCES_os_linux_local}) SET(libunwind_la_SOURCES_x86_os x86/Gos-linux.c) @@ -125,7 +125,7 @@ if(CLR_CMAKE_PLATFORM_LINUX) SET(libunwind_la_SOURCES_arm_os arm/Gos-linux.c) SET(libunwind_la_SOURCES_arm_os_local arm/Los-linux.c) list(APPEND libunwind_coredump_la_SOURCES coredump/_UCD_access_reg_linux.c) -elseif(CLR_CMAKE_PLATFORM_FREEBSD) +elseif(CLR_CMAKE_HOST_FREEBSD) SET(libunwind_la_SOURCES_os ${libunwind_la_SOURCES_os_freebsd}) SET(libunwind_la_SOURCES_os_local ${libunwind_la_SOURCES_os_freebsd_local}) SET(libunwind_la_SOURCES_x86_os x86/Gos-freebsd.c) @@ -319,22 +319,22 @@ SET(libunwind_x86_64_la_SOURCES_x86_64 x86_64/Gstash_frame.c x86_64/Gstep.c x86_64/Gtrace.c ) -if(CLR_CMAKE_PLATFORM_ARCH_ARM64) +if(CLR_CMAKE_HOST_ARCH_ARM64) SET(libunwind_la_SOURCES ${libunwind_la_SOURCES_aarch64}) SET(libunwind_remote_la_SOURCES ${libunwind_aarch64_la_SOURCES_aarch64}) SET(libunwind_elf_la_SOURCES ${libunwind_elf64_la_SOURCES}) list(APPEND libunwind_setjmp_la_SOURCES aarch64/siglongjmp.S) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) +elseif(CLR_CMAKE_HOST_ARCH_ARM) SET(libunwind_la_SOURCES ${libunwind_la_SOURCES_arm}) SET(libunwind_remote_la_SOURCES ${libunwind_arm_la_SOURCES_arm}) SET(libunwind_elf_la_SOURCES ${libunwind_elf32_la_SOURCES}) list(APPEND libunwind_setjmp_la_SOURCES arm/siglongjmp.S) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) +elseif(CLR_CMAKE_HOST_ARCH_I386) SET(libunwind_la_SOURCES ${libunwind_la_SOURCES_x86} ${libunwind_x86_la_SOURCES_os}) SET(libunwind_remote_la_SOURCES ${libunwind_x86_la_SOURCES_x86}) SET(libunwind_elf_la_SOURCES ${libunwind_elf32_la_SOURCES}) list(APPEND libunwind_setjmp_la_SOURCES x86/longjmp.S x86/siglongjmp.S) -elseif(CLR_CMAKE_PLATFORM_ARCH_AMD64) +elseif(CLR_CMAKE_HOST_ARCH_AMD64) SET(libunwind_la_SOURCES ${libunwind_la_SOURCES_x86_64}) SET(libunwind_remote_la_SOURCES ${libunwind_x86_64_la_SOURCES_x86_64}) SET(libunwind_elf_la_SOURCES ${libunwind_elf64_la_SOURCES}) diff --git a/src/coreclr/src/pal/tests/CMakeLists.txt b/src/coreclr/src/pal/tests/CMakeLists.txt index 22e07c54030..d9f260b8d45 100644 --- a/src/coreclr/src/pal/tests/CMakeLists.txt +++ b/src/coreclr/src/pal/tests/CMakeLists.txt @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.14.2) -if(CLR_CMAKE_PLATFORM_ARCH_I386) +if(CLR_CMAKE_HOST_ARCH_I386) set(PAL_CMAKE_PLATFORM_ARCH_I386 1) -elseif(CLR_CMAKE_PLATFORM_ARCH_AMD64) +elseif(CLR_CMAKE_HOST_ARCH_AMD64) set(PAL_CMAKE_PLATFORM_ARCH_AMD64 1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) +elseif(CLR_CMAKE_HOST_ARCH_ARM) set(PAL_CMAKE_PLATFORM_ARCH_ARM 1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) +elseif(CLR_CMAKE_HOST_ARCH_ARM64) set(PAL_CMAKE_PLATFORM_ARCH_ARM64 1) endif() diff --git a/src/coreclr/src/pal/tests/palsuite/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/CMakeLists.txt index e70fd12d872..11510332803 100644 --- a/src/coreclr/src/pal/tests/palsuite/CMakeLists.txt +++ b/src/coreclr/src/pal/tests/palsuite/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories(${PALTESTSUITE_SOURCE_DIR}/common) # All test will link against these libraries: # pthread and m are part of the Android C library (bionic), # so we don't need to link them seperately -if(NOT CLR_CMAKE_PLATFORM_ANDROID) +if(NOT CLR_CMAKE_HOST_ANDROID) list(APPEND COMMON_TEST_LIBRARIES pthread) list(APPEND COMMON_TEST_LIBRARIES m) endif() diff --git a/src/coreclr/src/pal/tests/palsuite/eventprovider/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/eventprovider/CMakeLists.txt index 809439b5e1c..e6400a88774 100644 --- a/src/coreclr/src/pal/tests/palsuite/eventprovider/CMakeLists.txt +++ b/src/coreclr/src/pal/tests/palsuite/eventprovider/CMakeLists.txt @@ -28,11 +28,11 @@ if(FEATURE_EVENT_TRACE) list(APPEND EVENT_PROVIDER_DEPENDENCIES eventprovider ) - if(CLR_CMAKE_PLATFORM_LINUX) + if(CLR_CMAKE_HOST_LINUX) list(APPEND EVENT_PROVIDER_DEPENDENCIES coreclrtraceptprovider ) - endif(CLR_CMAKE_PLATFORM_LINUX) + endif(CLR_CMAKE_HOST_LINUX) endif(FEATURE_EVENT_TRACE) target_link_libraries(eventprovidertest ${EVENT_PROVIDER_DEPENDENCIES} coreclrpal) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt index 123b6b611b8..5d07fe3ba9a 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt @@ -1,14 +1,14 @@ -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) add_definitions(-DFEATURE_ENABLE_HARDWARE_EXCEPTIONS) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) # Set the RPATH of paltest_pal_sxs_test1 so that it can find dependencies without needing to set LD_LIBRARY # For more information: http://www.cmake.org/Wiki/CMake_RPATH_handling. if(CORECLR_SET_RPATH) - if(CLR_CMAKE_PLATFORM_LINUX) + if(CLR_CMAKE_HOST_LINUX) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) set(CMAKE_INSTALL_RPATH "\$ORIGIN") - endif(CLR_CMAKE_PLATFORM_LINUX) + endif(CLR_CMAKE_HOST_LINUX) endif(CORECLR_SET_RPATH) # Test DLL1 diff --git a/src/coreclr/src/tools/crossgen/CMakeLists.txt b/src/coreclr/src/tools/crossgen/CMakeLists.txt index 37ea66695ca..053490a6c03 100644 --- a/src/coreclr/src/tools/crossgen/CMakeLists.txt +++ b/src/coreclr/src/tools/crossgen/CMakeLists.txt @@ -11,9 +11,9 @@ if(WIN32) add_definitions(-D_CRT_NON_CONFORMING_WCSTOK) endif() -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) add_definitions(-DNO_NGENPDB) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) add_definitions(-DFX_VER_INTERNALNAME_STR=crossgen.exe) @@ -42,7 +42,7 @@ target_link_libraries(crossgen v3binder_crossgen ) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) target_link_libraries(crossgen mscorrc_debug coreclrpal @@ -63,7 +63,7 @@ else() ${STATIC_MT_VCRT_LIB} ) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) add_subdirectory(../../zap ../../zap) add_subdirectory(../../vm/crossgen ../../vm/crossgen) diff --git a/src/coreclr/src/unwinder/CMakeLists.txt b/src/coreclr/src/unwinder/CMakeLists.txt index e6019cb2c7b..4421ea9f6f6 100644 --- a/src/coreclr/src/unwinder/CMakeLists.txt +++ b/src/coreclr/src/unwinder/CMakeLists.txt @@ -19,10 +19,10 @@ list(APPEND UNWINDER_SOURCES convert_to_absolute_path(UNWINDER_SOURCES ${UNWINDER_SOURCES}) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) add_library_clr(unwinder_wks ${UNWINDER_SOURCES}) add_dependencies(unwinder_wks eventing_headers) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) add_library_clr(unwinder_dac ${UNWINDER_SOURCES}) add_dependencies(unwinder_dac eventing_headers) diff --git a/src/coreclr/src/utilcode/CMakeLists.txt b/src/coreclr/src/utilcode/CMakeLists.txt index 8cc0ca5c70d..ca2262ecac4 100644 --- a/src/coreclr/src/utilcode/CMakeLists.txt +++ b/src/coreclr/src/utilcode/CMakeLists.txt @@ -107,14 +107,14 @@ add_library_clr(utilcode STATIC ${UTILCODE_SOURCES}) add_library_clr(utilcodestaticnohost STATIC ${UTILCODE_STATICNOHOST_SOURCES}) add_library_clr(utilcode_crossgen STATIC ${UTILCODE_CROSSGEN_SOURCES}) -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) target_link_libraries(utilcodestaticnohost nativeresourcestring) target_link_libraries(utilcode_crossgen nativeresourcestring) target_link_libraries(utilcode_dac nativeresourcestring) target_link_libraries(utilcode nativeresourcestring) add_dependencies(utilcode_dac coreclrpal) add_dependencies(utilcode coreclrpal) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) if(WIN32) diff --git a/src/coreclr/src/vm/CMakeLists.txt b/src/coreclr/src/vm/CMakeLists.txt index 9d4a8991230..de9bf64c1a9 100644 --- a/src/coreclr/src/vm/CMakeLists.txt +++ b/src/coreclr/src/vm/CMakeLists.txt @@ -850,18 +850,18 @@ elseif(CLR_CMAKE_TARGET_ARCH_ARM64) ${ARCH_SOURCES_DIR}/profiler.cpp ) - if(CLR_CMAKE_PLATFORM_UNIX) + if(CLR_CMAKE_HOST_UNIX) list(APPEND VM_SOURCES_DAC_AND_WKS_ARCH ${ARCH_SOURCES_DIR}/arm64singlestepper.cpp ) - endif(CLR_CMAKE_PLATFORM_UNIX) + endif(CLR_CMAKE_HOST_UNIX) endif() -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_HOST_UNIX) list(APPEND VM_SOURCES_WKS_ARCH ${ARCH_SOURCES_DIR}/unixstubs.cpp ) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif(CLR_CMAKE_HOST_UNIX) set(VM_SOURCES_DAC_ARCH exceptionhandling.cpp diff --git a/src/coreclr/src/vm/crossgen/CMakeLists.txt b/src/coreclr/src/vm/crossgen/CMakeLists.txt index 0e994715f78..cea51f51b44 100644 --- a/src/coreclr/src/vm/crossgen/CMakeLists.txt +++ b/src/coreclr/src/vm/crossgen/CMakeLists.txt @@ -253,12 +253,12 @@ if (WIN32) list(APPEND VM_CROSSGEN_SOURCES ${VM_CROSSGEN_HEADERS}) endif (WIN32) -if (CLR_CMAKE_PLATFORM_LINUX) +if (CLR_CMAKE_HOST_LINUX) list(APPEND VM_CROSSGEN_SOURCES ../perfmap.cpp ../perfinfo.cpp ) -endif (CLR_CMAKE_PLATFORM_LINUX) +endif (CLR_CMAKE_HOST_LINUX) add_library_clr(cee_crossgen ${VM_CROSSGEN_SOURCES}) add_dependencies(cee_crossgen eventing_headers) diff --git a/src/coreclr/src/vm/wks/CMakeLists.txt b/src/coreclr/src/vm/wks/CMakeLists.txt index 2a2593f32ed..6a5ea030de6 100644 --- a/src/coreclr/src/vm/wks/CMakeLists.txt +++ b/src/coreclr/src/vm/wks/CMakeLists.txt @@ -1,6 +1,6 @@ if (WIN32) - if(CLR_CMAKE_PLATFORM_ARCH_ARM OR CLR_CMAKE_PLATFORM_ARCH_ARM64) + if(CLR_CMAKE_HOST_ARCH_ARM OR CLR_CMAKE_HOST_ARCH_ARM64) preprocess_compile_asm(ASM_FILES ${VM_SOURCES_WKS_ARCH_ASM} OUTPUT_OBJECTS VM_WKS_ARCH_ASM_OBJECTS) list(APPEND VM_SOURCES_WKS_ARCH_ASM ${VM_WKS_ARCH_ASM_OBJECTS}) endif() @@ -17,11 +17,11 @@ add_dependencies(cee_wks eventing_headers) if (WIN32) - if(NOT CLR_CMAKE_PLATFORM_ARCH_ARM AND NOT CLR_CMAKE_PLATFORM_ARCH_ARM64) + if(NOT CLR_CMAKE_HOST_ARCH_ARM AND NOT CLR_CMAKE_HOST_ARCH_ARM64) - if (CLR_CMAKE_PLATFORM_ARCH_I386) + if (CLR_CMAKE_HOST_ARCH_I386) set_source_files_properties(${VM_SOURCES_WKS_ARCH_ASM} PROPERTIES COMPILE_FLAGS "/Zm /safeseh") - endif (CLR_CMAKE_PLATFORM_ARCH_I386) + endif (CLR_CMAKE_HOST_ARCH_I386) # Convert AsmConstants.h into AsmConstants.inc find_program(POWERSHELL powershell) @@ -47,6 +47,6 @@ if (WIN32) add_dependencies(cee_wks asmconstants_inc) - endif(NOT CLR_CMAKE_PLATFORM_ARCH_ARM AND NOT CLR_CMAKE_PLATFORM_ARCH_ARM64) + endif(NOT CLR_CMAKE_HOST_ARCH_ARM AND NOT CLR_CMAKE_HOST_ARCH_ARM64) endif (WIN32) diff --git a/src/coreclr/tests/src/Exceptions/ForeignThread/CMakeLists.txt b/src/coreclr/tests/src/Exceptions/ForeignThread/CMakeLists.txt index 39ee068b45c..f5e8b3a8769 100644 --- a/src/coreclr/tests/src/Exceptions/ForeignThread/CMakeLists.txt +++ b/src/coreclr/tests/src/Exceptions/ForeignThread/CMakeLists.txt @@ -2,10 +2,10 @@ project (ForeignThreadExceptionsNative) include_directories(${INC_PLATFORM_DIR}) -if(CLR_CMAKE_PLATFORM_DARWIN) +if(CLR_CMAKE_HOST_DARWIN) # Enable non-POSIX pthreads APIs, which by default are not included in the pthreads header add_definitions(-D_DARWIN_C_SOURCE) -endif(CLR_CMAKE_PLATFORM_DARWIN) +endif(CLR_CMAKE_HOST_DARWIN) set(SOURCES ForeignThreadExceptionsNative.cpp) diff --git a/src/coreclr/tests/src/Interop/CMakeLists.txt b/src/coreclr/tests/src/Interop/CMakeLists.txt index f85eff4c8f5..4fe2e6e8b91 100644 --- a/src/coreclr/tests/src/Interop/CMakeLists.txt +++ b/src/coreclr/tests/src/Interop/CMakeLists.txt @@ -81,7 +81,7 @@ if(WIN32) add_subdirectory(WinRT/NativeComponent) # IJW isn't supported on ARM64 - if(NOT CLR_CMAKE_PLATFORM_ARCH_ARM64) + if(NOT CLR_CMAKE_HOST_ARCH_ARM64) add_subdirectory(IJW/ijwhostmock) add_subdirectory(IJW/IjwNativeDll) add_subdirectory(IJW/IjwNativeCallingManagedDll) |