diff options
| author | Michael Matz <matz@suse.de> | 2022-11-16 16:28:01 +0100 |
|---|---|---|
| committer | Michael Matz <matz@suse.de> | 2022-11-30 17:15:08 +0100 |
| commit | 885d86436c3f9ab0a13f39647860b526faa92cf8 (patch) | |
| tree | fe346537ae1d7719d95c2f08c734a032820db9eb | |
| parent | d7791499120d1ca92775bc63319af3165af30447 (diff) | |
| download | gdb-885d86436c3f9ab0a13f39647860b526faa92cf8.zip gdb-885d86436c3f9ab0a13f39647860b526faa92cf8.tar.gz gdb-885d86436c3f9ab0a13f39647860b526faa92cf8.tar.bz2 | |
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.
| -rw-r--r-- | ld/ldlang.c | 7 | ||||
| -rw-r--r-- | ld/testsuite/ld-scripts/exclude-file-3.map | 4 |
2 files changed, 7 insertions, 4 deletions
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 @@ walk_wild_section_match (lang_wild_statement_type *ptr, 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 @@ resolve_wilds (void) 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 +#... |