[MLton-commit] r4104

[Stephen Weeks]

Got things working on Cygwin.  The main change was one line in gc.c,
changing MLton_Platform_CygwinUseMmap from FALSE to TRUE.  With that,
all regressions work fine, except for a case-sensitivity problem with
exnHistory and a not-enough-memory problem with hamlet.

The other, minor, changes were to remove calls to "size" from the
Makefiles and the call to strip, since those fail on Cygwin due to the
executable having the .exe suffix.  Also, I added the obvious
MLNLFFIGEN platform/memory file for Cygwin.


----------------------------------------------------------------------

U   mlton/trunk/Makefile
U   mlton/trunk/benchmark/Makefile
A   mlton/trunk/lib/mlnlffi/memory/platform/memory.x86-cygwin.mlb
U   mlton/trunk/mllex/Makefile
U   mlton/trunk/mlnlffigen/Makefile
U   mlton/trunk/mlprof/Makefile
U   mlton/trunk/mlton/Makefile
U   mlton/trunk/mlyacc/Makefile
U   mlton/trunk/runtime/gc.c

----------------------------------------------------------------------

Modified: mlton/trunk/Makefile
===================================================================
--- mlton/trunk/Makefile	2005-10-12 00:51:01 UTC (rev 4103)
+++ mlton/trunk/Makefile	2005-10-12 00:55:18 UTC (rev 4104)
@@ -389,7 +389,7 @@
 		cd $(TMAN) && $(GZIP) $(MAN_PAGES);			\
 	fi
 	case "$(TARGET_OS)" in						\
-	darwin|solaris)							\
+	cygwin|darwin|solaris)						\
 	;;								\
 	*)								\
 		for f in $(TLIB)/$(AOUT) $(TBIN)/$(LEX)			\

Modified: mlton/trunk/benchmark/Makefile
===================================================================
--- mlton/trunk/benchmark/Makefile	2005-10-12 00:51:01 UTC (rev 4103)
+++ mlton/trunk/benchmark/Makefile	2005-10-12 00:55:18 UTC (rev 4104)
@@ -23,7 +23,6 @@
 $(NAME): $(NAME).mlb $(shell PATH=$(BIN):$$PATH && $(MLTON) -stop f $(NAME).mlb)
 	@echo 'Compiling $(NAME)'
 	$(MLTON) $(FLAGS) $(NAME).mlb
-	size $(NAME)
 
 $(NAME).sml: $(NAME).cm $(shell $(MLTON) -stop f $(NAME).cm)
 	mlton -stop sml $(NAME).cm

Added: mlton/trunk/lib/mlnlffi/memory/platform/memory.x86-cygwin.mlb
===================================================================
--- mlton/trunk/lib/mlnlffi/memory/platform/memory.x86-cygwin.mlb	2005-10-12 00:51:01 UTC (rev 4103)
+++ mlton/trunk/lib/mlnlffi/memory/platform/memory.x86-cygwin.mlb	2005-10-12 00:55:18 UTC (rev 4104)
@@ -0,0 +1 @@
+../memory.32bit-unix.mlb

Modified: mlton/trunk/mllex/Makefile
===================================================================
--- mlton/trunk/mllex/Makefile	2005-10-12 00:51:01 UTC (rev 4103)
+++ mlton/trunk/mllex/Makefile	2005-10-12 00:55:18 UTC (rev 4104)
@@ -21,7 +21,6 @@
 $(NAME): $(NAME).mlb $(shell PATH=$(BIN):$$PATH && $(MLTON) -stop f $(NAME).mlb)
 	@echo 'Compiling $(NAME)'
 	$(MLTON) $(FLAGS) $(NAME).mlb
-	size $(NAME)
 
 $(NAME).sml: $(NAME).cm $(shell $(MLTON) -stop f $(NAME).cm)
 	mlton -stop sml $(NAME).cm

Modified: mlton/trunk/mlnlffigen/Makefile
===================================================================
--- mlton/trunk/mlnlffigen/Makefile	2005-10-12 00:51:01 UTC (rev 4103)
+++ mlton/trunk/mlnlffigen/Makefile	2005-10-12 00:55:18 UTC (rev 4104)
@@ -20,7 +20,6 @@
 $(NAME): $(NAME).mlb $(shell PATH=$(BIN):$$PATH && $(MLTON) -stop f $(NAME).mlb)
 	@echo 'Compiling $(NAME)'
 	$(MLTON) $(FLAGS) $(NAME).mlb
-	size $(NAME)
 
 .PHONY: clean
 clean:

Modified: mlton/trunk/mlprof/Makefile
===================================================================
--- mlton/trunk/mlprof/Makefile	2005-10-12 00:51:01 UTC (rev 4103)
+++ mlton/trunk/mlprof/Makefile	2005-10-12 00:55:18 UTC (rev 4104)
@@ -21,7 +21,6 @@
 $(NAME): $(NAME).mlb $(shell PATH=$(BIN):$$PATH && $(MLTON) -stop f $(NAME).mlb)
 	@echo 'Compiling $(NAME)'
 	$(MLTON) $(FLAGS) $(NAME).mlb
-	size $(NAME)
 
 $(NAME).sml: $(NAME).cm $(shell $(MLTON) -stop f $(NAME).cm)
 	mlton -stop sml $(NAME).cm

Modified: mlton/trunk/mlton/Makefile
===================================================================
--- mlton/trunk/mlton/Makefile	2005-10-12 00:51:01 UTC (rev 4103)
+++ mlton/trunk/mlton/Makefile	2005-10-12 00:55:18 UTC (rev 4104)
@@ -74,7 +74,6 @@
 	$(MAKE) $(UP)
 	@echo 'Compiling mlton (takes a while)'
 	mlton $(FLAGS) $(FILE)
-	size $(AOUT)
 
 #! Pass $(PATH) to upgrade-basis because it is run via #!/usr/bin/env
 # bash, which resets the path.

Modified: mlton/trunk/mlyacc/Makefile
===================================================================
--- mlton/trunk/mlyacc/Makefile	2005-10-12 00:51:01 UTC (rev 4103)
+++ mlton/trunk/mlyacc/Makefile	2005-10-12 00:55:18 UTC (rev 4104)
@@ -21,7 +21,6 @@
 $(NAME): $(NAME).mlb $(shell PATH=$(BIN):$$PATH && $(MLTON) -stop f $(NAME).mlb)
 	@echo 'Compiling $(NAME)'
 	$(MLTON) $(FLAGS) $(NAME).mlb
-	size $(NAME)
 
 $(NAME).sml: $(NAME).cm $(shell $(MLTON) -stop f $(NAME).cm)
 	mlton -stop sml $(NAME).cm

Modified: mlton/trunk/runtime/gc.c
===================================================================
--- mlton/trunk/runtime/gc.c	2005-10-12 00:51:01 UTC (rev 4103)
+++ mlton/trunk/runtime/gc.c	2005-10-12 00:55:18 UTC (rev 4104)
@@ -4430,7 +4430,7 @@
                                 s->alignment));
         assert (isAligned (GC_NORMAL_HEADER_SIZE + sizeof (struct GC_weak),
                                 s->alignment));
-        MLton_Platform_CygwinUseMmap = FALSE;
+        MLton_Platform_CygwinUseMmap = TRUE;
         s->amInGC = TRUE;
         s->amInMinorGC = FALSE;
         s->bytesAllocated = 0;