[Sbcl-commits] CVS: sbcl/tools-for-build grovel-features.sh,1.7,1.8 grovel-headers.c,1.10,1.11 sparc-funcdef.sh,1.3,1.4 whitespacely-canonical-filenames,1.1,1.2

[Christophe R. <cr...@us...>]

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