From 35d5b1349ba8364206949d1e966bfe0aed5371ba Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sat, 26 Sep 1992 02:48:56 +0000
Subject: [PATCH] Move definitions of TYPE_CODE_LENGTH and HAS_COMPILER_SUPPORT
 out of the command line and into "config.h"

---
 v7/src/microcode/config.h       | 23 ++++++++++++++++++++++-
 v7/src/microcode/gctype.c       | 13 ++++++-------
 v7/src/microcode/m/alpha.h      |  4 ++--
 v7/src/microcode/m/apoll68k.h   |  8 ++++----
 v7/src/microcode/m/hp9k300.h    |  6 +++---
 v7/src/microcode/m/hp9k400.h    |  6 +++---
 v7/src/microcode/m/hp9k800.h    |  6 +++---
 v7/src/microcode/m/i386.h       |  4 ++--
 v7/src/microcode/m/mips.h       |  6 +++---
 v7/src/microcode/m/next.h       |  6 +++---
 v7/src/microcode/m/sun3.h       |  8 ++++----
 v7/src/microcode/m/vax.h        |  6 +++---
 v7/src/microcode/option.c       |  3 ++-
 v7/src/microcode/unxutl/ymkfile | 19 +++++++++++--------
 v7/src/microcode/wsize.c        |  3 ++-
 v8/src/microcode/gctype.c       | 13 ++++++-------
 16 files changed, 79 insertions(+), 55 deletions(-)

diff --git a/v7/src/microcode/config.h b/v7/src/microcode/config.h
index a3b6c0aa7..ec5a5c771 100644
--- a/v7/src/microcode/config.h
+++ b/v7/src/microcode/config.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/config.h,v 9.74 1992/08/05 02:49:29 jinx Exp $
+$Id: config.h,v 9.75 1992/09/26 02:48:56 cph Exp $
 
 Copyright (c) 1987-1992 Massachusetts Institute of Technology
 
@@ -195,6 +195,8 @@ typedef unsigned long SCHEME_OBJECT;
 
 #define MACHINE_TYPE		"vax"
 #define FASL_INTERNAL_FORMAT	FASL_VAX
+#define HAS_COMPILER_SUPPORT
+#define TYPE_CODE_LENGTH	6
 #define VAX_BYTE_ORDER
 #define b32
 #define HEAP_IN_LOW_MEMORY
@@ -267,9 +269,11 @@ typedef unsigned long SCHEME_OBJECT;
 #define FASL_INTERNAL_FORMAT	FASL_68000
 #else
 #define FASL_INTERNAL_FORMAT	FASL_68020
+#define HAS_COMPILER_SUPPORT
 #endif
 #define b32
 #define HEAP_IN_LOW_MEMORY
+#define TYPE_CODE_LENGTH	6
 #endif /* hp9000s300 */
 
 #if defined(hp9000s800) || defined(__hp9000s800)
@@ -279,6 +283,8 @@ typedef unsigned long SCHEME_OBJECT;
 #define MACHINE_TYPE		"hp9000s800"
 #endif
 #define FASL_INTERNAL_FORMAT	FASL_HP_SPECTRUM
+#define HAS_COMPILER_SUPPORT
+#define TYPE_CODE_LENGTH	6
 #define FLOATING_ALIGNMENT	0x7
 #define b32
 
@@ -338,6 +344,8 @@ typedef unsigned long SCHEME_OBJECT;
 #ifdef sun3
 #define MACHINE_TYPE		"sun3"
 #define FASL_INTERNAL_FORMAT	FASL_68020
+#define HAS_COMPILER_SUPPORT
+#define TYPE_CODE_LENGTH	6
 #define b32
 #define HEAP_IN_LOW_MEMORY
 #define HAS_FLOOR
@@ -360,6 +368,8 @@ typedef unsigned long SCHEME_OBJECT;
 #ifdef NeXT
 #define MACHINE_TYPE		"next"
 #define FASL_INTERNAL_FORMAT	FASL_68020
+#define HAS_COMPILER_SUPPORT
+#define TYPE_CODE_LENGTH	6
 #define b32
 #define HEAP_IN_LOW_MEMORY
 #define HAS_FLOOR
@@ -370,6 +380,8 @@ typedef unsigned long SCHEME_OBJECT;
 #ifdef i386
 
 #define FASL_INTERNAL_FORMAT	FASL_I386
