Move the redefinition of with-lock into the compiler

src/bare.lsp.in

@@ -46,9 +46,6 @@
 #-:wants-dlopen (setq *features* (delete :dlopen *features*))
 #+:wants-dlopen (push :dlopen *features*)
 
-#-threads
-(defmacro c::with-lock ((lock) &body body)
-  `(progn ,@body))
 (load #+(or cross ecl-min) "cmp/load.lsp"
       #-(or cross ecl-min) "cmp.so")
 

src/cmp/cmpmain.lsp

@@ -12,6 +12,10 @@
 
 (in-package "COMPILER")
 
+#-threads
+(defmacro with-lock ((lock) &body body)
+  `(progn ,@body))
+
 (defun safe-system (string)
   (cmpnote "Invoking external command:~%;;; ~A~%" string)
   (let ((result (si:system string)))