From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Fri, 22 Jun 2018 10:06:29 +0000 (-0700)
Subject: Punt remains of µmodule support.
X-Git-Tag: mit-scheme-pucked-9.2.15~10^2~2
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=1f8d8b25c78dbf1b45d0643d7144b9bda7d55dd3;p=mit-scheme.git

Punt remains of µmodule support.
---

diff --git a/src/microcode/configure.ac b/src/microcode/configure.ac
index e74988495..9cc9a1161 100644
--- a/src/microcode/configure.ac
+++ b/src/microcode/configure.ac
@@ -153,14 +153,6 @@ OPTIONAL_SOURCES=
 OPTIONAL_OBJECTS=
 SCHEME_DEFS=-DMIT_SCHEME
 SCHEME_LDFLAGS=
-MODULE_BASES=
-MODULE_AUX_BASES=
-MODULE_LIBS=
-MODULE_TARGETS=
-MODULE_RULES=/dev/null
-MODULE_CFLAGS=
-MODULE_LDFLAGS=
-MODULE_LOADER=
 LIARC_VARS=/dev/null
 LIARC_RULES=/dev/null
 AUX_PROGRAMS=
@@ -333,15 +325,6 @@ darwin*)
     CFLAGS="${CFLAGS} ${MACOSX_CFLAGS}"
     LDFLAGS="${LDFLAGS} ${MACOSX_CFLAGS} -Wl,-syslibroot,${MACOSX_SYSROOT}"
     LDFLAGS="${LDFLAGS} -framework CoreFoundation"
-    MODULE_LDFLAGS="${MODULE_LDFLAGS} -bundle"
-    if test "${with_module_loader}" != no; then
-      if test "${with_module_loader}" = yes; then
-	MODULE_LOADER='${SCHEME_EXE}'
-      else
-	MODULE_LOADER="${with_module_loader}"
-      fi
-      MODULE_LDFLAGS="${MODULE_LDFLAGS} -bundle_loader ${MODULE_LOADER}"
-    fi
     AUX_PROGRAMS="${AUX_PROGRAMS} macosx-starter"
     ;;
 netbsd*)
@@ -367,8 +350,6 @@ if test "${DO_GCC_TESTS}" = yes; then
     if test "${GNU_LD}" = yes; then
 	SCHEME_LDFLAGS="${SCHEME_LDFLAGS} -export-dynamic"
     fi
