Blame SOURCES/binutils-s390-ld-testsuite-fixes.patch

3dad3f
--- binutils.orig/ld/testsuite/ld-elf/indirect.exp	2020-07-28 13:07:26.371506355 +0100
3dad3f
+++ binutils-2.35/ld/testsuite/ld-elf/indirect.exp	2020-07-28 13:19:16.109480917 +0100
3dad3f
@@ -151,12 +151,6 @@ set run_tests {
3dad3f
     {"Run with libindirect4c.so 4"
3dad3f
      "-Wl,--no-as-needed tmpdir/libindirect4c.so tmpdir/indirect4b.o tmpdir/indirect4a.o" ""
3dad3f
      {dummy.c} "indirect4d" "indirect4.out"}
3dad3f
-    {"Run indirect5 1"
3dad3f
-     "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libindirect5.so" ""
3dad3f
-     {indirect5a.c} "indirect5a" "indirect5.out" "$NOPIE_CFLAGS"}
3dad3f
-    {"Run indirect5 2"
3dad3f
-     "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/indirect5a.o tmpdir/libindirect5.so" ""
3dad3f
-     {dummy.c} "indirect5b" "indirect5.out" "$NOPIE_CFLAGS"}
3dad3f
     {"Run indirect6 1"
3dad3f
      "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/libindirect5.so" ""
3dad3f
      {indirect6a.c} "indirect6a" "indirect5.out" "$NOPIE_CFLAGS"}
3dad3f
@@ -208,7 +202,7 @@ proc check_dynamic_syms { test } {
3dad3f
     return 1
3dad3f
 }
3dad3f
 
3dad3f
-foreach t [list indirect5a indirect5b indirect6a indirect6b] {
3dad3f
+foreach t [list indirect6a indirect6b] {
3dad3f
     set testname [concat $t "dynsym"]
3dad3f
     if { [check_dynamic_syms tmpdir/$t] } {
3dad3f
 	pass $testname
3dad3f
@@ -225,12 +219,6 @@ if { ! [string match "" $exec_output] }
3dad3f
 }
3dad3f
 
3dad3f
 set pie_tests {
3dad3f
-    {"Run indirect5 3"
3dad3f
-     "-pie -Wl,--no-as-needed tmpdir/libindirect5.so" ""
3dad3f
-     {indirect5a.c} "indirect5c" "indirect5.out" "-fPIE"}
3dad3f
-    {"Run indirect5 4"
3dad3f
-     "-pie -Wl,--no-as-needed tmpdir/indirect5a.o tmpdir/libindirect5.so" ""
3dad3f
-     {dummy.c} "indirect5d" "indirect5.out" "-fPIE"}
3dad3f
     {"Run indirect6 3"
3dad3f
      "-pie -Wl,--no-as-needed tmpdir/libindirect5.so" ""
3dad3f
      {indirect6a.c} "indirect6c" "indirect5.out" "-fPIE"}
3dad3f
diff -rup binutils.orig/ld/testsuite/ld-elf/shared.exp binutils-2.35/ld/testsuite/ld-elf/shared.exp
3dad3f
--- binutils.orig/ld/testsuite/ld-elf/shared.exp	2020-07-28 14:15:41.646811416 +0100
3dad3f
+++ binutils-2.35/ld/testsuite/ld-elf/shared.exp	2020-07-28 14:19:13.606963162 +0100
3dad3f
@@ -1380,18 +1380,6 @@ if { [istarget *-*-linux*]
3dad3f
 	    "pr22393-2-static" \
3dad3f
 	    "pass.out" \
3dad3f
 	] \
3dad3f
-	[list \
3dad3f
-	    "Run pr21964-4" \
3dad3f
-	    "" \
3dad3f
-	    "" \
3dad3f
-	    {pr21964-4.c} \
3dad3f
-	    "pr21964-4" \
3dad3f
-	    "pass.out" \
3dad3f
-	    "" \
3dad3f
-	    "" \
3dad3f
-	    "" \
3dad3f
-	    "-ldl" \
3dad3f
-	] \
3dad3f
     ]
3dad3f
 }
3dad3f
 
3dad3f
diff -rup binutils.orig/ld/testsuite/ld-elf/tls.exp binutils-2.35/ld/testsuite/ld-elf/tls.exp
3dad3f
--- binutils.orig/ld/testsuite/ld-elf/tls.exp	2020-07-28 14:15:41.635811460 +0100
3dad3f
+++ binutils-2.35/ld/testsuite/ld-elf/tls.exp	2020-07-28 14:21:04.086521032 +0100
3dad3f
@@ -49,5 +49,6 @@ run_ld_link_tests [list \
3dad3f
 	{{readelf -r pr22263-1.rd}} \
3dad3f
 	"pr22263-1" \
3dad3f
 	"-fPIE -O2 $NOSANTIZE_CFLAGS" \
3dad3f
-    ] \
3dad3f
+	] \
3dad3f
+       { s390*-*-* } \
3dad3f
 ]
