* [PATCH] ld: write full path to included file to dependency-file
@ 2023-09-14 6:42 Thomas Weißschuh
2023-09-16 8:20 ` Alan Modra
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Weißschuh @ 2023-09-14 6:42 UTC (permalink / raw)
To: binutils; +Cc: Thomas Weißschuh
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 full path is
actually available, in ldfile_find_command_file().
---
ld/ldfile.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ld/ldfile.c b/ld/ldfile.c
index b8fd4e5d8e0a..56b221c25d68 100644
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -643,6 +643,8 @@ ldfile_find_command_file (const char *name,
{
path = concat (search->name, slash, name, (const char *) NULL);
result = try_open (path, sysrooted);
+ if (result)
+ track_dependency_files (path);
free (path);
if (result)
break;
@@ -711,8 +713,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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] ld: write full path to included file to dependency-file
2023-09-14 6:42 [PATCH] ld: write full path to included file to dependency-file Thomas Weißschuh
@ 2023-09-16 8:20 ` Alan Modra
0 siblings, 0 replies; 2+ messages in thread
From: Alan Modra @ 2023-09-16 8:20 UTC (permalink / raw)
To: Thomas Weißschuh; +Cc: binutils
On Thu, Sep 14, 2023 at 08:42:27AM +0200, Thomas Weißschuh wrote:
> 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 full path is
> actually available, in ldfile_find_command_file().
This patch is incomplete. ldfile_find_command_file possibly opens a
file in two places.
> ---
> ld/ldfile.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/ld/ldfile.c b/ld/ldfile.c
> index b8fd4e5d8e0a..56b221c25d68 100644
> --- a/ld/ldfile.c
> +++ b/ld/ldfile.c
> @@ -643,6 +643,8 @@ ldfile_find_command_file (const char *name,
> {
> path = concat (search->name, slash, name, (const char *) NULL);
> result = try_open (path, sysrooted);
> + if (result)
> + track_dependency_files (path);
> free (path);
> if (result)
> break;
> @@ -711,8 +713,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
--
Alan Modra
Australia Development Lab, IBM
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-16 8:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-14 6:42 [PATCH] ld: write full path to included file to dependency-file Thomas Weißschuh
2023-09-16 8:20 ` Alan Modra
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).