diff options
| author | Rahul Kumar <rahku@microsoft.com> | 2016-04-12 14:40:23 -0700 |
|---|---|---|
| committer | Rahul Kumar <rahku@microsoft.com> | 2016-04-18 22:17:29 -0700 |
| commit | 7f46dbe0c6b0785a4e40978da684b1dc81d0b8ce (patch) | |
| tree | 2de78686eb771e11d7276c69791405550bbd0311 | |
| parent | 0a31fe90800bd45e3c3668483dbe27358864170e (diff) | |
| download | coreclr-7f46dbe0c6b0785a4e40978da684b1dc81d0b8ce.tar.gz coreclr-7f46dbe0c6b0785a4e40978da684b1dc81d0b8ce.tar.bz2 coreclr-7f46dbe0c6b0785a4e40978da684b1dc81d0b8ce.zip | |
enable build of cross target components.
Currently only enabled for arm64
43 files changed, 970 insertions, 908 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2270698758..faf2acf9c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,50 +1,110 @@ # Require at least version 2.8.12 of CMake cmake_minimum_required(VERSION 2.8.12) +if(CMAKE_VERSION VERSION_EQUAL 3.0 OR CMAKE_VERSION VERSION_GREATER 3.0) + cmake_policy(SET CMP0042 NEW) +endif() + # Set the project name project(CoreCLR) -set(CORECLR_SET_RPATH ON) +# Include cmake functions +include(functions.cmake) +# Set commonly used directory names +set(CLR_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +set(VM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/vm) +set(GENERATED_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/src/inc) + +set(CORECLR_SET_RPATH ON) if(CORECLR_SET_RPATH) # Enable @rpath support for shared libraries. set(MACOSX_RPATH ON) endif(CORECLR_SET_RPATH) -if(CMAKE_VERSION VERSION_EQUAL 3.0 OR CMAKE_VERSION VERSION_GREATER 3.0) - cmake_policy(SET CMP0042 NEW) +OPTION(CMAKE_ENABLE_CODE_COVERAGE "Enable code coverage" OFF) + +# Ensure that python is present +find_program(PYTHON python) +if (PYTHON STREQUAL "PYTHON-NOTFOUND") + message(FATAL_ERROR "PYTHON not found: Please install Python 2.7.9 or later from https://www.python.org/downloads/") endif() -set(CLR_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -set(VM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/vm) -set(GENERATED_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/src/inc) +# Ensure other tools are present +if(WIN32) + enable_language(ASM_MASM) -function(clr_unknown_arch) - if (WIN32) - message(FATAL_ERROR "Only AMD64, ARM64 and I386 are supported") - else() - message(FATAL_ERROR "Only AMD64, ARM64 and ARM are supported") + # Ensure that MC is present + find_program(MC mc) + if (MC STREQUAL "MC-NOTFOUND") + message(FATAL_ERROR "MC not found") endif() -endfunction() + if(CLR_CMAKE_HOST_ARCH STREQUAL arm64) + # CMAKE_CXX_COMPILER will default to the compiler installed with + # Visual studio. Overwrite it to the compiler on the path. + # TODO, remove when cmake generator supports Arm64 as a target. + find_program(PATH_CXX_COMPILER cl) + set(CMAKE_CXX_COMPILER ${PATH_CXX_COMPILER}) + message("Overwriting the CMAKE_CXX_COMPILER.") + message(CMAKE_CXX_COMPILER found:${CMAKE_CXX_COMPILER}) + endif() +else() + enable_language(ASM) + + # Ensure that awk is present + find_program(AWK awk) + if (AWK STREQUAL "AWK-NOTFOUND") + message(FATAL_ERROR "AWK not found") + endif() + + if (CMAKE_SYSTEM_NAME STREQUAL Darwin) + + # Ensure that dsymutil and strip is present + find_program(DSYMUTIL dsymutil) + if (DSYMUTIL STREQUAL "DSYMUTIL-NOTFOUND") + message(FATAL_ERROR "dsymutil not found") + endif() + find_program(STRIP strip) + if (STRIP STREQUAL "STRIP-NOTFOUND") + message(FATAL_ERROR "strip not found") + endif() + elseif (CMAKE_SYSTEM_NAME STREQUAL Linux) + # Ensure that objcopy is present + if(DEFINED ENV{CROSSCOMPILE}) + if(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l) + find_program(OBJCOPY ${TOOLCHAIN}-objcopy) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) + find_program(OBJCOPY ${TOOLCHAIN}-objcopy) + else() + clr_unknown_arch() + endif() + else() + find_program(OBJCOPY objcopy) + endif() + if (OBJCOPY STREQUAL "OBJCOPY-NOTFOUND") + message(FATAL_ERROR "objcopy not found") + endif() + endif () +endif(WIN32) + +#---------------------------------------- +# Detect and set platform variable names +# - for non-windows build platform & architecture is detected using inbuilt CMAKE variables +# - 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) - if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64) - set(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64 1) + # CMAKE_SYSTEM_PROCESSOR returns the value of `uname -p`. + # For the AMD/Intel 64bit architecure two different strings are common. + # 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) elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l) - set(CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM 1) - # Because we don't use CMAKE_C_COMPILER/CMAKE_CXX_COMPILER to use clang - # we have to set the triple by adding a compiler argument - add_compile_options(-mthumb) - add_compile_options(-mfpu=vfpv3) - if(ARM_SOFTFP) - add_compile_options(-mfloat-abi=softfp) - add_compile_options(-target armv7-linux-gnueabi) - else() - add_compile_options(-target armv7-linux-gnueabihf) - endif(ARM_SOFTFP) + set(CLR_CMAKE_PLATFORM_UNIX_ARM 1) elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) - set(CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM64 1) + set(CLR_CMAKE_PLATFORM_UNIX_ARM64 1) else() clr_unknown_arch() endif() @@ -53,7 +113,7 @@ endif(CMAKE_SYSTEM_NAME STREQUAL Linux) if(CMAKE_SYSTEM_NAME STREQUAL Darwin) set(CLR_CMAKE_PLATFORM_UNIX 1) - set(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64 1) + set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) set(CLR_CMAKE_PLATFORM_DARWIN 1) if(CMAKE_VERSION VERSION_LESS "3.4.0") set(CMAKE_ASM_COMPILE_OBJECT "${CMAKE_C_COMPILER} <FLAGS> <DEFINES> -o <OBJECT> -c <SOURCE>") @@ -64,19 +124,19 @@ endif(CMAKE_SYSTEM_NAME STREQUAL Darwin) if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) set(CLR_CMAKE_PLATFORM_UNIX 1) - set(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64 1) + set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) set(CLR_CMAKE_PLATFORM_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_TARGET_AMD64 1) + set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) set(CLR_CMAKE_PLATFORM_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_TARGET_AMD64 1) + set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) set(CLR_CMAKE_PLATFORM_NETBSD 1) endif(CMAKE_SYSTEM_NAME STREQUAL NetBSD) @@ -87,7 +147,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL SunOS) OUTPUT_VARIABLE SUNOS_NATIVE_INSTRUCTION_SET ) if(SUNOS_NATIVE_INSTRUCTION_SET MATCHES "amd64") - set(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64 1) + set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) set(CMAKE_SYSTEM_PROCESSOR "amd64") else() clr_unknown_arch() @@ -95,251 +155,69 @@ if(CMAKE_SYSTEM_NAME STREQUAL SunOS) set(CLR_CMAKE_PLATFORM_SUNOS 1) endif(CMAKE_SYSTEM_NAME STREQUAL SunOS) -if(CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM) +#-------------------------------------------- +# This repo builds two set of binaries +# 1. binaries which execute on target arch machine +# - for such binaries host architecture & target architecture are same +# - eg. coreclr.dll +# 2. binaries which execute on host machine but target another architecture +# - host architecture is different from target architecture +# - eg. crossgen.exe - runs on x64 machine and generates nis targeting arm64 +# - 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) -elseif(CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM64) - set(CLR_CMAKE_PLATFORM_ARCH_ARM64 1) -elseif(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64) + set(CLR_CMAKE_HOST_ARCH "arm") +elseif(CLR_CMAKE_PLATFORM_UNIX_ARM64) + set(CLR_CMAKE_PLATFORM_ARCH_ARM64 1) + set(CLR_CMAKE_HOST_ARCH "arm64") +elseif(CLR_CMAKE_PLATFORM_UNIX_AMD64) set(CLR_CMAKE_PLATFORM_ARCH_AMD64 1) + set(CLR_CMAKE_HOST_ARCH "x64") elseif(WIN32) - if (CLR_CMAKE_TARGET_ARCH STREQUAL x64) + # 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(IS_64BIT_BUILD 1) - elseif(CLR_CMAKE_TARGET_ARCH STREQUAL x86) + elseif(CLR_CMAKE_HOST_ARCH STREQUAL x86) set(CLR_CMAKE_PLATFORM_ARCH_I386 1) - set(IS_64BIT_BUILD 0) - elseif(CLR_CMAKE_TARGET_ARCH STREQUAL arm64) + elseif(CLR_CMAKE_HOST_ARCH STREQUAL arm64) set(CLR_CMAKE_PLATFORM_ARCH_ARM64 1) - set(IS_64BIT_BUILD 1) - - # CMAKE_CXX_COMPILER will default to the compiler installed with - # Visual studio. Overwrite it to the compiler on the path. - # TODO, remove when cmake generator supports Arm64 as a target. - - find_program(PATH_CXX_COMPILER cl) - set(CMAKE_CXX_COMPILER ${PATH_CXX_COMPILER}) - - message("Overwriting the CMAKE_CXX_COMPILER.") - message(CMAKE_CXX_COMPILER found:${CMAKE_CXX_COMPILER}) else() clr_unknown_arch() endif() endif() -if(CLR_CMAKE_PLATFORM_UNIX) - # Set flag to indicate if this will be a 64bit build - # CMAKE_SYSTEM_PROCESSOR returns the value of `uname -p`. - # For the AMD/Intel 64bit architecure two different strings are common. - # Linux and Darwin identify it as "x86_64" while FreeBSD and NetBSD use the - # "amd64" string. Accept either of the two here. - if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL amd64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) - set(IS_64BIT_BUILD 1) - endif (CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL amd64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) -endif(CLR_CMAKE_PLATFORM_UNIX) - -# Ensure that python is present -find_program(PYTHON python) -if (PYTHON STREQUAL "PYTHON-NOTFOUND") - message(FATAL_ERROR "PYTHON not found: Please install Python 2.7.9 or later from https://www.python.org/downloads/") +# Set TARGET architecture variables +# Target arch will be a cmake param (optional) for both windows as well as non-windows build +# if target arch is not specified then host & target are same +if(NOT DEFINED CLR_CMAKE_TARGET_ARCH OR CLR_CMAKE_TARGET_ARCH STREQUAL "" ) + set(CLR_CMAKE_TARGET_ARCH ${CLR_CMAKE_HOST_ARCH}) endif() -if(WIN32) - enable_language(ASM_MASM) - - # Ensure that MC is present - find_program(MC mc) - if (MC STREQUAL "MC-NOTFOUND") - message(FATAL_ERROR "MC not found") - endif() -else() - enable_language(ASM) - - # Ensure that awk is present - find_program(AWK awk) - if (AWK STREQUAL "AWK-NOTFOUND") - message(FATAL_ERROR "AWK not found") - endif() - - if (CMAKE_SYSTEM_NAME STREQUAL Darwin) - - # Ensure that dsymutil and strip is present - find_program(DSYMUTIL dsymutil) - if (DSYMUTIL STREQUAL "DSYMUTIL-NOTFOUND") - message(FATAL_ERROR "dsymutil not found") - endif() - find_program(STRIP strip) - if (STRIP STREQUAL "STRIP-NOTFOUND") - message(FATAL_ERROR "strip not found") - endif() - elseif (CMAKE_SYSTEM_NAME STREQUAL Linux) - # Ensure that objcopy is present - if(DEFINED ENV{CROSSCOMPILE}) - if(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l) - find_program(OBJCOPY ${TOOLCHAIN}-objcopy) - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) - find_program(OBJCOPY ${TOOLCHAIN}-objcopy) - else() - clr_unknown_arch() - endif() - else() - find_program(OBJCOPY objcopy) - endif() - if (OBJCOPY STREQUAL "OBJCOPY-NOTFOUND") - message(FATAL_ERROR "objcopy not found") - endif() - endif () -endif(WIN32) - -# Build a list of compiler definitions by putting -D in front of each define. -function(get_compile_definitions DefinitionName) - # Get the current list of definitions - get_directory_property(COMPILE_DEFINITIONS_LIST COMPILE_DEFINITIONS) - - foreach(DEFINITION IN LISTS COMPILE_DEFINITIONS_LIST) - if (${DEFINITION} MATCHES "^\\$<\\$<CONFIG:([^>]+)>:([^>]+)>$") - # The entries that contain generator expressions must have the -D inside of the - # expression. So we transform e.g. $<$<CONFIG:Debug>:_DEBUG> to $<$<CONFIG:Debug>:-D_DEBUG> - set(DEFINITION "$<$<CONFIG:${CMAKE_MATCH_1}>:-D${CMAKE_MATCH_2}>") - else() - set(DEFINITION -D${DEFINITION}) - endif() - list(APPEND DEFINITIONS ${DEFINITION}) - endforeach() - set(${DefinitionName} ${DEFINITIONS} PARENT_SCOPE) -endfunction(get_compile_definitions) - -# Build a list of include directories by putting -I in front of each include dir. -function(get_include_directories IncludeDirectories) - get_directory_property(dirs INCLUDE_DIRECTORIES) - foreach(dir IN LISTS dirs) - list(APPEND INC_DIRECTORIES -I${dir}) - endforeach() - set(${IncludeDirectories} ${INC_DIRECTORIES} PARENT_SCOPE) -endfunction(get_include_directories) - -# Set the passed in RetSources variable to the list of sources with added current source directory -# to form absolute paths. -# The parameters after the RetSources are the input files. -function(convert_to_absolute_path RetSources) - set(Sources ${ARGN}) - foreach(Source IN LISTS Sources) - list(APPEND AbsolutePathSources ${CMAKE_CURRENT_SOURCE_DIR}/${Source}) - endforeach() - set(${RetSources} ${AbsolutePathSources} PARENT_SCOPE) -endfunction(convert_to_absolute_path) - -#Preprocess exports definition file -function(preprocess_def_file inputFilename outputFilename) - get_compile_definitions(PREPROCESS_DEFINITIONS) - - add_custom_command( - OUTPUT ${outputFilename} - COMMAND ${CMAKE_CXX_COMPILER} /P /EP /TC ${PREPROCESS_DEFINITIONS} /Fi${outputFilename} ${inputFilename} - DEPENDS ${inputFilename} - COMMENT "Preprocessing ${inputFilename}" - ) - - set_source_files_properties(${outputFilename} - PROPERTIES GENERATED TRUE) -endfunction() - -function(generate_exports_file inputFilename outputFilename) - - if(CMAKE_SYSTEM_NAME STREQUAL Darwin) - set(AWK_SCRIPT generateexportedsymbols.awk) - else() - set(AWK_SCRIPT generateversionscript.awk) - endif(CMAKE_SYSTEM_NAME STREQUAL Darwin) - - add_custom_command( - OUTPUT ${outputFilename} - COMMAND ${AWK} -f ${CMAKE_SOURCE_DIR}/${AWK_SCRIPT} ${inputFilename} >${outputFilename} - DEPENDS ${inputFilename} ${CMAKE_SOURCE_DIR}/${AWK_SCRIPT} - COMMENT "Generating exports file ${outputFilename}" - ) - set_source_files_properties(${outputFilename} - PROPERTIES GENERATED TRUE) -endfunction() - -function(add_precompiled_header header cppFile targetSources) - if(MSVC) - set(precompiledBinary "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/stdafx.pch") - - set_source_files_properties(${cppFile} - PROPERTIES COMPILE_FLAGS "/Yc\"${header}\" /Fp\"${precompiledBinary}\"" - OBJECT_OUTPUTS "${precompiledBinary}") - set_source_files_properties(${${targetSources}} - PROPERTIES COMPILE_FLAGS "/Yu\"${header}\" /Fp\"${precompiledBinary}\"" - OBJECT_DEPENDS "${precompiledBinary}") - # Add cppFile to SourcesVar - set(${targetSources} ${${targetSources}} ${cppFile} PARENT_SCOPE) - endif(MSVC) -endfunction() - -function(strip_symbols targetName outputFilename) - if(CLR_CMAKE_PLATFORM_UNIX) - if(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELEASE) - - # On the older version of cmake (2.8.12) used on Ubuntu 14.04 the TARGET_FILE - # generator expression doesn't work correctly returning the wrong path and on - # the newer cmake versions the LOCATION property isn't supported anymore. - if(CMAKE_VERSION VERSION_EQUAL 3.0 OR CMAKE_VERSION VERSION_GREATER 3.0) - set(strip_source_file $<TARGET_FILE:${targetName}>) - else() - get_property(strip_source_file TARGET ${targetName} PROPERTY LOCATION) - endif() - - if(CMAKE_SYSTEM_NAME STREQUAL Darwin) - set(strip_destination_file ${strip_source_file}.dwarf) - - add_custom_command( - TARGET ${targetName} - POST_BUILD - VERBATIM - COMMAND ${DSYMUTIL} --flat --minimize ${strip_source_file} - COMMAND ${STRIP} -u -r ${strip_source_file} - COMMENT Stripping symbols from ${strip_source_file} into file ${strip_destination_file} - ) - elseif(CMAKE_SYSTEM_NAME STREQUAL Linux) - set(strip_destination_file ${strip_source_file}.dbg) - - add_custom_command( - TARGET ${targetName} - POST_BUILD - VERBATIM - COMMAND ${OBJCOPY} --only-keep-debug ${strip_source_file} ${strip_destination_file} - COMMAND ${OBJCOPY} --strip-debug ${strip_source_file} - COMMAND ${OBJCOPY} --add-gnu-debuglink=${strip_destination_file} ${strip_source_file} - COMMENT Stripping symbols from ${strip_source_file} into file ${strip_destination_file} - ) - endif(CMAKE_SYSTEM_NAME STREQUAL Darwin) - - set(${outputFilename} ${strip_destination_file} PARENT_SCOPE) - endif(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELEASE) - endif(CLR_CMAKE_PLATFORM_UNIX) -endfunction() - -function(install_clr targetName) - strip_symbols(${targetName} strip_destination_file) - - # On the older version of cmake (2.8.12) used on Ubuntu 14.04 the TARGET_FILE - # generator expression doesn't work correctly returning the wrong path and on - # the newer cmake versions the LOCATION property isn't supported anymore. - if(CMAKE_VERSION VERSION_EQUAL 3.0 OR CMAKE_VERSION VERSION_GREATER 3.0) - set(install_source_file $<TARGET_FILE:${targetName}>) +# Set target architecture variables +if (CLR_CMAKE_TARGET_ARCH STREQUAL x64) + set(CLR_CMAKE_TARGET_ARCH_AMD64 1) + elseif(CLR_CMAKE_TARGET_ARCH STREQUAL x86) + set(CLR_CMAKE_TARGET_ARCH_I386 1) + elseif(CLR_CMAKE_TARGET_ARCH STREQUAL arm64) + set(CLR_CMAKE_TARGET_ARCH_ARM64 1) + elseif(CLR_CMAKE_TARGET_ARCH STREQUAL arm) + set(CLR_CMAKE_TARGET_ARCH_ARM 1) else() - get_property(install_source_file TARGET ${targetName} PROPERTY LOCATION) - endif() + clr_unknown_arch() +endif() - install(PROGRAMS ${install_source_file} DESTINATION .) - if(WIN32) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${targetName}.pdb DESTINATION PDB) - else() - install(FILES ${strip_destination_file} DESTINATION .) +# 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))) + message(FATAL_ERROR "Invalid host and target arch combination") endif() -endfunction() +endif() -# Includes +#----------------------------------------------------- +# Initialize Cmake compiler flags and other variables +#----------------------------------------------------- if (CMAKE_CONFIGURATION_TYPES) # multi-configuration generator? set(CMAKE_CONFIGURATION_TYPES "Debug;Checked;Release;RelWithDebInfo" CACHE STRING "" FORCE) @@ -350,6 +228,9 @@ set(CMAKE_CXX_FLAGS_CHECKED ${CLR_CXX_FLAGS_CHECKED_INIT} CACHE STRING "Flags us set(CMAKE_EXE_LINKER_FLAGS_CHECKED "") set(CMAKE_SHARED_LINKER_FLAGS_CHECKED "") +# Disable the following line for UNIX altjit on Windows +set(CMAKE_CXX_STANDARD_LIBRARIES "") # do not link against standard win32 libs i.e. kernel32, uuid, user32, etc. + if (WIN32) # For multi-configuration toolset (as Visual Studio) # set the different configuration defines. @@ -359,6 +240,66 @@ if (WIN32) endforeach (Definition) endforeach (Config) + if(NOT CLR_CMAKE_PLATFORM_ARCH_ARM64) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf") + endif (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64) + + # Incremental linking with CFG is broken until next VS release. + # This needs to be appended to the last for each build type to override the default flag. + set(NO_INCREMENTAL_LINKER_FLAGS "/INCREMENTAL:NO") + + # Linker flags + # + # Disable the following line for UNIX altjit on Windows + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO") #Do not create Side-by-Side Assembly Manifest + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.00") #windows subsystem + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LARGEADDRESSAWARE") # can handle addresses larger than 2 gigabytes + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /RELEASE") #sets the checksum in the header + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NXCOMPAT") #Compatible with Data Execution Prevention + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DYNAMICBASE") #Use address space layout randomization + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUGTYPE:cv,fixup") #debugging format + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /PDBCOMPRESS") #shrink pdb size + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /IGNORE:4197,4013,4254,4070,4221") + + set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /IGNORE:4221") + + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /PDBCOMPRESS") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1572864") + + # Debug build specific flags + set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/NOVCFEATURE ${NO_INCREMENTAL_LINKER_FLAGS}") + set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${NO_INCREMENTAL_LINKER_FLAGS}") + + # Checked build specific flags + set(CMAKE_SHARED_LINKER_FLAGS_CHECKED "${CMAKE_SHARED_LINKER_FLAGS_CHECKED} /OPT:REF /OPT:NOICF /NOVCFEATURE ${NO_INCREMENTAL_LINKER_FLAGS}") + set(CMAKE_STATIC_LINKER_FLAGS_CHECKED "${CMAKE_STATIC_LINKER_FLAGS_CHECKED}") + set(CMAKE_EXE_LINKER_FLAGS_CHECKED "${CMAKE_EXE_LINKER_FLAGS_CHECKED} /OPT:REF /OPT:NOICF ${NO_INCREMENTAL_LINKER_FLAGS}") + + # Release build specific flags + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG /OPT:REF /OPT:ICF ${NO_INCREMENTAL_LINKER_FLAGS}") + set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /LTCG") + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG /OPT:REF /OPT:ICF ${NO_INCREMENTAL_LINKER_FLAGS}") + + # ReleaseWithDebugInfo build specific flags + set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /LTCG /OPT:REF /OPT:ICF ${NO_INCREMENTAL_LINKER_FLAGS}") + set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /LTCG") + set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /LTCG /OPT:REF /OPT:ICF ${NO_INCREMENTAL_LINKER_FLAGS}") + + # Temporary until cmake has VS generators for arm64 + if(CLR_CMAKE_PLATFORM_ARCH_ARM64) + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /machine:arm64") + set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /machine:arm64") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /machine:arm64") + else() + # Force uCRT to be dynamically linked for Release build + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") + set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") + set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") + endif(CLR_CMAKE_PLATFORM_ARCH_ARM64) + elseif (CLR_CMAKE_PLATFORM_UNIX) # Set the values to display when interactively configuring CMAKE_BUILD_TYPE set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "DEBUG;CHECKED;RELEASE;RELWITHDEBINFO") @@ -384,57 +325,6 @@ elseif (CLR_CMAKE_PLATFORM_UNIX) message(FATAL_ERROR "Unknown build type! Set CMAKE_BUILD_TYPE to DEBUG, CHECKED, RELEASE, or RELWITHDEBINFO!") endif () -endif(WIN32) - -if (CLR_CMAKE_PLATFORM_UNIX) - add_definitions(-DPLATFORM_UNIX=1) - - if(CLR_CMAKE_PLATFORM_LINUX) - if(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64) - message("Detected Linux x86_64") - add_definitions(-DLINUX64) - elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) - message("Detected Linux ARM") - add_definitions(-DLINUX32) - elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) - message("Detected Linux ARM64") - add_definitions(-DLINUX64) - else() - clr_unknown_arch() - endif() - endif(CLR_CMAKE_PLATFORM_LINUX) - - if(CLR_CMAKE_PLATFORM_DARWIN) - message("Detected OSX x86_64") - endif(CLR_CMAKE_PLATFORM_DARWIN) - - if(CLR_CMAKE_PLATFORM_FREEBSD) - message("Detected FreeBSD amd64") - endif(CLR_CMAKE_PLATFORM_FREEBSD) - - if(CLR_CMAKE_PLATFORM_NETBSD) - message("Detected NetBSD amd64") - endif(CLR_CMAKE_PLATFORM_NETBSD) - - # Disable frame pointer optimizations so profilers can get better call stacks - add_compile_options(-fno-omit-frame-pointer) - - # The -fms-extensions enable the stuff like __if_exists, __declspec(uuid()), etc. - add_compile_options(-fms-extensions ) - #-fms-compatibility Enable full Microsoft Visual C++ compatibility - #-fms-extensions Accept some non-standard constructs supported by the Microsoft compiler - - if(CLR_CMAKE_PLATFORM_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() - add_compile_options(-fstack-protector-strong) - endif(CLR_CMAKE_PLATFORM_DARWIN) - - if(CLR_CMAKE_PLATFORM_LINUX) - set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -Wa,--noexecstack") - endif(CLR_CMAKE_PLATFORM_LINUX) - # set the CLANG sanitizer flags for debug build if(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL CHECKED) # obtain settings from running enablesanitizers.sh @@ -469,210 +359,20 @@ if (CLR_CMAKE_PLATFORM_UNIX) set(CMAKE_SHARED_LINKER_FLAGS_CHECKED "${CMAKE_SHARED_LINKER_FLAGS_CHECKED} ${CLR_SANITIZE_LINK_FLAGS} -Wl,--gc-sections") endif () endif(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL CHECKED) +endif(WIN32) - add_definitions(-DDISABLE_CONTRACTS) - # The -ferror-limit is helpful during the porting, it makes sure the compiler doesn't stop - # after hitting just about 20 errors. - add_compile_options(-ferror-limit=4096) - - # All warnings that are not explicitly disabled are reported as errors - add_compile_options(-Werror) - - # Disabled warnings - add_compile_options(-Wno-unused-private-field) - add_compile_options(-Wno-unused-variable) - # Explicit constructor calls are not supported by clang (this->ClassName::ClassName()) - add_compile_options(-Wno-microsoft) - # This warning is caused by comparing 'this' to NULL - add_compile_options(-Wno-tautological-compare) - # There are constants of type BOOL used in a condition. But BOOL is defined as int - # and so the compiler thinks that there is a mistake. - add_compile_options(-Wno-constant-logical-operand) - - add_compile_options(-Wno-unknown-warning-option) - - #These seem to indicate real issues - add_compile_options(-Wno-invalid-offsetof) - # The following warning indicates that an attribute __attribute__((__ms_struct__)) was applied - # to a struct or a class that has virtual members or a base class. In that case, clang - # may not generate the same object layout as MSVC. - add_compile_options(-Wno-incompatible-ms-struct) - -endif(CLR_CMAKE_PLATFORM_UNIX) - -if (WIN32) - # Compile options for targeting windows - - # The following options are set by the razzle build - add_compile_options(/TP) # compile all files as C++ - add_compile_options(/d2Zi+) # make optimized builds debugging easier - add_compile_options(/nologo) # Suppress Startup Banner - add_compile_options(/W3) # set warning level to 3 - add_compile_options(/WX) # treat warnings as errors - add_compile_options(/Oi) # enable intrinsics - add_compile_options(/Oy-) # disable suppressing of the creation of frame pointers on the call stack for quicker function calls - add_compile_options(/U_MT) # undefine the predefined _MT macro - add_compile_options(/GF) # enable read-only string pooling - add_compile_options(/Gm-) # disable minimal rebuild - add_compile_options(/EHa) # enable C++ EH (w/ SEH exceptions) - add_compile_options(/Zp8) # pack structs on 8-byte boundary - add_compile_options(/Gy) # separate functions for linker - add_compile_options(/Zc:wchar_t-) # C++ language conformance: wchar_t is NOT the native type, but a typedef - add_compile_options(/Zc:forScope) # C++ language conformance: enforce Standard C++ for scoping rules - add_compile_options(/GR-) # disable C++ RTTI - add_compile_options(/FC) # use full pathnames in diagnostics - add_compile_options(/MP) # Build with Multiple Processes (number of processes equal to the number of processors) - add_compile_options(/GS) # Buffer Security Check - add_compile_options(/Zm200) # Specify Precompiled Header Memory Allocation Limit of 150MB - add_compile_options(/wd4960 /wd4961 /wd4603 /wd4627 /wd4838 /wd4456 /wd4457 /wd4458 /wd4459 /wd4091 /we4640) - add_compile_options(/Zi) # enable debugging information - - if (CLR_CMAKE_PLATFORM_ARCH_I386) - add_compile_options(/Gz) - endif (CLR_CMAKE_PLATFORM_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) - # 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) - - if(NOT CLR_CMAKE_PLATFORM_ARCH_ARM64) - # enable control-flow-guard support for native components for non-Arm64 builds - add_compile_options(/guard:cf) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /guard:cf") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /guard:cf") - - # Statically linked CRT (libcmt[d].lib, libvcruntime[d].lib and libucrt[d].lib) by default. This is done to avoid - # linking in VCRUNTIME140.DLL for a simplified xcopy experience by reducing the dependency on VC REDIST. - # - # For Release builds, we shall dynamically link into uCRT [ucrtbase.dll] (which is pushed down as a Windows Update on downlevel OS) but - # wont do the same for debug/checked builds since ucrtbased.dll is not redistributable and Debug/Checked builds are not - # production-time scenarios. - add_compile_options($<$<OR:$<CONFIG:Release>,$<CONFIG:Relwithdebinfo>>:/MT>) - add_compile_options($<$<OR:$<CONFIG:Debug>,$<CONFIG:Checked>>:/MTd>) - endif (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64) - - # Incremental linking with CFG is broken until next VS release. - # This needs to be appended to the last for each build type to override the default flag. - set(NO_INCREMENTAL_LINKER_FLAGS "/INCREMENTAL:NO") - - # Linker flags - # - # Disable the following line for UNIX altjit on Windows - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO") #Do not create Side-by-Side Assembly Manifest - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.00") #windows subsystem - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LARGEADDRESSAWARE") # can handle addresses larger than 2 gigabytes - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /RELEASE") #sets the checksum in the header - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NXCOMPAT") #Compatible with Data Execution Prevention - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DYNAMICBASE") #Use address space layout randomization - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUGTYPE:cv,fixup") #debugging format - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /PDBCOMPRESS") #shrink pdb size - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /IGNORE:4197,4013,4254,4070,4221") - - set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /IGNORE:4221") - - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /PDBCOMPRESS") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1572864") - - # Debug build specific flags - set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/NOVCFEATURE ${NO_INCREMENTAL_LINKER_FLAGS}") - set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${NO_INCREMENTAL_LINKER_FLAGS}") - - # Checked build specific flags - set(CMAKE_SHARED_LINKER_FLAGS_CHECKED "${CMAKE_SHARED_LINKER_FLAGS_CHECKED} /OPT:REF /OPT:NOICF /NOVCFEATURE ${NO_INCREMENTAL_LINKER_FLAGS}") - set(CMAKE_STATIC_LINKER_FLAGS_CHECKED "${CMAKE_STATIC_LINKER_FLAGS_CHECKED}") - set(CMAKE_EXE_LINKER_FLAGS_CHECKED "${CMAKE_EXE_LINKER_FLAGS_CHECKED} /OPT:REF /OPT:NOICF ${NO_INCREMENTAL_LINKER_FLAGS}") - - # Release build specific flags - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG /OPT:REF /OPT:ICF ${NO_INCREMENTAL_LINKER_FLAGS}") - set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /LTCG") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG /OPT:REF /OPT:ICF ${NO_INCREMENTAL_LINKER_FLAGS}") - - # ReleaseWithDebugInfo build specific flags - set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /LTCG /OPT:REF /OPT:ICF ${NO_INCREMENTAL_LINKER_FLAGS}") - set(CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO} /LTCG") - set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /LTCG /OPT:REF /OPT:ICF ${NO_INCREMENTAL_LINKER_FLAGS}") - -# Temporary until cmake has VS generators for arm64 -if(CLR_CMAKE_PLATFORM_ARCH_ARM64) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /machine:arm64") - set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /machine:arm64") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /machine:arm64") -else() - # Force uCRT to be dynamically linked for Release builds - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") - set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") - set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") - -endif(CLR_CMAKE_PLATFORM_ARCH_ARM64) - -endif (WIN32) - -OPTION(CMAKE_ENABLE_CODE_COVERAGE "Enable code coverage" OFF) - -if(CMAKE_ENABLE_CODE_COVERAGE) - - if(CLR_CMAKE_PLATFORM_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" ) - endif(NOT UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG) - - add_compile_options(-fprofile-arcs) - add_compile_options(-ftest-coverage) - set(CLANG_COVERAGE_LINK_FLAGS "--coverage") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CLANG_COVERAGE_LINK_FLAGS}") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CLANG_COVERAGE_LINK_FLAGS}") - else() - message(FATAL_ERROR "Code coverage builds not supported on current platform") - endif(CLR_CMAKE_PLATFORM_UNIX) - -endif(CMAKE_ENABLE_CODE_COVERAGE) - -# Start of projects that require usage of platform include files - -if(CLR_CMAKE_PLATFORM_UNIX) - add_subdirectory(src/corefx) -endif(CLR_CMAKE_PLATFORM_UNIX) - -if(IS_64BIT_BUILD) - add_definitions(-DBIT64=1) -endif(IS_64BIT_BUILD) - -if (CLR_CMAKE_PLATFORM_ARCH_AMD64) - if (CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64) - add_definitions(-DDBG_TARGET_AMD64_UNIX) - endif() - add_definitions(-D_TARGET_AMD64_=1) - add_definitions(-DDBG_TARGET_AMD64) -elseif (CLR_CMAKE_PLATFORM_ARCH_ARM64) - if (CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM64) - add_definitions(-DDBG_TARGET_ARM64_UNIX) - endif() - add_definitions(-D_TARGET_ARM64_=1) - add_definitions(-DDBG_TARGET_ARM64) -elseif (CLR_CMAKE_PLATFORM_ARCH_ARM) - if (CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM) - add_definitions(-DDBG_TARGET_ARM_UNIX) - endif (CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM) - add_definitions(-D_TARGET_ARM_=1) - add_definitions(-DDBG_TARGET_ARM) -elseif (CLR_CMAKE_PLATFORM_ARCH_I386) - add_definitions(-D_TARGET_X86_=1) - add_definitions(-DDBG_TARGET_X86) -else () - clr_unknown_arch() -endif (CLR_CMAKE_PLATFORM_ARCH_AMD64) +if(CLR_CMAKE_PLATFORM_LINUX) + set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -Wa,--noexecstack") +endif(CLR_CMAKE_PLATFORM_LINUX) +#------------------------------------ +# Definitions (for platform) +#----------------------------------- if (CLR_CMAKE_PLATFORM_ARCH_AMD64) add_definitions(-D_AMD64_) add_definitions(-D_WIN64) add_definitions(-DAMD64) + add_definitions(-DBIT64=1) elseif (CLR_CMAKE_PLATFORM_ARCH_I386) add_definitions(-D_X86_) elseif (CLR_CMAKE_PLATFORM_ARCH_ARM) @@ -682,60 +382,43 @@ elseif (CLR_CMAKE_PLATFORM_ARCH_ARM64) add_definitions(-D_ARM64_) add_definitions(-DARM64) add_definitions(-D_WIN64) + add_definitions(-DBIT64=1) else () clr_unknown_arch() endif () -if (WIN32) - set(FEATURE_EVENT_TRACE 1) -endif() -if(CLR_CMAKE_PLATFORM_LINUX AND CLR_CMAKE_PLATFORM_ARCH_AMD64) - set(FEATURE_EVENT_TRACE 1) -endif() - -if(CLR_CMAKE_PLATFORM_UNIX) - add_subdirectory(src/ToolBox/SOS/lldbplugin) - add_subdirectory(src/pal) - add_subdirectory(src/coreclr/hosts) - add_subdirectory(src/ildasm/unixcoreclrloader) +if (CLR_CMAKE_PLATFORM_UNIX) + if(CLR_CMAKE_PLATFORM_LINUX) + if(CLR_CMAKE_PLATFORM_UNIX_AMD64) + message("Detected Linux x86_64") + add_definitions(-DLINUX64) + elseif(CLR_CMAKE_PLATFORM_UNIX_ARM) + message("Detected Linux ARM") + add_definitions(-DLINUX32) + elseif(CLR_CMAKE_PLATFORM_UNIX_ARM64) + message("Detected Linux ARM64") + add_definitions(-DLINUX64) + else() + clr_unknown_arch() + endif() + endif(CLR_CMAKE_PLATFORM_LINUX) endif(CLR_CMAKE_PLATFORM_UNIX) -# Add this subdir. We install the headers for the jit. -add_subdirectory(src/pal/prebuilt/inc) - -add_subdirectory(src/debug/debug-pal) - -if(WIN32) - add_subdirectory(src/gc/sample) -endif() - -# End of projects that require usage of platform include files - -if(WIN32 AND CLR_CMAKE_PLATFORM_ARCH_I386 AND BUILD_JIT32) - set(CLR_BUILD_JIT32 1) -else() - set(CLR_BUILD_JIT32 0) -endif() - -# Enable for UNIX altjit on Windows - set(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64 1) -# Enable for UNIX altjit on Windows - add_definitions(-DCLR_CMAKE_PLATFORM_UNIX=1) - -# Disable the following line for UNIX altjit on Windows -set(CMAKE_CXX_STANDARD_LIBRARIES "") # do not link against standard win32 libs i.e. kernel32, uuid, user32, etc. - -# Include directory directives +if (CLR_CMAKE_PLATFORM_UNIX) + add_definitions(-DPLATFORM_UNIX=1) -# Include the basic prebuilt headers - required for getting fileversion resource details. -include_directories("src/pal/prebuilt/inc") -include_directories("bin/obj") + if(CLR_CMAKE_PLATFORM_DARWIN) + message("Detected OSX x86_64") + endif(CLR_CMAKE_PLATFORM_DARWIN) -if (CLR_CMAKE_PLATFORM_UNIX) - include_directories("src/pal/inc") - include_directories("src/pal/inc/rt") - include_directories("src/pal/src/safecrt") -endif (CLR_CMAKE_PLATFORM_UNIX) + if(CLR_CMAKE_PLATFORM_FREEBSD) + message("Detected FreeBSD amd64") + endif(CLR_CMAKE_PLATFORM_FREEBSD) -# Libraries + if(CLR_CMAKE_PLATFORM_NETBSD) + message("Detected NetBSD amd64") + endif(CLR_CMAKE_PLATFORM_NETBSD) +endif(CLR_CMAKE_PLATFORM_UNIX) if (WIN32) @@ -757,175 +440,145 @@ if (WIN32) endif(WIN32) -# Definition directives - -if (CLR_CMAKE_PLATFORM_UNIX) - - if(CLR_CMAKE_PLATFORM_DARWIN) - add_definitions(-D_XOPEN_SOURCE) - endif(CLR_CMAKE_PLATFORM_DARWIN) +# Architecture specific files folder name +if (CLR_CMAKE_TARGET_ARCH_AMD64) + set(ARCH_SOURCES_DIR amd64) +elseif (CLR_CMAKE_TARGET_ARCH_ARM64) + set(ARCH_SOURCES_DIR arm64) +elseif (CLR_CMAKE_TARGET_ARCH_ARM) + set(ARCH_SOURCES_DIR arm) +elseif (CLR_CMAKE_TARGET_ARCH_I386) + set(ARCH_SOURCES_DIR i386) +else () + clr_unknown_arch() +endif () - if (CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64) - add_definitions(-DUNIX_AMD64_ABI) - elseif (CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM) - add_definitions(-DUNIX_ARM_ABI) - endif() +# Enable for UNIX altjit on Windows - set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) +# Enable for UNIX altjit on Windows - add_definitions(-DCLR_CMAKE_PLATFORM_UNIX=1) +#-------------------------------------- +# Compile Options +#-------------------------------------- +include(compileoptions.cmake) + +#---------------------------------------------------- +# Cross target Component build specific configuration +#---------------------------------------------------- +if(CLR_CROSS_COMPONENTS_BUILD) + include(crosscomponents.cmake) +endif(CLR_CROSS_COMPONENTS_BUILD) + +#----------------------------------------- +# Add Projects +# - project which require platform header not clr's +# - do not depend on clr's compile definitions +#----------------------------------------- +if(CLR_CMAKE_PLATFORM_UNIX) + add_subdirectory(src/corefx) endif(CLR_CMAKE_PLATFORM_UNIX) -add_definitions(-D_BLD_CLR) -add_definitions(-DDEBUGGING_SUPPORTED) -add_definitions(-DPROFILING_SUPPORTED) +if(CLR_CMAKE_PLATFORM_UNIX) + add_subdirectory(src/ToolBox/SOS/lldbplugin) + if(NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) + add_subdirectory(src/pal) + endif(NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) + add_subdirectory(src/coreclr/hosts) + add_subdirectory(src/ildasm/unixcoreclrloader) +endif(CLR_CMAKE_PLATFORM_UNIX) -if(WIN32) - add_definitions(-DWIN32) - add_definitions(-D_WIN32) - add_definitions(-DWINVER=0x0602) - add_definitions(-D_WIN32_WINNT=0x0602) - add_definitions(-DWIN32_LEAN_AND_MEAN=1) - if(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_I386) - add_definitions(-D_CRT_SECURE_NO_WARNINGS) - # Only enable edit and continue on windows x86 and x64 - # exclude Linux, arm & arm64 - add_definitions(-DEnC_SUPPORTED) - endif(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_I386) -endif(WIN32) +# Add this subdir. We install the headers for the jit. +add_subdirectory(src/pal/prebuilt/inc) -# Features - please keep them alphabetically sorted +add_subdirectory(src/debug/debug-pal) -add_definitions(-DFEATURE_APPDOMAIN_RESOURCE_MONITORING) if(WIN32) - add_definitions(-DFEATURE_APPX) -endif(WIN32) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_ARM OR CLR_CMAKE_PLATFORM_ARCH_ARM64) - add_definitions(-DFEATURE_ARRAYSTUB_AS_IL) + add_subdirectory(src/gc/sample) endif() -add_definitions(-DFEATURE_ASYNC_IO) -add_definitions(-DFEATURE_BCL_FORMATTING) -add_definitions(-DFEATURE_COLLECTIBLE_TYPES) - +# Above projects do not build with these compile options +# All of the compiler options are specified in file compileoptions.cmake +# Do not add any new options here. They shoul be added in compileoptions.cmake if(WIN32) - add_definitions(-DFEATURE_CLASSIC_COMINTEROP) - add_definitions(-DFEATURE_COMINTEROP) - add_definitions(-DFEATURE_COMINTEROP_APARTMENT_SUPPORT) - add_definitions(-DFEATURE_COMINTEROP_UNMANAGED_ACTIVATION) - add_definitions(-DFEATURE_COMINTEROP_WINRT_MANAGED_ACTIVATION) + add_compile_options(/FIWarningControl.h) # force include of WarningControl.h + add_compile_options(/Zl) # omit default library name in .OBJ endif(WIN32) -add_definitions(-DFEATURE_CORECLR) +#------------------------------------- +# Include directory directives +#------------------------------------- +# Include the basic prebuilt headers - required for getting fileversion resource details. +include_directories("src/pal/prebuilt/inc") +include_directories("bin/obj") + 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(CLR_CMAKE_PLATFORM_UNIX) - add_definitions(-DFEATURE_DBGIPC_TRANSPORT_DI) - add_definitions(-DFEATURE_DBGIPC_TRANSPORT_VM) -endif(CLR_CMAKE_PLATFORM_UNIX) -if(FEATURE_EVENT_TRACE) - add_definitions(-DFEATURE_EVENT_TRACE=1) - if(CLR_CMAKE_PLATFORM_UNIX) - add_definitions(-DFEATURE_EVENTSOURCE_XPLAT=1) - endif(CLR_CMAKE_PLATFORM_UNIX) -endif(FEATURE_EVENT_TRACE) -add_definitions(-DFEATURE_EXCEPTIONDISPATCHINFO) -# NetBSD doesn't implement this feature -if(NOT CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) - add_definitions(-DFEATURE_HIJACK) -endif(NOT CLR_CMAKE_PLATFORM_UNIX_TARGET_ARM AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) -add_definitions(-DFEATURE_HOST_ASSEMBLY_RESOLVER) -add_definitions(-DFEATURE_HOSTED_BINDER) -add_definitions(-DFEATURE_ICASTABLE) -if (CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_PLATFORM_ARCH_ARM64) - add_definitions(-DFEATURE_IMPLICIT_TLS) - set(FEATURE_IMPLICIT_TLS 1) -endif(CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_PLATFORM_ARCH_ARM64) -add_definitions(-DFEATURE_ISYM_READER) -add_definitions(-DFEATURE_LOADER_OPTIMIZATION) -add_definitions(-DFEATURE_MANAGED_ETW) -add_definitions(-DFEATURE_MANAGED_ETW_CHANNELS) -add_definitions(-DFEATURE_MAIN_CLR_MODULE_USES_CORE_NAME) -add_definitions(-DFEATURE_MERGE_CULTURE_SUPPORT_AND_ENGINE) -if(WIN32) -# Disable the following for UNIX altjit on Windows -add_definitions(-DFEATURE_MERGE_JIT_AND_ENGINE) -endif(WIN32) -add_definitions(-DFEATURE_MULTICOREJIT) -add_definitions(-DFEATURE_NORM_IDNA_ONLY) -if(CLR_CMAKE_PLATFORM_UNIX) - add_definitions(-DFEATURE_PAL) - add_definitions(-DFEATURE_PAL_SXS) - add_definitions(-DFEATURE_PAL_ANSI) -endif(CLR_CMAKE_PLATFORM_UNIX) -if(CLR_CMAKE_PLATFORM_LINUX) - add_definitions(-DFEATURE_PERFMAP) -endif(CLR_CMAKE_PLATFORM_LINUX) -add_definitions(-DFEATURE_PREJIT) -add_definitions(-DFEATURE_RANDOMIZED_STRING_HASHING) -if(NOT DEFINED CLR_CMAKE_PLATFORM_ARCH_ARM64) - add_definitions(-DFEATURE_READYTORUN) - set(FEATURE_READYTORUN 1) -endif(NOT DEFINED CLR_CMAKE_PLATFORM_ARCH_ARM64) - -if (CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_I386) - add_definitions(-DFEATURE_REJIT) -endif(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_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_PLATFORM_ARCH_ARM64) AND NOT CLR_CMAKE_PLATFORM_ARCH_ARM) - add_definitions(-DFEATURE_STUBS_AS_IL) -endif ((CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_PLATFORM_ARCH_ARM64) AND NOT CLR_CMAKE_PLATFORM_ARCH_ARM) -add_definitions(-DFEATURE_SVR_GC) -add_definitions(-DFEATURE_SYMDIFF) -add_definitions(-DFEATURE_SYNTHETIC_CULTURES) -if(CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64) - add_definitions(-DFEATURE_UNIX_AMD64_STRUCT_PASSING) - add_definitions(-DFEATURE_UNIX_AMD64_STRUCT_PASSING_ITF) -endif (CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64) -add_definitions(-DFEATURE_USE_ASM_GC_WRITE_BARRIERS) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64 AND NOT WIN32) - add_definitions(-DFEATURE_USE_SOFTWARE_WRITE_WATCH_FOR_GC_HEAP) -endif(CLR_CMAKE_PLATFORM_ARCH_AMD64 AND NOT WIN32) -add_definitions(-DFEATURE_VERSIONING) -if(WIN32) - add_definitions(-DFEATURE_VERSIONING_LOG) -endif(WIN32) -add_definitions(-DFEATURE_WIN32_REGISTRY) -add_definitions(-DFEATURE_WINDOWSPHONE) -add_definitions(-DFEATURE_WINMD_RESILIENT) + include_directories("src/pal/inc") + include_directories("src/pal/inc/rt") + include_directories("src/pal/src/safecrt") +endif (CLR_CMAKE_PLATFORM_UNIX) + +#-------------------------------- +# Definition directives +# - all clr specific compile definitions should be included in this file +# - all clr specific feature variable should also be added in this file +#---------------------------------- +include(clrdefinitions.cmake) + +# Microsoft.Dotnet.BuildTools.Coreclr version +set(BuildToolsVersion "1.0.4-prerelease") +set(BuildToolsDir "${CLR_DIR}/packages/Microsoft.DotNet.BuildTools.CoreCLR/${BuildToolsVersion}") + +#------------------------------ +# Add Product Directory +#------------------------------ +add_subdirectory(src) +#------------------------------ +# Add Test Directory +#------------------------------ if(CLR_CMAKE_BUILD_TESTS) + # remove some definitions for test build + remove_definitions(-D_SECURE_SCL=0) + remove_definitions(-DUNICODE) + remove_definitions(-D_UNICODE) + add_subdirectory(tests) endif(CLR_CMAKE_BUILD_TESTS) -if (CLR_CMAKE_PLATFORM_ARCH_AMD64) - set(ARCH_SOURCES_DIR amd64) -elseif (CLR_CMAKE_PLATFORM_ARCH_ARM64) - set(ARCH_SOURCES_DIR arm64) -elseif (CLR_CMAKE_PLATFORM_ARCH_ARM) - set(ARCH_SOURCES_DIR arm) -elseif (CLR_CMAKE_PLATFORM_ARCH_I386) - set(ARCH_SOURCES_DIR i386) -else () - clr_unknown_arch() -endif () - -add_definitions(-D_SECURE_SCL=0) -add_definitions(-DUNICODE) -add_definitions(-D_UNICODE) +#---------------------------------------------------- +# Build the project again for cross target components +# - intermediates will be placed at %__IntermediatesDir%\crosscomponents +# - final binaries will be placed at %__CMakeBinDir%\<hostArch> +#---------------------------------------------------- -# Compiler options +if(CLR_CMAKE_PLATFORM_ARCH_ARM64 AND WIN32) + # Cross target component build only enabled for win arm64 + set(CLR_CROSS_COMPONENTS_BUILD_ENABLED 1) +endif() -if(WIN32) - add_compile_options(/FIWarningControl.h) # force include of WarningControl.h - add_compile_options(/Zl) # omit default library name in .OBJ -endif(WIN32) +# To avoid recursion when building cross target components +if(NOT DEFINED CLR_CROSS_COMPONENTS_BUILD AND CLR_CROSS_COMPONENTS_BUILD_ENABLED) -# Microsoft.Dotnet.BuildTools.Coreclr version -set(BuildToolsVersion "1.0.4-prerelease") -set(BuildToolsDir "${CLR_DIR}/packages/Microsoft.DotNet.BuildTools.CoreCLR/${BuildToolsVersion}") + # Set host arch for cross target components + if(CLR_CMAKE_PLATFORM_ARCH_ARM64) + set(CLR_CROSS_BUILD_HOST_ARCH x64) + elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) + set(CLR_CROSS_BUILD_HOST_ARCH x86) + endif() -add_subdirectory(src) + include(ExternalProject) + + # Add the source root again as external project but with CLR_CROSS_COMPONENTS_BUILD flag set + ExternalProject_Add( + crosscomponents + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} + # Arm64 builds currently pollute the env by setting private toolset dirs. Get rid of that. + CMAKE_COMMAND "$ENV{__VSToolsRoot}\\..\\..\\VC\\vcvarsall.bat" COMMAND cmake + CMAKE_ARGS -DCLR_CROSS_COMPONENTS_BUILD=1 + -DCMAKE_INSTALL_PREFIX:PATH=$ENV{__CMakeBinDir}/${CLR_CROSS_BUILD_HOST_ARCH} + -DCMAKE_USER_MAKE_RULES_OVERRIDE=${CLR_DIR}/src/pal/tools/windows-compiler-override.txt + -DCLR_CMAKE_HOST_ARCH=${CLR_CROSS_BUILD_HOST_ARCH} + -DCLR_CMAKE_TARGET_ARCH=${CLR_CMAKE_HOST_ARCH} + BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/crosscomponents + INSTALL_DIR $ENV{__CMakeBinDir}/${CLR_CROSS_BUILD_HOST_ARCH} + ) +endif() diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake new file mode 100644 index 0000000000..e818e1f87e --- /dev/null +++ b/clrdefinitions.cmake @@ -0,0 +1,181 @@ +if(WIN32 AND CLR_CMAKE_PLATFORM_ARCH_I386 AND BUILD_JIT32) + set(CLR_BUILD_JIT32 1) +else() + set(CLR_BUILD_JIT32 0) +endif() + +if (WIN32) + set(FEATURE_EVENT_TRACE 1) +endif() +if(CLR_CMAKE_PLATFORM_LINUX AND CLR_CMAKE_PLATFORM_ARCH_AMD64) + set(FEATURE_EVENT_TRACE 1) +endif() + +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(-DDBG_TARGET_64BIT=1) + add_definitions(-DDBG_TARGET_AMD64=1) + add_definitions(-DDBG_TARGET_WIN64=1) +elseif (CLR_CMAKE_TARGET_ARCH_ARM64) + if (CLR_CMAKE_PLATFORM_UNIX) + add_definitions(-DDBG_TARGET_ARM64_UNIX) + endif() + add_definitions(-D_TARGET_ARM64_=1) + add_definitions(-DDBG_TARGET_64BIT=1) + add_definitions(-DDBG_TARGET_ARM64=1) + add_definitions(-DDBG_TARGET_WIN64=1) +elseif (CLR_CMAKE_TARGET_ARCH_ARM) + if (CLR_CMAKE_PLATFORM_UNIX) + add_definitions(-DDBG_TARGET_ARM_UNIX) + endif (CLR_CMAKE_PLATFORM_UNIX) + add_definitions(-D_TARGET_ARM_=1) + add_definitions(-DDBG_TARGET_32BIT=1) + add_definitions(-DDBG_TARGET_ARM=1) +elseif (CLR_CMAKE_TARGET_ARCH_I386) + add_definitions(-D_TARGET_X86_=1) + add_definitions(-DDBG_TARGET_32BIT=1) + add_definitions(-DDBG_TARGET_X86=1) +else () + clr_unknown_arch() +endif (CLR_CMAKE_TARGET_ARCH_AMD64) + +if (CLR_CMAKE_PLATFORM_UNIX) + + if(CLR_CMAKE_PLATFORM_DARWIN) + add_definitions(-D_XOPEN_SOURCE) + endif(CLR_CMAKE_PLATFORM_DARWIN) + + if (CLR_CMAKE_PLATFORM_UNIX_AMD64) + add_definitions(-DUNIX_AMD64_ABI) + elseif (CLR_CMAKE_PLATFORM_UNIX_ARM) + add_definitions(-DUNIX_ARM_ABI) + endif() + +endif(CLR_CMAKE_PLATFORM_UNIX) + +add_definitions(-D_BLD_CLR) +add_definitions(-DDEBUGGING_SUPPORTED) +add_definitions(-DPROFILING_SUPPORTED) + +if(WIN32) + add_definitions(-DWIN32) + add_definitions(-D_WIN32) + add_definitions(-DWINVER=0x0602) + add_definitions(-D_WIN32_WINNT=0x0602) + add_definitions(-DWIN32_LEAN_AND_MEAN=1) + if(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_I386) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) + # Only enable edit and continue on windows x86 and x64 + # exclude Linux, arm & arm64 + add_definitions(-DEnC_SUPPORTED) + endif(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_I386) +endif(WIN32) + +# Features - please keep them alphabetically sorted + +add_definitions(-DFEATURE_APPDOMAIN_RESOURCE_MONITORING) +if(WIN32) + add_definitions(-DFEATURE_APPX) +endif(WIN32) +if(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_ARM OR CLR_CMAKE_PLATFORM_ARCH_ARM64) + add_definitions(-DFEATURE_ARRAYSTUB_AS_IL) +endif() + +add_definitions(-DFEATURE_ASYNC_IO) +add_definitions(-DFEATURE_BCL_FORMATTING) +add_definitions(-DFEATURE_COLLECTIBLE_TYPES) + +if(WIN32) + add_definitions(-DFEATURE_CLASSIC_COMINTEROP) + add_definitions(-DFEATURE_COMINTEROP) + add_definitions(-DFEATURE_COMINTEROP_APARTMENT_SUPPORT) + add_definitions(-DFEATURE_COMINTEROP_UNMANAGED_ACTIVATION) + add_definitions(-DFEATURE_COMINTEROP_WINRT_MANAGED_ACTIVATION) +endif(WIN32) + +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(CLR_CMAKE_PLATFORM_UNIX) + add_definitions(-DFEATURE_DBGIPC_TRANSPORT_DI) + add_definitions(-DFEATURE_DBGIPC_TRANSPORT_VM) +endif(CLR_CMAKE_PLATFORM_UNIX) +if(FEATURE_EVENT_TRACE) + add_definitions(-DFEATURE_EVENT_TRACE=1) + if(CLR_CMAKE_PLATFORM_UNIX) + add_definitions(-DFEATURE_EVENTSOURCE_XPLAT=1) + endif(CLR_CMAKE_PLATFORM_UNIX) +endif(FEATURE_EVENT_TRACE) +add_definitions(-DFEATURE_EXCEPTIONDISPATCHINFO) +# NetBSD doesn't implement this feature +if(NOT CLR_CMAKE_PLATFORM_UNIX_ARM AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) + add_definitions(-DFEATURE_HIJACK) +endif(NOT CLR_CMAKE_PLATFORM_UNIX_ARM AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) +add_definitions(-DFEATURE_HOST_ASSEMBLY_RESOLVER) +add_definitions(-DFEATURE_HOSTED_BINDER) +add_definitions(-DFEATURE_ICASTABLE) +if (CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_PLATFORM_ARCH_ARM64) + add_definitions(-DFEATURE_IMPLICIT_TLS) + set(FEATURE_IMPLICIT_TLS 1) +endif(CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_PLATFORM_ARCH_ARM64) +add_definitions(-DFEATURE_ISYM_READER) +add_definitions(-DFEATURE_LOADER_OPTIMIZATION) +add_definitions(-DFEATURE_MANAGED_ETW) +add_definitions(-DFEATURE_MANAGED_ETW_CHANNELS) +add_definitions(-DFEATURE_MAIN_CLR_MODULE_USES_CORE_NAME) +add_definitions(-DFEATURE_MERGE_CULTURE_SUPPORT_AND_ENGINE) +if(WIN32) +# Disable the following for UNIX altjit on Windows +add_definitions(-DFEATURE_MERGE_JIT_AND_ENGINE) +endif(WIN32) +add_definitions(-DFEATURE_MULTICOREJIT) +add_definitions(-DFEATURE_NORM_IDNA_ONLY) +if(CLR_CMAKE_PLATFORM_UNIX) + add_definitions(-DFEATURE_PAL) + add_definitions(-DFEATURE_PAL_SXS) + add_definitions(-DFEATURE_PAL_ANSI) +endif(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_PLATFORM_LINUX) + add_definitions(-DFEATURE_PERFMAP) +endif(CLR_CMAKE_PLATFORM_LINUX) +add_definitions(-DFEATURE_PREJIT) +add_definitions(-DFEATURE_RANDOMIZED_STRING_HASHING) +if(NOT DEFINED CLR_CMAKE_TARGET_ARCH_ARM64) + add_definitions(-DFEATURE_READYTORUN) + set(FEATURE_READYTORUN 1) +endif(NOT DEFINED CLR_CMAKE_TARGET_ARCH_ARM64) + +if (CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_ARCH_I386) + add_definitions(-DFEATURE_REJIT) +endif(CLR_CMAKE_PLATFORM_ARCH_AMD64 OR CLR_CMAKE_PLATFORM_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_PLATFORM_ARCH_ARM64) AND NOT CLR_CMAKE_PLATFORM_ARCH_ARM) + add_definitions(-DFEATURE_STUBS_AS_IL) +endif ((CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_PLATFORM_ARCH_ARM64) AND NOT CLR_CMAKE_PLATFORM_ARCH_ARM) +add_definitions(-DFEATURE_SVR_GC) +add_definitions(-DFEATURE_SYMDIFF) +add_definitions(-DFEATURE_SYNTHETIC_CULTURES) +if(CLR_CMAKE_PLATFORM_UNIX_AMD64) + add_definitions(-DFEATURE_UNIX_AMD64_STRUCT_PASSING) + add_definitions(-DFEATURE_UNIX_AMD64_STRUCT_PASSING_ITF) +endif (CLR_CMAKE_PLATFORM_UNIX_AMD64) +add_definitions(-DFEATURE_USE_ASM_GC_WRITE_BARRIERS) +add_definitions(-DFEATURE_VERSIONING) +if(WIN32) + add_definitions(-DFEATURE_VERSIONING_LOG) +endif(WIN32) +add_definitions(-DFEATURE_WIN32_REGISTRY) +add_definitions(-DFEATURE_WINDOWSPHONE) +add_definitions(-DFEATURE_WINMD_RESILIENT) +add_definitions(-D_SECURE_SCL=0) +add_definitions(-DUNICODE) +add_definitions(-D_UNICODE)
\ No newline at end of file diff --git a/compileoptions.cmake b/compileoptions.cmake new file mode 100644 index 0000000000..4ec51d3ad2 --- /dev/null +++ b/compileoptions.cmake @@ -0,0 +1,131 @@ +if (CLR_CMAKE_PLATFORM_UNIX) + # Disable frame pointer optimizations so profilers can get better call stacks + add_compile_options(-fno-omit-frame-pointer) + + # The -fms-extensions enable the stuff like __if_exists, __declspec(uuid()), etc. + add_compile_options(-fms-extensions ) + #-fms-compatibility Enable full Microsoft Visual C++ compatibility + #-fms-extensions Accept some non-standard constructs supported by the Microsoft compiler + + if(CLR_CMAKE_PLATFORM_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() + add_compile_options(-fstack-protector-strong) + endif(CLR_CMAKE_PLATFORM_DARWIN) + + add_definitions(-DDISABLE_CONTRACTS) + # The -ferror-limit is helpful during the porting, it makes sure the compiler doesn't stop + # after hitting just about 20 errors. + add_compile_options(-ferror-limit=4096) + + # All warnings that are not explicitly disabled are reported as errors + add_compile_options(-Werror) + + # Disabled warnings + add_compile_options(-Wno-unused-private-field) + add_compile_options(-Wno-unused-variable) + # Explicit constructor calls are not supported by clang (this->ClassName::ClassName()) + add_compile_options(-Wno-microsoft) + # This warning is caused by comparing 'this' to NULL + add_compile_options(-Wno-tautological-compare) + # There are constants of type BOOL used in a condition. But BOOL is defined as int + # and so the compiler thinks that there is a mistake. + add_compile_options(-Wno-constant-logical-operand) + + add_compile_options(-Wno-unknown-warning-option) + + #These seem to indicate real issues + add_compile_options(-Wno-invalid-offsetof) + # The following warning indicates that an attribute __attribute__((__ms_struct__)) was applied + # to a struct or a class that has virtual members or a base class. In that case, clang + # may not generate the same object layout as MSVC. + add_compile_options(-Wno-incompatible-ms-struct) + +endif(CLR_CMAKE_PLATFORM_UNIX) + +if(CLR_CMAKE_PLATFORM_UNIX_ARM) + # Because we don't use CMAKE_C_COMPILER/CMAKE_CXX_COMPILER to use clang + # we have to set the triple by adding a compiler argument + add_compile_options(-mthumb) + add_compile_options(-mfpu=vfpv3) + if(ARM_SOFTFP) + add_compile_options(-mfloat-abi=softfp) + add_compile_options(-target armv7-linux-gnueabi) + else() + add_compile_options(-target armv7-linux-gnueabihf) + endif(ARM_SOFTFP) +endif(CLR_CMAKE_PLATFORM_UNIX_ARM) + +if (WIN32) + # Compile options for targeting windows + + # The following options are set by the razzle build + add_compile_options(/TP) # compile all files as C++ + add_compile_options(/d2Zi+) # make optimized builds debugging easier + add_compile_options(/nologo) # Suppress Startup Banner + add_compile_options(/W3) # set warning level to 3 + add_compile_options(/WX) # treat warnings as errors + add_compile_options(/Oi) # enable intrinsics + add_compile_options(/Oy-) # disable suppressing of the creation of frame pointers on the call stack for quicker function calls + add_compile_options(/U_MT) # undefine the predefined _MT macro + add_compile_options(/GF) # enable read-only string pooling + add_compile_options(/Gm-) # disable minimal rebuild + add_compile_options(/EHa) # enable C++ EH (w/ SEH exceptions) + add_compile_options(/Zp8) # pack structs on 8-byte boundary + add_compile_options(/Gy) # separate functions for linker + add_compile_options(/Zc:wchar_t-) # C++ language conformance: wchar_t is NOT the native type, but a typedef + add_compile_options(/Zc:forScope) # C++ language conformance: enforce Standard C++ for scoping rules + add_compile_options(/GR-) # disable C++ RTTI + add_compile_options(/FC) # use full pathnames in diagnostics + add_compile_options(/MP) # Build with Multiple Processes (number of processes equal to the number of processors) + add_compile_options(/GS) # Buffer Security Check + add_compile_options(/Zm200) # Specify Precompiled Header Memory Allocation Limit of 150MB + add_compile_options(/wd4960 /wd4961 /wd4603 /wd4627 /wd4838 /wd4456 /wd4457 /wd4458 /wd4459 /wd4091 /we4640) + add_compile_options(/Zi) # enable debugging information + + if (CLR_CMAKE_PLATFORM_ARCH_I386) + add_compile_options(/Gz) + endif (CLR_CMAKE_PLATFORM_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) + # 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) + + if(NOT CLR_CMAKE_PLATFORM_ARCH_ARM64) + # enable control-flow-guard support for native components for non-Arm64 builds + add_compile_options(/guard:cf) + + # Statically linked CRT (libcmt[d].lib, libvcruntime[d].lib and libucrt[d].lib) by default. This is done to avoid + # linking in VCRUNTIME140.DLL for a simplified xcopy experience by reducing the dependency on VC REDIST. + # + # For Release builds, we shall dynamically link into uCRT [ucrtbase.dll] (which is pushed down as a Windows Update on downlevel OS) but + # wont do the same for debug/checked builds since ucrtbased.dll is not redistributable and Debug/Checked builds are not + # production-time scenarios. + add_compile_options($<$<OR:$<CONFIG:Release>,$<CONFIG:Relwithdebinfo>>:/MT>) + add_compile_options($<$<OR:$<CONFIG:Debug>,$<CONFIG:Checked>>:/MTd>) + endif (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64) +endif (WIN32) + +if(CMAKE_ENABLE_CODE_COVERAGE) + + if(CLR_CMAKE_PLATFORM_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" ) + endif(NOT UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG) + + add_compile_options(-fprofile-arcs) + add_compile_options(-ftest-coverage) + set(CLANG_COVERAGE_LINK_FLAGS "--coverage") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CLANG_COVERAGE_LINK_FLAGS}") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CLANG_COVERAGE_LINK_FLAGS}") + else() + message(FATAL_ERROR "Code coverage builds not supported on current platform") + endif(CLR_CMAKE_PLATFORM_UNIX) + +endif(CMAKE_ENABLE_CODE_COVERAGE) diff --git a/crosscomponents.cmake b/crosscomponents.cmake new file mode 100644 index 0000000000..158173e307 --- /dev/null +++ b/crosscomponents.cmake @@ -0,0 +1,8 @@ +add_definitions(-DCROSS_COMPILE) + +set (CLR_CROSS_COMPONENTS_LIST + crossgen + mscordaccore + mscordbi + sos +) diff --git a/functions.cmake b/functions.cmake new file mode 100644 index 0000000000..5a65ef3e90 --- /dev/null +++ b/functions.cmake @@ -0,0 +1,180 @@ +function(clr_unknown_arch) + if (WIN32) + message(FATAL_ERROR "Only AMD64, ARM64 and I386 are supported") + else() + message(FATAL_ERROR "Only AMD64, ARM64 and ARM are supported") + endif() +endfunction() + +# Build a list of compiler definitions by putting -D in front of each define. +function(get_compile_definitions DefinitionName) + # Get the current list of definitions + get_directory_property(COMPILE_DEFINITIONS_LIST COMPILE_DEFINITIONS) + + foreach(DEFINITION IN LISTS COMPILE_DEFINITIONS_LIST) + if (${DEFINITION} MATCHES "^\\$<\\$<CONFIG:([^>]+)>:([^>]+)>$") + # The entries that contain generator expressions must have the -D inside of the + # expression. So we transform e.g. $<$<CONFIG:Debug>:_DEBUG> to $<$<CONFIG:Debug>:-D_DEBUG> + set(DEFINITION "$<$<CONFIG:${CMAKE_MATCH_1}>:-D${CMAKE_MATCH_2}>") + else() + set(DEFINITION -D${DEFINITION}) + endif() + list(APPEND DEFINITIONS ${DEFINITION}) + endforeach() + set(${DefinitionName} ${DEFINITIONS} PARENT_SCOPE) +endfunction(get_compile_definitions) + +# Build a list of include directories by putting -I in front of each include dir. +function(get_include_directories IncludeDirectories) + get_directory_property(dirs INCLUDE_DIRECTORIES) + foreach(dir IN LISTS dirs) + list(APPEND INC_DIRECTORIES -I${dir}) + endforeach() + set(${IncludeDirectories} ${INC_DIRECTORIES} PARENT_SCOPE) +endfunction(get_include_directories) + +# Set the passed in RetSources variable to the list of sources with added current source directory +# to form absolute paths. +# The parameters after the RetSources are the input files. +function(convert_to_absolute_path RetSources) + set(Sources ${ARGN}) + foreach(Source IN LISTS Sources) + list(APPEND AbsolutePathSources ${CMAKE_CURRENT_SOURCE_DIR}/${Source}) + endforeach() + set(${RetSources} ${AbsolutePathSources} PARENT_SCOPE) +endfunction(convert_to_absolute_path) + +#Preprocess exports definition file +function(preprocess_def_file inputFilename outputFilename) + get_compile_definitions(PREPROCESS_DEFINITIONS) + + add_custom_command( + OUTPUT ${outputFilename} + COMMAND ${CMAKE_CXX_COMPILER} /P /EP /TC ${PREPROCESS_DEFINITIONS} /Fi${outputFilename} ${inputFilename} + DEPENDS ${inputFilename} + COMMENT "Preprocessing ${inputFilename}" + ) + + set_source_files_properties(${outputFilename} + PROPERTIES GENERATED TRUE) +endfunction() + +function(generate_exports_file inputFilename outputFilename) + + if(CMAKE_SYSTEM_NAME STREQUAL Darwin) + set(AWK_SCRIPT generateexportedsymbols.awk) + else() + set(AWK_SCRIPT generateversionscript.awk) + endif(CMAKE_SYSTEM_NAME STREQUAL Darwin) + + add_custom_command( + OUTPUT ${outputFilename} + COMMAND ${AWK} -f ${CMAKE_SOURCE_DIR}/${AWK_SCRIPT} ${inputFilename} >${outputFilename} + DEPENDS ${inputFilename} ${CMAKE_SOURCE_DIR}/${AWK_SCRIPT} + COMMENT "Generating exports file ${outputFilename}" + ) + set_source_files_properties(${outputFilename} + PROPERTIES GENERATED TRUE) +endfunction() + +function(add_precompiled_header header cppFile targetSources) + if(MSVC) + set(precompiledBinary "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/stdafx.pch") + + set_source_files_properties(${cppFile} + PROPERTIES COMPILE_FLAGS "/Yc\"${header}\" /Fp\"${precompiledBinary}\"" + OBJECT_OUTPUTS "${precompiledBinary}") + set_source_files_properties(${${targetSources}} + PROPERTIES COMPILE_FLAGS "/Yu\"${header}\" /Fp\"${precompiledBinary}\"" + OBJECT_DEPENDS "${precompiledBinary}") + # Add cppFile to SourcesVar + set(${targetSources} ${${targetSources}} ${cppFile} PARENT_SCOPE) + endif(MSVC) +endfunction() + +function(strip_symbols targetName outputFilename) + if(CLR_CMAKE_PLATFORM_UNIX) + if(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELEASE) + + # On the older version of cmake (2.8.12) used on Ubuntu 14.04 the TARGET_FILE + # generator expression doesn't work correctly returning the wrong path and on + # the newer cmake versions the LOCATION property isn't supported anymore. + if(CMAKE_VERSION VERSION_EQUAL 3.0 OR CMAKE_VERSION VERSION_GREATER 3.0) + set(strip_source_file $<TARGET_FILE:${targetName}>) + else() + get_property(strip_source_file TARGET ${targetName} PROPERTY LOCATION) + endif() + + if(CMAKE_SYSTEM_NAME STREQUAL Darwin) + set(strip_destination_file ${strip_source_file}.dwarf) + + add_custom_command( + TARGET ${targetName} + POST_BUILD + VERBATIM + COMMAND ${DSYMUTIL} --flat --minimize ${strip_source_file} + COMMAND ${STRIP} -u -r ${strip_source_file} + COMMENT Stripping symbols from ${strip_source_file} into file ${strip_destination_file} + ) + elseif(CMAKE_SYSTEM_NAME STREQUAL Linux) + set(strip_destination_file ${strip_source_file}.dbg) + + add_custom_command( + TARGET ${targetName} + POST_BUILD + VERBATIM + COMMAND ${OBJCOPY} --only-keep-debug ${strip_source_file} ${strip_destination_file} + COMMAND ${OBJCOPY} --strip-debug ${strip_source_file} + COMMAND ${OBJCOPY} --add-gnu-debuglink=${strip_destination_file} ${strip_source_file} + COMMENT Stripping symbols from ${strip_source_file} into file ${strip_destination_file} + ) + endif(CMAKE_SYSTEM_NAME STREQUAL Darwin) + + set(${outputFilename} ${strip_destination_file} PARENT_SCOPE) + endif(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELEASE) + endif(CLR_CMAKE_PLATFORM_UNIX) +endfunction() + +function(install_clr targetName) + list(FIND CLR_CROSS_COMPONENTS_LIST ${targetName} INDEX) + if (NOT DEFINED CLR_CROSS_COMPONENTS_LIST OR NOT ${INDEX} EQUAL -1) + strip_symbols(${targetName} strip_destination_file) + # On the older version of cmake (2.8.12) used on Ubuntu 14.04 the TARGET_FILE + # generator expression doesn't work correctly returning the wrong path and on + # the newer cmake versions the LOCATION property isn't supported anymore. + if(CMAKE_VERSION VERSION_EQUAL 3.0 OR CMAKE_VERSION VERSION_GREATER 3.0) + set(install_source_file $<TARGET_FILE:${targetName}>) + else() + get_property(install_source_file TARGET ${targetName} PROPERTY LOCATION) + endif() + + install(PROGRAMS ${install_source_file} DESTINATION .) + if(WIN32) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/${targetName}.pdb DESTINATION PDB) + else() + install(FILES ${strip_destination_file} DESTINATION .) + endif() + endif() +endfunction() + +function(_add_executable) + add_executable(${ARGV}) + list(FIND CLR_CROSS_COMPONENTS_LIST ${ARGV0} INDEX) + if (DEFINED CLR_CROSS_COMPONENTS_LIST AND ${INDEX} EQUAL -1) + set_target_properties(${ARGV0} PROPERTIES EXCLUDE_FROM_ALL 1) + endif() +endfunction() + +function(_add_library) + add_library(${ARGV}) + list(FIND CLR_CROSS_COMPONENTS_LIST ${ARGV0} INDEX) + if (DEFINED CLR_CROSS_COMPONENTS_LIST AND ${INDEX} EQUAL -1) + set_target_properties(${ARGV0} PROPERTIES EXCLUDE_FROM_ALL 1) + endif() +endfunction() + +function(_install) + if(NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) + install(${ARGV}) + endif() +endfunction()
\ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 957be0ef38..323c6f2e4f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -72,11 +72,19 @@ add_custom_target( function(add_library_clr) add_library(${ARGV}) add_dependencies(${ARGV0} GeneratedEventingFiles) + list(FIND CLR_CROSS_COMPONENTS_LIST ${ARGV0} INDEX) + if (DEFINED CLR_CROSS_COMPONENTS_LIST AND ${INDEX} EQUAL -1) + set_target_properties(${ARGV0} PROPERTIES EXCLUDE_FROM_ALL 1) + endif() endfunction() function(add_executable_clr) add_executable(${ARGV}) add_dependencies(${ARGV0} GeneratedEventingFiles) + list(FIND CLR_CROSS_COMPONENTS_LIST ${ARGV0} INDEX) + if (DEFINED CLR_CROSS_COMPONENTS_LIST AND ${INDEX} EQUAL -1) + set_target_properties(${ARGV0} PROPERTIES EXCLUDE_FROM_ALL 1) + endif() endfunction() if(CLR_CMAKE_PLATFORM_UNIX) diff --git a/src/ToolBox/SOS/Strike/CMakeLists.txt b/src/ToolBox/SOS/Strike/CMakeLists.txt index 3c1cffe553..124fe979b3 100644 --- a/src/ToolBox/SOS/Strike/CMakeLists.txt +++ b/src/ToolBox/SOS/Strike/CMakeLists.txt @@ -14,14 +14,26 @@ if(CLR_CMAKE_PLATFORM_ARCH_AMD64) add_definitions(-D_TARGET_WIN64_=1) add_definitions(-DDBG_TARGET_64BIT) add_definitions(-DDBG_TARGET_WIN64=1) + if(WIN32) + add_definitions(-DSOS_TARGET_ARM64=1) + endif(WIN32) + remove_definitions(-D_TARGET_ARM64_=1) + add_definitions(-D_TARGET_AMD64_) + add_definitions(-DDBG_TARGET_AMD64) elseif(CLR_CMAKE_PLATFORM_ARCH_I386) add_definitions(-DSOS_TARGET_X86=1) add_definitions(-D_TARGET_X86_=1) add_definitions(-DDBG_TARGET_32BIT) + add_definitions(-DSOS_TARGET_ARM=1) elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) add_definitions(-DSOS_TARGET_ARM=1) add_definitions(-D_TARGET_WIN32_=1) add_definitions(-DDBG_TARGET_32BIT) +elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) + add_definitions(-DSOS_TARGET_ARM64=1) + add_definitions(-D_TARGET_WIN64_=1) + add_definitions(-DDBG_TARGET_64BIT) + add_definitions(-DDBG_TARGET_WIN64=1) endif() add_definitions(-DSTRIKE) @@ -130,14 +142,25 @@ if(CLR_CMAKE_PLATFORM_ARCH_AMD64) set(SOS_SOURCES_ARCH disasmX86.cpp ) + if(WIN32) + list(APPEND + SOS_SOURCES_ARCH + disasmARM64.cpp + ) + endif(WIN32) elseif(CLR_CMAKE_PLATFORM_ARCH_I386) set(SOS_SOURCES_ARCH disasmX86.cpp + disasmARM.cpp ) elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) set(SOS_SOURCES_ARCH disasmARM.cpp ) +elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) + set(SOS_SOURCES_ARCH + disasmARM64.cpp + ) endif() list(APPEND SOS_SOURCES ${SOS_SOURCES_ARCH}) diff --git a/src/ToolBox/SOS/Strike/DisasmARM64.cpp b/src/ToolBox/SOS/Strike/DisasmARM64.cpp index b726caac7d..ffe55bfd7a 100644 --- a/src/ToolBox/SOS/Strike/DisasmARM64.cpp +++ b/src/ToolBox/SOS/Strike/DisasmARM64.cpp @@ -23,9 +23,9 @@ #include "disasm.h" -#include "..\..\..\inc\corhdr.h" -#include "..\..\..\inc\cor.h" -#include "..\..\..\inc\dacprivate.h" +#include "../../../inc/corhdr.h" +#include "../../../inc/cor.h" +#include "../../../inc/dacprivate.h" namespace ARM64GCDump { diff --git a/src/ToolBox/SOS/lldbplugin/CMakeLists.txt b/src/ToolBox/SOS/lldbplugin/CMakeLists.txt index d8d05b9d2f..69823933a6 100644 --- a/src/ToolBox/SOS/lldbplugin/CMakeLists.txt +++ b/src/ToolBox/SOS/lldbplugin/CMakeLists.txt @@ -86,7 +86,7 @@ if(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG OR UPPERCASE_CMAKE_BUILD_TYPE STREQ ) endif(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL CHECKED) -add_library(sosplugin SHARED ${SOURCES}) +_add_library(sosplugin SHARED ${SOURCES}) add_dependencies(sosplugin sos) if (CLR_CMAKE_PLATFORM_UNIX) diff --git a/src/classlibnative/CMakeLists.txt b/src/classlibnative/CMakeLists.txt index 4db05298ae..1c8d82566f 100644 --- a/src/classlibnative/CMakeLists.txt +++ b/src/classlibnative/CMakeLists.txt @@ -4,24 +4,6 @@ include_directories(BEFORE "../vm/${ARCH_SOURCES_DIR}") include_directories("../debug/inc") include_directories("../debug/inc/dump") -if(CLR_CMAKE_PLATFORM_ARCH_AMD64) - add_definitions(-DDBG_TARGET_64BIT=1) - add_definitions(-DDBG_TARGET_AMD64=1) - add_definitions(-DDBG_TARGET_WIN64=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) - add_definitions(-DDBG_TARGET_32BIT=1) - add_definitions(-DDBG_TARGET_X86=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) - add_definitions(-DDBG_TARGET_32BIT=1) - add_definitions(-DDBG_TARGET_ARM=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) - add_definitions(-DDBG_TARGET_64BIT=1) - add_definitions(-DDBG_TARGET_ARM64=1) - add_definitions(-DDBG_TARGET_WIN64=1) -else() - clr_unknown_arch() -endif() - add_subdirectory(bcltype) add_subdirectory(float) diff --git a/src/coreclr/hosts/coreconsole/CMakeLists.txt b/src/coreclr/hosts/coreconsole/CMakeLists.txt index fdc0020126..a8eae3209b 100644 --- a/src/coreclr/hosts/coreconsole/CMakeLists.txt +++ b/src/coreclr/hosts/coreconsole/CMakeLists.txt @@ -10,14 +10,14 @@ add_definitions(-DFX_VER_INTERNALNAME_STR=CoreConsole.exe) if(CLR_CMAKE_PLATFORM_UNIX) # This does not compile on Linux yet if(CAN_BE_COMPILED_ON_LINUX) - add_executable(CoreConsole + _add_executable(CoreConsole ${CoreConsole_SOURCES} ${CoreConsole_RESOURCES} ) endif(CAN_BE_COMPILED_ON_LINUX) else() - add_executable(CoreConsole + _add_executable(CoreConsole ${CoreConsole_SOURCES} ${CoreConsole_RESOURCES} ) diff --git a/src/coreclr/hosts/corerun/CMakeLists.txt b/src/coreclr/hosts/corerun/CMakeLists.txt index 93bb9c2bcc..6868bb12c3 100644 --- a/src/coreclr/hosts/corerun/CMakeLists.txt +++ b/src/coreclr/hosts/corerun/CMakeLists.txt @@ -10,14 +10,14 @@ add_definitions(-DFX_VER_INTERNALNAME_STR=CoreRun.exe) if(CLR_CMAKE_PLATFORM_UNIX) # This does not compile on Linux yet if(CAN_BE_COMPILED_ON_LINUX) - add_executable(CoreRun + _add_executable(CoreRun ${CoreRun_SOURCES} ${CoreRun_RESOURCES} ) endif(CAN_BE_COMPILED_ON_LINUX) else() - add_executable(CoreRun + _add_executable(CoreRun ${CoreRun_SOURCES} ${CoreRun_RESOURCES} ) diff --git a/src/coreclr/hosts/osxbundlerun/CMakeLists.txt b/src/coreclr/hosts/osxbundlerun/CMakeLists.txt index 2ccc881dbe..49e2248ee7 100644 --- a/src/coreclr/hosts/osxbundlerun/CMakeLists.txt +++ b/src/coreclr/hosts/osxbundlerun/CMakeLists.txt @@ -9,7 +9,7 @@ set(CORERUN_SOURCES osxbundlerun.cpp ) -add_executable(osxbundlerun +_add_executable(osxbundlerun ${CORERUN_SOURCES} ) diff --git a/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt b/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt index cb18e82776..8988e60dcf 100644 --- a/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt +++ b/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt @@ -8,7 +8,7 @@ set(CORECONSOLE_SOURCES coreconsole.cpp ) -add_executable(coreconsole +_add_executable(coreconsole ${CORECONSOLE_SOURCES} ) diff --git a/src/coreclr/hosts/unixcorerun/CMakeLists.txt b/src/coreclr/hosts/unixcorerun/CMakeLists.txt index 1f0c75995e..b32c9833bf 100644 --- a/src/coreclr/hosts/unixcorerun/CMakeLists.txt +++ b/src/coreclr/hosts/unixcorerun/CMakeLists.txt @@ -8,7 +8,7 @@ set(CORERUN_SOURCES corerun.cpp ) -add_executable(corerun +_add_executable(corerun ${CORERUN_SOURCES} ) diff --git a/src/coreclr/hosts/unixcoreruncommon/CMakeLists.txt b/src/coreclr/hosts/unixcoreruncommon/CMakeLists.txt index f71e979cc6..a17e0a0fd6 100644 --- a/src/coreclr/hosts/unixcoreruncommon/CMakeLists.txt +++ b/src/coreclr/hosts/unixcoreruncommon/CMakeLists.txt @@ -2,7 +2,7 @@ project(unixcoreruncommon) add_compile_options(-fPIC) -add_library(unixcoreruncommon +_add_library(unixcoreruncommon STATIC coreruncommon.cpp ) diff --git a/src/corefx/CMakeLists.txt b/src/corefx/CMakeLists.txt index 7bd522d3bf..5abcaa32c9 100644 --- a/src/corefx/CMakeLists.txt +++ b/src/corefx/CMakeLists.txt @@ -9,6 +9,8 @@ # assemblies) or System.Diagnostics.Process.Native (a native interop library for # System.Diagnostics.Process.dll). +remove_definitions(-D_WIN64) + if(CLR_CMAKE_PLATFORM_UNIX) add_subdirectory(System.Globalization.Native) endif(CLR_CMAKE_PLATFORM_UNIX) diff --git a/src/corefx/System.Globalization.Native/CMakeLists.txt b/src/corefx/System.Globalization.Native/CMakeLists.txt index bf279efe6a..3d9e392132 100644 --- a/src/corefx/System.Globalization.Native/CMakeLists.txt +++ b/src/corefx/System.Globalization.Native/CMakeLists.txt @@ -52,7 +52,7 @@ set(NATIVEGLOBALIZATION_SOURCES include_directories(${UTYPES_H}) -add_library(System.Globalization.Native +_add_library(System.Globalization.Native SHARED ${NATIVEGLOBALIZATION_SOURCES} ) diff --git a/src/debug/daccess/CMakeLists.txt b/src/debug/daccess/CMakeLists.txt index 77dc1c249d..30068450b4 100644 --- a/src/debug/daccess/CMakeLists.txt +++ b/src/debug/daccess/CMakeLists.txt @@ -3,29 +3,6 @@ include(${CLR_DIR}/dac.cmake) add_definitions(-DFEATURE_NO_HOST) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64) - add_definitions(-D_TARGET_AMD64_=1) - add_definitions(-DDBG_TARGET_64BIT=1) - add_definitions(-DDBG_TARGET_AMD64=1) - add_definitions(-DDBG_TARGET_WIN64=1) - add_definitions(-D_WIN64=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) - add_definitions(-D_TARGET_X86_=1) - add_definitions(-DDBG_TARGET_X86=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) - add_definitions(-D_TARGET_ARM_=1) - add_definitions(-DDBG_TARGET_32BIT=1) - add_definitions(-DDBG_TARGET_ARM=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) - add_definitions(-D_TARGET_ARM64_=1) - add_definitions(-DDBG_TARGET_64BIT=1) - add_definitions(-DDBG_TARGET_ARM64=1) - add_definitions(-DDBG_TARGET_WIN64=1) - add_definitions(-D_WIN64=1) -else() - clr_unknown_arch() -endif() - include_directories(BEFORE ${VM_DIR}) include_directories(BEFORE ${VM_DIR}/${ARCH_SOURCES_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/debug/debug-pal/CMakeLists.txt b/src/debug/debug-pal/CMakeLists.txt index d9a6cf2e84..c96d7f9e06 100644 --- a/src/debug/debug-pal/CMakeLists.txt +++ b/src/debug/debug-pal/CMakeLists.txt @@ -28,4 +28,4 @@ if(CLR_CMAKE_PLATFORM_UNIX) endif(CLR_CMAKE_PLATFORM_UNIX) -add_library(debug-pal STATIC ${TWO_WAY_PIPE_SOURCES}) +_add_library(debug-pal STATIC ${TWO_WAY_PIPE_SOURCES}) diff --git a/src/debug/di/CMakeLists.txt b/src/debug/di/CMakeLists.txt index 030e150434..8894813e73 100644 --- a/src/debug/di/CMakeLists.txt +++ b/src/debug/di/CMakeLists.txt @@ -1,25 +1,3 @@ -if(CLR_CMAKE_PLATFORM_ARCH_AMD64) - add_definitions(-D_TARGET_WIN64_=1) - add_definitions(-DDBG_TARGET_64BIT) - add_definitions(-DDBG_TARGET_WIN64=1) - add_definitions(-DDBG_TARGET_AMD64=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) - add_definitions(-D_TARGET_X86_=1) - add_definitions(-DDBG_TARGET_32BIT) - add_definitions(-DDBG_TARGET_X86=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) - add_definitions(-D_TARGET_WIN32_=1) - add_definitions(-DDBG_TARGET_32BIT) - add_definitions(-DDBG_TARGET_ARM=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) - add_definitions(-D_TARGET_WIN64_=1) - add_definitions(-DDBG_TARGET_64BIT) - add_definitions(-DDBG_TARGET_WIN64=1) - add_definitions(-DDBG_TARGET_ARM64=1) -else() - clr_unknown_arch() -endif() - add_definitions(-DFEATURE_METADATA_CUSTOM_DATA_SOURCE -DFEATURE_METADATA_DEBUGGEE_DATA_SOURCE -DFEATURE_NO_HOST -DFEATURE_METADATA_LOAD_TRUSTED_IMAGES) set(CORDBDI_SOURCES @@ -56,7 +34,7 @@ if(WIN32) #use static crt add_definitions(-MT) - if (CLR_CMAKE_PLATFORM_ARCH_AMD64) + if (CLR_CMAKE_TARGET_ARCH_AMD64) set(CORDBDI_SOURCES ${CORDBDI_SOURCES} ${ARCH_SOURCES_DIR}/floatconversion.asm @@ -65,7 +43,7 @@ if(WIN32) elseif(CLR_CMAKE_PLATFORM_UNIX) add_compile_options(-fPIC) - if(CLR_CMAKE_PLATFORM_ARCH_AMD64) + if(CLR_CMAKE_TARGET_ARCH_AMD64) set(CORDBDI_SOURCES ${CORDBDI_SOURCES} ${ARCH_SOURCES_DIR}/floatconversion.S diff --git a/src/debug/ee/CMakeLists.txt b/src/debug/ee/CMakeLists.txt index ec703a15ac..85170df713 100644 --- a/src/debug/ee/CMakeLists.txt +++ b/src/debug/ee/CMakeLists.txt @@ -2,29 +2,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) add_definitions(-DFEATURE_NO_HOST) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64) - add_definitions(-D_TARGET_AMD64_=1) - add_definitions(-DDBG_TARGET_64BIT=1) - add_definitions(-DDBG_TARGET_AMD64=1) - add_definitions(-DDBG_TARGET_WIN64=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) - add_definitions(-D_TARGET_X86_=1) - add_definitions(-DDBG_TARGET_32BIT=1) - add_definitions(-DDBG_TARGET_X86=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) - add_definitions(-D_TARGET_ARM_=1) - add_definitions(-DDBG_TARGET_32BIT=1) - add_definitions(-DDBG_TARGET_ARM=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) - add_definitions(-D_TARGET_ARM64_=1) - add_definitions(-DDBG_TARGET_64BIT=1) - add_definitions(-DDBG_TARGET_ARM64=1) - add_definitions(-DDBG_TARGET_WIN64=1) -else() - clr_unknown_arch() -endif() - - include_directories(BEFORE ${VM_DIR}) include_directories(BEFORE ${VM_DIR}/${ARCH_SOURCES_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}) @@ -60,19 +37,19 @@ if(CLR_CMAKE_PLATFORM_UNIX) ) endif(CLR_CMAKE_PLATFORM_UNIX) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64) +if(CLR_CMAKE_TARGET_ARCH_AMD64) list(APPEND CORDBEE_SOURCES_WKS ${ARCH_SOURCES_DIR}/debuggerregdisplayhelper.cpp ${ARCH_SOURCES_DIR}/amd64walker.cpp ) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) +elseif(CLR_CMAKE_TARGET_ARCH_I386) list(APPEND CORDBEE_SOURCES_WKS ${ARCH_SOURCES_DIR}/debuggerregdisplayhelper.cpp ${ARCH_SOURCES_DIR}/x86walker.cpp ) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) +elseif(CLR_CMAKE_TARGET_ARCH_ARM) list(APPEND CORDBEE_SOURCES_WKS ${ARCH_SOURCES_DIR}/armwalker.cpp) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) +elseif(CLR_CMAKE_TARGET_ARCH_ARM64) list(APPEND CORDBEE_SOURCES_WKS ${ARCH_SOURCES_DIR}/arm64walker.cpp) endif() diff --git a/src/dlls/mscordac/CMakeLists.txt b/src/dlls/mscordac/CMakeLists.txt index 9a28479fed..4a80ef46e7 100644 --- a/src/dlls/mscordac/CMakeLists.txt +++ b/src/dlls/mscordac/CMakeLists.txt @@ -89,7 +89,7 @@ if(WIN32) ) # ARM64_TODO: Enable this for Windows Arm64 - if (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64) + if (NOT CLR_CMAKE_TARGET_ARCH_ARM64) list(APPEND COREDAC_LIBRARIES ${STATIC_MT_VCRT_LIB} ) diff --git a/src/dlls/mscorrc/full/CMakeLists.txt b/src/dlls/mscorrc/full/CMakeLists.txt index 2b26c576f9..30d93385ec 100644 --- a/src/dlls/mscorrc/full/CMakeLists.txt +++ b/src/dlls/mscorrc/full/CMakeLists.txt @@ -6,9 +6,7 @@ if(WIN32) ../include.rc ) - # add the install targets - install (TARGETS mscorrc.debug DESTINATION .) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/mscorrc.debug.pdb DESTINATION PDB) + install_clr (mscorrc.debug) else() build_resources(${CMAKE_CURRENT_SOURCE_DIR}/../include.rc mscorrc_debug TARGET_CPP_FILE) diff --git a/src/dlls/mscorrc/small/CMakeLists.txt b/src/dlls/mscorrc/small/CMakeLists.txt index 48e7f48f00..7c359e075e 100644 --- a/src/dlls/mscorrc/small/CMakeLists.txt +++ b/src/dlls/mscorrc/small/CMakeLists.txt @@ -5,7 +5,4 @@ add_library_clr(mscorrc SHARED ) # add the install targets -install (TARGETS mscorrc DESTINATION .) -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/mscorrc.pdb DESTINATION PDB) - - +install_clr (mscorrc)
\ No newline at end of file diff --git a/src/gc/sample/CMakeLists.txt b/src/gc/sample/CMakeLists.txt index f0ba28edc7..572fba371f 100644 --- a/src/gc/sample/CMakeLists.txt +++ b/src/gc/sample/CMakeLists.txt @@ -29,6 +29,6 @@ else() gcenv.unix.cpp) endif() -add_executable(gcsample +_add_executable(gcsample ${SOURCES} ) diff --git a/src/gcinfo/CMakeLists.txt b/src/gcinfo/CMakeLists.txt index 53a1ad2591..11857184e3 100644 --- a/src/gcinfo/CMakeLists.txt +++ b/src/gcinfo/CMakeLists.txt @@ -22,5 +22,5 @@ endif(CLR_CMAKE_PLATFORM_UNIX) add_subdirectory(lib) add_subdirectory(crossgen) -install (FILES gcinfoencoder.cpp +_install (FILES gcinfoencoder.cpp DESTINATION gcinfo) diff --git a/src/ilasm/CMakeLists.txt b/src/ilasm/CMakeLists.txt index f155f48289..f9c6ba97af 100644 --- a/src/ilasm/CMakeLists.txt +++ b/src/ilasm/CMakeLists.txt @@ -38,7 +38,7 @@ if(CLR_CMAKE_PLATFORM_UNIX) set_source_files_properties( prebuilt/asmparse.c PROPERTIES COMPILE_FLAGS -O0 ) endif(CLR_CMAKE_PLATFORM_UNIX) -add_executable(ilasm +_add_executable(ilasm ${ILASM_SOURCES} ) diff --git a/src/ildasm/exe/CMakeLists.txt b/src/ildasm/exe/CMakeLists.txt index 8ce2bc3446..932c3850be 100644 --- a/src/ildasm/exe/CMakeLists.txt +++ b/src/ildasm/exe/CMakeLists.txt @@ -34,7 +34,7 @@ set(ILDASM_SOURCES ../windasm.cpp ) -add_executable(ildasm +_add_executable(ildasm ${ILDASM_SOURCES} ${ILDASM_RESOURCES} ) diff --git a/src/ildasm/rcdll/CMakeLists.txt b/src/ildasm/rcdll/CMakeLists.txt index 20af311045..93da34c3a8 100644 --- a/src/ildasm/rcdll/CMakeLists.txt +++ b/src/ildasm/rcdll/CMakeLists.txt @@ -22,7 +22,4 @@ target_link_libraries(ildasmrc ${STATIC_MT_VCRT_LIB} ) -# We will generate PDB only for the debug configuration -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/ildasmrc.pdb DESTINATION PDB) - -install (TARGETS ildasmrc DESTINATION .) +install_clr (ildasmrc)
\ No newline at end of file diff --git a/src/inc/CMakeLists.txt b/src/inc/CMakeLists.txt index 87d7536d02..803ca3bcc7 100644 --- a/src/inc/CMakeLists.txt +++ b/src/inc/CMakeLists.txt @@ -67,11 +67,11 @@ add_compile_options(-fPIC) endif(WIN32) # Compile *_i.c to lib -add_library(corguids ${CORGUIDS_SOURCES}) +_add_library(corguids ${CORGUIDS_SOURCES}) # Binplace the inc files for packaging later. -install (FILES cfi.h +_install (FILES cfi.h cor.h cordebuginfo.h coredistools.h @@ -84,4 +84,4 @@ install (FILES cfi.h gcinfoencoder.h gcinfotypes.h DESTINATION inc) -install (TARGETS corguids DESTINATION lib) +_install (TARGETS corguids DESTINATION lib) diff --git a/src/inc/clrnt.h b/src/inc/clrnt.h index bd25ab39ff..4fb85f4eda 100644 --- a/src/inc/clrnt.h +++ b/src/inc/clrnt.h @@ -1085,6 +1085,14 @@ RtlVirtualUnwind( IN OUT PKNONVOLATILE_CONTEXT_POINTERS ContextPointers OPTIONAL ); +#ifndef IMAGE_FILE_MACHINE_ARM64 +#define IMAGE_FILE_MACHINE_ARM64 0xAA64 // ARM64 Little-Endian +#endif + +#ifndef IMAGE_REL_ARM64_BRANCH26 +#define IMAGE_REL_ARM64_BRANCH26 0x0003 // 26 bit offset << 2 & sign ext. for B & BL +#endif + #endif #endif // CLRNT_H_ diff --git a/src/jit/CMakeLists.txt b/src/jit/CMakeLists.txt index 73ecac3b03..577be87966 100644 --- a/src/jit/CMakeLists.txt +++ b/src/jit/CMakeLists.txt @@ -6,10 +6,10 @@ include_directories("../inc") # Enable the following for UNIX altjit on Windows # add_definitions(-DALT_JIT) -if (CLR_CMAKE_PLATFORM_ARCH_AMD64) +if (CLR_CMAKE_TARGET_ARCH_AMD64) add_definitions(-DFEATURE_SIMD) add_definitions(-DFEATURE_AVX_SUPPORT) -endif (CLR_CMAKE_PLATFORM_ARCH_AMD64) +endif () if (ARM_SOFTFP) add_definitions(-DARM_SOFTFP) @@ -70,7 +70,7 @@ set( JIT_SOURCES valuenum.cpp ) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64) +if(CLR_CMAKE_TARGET_ARCH_AMD64) set( ARCH_SOURCES codegenxarch.cpp emitxarch.cpp @@ -80,7 +80,7 @@ if(CLR_CMAKE_PLATFORM_ARCH_AMD64) targetamd64.cpp unwindamd64.cpp ) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) +elseif(CLR_CMAKE_TARGET_ARCH_ARM) set( ARCH_SOURCES codegenarm.cpp emitarm.cpp @@ -88,7 +88,7 @@ elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) targetarm.cpp unwindarm.cpp ) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) +elseif(CLR_CMAKE_TARGET_ARCH_I386) set( ARCH_SOURCES codegenxarch.cpp emitxarch.cpp @@ -97,7 +97,7 @@ elseif(CLR_CMAKE_PLATFORM_ARCH_I386) simdcodegenxarch.cpp targetx86.cpp ) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) +elseif(CLR_CMAKE_TARGET_ARCH_ARM64) set( ARCH_SOURCES codegenarm64.cpp emitarm64.cpp @@ -115,20 +115,20 @@ endif() # #ifdef'ed, though it makes the build slightly slower to do so. Note there is only a legacy backend for # x86 and ARM. -if(CLR_CMAKE_PLATFORM_ARCH_AMD64) +if(CLR_CMAKE_TARGET_ARCH_AMD64) set( ARCH_LEGACY_SOURCES ) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) +elseif(CLR_CMAKE_TARGET_ARCH_ARM) set( ARCH_LEGACY_SOURCES codegenlegacy.cpp registerfp.cpp ) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) +elseif(CLR_CMAKE_TARGET_ARCH_I386) set( ARCH_LEGACY_SOURCES codegenlegacy.cpp stackfp.cpp ) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) +elseif(CLR_CMAKE_TARGET_ARCH_ARM64) set( ARCH_LEGACY_SOURCES ) else() @@ -174,4 +174,4 @@ add_subdirectory(standalone) if (CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_ARM) add_subdirectory(protojit) -endif (CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_ARM) +endif (CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_ARM)
\ No newline at end of file diff --git a/src/jit/crossgen/CMakeLists.txt b/src/jit/crossgen/CMakeLists.txt index c4950b1882..981369e768 100644 --- a/src/jit/crossgen/CMakeLists.txt +++ b/src/jit/crossgen/CMakeLists.txt @@ -1,7 +1,7 @@ include(${CLR_DIR}/crossgen.cmake) -if(CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_ARM) +if(CLR_CMAKE_TARGET_ARCH_I386 OR CLR_CMAKE_TARGET_ARCH_ARM) add_definitions(-DLEGACY_BACKEND) -endif(CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_ARM) +endif() add_library_clr(jit_crossgen ${SOURCES}) diff --git a/src/jit/gcencode.cpp b/src/jit/gcencode.cpp index 2c4e83564f..196507342c 100644 --- a/src/jit/gcencode.cpp +++ b/src/jit/gcencode.cpp @@ -4184,7 +4184,7 @@ void GCInfo::gcInfoRecordGCRegStateChange(GcInfoEncoder* gcInfoEn while (regMask) { // Get hold of the next register bit. - unsigned tmpMask = genFindLowestReg(regMask); assert(tmpMask); + regMaskTP tmpMask = genFindLowestReg(regMask); assert(tmpMask); // Remember the new state of this register. if (pPtrRegs != NULL) diff --git a/src/pal/CMakeLists.txt b/src/pal/CMakeLists.txt index 5d9ce4e9e9..cb8b05586c 100644 --- a/src/pal/CMakeLists.txt +++ b/src/pal/CMakeLists.txt @@ -2,6 +2,13 @@ cmake_minimum_required(VERSION 2.8.12.2) project(COREPAL) +if (WIN32) + set(FEATURE_EVENT_TRACE 1) +endif() +if(CLR_CMAKE_PLATFORM_LINUX AND CLR_CMAKE_PLATFORM_ARCH_AMD64) + set(FEATURE_EVENT_TRACE 1) +endif() + include_directories(${COREPAL_SOURCE_DIR}/inc) include_directories(${COREPAL_SOURCE_DIR}/src) include_directories(${COREPAL_SOURCE_DIR}/../inc) diff --git a/src/pal/prebuilt/inc/CMakeLists.txt b/src/pal/prebuilt/inc/CMakeLists.txt index 69854e68e8..ae9892bb77 100644 --- a/src/pal/prebuilt/inc/CMakeLists.txt +++ b/src/pal/prebuilt/inc/CMakeLists.txt @@ -2,5 +2,5 @@ cmake_minimum_required(VERSION 2.8.12.2) project(COREPAL) -install (FILES corerror.h corprof.h DESTINATION inc) +_install (FILES corerror.h corprof.h DESTINATION inc) diff --git a/src/pal/tools/gen-buildsys-win.bat b/src/pal/tools/gen-buildsys-win.bat index cccd342b79..5592fe5930 100644 --- a/src/pal/tools/gen-buildsys-win.bat +++ b/src/pal/tools/gen-buildsys-win.bat @@ -1,4 +1,4 @@ -@echo off +@if not defined __echo @echo off rem rem This file invokes cmake and generates the build system for windows. @@ -26,13 +26,13 @@ set __BuildJit32=%4 if defined CMakePath goto DoGen :: Eval the output from probe-win1.ps1 -for /f "delims=" %%a in ('powershell -NoProfile -ExecutionPolicy RemoteSigned "& .\probe-win.ps1"') do %%a +for /f "delims=" %%a in ('powershell -NoProfile -ExecutionPolicy RemoteSigned "& "%basePath%\probe-win.ps1""') do %%a :DoGen if "%UseVS%" == "0" ( - "%CMakePath%" "-DCMAKE_USER_MAKE_RULES_OVERRIDE=%basePath%\windows-compiler-override.txt" "-DCLR_CMAKE_TARGET_ARCH=%3" -G "Visual Studio %__VSString% Win64" %1 + "%CMakePath%" "-DCMAKE_USER_MAKE_RULES_OVERRIDE=%basePath%\windows-compiler-override.txt" "-DCMAKE_INSTALL_PREFIX:PATH=$ENV{__CMakeBinDir}" "-DCLR_CMAKE_HOST_ARCH=%3" -G "Visual Studio %__VSString% Win64" %1 ) else ( - "%CMakePath%" "-DCMAKE_USER_MAKE_RULES_OVERRIDE=%basePath%\windows-compiler-override.txt" "-DCLR_CMAKE_TARGET_ARCH=%3" %__BuildJit32% -G "Visual Studio %__VSString%" %1 + "%CMakePath%" "-DCMAKE_USER_MAKE_RULES_OVERRIDE=%basePath%\windows-compiler-override.txt" "-DCMAKE_INSTALL_PREFIX:PATH=$ENV{__CMakeBinDir}" "-DCLR_CMAKE_HOST_ARCH=%3" %__BuildJit32% -G "Visual Studio %__VSString%" %1 ) endlocal GOTO :DONE diff --git a/src/pal/tools/windows-compiler-override.txt b/src/pal/tools/windows-compiler-override.txt index 7f3c63c24e..f6cb16856c 100644 --- a/src/pal/tools/windows-compiler-override.txt +++ b/src/pal/tools/windows-compiler-override.txt @@ -13,5 +13,4 @@ SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/O2 /Zi") SET (CLR_DEFINES_DEBUG_INIT DEBUG _DEBUG _DBG URTBLDENV_FRIENDLY=Checked BUILDENV_CHECKED=1) SET (CLR_DEFINES_CHECKED_INIT DEBUG _DEBUG _DBG URTBLDENV_FRIENDLY=Checked BUILDENV_CHECKED=1) SET (CLR_DEFINES_RELEASE_INIT NDEBUG URTBLDENV_FRIENDLY=Retail) -SET (CLR_DEFINES_RELWITHDEBINFO_INIT NDEBUG URTBLDENV_FRIENDLY=Retail) -SET (CMAKE_INSTALL_PREFIX $ENV{__CMakeBinDir}) +SET (CLR_DEFINES_RELWITHDEBINFO_INIT NDEBUG URTBLDENV_FRIENDLY=Retail)
\ No newline at end of file diff --git a/src/unwinder/dac/CMakeLists.txt b/src/unwinder/dac/CMakeLists.txt index dcbfb0e1c0..ff7bd73114 100644 --- a/src/unwinder/dac/CMakeLists.txt +++ b/src/unwinder/dac/CMakeLists.txt @@ -2,28 +2,4 @@ include(${CLR_DIR}/dac.cmake) add_definitions(-DFEATURE_NO_HOST) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64) - add_definitions(-D_TARGET_AMD64_=1) - add_definitions(-DDBG_TARGET_64BIT=1) - add_definitions(-DDBG_TARGET_AMD64=1) - add_definitions(-DDBG_TARGET_WIN64=1) - add_definitions(-D_WIN64=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) - add_definitions(-D_TARGET_X86_=1) - add_definitions(-DDBG_TARGET_32BIT=1) - add_definitions(-DDBG_TARGET_X86=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) - add_definitions(-D_TARGET_ARM_=1) - add_definitions(-DDBG_TARGET_32BIT=1) - add_definitions(-DDBG_TARGET_ARM=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) - add_definitions(-D_TARGET_ARM64_=1) - add_definitions(-DDBG_TARGET_64BIT=1) - add_definitions(-DDBG_TARGET_ARM64=1) - add_definitions(-DDBG_TARGET_WIN64=1) - add_definitions(-D_WIN64=1) -else() - clr_unknown_arch() -endif() - add_library_clr(unwinder_dac ${UNWINDER_SOURCES}) diff --git a/src/vm/CMakeLists.txt b/src/vm/CMakeLists.txt index 346acb264f..5704624ee5 100644 --- a/src/vm/CMakeLists.txt +++ b/src/vm/CMakeLists.txt @@ -5,28 +5,6 @@ include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CLR_DIR}/src/gc) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64) - add_definitions(-D_TARGET_AMD64_=1) - add_definitions(-DDBG_TARGET_64BIT=1) - add_definitions(-DDBG_TARGET_AMD64=1) - add_definitions(-DDBG_TARGET_WIN64=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) - add_definitions(-D_TARGET_X86_=1) - add_definitions(-DDBG_TARGET_32BIT=1) - add_definitions(-DDBG_TARGET_X86=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) - add_definitions(-D_TARGET_ARM_=1) - add_definitions(-DDBG_TARGET_32BIT=1) - add_definitions(-DDBG_TARGET_ARM=1) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) - add_definitions(-D_TARGET_ARM64_=1) - add_definitions(-DDBG_TARGET_64BIT=1) - add_definitions(-DDBG_TARGET_ARM64=1) - add_definitions(-DDBG_TARGET_WIN64=1) -else() - clr_unknown_arch() -endif() - include_directories(${ARCH_SOURCES_DIR}) add_definitions(-DFEATURE_LEAVE_RUNTIME_HOLDER=1) @@ -324,7 +302,7 @@ list(APPEND VM_SOURCES_DAC clrprivtypecachewinrt.cpp ) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64) +if(CLR_CMAKE_TARGET_ARCH_AMD64) set(VM_SOURCES_WKS_ARCH_ASM ${ARCH_SOURCES_DIR}/AsmHelpers.asm ${ARCH_SOURCES_DIR}/CallDescrWorkerAMD64.asm @@ -347,7 +325,7 @@ if(CLR_CMAKE_PLATFORM_ARCH_AMD64) ${ARCH_SOURCES_DIR}/UMThunkStub.asm ${ARCH_SOURCES_DIR}/VirtualCallStubAMD64.asm ) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) +elseif(CLR_CMAKE_TARGET_ARCH_I386) set(VM_SOURCES_WKS_ARCH_ASM ${ARCH_SOURCES_DIR}/RedirectedHandledJITCase.asm ${ARCH_SOURCES_DIR}/asmhelpers.asm @@ -355,7 +333,7 @@ elseif(CLR_CMAKE_PLATFORM_ARCH_I386) ${ARCH_SOURCES_DIR}/gmsasm.asm ${ARCH_SOURCES_DIR}/jithelp.asm ) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) +elseif(CLR_CMAKE_TARGET_ARCH_ARM64) set(VM_SOURCES_WKS_ARCH_ASM ${ARCH_SOURCES_DIR}/AsmHelpers.asm ${ARCH_SOURCES_DIR}/CallDescrWorkerARM64.asm @@ -367,7 +345,7 @@ endif() else(WIN32) - if(CLR_CMAKE_PLATFORM_ARCH_AMD64) + if(CLR_CMAKE_TARGET_ARCH_AMD64) set(VM_SOURCES_WKS_ARCH_ASM ${ARCH_SOURCES_DIR}/calldescrworkeramd64.S ${ARCH_SOURCES_DIR}/crthelpers.S @@ -382,7 +360,7 @@ else(WIN32) ${ARCH_SOURCES_DIR}/umthunkstub.S ${ARCH_SOURCES_DIR}/virtualcallstubamd64.S ) - elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) + elseif(CLR_CMAKE_TARGET_ARCH_ARM) set(VM_SOURCES_WKS_ARCH_ASM ${ARCH_SOURCES_DIR}/asmhelpers.S ${ARCH_SOURCES_DIR}/crthelpers.S @@ -391,7 +369,7 @@ else(WIN32) ${ARCH_SOURCES_DIR}/patchedcode.S ${ARCH_SOURCES_DIR}/pinvokestubs.S ) - elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) + elseif(CLR_CMAKE_TARGET_ARCH_ARM64) set(VM_SOURCES_WKS_ARCH_ASM ${ARCH_SOURCES_DIR}/asmhelpers.S ${ARCH_SOURCES_DIR}/calldescrworkerarm64.S @@ -403,7 +381,7 @@ else(WIN32) endif(WIN32) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64) +if(CLR_CMAKE_TARGET_ARCH_AMD64) set(VM_SOURCES_DAC_AND_WKS_ARCH ${ARCH_SOURCES_DIR}/cgenamd64.cpp ${ARCH_SOURCES_DIR}/excepamd64.cpp @@ -419,7 +397,7 @@ if(CLR_CMAKE_PLATFORM_ARCH_AMD64) gcinfodecoder.cpp jitinterfacegen.cpp ) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) +elseif(CLR_CMAKE_TARGET_ARCH_I386) set(VM_SOURCES_DAC_AND_WKS_ARCH gcdecode.cpp exinfo.cpp @@ -434,7 +412,7 @@ elseif(CLR_CMAKE_PLATFORM_ARCH_I386) ${ARCH_SOURCES_DIR}/jitinterfacex86.cpp ${ARCH_SOURCES_DIR}/profiler.cpp ) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) +elseif(CLR_CMAKE_TARGET_ARCH_ARM) set(VM_SOURCES_DAC_AND_WKS_ARCH ${ARCH_SOURCES_DIR}/exceparm.cpp ${ARCH_SOURCES_DIR}/stubs.cpp @@ -447,7 +425,7 @@ elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) exceptionhandling.cpp gcinfodecoder.cpp ) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) +elseif(CLR_CMAKE_TARGET_ARCH_ARM64) set(VM_SOURCES_DAC_AND_WKS_ARCH ${ARCH_SOURCES_DIR}/cgenarm64.cpp ${ARCH_SOURCES_DIR}/stubs.cpp diff --git a/src/vm/crossgen/CMakeLists.txt b/src/vm/crossgen/CMakeLists.txt index 24a6fbdc53..928d9deb0f 100644 --- a/src/vm/crossgen/CMakeLists.txt +++ b/src/vm/crossgen/CMakeLists.txt @@ -107,20 +107,20 @@ include_directories(BEFORE ..) include_directories(${CLR_DIR}/src/gc) include_directories(../${ARCH_SOURCES_DIR}) -if(CLR_CMAKE_PLATFORM_ARCH_AMD64) +if(CLR_CMAKE_TARGET_ARCH_AMD64) list(APPEND VM_CROSSGEN_SOURCES ../${ARCH_SOURCES_DIR}/stublinkeramd64.cpp ) -elseif(CLR_CMAKE_PLATFORM_ARCH_I386) +elseif(CLR_CMAKE_TARGET_ARCH_I386) list(APPEND VM_CROSSGEN_SOURCES ../${ARCH_SOURCES_DIR}/stublinkerx86.cpp ../gcdecode.cpp ) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) +elseif(CLR_CMAKE_TARGET_ARCH_ARM) list(APPEND VM_CROSSGEN_SOURCES ../${ARCH_SOURCES_DIR}/stubs.cpp ) -elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) +elseif(CLR_CMAKE_TARGET_ARCH_ARM64) list(APPEND VM_CROSSGEN_SOURCES ../${ARCH_SOURCES_DIR}/stubs.cpp ) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b8faa5e787..078d9b8552 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -9,6 +9,8 @@ set(CMAKE_CXX_FLAGS_CHECKED "") set(CMAKE_EXE_LINKER_FLAGS_CHECKED "") set(CMAKE_SHARED_LINKER_FLAGS_CHECKED "") +set(CLR_CMAKE_TARGET_ARCH ${CLR_CMAKE_HOST_ARCH}) + set(INC_PLATFORM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/Common/Platform) if (WIN32) add_definitions(-DWINDOWS=1) |