From b47289c44f1caee7e4d6f411ae7e39802be92df8 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 7 Aug 2026 08:53:12 +0100 Subject: [PATCH] Linker testsuite tweaks for s390x --- binutils-testsuite-fixes.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/binutils-testsuite-fixes.patch b/binutils-testsuite-fixes.patch index 9eb463e..d26b36b 100644 --- a/binutils-testsuite-fixes.patch +++ b/binutils-testsuite-fixes.patch @@ -1320,3 +1320,27 @@ diff -rup bin.orig/ld/testsuite/ld-x86-64/sframe-pltgot-2.d binutils-2.43.50-55e 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 orig/ld/testsuite/ld-ctf/slice.d binutils-with-gold-2.46/ld/testsuite/ld-ctf/slice.d +--- orig/ld/testsuite/ld-ctf/slice.d 2026-08-07 08:49:10.226259730 +0100 ++++ binutils-with-gold-2.46/ld/testsuite/ld-ctf/slice.d 2026-08-07 08:50:56.082411251 +0100 +@@ -25,9 +25,4 @@ Contents of CTF section .ctf: + #... + 0x[0-9a-f]*: \(kind 6\) struct slices \(size 0x[0-9a-f]*\) \(aligned at 0x[0-9a-f]*\) + *\[0x0\] one: ID 0x[0-9a-f]*: \(kind 1\) int:1 \[slice 0x0:0x1\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\) +- *\[0x1\] two: ID 0x[0-9a-f]*: \(kind 1\) int:2 \[slice 0x0:0x2\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\) +- *\[0x3\] six: ID 0x[0-9a-f]*: \(kind 1\) int:6 \[slice 0x0:0x6\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\) +- *\[0x9\] ten: ID 0x[0-9a-f]*: \(kind 1\) int:10 \[slice 0x0:0xa\] \(format 0x1\) \(size 0x2\) \(aligned at 0x2\) +- *\[0x13\] bar: ID 0x[0-9a-f]*: \(kind 8\) enum foo:1 \[slice 0x0:0x1\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\) +- + #... +diff -rup orig/ld/testsuite/ld-shared/shared.exp binutils-with-gold-2.46/ld/testsuite/ld-shared/shared.exp +--- orig/ld/testsuite/ld-shared/shared.exp 2026-08-07 08:49:10.445371433 +0100 ++++ binutils-with-gold-2.46/ld/testsuite/ld-shared/shared.exp 2026-08-07 08:52:20.820484232 +0100 +@@ -283,6 +283,7 @@ if ![ld_compile "$CC_FOR_TARGET $NOPIE_C + setup_xfail "aarch64*-*-linux*" + # Solaris refuses to map shared objects with non-zero load addresses. + setup_xfail "*-*-solaris2*" ++ setup_xfail "s390x-*-linux*" + shared_test shnp "shared (non PIC, load offset)" \ + mainnp.o sh1np.o sh2np.o shared \ + "-Wl,-T,$srcdir/$subdir/elf-offset.ld,--hash-style=sysv" $NOPIE_LDFLAGS