Update to 7.0:

Changes relative to 6.8 include, in no particular order:

 - Change C code to require at least C89.  Clean up code in various
   other respects.
 - Win64 port.
 - Always count how much live data there is in the heap.  Add more
   robust heap expansion heuristic which relies on this.
 - Remove old-style Solaris threads support and some other obsolete
   platform support.
 - Restructure mark code, hopefully resulting in some performance
   improvements.
 - Change the GC code to traffic mostly in either bytes or allocation
   granules, not words, internally.
 - Provide for fast inline allocation that requires less frequent client
   recompilations.  (Needs more testing.)
 - Removed SILENT configuration macro and PRINTSTATS and GATHERSTATS
   macros.  Control is now via GC_PRINT_STATS and GC_PRINT_VERBOSE_STATS
   encironment variables.
 - Thread local allocation is now performed without needing to call
   special allocation functions.  The configuration macro
   THREAD_LOCAL_ALLOC
   continues to determine whether this is supported.
 - Thread local allocation is supported on more platforms.
 - Win32 threads code was rewritten and is hopefully more sane.
 - Allocation routines now decide whether to lock dynamically, based on
   whether a second thread has been created.
 - Mostly untested support for a compiler write barrier.
 - Use libatomic_ops for atomic operations.
 - Limited support for malloc redirection with Linux threads (& NPTL ).
 - Various bug fixes and some new platform support.

8 files changed, 51 insertions, 61 deletions

diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 8ed137c4deb..cea310e447f 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2006/11/05 17:49:33 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2007/07/07 15:21:07 wiz Exp $
 
-DISTNAME=	gc6.8
-PKGNAME=	${DISTNAME:S/gc/boehm-gc-/}
+DISTNAME=	gc-7.0
+PKGNAME=	${DISTNAME:S/gc/boehm-gc/}
 CATEGORIES=	devel
 MASTER_SITES=	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
 
diff --git a/devel/boehm-gc/PLIST b/devel/boehm-gc/PLIST
index d02cf3a3b0f..130e36bec4f 100644
--- a/devel/boehm-gc/PLIST
+++ b/devel/boehm-gc/PLIST
@@ -1,18 +1,15 @@
-@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:09:24 jlam Exp $
-include/gc.h
+@comment $NetBSD: PLIST,v 1.9 2007/07/07 15:21:07 wiz Exp $
 include/gc/gc.h
-include/gc/gc_alloc.h
 include/gc/gc_allocator.h
 include/gc/gc_amiga_redirects.h
 include/gc/gc_backptr.h
 include/gc/gc_config_macros.h
 include/gc/gc_cpp.h
 include/gc/gc_gcj.h
-include/gc/gc_inl.h
 include/gc/gc_inline.h
-include/gc/gc_local_alloc.h
 include/gc/gc_mark.h
 include/gc/gc_pthread_redirects.h
+include/gc/gc_tiny_fl.h
 include/gc/gc_typed.h
 include/gc/leak_detector.h
 include/gc/new_gc_alloc.h
@@ -21,15 +18,10 @@ include/gc/private/gc_locks.h
 include/gc/private/gc_priv.h
 include/gc/private/gcconfig.h
 include/gc/weakpointer.h
-include/gc_allocator.h
-include/gc_config_macros.h
-include/gc_cpp.h
-include/gc_local_alloc.h
-include/gc_pthread_redirects.h
-include/gc_typed.h
-include/leak_detector.h
+lib/libcord.la
 lib/libgc.la
 lib/libgccpp.la
+lib/pkgconfig/bdw-gc.pc
 man/man3/gc.3
 share/doc/gc/README
 share/doc/gc/README.DGUX386
@@ -54,12 +46,15 @@ share/doc/gc/README.sgi
 share/doc/gc/README.solaris2
 share/doc/gc/README.uts
 share/doc/gc/README.win32
