diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-06 18:56:58 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-06 18:56:58 +0000 |
| commit | 65c993910109f93c4fd892e278984fc871ec61b9 (patch) | |
| tree | d4019ed559c43af34b47073bfbd65c59506c7c27 /libjava | |
| parent | bcac45515cd485917a18edadb476cefe505a11b0 (diff) | |
* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation):
Add -shared-libgcc to cxxflags for *-*-solaris*.
Remove -lsocket.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168549 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 4 |
2 files changed, 9 insertions, 1 deletions
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 <ro@CeBiTec.Uni-Bielefeld.DE> + + * testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): + Add -shared-libgcc to cxxflags for *-*-solaris*. + Remove -lsocket. + 2011-01-03 Jakub Jelinek <jakub@redhat.com> * 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 |