This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Re: ld: EXCLUDE_FILES archive doesn't exclude its members
On Jan 7, 2002, Alan Modra <amodra@bigpond.net.au> wrote:
> On Sat, Jan 05, 2002 at 02:37:20AM -0200, Alexandre Oliva wrote:
>> When a linker script mentions an archive in EXCLUDE_FILES, this
>> doesn't result in the members of the archive being excluded as, IMO,
>> it should. This patch corrects this problem, and passes all ld
>> regression tests on athlon-pc-linux-gnu. Ok to install?
> OK, except for this style nit.
Thanks, here's what I'm checking in:
Index: ld/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* ldlang.c (walk_wild_section): Exclude object file if enclosing
archive is excluded.
Index: ld/ldlang.c
===================================================================
RCS file: /cvs/src/src/ld/ldlang.c,v
retrieving revision 1.69
diff -u -p -r1.69 ldlang.c
--- ld/ldlang.c 2001/12/18 12:15:35 1.69
+++ ld/ldlang.c 2002/01/08 14:54:43
@@ -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.
@@ -269,6 +269,21 @@ walk_wild_section (ptr, file, callback,
skip = fnmatch (list_tmp->name, file->filename, 0) == 0;
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;
--
Alexandre Oliva Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer aoliva@{cygnus.com, redhat.com}
CS PhD student at IC-Unicamp oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist *Please* write to mailing lists, not to me