Update lang/kaffe to 1.1.5

regenerate buildlink3

approved by wiz@

11 files changed, 197 insertions, 206 deletions

diff --git a/lang/kaffe/MESSAGE b/lang/kaffe/MESSAGE
index b9d3871e7c0..74b520f3a03 100644
--- a/lang/kaffe/MESSAGE
+++ b/lang/kaffe/MESSAGE
@@ -1,9 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/09/22 03:04:16 jschauma Exp $
+$NetBSD: MESSAGE,v 1.5 2005/09/06 18:15:32 tonio Exp $
 
 Before running Kaffe it is necessary to configure the environment.
 
-	PATH=$PATH:${PREFIX}/bin
-	CLASSPATH=${PREFIX}/jre/lib/rt.jar:.
+	PATH=$PATH:${JAVA_HOME}/bin
+	CLASSPATH=${JAVA_HOME}/jre/lib/rt.jar:.
 
 ===========================================================================
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index 91277af211b..238efd60027 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2005/08/20 19:16:23 jlam Exp $
+# $NetBSD: Makefile,v 1.61 2005/09/06 18:15:32 tonio Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		7
-
 CONFLICTS+=		kaffe-nox11-[0-9]*
 
 JAVA_WRAPPERS=		appletviewer jar java javac javadoc javah javakey \
@@ -21,6 +19,6 @@ PRINT_PLIST_AWK+=	/^java\/kaffe\/jre\/lib\/security\/java.security$$/ \
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/license.terms ${JAVA_HOME}
 
-.include "../../devel/libltdl/convenience.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../mk/java-env.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/kaffe/Makefile.common b/lang/kaffe/Makefile.common
index f39e19f0b56..1f5ea3498e3 100644
--- a/lang/kaffe/Makefile.common
+++ b/lang/kaffe/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:10 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/09/06 18:15:32 tonio Exp $
 
-DISTNAME=		kaffe-1.1.4
+DISTNAME=		kaffe-1.1.5
 CATEGORIES=		lang java
 MASTER_SITES=		ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
 
@@ -8,6 +8,10 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.kaffe.org/
 COMMENT=		Virtual machine capable of running Java(tm) code
 
+BUILD_DEPENDS=  unzip-[0-9]*:../../archivers/unzip
+BUILD_DEPENDS=  zip-[0-9]*:../../archivers/zip
+DEPENDS+=       jikes>=1.22:../../lang/jikes
+
 GNU_CONFIGURE_PREFIX=	${JAVA_HOME}
 JAVA_HOME=		${PREFIX}/java/kaffe
 JAVA_NAME=		kaffe
@@ -15,7 +19,6 @@ NO_MTREE=		yes
 USE_PKGINSTALL=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 TEST_TARGET=		check
 
 ONLY_FOR_PLATFORM=	*-*-alpha *-*-arm *-*-arm32 *-*-i386 *-*-m68k *-*-mips*	\
@@ -30,7 +33,8 @@ BUILDLINK_PASSTHRU_DIRS+=	${JAVA_HOME}/jre/lib/${MACHINE_ARCH}
 
 CONFIGURE_ARGS+=	--without-alsa
 CONFIGURE_ARGS+=	--without-esd
-CONFIGURE_ARGS+=	--without-awt
+CONFIGURE_ARGS+=	--disable-esdtest
+CONFIGURE_ARGS+=	--disable-native-awt
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -42,7 +46,7 @@ CONFIGURE_ARGS+=	--without-awt
 CONFIGURE_ENV+=		VM_LIBS="-lc"
 .endif
 
-.if (${OPSYS} == "NetBSD") && (${MACHINE_ARCH} == "alpha")
+.if ((${OPSYS} == "NetBSD") && (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "powerpc"))
 # On these systems, jit3 is not working.
 CONFIGURE_ARGS+=	--with-engine=intrp
 .endif
diff --git a/lang/kaffe/PLIST b/lang/kaffe/PLIST
index 065ebc010cc..2eb485b8aa4 100644
--- a/lang/kaffe/PLIST
+++ b/lang/kaffe/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2004/09/22 08:09:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/09/06 18:15:32 tonio Exp $
 bin/kaffe-appletviewer
 bin/kaffe-jar
 bin/kaffe-java
@@ -18,17 +18,15 @@ java/kaffe/bin/java
 java/kaffe/bin/javac
 java/kaffe/bin/javadoc
 java/kaffe/bin/javah
-java/kaffe/bin/javakey
 java/kaffe/bin/javap
