From: Ivan Maidanski <ivmai@mail.ru>
Date: Sat, 22 Apr 2017 14:24:05 +0000 (+0300)
Subject: Remove unused USE_GENERIC macro definition and description
X-Git-Tag: v7.6.8~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f5bcfdcda51d3f7f037feb0e84497b21424931d;p=gc

Remove unused USE_GENERIC macro definition and description
(a cherry-pick of commit 9ecc54bd from 'master')

* BCC_MAKEFILE: Remove comment about USE_GENERIC macro.
* WCC_MAKEFILE: Likewise.
* BCC_MAKEFILE (defines): Remove -DUSE_GENERIC.
* WCC_MAKEFILE (CFLAGS): Likewise.
* doc/README.win32 (Borland Tools): Remove information about
-DUSE_GENERIC and assembler.
---

diff --git a/BCC_MAKEFILE b/BCC_MAKEFILE
index 19ff3f7e..1f4a1b6f 100644
--- a/BCC_MAKEFILE
+++ b/BCC_MAKEFILE
@@ -1,5 +1,4 @@
 # Makefile for Borland C++ 5.5 on NT
-# If you have the Borland assembler, remove "-DUSE_GENERIC"
 #
 bc=	   c:\Borland\BCC55
 bcbin=	   $(bc)\bin
@@ -14,7 +13,7 @@ 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 -DUSE_GENERIC -DNO_GETENV -DJAVA_FINALIZATION -DGC_OPERATOR_NEW_ARRAY
+defines= -DALL_INTERIOR_POINTERS -DNO_GETENV -DJAVA_FINALIZATION -DGC_OPERATOR_NEW_ARRAY
 
 .c.obj:
 	$(cc) @&&|
diff --git a/WCC_MAKEFILE b/WCC_MAKEFILE
index 46e66bea..718c2103 100644
--- a/WCC_MAKEFILE
+++ b/WCC_MAKEFILE
@@ -66,8 +66,7 @@ TEST_DLLFLAG=
 CC=wcc386
 CXX=wpp386
 
-# -DUSE_GENERIC is required !
-CFLAGS=-$(CPU)$(CALLING) $(OPTIM) -zp4 -zc $(SYSFLAG) $(DLLFLAG) -DUSE_GENERIC $(DEFS)
+CFLAGS=-$(CPU)$(CALLING) $(OPTIM) -zp4 -zc $(SYSFLAG) $(DLLFLAG) $(DEFS)
 CXXFLAGS= $(CFLAGS)
 TEST_CFLAGS=-$(CPU)$(CALLING) $(OPTIM) -zp4 -zc $(SYSFLAG) $(TEST_DLLFLAG) $(DEFS)
 TEST_CXXFLAGS= $(TEST_CFLAGS)
diff --git a/doc/README.win32 b/doc/README.win32
index 0a32c204..fae4b5cf 100644
--- a/doc/README.win32
+++ b/doc/README.win32
@@ -94,9 +94,7 @@ I expect that -a1 introduces major performance penalties on a
 resort, gcconfig.h can be changed to allow 1 byte alignment.  But
 this has significant negative performance implications.)
 The Makefile is set up to assume Borland 4.5.  If you have another
-version, change the line near the top.  By default, it does not
-require the assembler.  If you do have the assembler, I recommend
-removing the -DUSE_GENERIC.
+version, change the line near the top.
 
 Digital Mars compiler
 ---------------------