From: H.J. Lu <hjl.tools@gmail.com>
Date: Wed, 10 May 2000 23:12:35 +0000 (+0000)
Subject: 2000-05-10  H.J. Lu  <hjl@gnu.org>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cd4c806ac95a85d8ee0271d7db797504cc656ec0;p=binutils-gdb.git

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.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 9ada466837e..474658cc388 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -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>
 
 	From Ulf Carlsson <ulfc@engr.sgi.com> and Andreas Jaeger <aj@suse.de>
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 8f0c607b7a1..d43140f06b2 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -1864,8 +1864,10 @@ open_input_bfds (s, force)
 
 	      /* If we are being called from within a group, and this
                  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
+		  && !s->input_statement.whole_archive
 		  && s->input_statement.loaded
 		  && bfd_check_format (s->input_statement.the_bfd,
 				       bfd_archive))