[Pkg-haskell-commits] darcs: ghc: Try using ld.gold on arm, using -optc-B/usr/bin/ld.gold

[Joachim Breitner]

Sun Nov 30 17:51:40 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Try using ld.gold on arm, using -optc-B/usr/bin/ld.gold 

    M ./changelog +6
    M ./rules -8 +2

Sun Nov 30 17:51:40 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Try using ld.gold on arm, using -optc-B/usr/bin/ld.gold 
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2014-11-30 18:46:58.230328175 +0000
+++ new-ghc/changelog	2014-11-30 18:46:58.258328177 +0000
@@ -1,3 +1,9 @@
+ghc (7.8.20141119-5) UNRELEASED; urgency=medium
+
+  * Try using ld.gold on arm, using -optc-B/usr/bin/ld.gold 
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 30 Nov 2014 18:51:25 +0100
+
 ghc (7.8.20141119-4) experimental; urgency=medium
 
   * Try using ld.gold on arm. 
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2014-11-30 18:46:58.230328175 +0000
+++ new-ghc/rules	2014-11-30 18:46:58.254328177 +0000
@@ -42,12 +42,6 @@
     MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-ifneq (,$(findstring $(DEB_HOST_ARCH),arm64 armel armhf))
-        LINKER = ld.gold
-else
-        LINKER = ld.bfd
-endif
-
 
 autoreconf:
 	autoreconf -fi
@@ -67,8 +61,9 @@
 	echo "SRC_HC_OPTS += -lffi -optl-pthread" >> mk/build.mk
 	echo "HADDOCK_DOCS := YES" >> mk/build.mk
 	echo "XSLTPROC_OPTS += --nonet" >> mk/build.mk
-ifneq (,$(findstring $(DEB_HOST_ARCH), arm armel armhf))
+ifneq (,$(findstring $(DEB_HOST_ARCH), arm64 armel armhf))
 	echo "SRC_HC_OPTS     += -optc-mlong-calls" >> mk/build.mk
+	echo "SRC_HC_OPTS     += -optc-B/usr/bin/ld.gold" >> mk/build.mk
 endif
 ifeq (armhf,$(DEB_HOST_ARCH))
 	echo "SRC_HC_OPTS += -D__ARM_PCS_VFP" >> mk/build.mk
@@ -121,7 +116,6 @@
 	./configure $(confflags) --prefix=/usr \
 		$(EXTRA_CONFIGURE_FLAGS) \
 		--with-system-libffi \
-		--with-ld=$(LINKER) \
 		--with-llc=llc-3.4 \
 		--with-opt=opt-3.4