[Pkg-haskell-commits] darcs: ghc: Remove PPC-relocations.patch

[Joachim Breitner]

Sat Jul  4 08:06:11 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Remove PPC-relocations.patch

    M ./changelog +6
    R ./patches/PPC-relocations.patch
    M ./patches/series -1

Sat Jul  4 08:06:11 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Remove PPC-relocations.patch
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2015-07-04 09:58:24.993156499 +0000
+++ new-ghc/changelog	2015-07-04 09:58:25.017156489 +0000
@@ -1,3 +1,9 @@
+ghc (7.10.1.20150630-2) UNRELEASED; urgency=medium
+
+  * Remove PPC-relocations.patch
+
+ -- Joachim Breitner <nomeata at debian.org>  Sat, 04 Jul 2015 10:05:47 +0200
+
 ghc (7.10.1.20150630-1) experimental; urgency=medium
 
   [ Joachim Breitner ]
diff -rN -u old-ghc/patches/PPC-relocations.patch new-ghc/patches/PPC-relocations.patch
--- old-ghc/patches/PPC-relocations.patch	2015-07-04 09:58:24.993156499 +0000
+++ new-ghc/patches/PPC-relocations.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-From 9f2e286b0c6da163ee6196c34be115260b5008e6 Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson at debian.org>
-Date: Mon, 11 May 2015 15:18:37 +0100
-Subject: [PATCH] rts/Linker.c: add some more PPC relocations (#10402)
-
-This implements R_PPC_PLTREL24, R_PPC_REL16_LO, R_PPC_REL16_HI, and
-R_PPC_REL16_HA, emitted by other parts of the current toolchain.
----
- rts/Linker.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-Index: ghc-7.10/rts/Linker.c
-===================================================================
---- ghc-7.10.orig/rts/Linker.c	2015-07-03 12:27:24.622584042 +0200
-+++ ghc-7.10/rts/Linker.c	2015-07-03 12:27:24.618583956 +0200
-@@ -5960,6 +5960,7 @@
-             value -= 0x8000; /* See Note [.LCTOC1 in PPC PIC code] */
-             /* fallthrough */
-          case R_PPC_REL24:
-+         case R_PPC_PLTREL24:
-             delta = value - P;
- 
-             if( delta << 6 >> 6 != delta )
-@@ -5981,6 +5982,18 @@
-             break;
- 
-          case R_PPC_REL16_LO:
-+            *(Elf32_Half*) P = value - P;
-+            break;
-+
-+         case R_PPC_REL16_HI:
-+            *(Elf32_Half*) P = (value - P) >> 16;
-+            break;
-+
-+         case R_PPC_REL16_HA:
-+            *(Elf32_Half*) P = (value + 0x8000 - P) >> 16;
-+            break;
-+
-+         case R_PPC_REL16_LO:
-             *(Elf32_Half*) P = value - P;
-             break;
- 
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series	2015-07-04 09:58:24.993156499 +0000
+++ new-ghc/patches/series	2015-07-04 09:58:25.009156491 +0000
@@ -2,6 +2,5 @@
 ARM-VFPv3D16
 no-missing-haddock-file-warning
 hurd.diff
-PPC-relocations.patch
 buildpath-abi-stability.patch
 reproducible-tmp-names