aboutsummaryrefslogtreecommitdiff
path: root/libjava/testsuite
diff options
context:
space:
mode:
authorRainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>2011-01-06 18:56:58 +0000
committerRainer Orth <ro@gcc.gnu.org>2011-01-06 18:56:58 +0000
commit74b51535c945900d75dd21fa6b551eeb6f46bed6 (patch)
treed4019ed559c43af34b47073bfbd65c59506c7c27 /libjava/testsuite
parent402c1cb4c884a4b9b0428e4e31bb877f5e7c81b4 (diff)
downloadgcc-74b51535c945900d75dd21fa6b551eeb6f46bed6.zip
gcc-74b51535c945900d75dd21fa6b551eeb6f46bed6.tar.gz
gcc-74b51535c945900d75dd21fa6b551eeb6f46bed6.tar.bz2
jni.exp (gcj_jni_get_cxxflags_invocation): Add -shared-libgcc to cxxflags for *-*-solaris*.
* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Add -shared-libgcc to cxxflags for *-*-solaris*. Remove -lsocket. From-SVN: r168549
Diffstat (limited to 'libjava/testsuite')
-rw-r--r--libjava/testsuite/libjava.jni/jni.exp4
1 files changed, 3 insertions, 1 deletions
diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index dbeced4..ebdee1b 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