packages/binutils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!302 [sync] PR-293: Backport: Fix gold linker relocation offset

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @eastb233 
Signed-off-by: @eastb233
This commit is contained in:
openeuler-ci-bot 2024-09-30 01:37:00 +00:00 committed by Gitee
commit 4adeb9f0e4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Fix-gold-linker-relocation-offset.patch Normal file
View File

@ -0,0 +1,52 @@
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

9
binutils.spec
View File

@ -2,7 +2,7 @@
Summary: A GNU collection of binary utilities
Name: binutils%{?_with_debug:-debug}
Version: 2.41
Release: 9
Release: 10
License: GPL-3.0-or-later AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND BSD-3-Clause AND GFDL-1.3-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later
URL: https://sourceware.org/binutils
@ -229,6 +229,10 @@ Patch5007: binutils-update-linker-manual.patch
# Lifetime: Fixed in 2.42 (maybe)
Patch5008: binutils-gold-empty-dwp.patch
# Purpose: Fix gold linker relocation offset.
# Lifetime: Permanent
Patch5009: Fix-gold-linker-relocation-offset.patch
#----------------------------------------------------------------------------
Provides: bundled(libiberty)
@ -1243,6 +1247,9 @@ exit 0
#----------------------------------------------------------------------------
%changelog
* Thu Sep 26 2024 wangding <wangding16@huawei.com> - 2.41-10
- fix gold linker relocation offset
* Thu Sep 19 2024 huyubiao <huyubiao@huawei.com> - 2.41-9
- add binutils-help to keep consistent with the old version