From: Alexandre Oliva <aoliva@redhat.com>
Date: Tue, 8 Jan 2002 14:56:09 +0000 (+0000)
Subject: * ldlang.c (walk_wild_section): Exclude object file if enclosing
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=34efb44947f434bef3f19231aa2d2d917ec2f4f1;p=deliverable%2Fbinutils-gdb.git

* ldlang.c (walk_wild_section): Exclude object file if enclosing
archive is excluded.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 720e83ba1d..0202545f23 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-08  Alexandre Oliva  <aoliva@redhat.com>
+
+	* ldlang.c (walk_wild_section): Exclude object file if enclosing
+	archive is excluded.
+
 2002-01-07  Jason Thorpe  <thorpej@wasabisystems.com>
 
 	* Makefile.am (ALL_EMULATIONS): Add eshelf_nbsd.o and eshlelf_nbsd.o.
diff --git a/ld/ldlang.c b/ld/ldlang.c
index afce0fa5c2..a7b53dd1b0 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -1,6 +1,6 @@
 /* Linker command language support.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001
+   2001, 2002
    Free Software Foundation, Inc.
 
 This file is part of GLD, the Gnu Linker.
@@ -270,6 +270,21 @@ walk_wild_section (ptr, file, callback, data)
 	      else
 		skip = strcmp (list_tmp->name, file->filename) == 0;
 
+	      /* If this file is part of an archive, and the archive is
+		 excluded, exclude this file.  */
+	      if (! skip && file->the_bfd != NULL
+		  && file->the_bfd->my_archive != NULL
+		  && file->the_bfd->my_archive->filename != NULL)
+		{
+		  if (wildcardp (list_tmp->name))
+		    skip = fnmatch (list_tmp->name,
+				    file->the_bfd->my_archive->filename,
+				    0) == 0;
+		  else
+		    skip = strcmp (list_tmp->name,
+				   file->the_bfd->my_archive->filename) == 0;
+		}
+
 	      if (skip)
 		break;
 	    }