From 446cedc24e89cc44611800c40634336716260526 Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Sat, 23 Jul 2022 22:01:02 +0100 Subject: [PATCH] compilerrt-builtins-arch-fix-armhf fix builtins armhf default arch detection by adding the same armhf triple handling use for compiler-rt Gbp-Pq: Name compilerrt-builtins-arch-fix-armhf.diff --- compiler-rt/lib/builtins/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt index ea5ad9cdb8..63f57abdcd 100644 --- a/compiler-rt/lib/builtins/CMakeLists.txt +++ b/compiler-rt/lib/builtins/CMakeLists.txt @@ -27,6 +27,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) load_llvm_config() construct_compiler_rt_default_triple() + if ("${COMPILER_RT_DEFAULT_TARGET_TRIPLE}" MATCHES ".*hf$") + if (${COMPILER_RT_DEFAULT_TARGET_ARCH} MATCHES "^arm") + set(COMPILER_RT_DEFAULT_TARGET_ARCH "armhf") + endif() + endif() include(SetPlatformToolchainTools) if(APPLE) -- 2.30.2