section-select: Fix exclude-file-3
this testcase wasn't correctly testing everything, it passed, even
though sections from an excluded file were included. Fixing this
reveals a problem in the new section selector. This fixes that as
well.
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 2dfc420..d873adb 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -422,6 +422,10 @@
return;
}
+ /* If filename is excluded we're done. */
+ if (walk_wild_file_in_exclude_list (ptr->exclude_name_list, file))
+ return;
+
/* Check section name against each wildcard spec. If there's no
wildcard all sections match. */
sec = ptr->section_list;
@@ -920,9 +924,6 @@
LANG_FOR_EACH_INPUT_STATEMENT (f)
{
//printf("XXX %s\n", f->filename);
- /* XXX if (walk_wild_file_in_exclude_list (s->exclude_name_list, f))
- return;*/
-
if (f->the_bfd == NULL
|| !bfd_check_format (f->the_bfd, bfd_archive))
resolve_wild_sections (f);
diff --git a/ld/testsuite/ld-scripts/exclude-file-3.map b/ld/testsuite/ld-scripts/exclude-file-3.map
index 389d170..2551820 100644
--- a/ld/testsuite/ld-scripts/exclude-file-3.map
+++ b/ld/testsuite/ld-scripts/exclude-file-3.map
@@ -3,5 +3,7 @@
EXCLUDE_FILE\(\*-b\.o\) \*\(\.data \.data\.\*\)
\.data +0x[0-9a-f]+ +0x[0-9a-f]+ tmpdir/exclude-file-a\.o
\.data\.1 +0x[0-9a-f]+ +0x[0-9a-f]+ tmpdir/exclude-file-a\.o
+#failif
+.*data +0x[0-9a-f]+ +0x[0-9a-f]+ .*exclude-file-b.*
-#...
\ No newline at end of file
+#...
