sparc-signal.h: Renamed to ...

	* include/sparc-signal.h: Renamed to ...
	* include/solaris-signal.h: ... this.
	* configure.ac: Use it on any *-*-solaris2* target.
	* configure: Regenerate.
	* configure.host (i?86-*-solaris2*): Set can_unwind_signal=yes.
	* Makefile.am (prims.lo): Add -fno-omit-frame-pointer to AM_CXXFLAGS.
	* Makefile.in: Regenerate.

From-SVN: r162217

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5cb9b57a696fd6edefcfeb6936563776310980fa..de24a9ece25c1a27e062de2f5a5d43dc6c435a12 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-15  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * include/sparc-signal.h: Renamed to ...
+       * include/solaris-signal.h: ... this.
+       * configure.ac: Use it on any *-*-solaris2* target.
+       * configure: Regenerate.
+       * configure.host (i?86-*-solaris2*): Set can_unwind_signal=yes.
+       * Makefile.am (prims.lo): Add -fno-omit-frame-pointer to AM_CXXFLAGS.
+       * Makefile.in: Regenerate.
+
 2010-07-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * configure.ac (ANONVERSCRIPT): Handle sun style.

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 7bcb5564213d2ab782a53e2214d523b523cffa7b..7b67ed0e1e78ee1be61516c80fdb11c91e4b9065 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -444,6 +444,8 @@ libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc \
 
 ## We need to compile at least the interpreter this way.
 interpret.lo:  AM_CXXFLAGS += -fwrapv
+## Necessary so EH works on 64-bit Solaris 2.
+prims.lo: AM_CXXFLAGS += -fno-omit-frame-pointer
 
 if USING_BOEHMGC
 libgcj_la_SOURCES += boehm.cc

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index acf4faefd5c8d2fa03dec3749feccf51577a09ae..9daa03e9486a77cf8347800d3c89c7ad9e3e4067 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -10535,6 +10535,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 
 
 interpret.lo:  AM_CXXFLAGS += -fwrapv
+prims.lo: AM_CXXFLAGS += -fno-omit-frame-pointer
 @BUILD_SUBLIBS_TRUE@libgcj-noncore-dummy.dll.a : $(srcdir)/libgcj-noncore-dummy.def
 @BUILD_SUBLIBS_TRUE@   $(DLLTOOL) -d $^ -l $@ --dllname cyggcj-noncore-$(DLL_VERSION).dll 
 

diff --git a/libjava/configure b/libjava/configure
index c83dfca3ad256ccfa1f5992f33148f0b96156251..89d5b6c4a8dc3e8ad6ac0eede6fce9380288808f 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -24160,8 +24160,8 @@ case "${host}" in
  i?86-*-linux*)
     SIGNAL_HANDLER=include/i386-signal.h
     ;;
- sparc*-sun-solaris*)
-    SIGNAL_HANDLER=include/sparc-signal.h
+ *-*-solaris2*)
+    SIGNAL_HANDLER=include/solaris-signal.h
     ;;
 # ia64-*)
 #    SYSDEP_SOURCES=sysdep/ia64.c

diff --git a/libjava/configure.ac b/libjava/configure.ac
index 7155a5bd31491e6f10a1fd19a4d1f33b4b91aea8..477766ae1ca04e302240356772fddd2f23903a14 100644 (file)
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1680,8 +1680,8 @@ case "${host}" in
  i?86-*-linux*)
     SIGNAL_HANDLER=include/i386-signal.h
     ;;
- sparc*-sun-solaris*)
-    SIGNAL_HANDLER=include/sparc-signal.h
+ *-*-solaris2*)
+    SIGNAL_HANDLER=include/solaris-signal.h
     ;;
 # ia64-*)
 #    SYSDEP_SOURCES=sysdep/ia64.c

