From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Tue, 17 Dec 2024 10:19:10 +0000 (+0100)
Subject: compilerrt-builtins-arch-fix-armhf
X-Git-Tag: archive/raspbian/1%17.0.6-19+rpi1^2~23
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b31747fb2f00ee54a42f35962da6ffcbcf452ee7;p=llvm-toolchain-17.git

compilerrt-builtins-arch-fix-armhf

fix builtins armhf default arch detection by adding the same armhf triple
handling use for compiler-rt

Gbp-Pq: Topic compiler-rt
Gbp-Pq: Name compilerrt-builtins-arch-fix-armhf.diff
---

diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt
index d62fa0432e..f65bb274fa 100644
--- a/compiler-rt/lib/builtins/CMakeLists.txt
+++ b/compiler-rt/lib/builtins/CMakeLists.txt
@@ -29,6 +29,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
     load_llvm_config()
   endif()
   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)