From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Tue, 31 May 2022 12:08:49 +0000 (+0100)
Subject: compilerrt-builtins-arch-fix-armhf
X-Git-Tag: archive/raspbian/1%14.0.4-4+rpi1~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=50068d1d0a5dcad75745775b70a0f92688816a3a;p=llvm-toolchain-14.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: Name compilerrt-builtins-arch-fix-armhf.diff
---

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)