From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Fri, 7 Jan 2011 15:32:24 +0000 (+0000)
Subject: backport: jni.exp (gcj_jni_get_cxxflags_invocation): Add -shared-libgcc to cxxflags... 
X-Git-Tag: releases/gcc-4.5.3~323
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fef5b6f2fa70e66a074de0c944b983e9352e823;p=thirdparty%2Fgcc.git

backport: jni.exp (gcj_jni_get_cxxflags_invocation): Add -shared-libgcc to cxxflags for *-*-solaris*.

	Backport from mainline:
	2011-01-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation):
	Add -shared-libgcc to cxxflags for *-*-solaris*.
	Remove -lsocket.

From-SVN: r168576
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 94e698eca8f2..a7f18760000e 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-07  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	Backport from mainline:
+	2011-01-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation):
+	Add -shared-libgcc to cxxflags for *-*-solaris*.
+	Remove -lsocket.
+
 2010-12-13  Andrew John Hughes  <ahughes@redhat.com>
 
 	PR libgcj/46774
diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index dbeced481a82..ebdee1b44c96 100644
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -274,8 +274,10 @@ proc gcj_jni_get_cxxflags_invocation {} {
     eval lappend cxxflags "-shared-libgcc -lgcj $libiconv"
   }
 
+  # Make sure libgcc unwinder is used on 64-bit Solaris 10+/x86 rather than
+  # the libc one.
   if { [istarget "*-*-solaris*"] } {
-    lappend cxxflags "-lsocket"
+    lappend cxxflags "-shared-libgcc"
   }
 
   return $cxxflags