[Pkg-haskell-commits] darcs: ghc: Add patches/Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch, patch by Colin Watson

[Joachim Breitner]

Wed Jun  5 18:48:55 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Add patches/Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch, patch by Colin Watson
  Ignore-this: de57d3aa7f1cdfda87973b3d3ca53419

    M ./changelog +7
    A ./patches/Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch
    M ./patches/series +1

Wed Jun  5 18:48:55 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Add patches/Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch, patch by Colin Watson
  Ignore-this: de57d3aa7f1cdfda87973b3d3ca53419
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2013-06-05 22:40:07.773542205 +0000
+++ new-ghc//changelog	2013-06-05 22:40:07.878487372 +0000
@@ -1,3 +1,10 @@
+ghc (7.6.3-3) UNRELEASED; urgency=low
+
+  * Add patches/Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch,
+    patch by Colin Watson
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 05 Jun 2013 20:48:20 +0200
+
 ghc (7.6.3-2) unstable; urgency=low
 
   * Enable compat level 9
diff -rN -u old-ghc//patches/Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch new-ghc//patches/Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch
--- old-ghc//patches/Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc//patches/Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch	2013-06-05 22:40:07.818042367 +0000
@@ -0,0 +1,22 @@
+From c47c47a4afb3aea920a8006cd44ced5874664288 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson at canonical.com>
+Date: Tue, 9 Apr 2013 00:02:27 +0100
+Subject: [PATCH] Handle sign bit when generating veneer for ARM Thumb branch
+ relocation
+
+---
+ rts/Linker.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: ghc-7.6.3/rts/Linker.c
+===================================================================
+--- ghc-7.6.3.orig/rts/Linker.c	2013-06-05 20:47:32.498881090 +0200
++++ ghc-7.6.3/rts/Linker.c	2013-06-05 20:47:32.498881090 +0200
+@@ -4850,6 +4850,7 @@
+                // Generate veneer
+                SymbolExtra *extra = makeArmSymbolExtra(oc, ELF_R_SYM(info), S+imm+4, 1, is_target_thm);
+                offset = (StgWord32) &extra->jumpIsland - P - 4;
++               sign = offset >> 31;
+                to_thm = 1;
+             } else if (!is_target_thm && ELF_R_TYPE(info) == R_ARM_THM_CALL) {
+                offset &= ~0x3;
diff -rN -u old-ghc//patches/series new-ghc//patches/series
--- old-ghc//patches/series	2013-06-05 22:40:07.773542205 +0000
+++ new-ghc//patches/series	2013-06-05 22:40:07.818042367 +0000
@@ -3,3 +3,4 @@
 use-debian-gen_contents_index
 ARM-VFPv3D16
 no-missing-haddock-file-warning
+Handle-sign-bit-when-generating-veneer-for-ARM-Thumb.patch