Update to 1.1.4 (latest development version) based on the patches sent

by M.Negovanovic PRs pkg/24507, pkg/24508, also add a new Makefile.common
which will be used for the upcoming kaffe-nox11 package and finally
bl3ify.

Changes:

* Support for security policy files
* AttachCurrentThread jni function for posix threads
* Bug fixes:
  * jar tool and jar file fixes
  * URL context handling
  * EUC-JP support rewritten to use libiconv
  * HTTP fixes
  * MulticastSocket
  * DNSJava binding
  * ARM jit
  * ServerSocket.bind
  * java.math.BigDecimal - fix rounding operations
  * JNI fixes
  * FTP handler from GNU Inetlib
  * SHA1PRNG randomness fixes (can use /dev/urandom if
    available)
  * java.security.SecureClassLoader fix
* GNU Classpath merges and updates:
  * Object serialization
  * almost all of java.io from Classpath
  * java.nio, java.net
  * java.util, java.util.regex
  * java.math, javax.naming
  * java.text, java.beans
  * java.net.protocol.file.Handler
  * java.util.Random
  * java.awt.GridBadLayout
  * java.awt.geom
  * javax.swing.event.EventListenerList
  * javax.swing.text.AttributeSet
* Updated sound code from Tritonus.org
* Updated javax.net.ssl/javax.security code
  from Jessie
* kjc bug fixes:
  * .this expressions
  * extra generated <clinit> methods
  * static initializers fixed.  Circular
    definitions of fields are now supported.
* Build fixes:
  * m68k atomic compare and exchange
  * m68k-netbsd
  * ALSA 1.0
  * mipsel-linux / jit3
  * Cygwin
  * FreeBSD networking
  * parisc and HP-UX

And more... http://www.kaffe.org/pipermail/kaffe-announce/2004/000023.html

10 files changed, 143 insertions, 288 deletions

diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index ff57c829620..d7deb986689 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,63 +1,15 @@
-# $NetBSD: Makefile,v 1.51 2004/01/24 13:51:14 grant Exp $
-
-DISTNAME=		kaffe-1.1.0
-CATEGORIES=		lang java
-MASTER_SITES=		ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.kaffe.org/
-COMMENT=		Virtual machine capable of running Java(tm) code
-
-USE_BUILDLINK2=		yes
-USE_PKGINSTALL=		yes
-USE_X11=		yes
-USE_LIBTOOL=		yes
-USE_GNU_TOOLS+=		make
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-TEST_TARGET=		check
-
-ONLY_FOR_PLATFORM=	*-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k *-*-mips*	\
-			*-*-sparc *-*-powerpc
-
-GNU_CONFIGURE=		yes
-CPPFLAGS+=		-Dunix
-
-JVM_HOME=		${LOCALBASE}/java/kaffe
-NO_MTREE=		yes	# since we change PREFIX below
-
-OWN_DIRS=	${PREFIX}
-OWN_DIRS+=	${PREFIX}/etc
-OWN_DIRS+=	${PREFIX}/jre
-OWN_DIRS+=	${PREFIX}/jre/lib
-OWN_DIRS+=	${PREFIX}/jre/lib/security
-SUPPORT_FILES=	${PREFIX}/jre/lib/security/java.security.default	\
-		${PREFIX}/jre/lib/security/java.security
-
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == "NetBSD") && (${OBJECT_FMT} == "ELF")
-#
-# We need to explicitly link libkaffe*.so with libc.so so that libc symbols
-# are resolved correctly when libkaffe*.so are dynamically loaded.
+# $NetBSD: Makefile,v 1.52 2004/04/06 16:59:36 xtraeme Exp $
 #
-CONFIGURE_ENV+=		VM_LIBS="-lc"
-.endif
 
-.if (${OPSYS} == "NetBSD") && (${MACHINE_ARCH} == "alpha")
-# On these systems, jit3 is not working.
-CONFIGURE_ARGS+=	--with-engine=intrp
-.endif
+PKGNAME=	kaffe-${KAFFE_VERSION}
+COMMENT=	Virtual machine capable of running Java(tm) code
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/license.terms ${PREFIX}
+USE_X11=	yes
 
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../devel/gmp/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/libungif/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
+CONFLICTS=	kaffe-nox11-[0-9]*
+PLIST_SUBST+=	WITH_X11=
 