-    MODULE_CFLAGS="-fPIC ${MODULE_CFLAGS}"
-    MODULE_LDFLAGS="${MODULE_LDFLAGS} -shared -fPIC"
     AC_MSG_CHECKING([for ELF binaries])
     AC_EGREP_CPP([yes],
 	[
@@ -871,26 +852,6 @@ for base in ${OPTIONAL_BASES}; do
     OPTIONAL_OBJECTS="${OPTIONAL_OBJECTS} ${base}.o"
 done
 
-if test "x${MODULE_BASES}" != x; then
-    MODULE_RULES=config-rules.module
-    rm -f ${MODULE_RULES}
-    for BASE in ${MODULE_BASES}; do
-	MODULE_TARGETS="${MODULE_TARGETS} ${BASE}.so"
-	MODULE_AUX_BASES="${MODULE_AUX_BASES} ${BASE}"
-    done
-    for BASE in ${MODULE_AUX_BASES}; do
-	echo >> ${MODULE_RULES}
-	echo ${BASE}.o: ${BASE}.c >> ${MODULE_RULES}
-	echo "	" '$(COMPILE_MODULE)' -c '$*.c' >> ${MODULE_RULES}
-    done
-fi
-if test "x${MODULE_TARGETS}" != x; then
-    if test ! -e ../lib/lib; then mkdir ../lib/lib; fi
-    for BASE in ${MODULE_TARGETS}; do
-	ln -sf ../../microcode/${BASE} ../lib/lib/${BASE}
-    done
-fi
-
 AC_SUBST([AS_FLAGS])
 AC_SUBST([GC_HEAD_FILES])
 AC_SUBST([M4_FLAGS])
@@ -899,11 +860,6 @@ AC_SUBST([OPTIONAL_SOURCES])
 AC_SUBST([OPTIONAL_OBJECTS])
 AC_SUBST([SCHEME_DEFS])
 AC_SUBST([SCHEME_LDFLAGS])
-AC_SUBST([MODULE_TARGETS])
-AC_SUBST_FILE([MODULE_RULES])
-AC_SUBST([MODULE_CFLAGS])
-AC_SUBST([MODULE_LDFLAGS])
-AC_SUBST([MODULE_LOADER])
 AC_SUBST_FILE([LIARC_VARS])
 AC_SUBST_FILE([LIARC_RULES])
 AC_SUBST([AUX_PROGRAMS])
@@ -921,7 +877,3 @@ rm -f makegen-cc
 echo "#!/bin/sh" > makegen-cc
 echo exec gcc -MM -MG -DMIT_SCHEME ${CPPFLAGS} '"${1}"' >> makegen-cc
 chmod +x makegen-cc
-
-if test ${MODULE_RULES} != /dev/null; then
-    rm -f ${MODULE_RULES}
-fi
diff --git a/src/microcode/liarc-ld.in b/src/microcode/liarc-ld.in
index d24fd8f27..62204c9cd 100644
--- a/src/microcode/liarc-ld.in
+++ b/src/microcode/liarc-ld.in
@@ -34,6 +34,6 @@ shift
 
 SCHEME_EXE=`dirname ${0}`/scheme
 
-CMD="@CCLD@ @LDFLAGS@ @MODULE_LDFLAGS@ -o ${OUT} ${@}"
+CMD="@CCLD@ @LDFLAGS@ -o ${OUT} ${@}"
 echo "${CMD}"
 eval "${CMD}"
diff --git a/src/microcode/makegen/Makefile.in.in b/src/microcode/makegen/Makefile.in.in
index a5c02e7fa..671e8ff1c 100644
--- a/src/microcode/makegen/Makefile.in.in
+++ b/src/microcode/makegen/Makefile.in.in
@@ -102,14 +102,6 @@ GC_HEAD_FILES = @GC_HEAD_FILES@
 OPTIONAL_SOURCES = @OPTIONAL_SOURCES@
 OPTIONAL_OBJECTS = @OPTIONAL_OBJECTS@
 
-MODULE_TARGETS = @MODULE_TARGETS@
-MODULE_CFLAGS = @MODULE_CFLAGS@
-MODULE_LDFLAGS = @MODULE_LDFLAGS@
-MODULE_LOADER = @MODULE_LOADER@
-COMPILE_MODULE = $(COMPILE) -DCOMPILE_AS_MODULE $(MODULE_CFLAGS)
-LINK_MODULE = $(LINK) $(MODULE_LDFLAGS)
-MODULE_LIBS = -lc
-
 # **** Rules for C back end (part 1, variables) ****
 
 @LIARC_VARS@
@@ -117,7 +109,7 @@ MODULE_LIBS = -lc
 # **** Program definitions ****
 
 aux_PROGRAMS = @AUX_PROGRAMS@
-aux_LIBS = $(MODULE_TARGETS)
+aux_LIBS = 
 aux_DATA = @AUX_DATA@
 EXTRA_PROGRAMS = findprim
 
@@ -190,8 +182,6 @@ extract-liarc-decls: extract-liarc-decls.o
 macosx-starter: macosx-starter.o
 	$(LINK) macosx-starter.o
 
-@MODULE_RULES@
-
 tags: TAGS
 TAGS:
 	./Tags.sh
diff --git a/src/microcode/ntutl/makefile b/src/microcode/ntutl/makefile
index 94f4f7bae..a60055053 100644
--- a/src/microcode/ntutl/makefile
+++ b/src/microcode/ntutl/makefile
@@ -27,10 +27,6 @@
 #### Makefile for Scheme under Win32 compiled by Microsoft Visual C++.
 !include <win32.mak>
 
-#USER_PRIM_SOURCES = prmd5.c
-#USER_PRIM_OBJECTS = prmd5.obj
-#USER_LIBS = md5.lib
-
 # **** Microsoft supplies their assembler as a separate product, and
 # **** we don't currently have a copy, so use the Watcom assembler.
 # Assembler options.
@@ -469,7 +465,6 @@ utils.obj: utils.c $(SCHEME_H) $(PRIMS_H) $(HISTORY_H) \
 vector.obj: vector.c $(SCHEME_H) $(PRIMS_H)
 wind.obj: wind.c $(OBSTACK_H) $(DSTACK_H) $(OUTF_H)
 
-prmd5.obj: prmd5.c $(SCHEME_H) $(PRIMS_H)
 prosenv.obj: prosenv.c $(SCHEME_H) $(PRIMS_H) $(OSENV_H) $(OSTOP_H) $(LIMITS_H)
 prosfile.obj: prosfile.c $(SCHEME_H) $(PRIMS_H) $(OSFILE_H)
 prosfs.obj: prosfs.c $(SCHEME_H) $(PRIMS_H) $(OSFILE_H) $(OSFS_H) $(OSIO_H)
diff --git a/src/microcode/ntutl/makefile.wcc b/src/microcode/ntutl/makefile.wcc
index 0584572ed..9919a9292 100644
--- a/src/microcode/ntutl/makefile.wcc
+++ b/src/microcode/ntutl/makefile.wcc
@@ -27,9 +27,7 @@
 #### Makefile for Scheme under Win32 compiled by Watcom C/C++
 ###  This makefile is meant to be used with Watcom make.
 
-USER_PRIM_SOURCES = # prmd5.c
-USER_PRIM_OBJECTS = # prmd5.obj
-USER_LIBS = library wsock32.lib #,md5.lib
+USER_LIBS = library wsock32.lib
 
 CC = wcc386
 M4 = m4
@@ -290,8 +288,8 @@ utils.obj &
 vector.obj &
 wind.obj
 
-SOURCES = $(CORE_SOURCES) $(USER_PRIM_SOURCES)
-OBJECTS = $(CORE_OBJECTS) $(USER_PRIM_OBJECTS) usrdef.obj
+SOURCES = $(CORE_SOURCES)
+OBJECTS = $(CORE_OBJECTS) usrdef.obj
 SCHEME_LIB = $(USER_LIBS)
 
 scheme : scheme.exe .SYMBOLIC