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

!178 Fix gold linker relocation offset and linker adrp signed shift

Browse Source 
From: @dguangya 
Reviewed-by: @li-yancheng 
Signed-off-by: @li-yancheng
This commit is contained in:
openeuler-ci-bot 2023-04-20 06:27:49 +00:00 committed by Gitee
commit dd059ae0b5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 72 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
Fix-gold-relocation-offset-and-adrp-signed-shife.patch Normal file
View File

@ -0,0 +1,64 @@
From e1184ff4d698dbb7eb06e2b3a25ccdc12acfa5fb Mon Sep 17 00:00:00 2001
From: wangding <wangding16@huawei.com>
Date: Wed, 8 Jun 2022 20:19:34 +0800
Subject: [PATCH] Fix gold linker relocation offset
---
gold/aarch64.cc | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gold/aarch64.cc b/gold/aarch64.cc
index 07abe44931f..05d40a383e0 100644
--- a/gold/aarch64.cc
+++ b/gold/aarch64.cc
@@ -2915,6 +2915,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),
@@ -8285,6 +8286,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,
diff --git a/gold/aarch64.cc b/gold/aarch64.cc
index 9f3af466..521908ff 100644
--- a/gold/aarch64.cc
+++ b/gold/aarch64.cc
@@ -1182,7 +1182,7 @@ class Reloc_stub : public Stub_base<size, big_endian>
aarch64_valid_for_adrp_p(AArch64_address location, AArch64_address dest)
{
typedef AArch64_relocate_functions<size, big_endian> Reloc;
- int64_t adrp_imm = (Reloc::Page(dest) - Reloc::Page(location)) >> 12;
+ int64_t adrp_imm = ((int64_t)(Reloc::Page(dest) - Reloc::Page(location))) >> 12;
return adrp_imm >= MIN_ADRP_IMM && adrp_imm <= MAX_ADRP_IMM;
}
--
2.26.0

9
binutils.spec
View File

@ -1,7 +1,7 @@
Summary: Binary utilities
Name: binutils
Version: 2.37
Release: 14
Release: 15
License: GPLv3+
URL: https://sourceware.org/binutils
@ -72,6 +72,7 @@ Patch46: backport-don-t-over-align-file-positions-of-PE-executable-sec.patch
Patch47: backport-PR28186-SEGV-elf.c-7991-30-in-_bfd_elf_fixup_group_sections.patch
Patch48: backport-PR28422-build_id-use-after-free.patch
Patch49: backport-PR28540-segmentation-fault-on-NULL-byte_get.patch
Patch50: Fix-gold-relocation-offset-and-adrp-signed-shife.patch
Provides: bundled(libiberty)
@ -396,6 +397,12 @@ fi
%{_infodir}/bfd*info*
%changelog
* Thu Apr 20 2023 dingguangya <dingguangya1@huawei.com> - 2.37-15
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Fix gold linker relocation offset
* Mon Oct 24 2022 huyubiao <huyubiao@huawei.com> - 2.37-14
- DESC:Prevents the use of null pointers and sets the pointer to null after being used.