From e9b11ea24ba6b9288acdccef1095ba96d00f2208 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Mon, 24 Mar 2025 16:15:46 +0100 Subject: [PATCH] Fix RISC-V ld testsuite failures The changes are the same as in Fedora commit a8edbcb25591 except adapted to work for the older version of binutils used in RHEL. Resolves: RHEL-85855 Thanks: Nick Clifton Signed-off-by: Andrea Bolognani --- binutils-riscv-testsuite-fixes.patch | 8 ++++---- binutils.spec | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) 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 2b35208..443428a 100644 --- a/binutils.spec +++ b/binutils.spec @@ -1422,6 +1422,7 @@ exit 0 %changelog * 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)