Move switch.scm back to compiler/base, so it can be shared.

Update to match 68k version.

diff --git a/v7/src/compiler/machines/spectrum/decls.scm b/v7/src/compiler/machines/spectrum/decls.scm
index 566eaceaa88c006278c5b4f18b8e1eed277940e6..b0104e2982b3015523ae9414f38369543d515c50 100644 (file)
--- a/v7/src/compiler/machines/spectrum/decls.scm
+++ b/v7/src/compiler/machines/spectrum/decls.scm
@@ -1,7 +1,7 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/spectrum/decls.scm,v 4.25 1990/01/25 16:34:14 jinx Exp $
-$MC68020-Header: decls.scm,v 4.25 90/01/18 22:43:31 GMT cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/compiler/machines/spectrum/decls.scm,v 4.26 1990/03/26 23:36:42 jinx Exp $
+$MC68020-Header: decls.scm,v 4.26 90/02/02 18:39:26 GMT cph Exp $
 
 Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
 
@@ -336,14 +336,13 @@ MIT in each case. |#
                              "contin" "crstop" "ctypes" "debug" "enumer"
                              "infnew" "lvalue" "object" "pmerly" "proced"
                              "refctx" "rvalue" "scode" "sets" "subprb"
-                             "toplev" "utils")
+                             "switch" "toplev" "utils")
             (filename/append "back"
                              "asmmac" "bittop" "bitutl" "insseq" "lapgn1"
                              "lapgn2" "lapgn3" "linear" "regmap" "symtab"
                              "syntax")
             (filename/append "machines/spectrum"
-                             "dassm1" "insmac" "machin" "rgspcm" "rulrew"
-                             "switch")
+                             "dassm1" "insmac" "machin" "rgspcm" "rulrew")
             (filename/append "fggen"
                              "declar" "fggen" "canon")
             (filename/append "fgopt"
@@ -395,8 +394,8 @@ MIT in each case. |#
         (filename/append "machines/spectrum" "machin"))
        (rtl-base
         (filename/append "rtlbase"
-                         "regset" "rgraph" "rtlcfg" "rtlobj"
-                         "rtlreg" "rtlty1" "rtlty2"))
+                         "rgraph" "rtlcfg" "rtlobj" "rtlreg" "rtlty1"
+                         "rtlty2"))
        (cse-base
         (filename/append "rtlopt"
                          "rcse1" "rcse2" "rcseep" "rcseht" "rcserq" "rcsesr"))
@@ -464,7 +463,6 @@ MIT in each case. |#
     (define-integration-dependencies "machines/spectrum" "machin" "rtlbase"
       "rtlreg" "rtlty1" "rtlty2")
 
-    (define-integration-dependencies "rtlbase" "regset" "base")
     (define-integration-dependencies "rtlbase" "rgraph" "base" "cfg1" "cfg2")
     (define-integration-dependencies "rtlbase" "rgraph" "machines/spectrum"
       "machin")
@@ -519,8 +517,14 @@ MIT in each case. |#
 
     (file-dependency/integration/join cse-base cse-base)
 
-    (define-integration-dependencies "rtlopt" "rcseht" "base" "object")
-    (define-integration-dependencies "rtlopt" "rcserq" "base" "object")
+    (file-dependency/integration/join
+     (filename/append "rtlopt" "ralloc" "rcompr" "rdebug" "rlife")
+     (filename/append "rtlbase" "regset"))
+
+    (file-dependency/integration/join
+     (filename/append "rtlopt" "rcseht" "rcserq")
+     (filename/append "base" "object"))
+
     (define-integration-dependencies "rtlopt" "rlife"  "base" "cfg2")
 
     (let ((dependents
@@ -542,7 +546,7 @@ MIT in each case. |#
     (define-integration-dependencies "back" "lapgn1" "base"
       "cfg1" "cfg2" "utils")
     (define-integration-dependencies "back" "lapgn1" "rtlbase"
-      "regset" "rgraph" "rtlcfg")
+      "rgraph" "rtlcfg")
     (define-integration-dependencies "back" "lapgn2" "rtlbase" "rtlreg")
     (define-integration-dependencies "back" "lapgn3" "rtlbase" "rtlcfg")
     (define-integration-dependencies "back" "linear" "base" "cfg1" "cfg2")