From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Sat, 4 Feb 2017 00:38:41 +0000 (-0700)
Subject: Use a large heap to build the system with LIAR/svm on a 32bit host.
X-Git-Tag: mit-scheme-pucked-9.2.12~227^2
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=320a36bd84b2e514093c19d85b71bb1b4cdd4637;p=mit-scheme.git

Use a large heap to build the system with LIAR/svm on a 32bit host.

The default heap (4096Kw) is exhausted compiling xml-parser.bin.
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 174b060d6..11b4a001c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -98,6 +98,7 @@ all-native: cross-target
 
 @IF_CROSS@COMPILER_SETTINGS_CROSS = (set! compiler:cross-compiling? true)
 @IF_LIARC@COMPILER_SETTINGS_LIARC = (set! compiler:invoke-c-compiler? false)
+TOOL_TOOLCHAIN_HEAP = @TOOL_TOOLCHAIN_HEAP@
 
 TOOL_COMPILER_SETTINGS = \
 	$(COMPILER_SETTINGS_CROSS) \
@@ -110,6 +111,7 @@ HOST_SCHEME = '$(MIT_SCHEME_EXE)' --batch-mode
 TOOL_COMPILER = $(TOOL_TOOLCHAIN)
 TOOL_SYNTAXER = $(HOST_SCHEME) --band $(TOOLCHAIN)/syntaxer.com
 TOOL_TOOLCHAIN = $(HOST_SCHEME) --band $(TOOLCHAIN)/compiler.com \
+  $(TOOL_TOOLCHAIN_HEAP) \
   --eval '(begin $(TOOL_COMPILER_SETTINGS))'
 
 .PHONY: toolchain
diff --git a/src/configure.ac b/src/configure.ac
index e6e502888..d71e45092 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -177,6 +177,13 @@ directory, which is usually \`/usr/local/lib/mit-scheme-${mit_scheme_native_code
     fi
 fi
 
+# A 32bit host running LIAR/svm needs a large heap.
+small_words='(= 4 (vector-ref (gc-space-status) 0))'
+if test x"${mit_scheme_native_code}" = xsvm1 \
+   && ${MIT_SCHEME_EXE} --eval "(%exit (if ${small_words} 0 1))"; then \
+    TOOL_TOOLCHAIN_HEAP="--heap 10000"
+fi
+
 AC_SUBST([DEFAULT_TARGET])
 AC_SUBST([ALL_TARGET])
 AC_SUBST([INSTALL_COM])
@@ -189,6 +196,7 @@ AC_SUBST([IF_DEBUG_TOOLCHAIN])
 AC_SUBST([IF_LIARC])
 AC_SUBST([IF_NOT_DEBUG_TOOLCHAIN])
 AC_SUBST([IF_SVM])
+AC_SUBST([TOOL_TOOLCHAIN_HEAP])
 
 AC_PROG_INSTALL
 AC_PROG_LN_S