Hi again,
number three.
This one is also on my list to be committed to 5.1.
Results on the usual place.
Thanks,
Andreas
2015-06-22 Andreas Tobler <andre...@gcc.gnu.org>
Backport from mainline
2015-05-28 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.
2015-05-26 Andreas Tobler <andre...@gcc.gnu.org>
* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Add
libiconv for FreeBSD to cxxflags.
Index: configure
===================================================================
--- configure (revision 224751)
+++ configure (working copy)
@@ -24442,6 +24442,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 224751)
+++ configure.ac (working copy)
@@ -1755,6 +1755,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 224751)
+++ 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 */
Index: testsuite/libjava.jni/jni.exp
===================================================================
--- testsuite/libjava.jni/jni.exp (revision 224751)
+++ testsuite/libjava.jni/jni.exp (working copy)
@@ -274,6 +274,11 @@
eval lappend cxxflags "-shared-libgcc -lgcj $libiconv"
}
+ # FreeBSD needs -liconv linked, otherwise we get some unresolved.
+ if { [istarget "*-*-freebsd*"] } {
+ eval lappend cxxflags "$libiconv"
+ }
+
# Make sure libgcc unwinder is used on 64-bit Solaris 10+/x86 rather than
# the libc one.
if { [istarget "*-*-solaris*"] } {