+#define HAS_COMPILER_SUPPORT
+#define TYPE_CODE_LENGTH	6
 #define VAX_BYTE_ORDER
 #define b32
 
@@ -405,6 +417,8 @@ typedef unsigned long SCHEME_OBJECT;
 
 #define MACHINE_TYPE		"mips"
 #define FASL_INTERNAL_FORMAT	FASL_MIPS
+#define HAS_COMPILER_SUPPORT
+#define TYPE_CODE_LENGTH	6
 #define FLOATING_ALIGNMENT   	0x7
 #define b32
 
@@ -453,6 +467,8 @@ typedef unsigned long SCHEME_OBJECT;
 #ifdef __alpha
 #define MACHINE_TYPE           "Alpha"
 #define FASL_INTERNAL_FORMAT   FASL_ALPHA
+#define HAS_COMPILER_SUPPORT
+#define TYPE_CODE_LENGTH       8
 
 /* The ASCII character set is used. */
 #define HEAP_IN_LOW_MEMORY     1
@@ -555,6 +571,7 @@ extern void * alpha_heap_malloc (long);
 #if _ISP__M68K
 #define MACHINE_TYPE          "Apollo 68k"
 #define FASL_INTERNAL_FORMAT  FASL_APOLLO_68K
+#define TYPE_CODE_LENGTH	6
 #else
 #define MACHINE_TYPE          "Apollo Prism"
 #define FASL_INTERNAL_FORMAT  FASL_APOLLO_PRISM
@@ -578,6 +595,10 @@ extern void * alpha_heap_malloc (long);
 #define CHAR_BIT 8
 #endif
 
+#ifndef TYPE_CODE_LENGTH
+#define TYPE_CODE_LENGTH 8
+#endif
+
 /* The GNU C compiler does not have any of these bugs. */
 #ifdef __GNUC__
 #undef HAVE_DOUBLE_TO_LONG_BUG
diff --git a/v7/src/microcode/gctype.c b/v7/src/microcode/gctype.c
index 44abdf494..af9932c79 100644
--- a/v7/src/microcode/gctype.c
+++ b/v7/src/microcode/gctype.c
@@ -1,6 +1,8 @@
 /* -*-C-*-
 
-Copyright (c) 1987, 1988, 1989 Massachusetts Institute of Technology
+$Id: gctype.c,v 9.31 1992/09/26 02:47:42 cph Exp $
+
+Copyright (c) 1987-92 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -30,12 +32,9 @@ Technology nor of any adaptation thereof in any advertising,
 promotional, or sales literature without prior written consent from
 MIT in each case. */
 
-/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/gctype.c,v 9.30 1989/08/28 18:28:51 cph Rel $
- *
- * This file contains the table which maps between Types and
- * GC Types.
- *
- */
+/* This file contains the table which maps between Types and GC Types.  */
+
+#include "config.h"		/* for definition of TYPE_CODE_LENGTH */
 
 	    /*********************************/
 	    /* Mapping GC_Type to Type_Codes */
diff --git a/v7/src/microcode/m/alpha.h b/v7/src/microcode/m/alpha.h
index 498f0baff..665aa3ee2 100644
--- a/v7/src/microcode/m/alpha.h
+++ b/v7/src/microcode/m/alpha.h
@@ -1,7 +1,7 @@
 /* -*-C-*-
    Machine file for DEC Alpha computers.
 
-$Id: alpha.h,v 1.1 1992/08/29 12:20:45 jinx Exp $
+$Id: alpha.h,v 1.2 1992/09/26 02:46:49 cph Exp $
 
 Copyright (c) 1992 Digital Equipment Corporation
 
@@ -15,4 +15,4 @@ Copyright (c) 1992 Digital Equipment Corporation
 
 #define LIB_DEBUG
 
-#define C_SWITCH_MACHINE -Dalpha -DTYPE_CODE_LENGTH=8
+#define C_SWITCH_MACHINE -Dalpha
diff --git a/v7/src/microcode/m/apoll68k.h b/v7/src/microcode/m/apoll68k.h
index 0a29f3b9b..c68166659 100644
--- a/v7/src/microcode/m/apoll68k.h
+++ b/v7/src/microcode/m/apoll68k.h
@@ -1,9 +1,9 @@
 /* -*-C-*-
    Machine file for Apollo 68k
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/m/Attic/apoll68k.h,v 1.1 1991/08/24 02:30:54 cph Exp $
+$Id: apoll68k.h,v 1.2 1992/09/26 02:46:51 cph Exp $
 
-Copyright (c) 1989, 1990 Massachusetts Institute of Technology
+Copyright (c) 1989-92 Massachusetts Institute of Technology
 Copyright (c) 1991 Michael K. Gschwind
 
 This material was developed by the Scheme project at the Massachusetts
@@ -38,12 +38,12 @@ MIT in each case. */
 
 #ifndef ALTERNATE_CC
 
