[pkgsrc/trunk]: pkgsrc/devel/boehm-gc Make this buildable on NetBSD/amd64.

[toshii <toshii%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f16cfadfc84b
branches:  trunk
changeset: 477264:f16cfadfc84b
user:      toshii <toshii%pkgsrc.org@localhost>
date:      Mon Jun 28 15:45:18 2004 +0000

description:
Make this buildable on NetBSD/amd64.
Changes are quite mechanical, but "gctest" appears to work...

diffstat:

 devel/boehm-gc/Makefile         |   4 +---
 devel/boehm-gc/distinfo         |   4 ++--
 devel/boehm-gc/patches/patch-ad |  36 ++++++++++++++++++++++++++++++++----
 3 files changed, 35 insertions(+), 9 deletions(-)

diffs (89 lines):

diff -r def34f07aab3 -r f16cfadfc84b devel/boehm-gc/Makefile
--- a/devel/boehm-gc/Makefile   Mon Jun 28 15:38:55 2004 +0000
+++ b/devel/boehm-gc/Makefile   Mon Jun 28 15:45:18 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2004/04/03 10:26:14 hubertf Exp $
+# $NetBSD: Makefile,v 1.39 2004/06/28 15:45:18 toshii Exp $
 #
 
 DISTNAME=              gc6.2
@@ -12,8 +12,6 @@
 COMMENT=               Garbage collection and memory leak detection for C and C++
 
 
-NOT_FOR_PLATFORM=      *-*-amd64 *-*-x86_64
-
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 GNU_CONFIGURE=         YES
diff -r def34f07aab3 -r f16cfadfc84b devel/boehm-gc/distinfo
--- a/devel/boehm-gc/distinfo   Mon Jun 28 15:38:55 2004 +0000
+++ b/devel/boehm-gc/distinfo   Mon Jun 28 15:45:18 2004 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.19 2004/04/03 10:26:14 hubertf Exp $
+$NetBSD: distinfo,v 1.20 2004/06/28 15:45:18 toshii 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) = d04a825837c969091c17ec4fb6f82a167726d1f4
+SHA1 (patch-ad) = 4d1b10f7f2bcef3c69897c5c4cd02c8ae9c8413c
 SHA1 (patch-ae) = 6e99458a388b5a408e03c133f9b1fdc8b170e87f
 SHA1 (patch-af) = ff3902115a8cc330916500db1169ce67f8354700
 SHA1 (patch-ag) = 540f937741280e2adb85e4c93c39065d5bedeb96
diff -r def34f07aab3 -r f16cfadfc84b devel/boehm-gc/patches/patch-ad
--- a/devel/boehm-gc/patches/patch-ad   Mon Jun 28 15:38:55 2004 +0000
+++ b/devel/boehm-gc/patches/patch-ad   Mon Jun 28 15:45:18 2004 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-ad,v 1.16 2004/05/07 12:06:47 cjep Exp $
---- include/private/gcconfig.h.orig    Tue Jun 17 04:01:23 2003
-+++ include/private/gcconfig.h Fri Apr  2 23:43:18 2004
+$NetBSD: patch-ad,v 1.17 2004/06/28 15:45:18 toshii Exp $
+
+--- include/private/gcconfig.h.orig    2003-06-17 11:01:23.000000000 +0900
++++ include/private/gcconfig.h
 @@ -85,7 +85,7 @@
  #    define SPARC
  #    define mach_type_known
@@ -30,7 +31,18 @@
  # if defined(mips) || defined(__mips) || defined(_mips)
  #    define MIPS
  #    if defined(nec_ews) || defined(_nec_ews)
-@@ -601,8 +605,14 @@
+@@ -220,6 +224,10 @@
+ #    define X86_64
+ #    define mach_type_known
+ # endif
++# if defined(__NetBSD__) && defined(__x86_64__)
++#    define X86_64
++#    define mach_type_known
++# endif
+ # if defined(LINUX) && (defined(__ia64__) || defined(__ia64))
+ #    define IA64
+ #    define mach_type_known
+@@ -601,8 +609,14 @@
  #   ifdef NETBSD
  #     define OS_TYPE "NETBSD"
  #     define HEURISTIC2
@@ -47,3 +59,19 @@
  #   endif
  #   ifdef LINUX
  #       define OS_TYPE "LINUX"
+@@ -1794,6 +1808,15 @@
+ #     define PREFETCH_FOR_WRITE(x) \
+         __asm__ __volatile__ ("       prefetchw       %0": : "m"(*(char *)(x)))
+ #   endif
++#   ifdef NETBSD
++#     define OS_TYPE "NETBSD"
++#     define HEURISTIC2
++#     define DATASTART GC_data_start
++#     define ELFCLASS32 32
++#     define ELFCLASS64 64
++#     define ELF_CLASS ELFCLASS64
++#       define DYNAMIC_LOADING
++#   endif
+ # endif
+ 
+ #if defined(LINUX) && defined(REDIRECT_MALLOC)