* lib/libjava.exp (libjava_arguments): Don't use -nodefaultlibs.

	(libjava_find_lib): Add `-L' option to find the actual library.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26782 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index b359154..4015384 100644 (file)
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 1999-05-03  Tom Tromey  <tromey@cygnus.com>
 
+       * lib/libjava.exp (libjava_arguments): Don't use -nodefaultlibs.
+       (libjava_find_lib): Add `-L' option to find the actual library.
+
        * libjava.mauve/mauve.exp (test_mauve): Pass `link' to
        libjava_arguments when linking.
        (test_mauve_sim): Likewise.

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 3c814f0..fad6175 100644 (file)
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -80,18 +80,24 @@ proc libjava_init { args } {
 }
 
 # Find a library.  We know where libtool puts the actual libraries,
-# and we look there.
+# and we look there.  The implementation is fairly hacky.  We can't
+# compile with -nodefaultlibs, because that will also eliminate the
+# system libraries we need.  In order to have gcj still work, it must
+# find the appropriate libraries so we must add -L options for their
+# paths.  However we can't simply use those libraries; we still need
+# libtool for linking.
 proc libjava_find_lib {dir name} {
     global base_dir
     set gp [get_multilibs]
     foreach sub {.libs _libs} {
        if {$gp != ""} {
            if {[file exists $gp/$dir/$sub/lib${name}.a]} then {
-               return "$gp/$dir/lib${name}.la"
+               return "$gp/$dir/lib${name}.la -L$gp/$dir/$sub"
            }
        }
        set lib [findfile $base_dir/../../$dir/$sub/lib${name}.a \
-                  "$base_dir/../../$dir/lib${name}.la" ""]
+                  "$base_dir/../../$dir/lib${name}.la -L$base_dir/../../$dir/$sub" \
+                  ""]
        if {$lib != ""} {
            return $lib
        }
@@ -194,10 +200,6 @@ proc libjava_arguments {{mode compile}} {
        }
     }
 
-    if {$mode == "link"} {
-       lappend args "additional_flags=-nodefaultlibs -lm -lgcc -lc -lgcc"
-    }
-
     return $args
 }