From: Thomas Weißschuh <thomas@t-8ch.de>
Date: Thu, 21 Sep 2023 06:03:09 +0000 (+0200)
Subject: ld: write resolved path to included file to dependency-file
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0ad14a8c34c866f64271041cb69b0e8a05913de8;p=binutils-gdb.git

ld: write resolved path to included file to dependency-file

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>
---

diff --git a/ld/ldfile.c b/ld/ldfile.c
index df7c9cbd65e..8f869c1f19e 100644
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -743,7 +743,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)
     {
@@ -925,8 +928,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;