diff --git a/debian/changelog b/debian/changelog index 31209127..f3161ea6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,6 @@ -llvm-toolchain-3.9 (1:3.9-5) UNRELEASED; urgency=medium +llvmy-toolchain-3.9 (1:3.9-5) UNRELEASED; urgency=medium - [ Gianfranco Costamagna ] - * d/p/no-neon-on-armhf.patch: avoid defaulting to NEON instructions - for armhf (Closes: #842143). + * armhf (Closes: #842143). [ Sylvestre Ledru ] * d/p/0011-SimplifyCFG-Hoisting-invalidates-metadata.patch: Also apply bug 29163 diff --git a/debian/patches/no-neon-on-armhf.patch b/debian/patches/no-neon-on-armhf.patch deleted file mode 100644 index ec8b356c..00000000 --- a/debian/patches/no-neon-on-armhf.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Patch suggested from upstream, to build without a default NEON for arm* - -Bug-Debian: https://bugs.debian.org/842142 -Bug-Debian: https://bugs.debian.org/842143 - -Index: llvm-toolchain-3.9-3.9/clang/lib/Driver/Tools.cpp -=================================================================== ---- llvm-toolchain-3.9-3.9.orig/clang/lib/Driver/Tools.cpp -+++ llvm-toolchain-3.9-3.9/clang/lib/Driver/Tools.cpp -@@ -9073,7 +9073,7 @@ - const llvm::Triple &Triple2 = getToolChain().getTriple(); - switch (Triple2.getSubArch()) { - case llvm::Triple::ARMSubArch_v7: -- CmdArgs.push_back("-mfpu=neon"); -+ CmdArgs.push_back("-mfpu=vfp"); - break; - case llvm::Triple::ARMSubArch_v8: - CmdArgs.push_back("-mfpu=crypto-neon-fp-armv8"); diff --git a/debian/patches/series b/debian/patches/series index cf82e150..0ec4adf5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -38,6 +38,4 @@ clang-tidy-run-bin.diff drop-wrong-hack-arm64.patch bug-30342.diff fix-scan-view-path.diff - -no-neon-on-armhf.patch 0011-SimplifyCFG-Hoisting-invalidates-metadata.patch