[DHG_packages] 01/01: ghc: drop the arm64 gold switch, gcc-7/binutils should be good now thanks to jrtc27

[Gianfranco Costamagna]

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

locutusofborg pushed a commit to branch master
in repository DHG_packages.

commit 99694be1f8953589937c3cc9967f9ea9bee1797e
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Sep 1 14:09:55 2017 +0200

    ghc: drop the arm64 gold switch, gcc-7/binutils should be good now thanks to jrtc27
---
 p/ghc/debian/changelog             |  3 +++
 p/ghc/debian/patches/arm64-no-gold | 26 --------------------------
 p/ghc/debian/rules                 |  3 ---
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index 7ff0ca7..8fb1537 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -3,6 +3,9 @@ ghc (8.0.2-10) UNRELEASED; urgency=medium
   [ John Paul Adrian Glaubitz ]
   * Make ghc cross-buildable
 
+  [ Gianfranco Costamagna ]
+  * Drop arm64 switch to gold, now gcc/binutils should be fixed.
+
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 29 Aug 2017 23:10:26 +0200
 
 ghc (8.0.2-9) unstable; urgency=medium
diff --git a/p/ghc/debian/patches/arm64-no-gold b/p/ghc/debian/patches/arm64-no-gold
deleted file mode 100644
index 2f5d465..0000000
--- a/p/ghc/debian/patches/arm64-no-gold
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Use BFD on arm64, because the new binutils seems to be not able to link it anymore
-Author: Gianfranco Costamagna <locutusofborg at debian.org>
-
-Last-Update: 2017-07-02
-
---- ghc-8.0.2.orig/aclocal.m4
-+++ ghc-8.0.2/aclocal.m4
-@@ -594,7 +594,7 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
-         # On aarch64/linux 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 -Wl,-z,noexecstack"
-+        $3="$$3 -fuse-ld=bfd -Wl,-z,noexecstack"
-         $4="$$4 -z noexecstack"
-         ;;
- 
-@@ -2043,8 +2043,7 @@ AC_DEFUN([FIND_LLVM_PROG],[
- AC_DEFUN([FIND_LD],[
-     FP_ARG_WITH_PATH_GNU_PROG([LD], [ld], [ld])
-     case $target in
--        arm*linux*       | \
--        aarch64*linux*   )
-+        arm*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
diff --git a/p/ghc/debian/rules b/p/ghc/debian/rules
index b0a7dc0..d5a9222 100755
--- a/p/ghc/debian/rules
+++ b/p/ghc/debian/rules
@@ -46,9 +46,6 @@ endif
 	dh $@
 
 override_dh_autoreconf:
-ifeq (arm64,$(DEB_HOST_ARCH))
-	patch -p1 < debian/patches/arm64-no-gold
-endif
 	dh_autoreconf perl -- boot
 
 override_dh_auto_configure:

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