diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rwxr-xr-x | libjava/configure | 3 | ||||
| -rw-r--r-- | libjava/configure.host | 1 | ||||
| -rw-r--r-- | libjava/configure.in | 3 | ||||
| -rw-r--r-- | libjava/include/pa-signal.h | 61 |
5 files changed, 75 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index aded40b..8c6cb64 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2004-07-08 Randolph Chung <tausq@debian.org> + + * configure.in (SIGNAL_HANDLER): Use pa-signal.h for hppa. + * configure: Regenerate. + * configure.host: Set can_unwind_signal for hppa*-linux. + * include/pa-signal.h: New file. + 2004-07-07 Per Bothner <per@bothner.com> * Makefile.am: Add rules to build libgij from just gij.cc. diff --git a/libjava/configure b/libjava/configure index 463bd0b..bf829c1 100755 --- a/libjava/configure +++ b/libjava/configure @@ -8525,6 +8525,9 @@ case "${host}" in # SYSDEP_SOURCES=sysdep/ia64.c # test -d sysdep || mkdir sysdep # ;; + hppa*-*-linux*) + SIGNAL_HANDLER=include/pa-signal.h + ;; ia64-*-linux*) SIGNAL_HANDLER=include/dwarf2-signal.h ;; diff --git a/libjava/configure.host b/libjava/configure.host index 5971945..9473927 100644 --- a/libjava/configure.host +++ b/libjava/configure.host @@ -169,6 +169,7 @@ case "${host}" in sparc*-linux* | \ ia64-* | \ x86_64*-linux* | \ + hppa*-linux* | \ sh-linux* | sh[34]*-linux*) can_unwind_signal=yes if test x$slow_pthread_self = xyes \ diff --git a/libjava/configure.in b/libjava/configure.in index 2eff8f9..142cffa 100644 --- a/libjava/configure.in +++ b/libjava/configure.in @@ -1177,6 +1177,9 @@ case "${host}" in # SYSDEP_SOURCES=sysdep/ia64.c # test -d sysdep || mkdir sysdep # ;; + hppa*-*-linux*) + SIGNAL_HANDLER=include/pa-signal.h + ;; ia64-*-linux*) SIGNAL_HANDLER=include/dwarf2-signal.h ;; diff --git a/libjava/include/pa-signal.h b/libjava/include/pa-signal.h new file mode 100644 index 0000000..0f7c054 --- /dev/null +++ b/libjava/include/pa-signal.h @@ -0,0 +1,61 @@ +// pa-signal.h - Catch runtime signals and turn them into exceptions. + +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation + + This file is part of libgcj. + +This software is copyrighted work licensed under the terms of the +Libgcj License. Please consult the file "LIBGCJ_LICENSE" for +details. */ + +#ifndef JAVA_SIGNAL_H +#define JAVA_SIGNAL_H 1 + +#include <signal.h> +#include <ucontext.h> +#include <sys/syscall.h> + +#define HANDLE_SEGV 1 +#define HANDLE_FPE 1 + +#define SIGNAL_HANDLER(_name) \ +static void _Jv_##_name (int _dummy, siginfo_t *_info, void *arg) + +#define MAKE_THROW_FRAME(_exception) \ +do \ +{ \ + struct ucontext *uc = (struct ucontext *)arg; \ + struct sigcontext *sc = &uc->uc_mcontext; \ + (void)_dummy; \ + (void)_info; \ + /* Advance the program counter so that it is after the start \ + of the instruction: the exception handler expects \ + the PC to point to the instruction after a call. */ \ + sc->sc_iaoq[0] = sc->sc_iaoq[1]; \ + sc->sc_iaoq[1] += 4; \ +} \ +while (0) + +#define INIT_SEGV \ +do \ + { \ + struct sigaction act; \ + act.sa_sigaction = _Jv_catch_segv; \ + sigemptyset (&act.sa_mask); \ + act.sa_flags = SA_SIGINFO; \ + syscall (SYS_rt_sigaction, SIGSEGV, &act, NULL, _NSIG / 8); \ + } \ +while (0) + +#define INIT_FPE \ +do \ + { \ + struct sigaction act; \ + act.sa_sigaction = _Jv_catch_fpe; \ + sigemptyset (&act.sa_mask); \ + act.sa_flags = SA_SIGINFO; \ + syscall (SYS_rt_sigaction, SIGFPE, &act, NULL, _NSIG / 8); \ + } \ +while (0) + +#endif /* JAVA_SIGNAL_H */ |