+share/doc/gc/README.win64
 share/doc/gc/barrett_diagram
 share/doc/gc/debugging.html
 share/doc/gc/gc.man
 share/doc/gc/gcdescr.html
 share/doc/gc/gcinterface.html
 share/doc/gc/leak.html
+share/doc/gc/overview.html
+share/doc/gc/porting.html
 share/doc/gc/scale.html
 share/doc/gc/simple_example.html
 share/doc/gc/tree.html
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index 5dd7832fd13..e22eb4d7b4f 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.32 2007/01/25 03:13:59 dmcmahill Exp $
+$NetBSD: distinfo,v 1.33 2007/07/07 15:21:07 wiz Exp $
 
-SHA1 (gc6.8.tar.gz) = 6d5def5ba5d29292ba9c76f04df3ec06d3ab3278
-RMD160 (gc6.8.tar.gz) = 6e894e7a51683a9342fd738baa6f1a2861e27400
-Size (gc6.8.tar.gz) = 756879 bytes
-SHA1 (patch-aa) = 6a0795787aee08f015bcdbdd590d8e2583b5a274
-SHA1 (patch-ab) = 0e8b628a023a67a7da461d4fcd22df0792e4efe3
+SHA1 (gc-7.0.tar.gz) = 657d84b702a572f8a510d2c28578a6dbaad3fed2
+RMD160 (gc-7.0.tar.gz) = 4912e2590dd8212bebeeb1e32506762ca31d0088
+Size (gc-7.0.tar.gz) = 1072682 bytes
+SHA1 (patch-aa) = 87a5bd5e83b0201d80a1e4e4ce6745c11b2e7cfe
+SHA1 (patch-ab) = b0301507ce02a3b06bb6044b50d3ccaa522ea4f1
 SHA1 (patch-ac) = 64c0f042a1ed7488158d49c77bab0330537d9e96
-SHA1 (patch-ad) = 42b3541bfacb8506ef681a9a9e350d986e0d9683
-SHA1 (patch-ae) = e8da710ece0400136c71ee7888c0ce7f719ac660
-SHA1 (patch-af) = b8505855125cd90987873e7a40f2a6b246226979
+SHA1 (patch-ad) = 893b5146db0d9f82ec95acd7e217f3d910e33ea0
+SHA1 (patch-af) = 80f1b9b136f808db1b227b70801ffa378abd07c7
diff --git a/devel/boehm-gc/patches/patch-aa b/devel/boehm-gc/patches/patch-aa
index 66fd50f5d75..a0952bf362c 100644
--- a/devel/boehm-gc/patches/patch-aa
+++ b/devel/boehm-gc/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.18 2007/01/23 03:27:20 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.19 2007/07/07 15:21:07 wiz Exp $
 
---- configure.in.orig	2006-06-07 01:01:52.000000000 -0400
-+++ configure.in
-@@ -326,7 +326,7 @@ case "$host" in
-     machdep="sparc_mach_dep.lo"
+--- configure.ac.orig	2007-06-30 15:40:15.000000000 +0000
++++ configure.ac
+@@ -399,7 +399,7 @@ case "$host" in
+     machdep="mach_dep.lo sparc_mach_dep.lo"
      AC_DEFINE(SUNOS53_SHARED_LIB)
      ;;
 - sparc*-sun-solaris2.*)
 + sparc*-sun-solaris2*)
-     machdep="sparc_mach_dep.lo"
+     machdep="mach_dep.lo sparc_mach_dep.lo"
      ;;
   ia64-*-*)
diff --git a/devel/boehm-gc/patches/patch-ab b/devel/boehm-gc/patches/patch-ab
index bc4b1abab81..16aacaa1a89 100644
--- a/devel/boehm-gc/patches/patch-ab
+++ b/devel/boehm-gc/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.16 2007/01/23 03:27:20 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.17 2007/07/07 15:21:07 wiz Exp $
 
---- configure.orig	2006-03-23 19:42:55.000000000 -0500
+--- configure.orig	2007-06-30 15:40:25.000000000 +0000
 +++ configure