3dad3f
diff -rup binutils.orig/ld/testsuite/ld-ifunc/ifunc.exp binutils-2.35/ld/testsuite/ld-ifunc/ifunc.exp
3dad3f
--- binutils.orig/ld/testsuite/ld-ifunc/ifunc.exp	2020-07-28 14:15:41.532811873 +0100
3dad3f
+++ binutils-2.35/ld/testsuite/ld-ifunc/ifunc.exp	2020-07-28 14:22:37.768146123 +0100
3dad3f
@@ -531,7 +531,9 @@ run_ld_link_exec_tests [list \
3dad3f
 if { ![check_ifunc_attribute_available] } {
3dad3f
     return
3dad3f
 }
3dad3f
-
3dad3f
+if { [istarget "s390*-*-*"] } {
3dad3f
+    return
3dad3f
+} else {
3dad3f
 run_cc_link_tests [list \
3dad3f
     [list \
3dad3f
 	"Build pr18808a.o" \
3dad3f
@@ -668,6 +670,7 @@ run_cc_link_tests [list \
3dad3f
 	"pr23169f" \
3dad3f
     ] \
3dad3f
 ]
3dad3f
+}
3dad3f
 
3dad3f
 run_ld_link_exec_tests [list \
3dad3f
     [list \
3dad3f
--- binutils.orig/ld/testsuite/ld-elf/tls.exp	2020-07-28 15:07:51.733384431 +0100
3dad3f
+++ binutils-2.35/ld/testsuite/ld-elf/tls.exp	2020-07-28 15:10:08.096835851 +0100
3dad3f
@@ -50,5 +50,5 @@ run_ld_link_tests [list \
3dad3f
 	"pr22263-1" \
3dad3f
 	"-fPIE -O2 $NOSANTIZE_CFLAGS" \
3dad3f
 	] \
3dad3f
-       { s390*-*-* } \
3dad3f
+    [list "s390*-*-*"] \
3dad3f
 ]
3dad3f
--- binutils.orig/ld/testsuite/ld-elf/tls.exp	2020-07-28 15:59:15.964926725 +0100
3dad3f
+++ binutils-2.35/ld/testsuite/ld-elf/tls.exp	2020-07-28 15:59:55.898764564 +0100
3dad3f
@@ -39,6 +39,9 @@ if [istarget "sparc*-*-*"] {
3dad3f
     append AFLAGS_PIC " -K PIC"
3dad3f
 }
3dad3f
 
3dad3f
+if [istarget "s390*-*-*"] {
3dad3f
+    return
3dad3f
+} else {
3dad3f
 run_ld_link_tests [list \
3dad3f
     [list \
3dad3f
 	"Build pr22263-1" \
3dad3f
@@ -50,5 +53,5 @@ run_ld_link_tests [list \
3dad3f
 	"pr22263-1" \
3dad3f
 	"-fPIE -O2 $NOSANTIZE_CFLAGS" \
3dad3f
 	] \
3dad3f
-    [list "s390*-*-*"] \
3dad3f
 ]
3dad3f
+}