diff -Nru ghc-7.8.4/debian/changelog ghc-7.8.4/debian/changelog
--- ghc-7.8.4/debian/changelog	2015-06-07 14:21:38.000000000 +0000
+++ ghc-7.8.4/debian/changelog	2015-06-26 17:52:30.000000000 +0000
@@ -1,3 +1,17 @@
+ghc (7.8.4-9+rpi1) stretch-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]
+  * disable debian/patches/reproducible-tmp-names at nometa's suggestion,
+    it appears to be breaking build with 7.6.
+  * no longer set Option "-float-abi=hard" in force-llc-settings, ghc now
+    sets it without help and setting it twice makes llc fail.
+  * cleanup config.sub and config.guess in clean target to avoid
+    unrepresentable changes to source error.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 26 Jun 2015 08:31:02 +0000
+
 ghc (7.8.4-9) unstable; urgency=medium
 
   * Another stab at making GHC more reproducible: Use a hash of the command
diff -Nru ghc-7.8.4/debian/patches/ARM-VFPv3D16 ghc-7.8.4/debian/patches/ARM-VFPv3D16
--- ghc-7.8.4/debian/patches/ARM-VFPv3D16	2015-04-27 09:05:22.000000000 +0000
+++ ghc-7.8.4/debian/patches/ARM-VFPv3D16	2015-06-26 08:35:13.000000000 +0000
@@ -13,9 +13,10 @@
 @@ -408,7 +408,7 @@
                  )],
                  [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-7.8.4/debian/patches/force-llc-settings ghc-7.8.4/debian/patches/force-llc-settings
--- ghc-7.8.4/debian/patches/force-llc-settings	1970-01-01 00:00:00.000000000 +0000
+++ ghc-7.8.4/debian/patches/force-llc-settings	2015-06-26 17:51:14.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-7.8.4/compiler/main/SysTools.lhs
+===================================================================
+--- ghc-7.8.4.orig/compiler/main/SysTools.lhs
++++ ghc-7.8.4/compiler/main/SysTools.lhs
+@@ -335,7 +335,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"]),
+                     -- Hans: this isn't right in general, but you can
+                     -- elaborate it in the same way as the others
+                     sOpt_L       = [],
diff -Nru ghc-7.8.4/debian/patches/series ghc-7.8.4/debian/patches/series
--- ghc-7.8.4/debian/patches/series	2015-05-25 17:26:19.000000000 +0000
+++ ghc-7.8.4/debian/patches/series	2015-06-26 09:30:56.000000000 +0000
@@ -10,5 +10,5 @@
 ghc-7.8.4-3-aarch64.patch
 PPC-relocations.patch
 buildpath-abi-stability.patch
-reproducible-tmp-names
 stable-specialization-rule-names
+force-llc-settings
diff -Nru ghc-7.8.4/debian/rules ghc-7.8.4/debian/rules
--- ghc-7.8.4/debian/rules	2015-05-25 09:07:27.000000000 +0000
+++ ghc-7.8.4/debian/rules	2015-06-26 17:51:59.000000000 +0000
@@ -297,6 +297,7 @@
 	
 	dh_autoreconf_clean
 	dh_clean
+	rm -f config.*
 
 binary-arch: binary-arch-stamp
 binary-arch-stamp: install-stamp