-@@ -4506,7 +4506,7 @@ _ACEOF
+@@ -6150,7 +6150,7 @@ _ACEOF
  _ACEOF
  
      ;;
 - sparc*-sun-solaris2.*)
 + sparc*-sun-solaris2*)
-     machdep="sparc_mach_dep.lo"
+     machdep="mach_dep.lo sparc_mach_dep.lo"
      ;;
   ia64-*-*)
diff --git a/devel/boehm-gc/patches/patch-ad b/devel/boehm-gc/patches/patch-ad
index 72b0146d6a2..1fc8b7a8649 100644
--- a/devel/boehm-gc/patches/patch-ad
+++ b/devel/boehm-gc/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.23 2007/01/25 03:13:59 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.24 2007/07/07 15:21:08 wiz Exp $
 
 Needed to build with the sun studio compilers
 
---- include/gc_cpp.h.orig	2005-12-05 19:35:14.000000000 -0500
+--- include/gc_cpp.h.orig	2007-05-09 00:53:31.000000000 +0000
 +++ include/gc_cpp.h
-@@ -212,8 +212,8 @@ extern "C" {typedef void (*GCCleanUpFunc
+@@ -219,8 +219,8 @@ extern "C" {typedef void (*GCCleanUpFunc
  inline void* operator new( 
      size_t size, 
      GCPlacement gcp,
@@ -15,7 +15,7 @@ Needed to build with the sun studio compilers
      /*
      Allocates a collectable or uncollected object, according to the
      value of "gcp".
-@@ -257,8 +257,8 @@ inline void* operator new( 
+@@ -264,8 +264,8 @@ inline void* operator new( 
  inline void* operator new[](
      size_t size, 
      GCPlacement gcp,
diff --git a/devel/boehm-gc/patches/patch-ae b/devel/boehm-gc/patches/patch-ae
deleted file mode 100644
index 2f7846c2948..00000000000
--- a/devel/boehm-gc/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2005/07/02 12:55:40 wiz Exp $
-
---- doc/Makefile.in.orig	2005-05-17 01:28:27.000000000 +0200
-+++ doc/Makefile.in
-@@ -30,7 +30,7 @@
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/doc/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
diff --git a/devel/boehm-gc/patches/patch-af b/devel/boehm-gc/patches/patch-af
index 1b7db3ff6c4..3691527ba03 100644
--- a/devel/boehm-gc/patches/patch-af
+++ b/devel/boehm-gc/patches/patch-af
@@ -1,19 +1,28 @@
-$NetBSD: patch-af,v 1.10 2006/07/17 17:08:16 wiz Exp $
+$NetBSD: patch-af,v 1.11 2007/07/07 15:21:08 wiz Exp $
 
---- Makefile.in.orig	2006-02-19 00:50:57.000000000 +0000
+--- Makefile.in.orig	2007-06-28 21:12:36.000000000 +0000
 +++ Makefile.in
-@@ -323,6 +323,10 @@ include_HEADERS = include/gc.h include/g
- include/gc_pthread_redirects.h include/gc_config_macros.h \
- include/leak_detector.h include/gc_typed.h @addincludes@
- 
+@@ -75,7 +75,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-pkgdatadir = $(datadir)/@PACKAGE@
++pkgdatadir = $(datadir)/doc/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = .
+@@ -323,6 +323,10 @@ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
 +include_PRIVATE_HEADERS = include/private/gc_hdrs.h \
 +include/private/gc_locks.h include/private/gc_priv.h \
 +include/private/gcconfig.h
 +
- EXTRA_HEADERS = include/gc_cpp.h include/gc_allocator.h
- @POWERPC_DARWIN_FALSE@asm_libgc_sources = 
- @POWERPC_DARWIN_TRUE@asm_libgc_sources = powerpc_darwin_mach_dep.s
-@@ -591,6 +595,13 @@ install-includeHEADERS: $(include_HEADER
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+@@ -895,6 +899,13 @@ install-includeHEADERS: $(include_HEADER
  	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
  	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
  	done