From 74b51535c945900d75dd21fa6b551eeb6f46bed6 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Thu, 6 Jan 2011 18:56:58 +0000 Subject: [PATCH] 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/ChangeLog | 6 ++++++ libjava/testsuite/libjava.jni/jni.exp | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b087b5f402d..aa1c306ef8d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2011-01-06 Rainer Orth + + * testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): + Add -shared-libgcc to cxxflags for *-*-solaris*. + Remove -lsocket. + 2011-01-03 Jakub Jelinek * gnu/gcj/convert/Convert.java (version): Update copyright notice diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index dbeced481a8..ebdee1b44c9 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