diff options
| author | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-16 21:16:00 +0000 |
|---|---|---|
| committer | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-16 21:16:00 +0000 |
| commit | 7f1fb0832a9685eb329af5d37b6b67e8a94c28cb (patch) | |
| tree | 7cb738abd8c62a2d3aeb0e7566909d3537bb740d /libjava | |
| parent | a6971e982119af18c653122215d5b86bd329bd88 (diff) | |
| download | gcc-7f1fb0832a9685eb329af5d37b6b67e8a94c28cb.tar.gz | |
2005-03-16 Andreas Tobler <a.tobler@schweiz.ch>
* testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one): Add
lgcc_s to the libraries to link for Darwin.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96579 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7adeca6e93b..4e0ed3e287b 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-03-16 Andreas Tobler <a.tobler@schweiz.ch> + + * testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one): Add + lgcc_s to the libraries to link for Darwin. + 2005-03-15 Andreas Tobler <a.tobler@schweiz.ch> * stacktrace.cc (_Jv_StackTrace::UnwindTraceFn): Protect @@ -7,7 +12,7 @@ (_Jv_StackTrace::non_system_trace_fn): Likewise. * include/java-stack.h (struct _Jv_InterpFrameInfo): Protect with #ifdef INTERPRETER. Also protect declarations that use it. - * java/lang/Class.h: Move _Jv_StackTrace friend declaration outside + * java/lang/Class.h: Move _Jv_StackTrace friend declaration outside #ifdef INTERPRETER block. 2005-03-15 Jakub Jelinek <jakub@redhat.com> diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index 989a16448a5..b2df3126983 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -243,8 +243,10 @@ proc gcj_jni_invocation_test_one {file} { set cfile [file rootname $file].c # Darwin needs -liconv linked, otherwise we get some unresolved. + # Also, like in the cxxtest we need to add -lgcc_s since Darwin + # has no libgcc_s.dylib installed yet. if { [istarget "*-*-darwin*"] } { - set cxxflags "-L../.libs -lgcj -liconv" + set cxxflags "-L../.libs -lgcc_s -lgcj -liconv" } else { set cxxflags "-L../.libs -lgcj" } |