[DHG_packages] 01/01: ghc: switch arm64 linker to bfd, since gold is garbage

[Clint Adams]

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

clint pushed a commit to branch master
in repository DHG_packages.

commit d716eca51d7a15b32f1335d0429074af5bbc6345
Author: Clint Adams <clint at debian.org>
Date:   Fri Aug 25 08:37:48 2017 -0400

    ghc: switch arm64 linker to bfd, since gold is garbage
---
 p/ghc/debian/changelog                |  6 ++++++
 p/ghc/debian/patches/no-gold-on-arm64 | 14 ++++++++++++++
 p/ghc/debian/patches/series           |  1 +
 p/ghc/debian/rules                    |  2 +-
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index afa348f..7783aaa 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,3 +1,9 @@
+ghc (8.0.2-6) unstable; urgency=medium
+
+  * Switch arm64 linker to bfd, since gold is garbage.
+
+ -- Clint Adams <clint at debian.org>  Fri, 25 Aug 2017 08:36:53 -0400
+
 ghc (8.0.2-5) unstable; urgency=medium
 
   * Patch from James Clarke to fix powerpc breakage caused by
diff --git a/p/ghc/debian/patches/no-gold-on-arm64 b/p/ghc/debian/patches/no-gold-on-arm64
new file mode 100644
index 0000000..31ffe84
--- /dev/null
+++ b/p/ghc/debian/patches/no-gold-on-arm64
@@ -0,0 +1,14 @@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -591,10 +591,7 @@
+         ;;
+ 
+     aarch64*linux*)
+-        # 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"
++        # gold is an abomination
+         $4="$$4 -z noexecstack"
+         ;;
+ 
diff --git a/p/ghc/debian/patches/series b/p/ghc/debian/patches/series
index 869c987..0d9a819 100644
--- a/p/ghc/debian/patches/series
+++ b/p/ghc/debian/patches/series
@@ -8,3 +8,4 @@ do-not-use-SHELL
 compiler-cmm-PprC-sparc-alignment.patch
 x32-use-native-x86_64-insn.patch
 osdecommitmemory-compat.patch
+no-gold-on-arm64
diff --git a/p/ghc/debian/rules b/p/ghc/debian/rules
index ef15dd8..1abf873 100755
--- a/p/ghc/debian/rules
+++ b/p/ghc/debian/rules
@@ -53,7 +53,7 @@ override_dh_auto_configure:
 	echo "HADDOCK_DOCS := YES" >> mk/build.mk
 	echo "EXTRA_HADDOCK_OPTS += --mathjax=file:///usr/share/javascript/mathjax/MathJax.js" >> mk/build.mk
 	echo "XSLTPROC_OPTS += --nonet" >> mk/build.mk
-ifneq (,$(filter arm64 armel armhf, $(DEB_HOST_ARCH)))
+ifneq (,$(filter armel armhf, $(DEB_HOST_ARCH)))
 	echo "SRC_HC_OPTS     += -optl-B/usr/bin/ld.gold" >> mk/build.mk
 endif
 ifeq (armhf,$(DEB_HOST_ARCH))

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