Remove force-llc-settings, it doesn't seem to be needed anymore and

breaks the build.

diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
index 4fb1601bd958eb4538f6fc6817f1ed43a8719144..93989ad2577910219b17ed99a8160ed5b9c43853 100644 (file)
--- 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 69b89e86a4c3e7fd165f1c176e29ccac22a85011..4f6e618cfa4656365ff578ac88875cda0a4d6e9b 100644 (file)
--- 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 <plugwash@raspbian.org> 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 (file)
index bcca80a..0000000
--- 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 <plugwash@p10link.net>
-
---- 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 43b140ebef4b30fe5165b68dc02c5a0243e39162..4198607e7c5701cd4e91e3efeda63d293f62eb6e 100644 (file)
--- 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