From 9b4197427c1b7e64bee9da205d1f38fa2cad2cbb Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Mon, 30 Jan 2017 17:21:19 -0700 Subject: [PATCH] svm: Remove imports from (cross-reference). --- src/compiler/machines/svm/compiler.pkg | 7 ------- src/compiler/machines/svm/decls.scm | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/compiler/machines/svm/compiler.pkg b/src/compiler/machines/svm/compiler.pkg index b14d70b80..3ae52d7fd 100644 --- 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 05893bd05..7e58fe10d 100644 --- 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)) -- 2.25.1