Re: libgcj/1736

[Alexandre Oliva]

On Mar  6, 2001, Bryce McKinlay <address@hidden> wrote:

> Perhaps it would suffice to simply clear "wl" when entering the
> incremental mode, assuming we know the linker will always be called
> directly when doing incremental.

Yep.  Please try this patch.

Index: ChangeLog
from  Alexandre Oliva  <address@hidden>

        * ltmain.in: Clear $wl during piecewise linking.

Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/ltmain.in,v
retrieving revision 1.200.2.48
diff -u -p -r1.200.2.48 ltmain.in
--- ltmain.in 2001/03/06 11:15:37 1.200.2.48
+++ ltmain.in 2001/03/08 07:08:42
@@ -3130,20 +3130,27 @@ EOF
        fi
 
        # Do each of the archive commands.
-       if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-         eval cmds=\"$archive_expsym_cmds\"
-       else
-         eval cmds=\"$archive_cmds\"
-       fi
+if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+eval cmds=\"$archive_expsym_cmds\"
+else
+eval cmds=\"$archive_cmds\"
+fi
         if len=`expr "X$cmds" : ".*"` &&
            test $len -le $max_cmd_len; then
           :
         else
-          # the command line is too long to link in one step, link piecewise
+          # The command line is too long to link in one step, link piecewise.
           $echo "creating reloadable object files..."
-          # save the value of $output and $libobjs because we want to use them 
later
+
+          # Save the value of $output and $libobjs because we want to
+         # use them later.  We have to clear $wl here because
+         # $reload_cmds runs $LD directly, but we want to restore it
+         # for $archive_cmds.
           save_libobjs=$libobjs
           save_output=$output
+         save_wl=$wl
+         wl=
+
           # clear the reloadable object creation command queue and initialize 
k to one.
           test_cmds=
           concat_cmds=
@@ -3201,6 +3208,7 @@ EOF
           libobjs=$output
           # restore the value of output
           output=$save_output
+         wl=$save_wl
 
           # expand the library linking commands again to reset the value of 
$libobjs for piecewise linking
           # Do each of the archive commands.

-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                  address@hidden, redhat.com}
CS PhD student at IC-Unicamp        address@hidden, gnu.org}
Free Software Evangelist    *Please* write to mailing lists, not to me