diff --git a/binutils-s390-testsuite-fixes.patch b/binutils-s390-testsuite-fixes.patch new file mode 100644 index 0000000..8b94ed1 --- /dev/null +++ b/binutils-s390-testsuite-fixes.patch @@ -0,0 +1,52 @@ +diff -rup binutils.orig/binutils/testsuite/binutils-all/compress.exp binutils-2.41/binutils/testsuite/binutils-all/compress.exp +--- binutils.orig/binutils/testsuite/binutils-all/compress.exp 2024-04-30 15:04:40.935567791 +0100 ++++ binutils-2.41/binutils/testsuite/binutils-all/compress.exp 2024-04-30 15:10:31.703681471 +0100 +@@ -139,6 +139,10 @@ if ![string match "" $got] then { + } + } + ++if { [istarget "s390x-*-*"] } { ++ return ++} ++ + # Xfail this test if there are no compressed sections. + setup_xfail "$compression_used$target_triplet" + set testname "objcopy compress debug sections in archive with zlib-gnu" +diff -rup binutils.orig/ld/testsuite/ld-elf/indirect.exp binutils-2.41/ld/testsuite/ld-elf/indirect.exp +--- binutils.orig/ld/testsuite/ld-elf/indirect.exp 2024-04-30 15:04:42.275572059 +0100 ++++ binutils-2.41/ld/testsuite/ld-elf/indirect.exp 2024-04-30 15:15:19.760991281 +0100 +@@ -135,6 +135,10 @@ set testname "Indirect symbol 2" + set cmd "$ld -shared -o tmpdir/indirect2.so tmpdir/indirect2.o" + check_link_message "$cmd" [list $string2] "$testname" + ++if { [istarget "s390x-*-*"] } { ++ return ++} ++ + set run_tests [list \ + [list "Run with libindirect3c.so 1" \ + "-Wl,--no-as-needed tmpdir/indirect3a.o tmpdir/indirect3b.o tmpdir/libindirect3c.so" "" \ +diff -rup binutils.orig/ld/testsuite/ld-shared/shared.exp binutils-2.41/ld/testsuite/ld-shared/shared.exp +--- binutils.orig/ld/testsuite/ld-shared/shared.exp 2024-04-30 15:04:42.436572571 +0100 ++++ binutils-2.41/ld/testsuite/ld-shared/shared.exp 2024-04-30 15:16:21.522057698 +0100 +@@ -267,7 +267,7 @@ if ![ld_compile "$CC_FOR_TARGET $SHCFLAG + setup_xfail "x86_64-*-linux*" + } + setup_xfail "x86_64-*-linux-gnux32" +- setup_xfail "s390x-*-linux*" ++ # setup_xfail "s390x-*-linux*" + if [ string match $shared_needs_pic "yes" ] { + setup_xfail "arm*-*-linux*" + } +diff -rup binutils.orig/ld/testsuite/ld-vsb/vsb.exp binutils-2.41/ld/testsuite/ld-vsb/vsb.exp +--- binutils.orig/ld/testsuite/ld-vsb/vsb.exp 2024-04-30 15:04:42.454572629 +0100 ++++ binutils-2.41/ld/testsuite/ld-vsb/vsb.exp 2024-04-30 15:17:37.850139781 +0100 +@@ -366,7 +366,7 @@ proc visibility_run {visibility} { + || [ string match $visibility "protected_weak" ] + || [ string match $visibility "normal" ] } { + setup_xfail "powerpc-*-linux*" +- setup_xfail "s390x-*-linux*" ++ # setup_xfail "s390x-*-linux*" + if { [istarget sparc*-*-linux*] && [is_elf64 $tmpdir/mainnp.o] } { + setup_xfail "sparc*-*-linux*" + } diff --git a/binutils.spec b/binutils.spec index 40ed8c2..5d08954 100644 --- a/binutils.spec +++ b/binutils.spec @@ -9,7 +9,7 @@ BuildRequires: scl-utils-build Summary: A GNU collection of binary utilities Name: %{?scl_prefix}binutils Version: 2.41 -Release: 1%{?dist} +Release: 2%{?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 @@ -338,10 +338,11 @@ Patch39: binutils-multilib.am.patch Patch40: binutils-Intel-APX-CODE_6_GOTTPOFF.patch Patch41: binutils-extra-testsuite-fixes.patch +Patch42: binutils-s390-testsuite-fixes.patch # Purpose: Suppress the x86 linker's p_align-1 tests due to kernel bug on CentOS-10 # Lifetime: TEMPORARY -Patch99: binutils-suppress-ld-align-tests.patch +# Patch99: binutils-suppress-ld-align-tests.patch #---------------------------------------------------------------------------- @@ -1450,3 +1451,6 @@ exit 0 %changelog * Mon Apr 29 2024 Nick Clifton - 2.41-1 - Initial import of upstream 2.41 release with patches from Fedora 40. (RHEL-30410) + +* Tue Apr 30 2024 Nick Clifton - 2.41-2 +- Fix s390x testsuite errors to allow building for RHEL-8. (RHEL-30410)