diff --git a/debian/patches/33-armhf-defaults.diff b/debian/patches/33-armhf-defaults.diff deleted file mode 100644 index 2eadda78..00000000 --- a/debian/patches/33-armhf-defaults.diff +++ /dev/null @@ -1,55 +0,0 @@ -Description: Fix defaults to use correct CPU and FPU on armhf - Clang was defaulting to a rediculously low CPU on armhf, furthermore when - The correct CPU is selected it defaults to incorrect FPU options for - debian. This patch sets the defaults to appropriate values. -Author: Peter Michael Green -Bug-Debian: http://bugs.debian.org/704111 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - -Index: llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Driver/Tools.cpp -=================================================================== ---- llvm-toolchain-snapshot_3.4~svn188990.orig/clang/lib/Driver/Tools.cpp 2013-08-22 09:08:06.216607799 +0200 -+++ llvm-toolchain-snapshot_3.4~svn188990/clang/lib/Driver/Tools.cpp 2013-08-22 09:10:40.676603865 +0200 -@@ -491,6 +491,9 @@ - if (Arg *A = Args.getLastArg(options::OPT_march_EQ)) { - // Otherwise, if we have -march= choose the base CPU for that arch. - MArch = A->getValue(); -+ } else if (Triple.getEnvironment() == llvm::Triple::GNUEABIHF) { -+ // Use armv6 for armhf (raspbian version of patch) -+ MArch = "armv7-a"; - } else { - // Otherwise, use the Arch from the triple. - MArch = Triple.getArchName(); -@@ -699,8 +702,19 @@ - Features.push_back("+soft-float-abi"); - - // Honor -mfpu=. -- if (const Arg *A = Args.getLastArg(options::OPT_mfpu_EQ)) -+ if (const Arg *A = Args.getLastArg(options::OPT_mfpu_EQ)) { - getFPUFeatures(D, A, Args, Features); -+ } else { -+ if (StringRef(CPUName).startswith("cortex-a")) { -+ //Debian armhf uses vfpv3-d16 -+ CmdArgs.push_back("-target-feature"); -+ CmdArgs.push_back("+vfp3"); -+ CmdArgs.push_back("-target-feature"); -+ CmdArgs.push_back("+d16"); -+ CmdArgs.push_back("-target-feature"); -+ CmdArgs.push_back("-neon"); -+ } -+ } - - // Setting -msoft-float effectively disables NEON because of the GCC - // implementation, although the same isn't true of VFP or VFP3. diff --git a/debian/patches/series b/debian/patches/series index 87cde992..644e8fd1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,7 +17,6 @@ scan-build-clang-path.diff 0050-powerpcspe-fp.diff declare_clear_cache.diff 31-powerpcspe.diff -33-armhf-defaults.diff 34-powerpc-no-altivec.diff ia64-fix.diff clang-format-version.diff