diff options
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 43b2444404f..c084e051b7f 100644 --- 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 af14e9426e1..8ecd6339d0b 100644 --- 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 |