92 lines
5.0 KiB
Diff
92 lines
5.0 KiB
Diff
|
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 -rup binutils.orig/ld/testsuite/ld-ctf/slice.d binutils-2.41/ld/testsuite/ld-ctf/slice.d
|
||
|
|
--- binutils.orig/ld/testsuite/ld-ctf/slice.d 2024-08-16 15:01:57.439706788 +0100
|
||
|
|
+++ binutils-2.41/ld/testsuite/ld-ctf/slice.d 2024-08-16 15:03:25.824963879 +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-shared/shared.exp binutils-2.41/ld/testsuite/ld-shared/shared.exp
|
||
|
|
--- binutils.orig/ld/testsuite/ld-shared/shared.exp 2024-08-16 15:01:57.612707292 +0100
|
||
|
|
+++ binutils-2.41/ld/testsuite/ld-shared/shared.exp 2024-08-16 15:05:33.353334828 +0100
|
||
|
|
@@ -274,6 +274,7 @@ 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"
|
||
|
|
--- binutils.orig/ld/testsuite/ld-vsb/vsb.exp 2024-08-16 15:01:57.631707347 +0100
|
||
|
|
+++ binutils-2.41/ld/testsuite/ld-vsb/vsb.exp 2024-08-16 15:46:04.098564801 +0100
|
||
|
|
@@ -396,7 +396,7 @@ proc visibility_run {visibility} {
|
||
|
|
setup_xfail "*-*-beos*"
|
||
|
|
}
|
||
|
|
|
||
|
|
- if { ![is_xcoff_format] } {
|
||
|
|
+ if { ![is_xcoff_format] && ![istarget s390x-*-*] } {
|
||
|
|
visibility_test $visibility vnp "visibility ($visibility) (non PIC, load offset)" \
|
||
|
|
mainnp.o sh1np.o sh2np.o $datfile \
|
||
|
|
"-Wl,-T,$srcdir/$subdir/elf-offset.ld,--hash-style=sysv"
|