From 5e3027f14bc73649edd5bb634e534aad9871894a Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Wed, 9 Apr 2025 19:23:22 +0200 Subject: [PATCH 1/2] Further clean up BuildRequires Earlier commit 6171205299fe has made the BuildRequires on bison unconditional, but failed to remove one remaining instance which was intended specifically for gprofng and is clearly no longer necessary. Finish cleaning things up. Related: RHEL-85855 Signed-off-by: Andrea Bolognani --- binutils.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/binutils.spec b/binutils.spec index 443428a..9ff51a3 100644 --- a/binutils.spec +++ b/binutils.spec @@ -550,7 +550,6 @@ linker, and it may become deprecated in the future. Summary: Next Generating code profiling tool Provides: gprofng = %{version}-%{release} Requires: binutils = %{version}-%{release} -BuildRequires: bison %description gprofng GprofNG is the GNU Next Generation Profiler for analyzing the performance From c9d315d84905f7b4bb598259863928a446feef96 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 15 Apr 2025 15:36:10 +0100 Subject: [PATCH 2/2] Adds z17 as a cpu name for the s390x architecture. Resolves: RHEL-87215 --- binutils-s390-z17-cpu-name.patch | 63 ++++++++++++++++++++++++++++++++ binutils.spec | 9 ++++- 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 binutils-s390-z17-cpu-name.patch diff --git a/binutils-s390-z17-cpu-name.patch b/binutils-s390-z17-cpu-name.patch new file mode 100644 index 0000000..80e7602 --- /dev/null +++ b/binutils-s390-z17-cpu-name.patch @@ -0,0 +1,63 @@ +diff -rup binutils.orig/gas/config/tc-s390.c binutils-2.41/gas/config/tc-s390.c +--- binutils.orig/gas/config/tc-s390.c 2025-04-15 15:07:06.478139437 +0100 ++++ binutils-2.41/gas/config/tc-s390.c 2025-04-15 15:07:25.647687210 +0100 +@@ -295,7 +295,7 @@ s390_parse_cpu (const char *arg, + S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX }, + { STRING_COMMA_LEN ("z16"), STRING_COMMA_LEN ("arch14"), + S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX }, +- { STRING_COMMA_LEN (""), STRING_COMMA_LEN ("arch15"), ++ { STRING_COMMA_LEN ("z17"), STRING_COMMA_LEN ("arch15"), + S390_INSTR_FLAG_HTM | S390_INSTR_FLAG_VX } + }; + static struct +Only in binutils-2.41/gas/config: tc-s390.c.orig +diff -rup binutils.orig/gas/doc/as.texi binutils-2.41/gas/doc/as.texi +--- binutils.orig/gas/doc/as.texi 2025-04-15 15:07:06.488139463 +0100 ++++ binutils-2.41/gas/doc/as.texi 2025-04-15 15:07:25.648222663 +0100 +@@ -1938,7 +1938,8 @@ Specify which s390 processor variant is + @samp{arch6}), @samp{z9-109}, @samp{z9-ec} (or @samp{arch7}), @samp{z10} (or + @samp{arch8}), @samp{z196} (or @samp{arch9}), @samp{zEC12} (or @samp{arch10}), + @samp{z13} (or @samp{arch11}), @samp{z14} (or @samp{arch12}), @samp{z15} +-(or @samp{arch13}), @samp{z16} (or @samp{arch14}), or @samp{arch15}. ++(or @samp{arch13}), @samp{z16} (or @samp{arch14}), or @samp{z17} (or ++@samp{arch15}). + @item -mregnames + @itemx -mno-regnames + Allow or disallow symbolic names for registers. +Only in binutils-2.41/gas/doc: as.texi.orig +diff -rup binutils.orig/gas/doc/c-s390.texi binutils-2.41/gas/doc/c-s390.texi +--- binutils.orig/gas/doc/c-s390.texi 2025-04-15 15:07:06.488139463 +0100 ++++ binutils-2.41/gas/doc/c-s390.texi 2025-04-15 15:07:25.648670969 +0100 +@@ -18,7 +18,8 @@ and eleven chip levels. The architecture + Architecture (ESA) and the newer z/Architecture mode. The chip levels + are g5 (or arch3), g6, z900 (or arch5), z990 (or arch6), z9-109, z9-ec + (or arch7), z10 (or arch8), z196 (or arch9), zEC12 (or arch10), z13 +-(or arch11), z14 (or arch12), z15 (or arch13), z16 (or arch14), or arch15. ++(or arch11), z14 (or arch12), z15 (or arch13), z16 (or arch14), or ++z17 (arch15). + + @menu + * s390 Options:: Command-line Options. +@@ -73,7 +74,7 @@ are recognized: + @code{z14} (or @code{arch12}), + @code{z15} (or @code{arch13}), + @code{z16} (or @code{arch14}), and +-@code{arch15}. ++@code{z17} (or @code{arch15}). + + Assembling an instruction that is not supported on the target + processor results in an error message. +diff -rup binutils.orig/opcodes/s390-mkopc.c binutils-2.41/opcodes/s390-mkopc.c +--- binutils.orig/opcodes/s390-mkopc.c 2025-04-15 15:07:07.711142709 +0100 ++++ binutils-2.41/opcodes/s390-mkopc.c 2025-04-15 15:07:25.648816426 +0100 +@@ -384,7 +384,8 @@ main (void) + else if (strcmp (cpu_string, "z16") == 0 + || strcmp (cpu_string, "arch14") == 0) + min_cpu = S390_OPCODE_ARCH14; +- else if (strcmp (cpu_string, "arch15") == 0) ++ else if (strcmp (cpu_string, "z17") == 0 ++ || strcmp (cpu_string, "arch15") == 0) + min_cpu = S390_OPCODE_ARCH15; + else { + fprintf (stderr, "Couldn't parse cpu string %s\n", cpu_string); +Only in binutils-2.41/opcodes: s390-mkopc.c.orig diff --git a/binutils.spec b/binutils.spec index 443428a..cca56e2 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: 54%{?dist} +Release: 55%{?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 AND LGPL-2.1-or-later AND LGPL-2.0-or-later URL: https://sourceware.org/binutils @@ -375,6 +375,10 @@ Patch58: binutils-Intel-APX-part-1-extra-relocs.patch # Lifetime: Fixed in 2.45 Patch59: binutils-aarch64-small-plt0.patch +# Purpose: Adds z17 as a cpu name for the s390x architecture. +# Lifetime: Fixed in 2.45 +Patch60: binutils-s390-z17-cpu-name.patch + #---------------------------------------------------------------------------- # Purpose: Workaround for an unresolved bug in ppc gcc @@ -1420,6 +1424,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Tue Apr 15 2025 Nick Clifton - 2.41-55 +- Adds z17 as a cpu name for the s390x architecture. (RHEL-87215) + * Wed Apr 02 2025 Andrea Bolognani - 2.41-54 - Fix BuildRequires for non-gold architectures. (RHEL-85855) - Fix RISC-V ld testsuite failures (thanks Nick Clifton). (RHEL-85855)