diff --git a/libjava/configure.host b/libjava/configure.host
index 460ef2fab07f122e7e5220df888d91de0ca30ec1..665fbe3c6a0ae1bd49e98c9e72a510bb1ed3a097 100644 (file)
--- a/libjava/configure.host
+++ b/libjava/configure.host
@@ -318,6 +318,9 @@ EOF
        DIVIDESPEC=-fuse-divide-subroutine
        CHECKREFSPEC=-fcheck-references
        ;;
+  i?86-*-solaris2*)
+       can_unwind_signal=yes
+       ;;
   *-*-freebsd*)
        slow_pthread_self=
        ;;

diff --git a/libjava/include/solaris-signal.h b/libjava/include/solaris-signal.h
new file mode 100644 (file)
index 0000000..a936afe
--- /dev/null
+++ b/libjava/include/solaris-signal.h
@@ -0,0 +1,48 @@
+// sparc-signal.h - Catch runtime signals and turn them into exceptions.
+
+/* Copyright (C) 1998, 1999, 2000, 2009  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>
+
+#define HANDLE_SEGV 1
+#define HANDLE_FPE 1
+
+#define SIGNAL_HANDLER(_name)                                          \
+static void _Jv_##_name (int,                                          \
+                        siginfo_t *_si __attribute__ ((__unused__)),   \
+                        void *_uc __attribute__ ((__unused__)))
+
+#define MAKE_THROW_FRAME(_exception)
+
+#define INIT_SEGV                                              \
+do                                                             \
+  {                                                            \
+    struct sigaction act;                                      \
+    act.sa_sigaction = _Jv_catch_segv;                         \
+    act.sa_flags = SA_SIGINFO | SA_NODEFER;                    \
+    sigemptyset (&act.sa_mask);                                        \
+    sigaction (SIGSEGV, &act, NULL);                           \
+  }                                                            \
+while (0)                                                      
+                                                               
+#define INIT_FPE                                               \
+do                                                             \
+  {                                                            \
+    struct sigaction act;                                      \
+    act.sa_sigaction = _Jv_catch_fpe;                          \
+    act.sa_flags = SA_SIGINFO | SA_NODEFER;                    \
+    sigemptyset (&act.sa_mask);                                        \
+    sigaction (SIGFPE, &act, NULL);                            \
+  }                                                            \
+while (0)
+
+#endif /* JAVA_SIGNAL_H */

diff --git a/libjava/include/sparc-signal.h b/libjava/include/sparc-signal.h
deleted file mode 100644 (file)
index a936afe..0000000
--- a/libjava/include/sparc-signal.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// sparc-signal.h - Catch runtime signals and turn them into exceptions.
-
-/* Copyright (C) 1998, 1999, 2000, 2009  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>
-
-#define HANDLE_SEGV 1
-#define HANDLE_FPE 1
-
-#define SIGNAL_HANDLER(_name)                                          \
-static void _Jv_##_name (int,                                          \
-                        siginfo_t *_si __attribute__ ((__unused__)),   \
-                        void *_uc __attribute__ ((__unused__)))
-
-#define MAKE_THROW_FRAME(_exception)
-
-#define INIT_SEGV                                              \
-do                                                             \
-  {                                                            \
-    struct sigaction act;                                      \
-    act.sa_sigaction = _Jv_catch_segv;                         \
-    act.sa_flags = SA_SIGINFO | SA_NODEFER;                    \
-    sigemptyset (&act.sa_mask);                                        \
-    sigaction (SIGSEGV, &act, NULL);                           \
-  }                                                            \
-while (0)                                                      
-                                                               
-#define INIT_FPE                                               \
-do                                                             \
-  {                                                            \
-    struct sigaction act;                                      \
-    act.sa_sigaction = _Jv_catch_fpe;                          \
-    act.sa_flags = SA_SIGINFO | SA_NODEFER;                    \
-    sigemptyset (&act.sa_mask);                                        \
-    sigaction (SIGFPE, &act, NULL);                            \
-  }                                                            \
-while (0)
-
-#endif /* JAVA_SIGNAL_H */