From: Peter Michael Green Date: Thu, 18 Apr 2019 12:58:25 +0000 (+0000) Subject: Commit Debian 3.0 (quilt) metadata X-Git-Tag: archive/raspbian/1%8-3+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4f282c29732d03b2bb6d6d46fc803bd11a717a2f;p=llvm-toolchain-8.git Commit Debian 3.0 (quilt) metadata [dgit (8.4) quilt-fixup] --- diff --git a/debian/patches/auto-1:8-3+rpi1-1a839296377e62e6071fdc0532f28cd26fa7ce7d-1555592223 b/debian/patches/auto-1:8-3+rpi1-1a839296377e62e6071fdc0532f28cd26fa7ce7d-1555592223 new file mode 100644 index 000000000..951097d7e --- /dev/null +++ b/debian/patches/auto-1:8-3+rpi1-1a839296377e62e6071fdc0532f28cd26fa7ce7d-1555592223 @@ -0,0 +1,55 @@ +From: Peter Michael Green +Subject: Automatically generated patch (1:8-3+rpi1) + +Last (up to) 3 git changes, FYI: + +commit 1a839296377e62e6071fdc0532f28cd26fa7ce7d +Author: Peter Michael Green +Date: Thu Apr 18 12:54:33 2019 +0000 + + Remove debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094 , dgit will regenerate it + +commit 8fe3dcc5b5f6c43e04e8f0058edc7ad29d96ae12 +Merge: 86394b476 d673fd1d4 +Author: Peter Michael Green +Date: Thu Apr 18 12:39:52 2019 +0000 + + Merge raspbian llvm-toolchain-7 changes into llvm-toolchain-8 packaging. + +commit 86394b476fd743ead652ed2be8daa09d3416fe66 +Merge: a66bb8aea 981d35010 +Author: root +Date: Thu Apr 18 11:30:47 2019 +0000 + + Psuedomerge tag '1%7.0.1-8' of 172.17.3.10:/build/git/l/llvm-toolchain-7 into HEAD +--- + +--- /dev/null ++++ llvm-toolchain-8-8/cmake/config.guess.hack +@@ -0,0 +1,2 @@ ++#!/bin/bash -e ++$(dirname "$0")/config.guess | sed -r s/arm[a-zA-Z0-9]*/armv6/ +--- llvm-toolchain-8-8.orig/cmake/modules/GetHostTriple.cmake ++++ llvm-toolchain-8-8/cmake/modules/GetHostTriple.cmake +@@ -15,7 +15,7 @@ function( get_host_triple var ) + set( value "i686-pc-windows-gnu" ) + endif() + else( MSVC ) +- 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-8-8.orig/compiler-rt/cmake/base-config-ix.cmake ++++ llvm-toolchain-8-8/compiler-rt/cmake/base-config-ix.cmake +@@ -204,8 +204,8 @@ macro(test_targets) + if(WIN32) + test_target_arch(arm "" "" "") + 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") diff --git a/debian/patches/series b/debian/patches/series index 7128e81d5..8958d8413 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -119,3 +119,4 @@ OpenCL-Change-type-of-block-pointer-for-OpenCL.patch OpenCL-Simplify-LLVM-IR-generated-for-OpenCL-blocks.patch OpenCL-Fix-assertion-due-to-blocks.patch +auto-1:8-3+rpi1-1a839296377e62e6071fdc0532f28cd26fa7ce7d-1555592223