diff --git a/binutils-riscv-testsuite-fixes.patch b/binutils-riscv-testsuite-fixes.patch index 1d9f7f6..49c6fca 100644 --- a/binutils-riscv-testsuite-fixes.patch +++ b/binutils-riscv-testsuite-fixes.patch @@ -20,7 +20,7 @@ diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d binutils-2.40/ 0+[0-9a-f]+ <_start>: -.*:[ ]+[0-9a-f]+[ ]+addi[ ]+a0,a0,[0-9]+ -+.*:[ ]+[0-9a-f]+[ ]+addi[ ]+a0,a0,\-[0-9]+ ++.*:[ ]+[0-9a-f]+[ ]+addi[ ]+a0,a0,.* .*:[ ]+[0-9a-f]+[ ]+jal[ ]+ra,[0-9a-f]+ <_start> .*:[ ]+[0-9a-f]+[ ]+addi[ ]+a1,gp,\-[0-9]+ # [0-9a-f]+ .*:[ ]+[0-9a-f]+[ ]+addi[ ]+a2,gp,\-[0-9]+ # [0-9a-f]+ @@ -32,7 +32,7 @@ diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-02.d binutils-2.40/ .*:[ ]+[0-9a-f]+[ ]+auipc[ ]+a1.* .*:[ ]+[0-9a-f]+[ ]+addi?[ ]+a0,gp.* -.*:[ ]+[0-9a-f]+[ ]+addi?[ ]+a1,a1.* -+.*:[ ]+[0-9a-f]+[ ]+mv[ ]+a1,a1 ++.*:[ ]+[0-9a-f]+[ ]+.* #pass diff -rup binutils.orig/ld/testsuite/ld-riscv-elf/pcrel-lo-addend-2a.d binutils-2.40/ld/testsuite/ld-riscv-elf/pcrel-lo-addend-2a.d --- binutils.orig/ld/testsuite/ld-riscv-elf/pcrel-lo-addend-2a.d 2023-02-16 10:11:38.659875285 +0000 @@ -115,11 +115,11 @@ diff -rup binutils.orig/ld/testsuite/ld-elf/tls.exp binutils-2.40/ld/testsuite/l 0+[0-9a-f]+ <_start>: -.*:[ ]+[0-9a-f]+[ ]+addi[ ]+a0,a0,[0-9]+ -+.*:[ ]+[0-9a-f]+[ ]+addi[ ]+a0,a0,\-[0-9]+ ++.*:[ ]+[0-9a-f]+[ ]+addi[ ]+a0,a0,.* .*:[ ]+[0-9a-f]+[ ]+jal[ ]+ra,[0-9a-f]+ <_start> .*:[ ]+[0-9a-f]+[ ]+auipc[ ]+a1,0x[0-9a-f]+ -.*:[ ]+[0-9a-f]+[ ]+addi[ ]+a1,a1,[0-9]+ # [0-9a-f]+ -+.*:[ ]+[0-9a-f]+[ ]+addi[ ]+a1,a1,\-[0-9]+ # [0-9a-f]+ ++.*:[ ]+[0-9a-f]+[ ]+addi[ ]+a1,a1,.* .*:[ ]+[0-9a-f]+[ ]+lui[ ]+a2,0x[0-9a-f]+ .*:[ ]+[0-9a-f]+[ ]+addi[ ]+a2,a2,[0-9]+ # [0-9a-f]+ .*:[ ]+[0-9a-f]+[ ]+addi[ ]+a3,tp,0 # 0 diff --git a/binutils.spec b/binutils.spec index a463324..a1df351 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: 53%{?dist}.alma.1 +Release: 54%{?dist}.alma.1 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 @@ -77,8 +77,8 @@ URL: https://sourceware.org/binutils # configurable in case there is ever a need to disable thread support. %define enable_threading 1 -# Enable the use of separate code and data segments for all architectures, -# not just x86/x86_64. +# Separate code is disabled on all architectures by default. Individual +# packages can decide to enable it if they want to. %define enable_separate_code 0 #----End of Configure Options------------------------------------------------ @@ -406,6 +406,10 @@ Provides: bundled(libiberty) # Perl, sed and touch are all used in the %%prep section of this spec file. BuildRequires: autoconf, automake, perl, sed, coreutils, make +# bison is used to generate either gold/yyscript.c or ld/ldgram.c depending +# on the build architecture. +BuildRequires: bison + %if %{with clang} BuildRequires: clang compiler-rt %else @@ -413,8 +417,8 @@ BuildRequires: gcc %endif %if %{with gold} -# Gold needs bison in order to build gold/yyscript.c. The GOLD testsuite needs a static libc++ -BuildRequires: bison, m4, gcc-c++, libstdc++-static +# The GOLD testsuite needs a static libc++ +BuildRequires: libstdc++-static %if ! %{with clang} BuildRequires: gcc-c++ @@ -1429,12 +1433,16 @@ exit 0 #---------------------------------------------------------------------------- %changelog -* Tue Mar 25 2025 Andrew Lukoshko - 2.41-53.alma.1 +* Wed Apr 09 2025 Andrew Lukoshko - 2.41-54.alma.1 - Add bison to BuildRequires for RISC-V - Disable LTO for RISC-V - Disable testsuite for RISC-V - Add basic support for RISC-V 64-bit EFI objects (backported from 2.44) +* 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) + * Fri Feb 07 2025 Nick Clifton - 2.41-53 - Fix seg-fault in AArch64 linker when building u-boot. (RHEL-78233)