-#define C_SWITCH_MACHINE -Dapollo -A nansi -DTYPE_CODE_LENGTH=6
+#define C_SWITCH_MACHINE -Dapollo -A nansi
 #define LD_SWITCH_MACHINE -L/usr/lib/X11
 
 #else /* ALTERNATE_CC */
 
-#define C_SWITCH_MACHINE -Dapollo -DTYPE_CODE_LENGTH=6
+#define C_SWITCH_MACHINE -Dapollo
 #define LD_SWITCH_MACHINE -L/usr/lib/X11
 
 #endif
diff --git a/v7/src/microcode/m/hp9k300.h b/v7/src/microcode/m/hp9k300.h
index a7fa7cbcb..804a57ddd 100644
--- a/v7/src/microcode/m/hp9k300.h
+++ b/v7/src/microcode/m/hp9k300.h
@@ -1,7 +1,7 @@
 /* -*-C-*-
    Machine file for HP9000 series 300 (or 200)
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/m/Attic/hp9k300.h,v 1.8 1992/03/16 19:56:30 cph Exp $
+$Id: hp9k300.h,v 1.9 1992/09/26 02:46:52 cph Exp $
 
 Copyright (c) 1989-92 Massachusetts Institute of Technology
 
@@ -67,13 +67,13 @@ MIT in each case. */
 /* The full optimizer breaks some of the files in those versions.  */
 /* #define C_OPTIMIZE_SWITCH +O1 */
 
-#define C_SWITCH_MACHINE -Wp,-H512000 -DTYPE_CODE_LENGTH=6
+#define C_SWITCH_MACHINE -Wp,-H512000
 /* For hp-ux prior to 8.0, add the following switches to the previous line:
    -Wc,-Nt30000,-Ns3000  */
 
 #else
 
-#define C_SWITCH_MACHINE -DTYPE_CODE_LENGTH=6
+#define C_SWITCH_MACHINE
 
 #endif
 
diff --git a/v7/src/microcode/m/hp9k400.h b/v7/src/microcode/m/hp9k400.h
index 51bbe3e40..b623751d4 100644
--- a/v7/src/microcode/m/hp9k400.h
+++ b/v7/src/microcode/m/hp9k400.h
@@ -1,7 +1,7 @@
 /* -*-C-*-
    Machine file for HP9000 series 400 (or 300) with 68040
 
-$Id: hp9k400.h,v 1.4 1992/09/25 01:20:59 cph Exp $
+$Id: hp9k400.h,v 1.5 1992/09/26 02:46:53 cph Exp $
 
 Copyright (c) 1991-92 Massachusetts Institute of Technology
 
@@ -67,13 +67,13 @@ MIT in each case. */
 /* The full optimizer breaks some of the files in those versions.  */
 /* #define C_OPTIMIZE_SWITCH +O1 */
 
-#define C_SWITCH_MACHINE -Wp,-H512000 -DTYPE_CODE_LENGTH=6
+#define C_SWITCH_MACHINE -Wp,-H512000
 /* For hp-ux prior to 8.0, add the following switches to the previous line:
    -Wc,-Nt30000,-Ns3000  */
 
 #else
 
-#define C_SWITCH_MACHINE -DTYPE_CODE_LENGTH=6
+#define C_SWITCH_MACHINE
 
 #endif
 
