diff -Nru ghc-7.10.3/debian/changelog ghc-7.10.3/debian/changelog
--- ghc-7.10.3/debian/changelog	2016-01-29 15:58:16.000000000 +0000
+++ ghc-7.10.3/debian/changelog	2016-02-04 21:26:13.000000000 +0000
@@ -1,3 +1,16 @@
+ghc (7.10.3-7+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]
+  * 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, 04 Feb 2016 21:26:13 +0000
+
 ghc (7.10.3-7) unstable; urgency=medium
 
   [ Joachim Breitner ]
diff -Nru ghc-7.10.3/debian/patches/ARM-VFPv3D16 ghc-7.10.3/debian/patches/ARM-VFPv3D16
--- ghc-7.10.3/debian/patches/ARM-VFPv3D16	2015-12-04 15:28:54.000000000 +0000
+++ ghc-7.10.3/debian/patches/ARM-VFPv3D16	2016-02-04 21:26:13.000000000 +0000
@@ -13,9 +13,10 @@
 @@ -411,7 +411,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.10.3/debian/patches/force-llc-settings ghc-7.10.3/debian/patches/force-llc-settings
--- ghc-7.10.3/debian/patches/force-llc-settings	1970-01-01 00:00:00.000000000 +0000
+++ ghc-7.10.3/debian/patches/force-llc-settings	2016-02-04 21:26:13.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.10.3/compiler/main/SysTools.hs
+===================================================================
+--- ghc-7.10.3.orig/compiler/main/SysTools.hs
++++ ghc-7.10.3/compiler/main/SysTools.hs
+@@ -349,7 +349,7 @@ initSysTools mbMinusB
+                     sPgm_libtool = libtool_path,
+                     sPgm_readelf = readelf_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.10.3/debian/patches/series ghc-7.10.3/debian/patches/series
--- ghc-7.10.3/debian/patches/series	2015-12-18 12:25:32.000000000 +0000
+++ ghc-7.10.3/debian/patches/series	2016-02-04 21:26:13.000000000 +0000
@@ -7,3 +7,4 @@
 cabal-show-detail-direct.patch
 sh4-platform-detection-support.patch
 sparc64-initial-platform-support.patch
+force-llc-settings
diff -Nru ghc-7.10.3/debian/rules ghc-7.10.3/debian/rules
--- ghc-7.10.3/debian/rules	2016-01-05 10:09:35.000000000 +0000
+++ ghc-7.10.3/debian/rules	2016-02-04 21:26:13.000000000 +0000
@@ -246,6 +246,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