diff -Nru ghc-8.2.2/debian/changelog ghc-8.2.2/debian/changelog
--- ghc-8.2.2/debian/changelog	2018-06-25 09:24:52.000000000 +0000
+++ ghc-8.2.2/debian/changelog	2018-07-03 12:25:58.000000000 +0000
@@ -1,3 +1,16 @@
+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>  Tue, 03 Jul 2018 12:25:58 +0000
+
 ghc (8.2.2-4) unstable; urgency=medium
 
   [ Clint Adams ]
diff -Nru ghc-8.2.2/debian/patches/ARM-VFPv3D16 ghc-8.2.2/debian/patches/ARM-VFPv3D16
--- ghc-8.2.2/debian/patches/ARM-VFPv3D16	2018-06-08 15:10:01.000000000 +0000
+++ ghc-8.2.2/debian/patches/ARM-VFPv3D16	2018-07-03 12:25:57.000000000 +0000
@@ -11,9 +11,10 @@
 @@ -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 -Nru ghc-8.2.2/debian/patches/force-llc-settings ghc-8.2.2/debian/patches/force-llc-settings
--- ghc-8.2.2/debian/patches/force-llc-settings	1970-01-01 00:00:00.000000000 +0000
+++ ghc-8.2.2/debian/patches/force-llc-settings	2018-07-03 12:25:54.000000000 +0000
@@ -0,0 +1,29 @@
+Description: force llc settings to ones that are known to work
+Author: Peter Michael Green <plugwash@p10link.net>
+
+---
+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: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: ghc-8.0.1/compiler/main/SysTools.hs
+===================================================================
+--- ghc-8.0.1.orig/compiler/main/SysTools.hs
++++ ghc-8.0.1/compiler/main/SysTools.hs
+@@ -360,7 +360,7 @@ initSysTools mbMinusB
+                     sPgm_windres = windres_path,
+                     sPgm_libtool = libtool_path,
+                     sPgm_lo  = (lo_prog,[]),
+-                    sPgm_lc  = (lc_prog,[]),
++                    sPgm_lc  = (lc_prog,[Option "-mcpu=arm1176jzf-s"]),
+                     sPgm_i   = iserv_prog,
+                     sOpt_L       = [],
+                     sOpt_P       = [],
diff -Nru ghc-8.2.2/debian/patches/series ghc-8.2.2/debian/patches/series
--- ghc-8.2.2/debian/patches/series	2018-06-08 15:10:01.000000000 +0000
+++ ghc-8.2.2/debian/patches/series	2018-07-03 12:25:58.000000000 +0000
@@ -10,3 +10,4 @@
 build-unlit-and-hp2ps-twice.patch
 fix-hssplicety.patch
 lower-optimization-for-unreg.patch
+force-llc-settings
diff -Nru ghc-8.2.2/debian/rules ghc-8.2.2/debian/rules
--- ghc-8.2.2/debian/rules	2018-06-25 09:18:19.000000000 +0000
+++ ghc-8.2.2/debian/rules	2018-07-03 12:25:57.000000000 +0000
@@ -276,6 +276,8 @@
 	rm -f utils/ghc-pwd/dist-boot/Main.o
 	rm -f utils/ghc-pwd/dist-boot/ghc-pwd
 
+	dh_autoreconf_clean
+
 	rm -f libraries/haskeline/a.out
 	rm -rf utils/ghctags/dist-install