[m-rev.] diff: merge in GC 6.1alpha5

[Fergus Henderson]

Branches: main
Estimated hours taken: 4

Merge version 6.1alpha5 of the Boehm collector
into the main branch of our CVS repository.
This is needed because the previous version that we
were using doesn't work on RedHat Linux 7.3.

boehm_gc/*:
	Update to GC version 6.1alpha5.

boehm_gc/include/gc.h:
boehm_gc/include/private/gcconfig.h:
boehm_gc/allchblk.c:
boehm_gc/gc_cpp.cc:
boehm_gc/dyn_load.c:
boehm_gc/misc.c:
boehm_gc/os_dep.c:
boehm_gc/include/gc.h:
boehm_gc/include/private/gcconfig.h:
boehm_gc/Makefile:
boehm_gc/Makefile.direct:
	Merge our local changes with the changes between GC versions
	6.0alpha6 to 6.1alpha5.

boehm_gc/allchblk.c:
	Remove our change to disable warnings about allocating
	black-listed blocks.  The boehm_gc code for these warnings has
	improved, so there should be fewer false positives now.
	Also the warnings can be disabled by setting an environment
	variable.

boehm_gc/gc_cpp.cc:
	Revert our (petdr's) MSVC-specific change regarding array
	operator new.  That change was a hack, which will be wrong
	for some versions of MSVC, and which was making maintenance
	difficult by causing merge conflicts.  If it turns out to still
	be needed, the right way to fix this is by defining
	GC_NO_OPERATOR_NEW_ARRAY for appropriate versions of MSVC
	(e.g. in include/gccpp.h), and sending the fix to Hans for
	inclusion in the next GC version.

boehm_gc/NT_MAKEFILE:
boehm_gc/gc.mak:
	Revert our (petdr's) local changes, and just use the unmodified
	gc-6.1alpha5 version.  Perhaps our local changes should be merged
	in, but doing that would be tricky and error-prone, and I can't
	easily test it.  If someone wants to do the merge, they can do
	'cvs update -jgc-6_0alpha6 -jtrunk_snapshot_20020716223636'
	on these two files.

boehm_gc/misc.c:
	Add a comment describing our local changes
	(as required by the Boehm GC license).

boehm_gc/os_dep.c:
boehm_gc/Makefile:
	Delete our local `#ifndef DONT_DEFINE_READ' change,
	since the Boehm GC doesn't define read() by default any more.

I could post the full diff, but the vast majority of that is just changes
in the Boehm collector, which are not really of interest here.
Extracting just the bits I touched is tricky...
So for now I'll just post the log message.

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------