From 2cd957d9440b5bd678b12b29d3b536084b5dc0ae Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Tue, 19 Sep 2017 17:22:15 -0700 Subject: [PATCH] src/Makefile.in: Use large heap when finishing cross-compilation. --- src/Makefile.in | 2 ++ src/configure.ac | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index c568901cf..894c18d1f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -684,11 +684,13 @@ cross-end: cross-host echo ' (load "../compiler/base/crsend" env)' && \ echo ' ((access FINISH-CROSS-COMPILATION:FILES env) ".."))') \ | (cd runtime && ../microcode/scheme --batch-mode --library ../lib \ + $(TOOL_TOOLCHAIN_HEAP) \ --fasl make.bin) (echo '(let ((env (->environment (quote (RUNTIME)))))' && \ echo ' (load "../compiler/base/crsend" env)' && \ echo ' ((access FINISH-CROSS-COMPILATION:INFO-FILES env) ".."))') \ | (cd runtime && ../microcode/scheme --batch-mode --library ../lib \ + $(TOOL_TOOLCHAIN_HEAP) \ --fasl make.com) # **** Legacy serialized targets **** diff --git a/src/configure.ac b/src/configure.ac index 7d6017656..2856940ae 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -182,10 +182,14 @@ directory, which is usually \`/usr/local/lib/mit-scheme-${mit_scheme_native_code fi # A 32bit host running LIAR/svm needs a large heap. +# A 64bit host running LIAR/svm failed to finish-cross-compilation:info-files. 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" +if test x"${mit_scheme_native_code}" = xsvm1; then + if ${MIT_SCHEME_EXE} --eval "(%exit (if ${small_words} 0 1))"; then + TOOL_TOOLCHAIN_HEAP="--heap 10000" + else + TOOL_TOOLCHAIN_HEAP="--heap 20000" + fi fi AC_SUBST([DEFAULT_TARGET]) -- 2.25.1