-java/kaffe/bin/jdb
 java/kaffe/bin/kaffe
 java/kaffe/bin/kaffeh
-java/kaffe/bin/kjc
-java/kaffe/bin/kopi
 java/kaffe/bin/native2ascii
 java/kaffe/bin/rmic
 java/kaffe/bin/rmiregistry
 java/kaffe/bin/serialver
+java/kaffe/include/jawt.h
+java/kaffe/include/jawt_md.h
 java/kaffe/include/jni.h
 java/kaffe/include/jni_cpp.h
 java/kaffe/include/jvmpi.h
@@ -40,27 +38,35 @@ java/kaffe/include/kaffe/java_lang_ThreadGroup.h
 java/kaffe/include/kaffe/java_lang_Throwable.h
 java/kaffe/include/kaffe/java_lang_VMThrowable.h
 java/kaffe/include/kaffe/jmalloc.h
-java/kaffe/include/kaffe/jtypes.h
+java/kaffe/include/kaffe/jni_md.h
+java/kaffe/include/kaffe_jni.h
 java/kaffe/jre/bin/java
 java/kaffe/jre/bin/kaffe
 java/kaffe/jre/bin/kaffe-bin
 java/kaffe/jre/bin/rmiregistry
+java/kaffe/jre/lib/${MACHINE_ARCH}/libclasspath.la
 java/kaffe/jre/lib/${MACHINE_ARCH}/libio.la
+java/kaffe/jre/lib/${MACHINE_ARCH}/libkaffegc.la
+java/kaffe/jre/lib/${MACHINE_ARCH}/libkaffeverifier.la
 java/kaffe/jre/lib/${MACHINE_ARCH}/libkaffevm.la
 java/kaffe/jre/lib/${MACHINE_ARCH}/libmanagement.la
 java/kaffe/jre/lib/${MACHINE_ARCH}/libmath.la
 java/kaffe/jre/lib/${MACHINE_ARCH}/libnative.la
 java/kaffe/jre/lib/${MACHINE_ARCH}/libnet.la
 java/kaffe/jre/lib/${MACHINE_ARCH}/libnio.la
+java/kaffe/jre/lib/${MACHINE_ARCH}/libreplace.la
 java/kaffe/jre/lib/${MACHINE_ARCH}/libsecurity.la
 java/kaffe/jre/lib/${MACHINE_ARCH}/libzip.la
+java/kaffe/jre/lib/gmpjavamath.jar
+java/kaffe/jre/lib/logging.properties
 java/kaffe/jre/lib/rt.jar
-java/kaffe/jre/lib/security/java.security.default
-java/kaffe/lib/kjc.jar
+java/kaffe/jre/lib/security/java.security
+java/kaffe/jre/lib/tools.jar
 java/kaffe/license.terms
 java/kaffe/man/man1/kaffe.1
 @dirrm java/kaffe/man/man1
 @dirrm java/kaffe/man
+@exec ${MKDIR} %D/java/kaffe/lib
 @dirrm java/kaffe/lib
 @dirrm java/kaffe/jre/lib/security
 @dirrm java/kaffe/jre/lib/${MACHINE_ARCH}
diff --git a/lang/kaffe/buildlink3.mk b/lang/kaffe/buildlink3.mk
index 9f94b776494..256f00636a9 100644
--- a/lang/kaffe/buildlink3.mk
+++ b/lang/kaffe/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/10/03 00:15:01 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2005/09/06 18:15:32 tonio Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KAFFE_BUILDLINK3_MK:=	${KAFFE_BUILDLINK3_MK}+
@@ -11,16 +11,13 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkaffe}
 BUILDLINK_PACKAGES+=	kaffe
 
 .if !empty(KAFFE_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.kaffe+=	kaffe>=1.1.4nb2
-BUILDLINK_RECOMMENDED.kaffe+=	kaffe>=1.1.4nb4
+BUILDLINK_DEPENDS.kaffe+=	kaffe>=1.1.5
 BUILDLINK_PKGSRCDIR.kaffe?=	../../lang/kaffe
 BUILDLINK_JAVA_PREFIX.kaffe=	${PREFIX}/java/kaffe
-
-BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_JAVA_PREFIX.kaffe}
+.endif	# KAFFE_BUILDLINK3_MK
 
 BUILDLINK_CPPFLAGS.kaffe= \
 	-I${BUILDLINK_JAVA_PREFIX.kaffe}/include			\
 	-I${BUILDLINK_JAVA_PREFIX.kaffe}/include/kaffe
