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

	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: r168577

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 43b2444404f05d182fdbf7ca5b14b211593f4796..c084e051b7f5c2a821bae233df1174eef4904773 100644 (file)
--- 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  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        Backport from mainline:

diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index af14e9426e100a14d9faf4072883cf94a560695b..8ecd6339d0bff0e58fcf6944c664bd91e06dde47 100644 (file)
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -265,8 +265,10 @@ proc gcj_jni_get_cxxflags_invocation {} {
     lappend cxxflags -shared-libgcc -lgcj -liconv
   }
 
+  # 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