Merge branch 'master' into configure-cc

gongchengra · Jun 19, 2017 · 33765fa · 33765fa
2 parents dd610ce + 1de3815
commit 33765fa
Show file tree

Hide file tree

Showing 95 changed files with 2,159 additions and 1,104 deletions.
diff --git a/BUILDING b/BUILDING
@@ -167,15 +167,18 @@ The make file supports several targets:
 
 WINDOWS
 
-Building Chez Scheme under Windows with Cygwin follows the
-instructions above except that make install is not supported:
+Building Chez Scheme under Windows with Cygwin or Bash/WSL follows the
+instructions above, except that 'make install' is not supported, and
+the 'OS' environment variable must be set to 'Windows_NT' on Bash/WSL
+(to indicate a build for Windows, as opposed to a build for Linux on
+Windows):
 
-./configure
-make
+env OS=Windows_NT ./configure
+env OS=Windows_NT make
 
 Prerequisites:
 
-* Cygwin with bash, grep, make, sed, etc.
+* Cygwin or Bash/WSL with bash, grep, make, sed, etc.
 * Microsoft Visual Studio 2015
 * WiX Toolset (for making an install)
 

diff --git a/LOG b/LOG
@@ -477,4 +477,47 @@
 - fix strip-fasl-file for immutable strings and vectors,
   fix an $oops call, and fix a vector-index increment in hashing
     strip.ss, 7.ss, newhash.ss, misc.ms
+- fix signature of fxbit-set?
+    primdata.ss
+- more optimizations for map and for-each with explicit list
+  extend the reductions for map and for-each when the arguments are
+  explicit lists like (list 1 2 3 ...) or '(1 2 3 ...). 
+    cp0.ss,
+    4.ms
+- reverted to the preceding version of cp0 due to failure to preserve
+  the expected evaluation order in one of the mats; removed the
+  corresponding equivalent-expansion tests.
+    cp0.ss,
+    4.ms
+- restored the map and for-each optimizations with a fix for the
+  evaluation-order bug.
+    cp0.ss,
+    4.ms
+- added date-dst? to access the previously-hidden DST information in
+  date records, and added date-zone-name to provide a time zone name.
+    date.ss, primdata.ss,
+    stats.c,
+    date.ms, root-experr*, patch-compile*,
+    system.stex
+- fixed a bug in flonum-extractor, which on 64-bit machines was using an
+  8-byte read instead of a 4-byte read to pick up the 4 highest-order
+  bytes of a little-endian flonum, potentially reading past the end of
+  mapped memory for flonums produced by taking the imaginary part of an
+  inexact complexnum (which, unlike other flonums, are not aligned on
+  16-byte boundaries).  The 8-byte load would also have failed to produce
+  correct results on 64-bit big-endian machines (of which we presently
+  have none) because the offsets passed to flonum-extractor assume the
+  bits are in the lowest-order 4 bytes of the extracted field.
+    cp0.ss,
+    misc.ms,
+    release_notes.stex
+- support Windows build on Bash/WSL
+    BUILDING, configure, workarea, c/vs.bat (new), mats/vs.bat (new),
+    c/Mf-*nt, mats/Mf-*, s/Mf-base
+- fix c/version.h for FreeBDS (machine types i3fb, ti3fb, a6fb, ta6fb)
+- fix reference to libc.so to be libc.so.7 for FreeBSD (machine types
+  i3fb, ti3fb, a6fb, ta6fb)
+    foreign.ms
 - added CC option to configure for selecting the compiler
+    configure,
+    c/Mf-*
diff --git a/boot/a6le/equates.h b/boot/a6le/equates.h
@@ -156,7 +156,8 @@ typedef unsigned long U64;
 #define dtvec_mon 0x5
 #define dtvec_nsec 0x0
 #define dtvec_sec 0x1
-#define dtvec_size 0xB
+#define dtvec_size 0xC
+#define dtvec_tzname 0xB
 #define dtvec_tzoff 0xA
 #define dtvec_wday 0x7
 #define dtvec_yday 0x8

diff --git a/boot/a6le/petite.boot b/boot/a6le/petite.boot
diff --git a/boot/a6le/scheme.boot b/boot/a6le/scheme.boot
diff --git a/boot/a6nt/equates.h b/boot/a6nt/equates.h
@@ -156,7 +156,8 @@ typedef unsigned long long U64;
 #define dtvec_mon 0x5
 #define dtvec_nsec 0x0
 #define dtvec_sec 0x1
