From: Guillermo J. Rozas <edu/mit/csail/zurich/gjr>
Date: Thu, 24 Jun 1993 06:49:03 +0000 (+0000)
Subject: Global NT merge.
X-Git-Tag: 20090517-FFI~8302
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=b0e6d8e4c87e029ff6b573397d11cc5e27b34e00;p=mit-scheme.git

Global NT merge.
---

diff --git a/v7/src/microcode/unxutl/y300.lcl b/v7/src/microcode/unxutl/y300.lcl
index 3c3fd0d81..be4b6802d 100644
--- a/v7/src/microcode/unxutl/y300.lcl
+++ b/v7/src/microcode/unxutl/y300.lcl
@@ -1,6 +1,6 @@
 /* -*- C -*-
    Switzerland local additions to the makefile
-   $Id: y300.lcl,v 1.23 1992/12/07 22:14:10 cph Exp $
+   $Id: y300.lcl,v 1.24 1993/06/24 06:40:31 gjr Exp $
  */
 
 COMMON_OBJECTS = $(CORE_OBJECTS) $(STD_GC_OBJECTS) $(UNIX_OBJECTS) $(OS_PRIM_OBJECTS)
@@ -8,10 +8,10 @@ COMMON_OBJECTS = $(CORE_OBJECTS) $(STD_GC_OBJECTS) $(UNIX_OBJECTS) $(OS_PRIM_OBJ
 /* These extra files are for 6003.  They assume we're using HP-UX. */
 
 6003_SOURCES = $(X_SOURCES) $(TERMCAP_OBJECTS) $(GRAPHICS_SOURCES)\
-	SOURCES_SYSTEM SOURCES_MACHINE Sgraph_ar.c fft.c array.c\
+	SOURCES_SYSTEM SOURCES_MACHINE sgraph_a.c fft.c array.c\
        image.c
 6003_OBJECTS = $(X_OBJECTS) $(TERMCAP_OBJECTS) $(GRAPHICS_OBJECTS)\
-	OBJECTS_SYSTEM OBJECTS_MACHINE Sgraph_ar.o fft.o array.o\
+	OBJECTS_SYSTEM OBJECTS_MACHINE sgraph_a.o fft.o array.o\
        image.o usr6003.o
 6003_LIB =  $(USER_LIBS) $(GRAPHICS_LIBS) $(X_LIB) $(TERMCAP_LIBS)\
 	LIB_MATH LIBS_SYSTEM LIBS_MACHINE LIB_DEBUG LIB_STANDARD
@@ -46,12 +46,12 @@ KIT_OBJECTS = $(X_OBJECTS) $(TERMCAP_OBJECTS) $(GRAPHICS_OBJECTS)\
 KIT_LIB = $(USER_LIBS) $(GRAPHICS_LIBS) $(X_LIB) $(TERMCAP_LIBS)\
 	LIB_MATH LIBS_SYSTEM LIBS_MACHINE LIB_DEBUG LIB_STANDARD LIB_DVIO
 
-/* Franklyn's personal scheme: 6003-like + Sgraph_xt. */
+/* Franklyn's personal scheme: 6003-like + sgraph_xt. */
 
 LYN_SOURCES = $(X_SOURCES) $(CTERM_SOURCES) $(GRAPHICS_SOURCES)\
-	unixprim.c  Sgraph_ar.c Sgraph_xt.c fft.c array.c image.c
+	unixprim.c  sgraph_a.c sgraph_x.c fft.c array.c image.c
 LYN_OBJECTS = $(X_OBJECTS) $(CTERM_OBJECTS) $(GRAPHICS_OBJECTS)\
-	unixprim.o  Sgraph_ar.o Sgraph_xt.o fft.o array.o image.o\
+	unixprim.o  sgraph_a.o sgraph_x.o fft.o array.o image.o\
 	usrLYN.o
 LYN_LIB =  $(USER_LIBS) $(GRAPHICS_LIBS) $(X_LIB) $(CTERM_LIB)\
 	-lm
@@ -67,7 +67,7 @@ SIG_LIB =  $(USER_LIBS) $(X_LIB) $(TERMCAP_LIBS)\
 
 world: all scmsig scm6003 kitscheme
 
-everything: world Ppband
+everything: world ppband
 
 install.world: install scm6003
 	-mv -f $(BINDIR)/scm6003 $(BINDIR)/scm6003.busy
@@ -82,10 +82,10 @@ scm6003 : $(COMMON_OBJECTS) $(6003_OBJECTS)
 	rm -f $@
 	$(CC) $(LDFLAGS) -o $@ $(COMMON_OBJECTS) $(6003_OBJECTS) $(6003_LIB)
 
-usr6003.c : $(6003_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.touch Findprim xmakefile
+usr6003.c : $(6003_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.tch findprim xmkfile
 	@ECHO "#** Re-making" $@ because of $?
 	rm -f usr6003.c
-	./Findprim $(6003_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usr6003.c
+	./findprim $(6003_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usr6003.c
 
 kitscheme : $(COMMON_OBJECTS) $(KIT_OBJECTS)
 	@ECHO "#** Re-linking" $@ because of $?
@@ -98,22 +98,22 @@ kitscheme : $(COMMON_OBJECTS) $(KIT_OBJECTS)
 	/usr/local/lib/gcc-gnulib -lc /usr/local/lib/gcc-gnulib
 #endif
 
-usrkit.c : $(KIT_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.touch Findprim xmakefile
+usrkit.c : $(KIT_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.tch findprim xmkfile
 	@ECHO "#** Re-making" $@ because of $?
 	rm -f usrkit.c
-	./Findprim $(KIT_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usrkit.c
+	./findprim $(KIT_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usrkit.c
 
 scmLYN : $(COMMON_OBJECTS) $(LYN_OBJECTS)
 	@echo "#** Re-linking" $@ because of $?
 	rm -f $@
 	$(CC) $(LDFLAGS) -o $@ $(COMMON_OBJECTS) $(LYN_OBJECTS) $(LYN_LIB)
 
-usrLYN.c : $(LYN_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.touch Findprim xmakefile
+usrLYN.c : $(LYN_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.tch findprim xmkfile
 	@echo "#** Re-making" $@ because of $?
 	rm -f usrLYN.c
-	./Findprim $(LYN_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usrLYN.c
+	./findprim $(LYN_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usrLYN.c
 
-gpio.o : gpio.c scheme.touch prims.h
+gpio.o : gpio.c scheme.tch prims.h
 
 
 scmsig : $(COMMON_OBJECTS) $(SIG_OBJECTS)
@@ -121,8 +121,8 @@ scmsig : $(COMMON_OBJECTS) $(SIG_OBJECTS)
 	rm -f $@
 	$(CC) $(LDFLAGS) -o $@ $(COMMON_OBJECTS) $(SIG_OBJECTS) $(SIG_LIB)
 
-usrSIG.c : $(SIG_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.touch Findprim xmakefile
+usrSIG.c : $(SIG_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.tch findprim xmkfile
 	@ECHO "#** Re-making" $@ because of $?
 	rm -f usrSIG.c
-	./Findprim $(SIG_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usrSIG.c
+	./findprim $(SIG_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usrSIG.c
 
diff --git a/v7/src/microcode/unxutl/y700.lcl b/v7/src/microcode/unxutl/y700.lcl
index e861d56c8..d94edd30e 100644
--- a/v7/src/microcode/unxutl/y700.lcl
+++ b/v7/src/microcode/unxutl/y700.lcl
@@ -1,6 +1,6 @@
 /* -*- C -*-
    Switzerland local additions to the makefile
-   $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/unxutl/Attic/y700.lcl,v 1.5 1993/02/22 20:35:18 nick Exp $
+   $Id: y700.lcl,v 1.6 1993/06/24 06:42:27 gjr Exp $
  */
 
 COMMON_OBJECTS = $(CORE_OBJECTS) $(STD_GC_OBJECTS) $(UNIX_OBJECTS) $(OS_PRIM_OBJECTS)
@@ -18,10 +18,10 @@ if it is unset - nick */
 /* These extra files are for 6003.  They assume we're using HP-UX. */
 
 6003_SOURCES = $(X_SOURCES) $(TERMCAP_OBJECTS) $(GRAPHICS_SOURCES)\
-	SOURCES_SYSTEM SOURCES_MACHINE Sgraph_ar.c fft.c array.c\
+	SOURCES_SYSTEM SOURCES_MACHINE sgraph_a.c fft.c array.c\
        image.c
 6003_OBJECTS = $(X_OBJECTS) $(TERMCAP_OBJECTS) $(GRAPHICS_OBJECTS)\
-	OBJECTS_SYSTEM OBJECTS_MACHINE Sgraph_ar.o fft.o array.o\
+	OBJECTS_SYSTEM OBJECTS_MACHINE sgraph_a.o fft.o array.o\
        image.o usr6003.o
 6003_LIB =  $(USER_LIBS) $(GRAPHICS_LIBS) $(X_LIB) $(TERMCAP_LIBS)\
 	LIB_MATH LIBS_SYSTEM LIBS_MACHINE LIB_DEBUG LIB_STANDARD
@@ -38,7 +38,7 @@ SIG_LIB =  $(USER_LIBS) $(X_LIB) $(TERMCAP_LIBS)\
 
 world: all scmsig scm6003
 
-everything: world Ppband
+everything: world ppband
 
 install.world: install scmsig scm6003 
 	-mv -f $(BINDIR)/scm6003 $(BINDIR)/scm6003.busy
@@ -53,10 +53,10 @@ scm6003 : $(COMMON_OBJECTS) $(6003_OBJECTS)
 	rm -f $@
 	$(CC) $(LDFLAGS) -o $@ $(COMMON_OBJECTS) $(6003_OBJECTS) $(6003_LIB)
 
-usr6003.c : $(6003_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.touch Findprim xmakefile
+usr6003.c : $(6003_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.tch findprim xmkfile
 	@ECHO "#** Re-making" $@ because of $?
 	rm -f usr6003.c
-	./Findprim $(6003_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usr6003.c
+	./findprim $(6003_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usr6003.c
 
 
 scmsig : $(COMMON_OBJECTS) $(SIG_OBJECTS)
@@ -64,28 +64,28 @@ scmsig : $(COMMON_OBJECTS) $(SIG_OBJECTS)
 	rm -f $@
 	$(CC) $(LDFLAGS) -o $@ $(COMMON_OBJECTS) $(SIG_OBJECTS) $(SIG_LIB)
 
-usrSIG.c : $(SIG_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.touch Findprim xmakefile
+usrSIG.c : $(SIG_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.tch findprim xmkfile
 	@ECHO "#** Re-making" $@ because of $?
 	rm -f usrSIG.c
-	./Findprim $(SIG_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usrSIG.c
+	./findprim $(SIG_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usrSIG.c
 
-Sgraph.o Sgraph_xt.o SgX.o : scheme.touch prims.h Sgraph.h
-Sgraph_ar.o : scheme.touch prims.h Sgraph.h array.h
-fft.o : scheme.touch prims.h zones.h array.h image.h
-array.o image.o : scheme.touch prims.h array.h
+sgraph.o sgraph_x.o sgx.o : scheme.tch prims.h sgraph.h
+sgraph_a.o : scheme.tch prims.h sgraph.h array.h
+fft.o : scheme.tch prims.h zones.h array.h image.h
+array.o image.o : scheme.tch prims.h array.h
 
-d_Sgraph_ar.o : scheme.touch prims.h Sgraph.h array.h
+d_Sgraph_ar.o : scheme.tch prims.h Sgraph.h array.h
 	$(CC) $(CFLAGS)  -DREAL_IS_DEFINED_DOUBLE=1 -c $*.c
 
-d_fft.o : scheme.touch prims.h zones.h array.h image.h
+d_fft.o : scheme.tch prims.h zones.h array.h image.h
 	$(CC) $(CFLAGS)  -DREAL_IS_DEFINED_DOUBLE=1 -c $*.c
 
-d_array.o d_image.o : scheme.touch prims.h array.h
+d_array.o d_image.o : scheme.tch prims.h array.h
 	$(CC) $(CFLAGS)  -DREAL_IS_DEFINED_DOUBLE=1 -c $*.c
 
 
-d_Sgraph_ar.c : Sgraph_ar.c
-	ln -f -s Sgraph_ar.c d_Sgraph_ar.c
+d_sgraph_ar.c : sgraph_ar.c
+	ln -f -s sgraph_ar.c d_sgraph_ar.c
 
 d_fft.c : fft.c
 	ln -f -s fft.c d_fft.c
diff --git a/v7/src/microcode/unxutl/y800.lcl b/v7/src/microcode/unxutl/y800.lcl
index 00919423f..cafb96d3d 100644
--- a/v7/src/microcode/unxutl/y800.lcl
+++ b/v7/src/microcode/unxutl/y800.lcl
@@ -1,13 +1,13 @@
 /* -*- C -*-
    Switzerland local additions to the makefile
-   $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/unxutl/Attic/y800.lcl,v 1.1 1991/11/04 17:20:12 jinx Exp $
+   $Id: y800.lcl,v 1.2 1993/06/24 06:44:06 gjr Exp $
  */
 
 COMMON_OBJECTS = $(CORE_OBJECTS) $(STD_GC_OBJECTS) $(UNIX_OBJECTS) $(OS_PRIM_OBJECTS)
 
 world: all
 
-everything: world Ppband
+everything: world ppband
 
 install.world: install
 
diff --git a/v7/src/microcode/unxutl/ymkfile b/v7/src/microcode/unxutl/ymkfile
index b0c889751..ac6c56a19 100644
--- a/v7/src/microcode/unxutl/ymkfile
+++ b/v7/src/microcode/unxutl/ymkfile
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ymkfile,v 1.67 1993/06/15 18:59:34 gjr Exp $
+$Id: ymkfile,v 1.68 1993/06/24 06:49:03 gjr Exp $
 
 Copyright (c) 1989-1993 Massachusetts Institute of Technology
 
@@ -167,12 +167,12 @@ GRAPHICS_LIBS =
 #if (PROC_TYPE == PROC_TYPE_68020)
 #define PROC_TYPE_KNOWN
 MACHINE_SWITCHES =
-MACHINE_SOURCES = cmpint.c cmpaux-mc68k.m4
-MACHINE_OBJECTS = cmpint.o cmpaux-mc68k.o
-GC_HEAD_FILES = gccode.h cmpgc.h cmpint-mc68k.h
+MACHINE_SOURCES = cmpint.c cmpauxmd.m4
+MACHINE_OBJECTS = cmpint.o cmpauxmd.o
+GC_HEAD_FILES = gccode.h cmpgc.h cmpintmd.h
 
-cmpaux-mc68k.o : cmpaux-mc68k.s
-cmpaux-mc68k.s : cmpaux-mc68k.m4 xmakefile
+cmpauxmd.o : cmpauxmd.s
+cmpauxmd.s : cmpauxmd.m4 xmkfile
 
 #endif /* PROC_TYPE_68020 */
 
@@ -187,12 +187,12 @@ GC_HEAD_FILES = gccode.h cmpgc.h
 #if (PROC_TYPE == PROC_TYPE_VAX)
 #define PROC_TYPE_KNOWN
 MACHINE_SWITCHES =
-MACHINE_SOURCES = cmpint.c cmpaux-vax.m4
-MACHINE_OBJECTS = cmpint.o cmpaux-vax.o
-GC_HEAD_FILES = gccode.h cmpgc.h cmpint-vax.h
+MACHINE_SOURCES = cmpint.c cmpauxmd.m4
+MACHINE_OBJECTS = cmpint.o cmpauxmd.o
+GC_HEAD_FILES = gccode.h cmpgc.h cmpintmd.h
 
-cmpaux-vax.o : cmpaux-vax.s
-cmpaux-vax.s : cmpaux-vax.m4 xmakefile
+cmpauxmd.o : cmpauxmd.s
+cmpauxmd.s : cmpauxmd.m4 xmkfile
 
 #endif /* PROC_TYPE_VAX */
 
@@ -200,13 +200,13 @@ cmpaux-vax.s : cmpaux-vax.m4 xmakefile
 #define PROC_TYPE_KNOWN
 #undef hppa
 MACHINE_SWITCHES =
-MACHINE_SOURCES = cmpint.c cmpaux-hppa.m4
-MACHINE_OBJECTS = cmpint.o cmpaux-hppa.o
-GC_HEAD_FILES = gccode.h cmpgc.h cmpint-hppa.h hppacache.h
-XTRA_TARGETS = hppacache
+MACHINE_SOURCES = cmpint.c cmpauxmd.m4
+MACHINE_OBJECTS = cmpint.o cmpauxmd.o
+GC_HEAD_FILES = gccode.h cmpgc.h cmpintmd.h hppacach.h
+XTRA_TARGETS = hppacach
 
-cmpaux-hppa.o : cmpaux-hppa.s
-cmpaux-hppa.s : cmpaux-hppa.m4 xmakefile
+cmpauxmd.o : cmpauxmd.s
+cmpauxmd.s : cmpauxmd.m4 xmkfile
 
 #endif /* PROC_TYPE_HPPA */
 
@@ -214,12 +214,12 @@ cmpaux-hppa.s : cmpaux-hppa.m4 xmakefile
 #define PROC_TYPE_KNOWN
 #undef mips
 MACHINE_SWITCHES =
-MACHINE_SOURCES = cmpint.c cmpaux-mips.m4
-MACHINE_OBJECTS = cmpint.o cmpaux-mips.o
-GC_HEAD_FILES = gccode.h cmpgc.h cmpint-mips.h
+MACHINE_SOURCES = cmpint.c cmpauxmd.m4
+MACHINE_OBJECTS = cmpint.o cmpauxmd.o
+GC_HEAD_FILES = gccode.h cmpgc.h cmpintmd.h
 
-cmpaux-mips.o : cmpaux-mips.s
-cmpaux-mips.s : cmpaux-mips.m4 xmakefile
+cmpauxmd.o : cmpauxmd.s
+cmpauxmd.s : cmpauxmd.m4 xmkfile
 
 #endif /* PROC_TYPE_MIPS */
 
@@ -227,38 +227,38 @@ cmpaux-mips.s : cmpaux-mips.m4 xmakefile
 #define PROC_TYPE_KNOWN
 #undef i386
 MACHINE_SWITCHES =
-MACHINE_SOURCES = cmpint.c cmpaux-i386.m4
-MACHINE_OBJECTS = cmpint.o cmpaux-i386.o
-GC_HEAD_FILES = gccode.h cmpgc.h cmpint-i386.h
+MACHINE_SOURCES = cmpint.c cmpauxmd.m4
+MACHINE_OBJECTS = cmpint.o cmpauxmd.o
+GC_HEAD_FILES = gccode.h cmpgc.h cmpintmd.h
 
-cmpaux-i386.o : cmpaux-i386.s
-cmpaux-i386.s : cmpaux-i386.m4 xmakefile
+cmpauxmd.o : cmpauxmd.s
+cmpauxmd.s : cmpauxmd.m4 xmkfile
 
 #endif /* PROC_TYPE_I386 */
 
 #if (PROC_TYPE == PROC_TYPE_ALPHA)
 #define PROC_TYPE_KNOWN
 MACHINE_SWITCHES =
-MACHINE_SOURCES = cmpint.c cmpaux-alpha.m4
-MACHINE_OBJECTS = cmpint.o cmpaux-alpha.o
-GC_HEAD_FILES = gccode.h cmpgc.h cmpint-alpha.h
+MACHINE_SOURCES = cmpint.c cmpauxmd.m4
+MACHINE_OBJECTS = cmpint.o cmpauxmd.o
+GC_HEAD_FILES = gccode.h cmpgc.h cmpintmd.h
 
-cmpaux-alpha.o : cmpaux-alpha.s
-cmpaux-alpha.s : cmpaux-alpha.m4 xmakefile
+cmpauxmd.o : cmpauxmd.s
+cmpauxmd.s : cmpauxmd.m4 xmkfile
 
 #endif /* PROC_TYPE_ALPHA */
 
 #if (PROC_TYPE == PROC_TYPE_LIARC)
 #define PROC_TYPE_KNOWN
 
-#include "ymake.cclist"
+#include "ymake.ccl"
 
 COMPILED_OBJECTS = $(COMPILED_SOURCES:.c=.o)
 
 MACHINE_SWITCHES = -DNATIVE_CODE_IS_C
-MACHINE_SOURCES = cmpint.c cmpaux-C.c compinit.c $(COMPILED_SOURCES)
-MACHINE_OBJECTS = cmpint.o cmpaux-C.o compinit.o $(COMPILED_OBJECTS)
-GC_HEAD_FILES = gccode.h cmpgc.h cmpint-C.h
+MACHINE_SOURCES = cmpint.c cmpauxmd.c compinit.c $(COMPILED_SOURCES)
+MACHINE_OBJECTS = cmpint.o cmpauxmd.o compinit.o $(COMPILED_OBJECTS)
+GC_HEAD_FILES = gccode.h cmpgc.h cmpintmd.h
 LIARC_HEAD_FILES = \
 ansidecl.h \
 config.h \
@@ -271,21 +271,22 @@ const.h \
 interp.h \
 prim.h \
 $(GC_HEAD_FILES)
-cmpaux-C.o : cmpaux-C.c liarc.touch bignum.h
-compinit.o : compinit.c liarc.touch compinit.h
-/* The following includes liarc.touch in case COMPILED_SOURCES is empty,
+cmpauxmd.o : cmpauxmd.c liarc.tch bignum.h
+compinit.o : compinit.c liarc.tch compinit.h
+/* The following includes liarc.tch in case COMPILED_SOURCES is empty,
    to prevent fgrep from reading stdin.
  */
-compinit.h : $(COMPILED_SOURCES) liarc.touch xmakefile
+compinit.h : $(COMPILED_SOURCES) liarc.tch xmkfile
 	@echo "#*** Generating" $@ "because of" $?
 	rm -f $@
-	fgrep DECLARE_COMPILED_CODE liarc.touch $(COMPILED_SOURCES) | \
+	fgrep DECLARE_COMPILED_CODE liarc.tch $(COMPILED_SOURCES) | \
 	sed -e 's/.*:/  /' -e 's/)/);' > $@
 
-$(COMPILED_OBJECTS) : liarc.touch
-liarc.touch: liarc.h $(LIARC_HEAD_FILES)
+$(COMPILED_OBJECTS) : liarc.tch
+liarc.tch: liarc.h $(LIARC_HEAD_FILES)
 	@echo "#** Generating" $@ because of $?
-	touch liarc.touch
+	rm -f $@
+	echo "touch" > $@
 
 #endif /* PROC_TYPE_LIARC */
 
@@ -354,7 +355,7 @@ CFLAGS = -DMIT_SCHEME C_OPTIMIZE_SWITCH C_DEBUG_SWITCH C_SWITCH_MACHINE C_SWITCH
 	$(CC) $(CFLAGS) -c $*.c
 
 .c.cpp: ; @ECHO "#** Generating" $@
-	make -f xmakefile Breakup
+	make -f xmkfile Breakup
 	$(CC) $(CFLAGS) -E $*.c | \
 	RUN(Breakup) | \
 	sed -e 's/^#.*//' -e 's/^[ 	]*$$//' -e 's/^$$//' | \
@@ -405,6 +406,7 @@ obstack.c \
 option.c \
 osscheme.c \
 ostty.c \
+outf.c \
 prim.c \
 primutl.c \
 prmcon.c \
@@ -467,7 +469,7 @@ pruxfs.c \
 pruxio.c \
 pruxsock.c
 
-HEAD_FILES = scheme.touch prims.h zones.h locks.h bignum.h \
+HEAD_FILES = scheme.tch prims.h zones.h locks.h bignum.h \
 	$(GC_HEAD_FILES) trap.h lookup.h history.h cmpint.h
 
 CORE_OBJECTS = \
@@ -500,6 +502,7 @@ obstack.o \
 option.o \
 osscheme.o \
 ostty.o \
+outf.o \
 prim.o \
 primutl.o \
 prmcon.o \
@@ -569,7 +572,7 @@ BCHOBJECTS = $(CORE_OBJECTS) $(BCH_GC_OBJECTS) $(UNIX_OBJECTS) $(OS_PRIM_OBJECTS
 
 /* Construction rules. */
 
-all: Bintopsb Psbtobin scheme bchscheme bchdrn $(XTRA_TARGETS)
+all: bintopsb psbtobin scheme bchscheme bchdrn $(XTRA_TARGETS)
 
 scheme xscheme : $(OBJECTS) $(SCHEME_OBJECTS)
 	@ECHO "#** Re-linking" $@ because of $?
@@ -586,27 +589,27 @@ bchdrn : bchdrn.o bchutl.o
 	rm -f $@
 	$(CC) $(LDFLAGS) -o $@ bchdrn.o bchutl.o
 
-Findprim : Findprim.o
+findprim : findprim.o
 	@ECHO "#** Re-linking" $@ because of $?
-	$(CC) $(LDFLAGS) -o $@ Findprim.o
+	$(CC) $(LDFLAGS) -o $@ findprim.o
 
-Bintopsb : Bintopsb.o missing.o
+bintopsb : bintopsb.o missing.o
 	@ECHO "#** Re-linking" $@ because of $?
-	$(CC) $(LDFLAGS) -o $@ Bintopsb.o missing.o LIB_MATH
+	$(CC) $(LDFLAGS) -o $@ bintopsb.o missing.o LIB_MATH
 
-Psbtobin : Psbtobin.o missing.o
+psbtobin : psbtobin.o missing.o
 	@ECHO "#** Re-linking" $@ because of $?
-	$(CC) $(LDFLAGS) -o $@ Psbtobin.o missing.o LIB_MATH
+	$(CC) $(LDFLAGS) -o $@ psbtobin.o missing.o LIB_MATH
 
-Breakup : Breakup.o
+breakup : breakup.o
 	@ECHO "#** Re-linking" $@ because of $?
-	$(CC) $(LDFLAGS) -o $@ Breakup.o
+	$(CC) $(LDFLAGS) -o $@ breakup.o
 
-Wsize : Wsize.o
+wsize : wsize.o
 	@ECHO "#** Re-linking" $@ because of $?
-	$(CC) $(LDFLAGS) -o $@ Wsize.o LIB_MATH LIBS_SYSTEM LIBS_MACHINE LIB_DEBUG LIB_STANDARD
+	$(CC) $(LDFLAGS) -o $@ wsize.o LIB_MATH LIBS_SYSTEM LIBS_MACHINE LIB_DEBUG LIB_STANDARD
 
-Ppband : Ppband.o
+ppband : ppband.o
 	@ECHO "#** Re-linking" $@ because of $?
 	$(CC) $(LDFLAGS) -o $@ Ppband.o
 
@@ -626,23 +629,23 @@ usrdef.txt :
 	RUN(make_vmslist) usrdef.txt $(SCHEME_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES)
 
 vmsusrdef.c :
-	echo "$$ Findprim -o usrdef.c -l [-.vms]usrdef.txt"
+	echo "$$ findprim -o usrdef.c -l [-.vms]usrdef.txt"
 	$(CC) $(CFLAGS) -c usrdef.c
 
-usrdef.c : $(SCHEME_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.touch Findprim xmakefile
+usrdef.c : $(SCHEME_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.tch findprim xmkfile
 	@ECHO "#** Re-making" $@ because of $?
 	rm -f usrdef.c
-	RUN(Findprim) $(SCHEME_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usrdef.c
+	RUN(findprim) $(SCHEME_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usrdef.c
 
-bchdef.c : $(SCHEME_SOURCES) $(BCHSOURCES) $(OS_PRIM_SOURCES) usrdef.touch Findprim xmakefile
+bchdef.c : $(SCHEME_SOURCES) $(BCHSOURCES) $(OS_PRIM_SOURCES) usrdef.tch findprim xmkfile
 	@ECHO "#** Re-making" $@ because of $?
 	rm -f bchdef.c
-	RUN(Findprim) $(SCHEME_SOURCES) $(BCHSOURCES) $(OS_PRIM_SOURCES) > bchdef.c
+	RUN(findprim) $(SCHEME_SOURCES) $(BCHSOURCES) $(OS_PRIM_SOURCES) > bchdef.c
 
 primitive_tables :
 	rm -f usrdef.c usrdef.o bchdef.c bchdef.o
 
-scheme.touch psbmap.touch usrdef.touch :
+scheme.tch psbmap.tch usrdef.tch :
 	@ECHO "#** Resetting" $@ because of $?
 	rm -f $@
 	/* Create the file by opening rather than using `touch' program.
@@ -650,30 +653,30 @@ scheme.touch psbmap.touch usrdef.touch :
 	   file server's clock is not synchronized with the client's. */
 	echo "touch" > $@
 
-#include "ymake.local"
+#include "ymake.lcl"
 
-/* scheme.touch depends also on butterfly.h rename.c */
-scheme.touch : scheme.h oscond.h ansidecl.h dstack.h obstack.h config.h \
+/* scheme.tch depends also on butterfly.h rename.c */
+scheme.tch : scheme.h oscond.h ansidecl.h dstack.h obstack.h config.h \
 	bkpt.h object.h scode.h sdata.h gc.h interp.h stack.h futures.h \
 	types.h errors.h returns.h const.h fixobj.h default.h extern.h prim.h \
-	intrpt.h critsec.h float.h
-psbmap.touch : config.h object.h bignum.h bignumint.h bitstr.h types.h \
+	intrpt.h critsec.h float.h outf.h
+psbmap.tch : config.h object.h bignum.h bignmint.h bitstr.h types.h \
 	sdata.h const.h psbmap.h $(GC_HEAD_FILES) comlin.h comlin.c
-usrdef.touch : usrdef.h config.h object.h prim.h
+usrdef.tch : usrdef.h config.h object.h prim.h
 
-limits.h : hard-params
+limits.h : hard-par
 	rm -f limits.h
-	RUN(hard-params) -l > limits.h
-float.h : hard-params
+	RUN(hard-par) -l > limits.h
+float.h : hard-par
 	rm -f float.h
-	RUN(hard-params) -f > float.h
-hard-params : hard-params.c
-	$(CC) -DNO_SC $(LDFLAGS) -o hard-params hard-params.c
+	RUN(hard-par) -f > float.h
+hard-par : hard-par.c
+	$(CC) -DNO_SC $(LDFLAGS) -o hard-par hard-par.c
 
-hppacache.o : hppacache.h
+hppacach.o : hppacach.h
 
-hppacache : hppacache.o
-	$(CC) $(CFLAGS) -o hppacache hppacache.o
+hppacach : hppacach.o
+	$(CC) $(CFLAGS) -o hppacach hppacach.o
 
 lint.out : $(SOURCES) $(SCHEME_SOURCES) $(CSRC) usrdef.c $(HEAD_FILES)
 	rm -f lint.out
@@ -684,86 +687,83 @@ lint.out : $(SOURCES) $(SCHEME_SOURCES) $(CSRC) usrdef.c $(HEAD_FILES)
 /* "foo" prevents syntax error when USER_PRIM_OBJECTS is empty. */
 foo $(USER_PRIM_OBJECTS) : $(HEAD_FILES)
 
-interp.o : scheme.touch locks.h trap.h lookup.h history.h cmpint.h zones.h prmcon.h
-hooks.o : scheme.touch prims.h winder.h history.h
-utils.o : scheme.touch prims.h winder.h history.h cmpint.h
-primutl.o : scheme.touch prims.h prename.h
+interp.o : scheme.tch locks.h trap.h lookup.h history.h cmpint.h zones.h prmcon.h
+hooks.o : scheme.tch prims.h winder.h history.h
+utils.o : scheme.tch prims.h winder.h history.h cmpint.h
+primutl.o : scheme.tch prims.h prename.h
 
 hunk.o list.o step.o vector.o sysprim.o daemon.o prim.o extern.o : \
-	scheme.touch prims.h
+	scheme.tch prims.h
 
-lookup.o lookprm.o debug.o intern.o : scheme.touch prims.h lookup.h trap.h locks.h
+lookup.o lookprm.o debug.o intern.o : scheme.tch prims.h lookup.h trap.h locks.h
 
-fasload.o : scheme.touch prims.h osscheme.h osfile.h osio.h $(GC_HEAD_FILES) \
+fasload.o : scheme.tch prims.h osscheme.h osfile.h osio.h $(GC_HEAD_FILES) \
 	trap.h option.h prmcon.h load.c fasl.h
-fasdump.o : scheme.touch prims.h osio.h osfile.h osfs.h $(GC_HEAD_FILES) \
+fasdump.o : scheme.tch prims.h osio.h osfile.h osfs.h $(GC_HEAD_FILES) \
 	trap.h lookup.h fasl.h dump.c
 
-memmag.o : scheme.touch prims.h $(GC_HEAD_FILES)
-gcloop.o : scheme.touch $(GC_HEAD_FILES)
-purify.o : scheme.touch prims.h $(GC_HEAD_FILES) zones.h
-purutl.o : scheme.touch prims.h $(GC_HEAD_FILES) zones.h
-comutl.o : scheme.touch prims.h
+memmag.o : scheme.tch prims.h $(GC_HEAD_FILES)
+gcloop.o : scheme.tch $(GC_HEAD_FILES)
+purify.o : scheme.tch prims.h $(GC_HEAD_FILES) zones.h
+purutl.o : scheme.tch prims.h $(GC_HEAD_FILES) zones.h
+comutl.o : scheme.tch prims.h
 gctype.o : config.h
 
-artutl.o : scheme.touch
-bignum.o : scheme.touch bignumint.h limits.h
-bigprm.o flonum.o intprm.o : scheme.touch prims.h zones.h
-generic.o : scheme.touch prims.h
-fixnum.o : scheme.touch prims.h mul.c
+artutl.o : scheme.tch
+bignum.o : scheme.tch bignmint.h limits.h
+bigprm.o flonum.o intprm.o : scheme.tch prims.h zones.h
+generic.o : scheme.tch prims.h
+fixnum.o : scheme.tch prims.h mul.c
 
-storage.o : scheme.touch gctype.c
+storage.o : scheme.tch gctype.c
 
-char.o string.o dfloat.o : scheme.touch prims.h
-tterm.o : scheme.touch prims.h osterm.h
+char.o string.o dfloat.o : scheme.tch prims.h
+tterm.o : scheme.tch prims.h osterm.h
 
-boot.o : scheme.touch prims.h version.h option.h ostop.h
+boot.o : scheme.tch prims.h version.h option.h ostop.h os.h
 option.o : ansidecl.h obstack.h config.h osenv.h
-term.o : scheme.touch
+term.o : scheme.tch
 missing.o : config.h
 
 BCHGCC_H = bchgcc.h oscond.h $(GC_HEAD_FILES)
-bchdmp.o : scheme.touch prims.h uxio.h osio.h osfile.h trap.h lookup.h \
+bchdmp.o : scheme.tch prims.h uxio.h osio.h osfile.h trap.h lookup.h \
 	$(BCHGCC_H) fasl.h dump.c
 bchdrn.o : ansidecl.h bchdrn.h
-bchmmg.o : scheme.touch prims.h ux.h $(BCHGCC_H) option.h bchdrn.h
-bchgcl.o : scheme.touch $(BCHGCC_H)
-bchpur.o : scheme.touch prims.h $(BCHGCC_H) zones.h
+bchmmg.o : scheme.tch prims.h ux.h $(BCHGCC_H) option.h bchdrn.h
+bchgcl.o : scheme.tch $(BCHGCC_H)
+bchpur.o : scheme.tch prims.h $(BCHGCC_H) zones.h
 bchutl.o : ansidecl.h
 
-syntax.o : scheme.touch prims.h edwin.h syntax.h
-bitstr.o : scheme.touch prims.h bitstr.h
-regex.o : scheme.touch syntax.h regex.h
-rgxprim.o : scheme.touch prims.h edwin.h syntax.h regex.h
+syntax.o : scheme.tch prims.h edwin.h syntax.h
+bitstr.o : scheme.tch prims.h bitstr.h
+regex.o : scheme.tch syntax.h regex.h
+rgxprim.o : scheme.tch prims.h edwin.h syntax.h regex.h
 
-Bintopsb.o : psbmap.touch trap.h limits.h fasl.h load.c bltdef.h
-Psbtobin.o : psbmap.touch float.h fasl.h dump.c
+Bintopsb.o : psbmap.tch trap.h limits.h fasl.h load.c bltdef.h
+Psbtobin.o : psbmap.tch float.h fasl.h dump.c
 Ppband.o : ansidecl.h config.h errors.h types.h const.h object.h \
         $(GC_HEAD_FILES) sdata.h load.c fasl.h
 Wsize.o : config.h
 
-dmpwrld.o : scheme.touch prims.h ux.h osfs.h \
-	unexec.c unexhp9k800.c getpagesize.h
+dmpwrld.o : scheme.tch prims.h ux.h osfs.h \
+	unexec.c unexhppa.c getpgsz.h
 
-x11base.o x11color.o x11graph.o x11term.o starbasex.o : scheme.touch prims.h \
+x11base.o x11color.o x11graph.o x11term.o starbasx.o : scheme.tch prims.h \
 	x11.h
 x11base.o : ux.h uxselect.h
-starbase.o : scheme.touch prims.h
+starbase.o : scheme.tch prims.h
 
-cmpint.o : scheme.touch prim.h $(GC_HEAD_FILES)
-cmpaux-hppa.s : cmpaux-hppa.m4
-cmpaux-mc68k.s : cmpaux-mc68k.m4
-cmpaux-vax.s : cmpaux-vax.m4
+cmpint.o : scheme.tch prim.h $(GC_HEAD_FILES)
 
-osscheme.o : scheme.touch posixtype.h os.h osscheme.h
-ostty.o : ansidecl.h oscond.h posixtype.h os.h ostty.h osscheme.h
+osscheme.o : scheme.tch posixtyp.h os.h osscheme.h
+ostty.o : ansidecl.h oscond.h posixtyp.h os.h ostty.h osscheme.h
 
-error.o ptrvec.o transact.o : ansidecl.h dstack.h
+error.o ptrvec.o transact.o : ansidecl.h dstack.h outf.h
 wind.o : ansidecl.h dstack.h obstack.h
 obstack.o : obstack.h
 
 $(UNIX_OBJECTS) pruxenv.o pruxfs.o pruxio.o pruxsock.o : oscond.h ansidecl.h \
-       posixtype.h intext.h dstack.h os.h osscheme.h ux.h
+       posixtyp.h intext.h dstack.h os.h osscheme.h ux.h
 uxctty.o : osctty.h ossig.h
 uxenv.o : osenv.h
 uxfile.o : osfile.h osio.h uxio.h
@@ -774,14 +774,14 @@ uxsig.o : ossig.h osctty.h ostty.h uxtrap.h uxutil.h critsec.h
 uxsock.o : uxsock.h osio.h uxio.h prims.h
 uxterm.o : osterm.h uxterm.h osio.h uxio.h ospty.h
 uxtop.o : ostop.h uxtop.h osctty.h uxutil.h errors.h option.h
-uxtrap.o : scheme.touch uxtrap.h uxutil.h option.h $(GC_HEAD_FILES)
+uxtrap.o : scheme.tch uxtrap.h uxutil.h option.h $(GC_HEAD_FILES)
 uxtty.o : ostty.h osenv.h osio.h uxio.h osterm.h uxterm.h
 uxutil.o : uxutil.h
 pruxfs.o : osfs.h
 pruxio.o : osio.h uxselect.h
 pruxsock.o : osio.h uxsock.h
 
-$(OS_PRIM_OBJECTS) : scheme.touch prims.h posixtype.h os.h
+$(OS_PRIM_OBJECTS) : scheme.tch prims.h posixtyp.h os.h
 prosenv.o : osenv.h ostop.h
 prosfile.o : osfile.h
 prosfs.o : osfs.h
@@ -791,5 +791,5 @@ prospty.o : osterm.h osio.h ospty.h
 prosterm.o : osterm.h osio.h
 prostty.o : ostty.h osctty.h osfile.h osio.h
 
-prmcon.o : scheme.touch prims.h prmcon.h
+prmcon.o : scheme.tch prims.h prmcon.h
 
diff --git a/v7/src/microcode/unxutl/ynws3250.lcl b/v7/src/microcode/unxutl/ynws3250.lcl
index 567912529..a8ff807de 100644
--- a/v7/src/microcode/unxutl/ynws3250.lcl
+++ b/v7/src/microcode/unxutl/ynws3250.lcl
@@ -1,6 +1,6 @@
 /* -*- C -*-
    Switzerland local additions to the makefile
-   $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/unxutl/Attic/ynws3250.lcl,v 1.1 1992/12/07 22:15:13 cph Exp $
+   $Id: ynws3250.lcl,v 1.2 1993/06/24 06:45:27 gjr Exp $
  */
 
 COMMON_OBJECTS = $(CORE_OBJECTS) $(STD_GC_OBJECTS) $(UNIX_OBJECTS) $(OS_PRIM_OBJECTS)
@@ -16,7 +16,7 @@ SIG_LIB =  $(USER_LIBS) $(X_LIB) $(TERMCAP_LIBS)\
 
 world: all scmsig
 
-everything: world Ppband
+everything: world ppband
 
 install.world: install scmsig
 	-mv -f $(BINDIR)/scmsig $(BINDIR)/scmsig.busy
@@ -28,7 +28,7 @@ scmsig : $(COMMON_OBJECTS) $(SIG_OBJECTS)
 	rm -f $@
 	$(CC) $(LDFLAGS) -o $@ $(COMMON_OBJECTS) $(SIG_OBJECTS) $(SIG_LIB)
 
-usrSIG.c : $(SIG_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.touch Findprim xmakefile
+usrSIG.c : $(SIG_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.tch findprim xmkfile
 	@ECHO "#** Re-making" $@ because of $?
 	rm -f usrSIG.c
-	./Findprim $(SIG_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usrSIG.c
+	./findprim $(SIG_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usrSIG.c
diff --git a/v7/src/microcode/utils.c b/v7/src/microcode/utils.c
index 967d3bb84..a9e01bbd0 100644
--- a/v7/src/microcode/utils.c
+++ b/v7/src/microcode/utils.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: utils.c,v 9.56 1993/02/23 02:38:36 gjr Exp $
+$Id: utils.c,v 9.57 1993/06/24 06:32:28 gjr Exp $
 
 Copyright (c) 1987-1993 Massachusetts Institute of Technology
 
@@ -57,14 +57,12 @@ DEFUN (Setup_Interrupt, (Masked_Interrupts), long Masked_Interrupts)
 
   if (!(VECTOR_P (Int_Vector)))
   {
-    fprintf (stderr,
-	     "\nInvalid handlers vector (0x%lx)\n", Int_Vector);
+    outf_fatal ("\nInvalid handlers vector (0x%lx)\n", Int_Vector);
 lose_big:
-    fprintf (stderr,
-	     "Interrupts = 0x%08lx, Mask = 0x%08lx, Masked = 0x%08lx\n",
-	     FETCH_INTERRUPT_CODE(),
-	     FETCH_INTERRUPT_MASK(),
-	     Masked_Interrupts);
+    outf_fatal("Interrupts = 0x%08lx, Mask = 0x%08lx, Masked = 0x%08lx\n",
+	       FETCH_INTERRUPT_CODE(),
+	       FETCH_INTERRUPT_MASK(),
+	       Masked_Interrupts);
     Microcode_Termination (TERM_NO_INTERRUPT_HANDLER);
   }
 
@@ -94,9 +92,8 @@ lose_big:
   /* Handle case where interrupt vector is too small. */
   if (Int_Number >= (VECTOR_LENGTH (Int_Vector)))
   {
-    fprintf (stderr,
-	     "\nInterrupt out of range: %ld (vector length = %ld)\n",
-	     Int_Number, (VECTOR_LENGTH (Int_Vector)));
+    outf_fatal("\nInterrupt out of range: %ld (vector length = %ld)\n",
+	       Int_Number, (VECTOR_LENGTH (Int_Vector)));
     goto lose_big;
   }
 
@@ -131,14 +128,14 @@ Passed_Checks:	/* This label may be used in Global_Interrupt_Hook */
 /* Error processing utilities */
 
 void
-DEFUN (err_print, (error_code, where), long error_code AND FILE * where)
+DEFUN (err_print, (error_code, where), long error_code AND outf_channel where)
 {
   extern char * Error_Names [];
 
   if (error_code > MAX_ERROR)
-    fprintf (where, "Unknown error code 0x%lx.\n", error_code);
+    outf (where, "Unknown error code 0x%lx.\n", error_code);
   else
-    fprintf (where, "Error code 0x%lx (%s).\n",
+    outf (where, "Error code 0x%lx (%s).\n",
 	     error_code,
 	     (Error_Names [error_code]));
   return;
@@ -151,10 +148,10 @@ void
 DEFUN (error_death, (code, message), long code AND char * message)
 {
   death_blow = code;
-  fprintf (stderr, "\nMicrocode Error: %s.\n", message);
-  err_print (code, stderr);
-  fprintf (stderr, "\n**** Stack Trace ****\n\n");
-  Back_Trace (stderr);
+  outf_fatal ("\nMicrocode Error: %s.\n", message);
+  err_print (code, fatal_output);
+  outf_error ("\n**** Stack Trace ****\n\n");
+  Back_Trace (error_output);
   termination_no_error_handler ();
   /*NOTREACHED*/
 }
@@ -162,7 +159,7 @@ DEFUN (error_death, (code, message), long code AND char * message)
 void
 DEFUN_VOID (Stack_Death)
 {
-  fprintf (stderr, "\nWill_Push vs. Pushed inconsistency.\n");
+  outf_fatal("\nWill_Push vs. Pushed inconsistency.\n");
   Microcode_Termination (TERM_BAD_STACK);
   /*NOTREACHED*/
 }
@@ -194,8 +191,8 @@ DEFUN_VOID (back_out_of_primitive_internal)
   primitive = (Regs [REGBLOCK_PRIMITIVE]);
   if (! (PRIMITIVE_P (primitive)))
     {
-      fprintf (stderr,
-	       "\nback_out_of_primitive backing out when not in primitive!\n");
+      outf_fatal(
+	      "\nback_out_of_primitive backing out when not in primitive!\n");
       Microcode_Termination (TERM_BAD_BACK_OUT);
     }
   nargs = (PRIMITIVE_N_ARGUMENTS (primitive));
@@ -238,9 +235,8 @@ DEFUN_VOID (canonicalize_primitive_context)
   primitive = (Regs [REGBLOCK_PRIMITIVE]);
   if (! (PRIMITIVE_P (primitive)))
     {
-      fprintf
-	(stderr,
-	 "\ncanonicalize_primitive_context invoked when not in primitive!\n");
+      outf_fatal
+	("\ncanonicalize_primitive_context invoked when not in primitive!\n");
       Microcode_Termination (TERM_BAD_BACK_OUT);
     }
   nargs = (PRIMITIVE_N_ARGUMENTS (primitive));
@@ -456,20 +452,20 @@ DEFUN (Do_Micro_Error, (Err, From_Pop_Return),
 
   if (Consistency_Check)
   {
-    err_print(Err, stdout);
+    err_print(Err, error_output);
     Print_Expression(Fetch_Expression(), "Expression was");
-    printf ("\nEnvironment 0x%lx (#%lo).\n",
+    outf_error ("\nEnvironment 0x%lx (#%lo).\n",
 	    ((long) (Fetch_Env ())), ((long) (Fetch_Env ())));
     Print_Return("Return code");
-    printf("\n");
+    outf_error ("\n");
   }
 
   Error_Exit_Hook();
 
   if (Trace_On_Error)
   {
-    printf("\n\n**** Stack Trace ****\n\n");
-    Back_Trace(stdout);
+    outf_error ("\n\n**** Stack Trace ****\n\n");
+    Back_Trace (error_output);
   }
 
 #ifdef ENABLE_DEBUGGING_TOOLS
@@ -732,7 +728,7 @@ DEFUN (Restore_History, (hist_obj), SCHEME_OBJECT hist_obj)
   }
   else if (new_hist == SHARP_T)
   {
-    fprintf(stderr, "\nBad history to restore.\n");
+    outf_fatal ("\nBad history to restore.\n");
     Microcode_Termination (TERM_EXIT);
     /*NOTREACHED*/
   }
@@ -764,17 +760,16 @@ DEFUN (primitive_apply_internal, (primitive), SCHEME_OBJECT primitive)
       {
 	int arity = (PRIMITIVE_N_ARGUMENTS (primitive));
 	Print_Expression (primitive, "Stack bad after ");
-	fprintf (stderr, "\nStack was 0x%lx, now 0x%lx, #args=%ld.\n",
-		 ((long) saved_stack), ((long) Stack_Pointer), ((long) arity));
-	fflush (stderr);
+	outf_fatal ("\nStack was 0x%lx, now 0x%lx, #args=%ld.\n",
+		    ((long) saved_stack), ((long) Stack_Pointer), ((long) arity));
 	Microcode_Termination (TERM_EXIT);
       }
   }
   if (Primitive_Debug)
     {
       Print_Expression (result, "Primitive Result");
-      putc ('\n', stderr);
-      fflush (stderr);
+      outf_error("\n");
+      outf_flush_error();
     }
   return (result);
 }
@@ -887,7 +882,7 @@ DEFUN (Find_State_Space, (State_Point), SCHEME_OBJECT State_Point)
 #ifdef ENABLE_DEBUGGING_TOOLS
     if (Point == SHARP_F)
     {
-      fprintf(stderr,
+      outf_fatal(
 	      "\nState_Point 0x%lx wrong: count was %ld, #F at %ld\n",
 	      ((long) State_Point), ((long) How_Far), ((long) i));
       Microcode_Termination(TERM_EXIT);
@@ -985,8 +980,8 @@ DEFUN (Translate_To_Point, (Target), SCHEME_OBJECT Target)
 #ifdef ENABLE_DEBUGGING_TOOLS
   if (Merge_Depth < 0)
   {
-    fprintf(stderr, "\nMerge_Depth went negative: %d\n", Merge_Depth);
-    Microcode_Termination(TERM_EXIT);
+    outf_fatal("\nMerge_Depth went negative: %d\n", Merge_Depth);
+    Microcode_Termination (TERM_EXIT);
   }
 #endif /* ENABLE_DEBUGGING_TOOLS */
 
diff --git a/v7/src/microcode/ux.h b/v7/src/microcode/ux.h
index 9d8362609..034d4634f 100644
--- a/v7/src/microcode/ux.h
+++ b/v7/src/microcode/ux.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ux.h,v 1.46 1993/06/15 19:00:20 gjr Exp $
+$Id: ux.h,v 1.47 1993/06/24 06:34:39 gjr Exp $
 
 Copyright (c) 1988-1993 Massachusetts Institute of Technology
 
@@ -41,7 +41,7 @@ MIT in each case. */
 
 #include "oscond.h"
 #include "ansidecl.h"
-#include "posixtype.h"
+#include "posixtyp.h"
 
 #ifndef _POSIX			/* Prevent multiple inclusion */
 # include <sys/times.h>
@@ -55,10 +55,6 @@ MIT in each case. */
 #include <pwd.h>
 #include <grp.h>
 
-#include "oscond.h"
-#include "ansidecl.h"
-#include "posixtype.h"
-
 extern int errno;
 
 /* These seem to be missing from versions of unistd.h */
diff --git a/v7/src/microcode/uxsig.c b/v7/src/microcode/uxsig.c
index 5bd8ed6b0..63e32fc05 100644
--- a/v7/src/microcode/uxsig.c
+++ b/v7/src/microcode/uxsig.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: uxsig.c,v 1.25 1993/02/21 00:00:58 gjr Exp $
+$Id: uxsig.c,v 1.26 1993/06/24 06:35:59 gjr Exp $
 
 Copyright (c) 1990-1993 Massachusetts Institute of Technology
 
@@ -1138,7 +1138,7 @@ DEFUN_VOID (interactive_back_trace)
   }
   INTERACTIVE_NEWLINE ();
   if ((strlen (&input_string[0])) == 0)
-    debug_back_trace (stdout);
+    debug_back_trace (console_output);
   else
   {
     transaction_begin ();
@@ -1146,19 +1146,19 @@ DEFUN_VOID (interactive_back_trace)
       FILE * to_dump = (fopen (&input_string[0], "w"));
       if (to_dump == ((FILE *) NULL))
       {
-	printf ("Error opening \"%s\".\n", (&input_string[0]));
+	outf_error ("Error opening \"%s\".\n", (&input_string[0]));
 	transaction_abort ();
 	return;
       }
       transaction_record_action (tat_always,
 				 eta_fclose,
 				 ((PTR) to_dump));
-      fprintf (stdout, "Writing the stack trace to file \"%s\" -- ",
-	       &input_string[0]);
-      fflush (stdout);
-      debug_back_trace (to_dump);
-      fputs ("Done.\n", stdout);
-      fflush (stdout);
+      outf_console ("Writing the stack trace to file \"%s\" -- ",
+                    &input_string[0]);
+      outf_flush_console ();
+      debug_back_trace ((outf_channel) to_dump);
+      outf_console ("Done.\n");
+      outf_flush_console ();
     }
     transaction_commit ();
   }
diff --git a/v7/src/microcode/wind.c b/v7/src/microcode/wind.c
index 834fe8603..abd30cb53 100644
--- a/v7/src/microcode/wind.c
+++ b/v7/src/microcode/wind.c
@@ -14,11 +14,12 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/wind.c,v 1.4 1991/07/06 21:42:41 cph Exp $ */
+/* $Id: wind.c,v 1.5 1993/06/24 06:37:10 gjr Exp $ */
 
 #include <stdio.h>
 #include "obstack.h"
 #include "dstack.h"
+#include "outf.h"
 extern void EXFUN (free, (PTR ptr));
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free free
@@ -31,8 +32,8 @@ DEFUN (error, (procedure_name, message),
        CONST char * procedure_name AND
        CONST char * message)
 {
-  fprintf (stderr, "%s: %s\n", procedure_name, message);
-  fflush (stderr);
+  outf_fatal ("%s: %s\n", procedure_name, message);
+  outf_flush_fatal ();
   abort ();
 }
 
diff --git a/v7/src/microcode/xdebug.c b/v7/src/microcode/xdebug.c
index db171b0a3..a59b63dca 100644
--- a/v7/src/microcode/xdebug.c
+++ b/v7/src/microcode/xdebug.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: xdebug.c,v 9.31 1992/11/24 23:14:38 gjr Exp $
+$Id: xdebug.c,v 9.32 1993/06/24 06:38:10 gjr Exp $
 
-Copyright (c) 1987-1992 Massachusetts Institute of Technology
+Copyright (c) 1987-1993 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -122,7 +122,7 @@ DEFUN (Find_In_Area, (Name, From, To, Obj, Mode, print_p, store_p),
 
   if (print_p)
   {
-    printf("    Looking in %s:\n", Name);
+    outf_console("    Looking in %s:\n", Name);
   }
   Where = From-1;
 
@@ -131,10 +131,10 @@ DEFUN (Find_In_Area, (Name, From, To, Obj, Mode, print_p, store_p),
     occurrences += 1;
     if (print_p)
 #ifndef b32
-      printf("Location = 0x%lx; Contents = 0x%lx\n",
+      outf_console("Location = 0x%lx; Contents = 0x%lx\n",
 	     ((long) Where), ((long) (*Where)));
 #else
-      printf("Location = 0x%08lx; Contents = 0x%08lx\n",
+      outf_console("Location = 0x%08lx; Contents = 0x%08lx\n",
 	     ((long) Where), ((long) (*Where)));
 #endif
     if (store_p)
@@ -163,10 +163,10 @@ DEFUN (Find_Who_Points, (Obj, Find_Mode, Collect_Mode),
   {
     putchar('\n');
 #ifndef b32
-    printf("*** Looking for Obj = 0x%lx; Find_Mode = %2ld ***\n",
+    outf_console("*** Looking for Obj = 0x%lx; Find_Mode = %2ld ***\n",
 	   ((long) Obj), ((long) Find_Mode));
 #else
-    printf("*** Looking for Obj = 0x%08lx; Find_Mode = %2ld ***\n",
+    outf_console("*** Looking for Obj = 0x%08lx; Find_Mode = %2ld ***\n",
 	   ((long) Obj), ((long) Find_Mode));
 #endif
   }
@@ -183,7 +183,7 @@ DEFUN (Find_Who_Points, (Obj, Find_Mode, Collect_Mode),
 #endif
   if (print_p)
   {
-    printf("Done.\n");
+    outf_console("Done.\n");
   }
   if (store_p)
   {
@@ -204,21 +204,21 @@ DEFUN (Print_Memory, (Where, How_Many),
   fast SCHEME_OBJECT *End   = &Where[How_Many];
 
 #ifndef b32
-  printf ("\n*** Memory from 0x%lx to 0x%lx (excluded) ***\n",
+  outf_console ("\n*** Memory from 0x%lx to 0x%lx (excluded) ***\n",
 	  ((long) Where), ((long) End));
   while (Where < End)
   {
-    printf ("0x%lx\n", ((long) (*Where++)));
+    outf_console ("0x%lx\n", ((long) (*Where++)));
   }
 #else
-  printf ("\n*** Memory from 0x%08lx to 0x%08lx (excluded) ***\n",
+  outf_console ("\n*** Memory from 0x%08lx to 0x%08lx (excluded) ***\n",
 	  ((long) Where), ((long) End));
   while (Where < End)
   {
-    printf ("0x%0l8x\n", ((long) (*Where++)));
+    outf_console ("0x%0l8x\n", ((long) (*Where++)));
   }
 #endif
-  printf ("Done.\n");
+  outf_console ("Done.\n");
   return;
 }
 
@@ -228,7 +228,7 @@ DEFINE_PRIMITIVE ("DEBUG-SHOW-PURE", Prim_debug_show_pure, 0, 0, 0)
 {
   PRIMITIVE_HEADER (0);
 
-  printf ("\n*** Constant & Pure Space: ***\n");
+  outf_console ("\n*** Constant & Pure Space: ***\n");
   Show_Pure ();
   PRIMITIVE_RETURN (UNSPECIFIC);
 }
@@ -239,7 +239,7 @@ DEFINE_PRIMITIVE ("DEBUG-SHOW-ENV", Prim_debug_show_env, 1, 1, 0)
   PRIMITIVE_HEADER (1);
 
   environment = (ARG_REF (1));
-  printf ("\n*** Environment = 0x%lx ***\n", ((long) environment));
+  outf_console ("\n*** Environment = 0x%lx ***\n", ((long) environment));
   Show_Env (environment);
   PRIMITIVE_RETURN (UNSPECIFIC);
 }
@@ -248,8 +248,8 @@ DEFINE_PRIMITIVE ("DEBUG-STACK-TRACE", Prim_debug_stack_trace, 0, 0, 0)
 {
   PRIMITIVE_HEADER (0);
 
-  printf ("\n*** Back Trace: ***\n");
-  Back_Trace (stdout);
+  outf_console ("\n*** Back Trace: ***\n");
+  Back_Trace (console_output);
   PRIMITIVE_RETURN (UNSPECIFIC);
 }
 
@@ -264,12 +264,12 @@ DEFINE_PRIMITIVE ("DEBUG-FIND-SYMBOL", Prim_debug_find_symbol, 1, 1, 0)
     fast SCHEME_OBJECT symbol = (find_symbol ((STRING_LENGTH (string)),
 					      (STRING_LOC (string, 0))));
     if (symbol == SHARP_F)
-      printf ("\nNot interned.\n");
+      outf_console ("\nNot interned.\n");
     else
       {
-	printf ("\nInterned Symbol: 0x%lx", ((long) symbol));
+	outf_console ("\nInterned Symbol: 0x%lx", ((long) symbol));
 	Print_Expression (MEMORY_REF (symbol, SYMBOL_GLOBAL_VALUE), "Value");
-	printf ("\n");
+	outf_console ("\n");
       }
   }
   PRIMITIVE_RETURN (UNSPECIFIC);