diff -Nru ghc-7.4.1/debian/changelog ghc-7.4.1/debian/changelog
--- ghc-7.4.1/debian/changelog	2012-06-16 11:48:18.000000000 +0100
+++ ghc-7.4.1/debian/changelog	2012-11-06 19:48:38.000000000 +0000
@@ -1,3 +1,10 @@
+ghc (7.4.1-4+rpi1) wheezy-staging; urgency=low
+
+  * Change compiler defaults for armv6
+  * Force llvm cpu and float abi options
+
+ -- Peter Michael Green <plugwash@p10link.net>  Tue, 06 Nov 2012 19:48:17 +0000
+
 ghc (7.4.1-4) unstable; urgency=low
 
   [ Erik de Castro Lopo ]
diff -Nru ghc-7.4.1/debian/patches/ARM-VFPv3D16 ghc-7.4.1/debian/patches/ARM-VFPv3D16
--- ghc-7.4.1/debian/patches/ARM-VFPv3D16	2012-06-16 11:31:58.000000000 +0100
+++ ghc-7.4.1/debian/patches/ARM-VFPv3D16	2012-11-06 19:48:38.000000000 +0000
@@ -8,9 +8,10 @@
 @@ -333,7 +333,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.4.1/debian/patches/force-llc-settings ghc-7.4.1/debian/patches/force-llc-settings
--- ghc-7.4.1/debian/patches/force-llc-settings	1970-01-01 01:00:00.000000000 +0100
+++ ghc-7.4.1/debian/patches/force-llc-settings	2012-11-06 19:48:38.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.4.1.rpi/compiler/main/SysTools.lhs
+===================================================================
+--- ghc-7.4.1.rpi.orig/compiler/main/SysTools.lhs	2012-06-18 18:30:01.000000000 +0000
++++ ghc-7.4.1.rpi/compiler/main/SysTools.lhs	2012-06-19 01:26:34.000000000 +0000
+@@ -280,7 +280,7 @@
+                         sPgm_sysman = top_dir ++ "/ghc/rts/parallel/SysMan",
+                         sPgm_windres = windres_path,
+                         sPgm_lo  = (lo_prog,[]),
+-                        sPgm_lc  = (lc_prog,[]),
++                        sPgm_lc  = (lc_prog,[Option "-mcpu=arm1176jzf-s" , Option "-float-abi=hard"]),
+                         -- 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.4.1/debian/patches/series ghc-7.4.1/debian/patches/series
--- ghc-7.4.1/debian/patches/series	2012-06-16 11:39:20.000000000 +0100
+++ ghc-7.4.1/debian/patches/series	2012-11-06 19:49:00.000000000 +0000
@@ -13,3 +13,4 @@
 memcpy-ffi.patch
 fix-PPC-right-shift-bug
 no-useless-timer
+force-llc-settings