From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Thu, 21 Jul 2022 07:14:44 +0000 (+0100)
Subject: compilerrt-builtins-arch-fix-armhf
X-Git-Tag: archive/raspbian/1%13.0.1-6_deb10u4+rpi1^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=176a57fb5fccc57c2855b1a0f36272c890157ca1;p=llvm-toolchain-13.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 59d83631a5..36c0c98a84 100644
--- a/compiler-rt/lib/builtins/CMakeLists.txt
+++ b/compiler-rt/lib/builtins/CMakeLists.txt
@@ -17,6 +17,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()
 
   if(APPLE)
     include(CompilerRTDarwinUtils)