-.endif  # KAFFE_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/kaffe/distinfo b/lang/kaffe/distinfo
index 6b49eaf5a18..a70121e4125 100644
--- a/lang/kaffe/distinfo
+++ b/lang/kaffe/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.12 2005/02/24 09:03:08 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/09/06 18:15:32 tonio Exp $
 
-SHA1 (kaffe-1.1.4.tar.gz) = fb7a6ac27d82e1854de07422c46ce5e17beda58b
-RMD160 (kaffe-1.1.4.tar.gz) = 5bb8b0c9a338a3bd05f9fdc2a3f94c297489a7db
-Size (kaffe-1.1.4.tar.gz) = 8891220 bytes
-SHA1 (patch-aa) = 7b5dde8d984e8ee2d474d4e54d064562a5535533
-SHA1 (patch-ac) = 5a4cd4ee913b7d4277cc10c38a7c4a810ba258f1
-SHA1 (patch-ae) = f7d6ff1e9356f6ba00c23c2ab0a1682aa9ccc003
+SHA1 (kaffe-1.1.5.tar.gz) = ebd8da490783ed189fb25fad0d674f384194e2f3
+RMD160 (kaffe-1.1.5.tar.gz) = 516b5dbaa13efed099f59ff9b7121700ef6ad13b
+Size (kaffe-1.1.5.tar.gz) = 9796278 bytes
+SHA1 (patch-aa) = 951e719e59e03e1e656c63d1a989d1bae3ab9984
+SHA1 (patch-ab) = 21202b63143330175fcc0dbbf029e6d66375ce2e
+SHA1 (patch-ac) = 7c16de2815a2bca67e042efb367d7ec751aa0ea8
+SHA1 (patch-ad) = d00ce5cafeaffe97347f6952c81d1971b0a11b94
diff --git a/lang/kaffe/patches/patch-aa b/lang/kaffe/patches/patch-aa
index 5ffe5191640..d826bbeb19e 100644
--- a/lang/kaffe/patches/patch-aa
+++ b/lang/kaffe/patches/patch-aa
@@ -1,18 +1,28 @@
-$NetBSD: patch-aa,v 1.12 2003/09/22 03:04:17 jschauma Exp $
+$NetBSD: patch-aa,v 1.13 2005/09/06 18:15:32 tonio Exp $
 