-#define dtvec_size 0xB
+#define dtvec_size 0xC
+#define dtvec_tzname 0xB
 #define dtvec_tzoff 0xA
 #define dtvec_wday 0x7
 #define dtvec_yday 0x8

diff --git a/boot/a6nt/petite.boot b/boot/a6nt/petite.boot
diff --git a/boot/a6nt/scheme.boot b/boot/a6nt/scheme.boot
diff --git a/boot/a6osx/equates.h b/boot/a6osx/equates.h
@@ -156,7 +156,8 @@ typedef unsigned long U64;
 #define dtvec_mon 0x5
 #define dtvec_nsec 0x0
 #define dtvec_sec 0x1
-#define dtvec_size 0xB
+#define dtvec_size 0xC
+#define dtvec_tzname 0xB
 #define dtvec_tzoff 0xA
 #define dtvec_wday 0x7
 #define dtvec_yday 0x8

diff --git a/boot/a6osx/petite.boot b/boot/a6osx/petite.boot
diff --git a/boot/a6osx/scheme.boot b/boot/a6osx/scheme.boot
diff --git a/boot/i3le/equates.h b/boot/i3le/equates.h
@@ -157,7 +157,8 @@ typedef unsigned long long U64;
 #define dtvec_mon 0x5
 #define dtvec_nsec 0x0
 #define dtvec_sec 0x1
-#define dtvec_size 0xB
+#define dtvec_size 0xC
+#define dtvec_tzname 0xB
 #define dtvec_tzoff 0xA
 #define dtvec_wday 0x7
 #define dtvec_yday 0x8

diff --git a/boot/i3le/petite.boot b/boot/i3le/petite.boot
diff --git a/boot/i3le/scheme.boot b/boot/i3le/scheme.boot
diff --git a/boot/i3nt/equates.h b/boot/i3nt/equates.h
@@ -157,7 +157,8 @@ typedef unsigned __int64 U64;
 #define dtvec_mon 0x5
 #define dtvec_nsec 0x0
 #define dtvec_sec 0x1
-#define dtvec_size 0xB
+#define dtvec_size 0xC
+#define dtvec_tzname 0xB
 #define dtvec_tzoff 0xA
 #define dtvec_wday 0x7
 #define dtvec_yday 0x8

diff --git a/boot/i3nt/petite.boot b/boot/i3nt/petite.boot
diff --git a/boot/i3nt/scheme.boot b/boot/i3nt/scheme.boot
diff --git a/boot/i3osx/equates.h b/boot/i3osx/equates.h
@@ -157,7 +157,8 @@ typedef unsigned long long U64;
 #define dtvec_mon 0x5
 #define dtvec_nsec 0x0
 #define dtvec_sec 0x1
-#define dtvec_size 0xB
+#define dtvec_size 0xC
+#define dtvec_tzname 0xB
 #define dtvec_tzoff 0xA
 #define dtvec_wday 0x7
 #define dtvec_yday 0x8

diff --git a/boot/i3osx/petite.boot b/boot/i3osx/petite.boot
diff --git a/boot/i3osx/scheme.boot b/boot/i3osx/scheme.boot
diff --git a/boot/ta6le/equates.h b/boot/ta6le/equates.h
@@ -156,7 +156,8 @@ typedef unsigned long U64;
 #define dtvec_mon 0x5
 #define dtvec_nsec 0x0
 #define dtvec_sec 0x1
-#define dtvec_size 0xB
+#define dtvec_size 0xC
+#define dtvec_tzname 0xB
 #define dtvec_tzoff 0xA
 #define dtvec_wday 0x7
 #define dtvec_yday 0x8

diff --git a/boot/ta6le/petite.boot b/boot/ta6le/petite.boot
diff --git a/boot/ta6le/scheme.boot b/boot/ta6le/scheme.boot
diff --git a/boot/ta6nt/equates.h b/boot/ta6nt/equates.h
@@ -156,7 +156,8 @@ typedef unsigned long long U64;
 #define dtvec_mon 0x5
 #define dtvec_nsec 0x0
 #define dtvec_sec 0x1
-#define dtvec_size 0xB
+#define dtvec_size 0xC
+#define dtvec_tzname 0xB
 #define dtvec_tzoff 0xA
 #define dtvec_wday 0x7
 #define dtvec_yday 0x8

