From: Michael Matz <matz@suse.de>
To: binutils@sourceware.org
Subject: [PATCH 2/8] section-select: Deal with sections added late
Date: Fri, 25 Nov 2022 16:46:41 +0000 (UTC) [thread overview]
Message-ID: <alpine.LSU.2.20.2211251645000.24878@wotan.suse.de> (raw)
In-Reply-To: <cover.1669391757.git.matz@suse.de>
at least the check_relocs callback can add input sections (for
creating an dynamic output relocation section). For those
we need to go through the walk_wild handlers again. For quick
detection of such new sections we export a new bfd function:
bfd_get_max_section_id and remember that one when resolving a wild
statement. Any section whose ->id member is higher than that is new.
---
I keep this patch separate (not quashed into the one before) because it
adds an interface to libbfd, which might be superseded depending on an
answer to patch 4/8. And keeping it )and the reversion in 7/8) separate
makes it easier to throw it out or include it.
bfd/bfd-in2.h | 2 ++
bfd/section.c | 19 +++++++++++++++++++
ld/ldlang.c | 12 +++++++++++-
ld/ldlang.h | 1 +
4 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 0b071dda1e5..5350ae42b03 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1330,6 +1330,8 @@ discarded_section (const asection *sec)
{ 0, NAME, 0, BSF_SECTION_SYM, SECTION }
#endif
+unsigned int bfd_get_max_section_id (void);
+
void bfd_section_list_clear (bfd *);
asection *bfd_get_section_by_name (bfd *abfd, const char *name);
diff --git a/bfd/section.c b/bfd/section.c
index f73e0345e15..d691bf265ab 100644
--- a/bfd/section.c
+++ b/bfd/section.c
@@ -849,6 +849,25 @@ SUBSECTION
These are the functions exported by the section handling part of BFD.
*/
+/*
+FUNCTION
+ bfd_get_max_section_id
+
+SYNOPSIS
+ unsigned int bfd_get_max_section_id (void);
+
+DESCRIPTION
+ Returns an internal number representing the maximum value of
+ any SECTION->id member. Whenever a new section is created that
+ value increases. It never decreases.
+*/
+
+unsigned int
+bfd_get_max_section_id (void)
+{
+ return _bfd_section_id;
+}
+
/*
FUNCTION
bfd_section_list_clear
diff --git a/ld/ldlang.c b/ld/ldlang.c
index c92ebd472f4..1e4f3a5ee05 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -374,6 +374,8 @@ walk_wild_consider_section (lang_wild_statement_type *ptr,
callback_t callback,
void *data)
{
+ if (s->id < ptr->max_section_id)
+ return;
/* Don't process sections from files which were excluded. */
if (walk_wild_file_in_exclude_list (sec->spec.exclude_name_list, file))
return;
@@ -395,6 +397,9 @@ walk_wild_section_general (lang_wild_statement_type *ptr,
for (s = file->the_bfd->sections; s != NULL; s = s->next)
{
+ if (s->id < ptr->max_section_id)
+ continue;
+ //printf ("YYY checking %s:%s\n", s->owner->filename, s->name);
sec = ptr->section_list;
if (sec == NULL)
(*callback) (ptr, sec, s, file, data);
@@ -1139,11 +1144,14 @@ walk_wild (lang_wild_statement_type *s, callback_t callback, void *data)
const char *file_spec = s->filename;
//char *p;
- if (!s->resolved)
+#if 1
+ //if (!s->resolved)
+ if (s->max_section_id < bfd_get_max_section_id ())
{
//printf("XXX %s\n", file_spec ? file_spec : "<null>");
walk_wild_resolve (s);
s->resolved = true;
+ s->max_section_id = bfd_get_max_section_id ();
}
{
@@ -1154,6 +1162,7 @@ walk_wild (lang_wild_statement_type *s, callback_t callback, void *data)
}
return;
}
+#endif
#if 0
if (file_spec == NULL)
@@ -8428,6 +8437,7 @@ lang_add_wild (struct wildcard_spec *filespec,
new_stmt->keep_sections = keep_sections;
lang_list_init (&new_stmt->children);
new_stmt->resolved = false;
+ new_stmt->max_section_id = 0;
lang_list_init (&new_stmt->matching_sections);
analyze_walk_wild_section_handler (new_stmt);
}
diff --git a/ld/ldlang.h b/ld/ldlang.h
index 50ad64ce057..8566e022a57 100644
--- a/ld/ldlang.h
+++ b/ld/ldlang.h
@@ -400,6 +400,7 @@ struct lang_wild_statement_struct
struct name_list *exclude_name_list;
lang_statement_list_type matching_sections;
bool resolved;
+ unsigned int max_section_id;
walk_wild_section_handler_t walk_wild_section_handler;
struct wildcard_list *handler_data[4];
--
2.36.1
next prev parent reply other threads:[~2022-11-25 16:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1669391757.git.matz@suse.de>
2022-11-25 16:44 ` [PATCH 1/8] section-select: Lazily resolve section matches Michael Matz
2022-11-25 16:46 ` Michael Matz [this message]
2022-11-25 16:47 ` [PATCH 3/8] section-select: Implement a prefix-tree Michael Matz
2022-11-25 16:55 ` [PATCH 4/8] section-select: Completely rebuild matches Michael Matz
2022-11-28 1:57 ` Alan Modra
2022-11-28 14:24 ` Michael Matz
2022-11-29 12:22 ` Alan Modra
2022-11-29 13:23 ` Michael Matz
2022-11-25 16:55 ` [PATCH 5/8] section-select: Remove unused code Michael Matz
2022-11-25 16:55 ` [PATCH 6/8] section-select: Cleanup Michael Matz
2022-11-25 16:57 ` [PATCH 7/8] section-select: Remove bfd_max_section_id again Michael Matz
2022-11-25 16:58 ` [PATCH 8/8] section-select: Fix exclude-file-3 Michael Matz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LSU.2.20.2211251645000.24878@wotan.suse.de \
--to=matz@suse.de \
--cc=binutils@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).