From: Peter Michael Green Date: Sat, 26 Nov 2022 19:15:23 +0000 (+0000) Subject: reduce context in patch. X-Git-Tag: archive/raspbian/1%16.0.6-15+rpi1~3^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2dd21538b9d704e1c555a8126b42892c71036c01;p=llvm-toolchain-16.git reduce context in patch. --- diff --git a/debian/patches/raspbian-triplet.patch b/debian/patches/raspbian-triplet.patch index 1f4d61eb71..8a77501b43 100644 --- a/debian/patches/raspbian-triplet.patch +++ b/debian/patches/raspbian-triplet.patch @@ -8,25 +8,17 @@ with the one we want for raspbian. +$(dirname "$0")/config.guess | sed -r s/arm[a-zA-Z0-9]*/armv6/ --- llvm-toolchain-9-9.orig/llvm/cmake/modules/GetHostTriple.cmake +++ llvm-toolchain-9-9/llvm/cmake/modules/GetHostTriple.cmake -@@ -18,7 +18,7 @@ function( get_host_triple var ) - if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows AND NOT MSYS) - message(WARNING "unable to determine host target triple") +@@ -20,3 +20,3 @@ else() - set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess) + set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess.hack) execute_process(COMMAND sh ${config_guess} - RESULT_VARIABLE TT_RV - OUTPUT_VARIABLE TT_OUT --- llvm-toolchain-9-9.orig/compiler-rt/cmake/base-config-ix.cmake +++ llvm-toolchain-9-9/compiler-rt/cmake/base-config-ix.cmake -@@ -203,8 +203,8 @@ macro(test_targets) - if(WIN32) - test_target_arch(arm "" "" "") +@@ -205,4 +205,4 @@ else() - test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft") - test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard") + test_target_arch(arm "" "" "-mfloat-abi=soft") + test_target_arch(armhf "" "" "-mfloat-abi=hard") test_target_arch(armv6m "" "-march=armv6m" "-mfloat-abi=soft") - endif() - elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32")