Fix building on m68k (tested: amiga), OK'd by Hans Boehm (hans.boehm hp com)

Bump to 6.2nb3

4 files changed, 30 insertions, 16 deletions

diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 2aa3ee72e62..3296220d887 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2004/02/28 23:41:32 recht Exp $
+# $NetBSD: Makefile,v 1.38 2004/04/03 10:26:14 hubertf Exp $
 #
 
 DISTNAME=		gc6.2
 PKGNAME=		${DISTNAME:S/gc/boehm-gc-/}
-PKGREVISION=		2
+PKGREVISION=		3
 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 48fad748a82..74c18c88b82 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.18 2003/12/03 00:14:16 recht Exp $
+$NetBSD: distinfo,v 1.19 2004/04/03 10:26:14 hubertf Exp $
 
 SHA1 (gc6.2.tar.gz) = ef17f8f56e9853ef41808fdf5c4c7bf2f78f1fec
 Size (gc6.2.tar.gz) = 750883 bytes
 SHA1 (patch-aa) = 90e279f7efba12194c2fbcecfe62bd902d842654
 SHA1 (patch-ab) = 8e85e84a5408dfab53d19bb84cc25140331906b6
 SHA1 (patch-ac) = 38b22813cf2861dcbc9739d70f9fefe69acf3210
-SHA1 (patch-ad) = 79a5ec4a2e2cfa227a5578e0356bff16dd193331
+SHA1 (patch-ad) = d04a825837c969091c17ec4fb6f82a167726d1f4
 SHA1 (patch-ae) = 6e99458a388b5a408e03c133f9b1fdc8b170e87f
 SHA1 (patch-af) = ff3902115a8cc330916500db1169ce67f8354700
 SHA1 (patch-ag) = 540f937741280e2adb85e4c93c39065d5bedeb96
+SHA1 (patch-ah) = c690aa1a375ae17514009124d5d184adcc606633
diff --git a/devel/boehm-gc/patches/patch-ad b/devel/boehm-gc/patches/patch-ad
index 7f1a0ecca1a..fa363330bd7 100644
--- a/devel/boehm-gc/patches/patch-ad
+++ b/devel/boehm-gc/patches/patch-ad
@@ -1,8 +1,6 @@
-$NetBSD: patch-ad,v 1.14 2003/05/22 16:46:50 jmmv Exp $
-
---- include/private/gcconfig.h.orig	2003-04-30 01:44:13.000000000 +0200
-+++ include/private/gcconfig.h	2003-05-14 00:28:46.000000000 +0200
-@@ -83,7 +83,7 @@
+--- include/private/gcconfig.h.orig	Tue Jun 17 04:01:23 2003
++++ include/private/gcconfig.h	Fri Apr  2 23:43:18 2004
+@@ -85,7 +85,7 @@
  #    define SPARC
  #    define mach_type_known
  # endif
@@ -11,7 +9,7 @@ $NetBSD: patch-ad,v 1.14 2003/05/22 16:46:50 jmmv Exp $
  #    define M68K
  #    define mach_type_known
  # endif
-@@ -91,7 +91,7 @@
+@@ -93,7 +93,7 @@
  #    define POWERPC
  #    define mach_type_known
  # endif
@@ -20,7 +18,7 @@ $NetBSD: patch-ad,v 1.14 2003/05/22 16:46:50 jmmv Exp $
  #    define ARM32
  #    define mach_type_known
  # endif
-@@ -104,6 +104,10 @@
+@@ -106,6 +106,10 @@
  #    endif
  #    define mach_type_known
  # endif
@@ -31,18 +29,20 @@ $NetBSD: patch-ad,v 1.14 2003/05/22 16:46:50 jmmv Exp $
  # if defined(mips) || defined(__mips) || defined(_mips)
  #    define MIPS
  #    if defined(nec_ews) || defined(_nec_ews)
-@@ -596,9 +600,14 @@
+@@ -601,8 +605,14 @@
  #   ifdef NETBSD
  #	define OS_TYPE "NETBSD"
  #	define HEURISTIC2
+-	extern char etext[];
+-#	define DATASTART ((ptr_t)(etext))
 +#	ifdef __ELF__
 +#	  define DATASTART GC_data_start
 +#	  define DYNAMIC_LOADING
 +#	else
- 	extern char etext[];
- #	define DATASTART ((ptr_t)(etext))
++	  extern char etext[];
++#	  define DATASTART ((ptr_t)(etext))
++#       endif
++#   define USE_GENERIC_PUSH_REGS
  #   endif
-+#   endif
  #   ifdef LINUX
  #       define OS_TYPE "LINUX"
- #       define STACKBOTTOM ((ptr_t)0xf0000000)
diff --git a/devel/boehm-gc/patches/patch-ah b/devel/boehm-gc/patches/patch-ah
new file mode 100644
index 00000000000..75704722f8f
--- /dev/null
+++ b/devel/boehm-gc/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.5 2004/04/03 10:26:14 hubertf Exp $
+
+--- tests/test.c.orig	Fri Apr  2 23:11:59 2004
++++ tests/test.c
+@@ -1256,7 +1256,7 @@ void run_one_test()
+ 	FAIL;
+       }
+       if (!TEST_FAIL_COUNT(1)) {
+-#	if!(defined(RS6000) || defined(POWERPC) || defined(IA64))
++#	if!(defined(RS6000) || defined(POWERPC) || defined(IA64) || defined(M68K))
+ 	  /* ON RS6000s function pointers point to a descriptor in the	*/
+ 	  /* data segment, so there should have been no failures.	*/
+     	  (void)GC_printf0("GC_is_visible produced wrong failure indication\n");