diff options
| author | Andrew Pinski <pinskia@physics.uc.edu> | 2005-10-02 21:40:55 +0000 |
|---|---|---|
| committer | Andrew Pinski <pinskia@gcc.gnu.org> | 2005-10-02 14:40:55 -0700 |
| commit | cc86dcfb9984a1c7329ea97a1c4f5891e00d6e9b (patch) | |
| tree | 29a5cc220b59e7a1521b9660e3761e7869ac8000 /libjava | |
| parent | c0ad5a317379afbc3dfb0fb1fd4e6fdb98aab8e2 (diff) | |
| download | gcc-cc86dcfb9984a1c7329ea97a1c4f5891e00d6e9b.zip gcc-cc86dcfb9984a1c7329ea97a1c4f5891e00d6e9b.tar.gz gcc-cc86dcfb9984a1c7329ea97a1c4f5891e00d6e9b.tar.bz2 | |
jni.exp (gcj_jni_test_one): For darwin, use -shared-libgcc not -lgcc_s, and explain why.
2005-10-02 Andrew Pinski <pinskia@physics.uc.edu>
* testsuite/lib/jni.exp (gcj_jni_test_one): For
darwin, use -shared-libgcc not -lgcc_s, and explain why.
(gcj_jni_invocation_test_one): Likewise.
From-SVN: r104878
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 19 |
2 files changed, 18 insertions, 7 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f580c67..257c011 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-10-02 Andrew Pinski <pinskia@physics.uc.edu> + + * testsuite/lib/jni.exp (gcj_jni_test_one): For + darwin, use -shared-libgcc not -lgcc_s, and explain why. + (gcj_jni_invocation_test_one): Likewise. + 2005-09-30 Tom Tromey <tromey@redhat.com> PR libgcj/24051: diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index c32330a..1810668 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -131,11 +131,13 @@ proc gcj_jni_test_one {file} { lappend cxxflaglist "-L$cxxldlibflags" } - # Darwin does not yet have a libgcc_s.dylib library. - # So we add it here. If the libgcc_s is installed, the libstdc++ - # would pick it up. + # If you're building the compiler with --prefix set to a place + # where it's not yet installed, then the linker won't be able to + # find the libgcc used by libffi.dylib. We could pass the + # -dylib_file option, but that's complicated, and it's much easier + # to just make the linker find libgcc using -L options. if { [istarget "*-*-darwin*"] } { - lappend cxxflaglist "-lgcc_s -lstdc++" + lappend cxxflaglist "-shared-libgcc -lstdc++" } else { lappend cxxflaglist "-lstdc++" } @@ -243,10 +245,13 @@ 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 you're building the compiler with --prefix set to a place + # where it's not yet installed, then the linker won't be able to + # find the libgcc used by libffi.dylib. We could pass the + # -dylib_file option, but that's complicated, and it's much easier + # to just make the linker find libgcc using -L options. if { [istarget "*-*-darwin*"] } { - set cxxflags "-L../.libs -lgcc_s -lgcj -liconv" + set cxxflags "-L../.libs -shared-libgcc -lgcj -liconv" } else { global LIBJAVA if [info exists LIBJAVA] { |