---- configure.orig	2003-08-03 19:15:52.000000000 -0400
-+++ configure	2003-09-21 18:22:14.000000000 -0400
-@@ -22916,11 +22916,11 @@
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char mpz_get_d ();
-+char __mpz_get_d ();
- int
- main ()
- {
--mpz_get_d ();
-+__mpz_get_d ();
-   ;
-   return 0;
- }
+--- config/i386/netbsd1/md.h.orig	2005-04-24 19:53:29.000000000 +0200
++++ config/i386/netbsd1/md.h	2005-04-24 19:58:35.000000000 +0200
+@@ -17,6 +17,7 @@
+ 
+ #include "i386/common.h"
+ #include "i386/threads.h"
++#include  <sys/ucontext.h>
+ 
+ #if defined(HAVE_SYS_RESOURCE_H)
+ #include <sys/resource.h>
+@@ -31,11 +32,11 @@
+ #undef SP_OFFSET
+ #define SP_OFFSET 2
+ 
+-#define SIGNAL_ARGS(sig, sc) int sig, int __code, struct sigcontext *sc
+-#define SIGNAL_CONTEXT_POINTER(scp) struct sigcontext *scp
++#define SIGNAL_ARGS(sig, sc) int sig, int __code, struct __ucontext *sc
++#define SIGNAL_CONTEXT_POINTER(scp) struct __ucontext *scp
+ #define GET_SIGNAL_CONTEXT_POINTER(sc) (sc)
+-#define SIGNAL_PC(scp) (scp)->sc_pc
+-#define STACK_POINTER(scp) (scp)->sc_sp
++#define SIGNAL_PC(scp) ((scp)->uc_mcontext.__gregs[_REG_EIP])
++#define STACK_POINTER(scp) ((scp)->uc_mcontext.__gregs[_REG_ESP])
+ 
+ #if defined(TRANSLATOR)
+ #include "jit-md.h"
diff --git a/lang/kaffe/patches/patch-ab b/lang/kaffe/patches/patch-ab
new file mode 100644
index 00000000000..a9f3dac8921
--- /dev/null
+++ b/lang/kaffe/patches/patch-ab
@@ -0,0 +1,85 @@
+$NetBSD: patch-ab,v 1.9 2005/09/06 18:15:32 tonio Exp $
+
+--- ./kaffe/kaffevm/systems/unix-pthreads/signal.c.orig	2005-04-24 19:46:52.000000000 +0200
++++ ./kaffe/kaffevm/systems/unix-pthreads/signal.c	2005-04-24 19:50:12.000000000 +0200
+@@ -47,8 +47,6 @@
+ #define SIG_T   void*
+ #endif
+ 
+-static void nullException(SIGNAL_ARGS(sig, sc));
+-static void floatingException(EXCEPTIONPROTO);
+ static void ignoreSignal(int sig);
+ 
+ static exchandler_t nullHandler;
+@@ -56,35 +54,6 @@
+ static exchandler_t stackOverflowHandler;
+ 
+ /*
+- * Setup the internal exceptions.
+- */
+-void
+-jthread_initexceptions(exchandler_t _nullHandler,
+-		       exchandler_t _floatingHandler,
+-		       exchandler_t _stackOverflowHandler)
+-{
+-	nullHandler = _nullHandler;
+-	floatingHandler = _floatingHandler;
+-	stackOverflowHandler = _stackOverflowHandler;
+-
+-	if (DBGEXPR(EXCEPTION, false, true)) {
+-		/* Catch signals we need to convert to exceptions */
+-#if defined(SIGSEGV)
+-		registerSyncSignalHandler(SIGSEGV, nullException);
+-#endif
+-#if defined(SIGBUS)
+-		registerSyncSignalHandler(SIGBUS, nullException);
+-#endif
+-#if defined(SIGFPE)
+-		registerSyncSignalHandler(SIGFPE, floatingException);
+-#endif
+-#if defined(SIGPIPE)
+-		ignoreSignal(SIGPIPE);
+-#endif
+-	}
+-}
+-
+-/*
+  * Null exception - catches bad memory accesses.
+  */
+ static void
+@@ -141,6 +110,35 @@
+ 	floatingHandler(EXCEPTIONFRAMEPTR);
+ }
+ 
++/*
++ * Setup the internal exceptions.
++ */
++void
++jthread_initexceptions(exchandler_t _nullHandler,
++		       exchandler_t _floatingHandler,
++		       exchandler_t _stackOverflowHandler)
++{
++	nullHandler = _nullHandler;
++	floatingHandler = _floatingHandler;
++	stackOverflowHandler = _stackOverflowHandler;
++
++	if (DBGEXPR(EXCEPTION, false, true)) {
++		/* Catch signals we need to convert to exceptions */
++#if defined(SIGSEGV)
++		registerSyncSignalHandler(SIGSEGV, nullException);
++#endif
++#if defined(SIGBUS)
++		registerSyncSignalHandler(SIGBUS, nullException);
++#endif
++#if defined(SIGFPE)
++		registerSyncSignalHandler(SIGFPE, floatingException);
++#endif
++#if defined(SIGPIPE)
++		ignoreSignal(SIGPIPE);
++#endif
++	}
++}
++
+ /* -----------------------------------------------
+  * OS signal handling code.  See FAQ/FAQ.jsignal for information.
+  * ----------------------------------------------- */
diff --git a/lang/kaffe/patches/patch-ac b/lang/kaffe/patches/patch-ac
index 207cb25bae9..1dda7484149 100644
--- a/lang/kaffe/patches/patch-ac
+++ b/lang/kaffe/patches/patch-ac
@@ -1,25 +1,14 @@
-$NetBSD: patch-ac,v 1.7 2004/04/06 17:08:01 xtraeme Exp $
+$NetBSD: patch-ac,v 1.8 2005/09/06 18:15:32 tonio Exp $
 
---- libraries/clib/security/Makefile.in.orig	2004-04-06 17:39:24.000000000 +0200
-+++ libraries/clib/security/Makefile.in	2004-04-06 17:42:21.000000000 +0200
-@@ -453,16 +453,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
+--- config/i386/netbsd1/jit-md.h.orig	2005-04-24 20:01:15.000000000 +0200
++++ config/i386/netbsd1/jit-md.h	2005-04-24 20:01:46.000000000 +0200
+@@ -26,7 +26,7 @@
  
