[Pkg-haskell-commits] darcs: ghc: Merge from unstable
Joachim Breitner
mail at joachim-breitner.de
Thu May 21 10:51:43 UTC 2015
Thu May 21 10:51:16 UTC 2015 Joachim Breitner <mail at joachim-breitner.de>
* Merge from unstable
M ./changelog +50
M ./patches/PPC-relocations.patch -5 +5
M ./patches/buildpath-abi-stability.patch -5 +5
M ./patches/series +3
Thu May 21 10:51:16 UTC 2015 Joachim Breitner <mail at joachim-breitner.de>
* Merge from unstable
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog 2015-05-21 10:51:42.887066814 +0000
+++ new-ghc/changelog 2015-05-21 10:51:42.891066912 +0000
@@ -1,3 +1,53 @@
+ghc (7.10.1-5) UNRELEASED; urgency=medium
+
+ * Merge from unstable (Closes: #785282, #785194 )
+
+ -- Joachim Breitner <nomeata at debian.org> Sun, 17 May 2015 20:34:08 +0200
+
+ghc (7.10.1-4) experimental; urgency=medium
+
+ * Fix patch/ghc-7.8.4-3-aarch64.patch; dropped a hunk when upgrading to
+ 7.10 that I should not have dropped. Thanks Gianfranco Costamagna for
+ noticing.
+
+ -- Joachim Breitner <nomeata at debian.org> Thu, 14 May 2015 23:16:55 +0200
+
+ghc (7.10.1-3) experimental; urgency=medium
+
+ * Apply patch by Sergei Trofimovich to implement load_/store_load_barrier on
+ armv6 and older (upstream ticket #10244)
+
+ -- Joachim Breitner <nomeata at debian.org> Thu, 14 May 2015 09:37:06 +0200
+
+ghc (7.10.1-2) experimental; urgency=medium
+
+ * Build against llvm-3.5 (Closes: 784245)
+
+ -- Joachim Breitner <nomeata at debian.org> Wed, 13 May 2015 11:18:54 +0200
+
+ghc (7.10.1-1) experimental; urgency=medium
+
+ * New upstream release. Optimistically dropping lots of patches, lets see
+ what now works out of the box.
+ * Ship haddock with ghc, and leave (most) paths as they are. It is easier to
+ not fight against the way upstream builds and installs stuff.
+ * Remove the hack introduced in 7.2.0 for a clean upgrade from 7.0.3.
+
+ -- Joachim Breitner <nomeata at debian.org> Tue, 12 May 2015 12:41:40 +0200
+
+ghc (7.8.4-6) unstable; urgency=medium
+
+ * Hack to get stable ABIs even when the build path changes. Closes:
+ #785282
+
+ -- Joachim Breitner <nomeata at debian.org> Thu, 21 May 2015 10:35:25 +0200
+
+ghc (7.8.4-5) unstable; urgency=medium
+
+ * New patch patches/PPC-relocations.patch by Colin Watson, Closes: #785194
+
+ -- Joachim Breitner <nomeata at debian.org> Wed, 13 May 2015 21:06:05 +0200
+
ghc (7.8.4-4) unstable; urgency=medium
* Apply hurd compatibility patch by Pino
diff -rN -u old-ghc/patches/buildpath-abi-stability.patch new-ghc/patches/buildpath-abi-stability.patch
--- old-ghc/patches/buildpath-abi-stability.patch 2015-05-21 10:51:42.883066716 +0000
+++ new-ghc/patches/buildpath-abi-stability.patch 2015-05-21 10:51:42.899067110 +0000
@@ -1,8 +1,8 @@
-Index: ghc-7.8.4/compiler/iface/MkIface.lhs
+Index: ghc-7.10.1/compiler/iface/MkIface.hs
===================================================================
---- ghc-7.8.4.orig/compiler/iface/MkIface.lhs 2015-05-17 23:15:16.294100501 +0200
-+++ ghc-7.8.4/compiler/iface/MkIface.lhs 2015-05-17 23:15:16.294100501 +0200
-@@ -607,7 +607,7 @@
+--- ghc-7.10.1.orig/compiler/iface/MkIface.hs 2015-05-17 20:34:02.808643844 +0200
++++ ghc-7.10.1/compiler/iface/MkIface.hs 2015-05-17 20:34:02.804643799 +0200
+@@ -611,7 +611,7 @@
iface_hash <- computeFingerprint putNameLiterally
(mod_hash,
ann_fn (mkVarOcc "module"), -- See mkIfaceAnnCache
@@ -11,7 +11,7 @@
sorted_deps,
mi_hpc iface0)
-@@ -639,6 +639,9 @@
+@@ -644,6 +644,9 @@
(non_orph_fis, orph_fis) = mkOrphMap ifFamInstOrph (mi_fam_insts iface0)
fix_fn = mi_fix_fn iface0
ann_fn = mkIfaceAnnCache (mi_anns iface0)
diff -rN -u old-ghc/patches/PPC-relocations.patch new-ghc/patches/PPC-relocations.patch
--- old-ghc/patches/PPC-relocations.patch 2015-05-21 10:51:42.887066814 +0000
+++ new-ghc/patches/PPC-relocations.patch 2015-05-21 10:51:42.899067110 +0000
@@ -9,11 +9,11 @@
rts/Linker.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
-Index: ghc-7.8.4/rts/Linker.c
+Index: ghc-7.10.1/rts/Linker.c
===================================================================
---- ghc-7.8.4.orig/rts/Linker.c 2015-05-13 21:04:36.925078989 +0200
-+++ ghc-7.8.4/rts/Linker.c 2015-05-13 21:04:36.921078903 +0200
-@@ -5622,6 +5622,7 @@
+--- ghc-7.10.1.orig/rts/Linker.c 2015-05-21 12:51:06.803899231 +0200
++++ ghc-7.10.1/rts/Linker.c 2015-05-21 12:51:06.799899140 +0200
+@@ -5944,6 +5944,7 @@
break;
case R_PPC_REL24:
@@ -21,7 +21,7 @@
delta = value - P;
if( delta << 6 >> 6 != delta )
-@@ -5641,6 +5642,18 @@
+@@ -5963,6 +5964,18 @@
*(Elf_Word *) P = (*(Elf_Word *) P & 0xfc000003)
| (delta & 0x3fffffc);
break;
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series 2015-05-21 10:51:42.883066716 +0000
+++ new-ghc/patches/series 2015-05-21 10:51:42.899067110 +0000
@@ -3,3 +3,6 @@
no-missing-haddock-file-warning
hurd.diff
ghc-7.8.4-3-aarch64.patch
+ARM-barriers.patch
+PPC-relocations.patch
+buildpath-abi-stability.patch
More information about the Pkg-haskell-commits
mailing list