[Pkg-haskell-commits] darcs: ghc: Drop back to 7.4.1 and add patches/fix-PPC-right-shift-bug.
Erik de Castro Lopo
erikd at mega-nerd.com
Sat Jun 16 01:16:31 UTC 2012
Sat Jun 16 01:15:51 UTC 2012 Erik de Castro Lopo <erikd at mega-nerd.com>
* Drop back to 7.4.1 and add patches/fix-PPC-right-shift-bug.
Ignore-this: bd7a939573f79912bd458dfda4cd8c55
M ./changelog -8 +5
M ./patches/ARM-VFPv3D16 -4 +4
M ./patches/armhf_llvm_abi -4 +4
A ./patches/fix-PPC-right-shift-bug
M ./patches/haddock-hardcode-ghc-paths -7 +7
M ./patches/no_ghci_on_powerpc -5 +5
M ./patches/series +4
Sat Jun 16 01:15:51 UTC 2012 Erik de Castro Lopo <erikd at mega-nerd.com>
* Drop back to 7.4.1 and add patches/fix-PPC-right-shift-bug.
Ignore-this: bd7a939573f79912bd458dfda4cd8c55
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog 2012-06-16 01:16:30.905324969 +0000
+++ new-ghc//changelog 2012-06-16 01:16:30.917325768 +0000
@@ -1,13 +1,10 @@
-ghc (7.4.2-1) experimental; urgency=low
+ghc (7.4.1-4) unstable; urgency=low
- * New upstream.
- * debian/patches/series
- - Remove patch fix-ARM-s-StgCRun-clobbered-register-list-for-both-A,
- fix-ARM-StgCRun-to-not-save-and-restore-r11-fp-regis and memcpy-ffi.patch
- (in upstream).
- - Refresh other patches.
+ * Add debian/patches/fix-PPC-right-shift-bug which fixes upstream GHC bug:
+ http://hackage.haskell.org/trac/ghc/ticket/6156
+ * Refresh other patches.
- -- Erik de Castro Lopo <erikd at mega-nerd.com> Mon, 11 Jun 2012 15:21:26 +1000
+ -- Erik de Castro Lopo <erikd at mega-nerd.com> Sat, 16 Jun 2012 11:03:31 +1000
ghc (7.4.1-3) unstable; urgency=low
diff -rN -u old-ghc//patches/ARM-VFPv3D16 new-ghc//patches/ARM-VFPv3D16
--- old-ghc//patches/ARM-VFPv3D16 2012-06-16 01:16:30.870323663 +0000
+++ new-ghc//patches/ARM-VFPv3D16 2012-06-16 01:16:30.953326221 +0000
@@ -1,11 +1,11 @@
Description: Use VFPv3-D16 FPU for ARM builds
Author: Jani Monoses <jani at ubuntu.com>
-Index: ghc-7.4.2/aclocal.m4
+Index: ghc/aclocal.m4
===================================================================
---- ghc-7.4.2.orig/aclocal.m4 2012-06-07 03:10:25.000000000 +1000
-+++ ghc-7.4.2/aclocal.m4 2012-06-11 15:25:38.000000000 +1000
-@@ -336,7 +336,7 @@
+--- ghc.orig/aclocal.m4 2012-02-01 18:10:32.000000000 +0000
++++ ghc/aclocal.m4 2012-03-10 16:40:32.415005650 +0000
+@@ -333,7 +333,7 @@
],
[changequote(, )dnl
ARM_ISA=ARMv7
diff -rN -u old-ghc//patches/armhf_llvm_abi new-ghc//patches/armhf_llvm_abi
--- old-ghc//patches/armhf_llvm_abi 2012-06-16 01:16:30.870323663 +0000
+++ new-ghc//patches/armhf_llvm_abi 2012-06-16 01:16:30.953326221 +0000
@@ -3,10 +3,10 @@
bug #5914.
Author: Iain Lane <laney at debian.org>
-Index: ghc-7.4.2/compiler/main/DriverPipeline.hs
+Index: ghc/compiler/main/DriverPipeline.hs
===================================================================
---- ghc-7.4.2.orig/compiler/main/DriverPipeline.hs 2012-06-07 03:10:25.000000000 +1000
-+++ ghc-7.4.2/compiler/main/DriverPipeline.hs 2012-06-11 15:25:32.000000000 +1000
+--- ghc.orig/compiler/main/DriverPipeline.hs 2012-03-10 16:41:46.000000000 +0000
++++ ghc/compiler/main/DriverPipeline.hs 2012-03-10 16:42:59.209169474 +0000
@@ -1,5 +1,5 @@
{-# OPTIONS -fno-cse #-}
-{-# LANGUAGE NamedFieldPuns #-}
@@ -14,7 +14,7 @@
-- -fno-cse is needed for GLOBAL_VAR's to behave properly
-----------------------------------------------------------------------------
-@@ -1382,6 +1382,9 @@
+@@ -1379,6 +1379,9 @@
then ["-mattr=+v7,+vfp3"]
else if (elem VFPv3D16 ext)
then ["-mattr=+v7,+vfp3,+d16"]
diff -rN -u old-ghc//patches/fix-PPC-right-shift-bug new-ghc//patches/fix-PPC-right-shift-bug
--- old-ghc//patches/fix-PPC-right-shift-bug 1970-01-01 00:00:00.000000000 +0000
+++ new-ghc//patches/fix-PPC-right-shift-bug 2012-06-16 01:16:30.953326221 +0000
@@ -0,0 +1,26 @@
+From: Erik de Castro Lopo <erikd at mega-nerd.com>
+Date: Sat, Jun 16 10:48:05 EST 2012
+Subject: PPC: Handle right shift of > 31 bits. Fix #5900.
+Description: This fixes GHC bug #5900
+ http://hackage.haskell.org/trac/ghc/ticket/5900
+ which was being triggered when compiling cryptocipher on PowerPC.
+ This has been applied upstream and is in GHC 7.4.2.
+
+Index: ghc-7.4.1/compiler/nativeGen/PPC/Ppr.hs
+===================================================================
+--- ghc-7.4.1.orig/compiler/nativeGen/PPC/Ppr.hs
++++ ghc-7.4.1/compiler/nativeGen/PPC/Ppr.hs
+@@ -594,6 +594,13 @@
+ pprInstr platform (NOT reg1 reg2) = pprUnary platform (sLit "not") reg1 reg2
+
+ pprInstr platform (SLW reg1 reg2 ri) = pprLogic platform (sLit "slw") reg1 reg2 (limitShiftRI ri)
++
++pprInstr platform (SRW reg1 reg2 (RIImm (ImmInt i))) | i > 31 || i < 0 =
++ -- Handle the case where we are asked to shift a 32 bit register by
++ -- less than zero or more than 31 bits. We convert this into a clear
++ -- of the destination register.
++ -- Fixes ticket http://hackage.haskell.org/trac/ghc/ticket/5900
++ pprInstr platform (XOR reg1 reg2 (RIReg reg2))
+ pprInstr platform (SRW reg1 reg2 ri) = pprLogic platform (sLit "srw") reg1 reg2 (limitShiftRI ri)
+ pprInstr platform (SRAW reg1 reg2 ri) = pprLogic platform (sLit "sraw") reg1 reg2 (limitShiftRI ri)
+ pprInstr platform (RLWINM reg1 reg2 sh mb me) = hcat [
diff -rN -u old-ghc//patches/haddock-hardcode-ghc-paths new-ghc//patches/haddock-hardcode-ghc-paths
--- old-ghc//patches/haddock-hardcode-ghc-paths 2012-06-16 01:16:30.854325021 +0000
+++ new-ghc//patches/haddock-hardcode-ghc-paths 2012-06-16 01:16:30.953326221 +0000
@@ -1,7 +1,7 @@
-Index: ghc-7.4.2/utils/haddock/haddock.cabal
+Index: ghc-7.4.1/utils/haddock/haddock.cabal
===================================================================
---- ghc-7.4.2.orig/utils/haddock/haddock.cabal 2012-06-07 03:10:26.000000000 +1000
-+++ ghc-7.4.2/utils/haddock/haddock.cabal 2012-06-11 15:24:08.000000000 +1000
+--- ghc-7.4.1.orig/utils/haddock/haddock.cabal 2012-02-01 19:10:43.000000000 +0100
++++ ghc-7.4.1/utils/haddock/haddock.cabal 2012-02-03 16:26:39.000000000 +0100
@@ -78,10 +78,6 @@
executable haddock
@@ -31,10 +31,10 @@
if flag(test)
cpp-options: -DTEST
-Index: ghc-7.4.2/utils/haddock/src/Main.hs
+Index: ghc-7.4.1/utils/haddock/src/Main.hs
===================================================================
---- ghc-7.4.2.orig/utils/haddock/src/Main.hs 2012-06-07 03:10:26.000000000 +1000
-+++ ghc-7.4.2/utils/haddock/src/Main.hs 2012-06-11 15:24:08.000000000 +1000
+--- ghc-7.4.1.orig/utils/haddock/src/Main.hs 2012-02-01 19:10:43.000000000 +0100
++++ ghc-7.4.1/utils/haddock/src/Main.hs 2012-02-03 16:26:39.000000000 +0100
@@ -50,7 +50,6 @@
#ifdef IN_GHC_TREE
import System.FilePath
@@ -43,7 +43,7 @@
import Paths_haddock
#endif
-@@ -350,14 +349,14 @@
+@@ -344,14 +343,14 @@
libDir <- getInTreeDir
return (ghcPath, libDir)
#else
diff -rN -u old-ghc//patches/no_ghci_on_powerpc new-ghc//patches/no_ghci_on_powerpc
--- old-ghc//patches/no_ghci_on_powerpc 2012-06-16 01:16:30.834325389 +0000
+++ new-ghc//patches/no_ghci_on_powerpc 2012-06-16 01:16:30.957326260 +0000
@@ -7,16 +7,16 @@
Author: Joachim Breitner <nomeata at debian.org>
Bug-Debian: http://bugs.debian.org/631073
-Index: ghc-7.4.2/mk/config.mk.in
+Index: ghc-7.4.0.20111219/mk/config.mk.in
===================================================================
---- ghc-7.4.2.orig/mk/config.mk.in 2012-06-07 03:10:25.000000000 +1000
-+++ ghc-7.4.2/mk/config.mk.in 2012-06-11 15:25:20.000000000 +1000
+--- ghc-7.4.0.20111219.orig/mk/config.mk.in 2011-12-19 19:11:04.000000000 +0100
++++ ghc-7.4.0.20111219/mk/config.mk.in 2011-12-21 19:56:11.000000000 +0100
@@ -172,7 +172,7 @@
# has support for this OS/ARCH combination.
OsSupportsGHCi=$(strip $(patsubst $(HostOS_CPP), YES, $(findstring $(HostOS_CPP), mingw32 cygwin32 linux solaris2 freebsd dragonfly netbsd openbsd darwin kfreebsdgnu)))
--ArchSupportsGHCi=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 powerpc sparc sparc64 arm)))
-+ArchSupportsGHCi=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 sparc sparc64 arm)))
+-ArchSupportsGHCi=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 powerpc sparc sparc64)))
++ArchSupportsGHCi=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 sparc sparc64)))
ifeq "$(OsSupportsGHCi)$(ArchSupportsGHCi)" "YESYES"
GhcWithInterpreter=YES
diff -rN -u old-ghc//patches/series new-ghc//patches/series
--- old-ghc//patches/series 2012-06-16 01:16:30.802324862 +0000
+++ new-ghc//patches/series 2012-06-16 01:16:30.957326260 +0000
@@ -1,3 +1,5 @@
+fix-ARM-s-StgCRun-clobbered-register-list-for-both-A
+fix-ARM-StgCRun-to-not-save-and-restore-r11-fp-regis
system-libffi
haddock-hardcode-ghc-paths
use-debian-gen_contents_index
@@ -8,3 +10,5 @@
ARM-VFPv3D16
hurd-is-ELF
no-missing-haddock-file-warning
+memcpy-ffi.patch
+fix-PPC-right-shift-bug
More information about the Pkg-haskell-commits
mailing list