+.include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
 
 PREFIX=		${JVM_HOME}
diff --git a/lang/kaffe/Makefile.common b/lang/kaffe/Makefile.common
new file mode 100644
index 00000000000..ff974d5f139
--- /dev/null
+++ b/lang/kaffe/Makefile.common
@@ -0,0 +1,76 @@
+# $NetBSD: Makefile.common,v 1.1 2004/04/06 16:59:37 xtraeme Exp $
+
+DISTNAME=		kaffe-${KAFFE_VERSION}
+CATEGORIES=		lang java
+MASTER_SITES=		ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
+
+MAINTAINER=		tech-pkg@NetBSD.org
+HOMEPAGE=		http://www.kaffe.org/
+
+USE_BUILDLINK3=		yes
+USE_PKGINSTALL=		yes
+USE_LIBTOOL=		yes
+USE_GNU_TOOLS+=		make
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+TEST_TARGET=		check
+
+ONLY_FOR_PLATFORM=	*-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k *-*-mips*	\
+			*-*-sparc *-*-powerpc
+
+GNU_CONFIGURE=		yes
+CPPFLAGS+=		-Dunix
+PATCHDIR=		${.CURDIR}/../../lang/kaffe/patches
+DISTINFO_FILE=		${.CURDIR}/../../lang/kaffe/distinfo
+DESCR_SRC=		${.CURDIR}/../../lang/kaffe/DESCR
+PLIST_SRC=		${.CURDIR}/../../lang/kaffe/PLIST
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILD_DEFS+=		USE_ESOUND
+
+.if !empty(USE_ESOUND:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+=	--with-esd
+.include "../../audio/esound/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-esd
+.endif
+
+KAFFE_VERSION=		1.1.4
+
+BUILDLINK_PASSTHRU_DIRS+=   ${JVM_HOME}/jre/lib/${MACHINE_ARCH}
+
+JVM_HOME=		${LOCALBASE}/java/kaffe
+NO_MTREE=		yes	# since we change PREFIX below
+
+OWN_DIRS=	${PREFIX}
+OWN_DIRS+=	${PREFIX}/etc
+OWN_DIRS+=	${PREFIX}/jre
+OWN_DIRS+=	${PREFIX}/jre/lib
+OWN_DIRS+=	${PREFIX}/jre/lib/security
+SUPPORT_FILES=	${PREFIX}/jre/lib/security/java.security.default \
+		${PREFIX}/jre/lib/security/java.security
+
+.include "../../mk/bsd.prefs.mk"
+
+.if (${OPSYS} == "NetBSD") && (${OBJECT_FMT} == "ELF")
+#
+# We need to explicitly link libkaffe*.so with libc.so so that libc symbols
+# are resolved correctly when libkaffe*.so are dynamically loaded.
+#
+CONFIGURE_ENV+=		VM_LIBS="-lc"
+.endif
+
+.if (${OPSYS} == "NetBSD") && (${MACHINE_ARCH} == "alpha")
+# On these systems, jit3 is not working.
+CONFIGURE_ARGS+=	--with-engine=intrp
+.endif
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/license.terms ${PREFIX}
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
diff --git a/lang/kaffe/PLIST b/lang/kaffe/PLIST
index c7ad4008181..d322d6aaa74 100644
--- a/lang/kaffe/PLIST
+++ b/lang/kaffe/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/09/22 03:04:16 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/04/06 16:59:37 xtraeme Exp $
 bin/appletviewer
 bin/install-jar
 bin/jar
@@ -18,68 +18,66 @@ bin/rmic
 bin/rmiregistry
 bin/serialver
 include/jni.h
-include/kaffe/Arrays.h
-include/kaffe/errors.h
+include/jni_cpp.h
+include/jvmpi.h
 include/kaffe/java_lang_Object.h
+include/kaffe/java_lang_StackTraceElement.h
 include/kaffe/java_lang_String.h
 include/kaffe/java_lang_Thread.h
 include/kaffe/java_lang_ThreadGroup.h
 include/kaffe/java_lang_Throwable.h
+include/kaffe/java_lang_VMThrowable.h
 include/kaffe/jmalloc.h
-include/kaffe/jni_cpp.h
-include/kaffe/jsyscall.h
 include/kaffe/jtypes.h
-include/kaffe/native.h
-jre/.pkgsrc
 jre/bin/java
 jre/bin/kaffe
 jre/bin/kaffe-bin
 jre/bin/rmiregistry
-jre/lib/.pkgsrc
-jre/lib/${MACHINE_ARCH}/libawt-${PKGVERSION}.so
-jre/lib/${MACHINE_ARCH}/libawt.la
-jre/lib/${MACHINE_ARCH}/libawt.so
+${WITH_X11}jre/lib/${MACHINE_ARCH}/libawt-${PKGVERSION}.so
+${WITH_X11}jre/lib/${MACHINE_ARCH}/libawt.a
+${WITH_X11}jre/lib/${MACHINE_ARCH}/libawt.la
+${WITH_X11}jre/lib/${MACHINE_ARCH}/libawt.so
 jre/lib/${MACHINE_ARCH}/libio-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libio.a
 jre/lib/${MACHINE_ARCH}/libio.la
 jre/lib/${MACHINE_ARCH}/libio.so
 jre/lib/${MACHINE_ARCH}/libkaffevm-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libkaffevm.a
 jre/lib/${MACHINE_ARCH}/libkaffevm.la
 jre/lib/${MACHINE_ARCH}/libkaffevm.so
 jre/lib/${MACHINE_ARCH}/libmanagement-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libmanagement.a
 jre/lib/${MACHINE_ARCH}/libmanagement.la
 jre/lib/${MACHINE_ARCH}/libmanagement.so
 jre/lib/${MACHINE_ARCH}/libmath-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libmath.a
 jre/lib/${MACHINE_ARCH}/libmath.la
 jre/lib/${MACHINE_ARCH}/libmath.so
 jre/lib/${MACHINE_ARCH}/libnative-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libnative.a
 jre/lib/${MACHINE_ARCH}/libnative.la
 jre/lib/${MACHINE_ARCH}/libnative.so
 jre/lib/${MACHINE_ARCH}/libnet-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libnet.a
 jre/lib/${MACHINE_ARCH}/libnet.la
 jre/lib/${MACHINE_ARCH}/libnet.so
+jre/lib/${MACHINE_ARCH}/libnio-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libnio.a
+jre/lib/${MACHINE_ARCH}/libnio.la
+jre/lib/${MACHINE_ARCH}/libnio.so
 jre/lib/${MACHINE_ARCH}/libsecurity-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libsecurity.a
 jre/lib/${MACHINE_ARCH}/libsecurity.la
 jre/lib/${MACHINE_ARCH}/libsecurity.so
-jre/lib/${MACHINE_ARCH}/libtritonuscommon-${PKGVERSION}.so
-jre/lib/${MACHINE_ARCH}/libtritonuscommon.la
-jre/lib/${MACHINE_ARCH}/libtritonuscommon.so
 jre/lib/${MACHINE_ARCH}/libzip-${PKGVERSION}.so
+jre/lib/${MACHINE_ARCH}/libzip.a
 jre/lib/${MACHINE_ARCH}/libzip.la
 jre/lib/${MACHINE_ARCH}/libzip.so
 jre/lib/rt.jar
-jre/lib/security/.pkgsrc
 jre/lib/security/java.security.default
 lib/kjc.jar
 license.terms
 man/man1/kaffe.1
-@dirrm lib
 @dirrm man/man1
-@dirrm man
-@dirrm jre/lib/security
 @dirrm jre/lib/${MACHINE_ARCH}
-@dirrm jre/lib
-@dirrm jre/bin
-@dirrm jre
 @dirrm include/kaffe
-@dirrm include
-@dirrm bin
diff --git a/lang/kaffe/buildlink3.mk b/lang/kaffe/buildlink3.mk
new file mode 100644
index 00000000000..4e22e08c1f7
--- /dev/null
+++ b/lang/kaffe/buildlink3.mk
@@ -0,0 +1,36 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/06 16:59:37 xtraeme Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+KAFFE_BUILDLINK3_MK:=	${KAFFE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	kaffe
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkaffe}
+BUILDLINK_PACKAGES+=	kaffe
+
+.if !empty(KAFFE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.kaffe+=	kaffe-[0-9]*
+BUILDLINK_PKGSRCDIR.kaffe?=	../../lang/kaffe
+.endif	# KAFFE_BUILDLINK3_MK
+
+BUILDLINK_FILES_CMD.kaffe=				    \
+	${BUILDLINK_PLIST_CMD.kaffe} |			    \
+	    ${GREP} '\(include.*/\|lib.*/lib[^/]*$$\)' |    \
+	    ${SED} "s,^,$${pkg_prefix},"
+
+BUILDLINK_JAVA_PREFIX.kaffe=	${BUILDLINK_PREFIX.kaffe}/java/kaffe
+
+BUILDLINK_CPPFLAGS.kaffe=				    \
+	-I${BUILDLINK_JAVA_PREFIX.kaffe}/include	    \
+	-I${BUILDLINK_JAVA_PREFIX.kaffe}/include/kaffe
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/kaffe/distinfo b/lang/kaffe/distinfo
index 84b429a3c24..365501f6aca 100644
--- a/lang/kaffe/distinfo
+++ b/lang/kaffe/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.8 2003/09/22 03:04:17 jschauma Exp $
+$NetBSD: distinfo,v 1.9 2004/04/06 16:59:37 xtraeme Exp $
 
-SHA1 (kaffe-1.1.0.tar.gz) = 3616a51fe667fee5837c6bfb41996fb877820547
-Size (kaffe-1.1.0.tar.gz) = 7713155 bytes
+SHA1 (kaffe-1.1.4.tar.gz) = fb7a6ac27d82e1854de07422c46ce5e17beda58b
+Size (kaffe-1.1.4.tar.gz) = 8891220 bytes
 SHA1 (patch-aa) = 7b5dde8d984e8ee2d474d4e54d064562a5535533
-SHA1 (patch-ac) = 4eefe6c31aaed295c5e62a9dae550b86a248cb57
-SHA1 (patch-ad) = 58289c46db00b5ac1c6f42d3f9e3c22c2b42deea
 SHA1 (patch-ae) = f7d6ff1e9356f6ba00c23c2ab0a1682aa9ccc003
-SHA1 (patch-ah) = 63c7229616a63179cc7dcbdb0f03d555c3682b44
-SHA1 (patch-ai) = 0533725771ab9bdfc4a922a41d3ac63e5facae9b
-SHA1 (patch-aj) = b2c5604c4fddf54c381ccd627ec69259f7735d24
diff --git a/lang/kaffe/patches/patch-ac b/lang/kaffe/patches/patch-ac
deleted file mode 100644
index cafe6769c4d..00000000000
--- a/lang/kaffe/patches/patch-ac
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2003/09/22 03:04:17 jschauma Exp $
-
---- libraries/clib/security/Makefile.in.orig	2003-08-03 19:15:38.000000000 -0400
-+++ libraries/clib/security/Makefile.in	2003-09-21 18:27:11.000000000 -0400
-@@ -392,16 +392,16 @@
- 	@list='$(security_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(securityDATA_INSTALL) $$d$$p $(DESTDIR)$(securitydir)/$$f"; \
--	  $(securityDATA_INSTALL) $$d$$p $(DESTDIR)$(securitydir)/$$f; \
-+	  echo " $(securityDATA_INSTALL) $$d$$p $(DESTDIR)$(securitydir)/$$f.default"; \
-+	  $(securityDATA_INSTALL) $$d$$p $(DESTDIR)$(securitydir)/$$f.default; \
- 	done
- 
- uninstall-securityDATA:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(security_DATA)'; for p in $$list; do \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " rm -f $(DESTDIR)$(securitydir)/$$f"; \
--	  rm -f $(DESTDIR)$(securitydir)/$$f; \
-+	  echo " rm -f $(DESTDIR)$(securitydir)/$$f.default"; \
-+	  rm -f $(DESTDIR)$(securitydir)/$$f.default; \
- 	done
- 
- ETAGS = etags
diff --git a/lang/kaffe/patches/patch-ad b/lang/kaffe/patches/patch-ad
deleted file mode 100644
index 84a9e336c93..00000000000
--- a/lang/kaffe/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2003/09/22 03:04:17 jschauma Exp $
-
---- kaffe/kaffevm/systems/unix-jthreads/jthread.c.orig	2003-09-21 22:44:00.000000000 -0400
-+++ kaffe/kaffevm/systems/unix-jthreads/jthread.c	2003-09-21 22:44:10.000000000 -0400
-@@ -143,7 +143,7 @@
- 
- /* A signal context pointer type, used in parameter lists/declarations */
- #ifndef SIGNAL_CONTEXT_POINTER
--#define SIGNAL_CONTEXT_POINTER(x) void *##x
-+#define SIGNAL_CONTEXT_POINTER(x) void *x
- #endif
- 
- /* Get the PC from a signal context pointer */
diff --git a/lang/kaffe/patches/patch-ah b/lang/kaffe/patches/patch-ah
deleted file mode 100644
index bed61d76b3c..00000000000
--- a/lang/kaffe/patches/patch-ah
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2003/09/16 20:15:37 jmmv Exp $
-
---- config/m68k/trampolines.c.orig	2003-08-11 13:03:10.712387000 +0100
-+++ config/m68k/trampolines.c	2003-08-11 13:14:50.602283000 +0100
-@@ -40,11 +40,11 @@
- 
- asm (
-         START_ASM_FUNC() C_FUNC_NAME(m68k_do_fixup_trampoline) "\n"
--C_FUNC_NAME(m68k_do_fixup_trampoline) ":
--        jbsr    " C_FUNC_NAME(soft_fixup_trampoline) "
--	addqw	#4,%sp
--	movel	%d0,%a0
--        jmp     %a0@"
-+C_FUNC_NAME(m68k_do_fixup_trampoline) ":\n"
-+"	jbsr    " C_FUNC_NAME(soft_fixup_trampoline) "\n"
-+"	addqw	#4,%sp\n"
-+"	movel	%d0,%a0\n"
-+"	jmp     %a0@\n"
-         END_ASM_FUNC()
- );
- 
-@@ -52,11 +52,11 @@
- 
- asm (
-         START_ASM_FUNC() C_FUNC_NAME(m68k_do_fixup_trampoline) "\n"
--C_FUNC_NAME(m68k_do_fixup_trampoline) ":
--        jbsr    " C_FUNC_NAME(soft_fixup_trampoline) "
--        addqw   #4,sp
--        movel   d0,a0
--        jmp     a0@"
-+C_FUNC_NAME(m68k_do_fixup_trampoline) ":\n"
-+"	jbsr    " C_FUNC_NAME(soft_fixup_trampoline) "\n"
-+"	addqw   #4,sp\n"
-+"	movel   d0,a0\n"
-+"	jmp     a0@\n"
-         END_ASM_FUNC()
- );
- 
diff --git a/lang/kaffe/patches/patch-ai b/lang/kaffe/patches/patch-ai
deleted file mode 100644
index 9df61945c1d..00000000000
--- a/lang/kaffe/patches/patch-ai
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2003/09/16 20:15:38 jmmv Exp $
-
---- config/mips/trampolines.c.orig	1999-10-09 03:03:14.000000000 +0100
-+++ config/mips/trampolines.c	2003-08-11 13:16:03.787618000 +0100
-@@ -31,50 +31,50 @@
- #define C_FUNC_NAME(FUNC) #FUNC
- #endif
- 
--asm("
--	.text							\n
--	.align	4						\n
--	sw	$31, 0($sp)					\n
--l1:	.word	" C_FUNC_NAME(soft_fixup_trampoline) "		\n
--	.globl 	mips_do_fixup_trampoline			\n
--	.ent	mips_do_fixup_trampoline			\n
--mips_do_fixup_trampoline:					\n
--	addi	$sp, $sp, -48					\n
--	# needed by the backtracer 				\n
--	sw	$31, 0($sp)					\n
--	sw	$2, 0($sp)					\n
--	sw	$4, 8($sp)					\n
--	sw	$5, 12($sp)					\n
--	sw	$6, 16($sp)					\n
--	sw	$7, 20($sp)					\n
--	swc1	$f13, 24($sp)					\n
--	swc1	$f12, 28($sp)					\n
--	swc1	$f15, 32($sp)					\n
--	swc1	$f14, 36($sp)					\n
--	sw	$30, 40($sp)					\n
--        sw      $gp, 4($sp)                                     \n
--        # $fp = $sp                                             \n
--	move	$30, $sp					\n
--	lw	$4, 0($31)					\n
--	lw	$5, 4($31)					\n
--	lw	$25, -4($25)					\n
--	jalr	$25						\n
--	nop							\n
--	lw	$30, 40($sp)					\n
--	lwc1	$f14, 36($sp)					\n
--	lwc1	$f15, 32($sp)					\n
--	lwc1	$f12, 28($sp)					\n
--	lwc1	$f13, 24($sp)					\n
--	lw	$7, 20($sp)					\n
--	lw	$6, 16($sp)					\n
--	lw	$5, 12($sp)					\n
--	lw	$4, 8($sp)					\n
--	lw	$gp, 4($sp)					\n
--	lw	$31, 0($sp)					\n
--	addi	$sp, $sp, 48					\n
--	move	$25, $2						\n
--	jr	$2						\n
--	.end	mips_do_fixup_trampoline"
-+asm("\n"
-+"	.text							\n"
-+"	.align	4						\n"
-+"	sw	$31, 0($sp)					\n"
-+"l1:	.word	" C_FUNC_NAME(soft_fixup_trampoline) "		\n"
-+"	.globl	mips_do_fixup_trampoline			\n"
-+"	.ent	mips_do_fixup_trampoline			\n"
-+"mips_do_fixup_trampoline:					\n"
-+"	addi	$sp, $sp, -48					\n"
-+"	# needed by the backtracer 				\n"
-+"	sw	$31, 0($sp)					\n"
-+"	sw	$2, 0($sp)					\n"
-+"	sw	$4, 8($sp)					\n"
-+"	sw	$5, 12($sp)					\n"
-+"	sw	$6, 16($sp)					\n"
-+"	sw	$7, 20($sp)					\n"
-+"	swc1	$f13, 24($sp)					\n"
-+"	swc1	$f12, 28($sp)					\n"
-+"	swc1	$f15, 32($sp)					\n"
-+"	swc1	$f14, 36($sp)					\n"
-+"	sw	$30, 40($sp)					\n"
-+"	sw	$gp, 4($sp)                                     \n"
-+"	# $fp = $sp                                            \n"
-+"	move	$30, $sp					\n"
-+"	lw	$4, 0($31)					\n"
-+"	lw	$5, 4($31)					\n"
-+"	lw	$25, -4($25)					\n"
-+"	jalr	$25						\n"
-+"	nop							\n"
-+"	lw	$30, 40($sp)					\n"
-+"	lwc1	$f14, 36($sp)					\n"
-+"	lwc1	$f15, 32($sp)					\n"
-+"	lwc1	$f12, 28($sp)					\n"
-+"	lwc1	$f13, 24($sp)					\n"
-+"	lw	$7, 20($sp)					\n"
-+"	lw	$6, 16($sp)					\n"
-+"	lw	$5, 12($sp)					\n"
-+"	lw	$4, 8($sp)					\n"
-+"	lw	$gp, 4($sp)					\n"
-+"	lw	$31, 0($sp)					\n"
-+"	addi	$sp, $sp, 48					\n"
-+"	move	$25, $2						\n"
-+"	jr	$2						\n"
-+"	.end	mips_do_fixup_trampoline"
- );
- 
- #endif
diff --git a/lang/kaffe/patches/patch-aj b/lang/kaffe/patches/patch-aj
deleted file mode 100644
index 840f5d67803..00000000000
--- a/lang/kaffe/patches/patch-aj
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2003/09/16 20:15:39 jmmv Exp $
-
---- config/sparc/trampolines.c.orig	1999-11-04 20:48:40.000000000 +0000
-+++ config/sparc/trampolines.c	2003-08-11 13:08:18.711843000 +0100
-@@ -33,14 +33,14 @@
- 
- asm(
- 	START_ASM_FUNC() C_FUNC_NAME(sparc_do_fixup_trampoline) "\n"
--C_FUNC_NAME(sparc_do_fixup_trampoline) ":			\n
--	save	%sp,-64,%sp					\n
--	ld	[%i7+8],%o0					\n
--	ld	[%i7+12],%o1					\n
--	call	" C_FUNC_NAME(soft_fixup_trampoline) "		\n
--	mov	%g1,%i7						\n
--	jmp	%o0						\n
--	restore"
-+C_FUNC_NAME(sparc_do_fixup_trampoline) ":			\n"
-+"	save	%sp,-64,%sp					\n"
-+"	ld	[%i7+8],%o0					\n"
-+"	ld	[%i7+12],%o1					\n"
-+"	call	" C_FUNC_NAME(soft_fixup_trampoline) "		\n"
-+"	mov	%g1,%i7						\n"
-+"	jmp	%o0						\n"
-+"	restore"
- 	END_ASM_FUNC()
- );
-