Merge version 8.0.2-11+rpi1 and 8.2.2-4 to produce 8.2.2-4+rpi1

diff --cc aclocal.m4
Simple merge

diff --cc compiler/main/SysTools.hs
Simple merge

diff --cc debian/changelog
index 8070e531d2d81abb61d5c6c4c5fef0bcde43e9e6,a5aa766faec787e91c5b4f9d64493714ccd8f773..9c070f8bf33d87430ba9656f6821d11c899ad72a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,69 +1,82 @@@
- ghc (8.0.2-11+rpi1) buster-staging; urgency=medium
++ghc (8.2.2-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>  Thu, 15 Feb 2018 12:54:03 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 03 Jul 2018 12:25:58 +0000
++
+ ghc (8.2.2-4) unstable; urgency=medium
+ 
+   [ Clint Adams ]
+   * Bump to Standards-Version 4.1.4.
+   * Set Rules-Requires-Root to no.
+ 
+   [ Ilias Tsitsimpis ]
+   * Use system's default ld (ld.bfd) on mips/mipsel, instead of ld.gold
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Mon, 25 Jun 2018 12:24:52 +0300
+ 
+ ghc (8.2.2-3) unstable; urgency=medium
+ 
+   * Upload to unstable.
+ 
+  -- Clint Adams <clint@debian.org>  Sun, 08 Apr 2018 16:24:00 -0400
+ 
+ ghc (8.2.2-2) experimental; urgency=medium
+ 
+   * Merge 8.0.2-12 unreleased changes.
+ 
+  -- Clint Adams <clint@debian.org>  Sat, 07 Apr 2018 08:08:41 -0400
+ 
+ ghc (8.2.2-1) experimental; urgency=medium
+ 
+   * Merge 8.0.2-11 unreleased changes
+   * New upstream release, patch refresh
+   * Fixup regex fix in watch file
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 27 Nov 2017 12:08:38 +0100
+ 
+ ghc (8.2.1-2) experimental; urgency=medium
+ 
+   [ Sean Whitton ]
+   * Upload to experimental again, after merging in changes from unstable.
+     - Refresh patches.
+     - Drop osdecommitmemory-compat.patch from series file
+       Merged upstream.
+ 
+   [ Clint Adams ]
+   * Drop avoid-CrossCompilerPrefix-stage2.patch.
+ 
+  -- Clint Adams <clint@debian.org>  Sun, 17 Sep 2017 07:52:14 -0400
+ 
+ ghc (8.2.1-1) experimental; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Sean Whitton <spwhitton@spwhitton.name>  Fri, 15 Sep 2017 17:15:49 -0700
+ 
+ ghc (8.2.0~20170507-3) experimental; urgency=medium
+ 
+   * 8.2.1-rc2.
+     - Switches to LLVM 3.9.
+ 
+  -- Clint Adams <clint@debian.org>  Wed, 12 Jul 2017 17:51:16 -0400
+ 
+ ghc (8.0.2-12) UNRELEASED; urgency=medium
+ 
+   [ Ilias Tsitsimpis ]
+   * Use salsa.debian.org URLs in Vcs-{Browser,Git} fields
+ 
+   [ Sean Whitton ]
+   * Add lower-optimization-for-unreg.patch (Closes: #890763).
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Fri, 09 Feb 2018 20:44:09 +0200
  
  ghc (8.0.2-11) unstable; urgency=medium
  

diff --cc debian/patches/ARM-VFPv3D16
index ececbc47e318aa116796e7b7f9cc228ab95adef1,0f705e2d69dcdb32088347ed7b3799b0424a152c..855ba69036cb08fd750820aca6c9aca2e3cf113b
--- 1/debian/patches/ARM-VFPv3D16
--- 2/debian/patches/ARM-VFPv3D16
+++ b/debian/patches/ARM-VFPv3D16
@@@ -6,17 -6,14 +6,15 @@@ 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: ghc/aclocal.m4
- ===================================================================
- --- ghc.orig/aclocal.m4       2016-01-14 16:19:24.858462215 +0100
- +++ ghc/aclocal.m4    2016-01-14 16:19:24.854462134 +0100
- @@ -420,7 +420,7 @@
+ --- a/aclocal.m4
+ +++ b/aclocal.m4
+ @@ -417,7 +417,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 6a40a8f0eac661b9191f22458f354b8f5cc5695c,909ac1a3cdeaccc07f0c77527287b824f61bd5e5..e6bdc0bdb7641cac97ef36f5a8fa3ccd5d2e1006
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -5,11 -5,8 +5,9 @@@ hurd.dif
  buildpath-abi-stability.patch
  reproducible-tmp-names
  do-not-use-SHELL
- compiler-cmm-PprC-sparc-alignment.patch
  x32-use-native-x86_64-insn.patch
- osdecommitmemory-compat.patch
  use-stage1-binaries-for-install.patch
  build-unlit-and-hp2ps-twice.patch
- avoid-CrossCompilerPrefix-stage2.patch
  fix-hssplicety.patch
+ lower-optimization-for-unreg.patch
 +force-llc-settings

diff --cc debian/rules
Simple merge