0.9.13.42:

	Don't generate (or include) genesis/lutex.h when building without
        SB-THREAD. Should fix the FreeBSD 4 build problems reported
        on sbcl-devel.

        Whitespace fixes.

diff --git a/src/compiler/generic/early-objdef.lisp b/src/compiler/generic/early-objdef.lisp
index 1ed5325..6b592a4 100644 (file)
--- a/src/compiler/generic/early-objdef.lisp
+++ b/src/compiler/generic/early-objdef.lisp
@@ -146,9 +146,9 @@
   fdefn                             ; 01010110
 
   no-tls-value-marker               ; 01011010
-  #!-sb-lutex
+  #!-(and sb-lutex sb-thread)
   unused01
-  #!+sb-lutex
+  #!+(and sb-lutex sb-thread)
   lutex                             ; 01011110
   unused02                          ; 01100010
   unused03                          ; 01100110

diff --git a/src/compiler/generic/genesis.lisp b/src/compiler/generic/genesis.lisp
index d6a427d..c42fcf8 100644 (file)
--- a/src/compiler/generic/genesis.lisp
+++ b/src/compiler/generic/genesis.lisp
@@ -2925,7 +2925,7 @@ initially undefined function references:~2%")
 (defconstant new-directory-core-entry-type-code 3861)
 (defconstant initial-fun-core-entry-type-code 3863)
 (defconstant page-table-core-entry-type-code 3880)
-#!+sb-lutex
+#!+(and sb-lutex sb-thread)
 (defconstant lutex-table-core-entry-type-code 3887)
 (defconstant end-core-entry-type-code 3840)
 

diff --git a/src/compiler/generic/objdef.lisp b/src/compiler/generic/objdef.lisp
index b3839eb..5a637c3 100644 (file)
--- a/src/compiler/generic/objdef.lisp
+++ b/src/compiler/generic/objdef.lisp
@@ -395,7 +395,7 @@
   (real :c-type "double" :length #!-x86-64 2 #!+x86-64 1)
   (imag :c-type "double" :length #!-x86-64 2 #!+x86-64 1))
 
-#!+sb-lutex
+#!+(and sb-lutex sb-thread)
 (define-primitive-object (lutex
                           :lowtag other-pointer-lowtag
                           :widetag lutex-widetag

diff --git a/src/compiler/generic/vm-fndb.lisp b/src/compiler/generic/vm-fndb.lisp
index 9636759..a4622b1 100644 (file)
--- a/src/compiler/generic/vm-fndb.lisp
+++ b/src/compiler/generic/vm-fndb.lisp
@@ -227,7 +227,7 @@
 
 ;;;; threading
 
-#!+sb-lutex
+#!+(and sb-lutex sb-thread)
 (progn
   (defknown sb!vm::%make-lutex () sb!vm::lutex ())
   (defknown sb!vm::lutexp (t) boolean (foldable flushable)))

diff --git a/src/runtime/save.c b/src/runtime/save.c
index 33f7e36..1518e61 100644 (file)
--- a/src/runtime/save.c
+++ b/src/runtime/save.c
@@ -34,7 +34,7 @@
 #include "genesis/static-symbols.h"
 #include "genesis/symbol.h"
 
-#ifdef LISP_FEATURE_SB_LUTEX
+#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX)
 #include "genesis/lutex.h"
 #endif
 

diff --git a/tests/run-program.impure.lisp b/tests/run-program.impure.lisp
index 609976a..2f608b4 100644 (file)
--- a/tests/run-program.impure.lisp
+++ b/tests/run-program.impure.lisp
@@ -44,12 +44,12 @@
 
 (defun make-pipe ()
   (multiple-value-bind (in out) (sb-posix:pipe)
-    (let ((input (sb-sys:make-fd-stream in 
-                                        :input t 
+    (let ((input (sb-sys:make-fd-stream in
+                                        :input t
                                         :external-format :ascii
                                         :buffering :none :name "in"))
-          (output (sb-sys:make-fd-stream out 
-                                         :output t 
+          (output (sb-sys:make-fd-stream out
+                                         :output t
                                          :external-format :ascii
                                          :buffering :none :name "out")))
       (make-two-way-stream input output))))
@@ -59,7 +59,7 @@
 (defvar *out-pipe* (make-pipe))
 (defvar *out* (make-synonym-stream '*out-pipe*))
 
-(defvar *ed* 
+(defvar *ed*
   (run-program "/bin/ed" (list *tmpfile*) :input *in* :output *out* :wait nil))
 
 (defun real-input (stream)

diff --git a/version.lisp-expr b/version.lisp-expr
index cb72bf9..8edaac7 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.13.41"
+"0.9.13.42"