* 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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@162217 138bc75d-0d04-0410-961f-82ee72b054a4

7 files changed, 20 insertions, 4 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5cb9b57a696..de24a9ece25 100644
--- 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 7bcb5564213..7b67ed0e1e7 100644
--- 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 acf4faefd5c..9daa03e9486 100644
--- 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 c83dfca3ad2..89d5b6c4a8d 100755
--- 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 7155a5bd314..477766ae1ca 100644
--- 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 460ef2fab07..665fbe3c6a0 100644
--- 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/sparc-signal.h b/libjava/include/solaris-signal.h
index a936afe067f..a936afe067f 100644
--- a/libjava/include/sparc-signal.h
+++ b/libjava/include/solaris-signal.h