[DHG_packages] 01/02: ghc: New upstream release (7.10.3-rc3)

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to annotated tag gitit_v0.11.1.1-2
in repository DHG_packages.

commit ffb62b0eb470039cfb7a9cc773cd69e98df5fe22
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Nov 19 10:06:51 2015 +0100

    ghc: New upstream release (7.10.3-rc3)
---
 p/ghc/debian/changelog                   |  6 ++++++
 p/ghc/debian/patches/ppc-bit-shift.patch | 32 --------------------------------
 p/ghc/debian/patches/series              |  1 -
 3 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index 1f68b28..ee00498 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,3 +1,9 @@
+ghc (7.10.2.20151114-1) UNRELEASED; urgency=medium
+
+  * New upstream release (7.10.3-rc3)
+
+ -- Joachim Breitner <nomeata at debian.org>  Thu, 19 Nov 2015 10:04:47 +0100
+
 ghc (7.10.2.20151030-3) experimental; urgency=medium
 
   * Apply a patch by Peter Trommler to fix
diff --git a/p/ghc/debian/patches/ppc-bit-shift.patch b/p/ghc/debian/patches/ppc-bit-shift.patch
deleted file mode 100644
index d3c9e03..0000000
--- a/p/ghc/debian/patches/ppc-bit-shift.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e429f5af8845275a584eb683b2fe6cdca8a7501b Mon Sep 17 00:00:00 2001
-From: Peter Trommler <ptrommler at acm.org>
-Date: Mon, 9 Nov 2015 15:59:36 +0100
-Subject: [PATCH 1/1] PPC nativeGen: fix shift right arithmetic > 31 bit
-
-Arithmetic shift right of more than 31 bits yields
-zero for positive Int and -1 for negative Int. On
-PowerPC immediates greater than 31 are not allowed,
-so replace with a shift by 31 bits which gives the
-correct result.
-
-Fixes #10870
----
- compiler/nativeGen/PPC/Ppr.hs | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/compiler/nativeGen/PPC/Ppr.hs b/compiler/nativeGen/PPC/Ppr.hs
-index 4ae32c9..876b11b 100644
---- a/compiler/nativeGen/PPC/Ppr.hs
-+++ b/compiler/nativeGen/PPC/Ppr.hs
-@@ -637,6 +637,8 @@ pprInstr (SLW reg1 reg2 (RIImm (ImmInt i))) | i < 0  || i > 31 =
-     -- Fixes ticket http://ghc.haskell.org/trac/ghc/ticket/10870
-     pprInstr (XOR reg1 reg2 (RIReg reg2))
- 
-+pprInstr (SRAW reg1 reg2 (RIImm (ImmInt i))) | i > 31 =
-+    pprInstr (SRAW reg1 reg2 (RIImm (ImmInt 31)))
- 
- pprInstr (SLW reg1 reg2 ri) = pprLogic (sLit "slw") reg1 reg2 (limitShiftRI ri)
- 
--- 
-2.1.4
-
diff --git a/p/ghc/debian/patches/series b/p/ghc/debian/patches/series
index 3060149..109dc4a 100644
--- a/p/ghc/debian/patches/series
+++ b/p/ghc/debian/patches/series
@@ -5,4 +5,3 @@ hurd.diff
 buildpath-abi-stability.patch
 reproducible-tmp-names
 cabal-show-detail-direct.patch
-ppc-bit-shift.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git