Update to 6.4:

 - Merge gcconfig.h changes from gcc tree.
 - Unconditionally include gc_priv.h in solaris_pthreads.c, win32_threads.h,
   aix_irix_threads.c, and solaris_threads.c to get thread definitions.
 - Start marker threads in GC_thr_init, so that they get started even
   if no other threads are ever started.  (Oddly enough, the parallel
   collector worked correctly, though not well, with no helper threads.)
 - Go ahead and split large blocks in GC_allochblk_nth if GC_dont_gc
   is set.  (Thanks to Alexander Petrossian.)
 - GC_PRINT_BACK_HEIGHT would deadlock with thread support.
 - Let in_progress_space in backgraph.s grow dynamically.
 - Fix README.solaris2.  The GC_thr_init() hack doesn't work anymore.
 - Convert GC_finalizer_mem_freed to bytes in allchblk.c.
 - Add missing declaration for GC_generic_malloc_words_small_inner.
   Without it, s390x breaks.  (Thanks to Ulrich Weigand.)
 - Applied several MacOSX patches to support older tool chains.
   (Thanks to Stefan Ring.)
 - Bug fix for NetBSD/amd64.  (Thanks to Marc Recht.)  Add NetBSD/sh3
   support.  (Thanks to Uchiyama Yasushi.)
 - Fixed an uninitialized variable in cordprnt.c.  (Thanks to gcc for
   providing the warning.)
 - Eliminated some, but not all, gcc -Wall warnings.
 - Changed some old style casts to reinterpret_cast in new_gc_alloc.h.
   (Thanks to Dan Grayson.)
 - GC_extend_size_map shouldn't adjust for GC_all_interior_pointers if
   GC_DONT_ADD_BYTE_AT_END is set.
 - Changed some (long) casts to (word) in preparation for win64.
   (Thanks to Peter Colson.)
 - Changed "int stack_size" declaration in pthread_support.c to use
   size_t.  (Only mattered with GC_ASSERTIONS enabled.)
 - Added CRIS (etrax) support.  (Thanks to Simon Posnjak and
   Hans-Peter Nilsson.)
 - Removed GC_IGNORE_FB frame buffer recognition, and replaced
   it with a check that the mapping type is MEM_IMAGE.
   In theory, this should work much better, but it is a high
   risk change for win32.  (Thanks to Ashley Bone for the crucial
   experimental data behind this, and to Rutger Ovidus for
   some further experiments.)
 - Fixed print_block_list to print the correct kind number for
   STUBBORN.  (Thanks to Rutger Ovidus.)
 - GC_allochblk_nth incremented GC_words_wasted by bytes rather than
   words.
 - Consider GC_words_wasted in GC_adj_words_allocd only if it is within
   reason.  (A hack to avoid some extremely unlikely scenarios in which
   we manage to allocate only "wasted" space.  7.0 has a better fix.)
 - Changed PowerPC GC_clear implementation to use lwsync instead of
   eieio, since the documentation recommends against eieio, and
   it seems to be incorrect if the preceding memory op is a load.
 - Fixed print_block_list to print the correct kind number for
   STUBBORN.  (Thanks to Rutger Ovidus.)
 - GC_allochblk_nth incremented GC_words_wasted by bytes rather than
   words.
 - Have configure.in generate an error if it is asked to support
   pthreads, but doesn't know how to.
 - Added Kazuhiro Inaoka's patch for Renesas M32R support.
 - Have the GNU build mechanism link with -ldl.  Rename THREADLIBS
   to THREADDLLIBS to reflect this.  (Thanks to Sven Verdoolaege.)
 - Added Hannes Mehnert's patch for FreeBSD/SPARC support.
 - Merged some FreeBSD specific patches to threadlibs.c and dyn_load.c.
   (Thanks tp John Merryweather Cooper.)
 - Define MPROTECT_VDB on MACOSX only if threads are being used, since the
   dirty page tracking mechanism uses threads.  (This avoids an undefined
   reference to _GC_darwin_register_mach_handler_thread.)
 - By popular demand, use __libc symbols only if we are built with
   USE_LIBC_PRIVATES, which is off by default, and not otherwise documented.
 - Ignore GC_enable_incremental() requests when KEEP_BACK_PTRS is set.
   The GC itself will dirty lots of pages in this cases, probably making
   it counterproductive on all platforms.  And the DARWIN port crashes.

5 files changed, 15 insertions, 76 deletions

diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 886c3d98844..8cd299a203b 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2004/12/06 23:00:23 adam Exp $
+# $NetBSD: Makefile,v 1.45 2005/02/19 21:19:50 wiz Exp $
 
-DISTNAME=	gc6.3
+DISTNAME=	gc6.4
 PKGNAME=	${DISTNAME:S/gc/boehm-gc-/}
-PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
 
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index 9bb05633ed0..2fc8cc42622 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.23 2004/11/10 19:10:52 snj Exp $
+$NetBSD: distinfo,v 1.24 2005/02/19 21:19:50 wiz Exp $
 
