2000-05-10 H.J. Lu <hjl@gnu.org>
* ldlang.c (open_input_bfds): Don't load the same file within a group again if the whole archive has been loaded already.
This commit is contained in:
parent
5af923b0f0
commit
cd4c806ac9
2 changed files with 8 additions and 1 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2000-05-10 H.J. Lu <hjl@gnu.org>
|
||||||
|
|
||||||
|
* ldlang.c (open_input_bfds): Don't load the same file within
|
||||||
|
a group again if the whole archive has been loaded already.
|
||||||
|
|
||||||
2000-05-03 Alan Modra <alan@linuxcare.com.au>
|
2000-05-03 Alan Modra <alan@linuxcare.com.au>
|
||||||
|
|
||||||
From Ulf Carlsson <ulfc@engr.sgi.com> and Andreas Jaeger <aj@suse.de>
|
From Ulf Carlsson <ulfc@engr.sgi.com> and Andreas Jaeger <aj@suse.de>
|
||||||
|
|
|
@ -1864,8 +1864,10 @@ open_input_bfds (s, force)
|
||||||
|
|
||||||
/* If we are being called from within a group, and this
|
/* If we are being called from within a group, and this
|
||||||
is an archive which has already been searched, then
|
is an archive which has already been searched, then
|
||||||
force it to be researched. */
|
force it to be researched unless the whole archive
|
||||||
|
has been loaded already. */
|
||||||
if (force
|
if (force
|
||||||
|
&& !s->input_statement.whole_archive
|
||||||
&& s->input_statement.loaded
|
&& s->input_statement.loaded
|
||||||
&& bfd_check_format (s->input_statement.the_bfd,
|
&& bfd_check_format (s->input_statement.the_bfd,
|
||||||
bfd_archive))
|
bfd_archive))
|
||||||
|
|
Loading…
Reference in a new issue