Conditionalize according to PROC_TYPE.

diff --git a/v7/src/microcode/m/i386.h b/v7/src/microcode/m/i386.h
index 67341932c105f3187ac4ba70eb169dabed822898..c4c9bb0b8357f1e807824aa43ec77aca09febbf6 100644 (file)
--- 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
 
-$Id: i386.h,v 1.4 1992/09/26 02:46:54 cph Exp $
+$Id: i386.h,v 1.5 1992/11/18 15:51:35 gjr Exp $
 
 Copyright (c) 1990-1992 Massachusetts Institute of Technology
 
@@ -33,7 +33,9 @@ Technology nor of any adaptation thereof in any advertising,
 promotional, or sales literature without prior written consent from
 MIT in each case. */
 
+#ifndef PROC_TYPE
 #define PROC_TYPE PROC_TYPE_I386
+#endif /* PROC_TYPE */
 
 #ifdef _SYSV
 #define M4_SWITCH_MACHINE -DTYPE_CODE_LENGTH=6

diff --git a/v7/src/microcode/m/ibm032.h b/v7/src/microcode/m/ibm032.h
index 425798240cb236db1bdf3747d188d7bcd28db23d..60c0cdd7dc4fd28f88f2805b3a6c9a6c98e397ac 100644 (file)
--- a/v7/src/microcode/m/ibm032.h
+++ b/v7/src/microcode/m/ibm032.h
@@ -1,9 +1,9 @@
 /* -*-C-*-
    Machine file for IBM PC/RT computers
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/m/Attic/ibm032.h,v 1.1 1989/10/20 12:36:54 jinx Rel $
+$Id: ibm032.h,v 1.2 1992/11/18 15:52:13 gjr Exp $
 
-Copyright (c) 1989 Massachusetts Institute of Technology
+Copyright (c) 1989-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -33,7 +33,9 @@ Technology nor of any adaptation thereof in any advertising,
 promotional, or sales literature without prior written consent from
 MIT in each case. */
 
+#ifndef PROC_TYPE
 #define PROC_TYPE PROC_TYPE_IBM032
+#endif /* PROC_TYPE */
 
 #define C_SWITCH_MACHINE -Dunix
 

diff --git a/v7/src/microcode/m/mips.h b/v7/src/microcode/m/mips.h
index a737608908e2f180ce97db31fa4b0c1651af9582..be4d09a7d78077690310849db794238a90ea8096 100644 (file)
--- a/v7/src/microcode/m/mips.h
+++ b/v7/src/microcode/m/mips.h
@@ -1,9 +1,9 @@
 /* -*-C-*-
    Machine file for MIPS computers.
 
-$Id: mips.h,v 1.6 1992/09/26 02:46:54 cph Exp $
+$Id: mips.h,v 1.7 1992/11/18 15:52:47 gjr Exp $
 
-Copyright (c) 1989-92 Massachusetts Institute of Technology
+Copyright (c) 1989-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -33,7 +33,9 @@ Technology nor of any adaptation thereof in any advertising,
 promotional, or sales literature without prior written consent from
 MIT in each case. */
 
+#ifndef PROC_TYPE
 #define PROC_TYPE PROC_TYPE_MIPS
+#endif /* PROC_TYPE */
 
 /* The MIPS compiler/linker doesn't use -lg.  */
 #define LIB_DEBUG

diff --git a/v7/src/microcode/m/next.h b/v7/src/microcode/m/next.h
index c0f1fd83ec2adaa89cb80ae5170a69450278085b..38646f6c671b36ef8d8116ed2b9cbba28d854d8d 100644 (file)
--- a/v7/src/microcode/m/next.h
+++ b/v7/src/microcode/m/next.h
@@ -1,9 +1,9 @@
 /* -*-C-*-
    Machine file for NeXT
 
-$Id: next.h,v 1.4 1992/09/26 02:46:55 cph Exp $
+$Id: next.h,v 1.5 1992/11/18 15:53:16 gjr Exp $
 
-Copyright (c) 1990-92 Massachusetts Institute of Technology
+Copyright (c) 1990-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -33,6 +33,9 @@ Technology nor of any adaptation thereof in any advertising,
 promotional, or sales literature without prior written consent from
 MIT in each case. */
 
+#ifndef PROC_TYPE
 #define PROC_TYPE PROC_TYPE_68020
