svm: Remove imports from (cross-reference).

diff --git a/src/compiler/machines/svm/compiler.pkg b/src/compiler/machines/svm/compiler.pkg
index b14d70b80713d7ed4758095fc78687358e07911d..3ae52d7fdc5a0bd91a030c6d8d5730543d0d57b6 100644 (file)
--- a/src/compiler/machines/svm/compiler.pkg
+++ b/src/compiler/machines/svm/compiler.pkg
@@ -230,13 +230,6 @@ USA.
          syntax-files!)
   (import (scode-optimizer top-level)
          sf/internal)
-  (import (cross-reference)
-         os-types
-         read-package-model
-         pmodel/pathname
-         pmodel/packages
-         package/name
-         package/files)
   (initialization (initialize-package!)))
 
 (define-package (compiler top-level)

diff --git a/src/compiler/machines/svm/decls.scm b/src/compiler/machines/svm/decls.scm
index 05893bd056ea8b899fc2c958f7e0b095491be614..7e58fe10d527531b12628193919c90f017fd51cc 100644 (file)
--- a/src/compiler/machines/svm/decls.scm
+++ b/src/compiler/machines/svm/decls.scm
@@ -45,6 +45,12 @@ USA.
 
 (define (setup-source-nodes!)
 
+  (define xref (->environment '(cross-reference)))
+  (define read-package-model (access read-package-model xref))
+  (define pmodel/packages (access pmodel/packages xref))
+  (define package/name (access package/name xref))
+  (define package/files (access package/files xref))
+
   ;; Assume there are no os-specific files or packages.
   (define pmodel (read-package-model "compiler" 'unix))