From 9313a2ec1d9fd6b0170bed0eb5897145b4224fa6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 7 Nov 2018 08:56:22 +0100 Subject: [PATCH] Bring back the Disable NEON generation on armhf patch which was gone Should fix the FTBFS on armhg (Closes: #842142) --- debian/changelog | 3 +++ .../patches/clang-arm-default-vfp3-on-armv7a.patch | 13 +++++++++++++ debian/patches/series | 1 + 3 files changed, 17 insertions(+) create mode 100644 debian/patches/clang-arm-default-vfp3-on-armv7a.patch diff --git a/debian/changelog b/debian/changelog index 94526cc4..193da1b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ llvm-toolchain-7 (1:7.0.1~+rc2-1~exp1) experimental; urgency=medium * New testing release + * Bring back the Disable NEON generation on armhf patch which was gone + Should fix the FTBFS on armhg + (Closes: #842142) -- Sylvestre Ledru Mon, 05 Nov 2018 23:38:34 +0100 diff --git a/debian/patches/clang-arm-default-vfp3-on-armv7a.patch b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch new file mode 100644 index 00000000..ce4daf4e --- /dev/null +++ b/debian/patches/clang-arm-default-vfp3-on-armv7a.patch @@ -0,0 +1,13 @@ +Index: llvm-toolchain-7-7/include/llvm/Support/ARMTargetParser.def +=================================================================== +--- llvm-toolchain-7-7.orig/include/llvm/Support/ARMTargetParser.def ++++ llvm-toolchain-7-7/include/llvm/Support/ARMTargetParser.def +@@ -75,7 +75,7 @@ ARM_ARCH("armv6kz", ARMV6KZ, "6KZ", "v6k + ARM_ARCH("armv6-m", ARMV6M, "6-M", "v6m", ARMBuildAttrs::CPUArch::v6_M, + FK_NONE, ARM::AEK_NONE) + ARM_ARCH("armv7-a", ARMV7A, "7-A", "v7", ARMBuildAttrs::CPUArch::v7, +- FK_NEON, ARM::AEK_DSP) ++ FK_VFPV3 /* Hard float */, ARM::AEK_DSP) + ARM_ARCH("armv7ve", ARMV7VE, "7VE", "v7ve", ARMBuildAttrs::CPUArch::v7, + FK_NEON, (ARM::AEK_SEC | ARM::AEK_MP | ARM::AEK_VIRT | + ARM::AEK_HWDIVARM | ARM::AEK_HWDIVTHUMB | ARM::AEK_DSP)) diff --git a/debian/patches/series b/debian/patches/series index 230de792..326426aa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -85,3 +85,4 @@ clangd-atomic-cmake.patch rustc-aarch64-test-failure.diff symbolizer-path.diff mips-rdhwr.diff +clang-arm-default-vfp3-on-armv7a.patch