diff options
Diffstat (limited to 'lang/kaffe/patches/patch-ab')
-rw-r--r-- | lang/kaffe/patches/patch-ab | 108 |
1 files changed, 26 insertions, 82 deletions
diff --git a/lang/kaffe/patches/patch-ab b/lang/kaffe/patches/patch-ab index a9f3dac8921..b48a79c2929 100644 --- a/lang/kaffe/patches/patch-ab +++ b/lang/kaffe/patches/patch-ab @@ -1,85 +1,29 @@ -$NetBSD: patch-ab,v 1.9 2005/09/06 18:15:32 tonio Exp $ +$NetBSD: patch-ab,v 1.10 2005/10/11 10:00:15 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 +--- Makefile.am.orig 2005-08-25 02:54:34.000000000 +0200 ++++ Makefile.am +@@ -25,7 +25,6 @@ SUBDIRS = \ + . \ + libraries/javalib \ + config \ +- libltdl \ + $(MAYBE_BINRELOC_DIR) \ + kaffe/kaffeh \ + include \ +@@ -36,7 +35,7 @@ SUBDIRS = \ + po \ + tools --static void nullException(SIGNAL_ARGS(sig, sc)); --static void floatingException(EXCEPTIONPROTO); - static void ignoreSignal(int sig); +-DIST_SUBDIRS = config include replace libltdl kaffe libraries tools test po ++DIST_SUBDIRS = config include replace kaffe libraries tools test po - 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. - * ----------------------------------------------- */ + EXTRA_DIST = \ + ChangeLog.1 \ +@@ -199,7 +198,6 @@ DIRECTORIES_BEFORE_RTJAR = \ + config \ + include \ + replace \ +- libltdl \ + kaffe/kaffevm \ + libraries/clib \ + kaffe |