+#endif /* PROC_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 6832d0872f6bdb9368f69ddde0f4c286f4fba0cd..98bb49d04d6a090097972d6b3c405006cccdb363 100644 (file)
--- a/v7/src/microcode/m/sun3.h
+++ b/v7/src/microcode/m/sun3.h
@@ -1,9 +1,9 @@
 /* -*-C-*-
    Machine file for Sun 3
 
-$Id: sun3.h,v 1.5 1992/09/26 02:46:56 cph Exp $
+$Id: sun3.h,v 1.6 1992/11/18 15:54:08 gjr Exp $
 
-Copyright (c) 1989-92 Massachusetts Institute of Technology
+Copyright (c) 1989-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -33,7 +33,9 @@ Technology nor of any adaptation thereof in any advertising,
 promotional, or sales literature without prior written consent from
 MIT in each case. */
 
+#ifndef PROC_TYPE
 #define PROC_TYPE PROC_TYPE_68020
+#endif /* PROC_TYPE */
 
 #ifndef ALTERNATE_CC
 

diff --git a/v7/src/microcode/m/sun4.h b/v7/src/microcode/m/sun4.h
index 5efc8a6e49f53f34e0b8d9308fe682ad14465c9a..83c158efbee4acd3e0aef687bd7d47d21d96871f 100644 (file)
--- a/v7/src/microcode/m/sun4.h
+++ b/v7/src/microcode/m/sun4.h
@@ -1,9 +1,9 @@
 /* -*-C-*-
    Machine file for Sun 4
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/m/Attic/sun4.h,v 1.2 1990/06/20 19:54:13 cph Rel $
+$Id: sun4.h,v 1.3 1992/11/18 15:54:50 gjr Exp $
 
-Copyright (c) 1990 Massachusetts Institute of Technology
+Copyright (c) 1990-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -33,7 +33,9 @@ Technology nor of any adaptation thereof in any advertising,
 promotional, or sales literature without prior written consent from
 MIT in each case. */
 
+#ifndef PROC_TYPE
 #define PROC_TYPE PROC_TYPE_SPARC
+#endif /* PROC_TYPE */
 
 #define C_SWITCH_MACHINE -Dsun4
 #define LD_SWITCH_MACHINE  

diff --git a/v7/src/microcode/m/umax.h b/v7/src/microcode/m/umax.h
index ccadeb955f23e71200e63d83224f9d52c0bad1f8..d5076c194df50a80434abc9b0c6ee280b8d6a65d 100644 (file)
--- a/v7/src/microcode/m/umax.h
+++ b/v7/src/microcode/m/umax.h
@@ -1,9 +1,9 @@
 /* -*-C-*-
    Machine file for Encore Multimax computers with NS32x32 processors
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/m/Attic/umax.h,v 1.1 1989/08/02 17:02:36 cph Rel $
+$Id: umax.h,v 1.2 1992/11/18 15:55:38 gjr Exp $
 
-Copyright (c) 1989 Massachusetts Institute of Technology
+Copyright (c) 1989-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -33,4 +33,6 @@ Technology nor of any adaptation thereof in any advertising,
 promotional, or sales literature without prior written consent from
 MIT in each case. */
 
+#ifndef PROC_TYPE
 #define PROC_TYPE PROC_TYPE_NS32K
+#endif /* PROC_TYPE */

diff --git a/v7/src/microcode/m/vax.h b/v7/src/microcode/m/vax.h
index cf1a093360ae752e09e88913426ce151a2758f9e..f9fafa02e6ed385b22aef94bc691248ba99a4ea6 100644 (file)
--- 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
 
-$Id: vax.h,v 1.4 1992/09/26 02:46:57 cph Exp $
+$Id: vax.h,v 1.5 1992/11/18 15:56:17 gjr Exp $
 
-Copyright (c) 1989-92 Massachusetts Institute of Technology
+Copyright (c) 1989-1992 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -39,7 +39,9 @@ MIT in each case. */
 #undef vax
 #endif
 
+#ifndef PROC_TYPE
 #define PROC_TYPE PROC_TYPE_VAX
+#endif /* PROC_TYPE */
 
 /* The M4_SWITCH_MACHINE must contain -P "define(GCC,1)", if using GCC,
    -P "define(VMS,1)" if preparing the files for VMS Vax C,