Update TODO (failure in Cygwin resolved)

diff --git a/TODO b/TODO
index cdbcfdc5e50c9ba7197ab7c365e1360182de4d0b..68ec84be014660ea735bf1d0fd9e8c69cf71e0ac 100644 (file)
--- a/TODO
+++ b/TODO
@@ -33,8 +33,6 @@ libc.so.1: gctest: fatal: libgcc_s.so.1: open failed: No such file or directory
 
 Solaris/x86[_64]: gctest fails if PROC_VDB.
 
-Cygwin: crashes with USE_MUNMAP: mmap(PROT_NONE) failed.
-
 Cygwin: autoreconf fails: possibly undefined macro: AC_MSG_ERROR, AS_IF
 at configure.ac:59 and configure.ac:694, respectively (autoreconf-2.68).
 

diff --git a/configure.ac b/configure.ac
index bdaf215eb7d610dadead16a7434bd8f7e6a5786a..c48daa0c7bb4f3c1709dd0deba97de3a864d326d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -785,6 +785,14 @@ AC_ARG_ENABLE(munmap,
 if test "${enable_munmap}" != ""; then
     AC_DEFINE([USE_MMAP], 1,
               [Define to use mmap instead of sbrk to expand the heap.])
+    case "$host" in
+      *-*-cygwin*)
+        # Workaround for Cygwin: use VirtualAlloc since mmap(PROT_NONE) fails
+        AC_DEFINE([USE_WINALLOC], 1,
+                  [Define to use Win32 VirtualAlloc (instead of sbrk or \
+                   mmap) to expand the heap.])
+        ;;
+    esac
     AC_DEFINE([USE_MUNMAP], 1,
               [Define to return memory to OS with munmap calls
                (see doc/README.macros).])

diff --git a/doc/README.win32 b/doc/README.win32
index 3ffb3b6f91705d189d52b66b61d940ce407773d8..d14686dd5df609f9890a8fe8035e43b9fc5734e0 100644 (file)
--- a/doc/README.win32
+++ b/doc/README.win32
@@ -78,9 +78,7 @@ To build the collector as a DLL, pass "--enable-shared --disable-static" to
 configure (this will instruct make compile with -D GC_DLL).
 
 Parallel marker could be enabled via "--enable-parallel-mark".
-
-Memory unmapping could be enabled via "--enable-munmap" (not well supported
-on Cygwin currently).
+Memory unmapping could be enabled via "--enable-munmap".
 
 Borland Tools
 -------------