Manual merge of version 8.2.2-4+rpi1 and 8.4.3+dfsg1-4 to produce 8.4.3+dfsg1-4+rpi1

diff --cc aclocal.m4
Simple merge

diff --cc compiler/main/SysTools.hs
index 9192482b45399e2b554b7e9e4d01d39642012037,93989ad2577910219b17ed99a8160ed5b9c43853..4fb1601bd958eb4538f6fc6817f1ed43a8719144
--- 1/compiler/main/SysTools.hs
--- 2/compiler/main/SysTools.hs
+++ b/compiler/main/SysTools.hs
@@@ -364,8 -294,11 +294,11 @@@ initSysTools mbMinus
                      sPgm_T   = touch_path,
                      sPgm_windres = windres_path,
                      sPgm_libtool = libtool_path,
+                     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       = [],
                      sOpt_P       = [],

diff --cc debian/changelog
index 9c070f8bf33d87430ba9656f6821d11c899ad72a,1c00a69cfb3f21f043ed2f0b28bfa3087344a89d..69b89e86a4c3e7fd165f1c176e29ccac22a85011
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,135 +1,148 @@@
- ghc (8.2.2-4+rpi1) buster-staging; urgency=medium
++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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 03 Jul 2018 12:25:58 +0000
++ -- Peter Michael green <plugwash@raspbian.org>  Wed, 28 Nov 2018 06:00:51 +0000
++
+ ghc (8.4.3+dfsg1-4) unstable; urgency=medium
+ 
+   * Add missing Breaks+Replaces+Provides (Closes: #910480).
+     Break+Replace+Provide all bundled libraries, including libghc-parsec3-dev.
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Fri, 19 Oct 2018 13:09:22 +0300
+ 
+ ghc (8.4.3+dfsg1-3) unstable; urgency=medium
+ 
+   * Conflict with mtl and stm.  closes: #910008.
+ 
+  -- Clint Adams <clint@debian.org>  Thu, 18 Oct 2018 18:20:40 -0400
+ 
+ ghc (8.4.3+dfsg1-2) unstable; urgency=medium
+ 
+   * Upload to unstable
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Wed, 26 Sep 2018 12:10:37 +0300
+ 
+ ghc (8.4.3+dfsg1-1) experimental; urgency=medium
+ 
+   * Backport upstream commit 18cb44dfae3f.
+     This fixes upstream bug #15213 (32 bit Haddock runs out of memory
+     compiling 32 bit GHC).
+   * Remove DFSG incompatible file (Closes: #870683).
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Fri, 21 Sep 2018 23:05:59 +0300
+ 
+ ghc (8.4.3-7) experimental; urgency=medium
+ 
+   * Backport upstream commit ec9aacf3eb2 (add -latomic to ghc-prim)
+   * Use system's default ld (ld.bfd) on sparc64, instead of ld.gold
+     (Closes: #908998)
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Tue, 18 Sep 2018 14:30:06 +0300
+ 
+ ghc (8.4.3-6) experimental; urgency=medium
+ 
+   [ Gianfranco Costamagna ]
+   * Try to fix armel build
+ 
+   [ John Paul Adrian Glaubitz ]
+   * ghc: disable ld override on powerpcspe too
+ 
+   [ Ilias Tsitsimpis ]
+   * Allow unregisterised ghc-8.2 to build newer GHC
+   * Bump to Standards-Version 4.2.1
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Fri, 14 Sep 2018 14:32:12 +0300
+ 
+ ghc (8.4.3-5) experimental; urgency=medium
+ 
+   * Switch to dh_auto_configure, making the correct triplet
+     being passed to the build system, with also --target flag
+     (this should hopefully make the configure more robust, and
+     stop failing now that armhf runs on arm64 systems)
+     - thanks waldi, jcristay for the help
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 20 Jul 2018 13:52:19 +0200
+ 
+ ghc (8.4.3-4) experimental; urgency=medium
+ 
+   * merge with unstable 8.2.2-6
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 20 Jul 2018 00:24:43 +0200
+ 
+ ghc (8.4.3-3) experimental; urgency=medium
+ 
+   * Switch configure.ac to search for llvm 6.0
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 19 Jul 2018 12:16:02 +0200
+ 
+ ghc (8.4.3-2) experimental; urgency=medium
+ 
+   [ Gianfranco Costamagna ]
+   * Remove old and non-applied anymore powerpcspe-disable-FPU-code.patch.
+     (Closes: #900817)
+   * Switch to llvm 6.0 (Closes: #850915)
+ 
+   [ Clint Adams ]
+   * Merge in 8.2.2-5.
+ 
+  -- Clint Adams <clint@debian.org>  Wed, 18 Jul 2018 19:12:59 -0400
+ 
+ ghc (8.4.3-1) experimental; urgency=medium
+ 
+   * New upstream version.
+   * Apply upstream patch to build on armhf.
+ 
+  -- Clint Adams <clint@debian.org>  Wed, 30 May 2018 18:34:37 -0400
+ 
+ ghc (8.4.2-1) experimental; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 23 Apr 2018 10:28:43 +0200
+ 
+ ghc (8.4.1-2) experimental; urgency=medium
+ 
+   * Refresh armel patch, but do not apply it, to see
+     if upstream changes are enough to make it build again
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 10 Apr 2018 08:58:07 +0200
+ 
+ ghc (8.4.1-1) experimental; urgency=medium
+ 
+   * New upstream release, patch refresh
+   * Bump std-version to 4.1.4, no changes required
+   * d/{rules,control}: switch to llvm 5.0 on arm*
+   * Drop patches included in new upstream release:
+     - reproducible-tmp-names
+     - do-not-use-SHELL
+     - build-unlit-and-hp2ps-twice.patch
+     - fix-hssplicety.patch
+     - lower-optimization-for-unreg.patch
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 09 Apr 2018 15:54:00 +0200
+ 
+ ghc (8.2.2-6) unstable; urgency=medium
+ 
+   * debian/patches/{risc-support,e175aaf6918bb2b497b83618dc4c270a0d231a1c}.patch
+     - add upstream patches to support risc* platforms (Closes: #904096)
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 19 Jul 2018 19:24:01 +0200
+ 
+ ghc (8.2.2-5) unstable; urgency=medium
+ 
+   * Apply patch to disable -Bsymbolic on unregisterised
+     architectures.  closes: #904055.
+   * Add autopkgtest.
+ 
+  -- Clint Adams <clint@debian.org>  Wed, 18 Jul 2018 18:56:46 -0400
  
  ghc (8.2.2-4) unstable; urgency=medium
  

diff --cc debian/patches/ARM-VFPv3D16
index 855ba69036cb08fd750820aca6c9aca2e3cf113b,42e67c979fb4a9a0bdf54c3a97f56eb229bf7a4a..ccad493ac8d67c9feeaf0e251fca4686226f2779
--- 1/debian/patches/ARM-VFPv3D16
--- 2/debian/patches/ARM-VFPv3D16
+++ b/debian/patches/ARM-VFPv3D16
@@@ -6,15 -6,16 +6,17 @@@ Author: Jani Monoses <jani@ubuntu.com
  Upstream-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
  Launchpad-Bug: https://ghc.haskell.org/trac/ghc/ticket/5914
  
+ Index: b/aclocal.m4
+ ===================================================================
  --- a/aclocal.m4
  +++ b/aclocal.m4
- @@ -417,7 +417,7 @@ AC_DEFUN([GET_ARM_ISA],
+ @@ -423,7 +423,7 @@ AC_DEFUN([GET_ARM_ISA],
                   )],
                   [changequote(, )dnl
 -                  ARM_ISA=ARMv7
 +-                 ARM_ISA=ARMv7
 ++                 ARM_ISA=ARMv6
  -                 ARM_ISA_EXT="[VFPv3,NEON]"
 -+                 ARM_ISA_EXT="[VFPv3D16,NEON]"
 ++                 ARM_ISA_EXT="[VFPv2]"
                    changequote([, ])dnl
                   ])
           ])

diff --cc debian/patches/series
index e6bdc0bdb7641cac97ef36f5a8fa3ccd5d2e1006,4198607e7c5701cd4e91e3efeda63d293f62eb6e..43b140ebef4b30fe5165b68dc02c5a0243e39162
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -3,11 -3,14 +3,15 @@@ ARM-VFPv3D1
  no-missing-haddock-file-warning
  hurd.diff
  buildpath-abi-stability.patch
- reproducible-tmp-names
- do-not-use-SHELL
  x32-use-native-x86_64-insn.patch
  use-stage1-binaries-for-install.patch
- build-unlit-and-hp2ps-twice.patch
- fix-hssplicety.patch
- lower-optimization-for-unreg.patch
+ llvm-targets-Add-versioned-ARM-targets.patch
+ bsymbolic-only-for-registerised.patch
+ use-llvm-6.0.patch
+ e175aaf6918bb2b497b83618dc4c270a0d231a1c.patch
+ risc-support.patch
+ armel-revert-ghci-fixes.patch
+ fix-build-using-unregisterized-v8.2
+ add_-latomic_to_ghc-prim
+ haddock-out-of-memory.patch
 +force-llc-settings

diff --cc debian/rules
Simple merge