Fix deadlocks in GC on Windows.

[sbcl.git] / src / assembly / assemfile.lisp

diff --git a/src/assembly/assemfile.lisp b/src/assembly/assemfile.lisp
index 837b239..424b3a2 100644 (file)
--- a/src/assembly/assemfile.lisp
+++ b/src/assembly/assemfile.lisp
@@ -45,9 +45,6 @@
         (let ((*features* (cons :sb-assembling *features*)))
           (init-assembler)
           (load (merge-pathnames name (make-pathname :type "lisp")))
-          (fasl-dump-cold-load-form `(in-package ,(package-name
-                                                   (sane-package)))
-                                    lap-fasl-output)
           (sb!assem:append-segment *code-segment* *elsewhere*)
           (setf *elsewhere* nil)
           (let ((length (sb!assem:finalize-segment *code-segment*)))
@@ -119,7 +116,7 @@
     ,@(unless (eq (reg-spec-kind reg) :res)
         `(:target ,(reg-spec-temp reg)))))
 
-(defun emit-vop (name options vars)
+(defun emit-assemble-vop (name options vars)
   (let* ((args (remove :arg vars :key #'reg-spec-kind :test #'neq))
          (temps (remove :temp vars :key #'reg-spec-kind :test #'neq))
          (results (remove :res vars :key #'reg-spec-kind :test #'neq))
@@ -193,4 +190,4 @@
     (let ((regs (mapcar (lambda (var) (apply #'parse-reg-spec var)) vars)))
       (if *emit-assembly-code-not-vops-p*
           (emit-assemble name options regs code)
-          (emit-vop name options regs)))))
+          (emit-assemble-vop name options regs)))))