Steel Bank Common Lisp

Update of /cvsroot/sbcl/sbcl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6445

Modified Files:
	version.lisp-expr 
Log Message:
0.9.8.29:
        Kill a couple of obsolete x86 instructions (illegal in 64-bit
        mode).  Patch from sbcl-devel "Tidying up
        src/compiler/x86-64/insts.lisp" by Lutz Euler on 2006-01-08.


Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.2639
retrieving revision 1.2640
diff -u -d -r1.2639 -r1.2640
--- version.lisp-expr	9 Jan 2006 22:46:14 -0000	1.2639
+++ version.lisp-expr	9 Jan 2006 23:13:19 -0000	1.2640
@@ -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.8.28"
+"0.9.8.29"

Update of /cvsroot/sbcl/sbcl/src/compiler/x86-64
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6445/src/compiler/x86-64

Modified Files:
	insts.lisp 
Log Message:
0.9.8.29:
        Kill a couple of obsolete x86 instructions (illegal in 64-bit
        mode).  Patch from sbcl-devel "Tidying up
        src/compiler/x86-64/insts.lisp" by Lutz Euler on 2006-01-08.


Index: insts.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/x86-64/insts.lisp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- insts.lisp	6 Jan 2006 03:31:27 -0000	1.17
+++ insts.lisp	9 Jan 2006 23:13:19 -0000	1.18
@@ -2787,21 +2787,6 @@
       (emit-byte segment #b11001101)
       (emit-byte segment number)))))
 
