[Pkg-haskell-commits] darcs: ghc: Refresh patches, drop ghc-7.8.4-3-aarch64.patch

[Joachim Breitner]

Fri Jul  3 10:27:48 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh patches, drop ghc-7.8.4-3-aarch64.patch

    M ./patches/PPC-relocations.patch -13 +13
    R ./patches/ghc-7.8.4-3-aarch64.patch
    M ./patches/series -1

Fri Jul  3 10:27:48 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh patches, drop ghc-7.8.4-3-aarch64.patch
diff -rN -u old-ghc/patches/ghc-7.8.4-3-aarch64.patch new-ghc/patches/ghc-7.8.4-3-aarch64.patch
--- old-ghc/patches/ghc-7.8.4-3-aarch64.patch	2015-07-03 12:30:09.151025147 +0000
+++ new-ghc/patches/ghc-7.8.4-3-aarch64.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-Provided by Edmund Grimley Evans in http://bugs.debian.org/783987 based on
-
-https://git.haskell.org/ghc.git/commit/1e8c9b81a819da8eb54405a029fc33a9f5220321
-
-Not in 7.10.2-rc1, but maybe we can fix that before 7.10.2:
-https://ghc.haskell.org/trac/ghc/ticket/9673
-
-
-Index: ghc-7.10/aclocal.m4
-===================================================================
---- ghc-7.10.orig/aclocal.m4	2015-06-15 09:29:12.405875831 +0200
-+++ ghc-7.10/aclocal.m4	2015-06-15 09:29:12.405875831 +0200
-@@ -2163,6 +2163,30 @@
- ])
- 
- 
-+# FIND_LD
-+# Find the version of `ld` to use. This is used in both in the top level
-+# configure.ac and in distrib/configure.ac.in.
-+#
-+# $1 = the variable to set
-+#
-+AC_DEFUN([FIND_LD],[
-+    FP_ARG_WITH_PATH_GNU_PROG([LD], [ld], [ld])
-+    case $target in
-+        arm*linux*       | \
-+        aarch64*linux*   )
-+            # Arm and Aarch64 requires use of the binutils ld.gold linker.
-+            # This case should catch at least arm-unknown-linux-gnueabihf,
-+            # arm-linux-androideabi, arm64-unknown-linux and
-+            # aarch64-linux-android
-+            FP_ARG_WITH_PATH_GNU_PROG([LD_GOLD], [ld.gold], [ld.gold])
-+            $1="$LD_GOLD"
-+            ;;
-+        *)
-+            $1="$LD"
-+            ;;
-+    esac
-+])
-+
- # FIND_GCC()
- # --------------------------------
- # Finds where gcc is
-Index: ghc-7.10/mk/config.mk.in
-===================================================================
---- ghc-7.10.orig/mk/config.mk.in	2015-06-15 09:29:12.405875831 +0200
-+++ ghc-7.10/mk/config.mk.in	2015-06-15 09:29:12.405875831 +0200
-@@ -172,7 +172,7 @@
- 
- # ArchSupportsSMP should be set iff there is support for that arch in
- # includes/stg/SMP.h
--ArchSupportsSMP=$(strip $(patsubst $(TargetArch_CPP), YES, $(findstring $(TargetArch_CPP), i386 x86_64 sparc powerpc arm)))
-+ArchSupportsSMP=$(strip $(patsubst $(TargetArch_CPP), YES, $(findstring $(TargetArch_CPP), i386 x86_64 sparc powerpc arm aarch64)))
- 
- GhcWithSMP := $(strip $(if $(filter YESNO, $(ArchSupportsSMP)$(GhcUnregisterised)),YES,NO))
- 
-@@ -180,7 +180,7 @@
- # has support for this OS/ARCH combination.
- 
- OsSupportsGHCi=$(strip $(patsubst $(TargetOS_CPP), YES, $(findstring $(TargetOS_CPP), mingw32 cygwin32 linux solaris2 freebsd dragonfly netbsd openbsd darwin kfreebsdgnu)))
--ArchSupportsGHCi=$(strip $(patsubst $(TargetArch_CPP), YES, $(findstring $(TargetArch_CPP), i386 x86_64 powerpc sparc sparc64 arm)))
-+ArchSupportsGHCi=$(strip $(patsubst $(TargetArch_CPP), YES, $(findstring $(TargetArch_CPP), i386 x86_64 powerpc sparc sparc64 arm aarch64)))
- 
- ifeq "$(OsSupportsGHCi)$(ArchSupportsGHCi)" "YESYES"
- GhcWithInterpreter=YES
diff -rN -u old-ghc/patches/PPC-relocations.patch new-ghc/patches/PPC-relocations.patch
--- old-ghc/patches/PPC-relocations.patch	2015-07-03 12:30:09.151025147 +0000
+++ new-ghc/patches/PPC-relocations.patch	2015-07-03 12:30:09.167025159 +0000
@@ -11,22 +11,20 @@
 
 Index: ghc-7.10/rts/Linker.c
 ===================================================================
---- ghc-7.10.orig/rts/Linker.c	2015-06-15 09:30:13.062408171 +0200
-+++ ghc-7.10/rts/Linker.c	2015-06-15 09:30:13.058408137 +0200
-@@ -5957,6 +5957,7 @@
-             break;
- 
+--- 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 )
-@@ -5976,6 +5977,18 @@
-             *(Elf_Word *) P = (*(Elf_Word *) P & 0xfc000003)
-                                           | (delta & 0x3fffffc);
+@@ -5981,6 +5982,18 @@
              break;
-+
-+         case R_PPC_REL16_LO:
+ 
+          case R_PPC_REL16_LO:
 +            *(Elf32_Half*) P = value - P;
 +            break;
 +
@@ -37,6 +35,8 @@
 +         case R_PPC_REL16_HA:
 +            *(Elf32_Half*) P = (value + 0x8000 - P) >> 16;
 +            break;
- #        endif
++
++         case R_PPC_REL16_LO:
+             *(Elf32_Half*) P = value - P;
+             break;
  
- #if x86_64_HOST_ARCH
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series	2015-07-03 12:30:09.151025147 +0000
+++ new-ghc/patches/series	2015-07-03 12:30:09.171025162 +0000
@@ -2,7 +2,6 @@
 ARM-VFPv3D16
 no-missing-haddock-file-warning
 hurd.diff
-ghc-7.8.4-3-aarch64.patch
 PPC-relocations.patch
 buildpath-abi-stability.patch
 reproducible-tmp-names