diff --git a/boot/ta6nt/petite.boot b/boot/ta6nt/petite.boot
diff --git a/boot/ta6nt/scheme.boot b/boot/ta6nt/scheme.boot
diff --git a/boot/ta6osx/equates.h b/boot/ta6osx/equates.h
@@ -156,7 +156,8 @@ typedef unsigned long U64;
 #define dtvec_mon 0x5
 #define dtvec_nsec 0x0
 #define dtvec_sec 0x1
-#define dtvec_size 0xB
+#define dtvec_size 0xC
+#define dtvec_tzname 0xB
 #define dtvec_tzoff 0xA
 #define dtvec_wday 0x7
 #define dtvec_yday 0x8

diff --git a/boot/ta6osx/petite.boot b/boot/ta6osx/petite.boot
diff --git a/boot/ta6osx/scheme.boot b/boot/ta6osx/scheme.boot
diff --git a/boot/ti3le/equates.h b/boot/ti3le/equates.h
@@ -157,7 +157,8 @@ typedef unsigned long long U64;
 #define dtvec_mon 0x5
 #define dtvec_nsec 0x0
 #define dtvec_sec 0x1
-#define dtvec_size 0xB
+#define dtvec_size 0xC
+#define dtvec_tzname 0xB
 #define dtvec_tzoff 0xA
 #define dtvec_wday 0x7
 #define dtvec_yday 0x8

diff --git a/boot/ti3le/petite.boot b/boot/ti3le/petite.boot
diff --git a/boot/ti3le/scheme.boot b/boot/ti3le/scheme.boot
diff --git a/boot/ti3nt/equates.h b/boot/ti3nt/equates.h
@@ -157,7 +157,8 @@ typedef unsigned __int64 U64;
 #define dtvec_mon 0x5
 #define dtvec_nsec 0x0
 #define dtvec_sec 0x1
-#define dtvec_size 0xB
+#define dtvec_size 0xC
+#define dtvec_tzname 0xB
 #define dtvec_tzoff 0xA
 #define dtvec_wday 0x7
 #define dtvec_yday 0x8

diff --git a/boot/ti3nt/petite.boot b/boot/ti3nt/petite.boot
diff --git a/boot/ti3nt/scheme.boot b/boot/ti3nt/scheme.boot
diff --git a/boot/ti3osx/equates.h b/boot/ti3osx/equates.h
@@ -157,7 +157,8 @@ typedef unsigned long long U64;
 #define dtvec_mon 0x5
 #define dtvec_nsec 0x0
 #define dtvec_sec 0x1
-#define dtvec_size 0xB
+#define dtvec_size 0xC
+#define dtvec_tzname 0xB
 #define dtvec_tzoff 0xA
 #define dtvec_wday 0x7
 #define dtvec_yday 0x8

