Re: [patch] libjava signal handling for FreeBSD (amd64/i386)

2015-05-28 Thread Andrew Haley
On 27/05/15 20:53, Andreas Tobler wrote:
 Is this ok for trunk?

Excellent, thanks.

Andrew.



[patch] libjava signal handling for FreeBSD (amd64/i386)

2015-05-27 Thread Andreas Tobler

Hi all,

now after this commit:

https://gcc.gnu.org/ml/gcc-cvs/2015-05/msg01107.html

(Thank you John!)

I can submit this patch which brings working signal handling support for 
FreeBSD amd64/i386. The libjava test suite passes w/o failure now.


Results can be found on the list.

Is this ok for trunk?

Thanks,
Andreas

2015-05-27  Andreas Tobler  andre...@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.

Index: configure
===
--- configure   (revision 223766)
+++ configure   (working copy)
@@ -24412,6 +24412,9 @@
  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
 ;;
Index: configure.ac
===
--- configure.ac(revision 223766)
+++ configure.ac(working copy)
@@ -1710,6 +1710,9 @@
  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
 ;;
Index: configure.host
===
--- configure.host  (revision 223766)
+++ configure.host  (working copy)
@@ -338,6 +338,8 @@
;;
   *-*-freebsd*)
slow_pthread_self=
+   can_unwind_signal=yes
+   DIVIDESPEC=-fuse-divide-subroutine
;;
   *-mingw*)
 libgcj_flags=${libgcj_flags} -fno-omit-frame-pointer
Index: include/freebsd-signal.h
===
--- include/freebsd-signal.h(revision 0)
+++ include/freebsd-signal.h(working copy)
@@ -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 */