diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rwxr-xr-x | libjava/configure | 3 | ||||
| -rw-r--r-- | libjava/configure.ac | 3 | ||||
| -rw-r--r-- | libjava/configure.host | 2 | ||||
| -rw-r--r-- | libjava/include/freebsd-signal.h | 48 |
5 files changed, 63 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 9ad6428..02b7ce7 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2015-05-28 Andreas Tobler <andreast@gcc.gnu.org> + + * configure.host: Add bits for FreeBSD amd64 and i386. + * configure.ac: Add signal handler for FreeBSD (amd64/i386) + * configure: Regenerate. + * include/freebsd-signal.h: New file. + 2015-05-26 Andreas Tobler <andreast@gcc.gnu.org> * testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Add diff --git a/libjava/configure b/libjava/configure index 0f31b0b..141b213 100755 --- a/libjava/configure +++ b/libjava/configure @@ -24412,6 +24412,9 @@ case "${host}" in powerpc*-*-aix*) SIGNAL_HANDLER=include/aix-signal.h ;; + i?86-*-freebsd* | x86_64-*-freebsd*) + SIGNAL_HANDLER=include/freebsd-signal.h + ;; *) SIGNAL_HANDLER=include/default-signal.h ;; diff --git a/libjava/configure.ac b/libjava/configure.ac index 00bbd36..656384b 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1710,6 +1710,9 @@ case "${host}" in powerpc*-*-aix*) SIGNAL_HANDLER=include/aix-signal.h ;; + i?86-*-freebsd* | x86_64-*-freebsd*) + SIGNAL_HANDLER=include/freebsd-signal.h + ;; *) SIGNAL_HANDLER=include/default-signal.h ;; diff --git a/libjava/configure.host b/libjava/configure.host index c6f359c..96222b8 100644 --- a/libjava/configure.host +++ b/libjava/configure.host @@ -338,6 +338,8 @@ EOF ;; *-*-freebsd*) slow_pthread_self= + can_unwind_signal=yes + DIVIDESPEC=-fuse-divide-subroutine ;; *-mingw*) libgcj_flags="${libgcj_flags} -fno-omit-frame-pointer" diff --git a/libjava/include/freebsd-signal.h b/libjava/include/freebsd-signal.h new file mode 100644 index 0000000..c4f7e99 --- /dev/null +++ b/libjava/include/freebsd-signal.h @@ -0,0 +1,48 @@ +/* freebsd-signal.h - Catch runtime signals and turn them into exceptions, + on a FreeBSD system. */ + +/* Copyright (C) 2015 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. */ + +/* This file is really more of a specification. The rest of the system + should be arranged so that this Just Works. */ + +#ifndef JAVA_SIGNAL_H +# define JAVA_SIGNAL_H 1 + +#include <sys/types.h> +#include <sys/signal.h> + +# define HANDLE_SEGV 1 +# define HANDLE_FPE 1 + +# define SIGNAL_HANDLER(_name) \ + static void _name (int _dummy __attribute__ ((unused))) + +# define MAKE_THROW_FRAME(_exception) + +# define INIT_SEGV \ + do { \ + struct sigaction sa; \ + sa.sa_handler = catch_segv; \ + sigemptyset (&sa.sa_mask); \ + sa.sa_flags = SA_NODEFER; \ + sigaction (SIGBUS, &sa, NULL); \ + sigaction (SIGSEGV, &sa, NULL); \ + } while (0) + +# define INIT_FPE \ + do { \ + struct sigaction sa; \ + sa.sa_handler = catch_fpe; \ + sigemptyset (&sa.sa_mask); \ + sa.sa_flags = SA_NODEFER; \ + sigaction (SIGFPE, &sa, NULL); \ + } while (0) + +#endif /* JAVA_SIGNAL_H */ |