diff --git a/boot/ti3osx/petite.boot b/boot/ti3osx/petite.boot
diff --git a/boot/ti3osx/scheme.boot b/boot/ti3osx/scheme.boot
diff --git a/c/Mf-a6nt b/c/Mf-a6nt
@@ -25,27 +25,11 @@ mdclean=vs.bat make.bat scheme.res ../bin/$m/*.exp mtscheme.exe* mdscheme.exe*
 include Mf-base
 
 ${Scheme}: make.bat
-	./make.bat
+	cmd.exe /c make.bat
 	cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
 
-vs.bat:
-	echo '@echo off' > $@
-	echo 'if "%VS140COMNTOOLS%" neq "" goto :VS' >> $@
-	echo 'echo Visual Studio 2015 must be installed.' >> $@
-	echo 'exit 1' >> $@
-	echo ':VS' >> $@
-	echo 'set INCLUDE=' >> $@
-	echo 'set LIB=' >> $@
-	echo 'set LIBPATH=' >> $@
-	echo 'set MACHINETYPE=amd64' >> $@
-	echo 'if exist "%VS140COMNTOOLS%..\..\VC\bin\x86_amd64\vcvarsx86_amd64.bat" set MACHINETYPE=x86_amd64' >> $@
-	echo 'if exist "%VS140COMNTOOLS%..\..\VC\bin\amd64\vcvars64.bat" set MACHINETYPE=amd64' >> $@
-	echo 'call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %MACHINETYPE%' >> $@
-	echo '%*' >> $@
-	chmod +x $@
-
 make.bat: vs.bat
 	echo '@echo off' > $@
 	echo 'set MAKEFLAGS=' >> $@
-	echo 'call vs.bat nmake /f Makefile.$m /nologo %*' >> $@
+	echo 'vs.bat x86_amd64 amd64 && nmake /f Makefile.$m /nologo %*' >> $@
 	chmod +x $@
diff --git a/c/Mf-i3nt b/c/Mf-i3nt
@@ -25,24 +25,11 @@ mdclean=vs.bat make.bat scheme.res ../bin/$m/*.exp mtscheme.exe* mdscheme.exe*
 include Mf-base
 
 ${Scheme}: make.bat
-	./make.bat
+	cmd.exe /c make.bat
 	cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
 
-vs.bat:
-	echo '@echo off' > $@
-	echo 'if "%VS140COMNTOOLS%" neq "" goto :VS' >> $@
-	echo 'echo Visual Studio 2015 must be installed.' >> $@
-	echo 'exit 1' >> $@
-	echo ':VS' >> $@
-	echo 'set INCLUDE=' >> $@
-	echo 'set LIB=' >> $@
-	echo 'set LIBPATH=' >> $@
-	echo 'call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x86' >> $@
-	echo '%*' >> $@
-	chmod +x $@
-
 make.bat: vs.bat
 	echo '@echo off' > $@
 	echo 'set MAKEFLAGS=' >> $@
-	echo 'call vs.bat nmake /f Makefile.$m /nologo %*' >> $@
+	echo 'vs.bat x86 && nmake /f Makefile.$m /nologo %*' >> $@
 	chmod +x $@
diff --git a/c/Mf-ta6nt b/c/Mf-ta6nt
@@ -25,27 +25,11 @@ mdclean=vs.bat make.bat scheme.res ../bin/$m/*.exp mtscheme.exe* mdscheme.exe*
 include Mf-base
 
 ${Scheme}: make.bat
-	./make.bat
+	cmd.exe /c make.bat
 	cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
 
-vs.bat:
-	echo '@echo off' > $@
-	echo 'if "%VS140COMNTOOLS%" neq "" goto :VS' >> $@
-	echo 'echo Visual Studio 2015 must be installed.' >> $@
-	echo 'exit 1' >> $@
-	echo ':VS' >> $@
-	echo 'set INCLUDE=' >> $@
-	echo 'set LIB=' >> $@
-	echo 'set LIBPATH=' >> $@
-	echo 'set MACHINETYPE=amd64' >> $@
-	echo 'if exist "%VS140COMNTOOLS%..\..\VC\bin\x86_amd64\vcvarsx86_amd64.bat" set MACHINETYPE=x86_amd64' >> $@
-	echo 'if exist "%VS140COMNTOOLS%..\..\VC\bin\amd64\vcvars64.bat" set MACHINETYPE=amd64' >> $@
-	echo 'call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %MACHINETYPE%' >> $@
-	echo '%*' >> $@
-	chmod +x $@
-
 make.bat: vs.bat
 	echo '@echo off' > $@
 	echo 'set MAKEFLAGS=' >> $@
-	echo 'call vs.bat nmake /f Makefile.$m /nologo %*' >> $@
+	echo 'vs.bat x86_amd64 amd64 && nmake /f Makefile.$m /nologo %*' >> $@
 	chmod +x $@
diff --git a/c/Mf-ti3nt b/c/Mf-ti3nt
@@ -25,24 +25,11 @@ mdclean=vs.bat make.bat scheme.res ../bin/$m/*.exp mtscheme.exe* mdscheme.exe*
 include Mf-base
 
 ${Scheme}: make.bat
-	./make.bat
+	cmd.exe /c make.bat
 	cp ../bin/$m/scheme.exe ../bin/$m/petite.exe
 
-vs.bat:
-	echo '@echo off' > $@
-	echo 'if "%VS140COMNTOOLS%" neq "" goto :VS' >> $@
-	echo 'echo Visual Studio 2015 must be installed.' >> $@
-	echo 'exit 1' >> $@
-	echo ':VS' >> $@
-	echo 'set INCLUDE=' >> $@
-	echo 'set LIB=' >> $@
-	echo 'set LIBPATH=' >> $@
-	echo 'call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x86' >> $@
-	echo '%*' >> $@
-	chmod +x $@
-
 make.bat: vs.bat
 	echo '@echo off' > $@
 	echo 'set MAKEFLAGS=' >> $@
-	echo 'call vs.bat nmake /f Makefile.$m /nologo %*' >> $@
+	echo 'vs.bat x86 && nmake /f Makefile.$m /nologo %*' >> $@
 	chmod +x $@