CMUCL commit: sparc-tramp-assem-branch src/compiler/generic (new-genesis.lisp)

[Raymond Toy]

    Date: Saturday, July 17, 2010 @ 11:43:45
  Author: rtoy
    Path: /project/cmucl/cvsroot/src/compiler/generic
     Tag: sparc-tramp-assem-branch

Modified: new-genesis.lisp

o Don't load the assem files twice.
o Print out the assem files in the same format as all the other
  files. 


------------------+
 new-genesis.lisp |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)


Index: src/compiler/generic/new-genesis.lisp
diff -u src/compiler/generic/new-genesis.lisp:1.89.2.1 src/compiler/generic/new-genesis.lisp:1.89.2.2
--- src/compiler/generic/new-genesis.lisp:1.89.2.1	Fri Jul 16 21:19:02 2010
+++ src/compiler/generic/new-genesis.lisp	Sat Jul 17 11:43:44 2010
@@ -4,7 +4,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/compiler/generic/new-genesis.lisp,v 1.89.2.1 2010-07-17 01:19:02 rtoy Exp $")
+  "$Header: /project/cmucl/cvsroot/src/compiler/generic/new-genesis.lisp,v 1.89.2.2 2010-07-17 15:43:44 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -2749,8 +2749,11 @@
 		     (string-equal "assem"
 				   (pathname-type x))))
 	      (dolist (file-name (remove-if-not #'is-assemfile  file-list))
-		(write-line (namestring file-name))
-		(cold-load file-name)))
+		(write-line (namestring (truename file-name)))
+		(cold-load file-name))
+	      ;; Don't load the assem files again, otherwise we'll get
+	      ;; two copies of everything.
+	      (setf file-list (remove-if #'is-assemfile file-list)))
 	    (initialize-static-fns)
 	    (dolist (file (if (listp file-list)
 			      file-list