public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
From: Vladislav Khmelevsky <och95@yandex.ru>
To: binutils@sourceware.org, ccoutant@gmail.com, ikudrin@accesssoftek.com
Cc: Vladislav Khmelevsky <och95@yandex.ru>
Subject: [PATCH] Fix emit-relocs for aarch64 gold
Date: Tue, 24 Jan 2023 17:36:41 +0400	[thread overview]
Message-ID: <20230124133641.258195-1-och95@yandex.ru> (raw)

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(+)

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


             reply	other threads:[~2023-01-24 13:36 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-24 13:36 Vladislav Khmelevsky [this message]
2023-03-13 10:22 Vladislav Khmelevsky
2023-04-23 17:30 Vladislav Khmelevsky
2023-09-18 10:53 Vladislav Khmelevsky
2023-11-08 16:26 Vladislav Khmelevsky
2023-11-08 16:36 ` Vladislav Khmelevsky
2023-11-13  8:15   ` Dmitry Selyutin
2023-11-16 10:35     ` Alan Modra
2023-11-16 15:35       ` Vladislav Khmelevsky

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=20230124133641.258195-1-och95@yandex.ru \
    --to=och95@yandex.ru \
    --cc=binutils@sourceware.org \
    --cc=ccoutant@gmail.com \
    --cc=ikudrin@accesssoftek.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).