diff options
author | Ivan Maidanski <ivmai@mail.ru> | 2018-12-19 00:48:13 +0300 |
---|---|---|
committer | Ivan Maidanski <ivmai@mail.ru> | 2018-12-19 00:52:41 +0300 |
commit | 0d2cc03848f45e1ca7176d7d73bff099f37b3a49 (patch) | |
tree | ea012ff98d06ddca1887af101ba9c174608b7381 | |
parent | 48dd4999917820aa22994189f072b9acbb547322 (diff) | |
download | bdwgc-0d2cc03848f45e1ca7176d7d73bff099f37b3a49.tar.gz |
Default to non-executable memory allocation across all make scripts
This matches the policy of Makefile.direct, configure and CMakeLists.txt.
* BCC_MAKEFILE (defines): Add -D NO_EXECUTE_PERMISSION.
* NT_MAKEFILE (.c.obj): Likewise.
* OS2_MAKEFILE (CFLAGS): Likewise.
* WCC_MAKEFILE (DEFS): Likewise.
* digimars.mak (DEFINES): Likewise.
* gc.mak [$CFG=="gc - Win32 Release" || $CFG=="gc - Win32 Debug"]
(CPP_PROJ): Likewise.
-rw-r--r-- | BCC_MAKEFILE | 3 | ||||
-rw-r--r-- | NT_MAKEFILE | 2 | ||||
-rw-r--r-- | OS2_MAKEFILE | 2 | ||||
-rw-r--r-- | WCC_MAKEFILE | 2 | ||||
-rw-r--r-- | digimars.mak | 2 | ||||
-rw-r--r-- | gc.mak | 8 |
6 files changed, 10 insertions, 9 deletions
diff --git a/BCC_MAKEFILE b/BCC_MAKEFILE index 10ac184a..86b45dfd 100644 --- a/BCC_MAKEFILE +++ b/BCC_MAKEFILE @@ -13,7 +13,8 @@ lib= $(bcbin)\tlib link= $(bcbin)\ilink32
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
-defines= -DALL_INTERIOR_POINTERS -DNO_GETENV -DJAVA_FINALIZATION -DENABLE_DISCLAIM -DGC_OPERATOR_NEW_ARRAY
+defines= -DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION -DNO_GETENV \
+ -DENABLE_DISCLAIM -DJAVA_FINALIZATION -DGC_OPERATOR_NEW_ARRAY
.c.obj:
$(cc) @&&|
diff --git a/NT_MAKEFILE b/NT_MAKEFILE index 479e64f3..efb1e969 100644 --- a/NT_MAKEFILE +++ b/NT_MAKEFILE @@ -92,7 +92,7 @@ OBJS= misc.obj win32_threads.obj alloc.obj reclaim.obj allchblk.obj mach_dep.obj all: gctest.exe cord\de.exe test_cpp.exe .c.obj: - $(cc) $(cdebug) $(cflags) $(CFLAGS_SPECIFIC) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM -DCORD_NOT_DLL -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj /wd4100 /wd4127 /wd4701 + $(cc) $(cdebug) $(cflags) $(CFLAGS_SPECIFIC) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM -DNO_EXECUTE_PERMISSION -DCORD_NOT_DLL -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj /wd4100 /wd4127 /wd4701 # Disable crt security warnings, since unfortunately they warn about all sorts # of safe uses of strncpy. It would be nice to leave the rest enabled. diff --git a/OS2_MAKEFILE b/OS2_MAKEFILE index 400fa73d..9a0d6ae7 100644 --- a/OS2_MAKEFILE +++ b/OS2_MAKEFILE @@ -10,7 +10,7 @@ OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_r CORDOBJS= cord\cordbscs.obj cord\cordxtra.obj cord\cordprnt.obj CC= icc -CFLAGS= /O /Q /DSMALL_CONFIG /DALL_INTERIOR_POINTERS /DENABLE_DISCLAIM +CFLAGS= /O /Q /DALL_INTERIOR_POINTERS /DENABLE_DISCLAIM /DNO_EXECUTE_PERMISSION /DSMALL_CONFIG # Use /Ti instead of /O for debugging # Setjmp_test may yield overly optimistic results when compiled # without optimization. diff --git a/WCC_MAKEFILE b/WCC_MAKEFILE index 0aae2df7..4fd4c443 100644 --- a/WCC_MAKEFILE +++ b/WCC_MAKEFILE @@ -25,7 +25,7 @@ CPU=5 OPTIM=-oneatx -s #OPTIM=-ohneatx -s -DEFS=-DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM #-DSMALL_CONFIG +DEFS=-DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM -DNO_EXECUTE_PERMISSION #-DSMALL_CONFIG ##### diff --git a/digimars.mak b/digimars.mak index 40d6e143..9e9f21f8 100644 --- a/digimars.mak +++ b/digimars.mak @@ -2,7 +2,7 @@ # compiler from www.digitalmars.com
# Written by Walter Bright
-DEFINES=-D_WINDOWS -DGC_DLL -DGC_THREADS -DGC_DISCOVER_TASK_THREADS -DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM
+DEFINES=-D_WINDOWS -DGC_DLL -DGC_THREADS -DGC_DISCOVER_TASK_THREADS -DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM -DNO_EXECUTE_PERMISSION
CFLAGS=-Iinclude -Ilibatomic_ops\src $(DEFINES) -wx -g
LFLAGS=/ma/implib/co
CC=sc
@@ -120,7 +120,7 @@ CPP=cl.exe # ADD CPP /nologo /MD /W3 /GX /O2 /I include /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "GC_THREADS" /FR /YX /c CPP_PROJ=/nologo /MD /W3 /EHsc /O2 /I include /D "NDEBUG" /D "WIN32"\ /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "ENABLE_DISCLAIM"\ - /D "GC_THREADS" /D "_CRT_SECURE_NO_DEPRECATE"\ + /D "GC_THREADS" /D "NO_EXECUTE_PERMISSION" /D "_CRT_SECURE_NO_DEPRECATE"\ /FR"$(INTDIR)/" /Fp"$(INTDIR)/gc.pch"\ /I./libatomic_ops/src /Fo"$(INTDIR)/" /c CPP_OBJS=.\Release/ @@ -309,9 +309,9 @@ CPP=cl.exe # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I include /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "GC_THREADS" /FR /YX /c CPP_PROJ=/nologo /MDd /W3 /Gm /EHsc /Zi /Od /I include /D "_DEBUG"\ /D "WIN32" /D "_WINDOWS" /D "ALL_INTERIOR_POINTERS" /D "ENABLE_DISCLAIM"\ - /D "GC_ASSERTIONS" /D "GC_THREADS" /D "_CRT_SECURE_NO_DEPRECATE"\ - /FR"$(INTDIR)/" /Fp"$(INTDIR)/gc.pch" /Fo"$(INTDIR)/"\ - /I./libatomic_ops/src /Fd"$(INTDIR)/" /c + /D "GC_ASSERTIONS" /D "GC_THREADS" /D "NO_EXECUTE_PERMISSION"\ + /D "_CRT_SECURE_NO_DEPRECATE" /FR"$(INTDIR)/" /Fp"$(INTDIR)/gc.pch"\ + /Fo"$(INTDIR)/" /I./libatomic_ops/src /Fd"$(INTDIR)/" /c CPP_OBJS=.\Debug/ CPP_SBRS=.\Debug/ |