[Pkg-haskell-commits] darcs: ghc: 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]

Thu May 14 21:16:49 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * 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.

    M ./changelog -1 +8
    M ./patches/ghc-7.8.4-3-aarch64.patch -5 +20

Thu May 14 21:16:49 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * 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.
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2015-05-15 06:18:47.581215483 +0000
+++ new-ghc/changelog	2015-05-15 06:18:47.601215945 +0000
@@ -1,9 +1,16 @@
+ghc (7.10.1-4) UNRELEASED; 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:21 +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
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-05-15 06:18:47.581215483 +0000
+++ new-ghc/patches/ghc-7.8.4-3-aarch64.patch	2015-05-15 06:18:47.597215852 +0000
@@ -9,9 +9,24 @@
 
 Index: ghc-7.10.1/aclocal.m4
 ===================================================================
---- ghc-7.10.1.orig/aclocal.m4	2015-05-11 22:27:09.955842452 +0200
-+++ ghc-7.10.1/aclocal.m4	2015-05-11 22:27:09.955842452 +0200
-@@ -2121,6 +2121,30 @@
+--- ghc-7.10.1.orig/aclocal.m4	2015-05-12 12:41:52.000000000 +0200
++++ ghc-7.10.1/aclocal.m4	2015-05-14 23:16:10.221224576 +0200
+@@ -568,9 +568,11 @@
+         $3="$$3 -D_HPUX_SOURCE"
+         $5="$$5 -D_HPUX_SOURCE"
+         ;;
+-    arm*linux*)
+-        # On arm/linux and arm/android, tell gcc to link using the gold linker.
+-        # Forcing LD to be ld.gold is done in configre.ac.
++    arm*linux*       | \
++    aarch64*linux*   )
++        # On arm/linux, aarch64/linux, arm/android and aarch64/android, tell
++        # gcc to link using the gold linker.
++        # Forcing LD to be ld.gold is done in FIND_LD m4 macro.
+         $3="$$3 -fuse-ld=gold"
+         ;;
+     esac
+@@ -2121,6 +2123,30 @@
      fi
  ])
  
@@ -44,8 +59,8 @@
  # Finds where gcc is
 Index: ghc-7.10.1/mk/config.mk.in
 ===================================================================
---- ghc-7.10.1.orig/mk/config.mk.in	2015-05-11 22:27:09.955842452 +0200
-+++ ghc-7.10.1/mk/config.mk.in	2015-05-11 22:27:09.955842452 +0200
+--- ghc-7.10.1.orig/mk/config.mk.in	2015-05-12 10:54:02.000000000 +0200
++++ ghc-7.10.1/mk/config.mk.in	2015-05-12 12:41:52.000000000 +0200
 @@ -172,7 +172,7 @@
  
  # ArchSupportsSMP should be set iff there is support for that arch in