diff options
author | tonio <tonio> | 2005-09-06 18:15:32 +0000 |
---|---|---|
committer | tonio <tonio> | 2005-09-06 18:15:32 +0000 |
commit | 7b93dc78d2cd8d74f703aef4f9303fd784687a41 (patch) | |
tree | 3affcc6bb13a331cf2f059492787dc997a0ea34e /lang/kaffe/patches | |
parent | 0bcb476f2e71253acc09aac0867104ad21623ae6 (diff) | |
download | pkgsrc-7b93dc78d2cd8d74f703aef4f9303fd784687a41.tar.gz |
Update lang/kaffe to 1.1.5
regenerate buildlink3
approved by wiz@
Diffstat (limited to 'lang/kaffe/patches')
-rw-r--r-- | lang/kaffe/patches/patch-aa | 44 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ab | 85 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ac | 33 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ad | 35 | ||||
-rw-r--r-- | lang/kaffe/patches/patch-ae | 134 |
5 files changed, 158 insertions, 173 deletions
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) - ); - |