From: "Thomas Weißschuh" <thomas@t-8ch.de>
To: binutils@sourceware.org
Cc: "Thomas Weißschuh" <thomas@t-8ch.de>,
"Jan Beulich" <jbeulich@suse.com>,
"Alan Modra" <amodra@gmail.com>
Subject: [PATCH v3] ld: write resolved path to included file to dependency-file
Date: Mon, 18 Sep 2023 21:42:23 +0200 [thread overview]
Message-ID: <20230918194226.1200853-1-thomas@t-8ch.de> (raw)
In ldfile_open_command_file_1() name written to the dependency files is
the name as specified passed to the "INCLUDE" directive.
This is before include-path processing so the tracked dependency
location is most likely wrong.
Instead track the opened file at the point where the resolved path is
actually available, in try_open().
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
---
v2: https://sourceware.org/pipermail/binutils/2023-September/129503.html
v2 -> v3:
* drop "write absolute paths to dependencies"
* fix code style in conditional
v1: https://sourceware.org/pipermail/binutils/2023-September/129475.html
v1 -> v2:
* push call to track_dependencies() into try_open() to catch all
dependencies
* sign-off commits
* write absolute paths to dependencies
ld/ldfile.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/ld/ldfile.c b/ld/ldfile.c
index b8fd4e5d8e0a..d73e251402c8 100644
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -529,7 +529,10 @@ try_open (const char *name, bool *sysrooted)
result = fopen (name, "r");
if (result != NULL)
- *sysrooted = is_sysrooted_pathname (name);
+ {
+ *sysrooted = is_sysrooted_pathname (name);
+ track_dependency_files (name);
+ }
if (verbose)
{
@@ -711,8 +714,6 @@ ldfile_open_command_file_1 (const char *name, enum script_open_style open_how)
return;
}
- track_dependency_files (name);
-
lex_push_file (ldlex_input_stack, name, sysrooted);
lineno = 1;
base-commit: 95ebc6fdec5780bf59685739cdd55cd41d0f55ac
--
2.42.0
next reply other threads:[~2023-09-18 19:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-18 19:42 Thomas Weißschuh [this message]
2023-09-21 6:03 ` Jan Beulich
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=20230918194226.1200853-1-thomas@t-8ch.de \
--to=thomas@t-8ch.de \
--cc=amodra@gmail.com \
--cc=binutils@sourceware.org \
--cc=jbeulich@suse.com \
/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).