1.0.21.34: fix build on x86/x86-64 lutex platforms

[sbcl.git] / src / compiler / x86 / call.lisp

diff --git a/src/compiler/x86/call.lisp b/src/compiler/x86/call.lisp
index 1b7d900..bdd1d54 100644 (file)
--- a/src/compiler/x86/call.lisp
+++ b/src/compiler/x86/call.lisp
@@ -123,7 +123,7 @@
   (:info start-lab copy-more-arg-follows)
   (:vop-var vop)
   (:generator 1
-    (align n-lowtag-bits)
+    (emit-alignment n-lowtag-bits)
     (trace-table-entry trace-table-fun-prologue)
     (emit-label start-lab)
     ;; Skip space for the function header.
@@ -1327,9 +1327,6 @@
     (inst mov value (make-ea :dword :base object :index value))))
 
 ;;; Turn more arg (context, count) into a list.
-(defoptimizer (%listify-rest-args stack-allocate-result) ((&rest args))
-  t)
-
 (define-vop (listify-rest-args)
   (:translate %listify-rest-args)
   (:policy :safe)
@@ -1354,8 +1351,7 @@
       (inst jecxz done)
       (inst lea dst (make-ea :dword :base ecx :index ecx))
       (maybe-pseudo-atomic stack-allocate-p
-       (allocation dst dst node stack-allocate-p)
-       (inst lea dst (make-ea :byte :base dst :disp list-pointer-lowtag))
+       (allocation dst dst node stack-allocate-p list-pointer-lowtag)
        (inst shr ecx 2)
        ;; Set decrement mode (successive args at lower addresses)
        (inst std)
@@ -1465,10 +1461,9 @@
   ;; register on -SB-THREAD.
   #!+sb-thread
   (progn
-    (inst fs-segment-prefix)
     (inst cmp (make-ea :dword
                        :disp (* thread-stepping-slot n-word-bytes))
-          nil-value))
+          nil-value :fs))
   #!-sb-thread
   (inst cmp (make-ea-for-symbol-value sb!impl::*stepping*)
         nil-value))