diff --git a/v7/src/microcode/m/hp9k800.h b/v7/src/microcode/m/hp9k800.h
index bd5fee45c..0ef12e3e6 100644
--- a/v7/src/microcode/m/hp9k800.h
+++ b/v7/src/microcode/m/hp9k800.h
@@ -1,7 +1,7 @@
 /* -*-C-*-
    Machine file for HP9000 series  600, 700, 800.
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/m/Attic/hp9k800.h,v 1.8 1992/03/26 04:02:34 cph Exp $
+$Id: hp9k800.h,v 1.9 1992/09/26 02:46:53 cph Exp $
 
 Copyright (c) 1989-92 Massachusetts Institute of Technology
 
@@ -46,10 +46,10 @@ MIT in each case. */
    /* Assume HPC */
    /* Instead of "-Aa -D_HPUX_SOURCE" you can use "-Wp,-H512000" to
       get the traditional C compiler. */
-#  define C_SWITCH_MACHINE -Aa -D_HPUX_SOURCE -DTYPE_CODE_LENGTH=6
+#  define C_SWITCH_MACHINE -Aa -D_HPUX_SOURCE
 #  define M4_SWITCH_MACHINE -DTYPE_CODE_LENGTH=6 -DHPC
 #else
    /* Assume GCC */
-#  define C_SWITCH_MACHINE -DTYPE_CODE_LENGTH=6
+#  define C_SWITCH_MACHINE
 #  define M4_SWITCH_MACHINE -DTYPE_CODE_LENGTH=6 -DGCC
 #endif
diff --git a/v7/src/microcode/m/i386.h b/v7/src/microcode/m/i386.h
index 5a8791470..67341932c 100644
--- a/v7/src/microcode/m/i386.h
+++ b/v7/src/microcode/m/i386.h
@@ -1,7 +1,7 @@
 /* -*-C-*-
    Machine file for Intel i386 computers
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/m/Attic/i386.h,v 1.3 1992/08/27 09:06:10 jinx Exp $
+$Id: i386.h,v 1.4 1992/09/26 02:46:54 cph Exp $
 
 Copyright (c) 1990-1992 Massachusetts Institute of Technology
 
@@ -42,4 +42,4 @@ MIT in each case. */
 #define M4_SWITCH_MACHINE -P "define(TYPE_CODE_LENGTH,6)"
 #endif
 
-#define C_SWITCH_MACHINE -DTYPE_CODE_LENGTH=6
+#define C_SWITCH_MACHINE
diff --git a/v7/src/microcode/m/mips.h b/v7/src/microcode/m/mips.h
index 2678e63e3..a73760890 100644
--- a/v7/src/microcode/m/mips.h
+++ b/v7/src/microcode/m/mips.h
@@ -1,7 +1,7 @@
 /* -*-C-*-
    Machine file for MIPS computers.
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/m/Attic/mips.h,v 1.5 1992/03/13 11:01:32 cph Exp $
+$Id: mips.h,v 1.6 1992/09/26 02:46:54 cph Exp $
 
 Copyright (c) 1989-92 Massachusetts Institute of Technology
 
@@ -43,7 +43,7 @@ MIT in each case. */
    than the built-in optimization limit.  The "-w" switch says not to
    report warnings -- there are many of them, all harmless, that would
    not be reported if this were an ANSI compiler. */
-#define C_SWITCH_MACHINE -Olimit 2000 -w -DTYPE_CODE_LENGTH=6
+#define C_SWITCH_MACHINE -Olimit 2000 -w
 #else
-#define C_SWITCH_MACHINE -DTYPE_CODE_LENGTH=6
+#define C_SWITCH_MACHINE
 #endif
diff --git a/v7/src/microcode/m/next.h b/v7/src/microcode/m/next.h
index 2455ee861..c0f1fd83e 100644
--- a/v7/src/microcode/m/next.h
+++ b/v7/src/microcode/m/next.h
@@ -1,9 +1,9 @@
 /* -*-C-*-
    Machine file for NeXT
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/m/Attic/next.h,v 1.3 1991/03/24 05:12:26 jinx Exp $
+$Id: next.h,v 1.4 1992/09/26 02:46:55 cph Exp $
 
-Copyright (c) 1990 Massachusetts Institute of Technology
+Copyright (c) 1990-92 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -34,5 +34,5 @@ promotional, or sales literature without prior written consent from
 MIT in each case. */
 
 #define PROC_TYPE PROC_TYPE_68020