- 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
+ /* Get the first exception frame from a signal handler */
+ #define	EXCEPTIONFRAME(f, c)						\
+-	(f).retbp = (c)->sc_ebp;					\
+-	(f).retpc = (c)->sc_eip + 1
++       (f).retbp = (c)->uc_mcontext.__gregs[_REG_EBP];                 \
++       (f).retpc = (c)->uc_mcontext.__gregs[_REG_EIP] + 1
  
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ #endif
diff --git a/lang/kaffe/patches/patch-ad b/lang/kaffe/patches/patch-ad
new file mode 100644
index 00000000000..62e7521a553
--- /dev/null
+++ b/lang/kaffe/patches/patch-ad
@@ -0,0 +1,35 @@
+$NetBSD: patch-ad,v 1.6 2005/09/06 18:15:32 tonio Exp $
+
+--- libraries/javalib/java/util/logging/Logger.java.orig	2005-04-29 10:56:27.000000000 +0200
++++ libraries/javalib/java/util/logging/Logger.java	2005-04-29 10:59:10.000000000 +0200
+@@ -290,7 +290,7 @@
+ 	if (!couldBeAdded)
+ 	  throw new IllegalStateException("cannot register new logger");
+       }
+-      else
++      else if (resourceBundleName != null)
+       {
+ 	/* The logger already exists. Make sure it uses
+ 	 * the same resource bundle for localizing messages.
+@@ -303,7 +303,7 @@
+ 	 * resourceBundle of the registered logger to the bundle
+ 	 * whose name was passed to getLogger.
+ 	 */
+-	if ((existingBundleName == null) && (resourceBundleName != null))
++	if (existingBundleName == null)
+ 	{
+ 	  /* If ResourceBundle.getBundle throws an exception, the
+ 	   * existing logger will be unchanged.  This would be
+@@ -319,7 +319,11 @@
+ 	    && ((existingBundleName == null)
+ 		|| !existingBundleName.equals(resourceBundleName)))
+ 	{
+-	  throw new IllegalArgumentException();
++    throw new IllegalArgumentException("name: " + name
++                                            + ", existing bundle name: "
++                                            + existingBundleName
++                                            + ", resource bundle name: "
++                                            + resourceBundleName);
+ 	}
+       }
+     }
diff --git a/lang/kaffe/patches/patch-ae b/lang/kaffe/patches/patch-ae
deleted file mode 100644
index c9e3cc20c4a..00000000000
--- a/lang/kaffe/patches/patch-ae
+++ /dev/null
@@ -1,134 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2003/09/16 20:15:33 jmmv Exp $
-
---- config/alpha/trampolines.c.orig	2001-06-18 11:39:22.000000000 +0100
-+++ config/alpha/trampolines.c	2003-08-11 13:10:17.142991000 +0100
-@@ -32,11 +32,11 @@
- 
- #if !defined(START_ASM_FUNC)
- #define START_ASM_FUNC(FUNC)		\
--    	".text				\n\
--	.align 3			\n\
--	.globl " C_FUNC_NAME(FUNC) "	\n\
--	.ent " C_FUNC_NAME(FUNC) "	\n\
--" C_FUNC_NAME(FUNC) ":"
-+    	".text				\n"\
-+	".align 3			\n"\
-+	".globl " C_FUNC_NAME(FUNC) "	\n"\
-+	".ent " C_FUNC_NAME(FUNC) "	\n"\
-+  C_FUNC_NAME(FUNC) ":"
- #endif
- #if !defined(END_ASM_FUNC)
- #define END_ASM_FUNC(FUNC)		\
-@@ -44,59 +44,59 @@
- #endif
- 
- asm(
--	START_ASM_FUNC(alpha_do_fixup_trampoline) "		\n\
--	.frame	$30,14*8,$26,0					\n\
--	.mask	0x04000000,-14*8				\n\
--	ldgp	$29,0($27)					\n\
--	lda    	$30,-14*8($30)		# reserve 14 on stack	\n\
--								\n\
--	# Save frame registers					\n\
--	stq	$26,0*8($30)		# ra			\n\
--	.prologue 1						\n\
--								\n\
--	# Save register arguments as local variables		\n\
--	stq	$16,1*8($30)		# a0			\n\
--	stq	$17,2*8($30)		# a1			\n\
--	stq	$18,3*8($30)		# a2			\n\
--	stq	$19,4*8($30)		# a3			\n\
--	stq	$20,5*8($30)		# a4			\n\
--	stq	$21,6*8($30)		# a5			\n\
--	stt	$f16,7*8($30)					\n\
--	stt	$f17,8*8($30)					\n\
--	stt	$f18,9*8($30)					\n\
--	stt	$f19,10*8($30)					\n\
--	stt	$f20,11*8($30)					\n\
--	stt	$f21,12*8($30)					\n\
--								\n\
--	# Compute the address of methodTrampoline.method	\n\
--	lda	$16,8($1)					\n\
--	# Call C to do the fixup				\n\
--	jsr	$26," C_FUNC_NAME(soft_fixup_trampoline) "	\n\
--	ldgp	$29,0($26)					\n\
--	mov	$0,$27						\n\
--								\n\
--	# Reload register arguments				\n\
--	ldq	$16,1*8($30)		# a0			\n\
--	ldq	$17,2*8($30)		# a1			\n\
--	ldq	$18,3*8($30)		# a2			\n\
--	ldq	$19,4*8($30)		# a3			\n\
--	ldq	$20,5*8($30)		# a4			\n\
--	ldq	$21,6*8($30)		# a5			\n\
--	ldt	$f16,7*8($30)					\n\
--	ldt	$f17,8*8($30)					\n\
--	ldt	$f18,9*8($30)					\n\
--	ldt	$f19,10*8($30)					\n\
--	ldt	$f20,11*8($30)					\n\
--	ldt	$f21,12*8($30)					\n\
--								\n\
--	ldq	$26,0*8($30)		# ra			\n\
--	lda    	$30,14*8($30)		# release stack		\n\
--								\n\
--	# Jump to translated method				\n\
--	jmp	$31,($27),0					\n\
--								\n\
--	# for __alpha_nextFrame()				\n\
--	ret	$31,($26),1					\n"
-+	START_ASM_FUNC(alpha_do_fixup_trampoline) "		\n"
-+"	.frame	$30,14*8,$26,0					\n"
-+"	.mask	0x04000000,-14*8				\n"
-+"	ldgp	$29,0($27)					\n"
-+"	lda    $30,-14*8($30)		# reserve 14 on stack	\n"
-+"								\n"
-+"	# Save frame registers					\n"
-+"	stq	$26,0*8($30)		# ra			\n"
-+"	.prologue 1						\n"
-+"								\n"
-+"	# Save register arguments as local variables		\n"
-+"	stq	$16,1*8($30)		# a0			\n"
-+"	stq	$17,2*8($30)		# a1			\n"
-+"	stq	$18,3*8($30)		# a2			\n"
-+"	stq	$19,4*8($30)		# a3			\n"
-+"	stq	$20,5*8($30)		# a4			\n"
-+"	stq	$21,6*8($30)		# a5			\n"
-+"	stt	$f16,7*8($30)					\n"
-+"	stt	$f17,8*8($30)					\n"
-+"	stt	$f18,9*8($30)					\n"
-+"	stt	$f19,10*8($30)					\n"
-+"	stt	$f20,11*8($30)					\n"
-+"	stt	$f21,12*8($30)					\n"
-+"								\n"
-+"	# Compute the address of methodTrampoline.method	\n"
-+"	lda	$16,8($1)					\n"
-+"	# Call C to do the fixup				\n"
-+"	jsr	$26," C_FUNC_NAME(soft_fixup_trampoline) "	\n"
-+"	ldgp	$29,0($26)					\n"
-+"	mov	$0,$27						\n"
-+"								\n"
-+"	# Reload register arguments				\n"
-+"	ldq	$16,1*8($30)		# a0			\n"
-+"	ldq	$17,2*8($30)		# a1			\n"
-+"	ldq	$18,3*8($30)		# a2			\n"
-+"	ldq	$19,4*8($30)		# a3			\n"
-+"	ldq	$20,5*8($30)		# a4			\n"
-+"	ldq	$21,6*8($30)		# a5			\n"
-+"	ldt	$f16,7*8($30)					\n"
-+"	ldt	$f17,8*8($30)					\n"
-+"	ldt	$f18,9*8($30)					\n"
-+"	ldt	$f19,10*8($30)					\n"
-+"	ldt	$f20,11*8($30)					\n"
-+"	ldt	$f21,12*8($30)					\n"
-+"								\n"
-+"	ldq	$26,0*8($30)		# ra			\n"
-+"	lda    $30,14*8($30)		# release stack		\n"
-+"								\n"
-+"	# Jump to translated method				\n"
-+"	jmp	$31,($27),0					\n"
-+"								\n"
-+"	# for __alpha_nextFrame()				\n"
-+"	ret	$31,($26),1					\n"
-     	END_ASM_FUNC(alpha_do_fixup_trampoline)
- );
-