Add bits for supporting NetBSD on x86_64.

This builds, and will compile and run helloworld, but hasn't been
particularly extensively tested.

No version bump since no prior x86_64 packages should have been created.

5 files changed, 101 insertions, 3 deletions

diff --git a/lang/kaffe/Makefile.common b/lang/kaffe/Makefile.common
index bfd7f0973e2..0b8e75c3085 100644
--- a/lang/kaffe/Makefile.common
+++ b/lang/kaffe/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2009/07/10 19:58:12 abs Exp $
+# $NetBSD: Makefile.common,v 1.19 2009/10/19 06:03:16 dholland Exp $
 
 DISTNAME=		kaffe-1.1.7
 CATEGORIES=		lang java
@@ -23,7 +23,7 @@ TEST_TARGET=		check
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 ONLY_FOR_PLATFORM=	*-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k 	\
-			*-*-mipsel *-*-sparc *-*-powerpc
+			*-*-mipsel *-*-sparc *-*-powerpc *-*-x86_64
 
 GNU_CONFIGURE=		yes
 CPPFLAGS+=		-Dunix
diff --git a/lang/kaffe/distinfo b/lang/kaffe/distinfo
index 5ad24c1034f..2c270705dd7 100644
--- a/lang/kaffe/distinfo
+++ b/lang/kaffe/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2009/07/10 19:58:12 abs Exp $
+$NetBSD: distinfo,v 1.27 2009/10/19 06:03:16 dholland Exp $
 
 SHA1 (kaffe-1.1.7.tar.gz) = 5951d16a4a7b11689932583d134520ca6de00817
 RMD160 (kaffe-1.1.7.tar.gz) = 7523a3470cd06cf60dbade8ea2f464dc9d85277b
@@ -10,3 +10,6 @@ SHA1 (patch-ad) = 6ad03154e1874822d8a784cdcf6faa248e76c38f
 SHA1 (patch-ae) = 81e4a650fbb7fa18fa19597d27362bbb0155847f
 SHA1 (patch-af) = 8f35727c9a6147a8c5af8bcc3279ef29f8c9ad13
 SHA1 (patch-ag) = f02fd305d0dcb4c0fa2abb89eb566bc3d2edc583
+SHA1 (patch-ba) = 945e31bbd87c9da3e18b8bae6b4042f448c7cd66
+SHA1 (patch-bb) = 693db57c01438620cd722e172c7751070efc2989
+SHA1 (patch-bc) = f00d541613db81540bcd21ddc68f7b27232024b6
diff --git a/lang/kaffe/patches/patch-ba b/lang/kaffe/patches/patch-ba
new file mode 100644
index 00000000000..16ef52d6c7a
--- /dev/null
+++ b/lang/kaffe/patches/patch-ba
@@ -0,0 +1,11 @@
+$NetBSD: patch-ba,v 1.1 2009/10/19 06:03:16 dholland Exp $
+
+--- /dev/null	2009-10-19 01:12:00.000000000 -0400
++++ config/x86_64/netbsd1/config.frag	2009-10-19 01:16:57.000000000 -0400
+@@ -0,0 +1,6 @@
++#
++# x86_64/NetBSD configuration
++#
++if [ "$cross_compiling" = yes ]; then
++  ac_cv_c_char_unsigned=${ac_cv_c_char_unsigned='no'}
++fi
diff --git a/lang/kaffe/patches/patch-bb b/lang/kaffe/patches/patch-bb
new file mode 100644
index 00000000000..45b1323adac
--- /dev/null
+++ b/lang/kaffe/patches/patch-bb
@@ -0,0 +1,69 @@
+$NetBSD: patch-bb,v 1.1 2009/10/19 06:03:16 dholland Exp $
+
+--- /dev/null	2009-10-19 01:12:00.000000000 -0400
++++ config/x86_64/netbsd1/md.h	2009-10-19 01:22:18.000000000 -0400
+@@ -0,0 +1,64 @@
++/*
++ * x86_64/netbsd1/md.h
++ * NetBSD AMD64 configuration information.
++ *
++ * Copyright (c) 2003, 2004, 2005
++ *      Kaffe.org contributors. See ChangeLog for details.
++ *
++ * Copyright (c) 2002
++ *	MandrakeSoft.  All rights reserved.
++ *
++ * Copyright (c) 2001
++ *	Transvirtual Technologies, Inc.  All rights reserved.
++ *
++ * See the file "license.terms" for information on usage and redistribution
++ * of this file.
++ */
++
++#ifndef __amd64_netbsd_md_h
++#define __amd64_netbsd_md_h
++
++#include "x86_64/common.h"
++#include "x86_64/threads.h"
++
++#undef	SP_OFFSET
++#define	SP_OFFSET	2
++#undef  FP_OFFSET
++#define FP_OFFSET	3
++
++#if defined(HAVE_SYS_UCONTEXT_H)
++#include <sys/ucontext.h>
++
++/* older netbsd's could have this macro missing, so we provide it */
++#ifndef _UC_MACHINE_SP
++#define _UC_MACHINE_SP(uc)      ((uc)->uc_mcontext.__gregs[_REG_URSP])
++#endif
++#ifndef _UC_MACHINE_PC
++#define _UC_MACHINE_PC(uc)      ((uc)->uc_mcontext.__gregs[_REG_RIP])
++#endif
++
++#define SIGCONTEXT ucontext_t
++
++#define SIGNAL_ARGS(sig, sc) int sig, siginfo_t *__si, void *sc
++#define SIGNAL_CONTEXT_POINTER(scp) SIGCONTEXT *scp
++#define SIGNAL_PC(scp) _UC_MACHINE_PC(((SIGCONTEXT *)(scp)))
++#define STACK_POINTER(scp) _UC_MACHINE_SP(((SIGCONTEXT *)(scp)))
++#define GET_SIGNAL_CONTEXT_POINTER(sc) (sc)
++
++#else
++
++#define SIGNAL_ARGS(sig, sc)		int sig, int __code, struct sigcontext *sc
++#define SIGNAL_CONTEXT_POINTER(scp)	struct sigcontext *scp
++#define GET_SIGNAL_CONTEXT_POINTER(sc)  (sc)
++#define SIGNAL_PC(scp)			(scp)->sc_pc
++#define STACK_POINTER(scp)		(scp)->sc_rsp
++
++#endif
++
++#if defined(TRANSLATOR)
++#include "jit-md.h"
++#endif
++
++#include "kaffe-unix-stack.h"
++
++#endif
diff --git a/lang/kaffe/patches/patch-bc b/lang/kaffe/patches/patch-bc
new file mode 100644
index 00000000000..51e227fadaa
--- /dev/null
+++ b/lang/kaffe/patches/patch-bc
@@ -0,0 +1,15 @@
+$NetBSD: patch-bc,v 1.1 2009/10/19 06:03:16 dholland Exp $
+
+--- /dev/null	2009-10-19 01:12:00.000000000 -0400
++++ config/x86_64/netbsd1/md.c	2009-10-19 01:17:59.000000000 -0400
+@@ -0,0 +1,10 @@
++/*
++ * i386/netbsd1/md.c
++ * NetBSD i386 specific functions.
++ *
++ * Copyright (c) 1996, 1997
++ *	Transvirtual Technologies, Inc.  All rights reserved.
++ *
++ * See the file "license.terms" for information on usage and redistribution 
++ * of this file. 
++ */