* ldlang.c (walk_wild_section): Move sec == NULL case out of loop.

This commit is contained in:
Alan Modra 2001-11-20 15:31:10 +00:00
parent ca0b584738
commit 2181f54fd8
2 changed files with 33 additions and 32 deletions

View File

@ -1,8 +1,12 @@
2001-11-21 Alan Modra <amodra@bigpond.net.au>
* ldlang.c (walk_wild_section): Move sec == NULL case out of loop.
2001-11-20 Angela Marie Thomas <angela@redhat.com>
* emultempl/elf32.em (gld${EMULATION_NAME}_finish): Use NULL instead
of false when calling lang_size_sections.
(hppaelf_layout_sections_again): Likewise.
of false when calling lang_size_sections.
* emultempl/hppaelf.em (hppaelf_layout_sections_again): Likewise.
2001-11-15 Alan Modra <amodra@bigpond.net.au>
@ -56,7 +60,7 @@ Tue Nov 13 11:27:14 2001 Ross Alexander <ross.alexander@uk.neceur.com>
* configure.tgt (mips*el-*-netbsd*, mips*-*-netbsd*):
Add support for targets.
2001-11-02 Nick Clifton <nickc@cambridge.redhat.com>
* configure.in (ALL_LINGUAS): Add "fr" and "sv"
@ -68,7 +72,7 @@ Tue Nov 13 11:27:14 2001 Ross Alexander <ross.alexander@uk.neceur.com>
* configure.tgt (sh-*-linux): Set targ_emul, targ_extra_emuls
as little endian default and to support big endian.
2001-11-01 Chris Demetriou <cgd@broadcom.com>
* ld.texinfo (Options): Document new option, -nostdlib.

View File

@ -251,47 +251,44 @@ walk_wild_section (ptr, file, callback, data)
struct wildcard_list *sec;
sec = ptr->section_list;
do
if (sec == NULL)
(*callback) (ptr, sec, s, file, data);
while (sec != NULL)
{
boolean skip = false;
struct name_list *list_tmp;
if (sec != NULL)
/* Don't process sections from files which were
excluded. */
for (list_tmp = sec->spec.exclude_name_list;
list_tmp;
list_tmp = list_tmp->next)
{
struct name_list *list_tmp;
if (wildcardp (list_tmp->name))
skip = fnmatch (list_tmp->name, file->filename, 0) == 0;
else
skip = strcmp (list_tmp->name, file->filename) == 0;
/* Don't process sections from files which were
excluded. */
for (list_tmp = sec->spec.exclude_name_list;
list_tmp;
list_tmp = list_tmp->next)
{
if (wildcardp (list_tmp->name))
skip = fnmatch (list_tmp->name, file->filename, 0) == 0;
else
skip = strcmp (list_tmp->name, file->filename) == 0;
if (skip)
break;
}
if (skip)
break;
}
if (!skip && sec->spec.name != NULL)
{
const char *sname = bfd_get_section_name (file->the_bfd, s);
if (!skip && sec->spec.name != NULL)
{
const char *sname = bfd_get_section_name (file->the_bfd, s);
if (wildcardp (sec->spec.name))
skip = fnmatch (sec->spec.name, sname, 0) != 0;
else
skip = strcmp (sec->spec.name, sname) != 0;
}
if (wildcardp (sec->spec.name))
skip = fnmatch (sec->spec.name, sname, 0) != 0;
else
skip = strcmp (sec->spec.name, sname) != 0;
}
if (!skip)
(*callback) (ptr, sec, s, file, data);
if (sec != NULL)
sec = sec->next;
sec = sec->next;
}
while (sec != NULL);
}
}