-(define-instruction into (segment)
-  (:printer byte ((op #b11001110)))
-  (:emitter
-   (emit-byte segment #b11001110)))
-
-(define-instruction bound (segment reg bounds)
-  (:emitter
-   (let ((size (matching-operand-size reg bounds)))
-     (when (eq size :byte)
-       (error "can't bounds-test bytes: ~S" reg))
-     (maybe-emit-operand-size-prefix segment size)
-     (maybe-emit-rex-for-ea segment bounds reg)
-     (emit-byte segment #b01100010)
-     (emit-ea segment bounds (reg-tn-encoding reg)))))
-
 (define-instruction iret (segment)
   (:printer byte ((op #b11001111)))
   (:emitter

Update of /cvsroot/sbcl/sbcl/src/compiler/generic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30942/src/compiler/generic

Modified Files:
	vm-typetran.lisp vm-type.lisp 
Log Message:
0.9.8.28:
        Oh, the embarrassment. x86-64 was using full calls to GENERIC-< and
        GENERIC-> for (UN)SIGNED-BYTE-64-P and CHECK-(UN)SIGNED-BYTE-64.
        Fix it.

        * Conditionalize type predicate, type predicate wrapper and
          typecheckfun creation on N-WORD-BITS. Add missing 64-bit
          cases.
        * Add missing SIGNED-BYTE-64 VOPs.
        * Nuke the now-unused 32-bit VOPs.          


Index: vm-typetran.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/generic/vm-typetran.lisp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- vm-typetran.lisp	14 Jul 2005 18:35:37 -0000	1.9
+++ vm-typetran.lisp	9 Jan 2006 22:46:14 -0000	1.10
@@ -96,8 +96,14 @@
 #!+sb-unicode (define-type-predicate simple-character-string-p
                   (simple-array character (*)))
 (define-type-predicate system-area-pointer-p system-area-pointer)
+#!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or))
 (define-type-predicate unsigned-byte-32-p (unsigned-byte 32))
+#!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or))
 (define-type-predicate signed-byte-32-p (signed-byte 32))
+#!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
+(define-type-predicate unsigned-byte-64-p (unsigned-byte 64))
+#!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
+(define-type-predicate signed-byte-64-p (signed-byte 64))
 (define-type-predicate vector-t-p (vector t))
 (define-type-predicate vector-nil-p (vector nil))
 (define-type-predicate weak-pointer-p weak-pointer)

Index: vm-type.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/generic/vm-type.lisp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- vm-type.lisp	14 Jul 2005 18:35:36 -0000	1.23
+++ vm-type.lisp	9 Jan 2006 22:46:14 -0000	1.24
@@ -191,10 +191,18 @@
     (numeric-type
      (cond ((type= type (specifier-type 'fixnum))
             'sb!c:check-fixnum)
+           #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or))
            ((type= type (specifier-type '(signed-byte 32)))
             'sb!c:check-signed-byte-32)
+           #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or))
            ((type= type (specifier-type '(unsigned-byte 32)))
             'sb!c:check-unsigned-byte-32)
+           #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
+           ((type= type (specifier-type '(signed-byte 64)))
+            'sb!c:check-signed-byte-64)
+           #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
+           ((type= type (specifier-type '(unsigned-byte 64)))
+            'sb!c:check-unsigned-byte-64)
            (t nil)))
     (fun-type
      'sb!c:check-fun)

Update of /cvsroot/sbcl/sbcl/src/compiler/x86-64
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30942/src/compiler/x86-64

Modified Files:
	type-vops.lisp 
Log Message:
0.9.8.28:
        Oh, the embarrassment. x86-64 was using full calls to GENERIC-< and
        GENERIC-> for (UN)SIGNED-BYTE-64-P and CHECK-(UN)SIGNED-BYTE-64.
        Fix it.

        * Conditionalize type predicate, type predicate wrapper and
          typecheckfun creation on N-WORD-BITS. Add missing 64-bit
          cases.
        * Add missing SIGNED-BYTE-64 VOPs.
        * Nuke the now-unused 32-bit VOPs.          


Index: type-vops.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/x86-64/type-vops.lisp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- type-vops.lisp	14 Jul 2005 19:13:49 -0000	1.7
+++ type-vops.lisp	9 Jan 2006 22:46:14 -0000	1.8
@@ -193,62 +193,43 @@
     (inst shr tmp 61)
     (inst jmp (if not-p :nz :z) target)))
 
-(define-vop (signed-byte-32-p type-predicate)
-  (:translate signed-byte-32-p)
-  (:generator 7
-    ;; (and (fixnum) (or (no bits set >31) (all bits set >31))
-    (move rax-tn value)
-    (inst test rax-tn 7)
-    (inst jmp :ne (if not-p target NOT-TARGET))
-    (inst sar rax-tn (+ 32 3 -1))
-    (if not-p
-        (progn
-          (inst jmp :nz MAYBE)
-          (inst jmp NOT-TARGET))
-        (inst jmp :z target))
-    MAYBE
-    (inst cmp rax-tn -1)
-    (inst jmp (if not-p :ne :eq) target)
-    NOT-TARGET))
+;;; A (SIGNED-BYTE 64) can be represented with either fixnum or a bignum with
+;;; exactly one digit.
 
-(define-vop (check-signed-byte-32 check-type)
-  (:generator 8
-    (let ((nope (generate-error-code vop
-                                     object-not-signed-byte-32-error
-                                     value))
-          (ok (gen-label)))
+(define-vop (signed-byte-64-p type-predicate)
+  (:translate signed-byte-64-p)
+  (:generator 45
+    (multiple-value-bind (yep nope)
+        (if not-p
+            (values not-target target)
+            (values target not-target))
+      (generate-fixnum-test value)
+      (inst jmp :e yep)
       (move rax-tn value)
-      (inst test rax-tn 7)
-      (inst jmp :ne nope)
-      (inst sar rax-tn (+ 32 3 -1))
-      (inst jmp :z ok)
-      (inst cmp rax-tn -1)
+      (inst and al-tn lowtag-mask)
+      (inst cmp al-tn other-pointer-lowtag)
       (inst jmp :ne nope)
-      (emit-label ok)
-      (move result value))))
-
-
-(define-vop (unsigned-byte-32-p type-predicate)
-  (:translate unsigned-byte-32-p)
-  (:generator 7
-    ;; (and (fixnum) (no bits set >31))
-    (move rax-tn value)
-    (inst test rax-tn 7)
-    (inst jmp :ne (if not-p target NOT-TARGET))
-    (inst shr rax-tn (+ 32 sb!vm::n-fixnum-tag-bits))
-    (inst jmp (if not-p :nz :z) target)
+      (loadw rax-tn value 0 other-pointer-lowtag)
+      (inst cmp rax-tn (+ (ash 1 n-widetag-bits) bignum-widetag))
+      (inst jmp (if not-p :ne :e) target))
     NOT-TARGET))
 
-(define-vop (check-unsigned-byte-32 check-type)
-  (:generator 8
-    (let ((nope
-           (generate-error-code vop object-not-unsigned-byte-32-error value)))
+(define-vop (check-signed-byte-64 check-type)
+  (:generator 45
+    (let ((nope (generate-error-code vop
+                                     object-not-signed-byte-64-error
+                                     value)))
+      (generate-fixnum-test value)
+      (inst jmp :e yep)
       (move rax-tn value)
-      (inst test rax-tn 7)
+      (inst and al-tn lowtag-mask)
+      (inst cmp al-tn other-pointer-lowtag)
       (inst jmp :ne nope)
-      (inst shr rax-tn (+ 32 sb!vm::n-fixnum-tag-bits))
-      (inst jmp :nz nope)
-      (move result value))))
+      (loadw rax-tn value 0 other-pointer-lowtag)
+      (inst cmp rax-tn (+ (ash 1 n-widetag-bits) bignum-widetag))
+      (inst jmp :ne nope))
+    YEP
+    (move result value)))
 
 ;;; An (unsigned-byte 64) can be represented with either a positive
 ;;; fixnum, a bignum with exactly one positive digit, or a bignum with

Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30942/src/code

Modified Files:
	typecheckfuns.lisp pred.lisp 
Log Message:
0.9.8.28:
        Oh, the embarrassment. x86-64 was using full calls to GENERIC-< and
        GENERIC-> for (UN)SIGNED-BYTE-64-P and CHECK-(UN)SIGNED-BYTE-64.
        Fix it.

        * Conditionalize type predicate, type predicate wrapper and
          typecheckfun creation on N-WORD-BITS. Add missing 64-bit
          cases.
        * Add missing SIGNED-BYTE-64 VOPs.
        * Nuke the now-unused 32-bit VOPs.          


Index: typecheckfuns.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/typecheckfuns.lisp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- typecheckfuns.lisp	14 Jul 2005 16:30:40 -0000	1.10
+++ typecheckfuns.lisp	9 Jan 2006 22:46:14 -0000	1.11
@@ -46,7 +46,15 @@
            ;; lemme know. -- WHN 2001-10-15
            #(t
              character
-             bit fixnum (unsigned-byte 32) (signed-byte 32)
+             bit fixnum
+             #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or))
+             (unsigned-byte 32)
+             #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
+             (unsigned-byte 64)
+             #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or))
+             (signed-byte 32)
+             #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
+             (signed-byte 64)
              single-float double-float)))
       (coerce (remove-duplicates
                (mapcar (lambda (typespec)
@@ -77,7 +85,10 @@
                           symbol
                           unsigned-byte
                           (unsigned-byte 8)
-                          (unsigned-byte 32))
+                          #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or))
+                          (unsigned-byte 32)
+                          #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
+                          (unsigned-byte 64))
                         ;; systematic names for array types
                         (map 'list
                              (lambda (element-type)

Index: pred.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/pred.lisp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- pred.lisp	29 Dec 2005 22:48:01 -0000	1.21
+++ pred.lisp	9 Jan 2006 22:46:14 -0000	1.22
@@ -93,8 +93,14 @@
   (def-type-predicate-wrapper system-area-pointer-p)
   (def-type-predicate-wrapper weak-pointer-p)
   (def-type-predicate-wrapper vectorp)
+  #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or))
   (def-type-predicate-wrapper unsigned-byte-32-p)
+  #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or))
   (def-type-predicate-wrapper signed-byte-32-p)
+  #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
+  (def-type-predicate-wrapper unsigned-byte-64-p)
+  #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or))
+  (def-type-predicate-wrapper signed-byte-64-p)
   (def-type-predicate-wrapper simple-array-nil-p)
   (def-type-predicate-wrapper simple-array-unsigned-byte-2-p)
   (def-type-predicate-wrapper simple-array-unsigned-byte-4-p)

Update of /cvsroot/sbcl/sbcl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30942

Modified Files:
	NEWS version.lisp-expr 
Log Message:
0.9.8.28:
        Oh, the embarrassment. x86-64 was using full calls to GENERIC-< and
        GENERIC-> for (UN)SIGNED-BYTE-64-P and CHECK-(UN)SIGNED-BYTE-64.
        Fix it.

        * Conditionalize type predicate, type predicate wrapper and
          typecheckfun creation on N-WORD-BITS. Add missing 64-bit
          cases.
        * Add missing SIGNED-BYTE-64 VOPs.
        * Nuke the now-unused 32-bit VOPs.          


Index: NEWS
===================================================================
RCS file: /cvsroot/sbcl/sbcl/NEWS,v
retrieving revision 1.940
retrieving revision 1.941
diff -u -d -r1.940 -r1.941
--- NEWS	7 Jan 2006 18:53:39 -0000	1.940
+++ NEWS	9 Jan 2006 22:46:14 -0000	1.941
@@ -13,6 +13,7 @@
   * optimization: faster implementation of EQUAL
   * optimization: emit more efficient opcodes for some common 
     immediate->register MOV instructions on x86-64.  (thanks to Lutz Euler)
+  * optimization: several other minor code-generation improvements on x86-64
   * fixed segfaults on x86 FreeBSD 7-current.  (thanks to NIIMI Satoshi)
 
 changes in sbcl-0.9.8 relative to sbcl-0.9.7:

Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.2638
retrieving revision 1.2639
diff -u -d -r1.2638 -r1.2639
--- version.lisp-expr	9 Jan 2006 13:00:18 -0000	1.2638
+++ version.lisp-expr	9 Jan 2006 22:46:14 -0000	1.2639
@@ -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.8.27"
+"0.9.8.28"

Update of /cvsroot/sbcl/sbcl-page
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30156

Modified Files:
	platform-support-platforms.lisp 
Log Message:
Add some 0.9.8 binaries.


Index: platform-support-platforms.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl-page/platform-support-platforms.lisp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- platform-support-platforms.lisp	15 Dec 2005 01:07:57 -0000	1.23
+++ platform-support-platforms.lisp	9 Jan 2006 16:06:41 -0000	1.24
@@ -23,9 +23,9 @@
 (define-status :not-available "not-available" "Not available (porters welcome!)" "X")
 (define-status :not-applicable "not-applicable" "No such system" " ")
 
-(define-port :x86 :linux :available :link "http://prdownloads.sourceforge.net/sbcl/sbcl-0.9.7-x86-linux-binary.tar.bz2?download")
-(define-port :x86-64 :linux :available :link "http://prdownloads.sourceforge.net/sbcl/sbcl-0.9.7-x86-64-linux-binary.tar.bz2?download")
-(define-port :ppc :linux :available :link "http://prdownloads.sourceforge.net/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2?download")
+(define-port :x86 :linux :available :link "http://prdownloads.sourceforge.net/sbcl/sbcl-0.9.8-x86-linux-binary.tar.bz2?download")
+(define-port :x86-64 :linux :available :link "http://prdownloads.sourceforge.net/sbcl/sbcl-0.9.8-x86-64-linux-binary.tar.bz2?download")
+(define-port :ppc :linux :available :link "http://prdownloads.sourceforge.net/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2?download")
 (define-port :mips :linux :available :link "http://prdownloads.sourceforge.net/sbcl/sbcl-0.8.8-mips-linux-binary.tar.bz2?download")
 (define-port :sparc :linux :available :link "http://prdownloads.sourceforge.net/sbcl/sbcl-0.9.1-sparc-linux-binary.tar.bz2?download")
 (define-port :alpha :linux :available :link "http://prdownloads.sourceforge.net/sbcl/sbcl-0.9.5-alpha-linux-binary.tar.bz2?download")
@@ -36,7 +36,7 @@
 (define-port :sparc :solaris :available :link "http://prdownloads.sourceforge.net/sbcl/sbcl-0.9.4-sparc-sunos-binary.tar.bz2?download")
 (define-port :x86 :solaris :available :link "http://prdownloads.sourceforge.net/sbcl/sbcl-0.9.4-x86-solaris-binary.tar.bz2?download")
 
-(define-port :x86 :freebsd :available :link "http://prdownloads.sourceforge.net/sbcl/sbcl-0.9.7-x86-freebsd-binary.tar.bz2?download")
+(define-port :x86 :freebsd :available :link "http://prdownloads.sourceforge.net/sbcl/sbcl-0.9.8-x86-freebsd-binary.tar.bz2?download")
 (define-port :x86 :netbsd :available :link "http://prdownloads.sourceforge.net/sbcl/sbcl-0.9.1-x86-netbsd-binary.tar.bz2?download")
 (define-port :x86 :openbsd :available :link "http://prdownloads.sourceforge.net/sbcl/sbcl-0.8.10-x86-openbsd-binary.tar.bz2?download")

Update of /cvsroot/sbcl/sbcl/doc/internals
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19069/doc/internals

Modified Files:
	make-top.sh 
Log Message:
0.9.8.27:
	Merge patch from James Bielman fixing self-build under Win32.
	... a little bit of an accident ensued; I ran 
		canonicalize-whitespace on .sh files, which seemed to
		work (except on wc.sh) until it scribbled all over 
		make.sh, confusing the shell interpreter utterly.
	... the resulting files have built the system, nevertheless.


Index: make-top.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/doc/internals/make-top.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- make-top.sh	19 Jun 2005 16:16:49 -0000	1.1
+++ make-top.sh	9 Jan 2006 13:00:18 -0000	1.2
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-# 	After the ordeal, we went back to the Factory. Greenblatt said he
+#       After the ordeal, we went back to the Factory. Greenblatt said he
 # was gonna locate us in a cell. He said: "Kid, I'm gonna INTERN you in a
 # cell. I want your manual and your mouse."
-#	I said, "Greenblatt, I can understand your wantin' my manual, so
+#       I said, "Greenblatt, I can understand your wantin' my manual, so
 # I don't have any documentation about the cell, but what do you want my
-# mouse for?" and he said, "Kid, we don't want any window system problems". 
+# mouse for?" and he said, "Kid, we don't want any window system problems".
 # I said, "Greenblatt, did you think I was gonna deexpose myself for
 # litterin'?"
-#	Greenblatt said he was makin' sure, and, friends, Greenblatt
+#       Greenblatt said he was makin' sure, and, friends, Greenblatt
 # was, 'cause he took out the left Meta-key so I couldn't double bucky the
 # rubout and cold-boot, and he took out the Inspector so I couldn't
 # click-left on Modify, set the PROCESS-WARM-BOOT-ACTION on the window,

Update of /cvsroot/sbcl/sbcl/tools-for-build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19069/tools-for-build

Modified Files:
	grovel-features.sh grovel-headers.c sparc-funcdef.sh 
	whitespacely-canonical-filenames 
Log Message:
0.9.8.27:
	Merge patch from James Bielman fixing self-build under Win32.
	... a little bit of an accident ensued; I ran 
		canonicalize-whitespace on .sh files, which seemed to
		work (except on wc.sh) until it scribbled all over 
		make.sh, confusing the shell interpreter utterly.
	... the resulting files have built the system, nevertheless.


Index: grovel-features.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tools-for-build/grovel-features.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- grovel-features.sh	17 Oct 2005 10:58:30 -0000	1.7
+++ grovel-features.sh	9 Jan 2006 13:00:18 -0000	1.8
@@ -12,7 +12,7 @@
     $GNUMAKE $bin -I ../src/runtime > /dev/null 2>&1 && ./$bin > /dev/null 2>&1
     if [ "$?" = 104 ]
     then
-	printf " :$1"
+        printf " :$1"
     fi
     rm -f $bin
 }

Index: grovel-headers.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tools-for-build/grovel-headers.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- grovel-headers.c	14 Jul 2005 20:24:19 -0000	1.10
+++ grovel-headers.c	9 Jan 2006 13:00:19 -0000	1.11
@@ -20,22 +20,27 @@
 
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/times.h>
+#ifdef _WIN32
+  #include <stdlib.h>
+#else
+  #include <sys/times.h>
+  #include <sys/wait.h>
+  #include <sys/ioctl.h>
+  #include <sys/termios.h>
+  #ifdef __APPLE_CC__
+    #include "../src/runtime/ppc-darwin-dlshim.h"
+    #include "../src/runtime/ppc-darwin-langinfo.h"
+  #else
+    #include <dlfcn.h>
+    #include <langinfo.h>
+  #endif
+#endif
+
 #include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/ioctl.h>
-#include <sys/termios.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <signal.h>
 #include <errno.h>
-#ifdef __APPLE_CC__
-  #include "../src/runtime/ppc-darwin-dlshim.h"
-  #include "../src/runtime/ppc-darwin-langinfo.h"
-#else
-  #include <dlfcn.h>
-  #include <langinfo.h>
-#endif
 
 #include "genesis/config.h"
 
@@ -74,7 +79,9 @@
 ;;;; See the program \"grovel-headers.c\".\n\
 \n\
 ");
-
+#ifdef _WIN32
+    printf (";;; This file is presently unused for the Windows version of sbcl.\n");
+#else
     printf("(in-package \"SB!ALIEN\")\n\n");
 
     printf (";;;flags for dlopen()\n");
@@ -223,5 +230,6 @@
     defsignal("sigxcpu", SIGXCPU);
     defsignal("sigxfsz", SIGXFSZ);
 #endif
+#endif // _WIN32
     return 0;
 }

Index: sparc-funcdef.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tools-for-build/sparc-funcdef.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sparc-funcdef.sh	10 Sep 2004 15:36:18 -0000	1.3
+++ sparc-funcdef.sh	9 Jan 2006 13:00:19 -0000	1.4
@@ -2,23 +2,23 @@
 
 TMP=sparc-funcdef.S
 
-SUN_FUNCDEF="#define FUNCDEF(x)	.type x, #function"
-GNU_FUNCDEF="#define FUNCDEF(x)	.type x,@function"
+SUN_FUNCDEF="#define FUNCDEF(x) .type x, #function"
+GNU_FUNCDEF="#define FUNCDEF(x) .type x,@function"
 
 echo $SUN_FUNCDEF > $TMP
 # cribbed from ldso_stubs, just "some code"
 echo "
-.globl ldso_stub__printf ;           
-	FUNCDEF(ldso_stub__printf) ; 
-ldso_stub__printf: ;                 
-	sethi %hi(printf),%g1 ;      
-	jmpl %g1+%lo(printf),%g0 ;   
-	nop /* delay slot*/ ;        
-.Lprintfe1: ;                        
-	.size	 ldso_stub__printf,.Lprintfe1-ldso_stub__printf ;" >> $TMP
+.globl ldso_stub__printf ;
+        FUNCDEF(ldso_stub__printf) ;
+ldso_stub__printf: ;
+        sethi %hi(printf),%g1 ;
+        jmpl %g1+%lo(printf),%g0 ;
+        nop /* delay slot*/ ;
+.Lprintfe1: ;
+        .size    ldso_stub__printf,.Lprintfe1-ldso_stub__printf ;" >> $TMP
 
 if $GNUMAKE sparc-funcdef.o > /dev/null 2>&1 ; then
-    echo $SUN_FUNCDEF 
+    echo $SUN_FUNCDEF
 else
     echo $GNU_FUNCDEF
 fi

Index: whitespacely-canonical-filenames
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tools-for-build/whitespacely-canonical-filenames,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- whitespacely-canonical-filenames	12 Jul 2005 12:58:02 -0000	1.1
+++ whitespacely-canonical-filenames	9 Jan 2006 13:00:19 -0000	1.2
@@ -11,7 +11,7 @@
 # conservative syntax used in SBCL sources)
 source_extensions='.lisp .lisp-expr .c .h'
 # other candidates:
-#   .sh
+#   .sh: if ./make.sh is altered, Bad Things happen
 #   ?
 
 for source_extension in $source_extensions; do

Update of /cvsroot/sbcl/sbcl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19069

Modified Files:
	binary-distribution.sh clean.sh distclean.sh find-gnumake.sh 
	install.sh make-config.sh make-genesis-2.sh make-target-1.sh 
	make-target-contrib.sh make.sh slam.sh source-distribution.sh 
	version.lisp-expr 
Log Message:
0.9.8.27:
	Merge patch from James Bielman fixing self-build under Win32.
	... a little bit of an accident ensued; I ran 
		canonicalize-whitespace on .sh files, which seemed to
		work (except on wc.sh) until it scribbled all over 
		make.sh, confusing the shell interpreter utterly.
	... the resulting files have built the system, nevertheless.


Index: binary-distribution.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/binary-distribution.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- binary-distribution.sh	16 Sep 2005 13:26:39 -0000	1.12
+++ binary-distribution.sh	9 Jan 2006 13:00:17 -0000	1.13
@@ -18,8 +18,8 @@
     $b/pubring.pgp \
     $b/contrib/asdf-module.mk \
     $b/contrib/vanilla-module.mk \
-    `for dir in $b/contrib/*; do 
-         if test -d $dir && test -f $dir/test-passed; then 
+    `for dir in $b/contrib/*; do
+         if test -d $dir && test -f $dir/test-passed; then
              echo $dir
          fi
      done`

Index: clean.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/clean.sh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- clean.sh	16 Sep 2005 13:26:39 -0000	1.21
+++ clean.sh	9 Jan 2006 13:00:17 -0000	1.22
@@ -40,7 +40,7 @@
 #     are never in the sources, so must've been created
 #   sbcl
 #     the runtime environment, created by compiling C code
-#   sbcl.h 
+#   sbcl.h
 #     information about Lisp code needed to build the runtime environment,
 #     created by running GENESIS
 #   Config, target
@@ -59,7 +59,7 @@
 #   .#*, *.orig, .*.orig, *.rej
 #     rubbish left behind by CVS updates
 #   *.htm, *.html
-#     The system doc sources are mostly texinfo, plus various odds 
+#     The system doc sources are mostly texinfo, plus various odds
 #     and ends like docstrings embedded in .lisp sources; any HTML is
 #     automatically-generated output.
 #   depend
@@ -73,34 +73,34 @@
 #   test-passed
 #     generated by automatic directory-test-thyself procedure
 find . \( \
-	-type l -o \
-	-name '*~' -o \
-	-name '#*#' -o \
-	-name '.#*' -o \
-	-name '*.orig' -o \
-	-name '.*.orig' -o \
+        -type l -o \
+        -name '*~' -o \
+        -name '#*#' -o \
+        -name '.#*' -o \
+        -name '*.orig' -o \
+        -name '.*.orig' -o \
         -name '*.rej' -o \
-	-name '?*.x86f' -o \
-	-name '?*.axpf' -o \
-	-name '?*.lbytef' -o \
-	-name '?*.fasl' -o \
-	-name 'core' -o \
-	-name '?*.core' -o \
-	-name '*.map' -o \
-	-name '*.nm' -o \
-	-name '*.host-obj' -o \
-	-name '*.lisp-obj' -o \
-	-name '*.target-obj' -o \
-	-name '*.lib' -o \
-	-name '*.tmp' -o \
-	-name '*.lisp-temp' -o \
-	-name '*.o' -o \
-	-name '*.so' -o \
-	-name 'a.out' -o \
-	-name 'sbcl' -o \
-	-name 'sbcl.h' -o \
-	-name 'depend' -o \
-	-name 'TAGS' -o \
-	-name 'tags' -o \
-	-name 'test-passed' -o \
-	-name 'local-target-features.lisp-expr' \) -print | xargs rm -f
+        -name '?*.x86f' -o \
+        -name '?*.axpf' -o \
+        -name '?*.lbytef' -o \
+        -name '?*.fasl' -o \
+        -name 'core' -o \
+        -name '?*.core' -o \
+        -name '*.map' -o \
+        -name '*.nm' -o \
+        -name '*.host-obj' -o \
+        -name '*.lisp-obj' -o \
+        -name '*.target-obj' -o \
+        -name '*.lib' -o \
+        -name '*.tmp' -o \
+        -name '*.lisp-temp' -o \
+        -name '*.o' -o \
+        -name '*.so' -o \
+        -name 'a.out' -o \
+        -name 'sbcl' -o \
+        -name 'sbcl.h' -o \
+        -name 'depend' -o \
+        -name 'TAGS' -o \
+        -name 'tags' -o \
+        -name 'test-passed' -o \
+        -name 'local-target-features.lisp-expr' \) -print | xargs rm -f

Index: distclean.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/distclean.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- distclean.sh	16 Sep 2005 13:26:39 -0000	1.4
+++ distclean.sh	9 Jan 2006 13:00:17 -0000	1.5
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-# a superset of clean.sh, cleaning up not only automatically 
+# a superset of clean.sh, cleaning up not only automatically
 # generated files but other things (e.g. customization files)
 # which shouldn't be in the distribution
 
@@ -16,10 +16,10 @@
 # Since the CVS/ subdirectories on my (WHN) machine have CVS/Root
 # containing
 #    :ext:wnewman@...
-# they're not useful for anyone else, so blow them away. (And even 
-# if we could set them up to refer to CVS in a way that someone else 
-# could use, perhaps referring to SourceForge anoncvs, what'd be the 
-# point? I'd expect a comfortable majority of those who want to do 
+# they're not useful for anyone else, so blow them away. (And even
+# if we could set them up to refer to CVS in a way that someone else
+# could use, perhaps referring to SourceForge anoncvs, what'd be the
+# point? I'd expect a comfortable majority of those who want to do
 # CVS operations would be inclined to start with "cvs co" anyway.)
 find . \( -type d -a -name CVS \) -print | xargs rm -r
 

Index: find-gnumake.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/find-gnumake.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- find-gnumake.sh	16 Sep 2005 13:26:39 -0000	1.4
+++ find-gnumake.sh	9 Jan 2006 13:00:17 -0000	1.5
@@ -11,7 +11,7 @@
     GNUMAKE=gmake
   elif [ -x "`which gnumake`" ] ; then
     # MacOS X aka Darwin
-    GNUMAKE=gnumake  
+    GNUMAKE=gnumake
   elif [ "GNU Make" = "`make -v | head -n 1 | cut -b 0-8`" ]; then
     GNUMAKE=make
   else

Index: install.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/install.sh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- install.sh	16 Sep 2005 13:26:39 -0000	1.22
+++ install.sh	9 Jan 2006 13:00:17 -0000	1.23
@@ -3,10 +3,10 @@
 
 # Install SBCL files into the usual places.
 
-ensure_dirs () 
+ensure_dirs ()
 {
-    for j in $*; do 
-	test -d $j || mkdir -p $j
+    for j in $*; do
+        test -d $j || mkdir -p $j
     done;
 }
 
@@ -28,10 +28,10 @@
 # Before doing anything else, make sure we have an SBCL to install
 if [ -f src/runtime/sbcl ]; then
     if [ -f output/sbcl.core ]; then
-	true
+        true
     else
-	echo "output/sbcl.core not found, aborting installation."
-	exit 1
+        echo "output/sbcl.core not found, aborting installation."
+        exit 1
     fi
 else
     echo "src/runtime/sbcl not found, aborting installation."
@@ -58,7 +58,7 @@
 cp src/runtime/sbcl $BUILD_ROOT$INSTALL_ROOT/bin/
 cp output/sbcl.core $BUILD_ROOT$SBCL_HOME/sbcl.core
 
-# installing contrib 
+# installing contrib
 
 SBCL="`pwd`/src/runtime/sbcl --noinform --core `pwd`/output/sbcl.core --userinit /dev/null --sysinit /dev/null --disable-debugger"
 SBCL_BUILDING_CONTRIB=1

Index: make-config.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/make-config.sh,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- make-config.sh	6 Jan 2006 01:11:07 -0000	1.55
+++ make-config.sh	9 Jan 2006 13:00:17 -0000	1.56
@@ -17,6 +17,74 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
+case `uname` in
+    Linux)
+        sbcl_os="linux"
+        ;;
+    OSF1)
+        # it's changed name twice since it was called OSF/1: clearly
+        # the marketers forgot to tell the engineers about Digital Unix
+        # _or_ OSF/1 ...
+        sbcl_os="osf1"
+        ;;
+    *BSD)
+        case `uname` in
+            FreeBSD)
+                sbcl_os="freebsd"
+                ;;
+            OpenBSD)
+                sbcl_os="openbsd"
+                ;;
+            NetBSD)
+                sbcl_os="netbsd"
+                ;;
+            *)
+                echo unsupported BSD variant: `uname`
+                exit 1
+                ;;
+        esac
+        ;;
+    Darwin)
+        sbcl_os="darwin"
+        ;;
+    SunOS)
+        sbcl_os="sunos"
+        ;;
+    CYGWIN* | WindowsNT | MINGW*)
+        sbcl_os="win32"
+        ;;
+    *)
+        echo unsupported OS type: `uname`
+        exit 1
+        ;;
+esac
+
+link_or_copy() {
+   if [ "$sbcl_os" = "win32" ] ; then
+       cp -r "$1" "$2"
+   else
+        ln -s "$1" "$2"
+   fi
+}
+
+remove_dir_safely() {
+   if [ "$sbcl_os" = "win32" ] ; then
+        if [ -d "$1" ] ; then
+            rm -rf "$1"
+        elif [ -e "$1" ] ; then
+            echo "I'm afraid to remove non-directory $1."
+            exit 1
+        fi
+    else
+        if [ -h "$1" ] ; then
+            rm "$1"
+        elif [ -w "$1" ] ; then
+            echo "I'm afraid to replace non-symlink $1 with a symlink."
+            exit 1
+        fi
+    fi
+}
+
 echo //entering make-config.sh
 
 echo //ensuring the existence of output/ directory
@@ -30,10 +98,10 @@
 printf '(' >> $ltf
 
 echo //guessing default target CPU architecture from host architecture
-case `uname -m` in 
-    *86) guessed_sbcl_arch=x86 ;; 
+case `uname -m` in
+    *86) guessed_sbcl_arch=x86 ;;
     i86pc) guessed_sbcl_arch=x86 ;;
-    *x86_64) guessed_sbcl_arch=x86-64 ;; 
+    *x86_64) guessed_sbcl_arch=x86-64 ;;
     [Aa]lpha) guessed_sbcl_arch=alpha ;;
     sparc*) guessed_sbcl_arch=sparc ;;
     sun*) guessed_sbcl_arch=sparc ;;
@@ -43,10 +111,10 @@
     mips*) guessed_sbcl_arch=mips ;;
     *)
         # If we're not building on a supported target architecture, we
-	# we have no guess, but it's not an error yet, since maybe
-	# target architecture will be specified explicitly below.
-	guessed_sbcl_arch=''
-	;;
+        # we have no guess, but it's not an error yet, since maybe
+        # target architecture will be specified explicitly below.
+        guessed_sbcl_arch=''
+        ;;
 esac
 
 echo //setting up CPU-architecture-dependent information
@@ -56,35 +124,28 @@
     echo "can't guess target SBCL architecture, need SBCL_ARCH environment var"
     exit 1
 fi
-printf ":%s" "$sbcl_arch" >> $ltf 
+printf ":%s" "$sbcl_arch" >> $ltf
 
 for d in src/compiler src/assembly; do
     echo //setting up symlink $d/target
     original_dir=`pwd`
+    remove_dir_safely "$d/target"
     cd ./$d
-    if [ -h target ] ; then
-	rm target
-    elif [ -w target ] ; then
-	echo "I'm afraid to replace non-symlink $d/target with a symlink."
-	exit 1
-    fi
     if [ -d $sbcl_arch ] ; then
-	ln -s $sbcl_arch target
+        link_or_copy $sbcl_arch target
     else
-	echo "missing sbcl_arch directory $PWD/$sbcl_arch"
-	exit 1
+        echo "missing sbcl_arch directory $PWD/$sbcl_arch"
+        exit 1
     fi
     cd $original_dir
 done
 
 echo //setting up symlink src/compiler/assembly
-if [ -h src/compiler/assembly ] ; then
-    rm src/compiler/assembly
-elif [ -w src/compiler/assembly ] ; then
-    echo "I'm afraid to replace non-symlink compiler/assembly with a symlink."
-    exit 1
-fi
-ln -s ../assembly src/compiler/assembly
+remove_dir_safely src/compiler/assembly
+original_dir=`pwd`
+cd src/compiler
+link_or_copy ../assembly assembly
+cd $original_dir
 
 echo //setting up OS-dependent information
 original_dir=`pwd`
@@ -93,82 +154,78 @@
 # KLUDGE: these two logically belong in the previous section
 # ("architecture-dependent"); it seems silly to enforce this in terms
 # of the shell script, though. -- CSR, 2002-02-03
-ln -s $sbcl_arch-arch.h target-arch.h
-ln -s $sbcl_arch-lispregs.h target-lispregs.h
-case `uname` in 
-    Linux)
-	printf ' :elf' >> $ltf
-	printf ' :linux' >> $ltf
-	sbcl_os="linux"
-	if [ $sbcl_arch = "x86-64" ]; then
-            ln -s Config.x86_64-linux Config                                    
-	else                                                                    
-            ln -s Config.$sbcl_arch-linux Config                                
-	fi 
-	ln -s $sbcl_arch-linux-os.h target-arch-os.h
-	ln -s linux-os.h target-os.h
-	;;
-    OSF1)			
-        # it's changed name twice since it was called OSF/1: clearly
-        # the marketers forgot to tell the engineers about Digital Unix
-        # _or_ OSF/1 ...
-	printf ' :elf' >> $ltf
-	printf ' :osf1' >> $ltf
-	sbcl_os="osf1"
-        ln -s Config.$sbcl_arch-osf1 Config
-	ln -s $sbcl_arch-osf1-os.h target-arch-os.h
-	ln -s osf1-os.h target-os.h
-	;;
-    *BSD)
-	printf ' :bsd' >> $ltf
-	ln -s $sbcl_arch-bsd-os.h target-arch-os.h
-	ln -s bsd-os.h target-os.h
-	case `uname` in
-	    FreeBSD)
-		printf ' :elf' >> $ltf
-		printf ' :freebsd' >> $ltf
-		sbcl_os="freebsd"
-		ln -s Config.$sbcl_arch-freebsd Config
-		;;
-	    OpenBSD)
-		printf ' :elf' >> $ltf
-		printf ' :openbsd' >> $ltf
-		sbcl_os="openbsd"
-		ln -s Config.$sbcl_arch-openbsd Config
-		;;
-	    NetBSD)
+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 ' :elf' >> $ltf
+        printf ' :linux' >> $ltf
+        if [ $sbcl_arch = "x86-64" ]; then
+            link_or_copy Config.x86_64-linux Config
+        else
+            link_or_copy Config.$sbcl_arch-linux Config
+        fi
+        link_or_copy $sbcl_arch-linux-os.h target-arch-os.h
+        link_or_copy linux-os.h target-os.h
+        ;;
+    osf1)
+        printf ' :elf' >> $ltf
+        printf ' :osf1' >> $ltf
+        link_or_copy Config.$sbcl_arch-osf1 Config
+        link_or_copy $sbcl_arch-osf1-os.h target-arch-os.h
+        link_or_copy osf1-os.h target-os.h
+        ;;
+    *bsd)
+        printf ' :bsd' >> $ltf
+        link_or_copy $sbcl_arch-bsd-os.h target-arch-os.h
+        link_or_copy bsd-os.h target-os.h
+        case "$sbcl_os" in
+            freebsd)
+                printf ' :elf' >> $ltf
+                printf ' :freebsd' >> $ltf
+                link_or_copy Config.$sbcl_arch-freebsd Config
+                ;;
+            openbsd)
+                printf ' :elf' >> $ltf
+                printf ' :openbsd' >> $ltf
+                link_or_copy Config.$sbcl_arch-openbsd Config
+                ;;
+            netbsd)
                 printf ' :netbsd' >> $ltf
-		printf ' :elf' >> $ltf
-		sbcl_os="netbsd"
-		ln -s Config.$sbcl_arch-netbsd Config
-		;;
-	    *)
-		echo unsupported BSD variant: `uname`
-		exit 1
-		;;
-	esac
-	;;
-    Darwin)
-	printf ' :mach-o' >> $ltf
-	printf ' :bsd' >> $ltf
-	sbcl_os="darwin"
-	ln -s $sbcl_arch-darwin-os.h target-arch-os.h
-	ln -s bsd-os.h target-os.h
-	printf ' :darwin' >> $ltf
-	ln -s Config.$sbcl_arch-darwin Config
-	;;
-    SunOS)
-	printf ' :elf' >> $ltf
+                printf ' :elf' >> $ltf
+                link_or_copy Config.$sbcl_arch-netbsd Config
+                ;;
+            *)
+                echo unsupported BSD variant: `uname`
+                exit 1
+                ;;
+        esac
+        ;;
+    darwin)
+        printf ' :mach-o' >> $ltf
+        printf ' :bsd' >> $ltf
+        link_or_copy $sbcl_arch-darwin-os.h target-arch-os.h
+        link_or_copy bsd-os.h target-os.h
+        printf ' :darwin' >> $ltf
+        link_or_copy Config.$sbcl_arch-darwin Config
+        ;;
+    sunos)
+        printf ' :elf' >> $ltf
         printf ' :sunos' >> $ltf
-	sbcl_os="sunos"
-	ln -s Config.$sbcl_arch-sunos Config
-	ln -s $sbcl_arch-sunos-os.h target-arch-os.h
-	ln -s sunos-os.h target-os.h
-	;;
+        link_or_copy Config.$sbcl_arch-sunos Config
+        link_or_copy $sbcl_arch-sunos-os.h target-arch-os.h
+        link_or_copy sunos-os.h target-os.h
+        ;;
+    win32)
+        printf ' :win32' >> $ltf
+        link_or_copy Config.$sbcl_arch-win32 Config
+        link_or_copy $sbcl_arch-win32-os.h target-arch-os.h
+        link_or_copy win32-os.h target-os.h
+        ;;
     *)
-	echo unsupported OS type: `uname`
-	exit 1
-	;;
+        echo unsupported OS type: `uname`
+        exit 1
+        ;;
 esac
 cd $original_dir
 
@@ -198,7 +255,7 @@
     printf ' :gencgc :stack-grows-downward-not-upward :c-stack-is-control-stack' >> $ltf
     printf ' :stack-allocatable-closures :alien-callbacks' >> $ltf
     if [ "$sbcl_os" = "linux" ] || [ "$sbcl_os" = "freebsd" ] || [ "$sbcl_os" = "netbsd" ] || [ "$sbcl_os" = "sunos" ]; then
-	printf ' :linkage-table' >> $ltf
+        printf ' :linkage-table' >> $ltf
     fi
 elif [ "$sbcl_arch" = "x86-64" ]; then
     printf ' :gencgc :stack-grows-downward-not-upward :c-stack-is-control-stack :linkage-table' >> $ltf
@@ -233,13 +290,13 @@
         exit 1
     fi
 elif [ "$sbcl_arch" = "sparc" ]; then
-    # Test the compiler in order to see if we are building on Sun 
+    # Test the compiler in order to see if we are building on Sun
     # toolchain as opposed to GNU binutils, and write the appropriate
-    # FUNCDEF macro for assembler. No harm in running this on sparc-linux 
+    # FUNCDEF macro for assembler. No harm in running this on sparc-linux
     # as well.
     sh tools-for-build/sparc-funcdef.sh > src/runtime/sparc-funcdef.h
     if [ "$sbcl_os" = "sunos" ] || [ "$sbcl_os" = "linux" ]; then
-	printf ' :linkage-table' >> $ltf
+        printf ' :linkage-table' >> $ltf
     fi
     printf ' :stack-allocatable-closures' >> $ltf
 elif [ "$sbcl_arch" = "alpha" ]; then

Index: make-genesis-2.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/make-genesis-2.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- make-genesis-2.sh	29 Dec 2005 16:08:31 -0000	1.9
+++ make-genesis-2.sh	9 Jan 2006 13:00:18 -0000	1.10
@@ -27,7 +27,7 @@
 # symbol table data on the C runtime. And we can get that symbol
 # data only after the C runtime has been built. Therefore, even
 # though we ran GENESIS earlier, we couldn't get it to make a .core
-# file at that time; but we needed to run it earlier in order to 
+# file at that time; but we needed to run it earlier in order to
 # get to where we can write a .core file.)
 echo //loading and running GENESIS to create cold-sbcl.core
 $SBCL_XC_HOST < make-genesis-2.lisp

Index: make-target-1.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/make-target-1.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- make-target-1.sh	16 Sep 2005 13:26:39 -0000	1.14
+++ make-target-1.sh	9 Jan 2006 13:00:18 -0000	1.15
@@ -24,7 +24,7 @@
 #
 # (This C build has to come after the first genesis in order to get
 # the sbcl.h the C build needs, and come before the second genesis in
-# order to produce the symbol table file that second genesis needs. It 
+# order to produce the symbol table file that second genesis needs. It
 # could come either before or after running the cross compiler; that
 # doesn't matter.)
 echo //building runtime system and symbol table file

Index: make-target-contrib.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/make-target-contrib.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- make-target-contrib.sh	16 Sep 2005 13:26:39 -0000	1.15
+++ make-target-contrib.sh	9 Jan 2006 13:00:18 -0000	1.16
@@ -51,7 +51,7 @@
 for i in contrib/*; do
     test -d $i && test -f $i/Makefile || continue;
     # export INSTALL_DIR=$SBCL_HOME/`basename $i `
-    test -f $i/test-passed && rm $i/test-passed 
+    test -f $i/test-passed && rm $i/test-passed
     $GNUMAKE -C $i test && touch $i/test-passed
 done
 
@@ -62,10 +62,10 @@
 do
   if [ -d "$dir" -a -f "$dir/Makefile" -a ! -f "$dir/test-passed" ]; then
       if $HEADER_HAS_BEEN_PRINTED; then
-	  echo > /dev/null
+          echo > /dev/null
       else
-	  echo "Failed contribs:"
-	  HEADER_HAS_BEEN_PRINTED=true
+          echo "Failed contribs:"
+          HEADER_HAS_BEEN_PRINTED=true
       fi
       echo "  `basename $dir`"
   fi

Index: make.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/make.sh,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- make.sh	16 Sep 2005 13:26:39 -0000	1.45
+++ make.sh	9 Jan 2006 13:00:18 -0000	1.46
@@ -33,7 +33,7 @@
 #                 endlessly for a programmer to help it out with input
 #                 on *DEBUG-IO*
 #   "lisp -batch" to use an existing CMU CL binary as a cross-compilation host
-#   "lisp -noinit -batch" 
+#   "lisp -noinit -batch"
 #                 to use an existing CMU CL binary as a cross-compilation host
 #                 when you have weird things in your .cmucl-init file
 #   "openmcl --batch"
@@ -50,7 +50,7 @@
 # optimizations (especially specializable arrays) that it doesn't
 # know how to implement how in a portable way. (Or maybe that wouldn't
 # require a second pass, just testing at build-the-cross-compiler time
-# whether the cross-compilation host returns suitable values from 
+# whether the cross-compilation host returns suitable values from
 # UPGRADED-ARRAY-ELEMENT-TYPE?)
 
 LANG=C
@@ -87,7 +87,7 @@
 #     identify the target architecture).
 #   On the host system:
 #     SBCL_XC_HOST=<whatever> sh make-host-1.sh
-#   Copy src/runtime/genesis/*.h from the host system to the target 
+#   Copy src/runtime/genesis/*.h from the host system to the target
 #     system.
 #   On the target system:
 #     sh make-target-1.sh
@@ -112,7 +112,7 @@
 NPASSED=`find contrib -name test-passed -print | wc -l`
 echo
 echo "The build seems to have finished successfully, including $NPASSED (out of $NCONTRIBS)"
-echo "contributed modules. If you would like to run more extensive tests on" 
+echo "contributed modules. If you would like to run more extensive tests on"
 echo "the new SBCL, you can try:"
 echo
 echo "  cd tests && sh ./run-tests.sh"
@@ -127,7 +127,7 @@
 echo
 echo "To install SBCL (more information in INSTALL):"
 echo
-echo "  sh install.sh" 
+echo "  sh install.sh"
 
 build_finished=`date`
 echo

Index: slam.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/slam.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- slam.sh	16 Sep 2005 13:26:39 -0000	1.13
+++ slam.sh	9 Jan 2006 13:00:18 -0000	1.14
@@ -22,7 +22,7 @@
 # This script is not a reliable way to build the system, but it is
 # fast.:-| It can be useful if you are trying to debug a low-level
 # problem, e.g. a problem in src/runtime/*.c or in
-# src/code/cold-init.lisp. Soon, you'll find yourself wanting to 
+# src/code/cold-init.lisp. Soon, you'll find yourself wanting to
 # test a small change in a file compiled into cold-sbcl.core without
 # redoing the entire rebuild-the-system-from-scratch process. You may be
 # able to avoid a complete make-host-2.sh by just letting this script
@@ -57,10 +57,10 @@
 #    Mostly it looks as though such limitations aren't fixable without
 #    the aforementioned rearchitecting or solving the halting problem.
 #
-# To make this work, you need an after-xc.core file. To cause the 
+# To make this work, you need an after-xc.core file. To cause the
 # system to generate an after-xc.core file, you need
 # :SB-AFTER-XC-CORE in target features during an ordinary build.
-# See the comments in base-target-features.lisp-expr for the 
+# See the comments in base-target-features.lisp-expr for the
 # recommended way to make that happen.
 #######################################################################
 
@@ -89,9 +89,9 @@
            ;;
     openmcl)
            LISP="openmcl"
-	   INIT="-b"
-	   CORE="-I"
-	   ;;
+           INIT="-b"
+           CORE="-I"
+           ;;
     *)     echo unknown host type: "$HOST_TYPE"
            echo should be one of "sbcl", "cmucl", or "clisp"
            exit 1

Index: source-distribution.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/source-distribution.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- source-distribution.sh	16 Sep 2005 13:26:39 -0000	1.2
+++ source-distribution.sh	9 Jan 2006 13:00:18 -0000	1.3
@@ -4,4 +4,4 @@
 # Create a source distribution. (You should run clean.sh first.)
 
 b=${1:?missing base directory name argument}
-tar cf $b-source.tar $b 
+tar cf $b-source.tar $b

Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.2637
retrieving revision 1.2638
diff -u -d -r1.2637 -r1.2638
--- version.lisp-expr	9 Jan 2006 12:45:47 -0000	1.2637
+++ version.lisp-expr	9 Jan 2006 13:00:18 -0000	1.2638
@@ -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.8.26"
+"0.9.8.27"

Update of /cvsroot/sbcl/sbcl/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19069/tests

Modified Files:
	clocc-ansi.test.sh clos.test.sh compiler.test.sh core.test.sh 
	expect.sh filesys.test.sh finalize.test.sh run-program.test.sh 
	run-tests.sh side-effectful-pathnames.test.sh stress-gc.sh 
	toplevel.sh 
Log Message:
0.9.8.27:
	Merge patch from James Bielman fixing self-build under Win32.
	... a little bit of an accident ensued; I ran 
		canonicalize-whitespace on .sh files, which seemed to
		work (except on wc.sh) until it scribbled all over 
		make.sh, confusing the shell interpreter utterly.
	... the resulting files have built the system, nevertheless.


Index: clocc-ansi.test.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/clocc-ansi.test.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- clocc-ansi.test.sh	14 Oct 2001 03:48:05 -0000	1.2
+++ clocc-ansi.test.sh	9 Jan 2006 13:00:18 -0000	1.3
@@ -20,7 +20,7 @@
 # While most of SBCL is derived from the CMU CL system, the test
 # files (like this one) were written from scratch after the fork
 # from CMU CL.
-# 
+#
 # This software is in the public domain and is provided with
 # absolutely no warranty. See the COPYING and CREDITS files for
 # more information.
@@ -32,7 +32,7 @@
 if [ "$SBCL_CLOCC_ANSI_TEST" = "" ] ; then
     echo //punting clocc ansi-test because SBCL_CLOCC_ANSI_TEST is undefined
     exit 104
-else 
+else
     echo //going on to run clocc ansi-test in $SBCL_CLOCC_ANSI_TEST
     cd $SBCL_CLOCC_ANSI_TEST
 fi

Index: clos.test.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/clos.test.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- clos.test.sh	3 Sep 2003 08:41:54 -0000	1.5
+++ clos.test.sh	9 Jan 2006 13:00:18 -0000	1.6
@@ -6,7 +6,7 @@
 # While most of SBCL is derived from the CMU CL system, the test
 # files (like this one) were written from scratch after the fork
 # from CMU CL.
-# 
+#
 # This software is in the public domain and is provided with
 # absolutely no warranty. See the COPYING and CREDITS files for
 # more information.
@@ -61,7 +61,7 @@
 # succession.
 cat > $tmpfilename <<EOF
     (in-package :cl-user)
-    (defclass another-class-with-slots () 
+    (defclass another-class-with-slots ()
       (a-new-slot-name))
     (defun foo (x)
       (values (setf (slot-value x 'a-new-slot-name) 2)
@@ -72,5 +72,5 @@
 rm $tmpfilename
 rm $compiled_tmpfilename
 
-# success 
+# success
 exit 104

Index: compiler.test.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/compiler.test.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- compiler.test.sh	21 Sep 2005 11:28:57 -0000	1.16
+++ compiler.test.sh	9 Jan 2006 13:00:18 -0000	1.17
@@ -6,7 +6,7 @@
 # While most of SBCL is derived from the CMU CL system, the test
 # files (like this one) were written from scratch after the fork
 # from CMU CL.
-# 
+#
 # This software is in the public domain and is provided with
 # absolutely no warranty. See the COPYING and CREDITS files for
 # more information.
@@ -39,11 +39,11 @@
 # having the same name.
 cat > $tmpfilename <<EOF
     (in-package :cl-user)
-    (defun foo (x) 
+    (defun foo (x)
       (flet ((baz (y) (load y)))
         (declare (notinline baz))
         (baz x)))
-    (defun bar (x) 
+    (defun bar (x)
       (flet ((baz (y) (load y)))
         (declare (notinline baz))
         (baz x)))
@@ -93,7 +93,7 @@
 cat > $tmpfilename <<EOF
     (in-package :cl-user)
     (defun foo (x) (list x))
-    (defun bar (x) 
+    (defun bar (x)
       (declare (notinline foo))
       (1+ (foo x)))
 EOF
@@ -162,12 +162,12 @@
 # been there
 cat > $tmpfilename <<EOF
     (eval-when (:compile-toplevel :load-toplevel :execute)
-      (defstruct buffer-state 
+      (defstruct buffer-state
         (output-index 0)))
-    
+
     (defclass buffered-stream-mixin ()
       ((buffer-state :initform (make-buffer-state))))
-    
+
     (defgeneric frob (stream))
     (defmethod frob ((stream t))
       nil)
@@ -320,7 +320,7 @@
 cat > $tmpfilename <<EOF
 (defun bar ()
   (let ((result ""))
-    (nreverse result)))  
+    (nreverse result)))
 EOF
 expect_clean_compile $tmpfilename
 
@@ -355,5 +355,5 @@
 rm $tmpfilename
 rm $compiled_tmpfilename
 
-# success 
+# success
 exit 104

Index: core.test.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/core.test.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- core.test.sh	6 Jan 2006 01:11:10 -0000	1.3
+++ core.test.sh	9 Jan 2006 13:00:18 -0000	1.4
@@ -8,7 +8,7 @@
 # While most of SBCL is derived from the CMU CL system, the test
 # files (like this one) were written from scratch after the fork
 # from CMU CL.
-# 
+#
 # This software is in the public domain and is provided with
 # absolutely no warranty. See the COPYING and CREDITS files for
 # more information.
@@ -41,7 +41,7 @@
 
 # In sbcl-0.9.8 saving cores with callbacks didn't work on gencgc platforms
 $SBCL <<EOF
-  (defun bar () 
+  (defun bar ()
     (format t "~&Callbacks not supported, skipping~%")
     (quit :unix-status 42))
   #+alien-callbacks

Index: expect.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/expect.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- expect.sh	17 May 2004 16:17:58 -0000	1.3
+++ expect.sh	9 Jan 2006 13:00:18 -0000	1.4
@@ -7,36 +7,36 @@
 {
     # Test compiling and loading.
     $SBCL <<EOF
-	(compile-file "$1")
-	;;; But loading the file should fail.
-	(multiple-value-bind (value0 value1) (ignore-errors (load *))
-	    (assert (null value0))
-	    (format t "VALUE1=~S (~A)~%" value1 value1)
-	    (assert (typep value1 'error)))
-	(sb-ext:quit :unix-status 52)
+        (compile-file "$1")
+        ;;; But loading the file should fail.
+        (multiple-value-bind (value0 value1) (ignore-errors (load *))
+            (assert (null value0))
+            (format t "VALUE1=~S (~A)~%" value1 value1)
+            (assert (typep value1 'error)))
+        (sb-ext:quit :unix-status 52)
 EOF
     if [ $? != 52 ]; then
-	echo compile-and-load $1 test failed: $?
-	exit 1
+        echo compile-and-load $1 test failed: $?
+        exit 1
     fi
 
     # Test loading into the interpreter.
     $SBCL <<EOF
-	(multiple-value-bind (value0 value1) (ignore-errors (load "$1"))
-	    (assert (null value0))
-	    (format t "VALUE1=~S (~A)~%" value1 value1)
-	    (assert (typep value1 'error)))
-	(sb-ext:quit :unix-status 52)
+        (multiple-value-bind (value0 value1) (ignore-errors (load "$1"))
+            (assert (null value0))
+            (format t "VALUE1=~S (~A)~%" value1 value1)
+            (assert (typep value1 'error)))
+        (sb-ext:quit :unix-status 52)
 EOF
     if [ $? != 52 ]; then
-	echo load-into-interpreter $1 test failed: $?
-	exit 1
+        echo load-into-interpreter $1 test failed: $?
+        exit 1
     fi
 }
 
 # Test that a file compiles cleanly, with no ERRORs, WARNINGs or
 # STYLE-WARNINGs.
-expect_clean_compile () 
+expect_clean_compile ()
 {
     $SBCL <<EOF
         (multiple-value-bind (pathname warnings-p failure-p)
@@ -105,7 +105,7 @@
           (compile-file "$1"))
 EOF
     if [ $? != 52 ]; then
-	echo expect-compiler-note $1 test failed: $?
-	exit 1
+        echo expect-compiler-note $1 test failed: $?
+        exit 1
     fi
 }

Index: filesys.test.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/filesys.test.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- filesys.test.sh	6 Jun 2005 06:54:22 -0000	1.10
+++ filesys.test.sh	9 Jan 2006 13:00:18 -0000	1.11
@@ -6,7 +6,7 @@
 # While most of SBCL is derived from the CMU CL system, the test
 # files (like this one) were written from scratch after the fork
 # from CMU CL.
-# 
+#
 # This software is in the public domain and is provided with
 # absolutely no warranty. See the COPYING and CREDITS files for
 # more information.
@@ -109,28 +109,28 @@
 (defun absolutify (pathname)
   "Convert a possibly-relative pathname to absolute."
   (merge-pathnames pathname
-		   (make-pathname :directory
-				  (pathname-directory
-				   *default-pathname-defaults*))))
+                   (make-pathname :directory
+                                  (pathname-directory
+                                   *default-pathname-defaults*))))
 (defun sorted-truenamestrings (pathname-designators)
   "Convert a collection of pathname designators into canonical form
 using TRUENAME, NAMESTRING, and SORT."
   (sort (mapcar #'namestring
-		(mapcar #'truename
-			pathname-designators))
-	#'string<))
+                (mapcar #'truename
+                        pathname-designators))
+        #'string<))
 (defun need-match-1 (directory-pathname result-sorted-truenamestrings)
   "guts of NEED-MATCH"
   (let ((directory-sorted-truenamestrings (sorted-truenamestrings
-					   (directory directory-pathname))))
+                                           (directory directory-pathname))))
     (unless (equal directory-sorted-truenamestrings
-		   result-sorted-truenamestrings)
+                   result-sorted-truenamestrings)
       (format t "~&~@<DIRECTORY argument = ~_~2I~S~:>~%"
-	      directory-pathname)
+              directory-pathname)
       (format t "~&~@<DIRECTORY result = ~_~2I~S~:>~%"
-	      directory-sorted-truenamestrings)
+              directory-sorted-truenamestrings)
       (format t "~&~@<expected result = ~_~2I~S.~:>~%"
-	      result-sorted-truenamestrings)
+              result-sorted-truenamestrings)
       (error "mismatch between DIRECTORY and expected result"))))
 (defun need-match (directory-pathname result-pathnames)
   "Require that (DIRECTORY DIRECTORY-PATHNAME) return RESULT-PATHNAMES
@@ -156,34 +156,34 @@
   (need-match "./animal" '("animal/"))
   (need-match "animal/*.*" '("animal/invertebrate/" "animal/vertebrate/"))
   (need-match "animal/*/*.*"
-	      '("animal/vertebrate/bird/"
-		"animal/vertebrate/mammal/"
-		"animal/vertebrate/snake/"))
+              '("animal/vertebrate/bird/"
+                "animal/vertebrate/mammal/"
+                "animal/vertebrate/snake/"))
   (need-match "plant/*.*" '("plant/kingsfoil" "plant/pipeweed"))
   (need-match "plant/**/*.*" '("plant/kingsfoil" "plant/pipeweed"))
   (need-match "plant/**/**/*.*" '("plant/kingsfoil" "plant/pipeweed"))
   (let ((vertebrates (mapcar (lambda (stem)
-			       (concatenate 'string
-					    "animal/vertebrate/"
-					    stem))
-			     '("bird/"
-			       "mammal/"
-			       "mammal/bear/" "mammal/bear/grizzly"
-			       "mammal/mythical/" "mammal/mythical/mermaid"
-			       "mammal/mythical/unicorn"
-			       "mammal/platypus"
-			       "mammal/rodent/" "mammal/rodent/beaver"
-			       "mammal/rodent/mouse" "mammal/rodent/rabbit"
-			       "mammal/rodent/rat"
-			       "mammal/ruminant/" "mammal/ruminant/cow"
-			       "mammal/walrus"
-			       "snake/" "snake/python"))))
+                               (concatenate 'string
+                                            "animal/vertebrate/"
+                                            stem))
+                             '("bird/"
+                               "mammal/"
+                               "mammal/bear/" "mammal/bear/grizzly"
+                               "mammal/mythical/" "mammal/mythical/mermaid"
+                               "mammal/mythical/unicorn"
+                               "mammal/platypus"
+                               "mammal/rodent/" "mammal/rodent/beaver"
+                               "mammal/rodent/mouse" "mammal/rodent/rabbit"
+                               "mammal/rodent/rat"
+                               "mammal/ruminant/" "mammal/ruminant/cow"
+                               "mammal/walrus"
+                               "snake/" "snake/python"))))
     (need-match "animal/vertebrate/**/*.*" vertebrates)
     (need-match "animal/vertebrate/mammal/../**/*.*" vertebrates)
     (need-match "animal/vertebrate/mammal/../**/**/*.*" vertebrates)
     #+nil
     (need-match "animal/vertebrate/mammal/mythical/../**/../**/*.*"
-		vertebrates))
+                vertebrates))
   (need-match "animal/vertebrate/**/robot.*" nil)
   (need-match "animal/vertebrate/mammal/../**/*.robot" nil)
   (need-match "animal/vertebrate/mammal/../**/robot/*.*" nil)

Index: finalize.test.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/finalize.test.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- finalize.test.sh	28 Jun 2005 12:27:35 -0000	1.2
+++ finalize.test.sh	9 Jan 2006 13:00:18 -0000	1.3
@@ -19,12 +19,12 @@
 (let ((junk (mapcar (lambda (_)
                       (declare (ignore _))
                       (let ((x (gensym)))
-			  (finalize x (lambda ()
-					;; cons in finalizer
+                          (finalize x (lambda ()
+                                        ;; cons in finalizer
                                         (setf *tmp* (make-list 10000))
-					(incf *count*)))
-			  x))
-		     (make-list 10000))))
+                                        (incf *count*)))
+                          x))
+                     (make-list 10000))))
     (setf junk (foo junk))
     (foo junk))
 
@@ -46,21 +46,21 @@
 echo "Waiting for SBCL to finish stress-testing finalizers"
 while true; do
     if [ -f finalize-test-passed ]; then
-	echo "OK"
-	rm finalize-test-passed
-	exit 104 # Success
+        echo "OK"
+        rm finalize-test-passed
+        exit 104 # Success
     elif [ -f finalize-test-failed ]; then
-	echo "Failed"
-	rm finalize-test-failed
-	exit 1 # Failure
+        echo "Failed"
+        rm finalize-test-failed
+        exit 1 # Failure
     fi
     sleep 1
     WAITED=$(($WAITED+1))
     if (($WAITED>60)); then
-	echo
-	echo "timeout, killing SBCL"
-	kill -9 $SBCL_PID
-	exit 1 # Failure, SBCL probably hanging in GC
+        echo
+        echo "timeout, killing SBCL"
+        kill -9 $SBCL_PID
+        exit 1 # Failure, SBCL probably hanging in GC
     fi
 done
 

Index: run-program.test.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/run-program.test.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- run-program.test.sh	3 Dec 2004 12:49:47 -0000	1.11
+++ run-program.test.sh	9 Jan 2006 13:00:18 -0000	1.12
@@ -8,7 +8,7 @@
 # While most of SBCL is derived from the CMU CL system, the test
 # files (like this one) were written from scratch after the fork
 # from CMU CL.
-# 
+#
 # This software is in the public domain and is provided with
 # absolutely no warranty. See the COPYING and CREDITS files for
 # more information.
@@ -22,10 +22,10 @@
 
 ${SBCL:-sbcl} <<EOF
   ;; test that $PATH is searched
-  (assert (zerop (sb-ext:process-exit-code 
-	          (sb-ext:run-program "true" () :search t :wait t))))
-  (assert (not (zerop (sb-ext:process-exit-code 
-	               (sb-ext:run-program "false" () :search t :wait t)))))
+  (assert (zerop (sb-ext:process-exit-code
+                  (sb-ext:run-program "true" () :search t :wait t))))
+  (assert (not (zerop (sb-ext:process-exit-code
+                       (sb-ext:run-program "false" () :search t :wait t)))))
   (let ((string (with-output-to-string (stream)
                   (sb-ext:run-program "/bin/echo"
                                       '("foo" "bar")
@@ -36,8 +36,8 @@
   ;; (instead of CMU CL alist-of-keywords convention).
   (let ((string (with-output-to-string (stream)
                   (sb-ext:run-program "/usr/bin/env" ()
-		                      :output stream
-				      :environment '("FEEFIE=foefum")))))
+                                      :output stream
+                                      :environment '("FEEFIE=foefum")))))
     (assert (string= string "FEEFIE=foefum
 ")))
   ;; The default Unix environment for the subprocess is the same as
@@ -45,13 +45,13 @@
   ;; other programs, but not like CMU CL.)
   (let ((string (with-output-to-string (stream)
                   (sb-ext:run-program "/usr/bin/env" ()
-		                      :output stream)))
-	(expected (apply #'concatenate
-	                 'string
-			 (mapcar (lambda (environ-string)
-			           (concatenate 'string
-				                environ-string
-						(string #\newline)))
+                                      :output stream)))
+        (expected (apply #'concatenate
+                         'string
+                         (mapcar (lambda (environ-string)
+                                   (concatenate 'string
+                                                environ-string
+                                                (string #\newline)))
                                  (sb-ext:posix-environ)))))
     (assert (string= string expected)))
   ;; That's not just because POSIX-ENVIRON is having a bad hair

Index: run-tests.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/run-tests.sh,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- run-tests.sh	18 Sep 2005 10:55:12 -0000	1.30
+++ run-tests.sh	9 Jan 2006 13:00:18 -0000	1.31
@@ -6,7 +6,7 @@
 #  --break-on-failure            Break into the debugger when a test fails
 #                                unexpectedly
 #  --break-on-expected-failure   Break into the debugger when any test fails
-#  
+#
 # If no test files are specified, runs all tests.
 
 # This software is part of the SBCL system. See the README file for
@@ -15,7 +15,7 @@
 # While most of SBCL is derived from the CMU CL system, the test
 # files (like this one) were written from scratch after the fork
 # from CMU CL.
-# 
+#
 # This software is in the public domain and is provided with
 # absolutely no warranty. See the COPYING and CREDITS files for
 # more information.

Index: side-effectful-pathnames.test.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/side-effectful-pathnames.test.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- side-effectful-pathnames.test.sh	10 Jan 2002 00:20:58 -0000	1.11
+++ side-effectful-pathnames.test.sh	9 Jan 2006 13:00:18 -0000	1.12
@@ -6,7 +6,7 @@
 # While most of SBCL is derived from the CMU CL system, the test
 # files (like this one) were written from scratch after the fork
 # from CMU CL.
-# 
+#
 # This software is in the public domain and is provided with
 # absolutely no warranty. See the COPYING and CREDITS files for
 # more information.

Index: stress-gc.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/stress-gc.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- stress-gc.sh	29 Mar 2001 01:50:35 -0000	1.3
+++ stress-gc.sh	9 Jan 2006 13:00:18 -0000	1.4
@@ -6,7 +6,7 @@
 # While most of SBCL is derived from the CMU CL system, the test
 # files (like this one) were written from scratch after the fork
 # from CMU CL.
-# 
+#
 # This software is in the public domain and is provided with
 # absolutely no warranty. See the COPYING and CREDITS files for
 # more information.

Index: toplevel.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/toplevel.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- toplevel.sh	14 Apr 2003 01:43:03 -0000	1.1
+++ toplevel.sh	9 Jan 2006 13:00:18 -0000	1.2
@@ -9,7 +9,7 @@
 # While most of SBCL is derived from the CMU CL system, the test
 # files (like this one) were written from scratch after the fork
 # from CMU CL.
-# 
+#
 # This software is in the public domain and is provided with
 # absolutely no warranty. See the COPYING and CREDITS files for
 # more information.

Update of /cvsroot/sbcl/sbcl/doc/manual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19069/doc/manual

Modified Files:
	make-tempfiles.sh 
Log Message:
0.9.8.27:
	Merge patch from James Bielman fixing self-build under Win32.
	... a little bit of an accident ensued; I ran 
		canonicalize-whitespace on .sh files, which seemed to
		work (except on wc.sh) until it scribbled all over 
		make.sh, confusing the shell interpreter utterly.
	... the resulting files have built the system, nevertheless.


Index: make-tempfiles.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/doc/manual/make-tempfiles.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- make-tempfiles.sh	30 Aug 2005 13:05:30 -0000	1.9
+++ make-tempfiles.sh	9 Jan 2006 13:00:18 -0000	1.10
@@ -54,11 +54,11 @@
 
 echo /creating docstring snippets from SBCL=\'$SBCLRUNTIME\' for packages \'$PACKAGES\'
 $SBCL <<EOF
-(load "docstrings.lisp") 
+(load "docstrings.lisp")
 (require :asdf)
-(dolist (module (quote ($MODULES))) 
-  (require module)) 
-(sb-texinfo:generate-includes "$DOCSTRINGDIR" $PACKAGES) 
+(dolist (module (quote ($MODULES)))
+  (require module))
+(sb-texinfo:generate-includes "$DOCSTRINGDIR" $PACKAGES)
 (sb-ext:quit))
 EOF

Update of /cvsroot/sbcl/sbcl/src/runtime
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19069/src/runtime

Modified Files:
	Config.x86-win32 
Log Message:
0.9.8.27:
	Merge patch from James Bielman fixing self-build under Win32.
	... a little bit of an accident ensued; I ran 
		canonicalize-whitespace on .sh files, which seemed to
		work (except on wc.sh) until it scribbled all over 
		make.sh, confusing the shell interpreter utterly.
	... the resulting files have built the system, nevertheless.


Index: Config.x86-win32
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/Config.x86-win32,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Config.x86-win32	3 Jan 2006 09:52:38 -0000	1.1
+++ Config.x86-win32	9 Jan 2006 13:00:18 -0000	1.2
@@ -25,15 +25,19 @@
 # (You *are* encouraged to design and implement a coherent stable
 # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is
 # working on one and it would be a nice thing to have.)
-OS_LINK_FLAGS = -Wl,--export-dynamic
-OS_LIBS =
+OS_LINK_FLAGS = -Wl,--export-dynamic,-mno-cygwin
+OS_LIBS = -mno-cygwin
 
 GC_SRC = gencgc.c
 
-CFLAGS =  -g -Wall -O3
+CFLAGS =  -g -Wall -O3 -mno-cygwin
 ASFLAGS = $(CFLAGS)
 
-CPP = /opt/xmingw/bin/i386-mingw32msvc-cpp
-CC = /opt/xmingw/bin/i386-mingw32msvc-gcc
-LD = /opt/xmingw/bin/i386-mingw32msvc-ld
-NM = /opt/xmingw/bin/i386-mingw32msvc-nm
+CPP = cpp
+CC = gcc
+LD = ld
+NM = nm
+
+# Nothing to do for after-grovel-headers.
+.PHONY: after-grovel-headers
+after-grovel-headers:

Update of /cvsroot/sbcl/sbcl/src/runtime
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16566/src/runtime

Modified Files:
	x86-assem.S 
Log Message:
0.9.8.26:
	Merge patch from James Bielman fixing use of GNAME on 
	fast_bzero* assembly functions.


Index: x86-assem.S
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/x86-assem.S,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- x86-assem.S	8 Jan 2006 00:33:13 -0000	1.26
+++ x86-assem.S	9 Jan 2006 12:45:47 -0000	1.27
@@ -870,7 +870,7 @@
         /* Variable containing a pointer to the bzero function to use.
          * Initially points to a function that detects which implementation
          * should be used, and then updates the variable. */
-        .long fast_bzero_detect        
+        .long GNAME(fast_bzero_detect)
 
 	.text
 	.align	align_8byte,0x90
@@ -878,7 +878,7 @@
 	TYPE(GNAME(fast_bzero))
 GNAME(fast_bzero):        
         /* Indirect function call */
-        jmp *fast_bzero_pointer
+        jmp *GNAME(fast_bzero_pointer)
 	SIZE(GNAME(fast_bzero))
         
       
@@ -904,10 +904,10 @@
          * for all non-SSE2 processors.
          */
 Lbase:
-        movl $fast_bzero_base, fast_bzero_pointer
+        movl $GNAME(fast_bzero_base), GNAME(fast_bzero_pointer)
         jmp Lrestore
 Lsse2:
-        movl $fast_bzero_sse, fast_bzero_pointer
+        movl $GNAME(fast_bzero_sse), GNAME(fast_bzero_pointer)
         jmp Lrestore
         
 Lrestore:
@@ -915,7 +915,7 @@
         pop %ecx
         pop %ebx
         pop %eax
-        jmp *fast_bzero_pointer
+        jmp *GNAME(fast_bzero_pointer)
         
 	SIZE(GNAME(fast_bzero_detect))

Update of /cvsroot/sbcl/sbcl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16566

Modified Files:
	version.lisp-expr 
Log Message:
0.9.8.26:
	Merge patch from James Bielman fixing use of GNAME on 
	fast_bzero* assembly functions.


Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.2636
retrieving revision 1.2637
diff -u -d -r1.2636 -r1.2637
--- version.lisp-expr	8 Jan 2006 22:39:03 -0000	1.2636
+++ version.lisp-expr	9 Jan 2006 12:45:47 -0000	1.2637
@@ -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.8.25"
+"0.9.8.26"