X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmain.lisp;h=06067d1e0aef177d5104cc857e33d8f8e5742ffe;hb=2912f5f6c2acb2da3b9fcc0f5afd1ca89782a9f8;hp=f62e112e680497ebb95d8852001ce1894893ffdd;hpb=57e21c4b62e8c1a1ee7ef59ed2abb0c864fb06bc;p=sbcl.git

diff --git a/src/compiler/main.lisp b/src/compiler/main.lisp
index f62e112..06067d1 100644
--- a/src/compiler/main.lisp
+++ b/src/compiler/main.lisp
@@ -91,11 +91,6 @@
 ;;; normally causes nested uses to be no-ops).
 (defvar *in-compilation-unit* nil)
 
-;;; This lock is siezed in the same situation: the compiler is not
-;;; presently thread-safe
-(defvar *big-compiler-lock*
-  (sb!thread:make-mutex :name "big compiler lock"))
-
 ;;; Count of the number of compilation units dynamically enclosed by
 ;;; the current active WITH-COMPILATION-UNIT that were unwound out of.
 (defvar *aborted-compilation-unit-count*)
@@ -205,23 +200,34 @@
                        defined later, the code doing so would not be ~
                        portable.~:@>"
 		      kind name)))
-                  (compiler-style-warn "undefined ~(~A~): ~S" kind name)))
+		  (if (eq kind :variable)
+		      (compiler-warn "undefined ~(~A~): ~S" kind name)
+		      (compiler-style-warn "undefined ~(~A~): ~S" kind name))))
 	    (let ((warn-count (length warnings)))
 	      (when (and warnings (> undefined-warning-count warn-count))
 		(let ((more (- undefined-warning-count warn-count)))
-		  (compiler-style-warn
-		   "~W more use~:P of undefined ~(~A~) ~S"
-		   more kind name))))))
+		  (if (eq kind :variable)
+		      (compiler-warn
+		       "~W more use~:P of undefined ~(~A~) ~S"
+		       more kind name)
+		      (compiler-style-warn
+		       "~W more use~:P of undefined ~(~A~) ~S"
+		       more kind name)))))))
 
 	(dolist (kind '(:variable :function :type))
 	  (let ((summary (mapcar #'undefined-warning-name
 				 (remove kind undefs :test-not #'eq
 					 :key #'undefined-warning-kind))))
 	    (when summary
-	      (compiler-style-warn
-	       "~:[This ~(~A~) is~;These ~(~A~)s are~] undefined:~
-		~%  ~{~<~%  ~1:;~S~>~^ ~}"
-	       (cdr summary) kind summary)))))))
+	      (if (eq kind :variable)
+		  (compiler-warn
+		   "~:[This ~(~A~) is~;These ~(~A~)s are~] undefined:~
+		    ~%  ~{~<~%  ~1:;~S~>~^ ~}"
+		   (cdr summary) kind summary)
+		  (compiler-style-warn
+		   "~:[This ~(~A~) is~;These ~(~A~)s are~] undefined:~
+		   ~%  ~{~<~%  ~1:;~S~>~^ ~}"
+		   (cdr summary) kind summary))))))))
 
   (unless (and (not abort-p)
 	       (zerop *aborted-compilation-unit-count*)
@@ -442,7 +448,7 @@
 	    (describe-ir2-component component *compiler-trace-output*))
 
 	  (maybe-mumble "code ")
-	  (multiple-value-bind (code-length trace-table fixups)
+	  (multiple-value-bind (code-length trace-table fixup-notes)
 	      (generate-code component)
 
             #-sb-xc-host
@@ -459,7 +465,7 @@
 				    *code-segment*
 				    code-length
 				    trace-table
-				    fixups
+				    fixup-notes
 				    *compile-object*))
 	      (core-object
 	       (maybe-mumble "core")
@@ -467,7 +473,7 @@
 				    *code-segment*
 				    code-length
 				    trace-table
-				    fixups
+				    fixup-notes
 				    *compile-object*))
 	      (null))))))
 
@@ -1502,7 +1508,7 @@
 				    (namestring input-pathname))))
 	  (when trace-file
 	    (let* ((default-trace-file-pathname
-		     (make-pathname :type "ntrace" :defaults input-pathname))
+		     (make-pathname :type "trace" :defaults input-pathname))
 		   (trace-file-pathname
 		    (if (eql trace-file t)
 			default-trace-file-pathname