-#define C_SWITCH_MACHINE -DNeXT -DTYPE_CODE_LENGTH=6 -DCOMPILER_PROCESSOR_TYPE=COMPILER_MC68040_TYPE
+#define C_SWITCH_MACHINE -DNeXT
 #define LD_SWITCH_MACHINE
diff --git a/v7/src/microcode/m/sun3.h b/v7/src/microcode/m/sun3.h
index 079f674fc..6832d0872 100644
--- a/v7/src/microcode/m/sun3.h
+++ b/v7/src/microcode/m/sun3.h
@@ -1,9 +1,9 @@
 /* -*-C-*-
    Machine file for Sun 3
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/m/Attic/sun3.h,v 1.4 1991/10/15 22:53:36 cph Exp $
+$Id: sun3.h,v 1.5 1992/09/26 02:46:56 cph Exp $
 
-Copyright (c) 1989-91 Massachusetts Institute of Technology
+Copyright (c) 1989-92 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -39,11 +39,11 @@ MIT in each case. */
 
 /* If your machine doesn't have a 68881 coprocessor, remove
    "-f68881" from this line and the LD_SWITCH_MACHINE line. */
-#define C_SWITCH_MACHINE -Dsun3 -DTYPE_CODE_LENGTH=6 -DCOMPILER_PROCESSOR_TYPE=COMPILER_MC68040_TYPE -f68881
+#define C_SWITCH_MACHINE -Dsun3 -f68881
 #define LD_SWITCH_MACHINE -f68881
 
 #else /* ALTERNATE_CC */
 
-#define C_SWITCH_MACHINE -Dsun3 -DTYPE_CODE_LENGTH=6 -DCOMPILER_PROCESSOR_TYPE=COMPILER_MC68040_TYPE
+#define C_SWITCH_MACHINE -Dsun3
 
 #endif
diff --git a/v7/src/microcode/m/vax.h b/v7/src/microcode/m/vax.h
index 8bf4b8327..cf1a09336 100644
--- a/v7/src/microcode/m/vax.h
+++ b/v7/src/microcode/m/vax.h
@@ -1,9 +1,9 @@
 /* -*-C-*-
    Machine file for DEC Vax computers
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/m/Attic/vax.h,v 1.3 1991/02/15 00:48:28 jinx Exp $
+$Id: vax.h,v 1.4 1992/09/26 02:46:57 cph Exp $
 
-Copyright (c) 1989, 1991 Massachusetts Institute of Technology
+Copyright (c) 1989-92 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -52,4 +52,4 @@ MIT in each case. */
 #define M4_SWITCH_MACHINE -P "define(TYPE_CODE_LENGTH,6)" -P "define(GCC,1)"
 #endif
 
-#define C_SWITCH_MACHINE -DTYPE_CODE_LENGTH=6
+#define C_SWITCH_MACHINE
diff --git a/v7/src/microcode/option.c b/v7/src/microcode/option.c
index 1353dae72..ae8fbdc57 100644
--- a/v7/src/microcode/option.c
+++ b/v7/src/microcode/option.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/option.c,v 1.28 1992/07/30 18:06:22 cph Exp $
+$Id: option.c,v 1.29 1992/09/26 02:48:50 cph Exp $
 
 Copyright (c) 1990-92 Massachusetts Institute of Technology
 
@@ -38,6 +38,7 @@ MIT in each case. */
 #include <ctype.h>
 #include "ansidecl.h"
 #include "obstack.h"
+#include "config.h"
 #include "osenv.h"
 #include <sys/stat.h>
 
diff --git a/v7/src/microcode/unxutl/ymkfile b/v7/src/microcode/unxutl/ymkfile
index 8d14b20bc..8bad422b0 100644
--- a/v7/src/microcode/unxutl/ymkfile
+++ b/v7/src/microcode/unxutl/ymkfile
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ymkfile,v 1.58 1992/09/14 20:51:31 cph Exp $
+$Id: ymkfile,v 1.59 1992/09/26 02:48:34 cph Exp $
 
 Copyright (c) 1989-1992 Massachusetts Institute of Technology
 
@@ -166,7 +166,7 @@ GRAPHICS_LIBS =
 
 #if (PROC_TYPE == PROC_TYPE_68020)
 #define PROC_TYPE_KNOWN
