.gitignore

@@ -7,4 +7,5 @@
 dist
 lab
 *~
+*.swp
 p/pandoc

p/ghc/debian/changelog

-ghc (8.6.5+dfsg1-4) UNRELEASED; urgency=medium
+ghc (8.6.5+dfsg1-4) unstable; urgency=medium
 
   [ John Paul Adrian Glaubitz ]
   * debian/patches/powerpc-fix-64-bit-comparision.patch
@@ -7,7 +7,12 @@ ghc (8.6.5+dfsg1-4) UNRELEASED; urgency=medium
   [ Aurelien Jarno ]
   * build with -mxgot on mips64el
 
- -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Fri, 09 Aug 2019 13:21:37 +0200
+  [ Ilias Tsitsimpis ]
+  * Remove cap on parallel builds, use `ggc-min-expand=10` instead
+  * Avoid virtual memory exhaustion on 32-bit unregisterised architectures
+    (Closes: #933968)
+
+ -- Ilias Tsitsimpis <iliastsi@debian.org>  Fri, 30 Aug 2019 12:53:32 +0300
 
 ghc (8.6.5+dfsg1-3) unstable; urgency=medium
 

p/ghc/debian/rules

@@ -56,11 +56,7 @@ ifneq (,$(filter mips mipsel powerpc powerpcspe sparc64, $(DEB_HOST_ARCH)))
 endif
 
 %:
-ifneq (,$(filter s390x, $(DEB_HOST_ARCH)))
-	dh $@ --max-parallel=2
-else
 	dh $@
-endif
 
 
 override_dh_autoreconf:
@@ -82,20 +78,19 @@ else
 	echo "BUILD_SPHINX_HTML := NO" >> mk/build.mk
 	echo "BUILD_SPHINX_PDF := NO" >> mk/build.mk
 endif
-ifneq (,$(filter arm64 armel armhf, $(DEB_HOST_ARCH)))
-	echo "SRC_HC_OPTS     += -optl-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
 endif
 ifeq (big, $(DEB_TARGET_ARCH_ENDIAN))
+	# See https://gitlab.haskell.org/ghc/ghc/issues/16998
 	patch -p1 < debian/patches/Disable-unboxed-arrays.patch
 endif
-ifneq (,$(filter mips mipsel, $(DEB_HOST_ARCH)))
+ifneq (,$(filter mips mipsel mips64el s390x, $(DEB_HOST_ARCH)))
 	echo "SRC_HC_OPTS     += -optc--param -optcggc-min-expand=10" >> mk/build.mk
 endif
 ifneq (,$(filter mips64el, $(DEB_HOST_ARCH)))
-	echo "SRC_HC_OPTS     += -optc-mxgot" >> mk/build.mk
+	# Pass -mxgot to fix relocation linker errors
+	echo "compiler/hsSyn/HsInstances_HC_OPTS += -optc-mxgot" >> mk/build.mk
 endif
 ifeq (x32,$(DEB_HOST_ARCH))
 	echo "INTEGER_LIBRARY = integer-simple" >> mk/build.mk
@@ -115,6 +110,13 @@ ifneq (,$(filter noopt, $(DEB_BUILD_OPTIONS)))
 	# This breaks the build - to be investigated:
 	# echo "GhcLibHcOpts  += -O0" >> mk/build.mk
 	echo "GhcRtsCcOpts  += -O0" >> mk/build.mk
+endif
+ifneq (,$(filter mipsel hppa x32, $(DEB_HOST_ARCH)))
+	# Virtual memory exhausted when trying to build unregisterised compiler on
+	# 32-bit targets. Disable optimizations for compiler/hsSyn/HsInstances.hs.
+	# See https://bugs.debian.org/933968
+	# See https://gitlab.haskell.org/ghc/ghc/issues/17048
+	echo "compiler/hsSyn/HsInstances_HC_OPTS += -O0" >> mk/build.mk
 endif
 	# We also want to build the threaded profiling-enabled debug runtime,
 	# because it does no harm