reduce context in patch. archive/raspbian/1%15.0.5-3+rpi1 raspbian/1%15.0.5-3+rpi1
authorPeter Michael Green <plugwash@debian.org>
Sat, 26 Nov 2022 19:15:23 +0000 (19:15 +0000)
committerPeter Michael Green <plugwash@debian.org>
Sat, 26 Nov 2022 19:15:23 +0000 (19:15 +0000)
debian/patches/raspbian-triplet.patch

index 1f4d61eb710aa93b67a19723b8c07a65f03de19d..8a77501b43dce157b6972165586bceba7edcc408 100644 (file)
@@ -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")