diff -Nru ghc-7.6.3/debian/changelog ghc-7.6.3/debian/changelog --- ghc-7.6.3/debian/changelog 2014-07-29 12:21:49.000000000 +0000 +++ ghc-7.6.3/debian/changelog 2014-08-16 00:41:21.000000000 +0000 @@ -1,3 +1,10 @@ +ghc (7.6.3-16+rpi1) jessie-staging; urgency=low + + * Change compiler defaults for armv6 + * Force llvm cpu and float abi options + + -- Peter Michael Green Sat, 16 Aug 2014 00:40:57 +0000 + ghc (7.6.3-16) unstable; urgency=medium * Also do not conflict with libghc-binary-doc diff -Nru ghc-7.6.3/debian/patches/ARM-VFPv3D16 ghc-7.6.3/debian/patches/ARM-VFPv3D16 --- ghc-7.6.3/debian/patches/ARM-VFPv3D16 2013-04-21 17:08:59.000000000 +0000 +++ ghc-7.6.3/debian/patches/ARM-VFPv3D16 2014-08-16 00:41:21.000000000 +0000 @@ -8,9 +8,10 @@ @@ -349,7 +349,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.6.3/debian/patches/force-llc-settings ghc-7.6.3/debian/patches/force-llc-settings --- ghc-7.6.3/debian/patches/force-llc-settings 1970-01-01 00:00:00.000000000 +0000 +++ ghc-7.6.3/debian/patches/force-llc-settings 2014-08-16 00:41:21.000000000 +0000 @@ -0,0 +1,29 @@ +Description: force llc settings to ones that are known to work +Author: Peter Michael Green + +--- +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: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +Index: ghc-7.6.3/compiler/main/SysTools.lhs +=================================================================== +--- ghc-7.6.3.orig/compiler/main/SysTools.lhs 2013-11-08 20:00:23.000000000 +0000 ++++ ghc-7.6.3/compiler/main/SysTools.lhs 2013-11-08 20:00:23.000000000 +0000 +@@ -292,7 +292,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.6.3/debian/patches/series ghc-7.6.3/debian/patches/series --- ghc-7.6.3/debian/patches/series 2014-07-01 07:16:15.000000000 +0000 +++ ghc-7.6.3/debian/patches/series 2014-08-16 00:41:21.000000000 +0000 @@ -10,3 +10,4 @@ 64-bit-big-endian arm64.patch ppc64el.patch +force-llc-settings