From 964f0e5a34f3eb4018ffee98cc559ee4e3e957d4 Mon Sep 17 00:00:00 2001 From: jschauma Date: Mon, 22 Sep 2003 03:04:16 +0000 Subject: Update lang/kaffe to 1.1.0, using patches provided in PR pkg/22155 by M.Negovanovic. While this version is actually a ``development'' version, it has been reported to be much more usable than the stable 1.0.7 version. Changes to 1.0.7 are far too numerous to list here, see http://www.kaffe.org and/or the ChangeLog in the tarball. --- lang/kaffe/DESCR | 6 ++---- lang/kaffe/MESSAGE | 11 ++--------- lang/kaffe/Makefile | 11 ++++++----- lang/kaffe/PLIST | 41 +++++++++++++++++++------------------- lang/kaffe/distinfo | 16 ++++++--------- lang/kaffe/patches/patch-aa | 31 +++++++++++++++-------------- lang/kaffe/patches/patch-ab | 13 ------------ lang/kaffe/patches/patch-ac | 37 ++++++++++++++++------------------ lang/kaffe/patches/patch-ad | 8 ++++---- lang/kaffe/patches/patch-af | 48 --------------------------------------------- lang/kaffe/patches/patch-ag | 47 -------------------------------------------- lang/kaffe/patches/patch-ak | 15 -------------- 12 files changed, 74 insertions(+), 210 deletions(-) delete mode 100644 lang/kaffe/patches/patch-ab delete mode 100644 lang/kaffe/patches/patch-af delete mode 100644 lang/kaffe/patches/patch-ag delete mode 100644 lang/kaffe/patches/patch-ak (limited to 'lang/kaffe') diff --git a/lang/kaffe/DESCR b/lang/kaffe/DESCR index 795c8533cbc..5991cc7e7b8 100644 --- a/lang/kaffe/DESCR +++ b/lang/kaffe/DESCR @@ -1,4 +1,2 @@ -This is the first release of "Kaffe OpenVM", a complete virtual machine -and class library set which allows the execution of Java code without any -code from Javasoft. It comes with a virtual machine and a set of class -libraries including beans, and the all important AWT graphics system. +Kaffe is a clean room implementation of Java virtual machine plus associated +class libraries needed to provide a Java runtime environment. diff --git a/lang/kaffe/MESSAGE b/lang/kaffe/MESSAGE index 99c81aa48d3..b9d3871e7c0 100644 --- a/lang/kaffe/MESSAGE +++ b/lang/kaffe/MESSAGE @@ -1,16 +1,9 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2003/04/14 18:23:48 mason Exp $ +$NetBSD: MESSAGE,v 1.4 2003/09/22 03:04:16 jschauma Exp $ Before running Kaffe it is necessary to configure the environment. -This requires the setting of PATH and LD_LIBRARY_PATH. -For the standard installation these would be defined as follows: PATH=$PATH:${PREFIX}/bin - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${PREFIX}/lib - -Note that you don't have to setup the CLASSPATH - if you do then that's -fine, but if you don't Kaffe will construct a classpath from the Jar and -Zip files it finds in the standard places (the default would be to include -all files in ${PREFIX}/share/kaffe). + CLASSPATH=${PREFIX}/jre/lib/rt.jar:. =========================================================================== diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile index dc6306d98e4..8575e485967 100644 --- a/lang/kaffe/Makefile +++ b/lang/kaffe/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.48 2003/08/23 15:14:01 jschauma Exp $ -# +# $NetBSD: Makefile,v 1.49 2003/09/22 03:04:16 jschauma Exp $ -DISTNAME= kaffe-1.0.7 -PKGREVISION= 1 +DISTNAME= kaffe-1.1.0 CATEGORIES= lang java -MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.0.x-production/ +MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.kaffe.org/ @@ -14,6 +12,7 @@ USE_BUILDLINK2= yes USE_PKGINSTALL= yes USE_X11= yes USE_LIBTOOL= yes +USE_GMAKE= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig TEST_TARGET= check @@ -27,6 +26,7 @@ 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 @@ -46,6 +46,7 @@ CONFIGURE_ENV+= VM_LIBS="-lc" post-install: ${INSTALL_DATA} ${WRKSRC}/license.terms ${PREFIX} +.include "../../converters/libiconv/buildlink2.mk" .include "../../devel/gmp/buildlink2.mk" .include "../../devel/zlib/buildlink2.mk" .include "../../graphics/jpeg/buildlink2.mk" diff --git a/lang/kaffe/PLIST b/lang/kaffe/PLIST index cf83be1162d..c7ad4008181 100644 --- a/lang/kaffe/PLIST +++ b/lang/kaffe/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.5 2003/01/29 10:58:50 jlam Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/09/22 03:04:16 jschauma Exp $ bin/appletviewer bin/install-jar bin/jar bin/java bin/javac bin/javadoc +bin/javah bin/javakey bin/javap bin/jdb @@ -29,56 +30,56 @@ 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/${MACHINE_ARCH}/libawt-1.0.7.so +jre/lib/.pkgsrc +jre/lib/${MACHINE_ARCH}/libawt-${PKGVERSION}.so jre/lib/${MACHINE_ARCH}/libawt.la jre/lib/${MACHINE_ARCH}/libawt.so -jre/lib/${MACHINE_ARCH}/libio-1.0.7.so +jre/lib/${MACHINE_ARCH}/libio-${PKGVERSION}.so jre/lib/${MACHINE_ARCH}/libio.la jre/lib/${MACHINE_ARCH}/libio.so -jre/lib/${MACHINE_ARCH}/libkaffevm-1.0.7.so +jre/lib/${MACHINE_ARCH}/libkaffevm-${PKGVERSION}.so jre/lib/${MACHINE_ARCH}/libkaffevm.la jre/lib/${MACHINE_ARCH}/libkaffevm.so -jre/lib/${MACHINE_ARCH}/libmanagement-1.0.7.so +jre/lib/${MACHINE_ARCH}/libmanagement-${PKGVERSION}.so jre/lib/${MACHINE_ARCH}/libmanagement.la jre/lib/${MACHINE_ARCH}/libmanagement.so -jre/lib/${MACHINE_ARCH}/libmath-1.0.7.so +jre/lib/${MACHINE_ARCH}/libmath-${PKGVERSION}.so jre/lib/${MACHINE_ARCH}/libmath.la jre/lib/${MACHINE_ARCH}/libmath.so -jre/lib/${MACHINE_ARCH}/libmicrosoft-1.0.7.so -jre/lib/${MACHINE_ARCH}/libmicrosoft.la -jre/lib/${MACHINE_ARCH}/libmicrosoft.so -jre/lib/${MACHINE_ARCH}/libnative-1.0.7.so +jre/lib/${MACHINE_ARCH}/libnative-${PKGVERSION}.so jre/lib/${MACHINE_ARCH}/libnative.la jre/lib/${MACHINE_ARCH}/libnative.so -jre/lib/${MACHINE_ARCH}/libnet-1.0.7.so +jre/lib/${MACHINE_ARCH}/libnet-${PKGVERSION}.so jre/lib/${MACHINE_ARCH}/libnet.la jre/lib/${MACHINE_ARCH}/libnet.so -jre/lib/${MACHINE_ARCH}/libsecurity-1.0.7.so +jre/lib/${MACHINE_ARCH}/libsecurity-${PKGVERSION}.so jre/lib/${MACHINE_ARCH}/libsecurity.la jre/lib/${MACHINE_ARCH}/libsecurity.so -jre/lib/${MACHINE_ARCH}/libzip-1.0.7.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.la jre/lib/${MACHINE_ARCH}/libzip.so -jre/lib/comm.jar -jre/lib/microsoft.jar -jre/lib/pjava.jar -jre/lib/rmi.jar jre/lib/rt.jar +jre/lib/security/.pkgsrc jre/lib/security/java.security.default -jre/lib/servlet.jar lib/kjc.jar -lib/tools.jar license.terms man/man1/kaffe.1 +@dirrm lib @dirrm man/man1 @dirrm man -@dirrm lib +@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/distinfo b/lang/kaffe/distinfo index 9187a3d2031..84b429a3c24 100644 --- a/lang/kaffe/distinfo +++ b/lang/kaffe/distinfo @@ -1,15 +1,11 @@ -$NetBSD: distinfo,v 1.7 2003/09/16 20:15:29 jmmv Exp $ +$NetBSD: distinfo,v 1.8 2003/09/22 03:04:17 jschauma Exp $ -SHA1 (kaffe-1.0.7.tar.gz) = 4f839362b9e1fbdb6c7af8f69663e5b0bf922e8e -Size (kaffe-1.0.7.tar.gz) = 4248252 bytes -SHA1 (patch-aa) = 66da985c6ba6891adca4c73351f990081e24e4e4 -SHA1 (patch-ab) = 5b68b671ed1a455cbe76bc316d9ea278fdf67349 -SHA1 (patch-ac) = 5947ff51d8db1988b57a609febf19c9d74d4c614 -SHA1 (patch-ad) = 9d8e61a6c3a73af6a50b20ac7e28911b63c2e566 +SHA1 (kaffe-1.1.0.tar.gz) = 3616a51fe667fee5837c6bfb41996fb877820547 +Size (kaffe-1.1.0.tar.gz) = 7713155 bytes +SHA1 (patch-aa) = 7b5dde8d984e8ee2d474d4e54d064562a5535533 +SHA1 (patch-ac) = 4eefe6c31aaed295c5e62a9dae550b86a248cb57 +SHA1 (patch-ad) = 58289c46db00b5ac1c6f42d3f9e3c22c2b42deea SHA1 (patch-ae) = f7d6ff1e9356f6ba00c23c2ab0a1682aa9ccc003 -SHA1 (patch-af) = 649f2c4c2f57331324e9c93bb1a2838476f49b77 -SHA1 (patch-ag) = 8a936289c45969e71f1bf475b0ccb6ec5701e202 SHA1 (patch-ah) = 63c7229616a63179cc7dcbdb0f03d555c3682b44 SHA1 (patch-ai) = 0533725771ab9bdfc4a922a41d3ac63e5facae9b SHA1 (patch-aj) = b2c5604c4fddf54c381ccd627ec69259f7735d24 -SHA1 (patch-ak) = cec9b6745efde3388b49a82cfd4e5b570f4208fe diff --git a/lang/kaffe/patches/patch-aa b/lang/kaffe/patches/patch-aa index 5a7f7d58689..5ffe5191640 100644 --- a/lang/kaffe/patches/patch-aa +++ b/lang/kaffe/patches/patch-aa @@ -1,17 +1,18 @@ -$NetBSD: patch-aa,v 1.11 2002/07/27 21:26:22 jschauma Exp $ +$NetBSD: patch-aa,v 1.12 2003/09/22 03:04:17 jschauma Exp $ ---- configure.orig Tue Jul 23 17:01:03 2002 -+++ configure Tue Jul 23 17:02:51 2002 -@@ -7197,10 +7197,10 @@ - /* Override any gcc2 internal prototype to avoid an error. */ +--- 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 __gmpz_get_d(); - - int main() { --mpz_get_d() -+__gmpz_get_d() - ; return 0; } - EOF - if { (eval echo configure:7207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + 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; + } diff --git a/lang/kaffe/patches/patch-ab b/lang/kaffe/patches/patch-ab deleted file mode 100644 index 31ce6de0655..00000000000 --- a/lang/kaffe/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.7 2002/07/27 21:26:22 jschauma Exp $ - ---- test/regression/Makefile.in.orig Tue Jul 23 17:04:49 2002 -+++ test/regression/Makefile.in Tue Jul 23 17:05:20 2002 -@@ -137,7 +137,7 @@ - - TESTS_ENVIRONMENT = $(SETUP_ENVIRONMENT) $(SHELL) TestScript - --ALWAYS_TESTS = HelloWorldApp.class.save HelloWorldApp.java TestIntLong.java TestFloatDouble.java DoubleCvt.java DoubleNeg.java DoubleConst.java DoublePrint.java DoubleComp.java ModuloTest.java LongNeg.java FPUStack.java divtest.java Str.java Str2.java InternHog.java IndexTest.java StackDump.java tname.java ttest.java ThreadInterrupt.java ThreadState.java UncaughtException.java IllegalWait.java Preempt.java ReflectInterfaces.java InnerTest.java SerialUID.java TestSerializable.java TestSerializable2.java TestCasts.java Alias.java NullPointerTest.java NullInvoke.java TableSwitch.java LostFrame.java ConstructorTest.java burford.java IllegalInterface.java GetInterfaces.java IntfTest.java SignedShort.java CharCvt.java BadFloatTest.java ProcessTest.java UDPTest.java SoTimeout.java wc.java FileTest.java FileChecks.java finalexc.java finaltest.java finaltest2.java forNameTest.java LoaderTest.java ArrayForName.java KaffeVerifyBug.java Schtum.java Reflect.java MethodBug.java Bean.java SortTest.java HashTest.java MapTest.java URLTest.java PropertiesTest.java ReaderTest.java CharArrayReaderTest.java LineNumberReaderTest.java BufferedReaderTest.java ReaderReadVoidTest.java PipeTest.java GetField.java ReflectInvoke.java InvTarExcTest.java SystemLoaderTest.java CLTest.java CLTestConc.java CLTestJLock.java CLTestLie.java CLTestFindLoaded.java ClassDeadLock.java ExceptionTest.java ExceptionTestClassLoader.java ExceptionTestClassLoader2.java TestClassRef.java ClassGC.java GCTest.java ThreadLocalTest.java BeanBug.java BitSetTest.java ExceptionInInitializerTest.java InitTest.java ProcessClassTest.java ProcessClassInst.java ProcessClassStop.java FindSystemClass.java ProcessClassLockTest.java DoubleBug.java TestUnlock.java MarkResetTest.java HashtableTest1.java ReflectMultiArray.java ExecTest.java CatchDeath.java ThreadStop.java DeadThread.java tthrd1.java SoInterrupt.java sysdepCallMethod.java DosTimeVerify.java ZipVerify.java ZipTest.java TruncatedClass.java TestNative.java -+ALWAYS_TESTS = HelloWorldApp.class.save HelloWorldApp.java TestIntLong.java TestFloatDouble.java DoubleCvt.java DoubleNeg.java DoubleConst.java DoublePrint.java DoubleComp.java ModuloTest.java LongNeg.java FPUStack.java divtest.java Str.java Str2.java InternHog.java IndexTest.java StackDump.java tname.java ttest.java ThreadInterrupt.java ThreadState.java UncaughtException.java IllegalWait.java ReflectInterfaces.java InnerTest.java SerialUID.java TestSerializable.java TestSerializable2.java TestCasts.java Alias.java NullPointerTest.java NullInvoke.java TableSwitch.java LostFrame.java ConstructorTest.java burford.java IllegalInterface.java GetInterfaces.java IntfTest.java SignedShort.java CharCvt.java BadFloatTest.java ProcessTest.java UDPTest.java SoTimeout.java wc.java FileTest.java FileChecks.java finalexc.java finaltest.java finaltest2.java forNameTest.java LoaderTest.java ArrayForName.java KaffeVerifyBug.java Schtum.java Reflect.java MethodBug.java Bean.java SortTest.java HashTest.java MapTest.java URLTest.java PropertiesTest.java ReaderTest.java CharArrayReaderTest.java LineNumberReaderTest.java BufferedReaderTest.java ReaderReadVoidTest.java PipeTest.java GetField.java ReflectInvoke.java InvTarExcTest.java SystemLoaderTest.java CLTest.java CLTestConc.java CLTestJLock.java CLTestLie.java CLTestFindLoaded.java ClassDeadLock.java ExceptionTest.java ExceptionTestClassLoader.java ExceptionTestClassLoader2.java TestClassRef.java ClassGC.java GCTest.java ThreadLocalTest.java BeanBug.java BitSetTest.java ExceptionInInitializerTest.java InitTest.java ProcessClassTest.java ProcessClassInst.java ProcessClassStop.java FindSystemClass.java ProcessClassLockTest.java DoubleBug.java TestUnlock.java MarkResetTest.java HashtableTest1.java ReflectMultiArray.java ExecTest.java CatchDeath.java ThreadStop.java DeadThread.java tthrd1.java SoInterrupt.java sysdepCallMethod.java DosTimeVerify.java ZipVerify.java ZipTest.java TruncatedClass.java TestNative.java - - - TEST_Overflow = Overflow.java diff --git a/lang/kaffe/patches/patch-ac b/lang/kaffe/patches/patch-ac index 87e9cdbf400..cafe6769c4d 100644 --- a/lang/kaffe/patches/patch-ac +++ b/lang/kaffe/patches/patch-ac @@ -1,28 +1,25 @@ -$NetBSD: patch-ac,v 1.3 2003/01/29 10:58:51 jlam Exp $ +$NetBSD: patch-ac,v 1.4 2003/09/22 03:04:17 jschauma Exp $ ---- libraries/clib/security/Makefile.in.orig Wed Jan 29 02:57:21 2003 -+++ libraries/clib/security/Makefile.in -@@ -268,18 +268,18 @@ install-securityDATA: $(security_DATA) - $(mkinstalldirs) $(DESTDIR)$(securitydir) +--- 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 $(srcdir)/$$p; then \ -- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(securitydir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(securitydir)/$$p; \ -+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(securitydir)/$$p.default"; \ -+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(securitydir)/$$p.default; \ - else if test -f $$p; then \ -- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(securitydir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(securitydir)/$$p; \ -+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(securitydir)/$$p.default"; \ -+ $(INSTALL_DATA) $$p $(DESTDIR)$(securitydir)/$$p.default; \ - fi; fi; \ + 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 \ -- rm -f $(DESTDIR)$(securitydir)/$$p; \ -+ rm -f $(DESTDIR)$(securitydir)/$$p.default; \ + @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 - tags: TAGS + ETAGS = etags diff --git a/lang/kaffe/patches/patch-ad b/lang/kaffe/patches/patch-ad index 5cb9807d3e8..84a9e336c93 100644 --- a/lang/kaffe/patches/patch-ad +++ b/lang/kaffe/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.3 2003/09/16 20:15:31 jmmv Exp $ +$NetBSD: patch-ad,v 1.4 2003/09/22 03:04:17 jschauma Exp $ ---- kaffe/kaffevm/systems/unix-jthreads/jthread.c.orig 2002-06-01 04:27:22.000000000 +0100 -+++ kaffe/kaffevm/systems/unix-jthreads/jthread.c 2003-08-11 12:21:55.382934000 +0100 -@@ -135,7 +135,7 @@ +--- 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 diff --git a/lang/kaffe/patches/patch-af b/lang/kaffe/patches/patch-af deleted file mode 100644 index 8f9a2510dbe..00000000000 --- a/lang/kaffe/patches/patch-af +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-af,v 1.3 2003/09/16 20:15:34 jmmv Exp $ - ---- config/arm/trampolines.c.orig 2001-05-14 23:24:39.000000000 +0100 -+++ config/arm/trampolines.c 2003-08-11 13:11:53.259056000 +0100 -@@ -35,14 +35,13 @@ - - asm( - START_ASM_FUNC() C_FUNC_NAME(arm_do_fixup_trampoline) "\n" --C_FUNC_NAME(arm_do_fixup_trampoline) ": \n -- stmdb sp!,{r0,r1,r2,r3,lr}\n -- mov r0,ip\n -- bl " C_FUNC_NAME(soft_fixup_trampoline) " \n -- mov ip, r0\n -- ldmia sp!,{r0,r1,r2,r3,lr}\n -- mov pc, ip\n --" -+C_FUNC_NAME(arm_do_fixup_trampoline) ": \n" -+" stmdb sp!,{r0,r1,r2,r3,lr} \n" -+" mov r0,ip \n" -+" bl " C_FUNC_NAME(soft_fixup_trampoline) " \n" -+" mov ip, r0 \n" -+" ldmia sp!,{r0,r1,r2,r3,lr} \n" -+" mov pc, ip \n" - END_ASM_FUNC() - ); - -@@ -50,14 +49,13 @@ - - asm( - START_ASM_FUNC() C_FUNC_NAME(arm_do_fixup_trampoline) "\n" --C_FUNC_NAME(arm_do_fixup_trampoline) ": \n -- stmdb sp!,{r0,r1,r2,r3,lr}\n -- mov r0,ip\n -- bl " C_FUNC_NAME(soft_fixup_trampoline) " (PLT) \n -- mov ip, r0\n -- ldmia sp!,{r0,r1,r2,r3,lr}\n -- mov pc, ip\n --" -+C_FUNC_NAME(arm_do_fixup_trampoline) ": \n" -+" stmdb sp!,{r0,r1,r2,r3,lr} \n" -+" mov r0,ip \n" -+" bl " C_FUNC_NAME(soft_fixup_trampoline) " (PLT) \n" -+" mov ip, r0 \n" -+" ldmia sp!,{r0,r1,r2,r3,lr} \n" -+" mov pc, ip \n" - END_ASM_FUNC() - ); - diff --git a/lang/kaffe/patches/patch-ag b/lang/kaffe/patches/patch-ag deleted file mode 100644 index 4278bed9ecb..00000000000 --- a/lang/kaffe/patches/patch-ag +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2003/09/16 20:15:35 jmmv Exp $ - ---- config/i386/trampolines.c.orig 2003-08-11 13:01:10.966139000 +0100 -+++ config/i386/trampolines.c 2003-08-11 13:13:31.960345000 +0100 -@@ -33,10 +33,10 @@ - - asm( - START_ASM_FUNC() C_FUNC_NAME(i386_do_fixup_trampoline) "\n" --C_FUNC_NAME(i386_do_fixup_trampoline) ": \n -- call " C_FUNC_NAME(soft_fixup_trampoline) " \n -- popl %ecx \n -- jmp *%eax" -+C_FUNC_NAME(i386_do_fixup_trampoline) ": \n" -+" call " C_FUNC_NAME(soft_fixup_trampoline) " \n" -+" popl %ecx \n" -+" jmp *%eax" - END_ASM_FUNC() - ); - -@@ -48,17 +48,16 @@ - */ - asm( - START_ASM_FUNC() C_FUNC_NAME(__kaffe_i386_gcj_fixup) "\n" --C_FUNC_NAME(__kaffe_i386_gcj_fixup) ": -- mov (%esp), %eax # get return address -- add -4(%eax), %eax # add jump relative offset from previous instr. -- # this points at at jmp *$off(%ebx) instr. -- mov 2(%eax), %eax # extract 'off' -- add %ebx, %eax # compute $off(%ebx) -- pushl %eax # pass as first argument -- call " C_FUNC_NAME(gcj_fixup_trampoline) " # returns target -- addl $4, %esp # remove argument -- jmp *%eax # jump to target --" -+C_FUNC_NAME(__kaffe_i386_gcj_fixup) ":" -+" mov (%esp), %eax # get return address\n" -+" add -4(%eax), %eax # add jump relative offset from previous instr.\n" -+" # this points at at jmp *$off(%ebx) instr.\n" -+" mov 2(%eax), %eax # extract 'off'\n" -+" add %ebx, %eax # compute $off(%ebx)\n" -+" pushl %eax # pass as first argument\n" -+" call " C_FUNC_NAME(gcj_fixup_trampoline) " # returns target\n" -+" addl $4, %esp # remove argument\n" -+" jmp *%eax # jump to target\n" - END_ASM_FUNC() - ); - diff --git a/lang/kaffe/patches/patch-ak b/lang/kaffe/patches/patch-ak deleted file mode 100644 index a5205da5ae0..00000000000 --- a/lang/kaffe/patches/patch-ak +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ak,v 1.3 2003/09/16 20:15:40 jmmv Exp $ - ---- kaffe/kaffevm/jit3/machine.h.orig 2000-12-20 03:42:38.000000000 +0100 -+++ kaffe/kaffevm/jit3/machine.h -@@ -148,8 +148,8 @@ typedef struct _nativeCodeInfo { - int codelen; - } nativeCodeInfo; - --#define willCatch(FLAG) willcatch.##FLAG = true --#define canCatch(FLAG) willcatch.##FLAG -+#define willCatch(FLAG) willcatch. FLAG = true -+#define canCatch(FLAG) willcatch. FLAG - - void setupGlobalRegisters(void); - void setupArgumentRegisters(void); -- cgit v1.2.3