From: Ivan Maidanski <ivmai@mail.ru>
Date: Wed, 17 Jul 2019 07:29:36 +0000 (+0300)
Subject: Remove Borland-specific Makefile (BCC_MAKEFILE)
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d67a9b19293ad081bd65f43af4682c4c55237693;p=gc

Remove Borland-specific Makefile (BCC_MAKEFILE)

Issue #105 (bdwgc).

CMake script should be used instead of BCC_MAKEFILE.

* BCC_MAKEFILE: Remove file.
* Makefile.am (EXTRA_DIST): Remove BCC_MAKEFILE.
* doc/README.win32 (Borland Tools): Remove "rarely tested" note; change
BCC_MAKEFILE to cmake -G "Borland Makefiles"; remove note that
Borland 5.5 is assumed.
---

diff --git a/BCC_MAKEFILE b/BCC_MAKEFILE
deleted file mode 100644
index 9ad4e29c..00000000
--- a/BCC_MAKEFILE
+++ /dev/null
@@ -1,85 +0,0 @@
-# Makefile for Borland C++ 5.5 on NT
-#
-bc=	   c:\Borland\BCC55
-bcbin=	   $(bc)\bin
-bclib=	   $(bc)\lib
-bcinclude= $(bc)\include
-
-gcinclude1 = .\include
-
-cc=	 $(bcbin)\bcc32
-rc=	 $(bcbin)\brc32
-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_EXECUTE_PERMISSION \
-     -DENABLE_DISCLAIM -DGC_ATOMIC_UNCOLLECTABLE -DJAVA_FINALIZATION \
-     -DGC_GCJ_SUPPORT -DGC_OPERATOR_NEW_ARRAY -DUSE_MUNMAP
-
-.c.obj:
-	$(cc) @&&|
-	$(cdebug) $(cflags) $(cvars) $(defines) -o$* -c $*.c
-|
-
-.cpp.obj:
-	$(cc) @&&|
-	$(cdebug) $(cflags) $(cvars) $(defines) -o$* -c $*.cpp
-|
-
-.rc.res:
-	$(rc) -i$(bcinclude) -r -fo$* $*.rc
-
-XXXOBJS= XXXalloc.obj XXXreclaim.obj XXXallchblk.obj XXXmisc.obj \
-    XXXmach_dep.obj XXXos_dep.obj XXXmark_rts.obj XXXheaders.obj XXXmark.obj \
-    XXXobj_map.obj XXXblacklst.obj XXXfinalize.obj XXXnew_hblk.obj \
-    XXXdbg_mlc.obj XXXmalloc.obj XXXdyn_load.obj \
-    XXXtypd_mlc.obj XXXptr_chck.obj XXXgc_cpp.obj XXXmallocx.obj \
-    XXXfnlz_mlc.obj XXXgcj_mlc.obj
-
-OBJS= $(XXXOBJS:XXX=)
-
-all: gc.lib
-
-check: gctest.exe test_cpp.exe de.exe
-	gctest.exe
-	test_cpp.exe
-
-$(OBJS) test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h MAKEFILE
-
-gc.lib: $(OBJS)
-	-del gc.lib
-	$(lib) $* @&&|
-	$(XXXOBJS:XXX=+)
-|
-
-gctest.exe: tests\test.obj gc.lib
-	$(cc) @&&|
-	$(cflags) -W -e$* tests\test.obj gc.lib
-|
-
-cord\tests\de.obj cord\tests\de_win.obj: include\cord.h \
-    include\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h
-
-de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj \
-    cord\tests\de_win.obj cord\tests\de_win.res gc.lib
-	$(cc) @&&|
-	$(cflags) -W -e$* cord\cordbscs.obj cord\cordxtra.obj \
-	cord\tests\de.obj cord\tests\de_win.obj gc.lib
-|
-	$(rc) cord\tests\de_win.res de.exe
-
-gc_cpp.obj: gc_cpp.cc include\gc_cpp.h include\gc.h
-
-test_cpp.cpp: tests\test_cpp.cc
-	copy tests\test_cpp.cc test_cpp.cpp
-
-test_cpp.exe: test_cpp.obj include\gc_cpp.h include\gc.h gc.lib
-	$(cc) @&&|
-	$(cflags) -W -e$* test_cpp.obj gc.lib
-|
-
-clean:
-	-del *.obj *.res *.exe *.csm cord\*.obj cord\*.res cord\*.exe cord\*.csm
-	-del cord\*.tds cord\tests\*.obj cord\tests\*.res
-	-del *.log *.tds gc.lib tests\test.obj "gc.#0*"
diff --git a/Makefile.am b/Makefile.am
index fc77933c..5d781d7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -196,8 +196,7 @@ EXTRA_DIST += README.QUICK
 
 # other makefiles
 # :GOTCHA: deliberately we do not include 'Makefile'
-EXTRA_DIST += BCC_MAKEFILE NT_MAKEFILE \
-    OS2_MAKEFILE PCR-Makefile digimars.mak \
+EXTRA_DIST += NT_MAKEFILE OS2_MAKEFILE PCR-Makefile digimars.mak \
     Makefile.direct SMakefile.amiga WCC_MAKEFILE autogen.sh CMakeLists.txt
 
 # files used by makefiles other than Makefile.am
diff --git a/doc/README.win32 b/doc/README.win32
index f05fb9c6..7827fd1c 100644
--- a/doc/README.win32
+++ b/doc/README.win32
@@ -80,8 +80,7 @@ Memory unmapping could be turned off by "--disable-munmap" option.
 Borland Tools
 -------------
 
-[Rarely tested.]
-For Borland tools, use BCC_MAKEFILE.  Note that
+For Borland tools, use `cmake -G "Borland Makefiles"`.  Note that
 Borland's compiler defaults to 1 byte alignment in structures (-a1),
 whereas Visual C++ appears to default to 8 byte alignment (/Zp8).
 The garbage collector in its default configuration EXPECTS AT
@@ -91,8 +90,6 @@ I expect that -a1 introduces major performance penalties on a
 486 or Pentium.)  Note that this changes structure layouts.  (As a last
 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 5.5.  If you have another
-version, change the line near the top.
 
 Digital Mars compiler
 ---------------------