X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fearly-impl.lisp;h=21e75b05c5c134b8bcebe7fe5880f2b1012d93b0;hb=bb756e3d4b19c30d4a9cd4250b606c5969613ad9;hp=f533cf75636529b17fcec1c207aaeaa82669c468;hpb=7868260cba340c8674aee03b1d36569dc55dc7cf;p=sbcl.git

diff --git a/src/code/early-impl.lisp b/src/code/early-impl.lisp
index f533cf7..21e75b0 100644
--- a/src/code/early-impl.lisp
+++ b/src/code/early-impl.lisp
@@ -19,10 +19,9 @@
 		  *read-only-space-free-pointer*
 		  sb!vm:*static-space-free-pointer*
 		  sb!vm:*initial-dynamic-space-free-pointer*
-		  *current-catch-block*
-		  *current-unwind-protect-block*
+		  sb!vm::*current-catch-block*
+		  sb!vm::*current-unwind-protect-block*
 		  sb!vm::*alien-stack*
-		  #!+sb-thread sb!thread::*foreground-thread-stack*
 		  sb!vm::*control-stack-start*
 		  sb!vm::*control-stack-end*
 		  sb!vm::*binding-stack-start*
@@ -33,8 +32,8 @@
 		  ;; :X86. (Note that non-X86 ports mention
 		  ;; pseudo-atomicity too, but they handle it without
 		  ;; messing with special variables.)
-		  #!+x86 *pseudo-atomic-atomic*
-		  #!+x86 *pseudo-atomic-interrupted*
+		  #!+(or x86 x86-64) *pseudo-atomic-atomic*
+		  #!+(or x86 x86-64) *pseudo-atomic-interrupted*
 		  sb!unix::*interrupts-enabled*
 		  sb!unix::*interrupt-pending*
 		  *free-interrupt-context-index*