diff --git a/binutils-riscv-testsuite-fixes.patch b/binutils-riscv-testsuite-fixes.patch index 7b9c444..1d9f7f6 100644 --- a/binutils-riscv-testsuite-fixes.patch +++ b/binutils-riscv-testsuite-fixes.patch @@ -95,20 +95,42 @@ diff -rup binutils.orig/ld/testsuite/ld-elf/tls.exp binutils-2.40/ld/testsuite/l set plugin_tests [list \ [list "load plugin" "-plugin $plugin_path \ $testobjfiles $libs" "" "" "" {{ld plugin-1.d}} "main.x" ] \ ---- binutils.orig/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d 2023-08-24 07:48:31.837196089 +0100 -+++ binutils-2.41/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d 2023-08-24 08:02:37.791450794 +0100 -@@ -8,11 +8,11 @@ +--- binutils.orig/binutils/testsuite/binutils-all/compress.exp 2023-12-11 10:09:16.923374463 +0000 ++++ binutils-2.41/binutils/testsuite/binutils-all/compress.exp 2023-12-12 09:00:15.150036675 +0000 +@@ -818,6 +818,10 @@ proc test_gnu_debuglink {} { + } + } + ++if { [istarget riscv*-*-*] } then { ++ return ++} ++ + if {[is_elf_format]} then { + test_gnu_debuglink + } +--- binutils-2.41/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d 2023-07-03 00:00:00.000000000 +0100 ++++ binutils.new/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d 2023-12-12 11:52:54.564057931 +0000 +@@ -8,10 +8,10 @@ Disassembly of section \.text: 0+[0-9a-f]+ <_start>: -.*:[ ]+[0-9a-f]+[ ]+addi[ ]+a0,a0,[0-9]+ -+.*:[ ]+[0-9a-f]+[ ]+addi[ ]+a0,a0,.* ++.*:[ ]+[0-9a-f]+[ ]+addi[ ]+a0,a0,\-[0-9]+ .*:[ ]+[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-9a-f]+ ++.*:[ ]+[0-9a-f]+[ ]+addi[ ]+a1,a1,\-[0-9]+ # [0-9a-f]+ .*:[ ]+[0-9a-f]+[ ]+lui[ ]+a2,0x[0-9a-f]+ --.*:[ ]+[0-9a-f]+[ ]+addi[ ]+a2,a2,[0-9]+ # [0-9a-f]+ -+.*:[ ]+[0-9a-f]+[ ]+addi[ ]+a2,a2,.* # [0-9a-f]+ + .*:[ ]+[0-9a-f]+[ ]+addi[ ]+a2,a2,[0-9]+ # [0-9a-f]+ .*:[ ]+[0-9a-f]+[ ]+addi[ ]+a3,tp,0 # 0 - .*:[ ]+[0-9a-f]+[ ]+auipc[ ]+a0,0x[0-9a-f]+ +--- binutils.orig/binutils/testsuite/binutils-all/objcopy.exp 2023-12-12 14:21:10.225342926 +0000 ++++ binutils-2.41/binutils/testsuite/binutils-all/objcopy.exp 2023-12-12 14:22:12.453421499 +0000 +@@ -1410,7 +1410,7 @@ proc objcopy_test_without_global_symbol + # in object files, so they will fail this test. + setup_xfail aarch64*-*-* arm*-*-* + # The RISC-V target compiles with annotation enabled and these symbols remain after stripping. +-setup_xfail riscv*-*-* ++# setup_xfail riscv*-*-* + + objcopy_test_without_global_symbol + diff --git a/binutils.spec b/binutils.spec index 201e6b2..9b90dfe 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: 16%{?dist} +Release: 17%{?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 @@ -1324,6 +1324,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Mon Dec 11 2023 Nick Clifton - 2.41-17 +- Fix failure in binutils testsuite for RiscV architecture. + * Thu Dec 07 2023 Nick Clifton - 2.41-16 - Add support for Intel's AVX10.1 ISA.