From 39a237cdefb30530af9afceb8dbe80fc6da62d37 Mon Sep 17 00:00:00 2001
From: ram <ram>
Date: Wed, 20 Jun 1990 20:55:55 +0000
Subject: [PATCH] Moved macros and vmdef earlier so that they are compiled
 before the macros are used.

---
 tools/comcom.lisp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/comcom.lisp b/tools/comcom.lisp
index 2e541f3c6..ccf9ef99e 100644
--- a/tools/comcom.lisp
+++ b/tools/comcom.lisp
@@ -26,7 +26,9 @@
   (comf "code:globals" :always-once t) ; For global variables.
   (comf "code:struct" :always-once t) ; For structures.
   (comf "c:globals" :always-once t)
-  (comf "c:proclaim" :always-once t)) ; For COOKIE structure.
+  (comf "c:proclaim" :always-once t) ; For COOKIE structure.
+  (let ((c:*compile-time-define-macros* nil))
+    (comf "c:macros" :load t)))
 
 (comf "c:type" :always-once *new-compile*)
 (comf "c:rt/vm-type")
@@ -38,8 +40,10 @@
 (comf "c:knownfun" :always-once *new-compile*)
 (comf "c:vop" :always-once *new-compile*)
 (comf "c:alloc")
+(comf "c:knownfun")
 (comf "c:fndb")
 (comf "c:main")
+(comf "c:vmdef" :load t :bootstrap-macros :both)
 
 #-new-compiler
 (unless *new-compile*
@@ -59,8 +63,6 @@
 (comf "c:envanal")
 (comf "c:rt/parms")
 
-(comf "c:vmdef" :load t :bootstrap-macros :both)
-
 (comf "c:tn" :bootstrap-macros :both)
 (comf "c:bit-util")
 (comf "c:life")
@@ -80,9 +82,7 @@
 
 (when *new-compile*
   (comf "c:eval-comp")
-  (comf "c:eval" :bootstrap-macros :both)
-  (let ((c:*compile-time-define-macros* nil))
-    (comf "c:macros" :load t)))
+  (comf "c:eval" :bootstrap-macros :both))
 
 
 (comf "c:aliencomp")
-- 
GitLab