rebase of the patches

This commit is contained in:
Sylvestre Ledru 2022-11-15 10:47:16 +01:00
parent fd2dd270a3
commit 6806d9a982

View File

@ -1,12 +1,12 @@
fix builtins armhf default arch detection by adding the same armhf triple
handling use for compiler-rt
Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/builtins/CMakeLists.txt
Index: llvm-toolchain-snapshot_16~++20221115104007+a853c42a6a5e/compiler-rt/lib/builtins/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/compiler-rt/lib/builtins/CMakeLists.txt
+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/builtins/CMakeLists.txt
@@ -27,6 +27,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
load_llvm_config()
--- llvm-toolchain-snapshot_16~++20221115104007+a853c42a6a5e.orig/compiler-rt/lib/builtins/CMakeLists.txt
+++ llvm-toolchain-snapshot_16~++20221115104007+a853c42a6a5e/compiler-rt/lib/builtins/CMakeLists.txt
@@ -29,6 +29,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
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")