From de97bb360366f1e815c3b882f39f4f95fe6f771b Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 1 Nov 2023 17:08:29 +0000 Subject: [PATCH] Allow for x86_64 build environments that use a base ISA of x86-64-v3. Resolves: #2247296 --- binutils-x86-64-v3.patch | 33 +++++++++++++++++++++++++++++++++ binutils.spec | 9 ++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 binutils-x86-64-v3.patch diff --git a/binutils-x86-64-v3.patch b/binutils-x86-64-v3.patch new file mode 100644 index 0000000..a8a07b6 --- /dev/null +++ b/binutils-x86-64-v3.patch @@ -0,0 +1,33 @@ +diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r +index 1bdb47c7b6b..1e4a24c6fbe 100644 +--- a/ld/testsuite/ld-x86-64/property-3.r ++++ b/ld/testsuite/ld-x86-64/property-3.r +@@ -4,5 +4,5 @@ Displaying notes found in: .note.gnu.property + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 + #... +- x86 ISA needed: x86-64-baseline, x86-64-v2 ++ x86 ISA needed: x86-64-baseline, x86-64-v2.* + #pass +diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r +index 8cc618cbfad..031a1d280ad 100644 +--- a/ld/testsuite/ld-x86-64/property-4.r ++++ b/ld/testsuite/ld-x86-64/property-4.r +@@ -4,5 +4,5 @@ Displaying notes found in: .note.gnu.property + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 + #... +- x86 ISA needed: x86-64-baseline, x86-64-v2, x86-64-v4 ++ x86 ISA needed: x86-64-baseline, x86-64-v2,.*x86-64-v4 + #pass +diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r +index e3ba4f659b9..58b274b9772 100644 +--- a/ld/testsuite/ld-x86-64/property-5.r ++++ b/ld/testsuite/ld-x86-64/property-5.r +@@ -4,5 +4,5 @@ Displaying notes found in: .note.gnu.property + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x900000 + #... +- x86 ISA needed: x86-64-baseline, x86-64-v2, x86-64-v4 ++ x86 ISA needed: x86-64-baseline, x86-64-v2,.*x86-64-v4 + #pass diff --git a/binutils.spec b/binutils.spec index c713fea..65c2067 100644 --- a/binutils.spec +++ b/binutils.spec @@ -2,7 +2,7 @@ Summary: A GNU collection of binary utilities Name: binutils%{?_with_debug:-debug} Version: 2.41 -Release: 9%{?dist} +Release: 10%{?dist} 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 LGPL-2.1-or-later AND LGPL-2.0-or-later URL: https://sourceware.org/binutils @@ -274,6 +274,10 @@ Patch20: binutils-execstack-error.patch # Lifetime: Fixed in 2.42 Patch21: binutils-BPF-reloc-4.patch +# Purpose: Allow for x86_64 build environments that use a base ISA of x86-64-v3. +# Lifetime: Fixed in 2.42 +Patch22: binutils-x86-64-v3.patch + #---------------------------------------------------------------------------- Provides: bundled(libiberty) @@ -1279,6 +1283,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Wed Nov 01 2023 Nick Clifton - 2.41-10 +- Allow for x86_64 build environments that use a base ISA of x86-64-v3. (#2247296) + * Mon Oct 30 2023 Nick Clifton - 2.41-9 - Accept and ignore R_BPF_64_NODYLD32 relocations. (#2245296)