cbaa3597aa
This reverts commit d763c6e5e2d0a6b34097aa7dabca31e9aff9b0b6. Adds the patch by @hans from https://github.com/llvm/llvm-project/issues/62719 This patch fixes the Windows build. d763c6e5e2d0a6b34097aa7dabca31e9aff9b0b6 reverted the reviews D144509 [CMake] Bumps minimum version to 3.20.0. This partly undoes D137724. This change has been discussed on discourse https://discourse.llvm.org/t/rfc-upgrading-llvms-minimum-required-cmake-version/66193 Note this does not remove work-arounds for older CMake versions, that will be done in followup patches. D150532 [OpenMP] Compile assembly files as ASM, not C Since CMake 3.20, CMake explicitly passes "-x c" (or equivalent) when compiling a file which has been set as having the language C. This behaviour change only takes place if "cmake_minimum_required" is set to 3.20 or newer, or if the policy CMP0119 is set to new. Attempting to compile assembly files with "-x c" fails, however this is workarounded in many cases, as OpenMP overrides this with "-x assembler-with-cpp", however this is only added for non-Windows targets. Thus, after increasing cmake_minimum_required to 3.20, this breaks compiling the GNU assembly for Windows targets; the GNU assembly is used for ARM and AArch64 Windows targets when building with Clang. This patch unbreaks that. D150688 [cmake] Set CMP0091 to fix Windows builds after the cmake_minimum_required bump The build uses other mechanism to select the runtime. Fixes #62719 Reviewed By: #libc, Mordante Differential Revision: https://reviews.llvm.org/D151344
64 lines
2.0 KiB
CMake
64 lines
2.0 KiB
CMake
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
|
|
cmake_minimum_required(VERSION 3.20.0)
|
|
|
|
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
|
|
project(CompilerRTCRT C)
|
|
set(COMPILER_RT_STANDALONE_BUILD TRUE)
|
|
set(COMPILER_RT_CRT_STANDALONE_BUILD TRUE)
|
|
|
|
set(COMPILER_RT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..")
|
|
|
|
set(LLVM_COMMON_CMAKE_UTILS "${COMPILER_RT_SOURCE_DIR}/../cmake")
|
|
|
|
# Add path for custom modules
|
|
list(INSERT CMAKE_MODULE_PATH 0
|
|
"${COMPILER_RT_SOURCE_DIR}/cmake"
|
|
"${COMPILER_RT_SOURCE_DIR}/cmake/Modules"
|
|
"${LLVM_COMMON_CMAKE_UTILS}"
|
|
"${LLVM_COMMON_CMAKE_UTILS}/Modules"
|
|
)
|
|
|
|
include(base-config-ix)
|
|
include(CompilerRTUtils)
|
|
|
|
load_llvm_config()
|
|
construct_compiler_rt_default_triple()
|
|
|
|
include(SetPlatformToolchainTools)
|
|
include(AddCompilerRT)
|
|
endif()
|
|
|
|
include(crt-config-ix)
|
|
|
|
if(COMPILER_RT_HAS_CRT)
|
|
add_compiler_rt_component(crt)
|
|
|
|
include(CheckSectionExists)
|
|
check_section_exists(".init_array" COMPILER_RT_HAS_INITFINI_ARRAY
|
|
SOURCE "volatile int x;\n__attribute__((constructor)) void f(void) {x = 0;}\nint main(void) { return 0; }\n")
|
|
|
|
append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 CRT_CFLAGS)
|
|
append_list_if(COMPILER_RT_HAS_INITFINI_ARRAY -DCRT_HAS_INITFINI_ARRAY CRT_CFLAGS)
|
|
append_list_if(COMPILER_RT_CRT_USE_EH_FRAME_REGISTRY -DEH_USE_FRAME_REGISTRY CRT_CFLAGS)
|
|
append_list_if(COMPILER_RT_HAS_FPIC_FLAG -fPIC CRT_CFLAGS)
|
|
append_list_if(COMPILER_RT_HAS_WNO_PEDANTIC -Wno-pedantic CRT_CFLAGS)
|
|
if (COMPILER_RT_HAS_FCF_PROTECTION_FLAG)
|
|
append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full CRT_CFLAGS)
|
|
endif()
|
|
|
|
foreach(arch ${CRT_SUPPORTED_ARCH})
|
|
add_compiler_rt_runtime(clang_rt.crtbegin
|
|
OBJECT
|
|
ARCHS ${arch}
|
|
SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtbegin.c
|
|
CFLAGS ${CRT_CFLAGS}
|
|
PARENT_TARGET crt)
|
|
add_compiler_rt_runtime(clang_rt.crtend
|
|
OBJECT
|
|
ARCHS ${arch}
|
|
SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/crtend.c
|
|
CFLAGS ${CRT_CFLAGS}
|
|
PARENT_TARGET crt)
|
|
endforeach()
|
|
endif()
|