[DHG_packages] 02/03: ghc: refresh armel-revert-ghci-fixes.patch

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch experimental
in repository DHG_packages.

commit e05b9f9e26312fea4a4e12bd134029dd04df48ee
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Jan 18 11:34:42 2016 +0100

    ghc: refresh armel-revert-ghci-fixes.patch
---
 p/ghc/debian/patches/armel-revert-ghci-fixes.patch | 26 +++++-----------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/p/ghc/debian/patches/armel-revert-ghci-fixes.patch b/p/ghc/debian/patches/armel-revert-ghci-fixes.patch
index bb3e2c0..43a2f40 100644
--- a/p/ghc/debian/patches/armel-revert-ghci-fixes.patch
+++ b/p/ghc/debian/patches/armel-revert-ghci-fixes.patch
@@ -11,7 +11,7 @@ Description: Revert ghci ARM improvements (ticket #10375) on armel
 
 --- ghc-7.10.3.orig/aclocal.m4
 +++ ghc-7.10.3/aclocal.m4
-@@ -574,18 +574,10 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
+@@ -577,18 +577,10 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
          $3="$$3 -D_HPUX_SOURCE"
          $5="$$5 -D_HPUX_SOURCE"
          ;;
@@ -34,9 +34,9 @@ Description: Revert ghci ARM improvements (ticket #10375) on armel
          # Forcing LD to be ld.gold is done in FIND_LD m4 macro.
          $3="$$3 -fuse-ld=gold -Wl,-z,noexecstack"
          $4="$$4 -z noexecstack"
---- ghc-7.10.3.orig/compiler/ghci/ByteCodeItbls.hs
-+++ ghc-7.10.3/compiler/ghci/ByteCodeItbls.hs
-@@ -219,17 +219,17 @@ mkJumpToAddr dflags a = case platformArc
+--- ghc-7.10.3.orig/libraries/ghci/GHCi/InfoTable.hsc
++++ ghc-7.10.3/libraries/ghci/GHCi/InfoTable.hsc
+@@ -184,17 +184,17 @@ mkJumpToAddr dflags a = case platformArc
                   , fromIntegral ((w64 `shiftR` 32) .&. 0x0000FFFF) ]
  
      ArchARM { } ->
@@ -58,10 +58,10 @@ Description: Revert ghci ARM improvements (ticket #10375) on armel
 +                , 0x47, 0x08
                  , byte0 w32, byte1 w32, byte2 w32, byte3 w32]
  
-     arch ->
+     ArchARM64 { } ->
 --- ghc-7.10.3.orig/compiler/llvmGen/LlvmCodeGen/Ppr.hs
 +++ ghc-7.10.3/compiler/llvmGen/LlvmCodeGen/Ppr.hs
-@@ -52,7 +52,7 @@ moduleLayout = sdocWithPlatform $ \platf
+@@ -52,7 +52,7 @@ moduleLayout = sdocWithPlatform $ \platform ->
          $+$ text "target triple = \"x86_64-linux-gnu\""
      Platform { platformArch = ArchARM {}, platformOS = OSLinux } ->
          text "target datalayout = \"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:64:128-a0:0:64-n32\""
@@ -70,17 +70,3 @@ Description: Revert ghci ARM improvements (ticket #10375) on armel
      Platform { platformArch = ArchARM {}, platformOS = OSAndroid } ->
          text "target datalayout = \"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:64:128-a0:0:64-n32\""
          $+$ text "target triple = \"arm-unknown-linux-androideabi\""
---- ghc-7.10.3.orig/rts/Linker.c
-+++ ghc-7.10.3/rts/Linker.c
-@@ -5574,11 +5574,6 @@ do_Elf_Rel_relocations ( ObjectCode* oc,
- #ifdef arm_HOST_ARCH
-          // Thumb instructions have bit 0 of symbol's st_value set
-          is_target_thm = S & 0x1;
--
--         if (is_target_thm)
--            errorBelch( "Symbol `%s' requires Thumb linkage which is not "
--                        "currently supported.\n", symbol );
--
-          T = sym.st_info & STT_FUNC && is_target_thm;
- 
-          // Make sure we clear bit 0. Strictly speaking we should have done

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