From 28ac79c44a514276de6f3d49fb867a34bbdf5b52 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Wed, 28 Nov 2018 20:27:21 +0000 Subject: [PATCH] Remove force-llc-settings, it doesn't seem to be needed anymore and breaks the build. --- compiler/main/SysTools.hs | 2 +- debian/changelog | 4 ---- debian/patches/force-llc-settings | 14 -------------- debian/patches/series | 1 - 4 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 debian/patches/force-llc-settings diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs index 4fb1601b..93989ad2 100644 --- a/compiler/main/SysTools.hs +++ b/compiler/main/SysTools.hs @@ -297,7 +297,7 @@ initSysTools mbMinusB sPgm_ar = ar_path, sPgm_ranlib = ranlib_path, sPgm_lo = (lo_prog,[]), - sPgm_lc = (lc_prog,[Option "-mcpu=arm1176jzf-s"]), + sPgm_lc = (lc_prog,[]), sPgm_lcc = (lcc_prog,[]), sPgm_i = iserv_prog, sOpt_L = [], diff --git a/debian/changelog b/debian/changelog index 69b89e86..4f6e618c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,10 +2,6 @@ ghc (8.4.3+dfsg1-4+rpi1) buster-staging; urgency=medium [changes brought forward from 7.6.3-21+rpi1 by Peter Michael Green at Sun, 19 Apr 2015 14:00:16 +0000] * Change compiler defaults for armv6 - * Force llvm cpu and float abi options - [changes introduced in 7.8.4-9+rpi1 by Peter Michael Green] - * no longer set Option "-float-abi=hard" in force-llc-settings, ghc now - sets it without help and setting it twice makes llc fail. [changed introduced in 7.10.3-2+rpi1 by Peter Michael Green] * Add call to dh_autoreconf_clean diff --git a/debian/patches/force-llc-settings b/debian/patches/force-llc-settings deleted file mode 100644 index bcca80aa..00000000 --- a/debian/patches/force-llc-settings +++ /dev/null @@ -1,14 +0,0 @@ -Description: force llc settings to ones that are known to work -Author: Peter Michael Green - ---- ghc-8.4.3+dfsg1.orig/compiler/main/SysTools.hs -+++ ghc-8.4.3+dfsg1/compiler/main/SysTools.hs -@@ -297,7 +297,7 @@ initSysTools mbMinusB - sPgm_ar = ar_path, - sPgm_ranlib = ranlib_path, - sPgm_lo = (lo_prog,[]), -- sPgm_lc = (lc_prog,[]), -+ sPgm_lc = (lc_prog,[Option "-mcpu=arm1176jzf-s"]), - sPgm_lcc = (lcc_prog,[]), - sPgm_i = iserv_prog, - sOpt_L = [], diff --git a/debian/patches/series b/debian/patches/series index 43b140eb..4198607e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,4 +14,3 @@ armel-revert-ghci-fixes.patch fix-build-using-unregisterized-v8.2 add_-latomic_to_ghc-prim haddock-out-of-memory.patch -force-llc-settings -- 2.30.2