gcc-toolset-15-binutils/SOURCES/binutils-extra-testsuite-fixes.patch
2025-11-12 07:18:47 +00:00

147 lines
7.4 KiB
Diff

diff -rup binutils.orig/binutils/testsuite/binutils-all/compress.exp binutils-with-gold-2.44/binutils/testsuite/binutils-all/compress.exp
--- binutils.orig/binutils/testsuite/binutils-all/compress.exp 2025-04-15 14:24:46.257868845 +0100
+++ binutils-with-gold-2.44/binutils/testsuite/binutils-all/compress.exp 2025-04-15 14:25:27.994757009 +0100
@@ -143,6 +143,10 @@ if { [istarget "s390*-*-*"] } then {
return
}
+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"
Only in binutils-with-gold-2.44/binutils/testsuite/binutils-all: compress.exp.orig
diff -rup binutils.orig/binutils/testsuite/binutils-all/objcopy.exp binutils-with-gold-2.44/binutils/testsuite/binutils-all/objcopy.exp
--- binutils.orig/binutils/testsuite/binutils-all/objcopy.exp 2025-04-15 14:24:46.257868845 +0100
+++ binutils-with-gold-2.44/binutils/testsuite/binutils-all/objcopy.exp 2025-04-15 14:25:21.331457046 +0100
@@ -1105,7 +1105,7 @@ switch [copy_setup] {
"$OBJCOPY" "$OBJCOPYFLAGS" "$test5"
if [is_elf_format] {
keep_debug_symbols_and_check_links "$STRIP" "--only-keep-debug $STRIPFLAGS" "$test6"
- keep_debug_symbols_for_elf_relocatable "$STRIP" "--only-keep-debug $STRIPFLAGS" "$test7"
+ # keep_debug_symbols_for_elf_relocatable "$STRIP" "--only-keep-debug $STRIPFLAGS" "$test7"
}
}
"0" {
@@ -1116,7 +1116,7 @@ switch [copy_setup] {
"$OBJCOPY" "$OBJCOPYFLAGS" "$test5"
if [is_elf_format] {
keep_debug_symbols_and_check_links "$STRIP" "--only-keep-debug $STRIPFLAGS" "$test6"
- keep_debug_symbols_for_elf_relocatable "$STRIP" "--only-keep-debug $STRIPFLAGS" "$test7"
+ # keep_debug_symbols_for_elf_relocatable "$STRIP" "--only-keep-debug $STRIPFLAGS" "$test7"
}
}
}
@@ -1414,11 +1414,10 @@ proc objcopy_test_without_global_symbol
# The AArch64 and ARM targets preserve mapping symbols
# in object files, so they will fail this test.
-setup_xfail aarch64*-*-* arm*-*-*
+# setup_xfail aarch64*-*-* arm*-*-*
# The RISC-V target compiles with annotation enabled and these symbols remain after stripping.
# setup_xfail riscv*-*-*
-
-objcopy_test_without_global_symbol
+# objcopy_test_without_global_symbol
# objcopy remove relocation from executable test
Only in binutils-with-gold-2.44/binutils/testsuite/binutils-all: objcopy.exp.orig
diff -rup binutils.orig/ld/testsuite/ld-ctf/slice.d binutils-with-gold-2.44/ld/testsuite/ld-ctf/slice.d
--- binutils.orig/ld/testsuite/ld-ctf/slice.d 2025-04-15 14:24:47.726871383 +0100
+++ binutils-with-gold-2.44/ld/testsuite/ld-ctf/slice.d 2025-04-15 14:25:27.995352399 +0100
@@ -25,9 +25,9 @@ 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\)
+ *\[0x.\] two: ID 0x[0-9a-f]*: \(kind 1\) int:2 \[slice 0x.:0x2\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\)
+ *\[0x.\] six: ID 0x[0-9a-f]*: \(kind 1\) int:6 \[slice 0x.:0x6\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\)
+ *\[0x.\] ten: ID 0x[0-9a-f]*: \(kind 1\) int:10 \[slice 0x.:0xa\] \(format 0x1\) \(size 0x2\) \(aligned at 0x2\)
+ *\[0x.*\] bar: ID 0x[0-9a-f]*: \(kind 8\) enum foo:1 \[slice 0x.*:0x1\] \(format 0x1\) \(size 0x1\) \(aligned at 0x1\)
#...
diff -rup binutils.orig/ld/testsuite/ld-elf/indirect.exp binutils-with-gold-2.44/ld/testsuite/ld-elf/indirect.exp
--- binutils.orig/ld/testsuite/ld-elf/indirect.exp 2025-04-15 14:24:47.740871408 +0100
+++ binutils-with-gold-2.44/ld/testsuite/ld-elf/indirect.exp 2025-04-15 14:25:27.994939548 +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-plugin/plugin.exp binutils-with-gold-2.44/ld/testsuite/ld-plugin/plugin.exp
--- binutils.orig/ld/testsuite/ld-plugin/plugin.exp 2025-04-15 14:24:47.870871632 +0100
+++ binutils-with-gold-2.44/ld/testsuite/ld-plugin/plugin.exp 2025-04-15 14:25:21.331843741 +0100
@@ -136,6 +136,8 @@ if { [istarget riscv*-*-*] } then {
return
}
+return
+
set plugin_tests [list \
[list "load plugin" "-plugin $plugin_path \
$testobjfiles $libs" "" "" "" {{ld plugin-1.d}} "main.x" ] \
diff -rup binutils.orig/ld/testsuite/ld-shared/shared.exp binutils-with-gold-2.44/ld/testsuite/ld-shared/shared.exp
--- binutils.orig/ld/testsuite/ld-shared/shared.exp 2025-04-15 14:24:47.915298066 +0100
+++ binutils-with-gold-2.44/ld/testsuite/ld-shared/shared.exp 2025-04-15 14:25:27.995415771 +0100
@@ -268,13 +268,14 @@ 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*"
}
setup_xfail "aarch64*-*-linux*"
# Solaris defaults to -z text.
setup_xfail "*-*-solaris2*"
+ setup_xfail "s390x-*-*"
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"
Only in binutils-with-gold-2.44/ld/testsuite/ld-shared: shared.exp.orig
Only in binutils-with-gold-2.44/ld/testsuite/ld-vsb: vsb.exp.orig
Only in binutils-with-gold-2.44/ld/testsuite/ld-vsb: vsb.exp.rej
--- binutils.orig/ld/testsuite/ld-plugin/lto.exp 2025-04-15 14:24:47.870871632 +0100
+++ binutils-with-gold-2.44/ld/testsuite/ld-plugin/lto.exp 2025-04-15 15:03:46.747609390 +0100
@@ -1126,6 +1126,9 @@ if { [at_least_gcc_version 4 7] } {
# Run "ld -r" to generate inputs for complex LTO tests.
run_dump_test "lto-3r"
remote_exec host "mv" "tmpdir/dump tmpdir/lto-3.o"
+
+return
+
run_dump_test "lto-4r-a"
remote_exec host "mv" "tmpdir/dump tmpdir/lto-4r-a.o"
run_dump_test "lto-4r-b"
--- binutils.orig/ld/testsuite/ld-shared/shared.exp 2025-04-15 17:42:27.117817106 +0100
+++ binutils-with-gold-2.44/ld/testsuite/ld-shared/shared.exp 2025-04-15 17:43:19.204400918 +0100
@@ -247,6 +247,7 @@ if ![ld_compile "$CC_FOR_TARGET $SHCFLAG
setup_xfail "arm*-*-linux*"
}
setup_xfail "aarch64*-*-linux*"
+ setup_xfail "s390x-*-*"
shared_test shnp "shared (non PIC)" mainnp.o sh1np.o sh2np.o shared
# Test ELF shared library relocations with a non-zero load
@@ -275,7 +276,6 @@ if ![ld_compile "$CC_FOR_TARGET $SHCFLAG
setup_xfail "aarch64*-*-linux*"
# Solaris defaults to -z text.
setup_xfail "*-*-solaris2*"
- setup_xfail "s390x-*-*"
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"