1.0.9.6: remove :UNIX from *FEATURES* on Windows

Thanks to Luis Oliveira.

diff --git a/NEWS b/NEWS
index 01c35ab..d89493e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 ;;;; -*- coding: utf-8; -*-
 changes in sbcl-1.0.10 relative to sbcl-1.0.9:
+  * minor incompatible change: :UNIX is no longer present in *FEATURES*
+    on Windows. (thanks to Luis Oliviera)
   * optimization: SLOT-VALUE and (SETF SLOT-VALUE) are now >20% faster
     for variable slot names, when the class of the instance is
     an instance of STANDARD-CLASS or FUNCALLABLE-STANDARD-CLASS, and not

diff --git a/base-target-features.lisp-expr b/base-target-features.lisp-expr
index d614afa..9b519a0 100644 (file)
--- a/base-target-features.lisp-expr
+++ b/base-target-features.lisp-expr
@@ -57,14 +57,6 @@
  ;; local-target-features.lisp-expr via make-config.sh, as alpha,
  ;; sparc and ppc ports don't currently support it. -- CSR, 2002-02-21
 
- ;; We're running under a UNIX. This is sort of redundant, and it was also
- ;; sort of redundant under CMU CL, which we inherited it from: neither SBCL
- ;; nor CMU CL supports anything but UNIX (and "technically not UNIX"es
- ;; such as *BSD and Linux). But someday, maybe we might, and in that case
- ;; we'd presumably remove this, so its presence conveys the information
- ;; that the system isn't one which follows such a change.
- :unix
-
  ;;
  ;; features present in this particular build
  ;;
@@ -327,6 +319,9 @@
  ;;     The backend implements compare-and-swap VOPs.
  ;;
  ;; operating system features:
+ ;;   :unix    = We're intended to run under some Unix-like OS. (This is not
+ ;;              exclusive with the features which indicate which particular
+ ;;              Unix-like OS we're intended to run under.)
  ;;   :linux   = We're intended to run under some version of Linux.
  ;;   :bsd     = We're intended to run under some version of BSD Unix. (This
  ;;              is not exclusive with the features which indicate which
@@ -339,8 +334,8 @@
  ;;              with the SunOS kernel.
  ;;   :osf1    = We're intended to run under Tru64 (aka Digital Unix
  ;;              aka OSF/1).
- ;; (No others are supported by SBCL as of 0.9.6, but :hpux or :irix
+ ;;   :win32   = We're intended to under some version of Microsoft Windows.
+ ;; (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, and it'd even be possible, though harder, to
- ;; port the system to Microsoft Windows.)
+ ;; motivated to do so.)
  )

diff --git a/make-config.sh b/make-config.sh
index ce0c8f2..50d1714 100644 (file)
--- a/make-config.sh
+++ b/make-config.sh
@@ -63,7 +63,7 @@ link_or_copy() {
    if [ "$sbcl_os" = "win32" ] ; then
        cp -r "$1" "$2"
    else
-        ln -s "$1" "$2"
+       ln -s "$1" "$2"
    fi
 }
 
@@ -160,6 +160,7 @@ link_or_copy $sbcl_arch-arch.h target-arch.h
 link_or_copy $sbcl_arch-lispregs.h target-lispregs.h
 case "$sbcl_os" in
     linux)
+        printf ' :unix' >> $ltf
         printf ' :elf' >> $ltf
         printf ' :linux' >> $ltf
 
@@ -178,6 +179,7 @@ case "$sbcl_os" in
         link_or_copy linux-os.h target-os.h
         ;;
     osf1)
+        printf ' :unix' >> $ltf
         printf ' :elf' >> $ltf
         printf ' :osf1' >> $ltf
         link_or_copy Config.$sbcl_arch-osf1 Config
@@ -185,6 +187,7 @@ case "$sbcl_os" in
         link_or_copy osf1-os.h target-os.h
         ;;
     *bsd)
+        printf ' :unix' >> $ltf
         printf ' :bsd' >> $ltf
         link_or_copy $sbcl_arch-bsd-os.h target-arch-os.h
         link_or_copy bsd-os.h target-os.h
@@ -215,6 +218,7 @@ case "$sbcl_os" in
         esac
         ;;
     darwin)
+        printf ' :unix' >> $ltf
         printf ' :mach-o' >> $ltf
         printf ' :bsd' >> $ltf
         printf ' :darwin' >> $ltf
@@ -229,6 +233,7 @@ case "$sbcl_os" in
         link_or_copy Config.$sbcl_arch-darwin Config
         ;;
     sunos)
+        printf ' :unix' >> $ltf
         printf ' :elf' >> $ltf
         printf ' :sunos' >> $ltf
         if [ $sbcl_arch = "x86" ]; then

diff --git a/version.lisp-expr b/version.lisp-expr
index e01194a..8b7d8c1 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".)
-"1.0.9.5"
+"1.0.9.6"