53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
|
From 3d84bd3df6cd5741b575cb454933a3c414c4a5d5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: wangding16 <wangding16@huawei.com>
|
||
|
|
Date: Sun, 25 Aug 2024 16:51:53 +0800
|
||
|
|
Subject: [PATCH] Fix gold linker relocation offset
|
||
|
|
|
||
|
|
Reference: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=c441a361287ca98aa7a4ac1ff02d12d138b289dc
|
||
|
|
|
||
|
|
---
|
||
|
|
gold/aarch64.cc | 20 ++++++++++++++++++++
|
||
|
|
1 file changed, 20 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/gold/aarch64.cc b/gold/aarch64.cc
|
||
|
|
index 7f95c0cf..6004118a 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,25 @@ 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.23.0
|
||
|
|
|