-MACHINE_SWITCHES = -DHAS_COMPILER_SUPPORT
+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
@@ -186,7 +186,7 @@ GC_HEAD_FILES = gccode.h cmpgc.h
 
 #if (PROC_TYPE == PROC_TYPE_VAX)
 #define PROC_TYPE_KNOWN
-MACHINE_SWITCHES = -DHAS_COMPILER_SUPPORT
+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
@@ -199,7 +199,7 @@ cmpaux-vax.s : cmpaux-vax.m4 xmakefile
 #if (PROC_TYPE == PROC_TYPE_HPPA)
 #define PROC_TYPE_KNOWN
 #undef hppa
-MACHINE_SWITCHES = -DHAS_COMPILER_SUPPORT
+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
@@ -213,7 +213,7 @@ cmpaux-hppa.s : cmpaux-hppa.m4 xmakefile
 #if (PROC_TYPE == PROC_TYPE_MIPS)
 #define PROC_TYPE_KNOWN
 #undef mips
-MACHINE_SWITCHES = -DHAS_COMPILER_SUPPORT
+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
@@ -226,7 +226,7 @@ cmpaux-mips.s : cmpaux-mips.m4 xmakefile
 #if (PROC_TYPE == PROC_TYPE_I386)
 #define PROC_TYPE_KNOWN
 #undef i386
-MACHINE_SWITCHES = -DHAS_COMPILER_SUPPORT
+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
@@ -238,7 +238,7 @@ cmpaux-i386.s : cmpaux-i386.m4 xmakefile
 
 #if (PROC_TYPE == PROC_TYPE_ALPHA)
 #define PROC_TYPE_KNOWN
-MACHINE_SWITCHES = -DHAS_COMPILER_SUPPORT
+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
@@ -661,12 +661,14 @@ 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
+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
+mul.o : config.h
 
 storage.o : scheme.touch gctype.c
 
@@ -674,7 +676,7 @@ char.o string.o dfloat.o : scheme.touch prims.h
 tterm.o : scheme.touch prims.h osterm.h
 
 boot.o : scheme.touch prims.h version.h option.h ostop.h
-option.o : ansidecl.h option.h
+option.o : ansidecl.h obstack.h config.h osenv.h
 term.o : scheme.touch
 missing.o : config.h
 
@@ -696,6 +698,7 @@ Bintopsb.o : psbmap.touch trap.h limits.h fasl.h load.c bltdef.h
 Psbtobin.o : psbmap.touch 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
diff --git a/v7/src/microcode/wsize.c b/v7/src/microcode/wsize.c
index a9c3bd610..1f2c720c9 100644
--- a/v7/src/microcode/wsize.c
+++ b/v7/src/microcode/wsize.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/Attic/wsize.c,v 9.31 1992/01/20 22:05:11 jinx Exp $
+$Id: wsize.c,v 9.32 1992/09/26 02:47:35 cph Exp $
 
 Copyright (c) 1989-1992 Massachusetts Institute of Technology
 
@@ -36,6 +36,7 @@ MIT in each case. */
 #include <math.h>
 #include <errno.h>
 #include <signal.h>
+#include "config.h"
 
 #ifndef TYPE_CODE_LENGTH
 /* This MUST match object.h */
diff --git a/v8/src/microcode/gctype.c b/v8/src/microcode/gctype.c
index eda31b53a..af9932c79 100644
--- a/v8/src/microcode/gctype.c
+++ b/v8/src/microcode/gctype.c
@@ -1,6 +1,8 @@
 /* -*-C-*-
 
-Copyright (c) 1987, 1988, 1989 Massachusetts Institute of Technology
+$Id: gctype.c,v 9.31 1992/09/26 02:47:42 cph Exp $
+
+Copyright (c) 1987-92 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -30,12 +32,9 @@ Technology nor of any adaptation thereof in any advertising,
 promotional, or sales literature without prior written consent from
 MIT in each case. */
 
-/* $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/microcode/gctype.c,v 9.30 1989/08/28 18:28:51 cph Rel $
- *
- * This file contains the table which maps between Types and
- * GC Types.
- *
- */
+/* This file contains the table which maps between Types and GC Types.  */
+
+#include "config.h"		/* for definition of TYPE_CODE_LENGTH */
 
 	    /*********************************/
 	    /* Mapping GC_Type to Type_Codes */
-- 
2.25.1