-SHA1 (gc6.3.tar.gz) = 58042fd0dbfc96423cf0bb1fe6ea0791e9cb79cf
-Size (gc6.3.tar.gz) = 772114 bytes
-SHA1 (patch-ab) = ecb2c60bdc561bfe5177f20c6d89d3a1789c3a6d
+SHA1 (gc6.4.tar.gz) = f857013d6af72979996ff994e740cad035c48e86
+Size (gc6.4.tar.gz) = 778553 bytes
 SHA1 (patch-ac) = 64c0f042a1ed7488158d49c77bab0330537d9e96
-SHA1 (patch-ad) = 1a7325d82be4d3e1fb2e37bdc54290871e46ca55
 SHA1 (patch-ae) = 6e99458a388b5a408e03c133f9b1fdc8b170e87f
 SHA1 (patch-af) = 35d27b97939c52319e2dc6524bb570f6aed01044
-SHA1 (patch-ag) = 2b1535c09fa28b2363f49ed2b673163c80ea61ff
+SHA1 (patch-ag) = f3af2a7692fc69689983d41e08c0e9417fae2fc4
diff --git a/devel/boehm-gc/patches/patch-ab b/devel/boehm-gc/patches/patch-ab
deleted file mode 100644
index 361983cd164..00000000000
--- a/devel/boehm-gc/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.12 2004/07/13 14:22:27 recht Exp $
-
---- dyn_load.c.orig	2004-05-06 01:03:06.000000000 +0200
-+++ dyn_load.c	2004-07-12 21:07:23.000000000 +0200
-@@ -80,6 +80,11 @@
- #   define l_name	lm_name
- #endif
- 
-+#if defined(NETBSD)
-+#   include <machine/elf_machdep.h>
-+#   define ELFSIZE ARCH_ELFSIZE
-+#endif
-+
- #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \
-     (defined(FREEBSD) && defined(__ELF__)) || defined(DGUX) || \
-     (defined(NETBSD) && defined(__ELF__)) || defined(HURD)
-@@ -91,7 +96,7 @@
- /* Newer versions of GNU/Linux define this macro.  We
-  * define it similarly for any ELF systems that don't.  */
- #  ifndef ElfW
--#    ifdef __NetBSD__
-+#    ifdef NETBSD
- #      if ELFSIZE == 32
- #        define ElfW(type) Elf32_##type
- #      else
diff --git a/devel/boehm-gc/patches/patch-ad b/devel/boehm-gc/patches/patch-ad
deleted file mode 100644
index 5140f733cb9..00000000000
--- a/devel/boehm-gc/patches/patch-ad
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ad,v 1.19 2004/07/13 14:22:27 recht Exp $
-
---- include/private/gcconfig.h.orig	2004-05-06 01:10:54.000000000 +0200
-+++ include/private/gcconfig.h	2004-07-13 10:19:42.000000000 +0200
-@@ -97,6 +97,10 @@
- #    define ARM32
- #    define mach_type_known
- # endif
-+# if defined(NETBSD) && defined(__sh__)
-+#    define SH
-+#    define mach_type_known
-+# endif
- # if defined(vax)
- #    define VAX
- #    ifdef ultrix
-@@ -1811,6 +1815,13 @@
-       extern int _end[];
- #     define DATAEND (_end)
- #   endif
-+#   ifdef NETBSD
-+#      define OS_TYPE "NETBSD"
-+#      define HEURISTIC2
-+#      define DATASTART GC_data_start
-+#       define USE_GENERIC_PUSH_REGS
-+#      define DYNAMIC_LOADING
-+#   endif
- # endif
-  
- # ifdef SH4
diff --git a/devel/boehm-gc/patches/patch-ag b/devel/boehm-gc/patches/patch-ag
index 81d0acd4201..a5f27ba2fae 100644
--- a/devel/boehm-gc/patches/patch-ag
+++ b/devel/boehm-gc/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.8 2004/11/10 19:10:53 snj Exp $
+$NetBSD: patch-ag,v 1.9 2005/02/19 21:19:50 wiz Exp $
 
---- os_dep.c.orig	2004-11-10 10:25:06.000000000 -0800
-+++ os_dep.c	2004-11-10 10:26:51.000000000 -0800
-@@ -3940,10 +3940,14 @@ kern_return_t catch_exception_raise_stat
+--- os_dep.c.orig	2004-12-18 02:42:19.000000000 +0100
++++ os_dep.c
+@@ -3950,10 +3950,10 @@ kern_return_t catch_exception_raise_stat
  #      if defined (DRSNX)
  #	 include <sys/sparc/frame.h>
  #      else
@@ -10,12 +10,8 @@ $NetBSD: patch-ag,v 1.8 2004/11/10 19:10:53 snj Exp $
 +#	 if defined(OPENBSD)
  #	   include <frame.h>
  #	 else
--#	   include <sys/frame.h>
-+#          if defined(NETBSD)
-+#            include <machine/frame.h>
-+#          else
-+#	     include <sys/frame.h>
-+#          endif
- #	 endif
- #      endif
- #    endif
+-#	   if defined(FREEBSD)
++#	   if defined(FREEBSD) || defined(NETBSD)
+ #	     include <machine/frame.h>
+ #	   else
+ #	     include <sys/frame.h>