From 74b51535c945900d75dd21fa6b551eeb6f46bed6 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Thu, 6 Jan 2011 18:56:58 +0000 Subject: 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 --- libjava/testsuite/libjava.jni/jni.exp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libjava/testsuite') 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 -- cgit v1.1