--- ./base-target-features.lisp-expr.org	2010-08-10 19:26:29.000000000 +0900
+++ ./base-target-features.lisp-expr	2010-09-17 12:45:20.000000000 +0900
@@ -219,7 +219,7 @@
  ;; As of SBCL 1.0.33.26, threads are part of the default build on
  ;; x86oid Linux. Other platforms that support them include
  ;; x86oid Darwin, FreeBSD, and Solaris.
- ; :sb-thread
+;:sb-thread
 
  ;; lutex support
  ;;
@@ -229,7 +229,7 @@
  ;; allows for sb-thread support on x86 OS X, Solaris and
  ;; FreeBSD.
  ;;
- ; :sb-lutex
+;:sb-lutex
 
  ;; On some operating systems the FS segment register (used for SBCL's
  ;; thread local storage) is not reliably preserved in signal
@@ -415,4 +415,5 @@
  ;; (No others are supported by SBCL as of 1.0.8, but :hpux or :irix
  ;; support could be ported from CMU CL if anyone is sufficiently
  ;; motivated to do so.)
+:darwin
  )
--- ./contrib/sb-posix/posix-tests.lisp.org	2010-08-24 23:10:15.000000000 +0900
+++ ./contrib/sb-posix/posix-tests.lisp	2010-09-17 12:45:20.000000000 +0900
@@ -103,6 +103,7 @@
       (sb-posix:syscall-errno c)))
   #.sb-posix::eexist)
 
+#-darwin
 (deftest mkdir.error.2
   (handler-case
       (sb-posix:mkdir #-win32 "/" #+win32 "C:/" 0)
@@ -164,6 +165,7 @@
   #+win32
   #.sb-posix::einval)
 
+#-darwin
 (deftest rmdir.error.3
   (handler-case
       (sb-posix:rmdir #-win32 "/" #+win32 "C:/")
@@ -331,6 +333,7 @@
             (,mode (sb-posix::stat-mode ,stat)))
        ,@body)))
 
+#-darwin
 (deftest stat-mode.1
   (with-stat-mode (mode *test-directory*)
     (sb-posix:s-isreg mode))
@@ -346,11 +349,13 @@
     (sb-posix:s-ischr mode))
   nil)
 
+#-darwin
 (deftest stat-mode.4
   (with-stat-mode (mode *test-directory*)
     (sb-posix:s-isblk mode))
   nil)
 
+#-darwin
 (deftest stat-mode.5
   (with-stat-mode (mode *test-directory*)
     (sb-posix:s-isfifo mode))
@@ -509,6 +514,7 @@
         (sb-posix:closedir dir))))
   nil)
 
+#-darwin
 (deftest readdir.1
   (let ((dir (sb-posix:opendir "/")))
     (unwind-protect
@@ -665,6 +671,7 @@
     #.(concatenate 'string "/" (make-string 255 :initial-element #\a)))
 
   ;; The error tests are in the order of exposition from SUSv3.
+  #-darwin
   (deftest readlink.error.1
       (let* ((subdir-pathname (merge-pathnames
                                (make-pathname
--- ./make-config.sh~	2010-08-10 19:26:29.000000000 +0900
+++ ./make-config.sh	2010-09-17 12:56:31.000000000 +0900
@@ -130,7 +130,7 @@
 
 # Under Darwin, uname -m returns "i386" even if CPU is x86_64.
 if [ "$sbcl_os" = "darwin" ] && [ "`/usr/sbin/sysctl -n hw.optional.x86_64`" = "1" ]; then
-    guessed_sbcl_arch=x86-64
+    echo guessed_sbcl_arch=x86-64
 fi
 
 echo //setting up CPU-architecture-dependent information
--- ./src/runtime/Config.x86-64-darwin.org	2010-06-28 22:51:18.000000000 +0900
+++ ./src/runtime/Config.x86-64-darwin	2010-09-17 12:45:20.000000000 +0900
@@ -10,13 +10,13 @@
 # files for more information.
 
 CFLAGS = -g -Wall -O2 -fdollars-in-identifiers
-ifdef LISP_FEATURE_DARWIN9_OR_BETTER
-CFLAGS += -mmacosx-version-min=10.5
-LINKFLAGS += -mmacosx-version-min=10.5
-else
+#ifdef LISP_FEATURE_DARWIN9_OR_BETTER
+#CFLAGS += -mmacosx-version-min=10.5
+#LINKFLAGS += -mmacosx-version-min=10.5
+#else
 CFLAGS += -mmacosx-version-min=10.4
 LINKFLAGS += -mmacosx-version-min=10.4
-endif
+#endif
 ifdef LISP_FEATURE_INODE64
 CFLAGS += -D_DARWIN_USE_64_BIT_INODE
 endif
--- ./src/runtime/Config.x86-darwin.org	2010-06-28 22:51:18.000000000 +0900
+++ ./src/runtime/Config.x86-darwin	2010-09-17 12:45:20.000000000 +0900
@@ -11,13 +11,13 @@
 
 CFLAGS = -arch i386 -g -Wall -O2 -fdollars-in-identifiers
 LINKFLAGS += -arch i386
-ifdef LISP_FEATURE_DARWIN9_OR_BETTER
-CFLAGS += -mmacosx-version-min=10.5
-LINKFLAGS += -mmacosx-version-min=10.5
-else
+#ifdef LISP_FEATURE_DARWIN9_OR_BETTER
+#CFLAGS += -mmacosx-version-min=10.5
+#LINKFLAGS += -mmacosx-version-min=10.5
+#else
 CFLAGS += -mmacosx-version-min=10.4
 LINKFLAGS += -mmacosx-version-min=10.4
-endif
+#endif
 
 OS_SRC = bsd-os.c x86-bsd-os.c darwin-os.c x86-darwin-os.c