From fed3b0ee5d1a68d212b6d72207a5c0165faa254a Mon Sep 17 00:00:00 2001
From: wangding16 <wangding16@huawei.com>
Date: Tue, 21 Jun 2022 17:48:54 +0800
Subject: [PATCH] Fix gold linker adrp signed shift

(cherry picked from commit 1b7bfa6d1a9995c096d11f4ba6a7a48a526f3fe1)
---
 Fix-gold-adrp-signed-shift.patch | 25 +++++++++++++++++++++++++
 binutils.spec                    |  9 ++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 Fix-gold-adrp-signed-shift.patch

diff --git a/Fix-gold-adrp-signed-shift.patch b/Fix-gold-adrp-signed-shift.patch
new file mode 100644
index 0000000..c867adb
--- /dev/null
+++ b/Fix-gold-adrp-signed-shift.patch
@@ -0,0 +1,25 @@
+From 9af7a3ae2af6b1b33d214b59b2286fde9ae1f80d Mon Sep 17 00:00:00 2001
+From: wangding16 <wangding16@huawei.com>
+Date: Tue, 21 Jun 2022 17:42:52 +0800
+Subject: [PATCH] Fix gold adrp signed shift
+
+---
+ gold/aarch64.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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.27.0
+
diff --git a/binutils.spec b/binutils.spec
index 0eeac09..a245f21 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -1,7 +1,7 @@
 Summary: Binary utilities
 Name:    binutils
 Version: 2.34
-Release: 20
+Release: 21
 License: GPLv3+
 URL:     https://sourceware.org/binutils
 
@@ -58,6 +58,7 @@ Patch41: backport-CVE-2021-45078.patch
 Patch42: backport-0001-CVE-2021-42574.patch
 Patch43: backport-0002-CVE-2021-42574.patch
 Patch44: Fix-gold-relocation-offset.patch
+Patch45: Fix-gold-adrp-signed-shift.patch
 
 Provides: bundled(libiberty)
 
@@ -336,6 +337,12 @@ fi
 %{_infodir}/bfd*info*
 
 %changelog
+* Tue Jun 21 2022 wangding <wangding16@huawei.com> - 2.34-21
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:Fix gold linker adrp signed shift
+
 * Wed Jun 8 2022 wangding <wangding16@huawei.com> - 2.34-20
 - Type:bugfix
 - ID:NA
-- 
Gitee