From: Peter Michael Green Date: Thu, 18 Apr 2019 12:54:33 +0000 (+0000) Subject: Remove debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155... X-Git-Tag: archive/raspbian/1%8-3+rpi1~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1a839296377e62e6071fdc0532f28cd26fa7ce7d;p=llvm-toolchain-8.git Remove debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094 , dgit will regenerate it --- diff --git a/debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094 b/debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094 deleted file mode 100644 index ad29b242d..000000000 --- a/debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094 +++ /dev/null @@ -1,61 +0,0 @@ -From: Peter Micahel Green -Subject: Automatically generated patch (1:5.0~+rc2-1+rpi1) - -Last (up to) 3 git changes, FYI: - -commit d8bb5e17a1c124bfc65bd4da3d5bad2318b86155 -Author: Peter Michael Green -Date: Thu Sep 7 07:03:48 2017 +0000 - - Remove old cmake patch, dgit will regenerate it. - -commit 8479377cb2739eeaa610fbc0370f239e0cabda83 -Merge: 706ae0030 46e6d900f -Author: Peter Michael Green -Date: Thu Sep 7 07:11:20 2017 +0100 - - Merge raspbian changes from llvm-toolchain-4.0 - -commit 706ae0030c98b01e6594ab4a4aca848e9dbedbd5 -Merge: 2b80ff9a0 b60f1e5d8 -Author: plugwash -Date: Thu Sep 7 07:02:37 2017 +0100 - - Psuedomerge to tie in 4.0 history. ---- - -Index: llvm-toolchain-6.0-6.0/cmake/config.guess.hack -=================================================================== ---- /dev/null -+++ llvm-toolchain-6.0-6.0/cmake/config.guess.hack -@@ -0,0 +1,2 @@ -+#!/bin/bash -e -+$(dirname "$0")/config.guess | sed -r s/arm[a-zA-Z0-9]*/armv6/ -Index: llvm-toolchain-6.0-6.0/cmake/modules/GetHostTriple.cmake -=================================================================== ---- llvm-toolchain-6.0-6.0.orig/cmake/modules/GetHostTriple.cmake -+++ llvm-toolchain-6.0-6.0/cmake/modules/GetHostTriple.cmake -@@ -15,7 +15,7 @@ function( get_host_triple var ) - set( value "i686-pc-mingw32" ) - 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 -Index: llvm-toolchain-6.0-6.0/compiler-rt/cmake/base-config-ix.cmake -=================================================================== ---- llvm-toolchain-6.0-6.0.orig/compiler-rt/cmake/base-config-ix.cmake -+++ llvm-toolchain-6.0-6.0/compiler-rt/cmake/base-config-ix.cmake -@@ -178,8 +178,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 93cc4e836..7128e81d5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -119,4 +119,3 @@ 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:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094