[Pkg-haskell-commits] darcs: ghc: New patch patches/PPC-relocations.patch by Colin Watson, Closes: #785194

[Joachim Breitner]

Wed May 13 19:06:01 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * New patch patches/PPC-relocations.patch by Colin Watson, Closes: #785194 

    M! ./changelog -43 +12
    A! ./patches/PPC-relocations.patch
    M! ./patches/series -1

Wed May 13 19:06:01 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * New patch patches/PPC-relocations.patch by Colin Watson, Closes: #785194 
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2015-05-21 10:51:41.319028121 +0000
+++ new-ghc/changelog	2015-05-21 10:51:41.339028615 +0000
@@ -1,34 +1,3 @@
-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-4) unstable; urgency=medium
 
   * Apply hurd compatibility patch by Pino
diff -rN -u old-ghc/patches/PPC-relocations.patch new-ghc/patches/PPC-relocations.patch
--- old-ghc/patches/PPC-relocations.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/PPC-relocations.patch	2015-05-21 10:51:41.339028615 +0000
@@ -0,0 +1,42 @@
+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.8.4/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 @@
+             break;
+ 
+          case R_PPC_REL24:
++         case R_PPC_PLTREL24:
+             delta = value - P;
+ 
+             if( delta << 6 >> 6 != delta )
+@@ -5641,6 +5642,18 @@
+             *(Elf_Word *) P = (*(Elf_Word *) P & 0xfc000003)
+                                           | (delta & 0x3fffffc);
+             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;
+ #        endif
+ 
+ #if x86_64_HOST_ARCH
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series	2015-05-21 10:51:41.311027925 +0000
+++ new-ghc/patches/series	2015-05-21 10:51:41.339028615 +0000
@@ -3,4 +3,3 @@
 no-missing-haddock-file-warning
 hurd.diff
 ghc-7.8.4-3-aarch64.patch
-ARM-barriers.patch