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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 94e698eca8f29089e9316a4f6c81a4af839c3635..a7f18760000e4336c2ff22c07b1785c29d3af720 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  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 dbeced481a824858cd6092c84a6a0a7abd33b5cc..ebdee1b44c96c18cb7b7ec9fc5bf26d336d07346 100644 (file)
--- 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