From: chatham <chatham@sourceware.org>
Date: Tue, 21 Aug 2007 21:29:12 +0000 (+0000)
Subject: Make relative references in linker scripts absolute and update a
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=72a2eed757d46b207f6e127dcc7c5acf848f5872;p=binutils-gdb.git

Make relative references in linker scripts absolute and update a
comment about relocate() being called.
---

diff --git a/gold/script.cc b/gold/script.cc
index f5584d9b01e..44de5518545 100644
--- a/gold/script.cc
+++ b/gold/script.cc
@@ -1141,7 +1141,20 @@ extern "C" void
 script_add_file(void* closurev, const char* name)
 {
   Parser_closure* closure = static_cast<Parser_closure*>(closurev);
-  Input_file_argument file(name, false, closure->position_dependent_options());
+  std::string absname;
+  if (name[0] == '/')
+    {
+      absname = name;
+    }
+  else
+    {
+      // Prepend `dirname closure->filename()` to make the path absolute.
+      char *slash = strrchr(closure->filename(), '/');
+      absname.assign(closure->filename(),
+                     slash ? slash - closure->filename() + 1 : 0);
+      absname += name;
+    }
+  Input_file_argument file(absname.c_str(), false, closure->position_dependent_options());
   closure->inputs()->add_file(file);
 }
 
diff --git a/gold/target-reloc.h b/gold/target-reloc.h
index d282805dbeb..1e9ecd03dcf 100644
--- a/gold/target-reloc.h
+++ b/gold/target-reloc.h
@@ -91,7 +91,7 @@ scan_relocs(
 }
 
 // This function implements the generic part of relocation processing.
-// This is an inline function which take a class whose operator()
+// This is an inline function which take a class whose relocate()
 // implements the machine specific part of relocation.  We do it this
 // way to avoid making a function call for each relocation, and to
 // avoid repeating the generic relocation handling code for each