From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Mon, 11 Sep 2023 13:40:42 +0000 (+0100)
Subject: compilerrt-builtins-arch-fix-armhf
X-Git-Tag: archive/raspbian/1%16.0.6-15+rpi1~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=59f3bc32b12e3026b2a129ac0ae602116d0a109f;p=llvm-toolchain-16.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 2fc7052289..65d43452ab 100644
--- a/compiler-rt/lib/builtins/CMakeLists.txt
+++ b/compiler-rt/lib/builtins/CMakeLists.txt
@@ -36,6 +36,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)