Fix emit-relocs for aarch64 gold

Message ID 20230918105332.2682211-1-och95@yandex.ru
State Committed
Headers
Series Fix emit-relocs for aarch64 gold |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_binutils_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_binutils_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_binutils_check--master-arm success Testing passed

Commit Message

Vladislav Khmelevsky Sept. 18, 2023, 10:53 a.m. UTC
  Fix relocation offsets values for the relaxed input sections the same
way it was fixed for the sections in PR21430.
---
 gold/aarch64.cc | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
  

Patch

diff --git a/gold/aarch64.cc b/gold/aarch64.cc
index 46a278bd466..b199fac2af7 100644
--- a/gold/aarch64.cc
+++ b/gold/aarch64.cc
@@ -2916,6 +2916,7 @@  class Target_aarch64 : public Sized_target<size, big_endian>
 			Section_id_hash> AArch64_input_section_map;
   typedef AArch64_insn_utilities<big_endian> Insn_utilities;
   const static int TCB_SIZE = size / 8 * 2;
+  static const Address invalid_address = static_cast<Address> (-1);
 
   Target_aarch64(const Target::Target_info* info = &aarch64_info)
     : Sized_target<size, big_endian>(info),
@@ -8286,6 +8287,27 @@  Target_aarch64<size, big_endian>::relocate_relocs(
 
   gold_assert(sh_type == elfcpp::SHT_RELA);
 
+  if (offset_in_output_section == this->invalid_address)
+    {
+      const Output_relaxed_input_section *poris
+          = output_section->find_relaxed_input_section (relinfo->object,
+                                                        relinfo->data_shndx);
+      if (poris != NULL)
+        {
+          Address section_address = poris->address ();
+          section_size_type section_size = poris->data_size ();
+
+          gold_assert ((section_address >= view_address)
+                       && ((section_address + section_size)
+                           <= (view_address + view_size)));
+
+          off_t offset = section_address - view_address;
+          view += offset;
+          view_address += offset;
+          view_size = section_size;
+        }
+    }
+
   gold::relocate_relocs<size, big_endian, Classify_reloc>(
     relinfo,
     prelocs,