Merge branch 'master' into ELisp

diff --cc src/Makefile.in
index 23735a946090ced23a573be1593e4565ad34d89f,abda45d3b461e4fb3837d73cf8f1267da3491d9c..5f2b750fa74ca153e8fc950e4793f6cd08871036
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -61,10 -61,11 +61,11 @@@ mkinstalldirs = $(SHELL) $(top_srcdir)/
  # **** END BOILERPLATE ****
  
  LIARC_BOOT_BUNDLES = compiler cref sf star-parser
 -LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) edwin ffi imail sos ssp xml
 +LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) edwin elisp ffi imail sos ssp xml
+ FFIS = @FFIS@
  
  SUBDIRS = $(INSTALLED_SUBDIRS) 6001 compiler rcs win32 xdoc
- INSTALLED_SUBDIRS = microcode runtime $(LIARC_BUNDLES)
+ INSTALLED_SUBDIRS = microcode runtime $(LIARC_BUNDLES) $(FFIS)
  
  MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
  AUXDIR_NAME = @AUXDIR_NAME@

diff --cc src/Setup.sh
index 79d50e3b867f1bb7815a7352a12d63ba603c7f48,db62f1d565d95bcf7ea99d3092c1267af1a08253..bf785dd019365bfd6f86ab5d94cdddf57f1e714a
--- 1/src/Setup.sh
--- 2/src/Setup.sh
+++ b/src/Setup.sh
@@@ -86,8 -86,13 +86,14 @@@ maybe_link lib/optiondb.scm ../etc/opti
  maybe_link lib/runtime ../runtime
  maybe_link lib/mit-scheme.h ../microcode/pruxffi.h
  maybe_link lib/ffi ../ffi
+ maybe_link lib/ffi-test-shim.so ../ffi/ffi-test-shim.so
+ maybe_link lib/ffi-test-types.bin ../ffi/ffi-test-types.bin
+ maybe_link lib/ffi-test-const.bin ../ffi/ffi-test-const.bin
 +maybe_link lib/elisp ../elisp
  
+ maybe_link config.sub microcode/config.sub
+ maybe_link config.guess microcode/config.guess
+ 
  for SUBDIR in ${INSTALLED_SUBDIRS} ${OTHER_SUBDIRS}; do
      echo "setting up ${SUBDIR}"
      maybe_link ${SUBDIR}/Setup.sh ../etc/Setup.sh

diff --cc src/compiler/base/toplev.scm
Simple merge

diff --cc src/compiler/machines/C/compiler.pkg
Simple merge

diff --cc src/compiler/machines/i386/compiler.pkg
Simple merge

diff --cc src/compiler/machines/spectrum/compiler.pkg
Simple merge

diff --cc src/compiler/machines/svm/compiler.pkg
Simple merge

diff --cc src/compiler/machines/x86-64/compiler.pkg
Simple merge

diff --cc src/configure.ac
index eea3827748b23f5964d6a87297b3cf4963e672e2,004413ab2a25129ef830a4db0a9331be0ed563ec..4c37657ee8069b028752c7e67ee7dfac7a7ab8ad
--- 1/src/configure.ac
--- 2/src/configure.ac
+++ b/src/configure.ac
@@@ -138,8 -189,8 +190,8 @@@ if test x"${mit_scheme_native_code}" = 
      for BN in star-parser; do
          (cd lib; rm -f ${BN}; ${LN_S} ../${BN} .)
      done
 -    for BUNDLE in 6001 compiler cref edwin ffi imail sf sos ssp star-parser \
 -                xdoc xml $FFIS; do
 +    for BUNDLE in 6001 compiler cref edwin elisp ffi imail sf sos ssp \
-           star-parser xdoc xml; do
++                star-parser xdoc xml $FFIS; do
        SO=${BUNDLE}.so
        (cd lib/lib; rm -f ${SO}; ${LN_S} ../../${BUNDLE}/${SO} .)
      done

diff --cc src/etc/compile.scm
index bd481ce4bbfd88fcdd133eabfd97d131b8b37629,30445eea4161219b847c7c99cc60259ee7783bf6..33239da773d18ebe2937cff64fec67fc878173b4
--- 1/src/etc/compile.scm
--- 2/src/etc/compile.scm
+++ b/src/etc/compile.scm
@@@ -37,8 -38,20 +38,20 @@@ USA
    (with-working-directory-pathname "sos"
      (lambda ()
        (load "load")))
 -  (for-each compile-dir '("xml" "win32" "edwin" "imail" "ssp" "ffi")))
 +  (for-each compile-dir '("xml" "win32" "edwin" "imail" "ssp" "ffi" "elisp")))
  
+ (define (compile-ffi dir)
+   (if (eq? microcode-id/compiled-code-type 'C)
+       (in-liarc
+        (lambda ()
+        (c-compile-dir dir)
+        (let* ((line '("make" "compile-liarc-bundle"))
+               (code (run-synchronous-subprocess
+                      (car line) (cdr line) 'working-directory dir)))
+          (if (not (zero? code))
+              (error "Process exited with error code:" code line)))))
+       (compile-dir dir)))
+ 
  (define (compile-boot-dirs compile-dir)
    (compile-cref compile-dir)
    (for-each compile-dir '("runtime" "cref" "sf" "compiler" "star-parser")))

diff --cc src/etc/create-makefiles.sh
Simple merge

diff --cc src/etc/optiondb.scm
Simple merge