Turn on memory unmapping in BCC/DMC/NT/WCC makefiles and Makefile.direct

* BCC_MAKEFILE (defines): Add -D USE_MUNMAP.
* NT_MAKEFILE (CFLAGS_DEFAULT): Likewise.
* WCC_MAKEFILE [MSWIN32] (DEFS): Likewise.
* digimars.mak (DEFINES): Likewise.
* Makefile.direct (CFLAGS): Add -D USE_MMAP -D USE_MUNMAP.

diff --git a/BCC_MAKEFILE b/BCC_MAKEFILE
index 4e58e25e180dfa1eaf7aa1e44e8e2245688c1793..f6398c1ddfea2e6a3ce9862962dea1ff321854dd 100644 (file)
--- a/BCC_MAKEFILE
+++ b/BCC_MAKEFILE
@@ -15,7 +15,7 @@ cflags=  -O2 -R -v- -vi -H -H=gc.csm -I$(bcinclude);$(gcinclude1) -L$(bclib) \
         -w-pro -w-aus -w-par -w-ccc -w-inl -w-rch -a4\r
 defines= -DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION \\r
      -DENABLE_DISCLAIM -DGC_ATOMIC_UNCOLLECTABLE -DJAVA_FINALIZATION \\r
-     -DGC_GCJ_SUPPORT -DGC_OPERATOR_NEW_ARRAY\r
+     -DGC_GCJ_SUPPORT -DGC_OPERATOR_NEW_ARRAY -DUSE_MUNMAP\r
 \r
 .c.obj:\r
        $(cc) @&&|\r

diff --git a/Makefile.direct b/Makefile.direct
index 4bfcaeef9db14401dccffe8383cfae168dd43dca..7422cd0c2a9c2408cf0b8ef52c0f5c03ea96c154 100644 (file)
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -48,7 +48,7 @@ CFLAGS_EXTRA=
 CFLAGS= -O -I$(srcdir)/include -I$(AO_SRC_DIR)/src \
   -DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM -DGC_ATOMIC_UNCOLLECTABLE \
   -DGC_GCJ_SUPPORT -DJAVA_FINALIZATION -DNO_EXECUTE_PERMISSION \
-  $(CFLAGS_FOR_PIC) $(CFLAGS_EXTRA)
+  -DUSE_MMAP -DUSE_MUNMAP $(CFLAGS_FOR_PIC) $(CFLAGS_EXTRA)
 
 # To build the collector with threads support, add to the above:
 # -DGC_THREADS -DPARALLEL_MARK -DTHREAD_LOCAL_ALLOC

diff --git a/NT_MAKEFILE b/NT_MAKEFILE
index 349d40eb902e7713e9393cfaa0df42ebd257ae5c..103f6fec3e9696c3c55ebcc151f9e72a1519b0fa 100644 (file)
--- a/NT_MAKEFILE
+++ b/NT_MAKEFILE
@@ -76,7 +76,7 @@ LINK_GC=$(link) $(ldebug) $(LINK_DLL_FLAGS)
 
 CFLAGS_SPECIFIC=$(CFLAGS_DEBUG) $(CFLAGS_GCDLL) $(CFLAGS_MT)
 
-CFLAGS_DEFAULT=-DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM -DGC_ATOMIC_UNCOLLECTABLE -DGC_GCJ_SUPPORT -DJAVA_FINALIZATION -DNO_EXECUTE_PERMISSION
+CFLAGS_DEFAULT=-DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM -DGC_ATOMIC_UNCOLLECTABLE -DGC_GCJ_SUPPORT -DJAVA_FINALIZATION -DNO_EXECUTE_PERMISSION -DUSE_MUNMAP
 
 # Make sure that .cc is not viewed as a suffix.  It is for VC++2005, but
 # not earlier versions.  We can deal with either, but not inconsistency.

diff --git a/WCC_MAKEFILE b/WCC_MAKEFILE
index bf4ec4763b868bd4fa0e7f3ea3315f31b48e3b4a..61a1db5308b1af2571b6f17cfeb4076458de9527 100644 (file)
--- a/WCC_MAKEFILE
+++ b/WCC_MAKEFILE
@@ -48,6 +48,7 @@ SYSTEM=Unknown
 SYSFLAG=-DDOS4GW -bt=dos
 !else ifdef MSWIN32
 SYSFLAG=-DMSWIN32 -bt=nt
+DEFS=$(DEFS) -DUSE_MUNMAP
 !else ifdef OS2
 SYSFLAG=-DOS2 -bt=os2
 !else

diff --git a/digimars.mak b/digimars.mak
index 2f098b9c5c6c7e6c12d62aaac696937a95dab066..1388d3539995065697d98b9d2bd259bef5bed2ff 100644 (file)
--- a/digimars.mak
+++ b/digimars.mak
@@ -2,7 +2,7 @@
 # compiler from www.digitalmars.com\r
 # Written by Walter Bright\r
 \r
-DEFINES=-D_WINDOWS -DGC_DLL -DGC_THREADS -DGC_DISCOVER_TASK_THREADS -DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM -DGC_ATOMIC_UNCOLLECTABLE -DGC_GCJ_SUPPORT -DJAVA_FINALIZATION -DNO_EXECUTE_PERMISSION\r
+DEFINES=-D_WINDOWS -DGC_DLL -DGC_THREADS -DGC_DISCOVER_TASK_THREADS -DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM -DGC_ATOMIC_UNCOLLECTABLE -DGC_GCJ_SUPPORT -DJAVA_FINALIZATION -DNO_EXECUTE_PERMISSION -DUSE_MUNMAP\r
 CFLAGS=-Iinclude -Ilibatomic_ops\src $(DEFINES) -wx -g\r
 LFLAGS=/ma/implib/co\r
 CC=sc\r