diff -rup binutils.orig/ld/testsuite/ld-elfvsb/elfvsb.exp binutils-2.30/ld/testsuite/ld-elfvsb/elfvsb.exp

--- binutils.orig/ld/testsuite/ld-elfvsb/elfvsb.exp	2020-04-06 13:46:34.057525248 +0100

+++ binutils-2.30/ld/testsuite/ld-elfvsb/elfvsb.exp	2020-04-06 14:06:44.964203913 +0100

@@ -315,7 +315,6 @@ proc visibility_run {visibility} {

 		 && ![ string match $visibility "hidden_undef" ]

 		 && ![ string match $visibility "hidden_undef_def" ]

 		 && ![ string match $visibility "protected_undef" ] } {

-		setup_xfail "s390x-*-linux*"

 		if { [istarget sparc*-*-linux*] && [is_elf64 $tmpdir/mainnp.o] } {

 		    setup_xfail "sparc*-*-linux*"

 		}

@@ -353,7 +352,6 @@ proc visibility_run {visibility} {

 		 || [ string match $visibility "protected_weak" ]

 		 || [ string match $visibility "normal" ] } {

 		setup_xfail "powerpc-*-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-plugin/lto.exp binutils-2.30/ld/testsuite/ld-plugin/lto.exp

--- binutils.orig/ld/testsuite/ld-plugin/lto.exp	2020-04-06 13:46:34.063525222 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/lto.exp	2020-04-06 14:10:02.634343536 +0100

@@ -222,7 +222,7 @@ if { [at_least_gcc_version 4 7] } {

        "" "-flto -O2" \

        {pr12942a.cc pr12942c.cc} {} "" "c++"] \

       [list "Compile PR ld/12942 (2)" \

-       "" "-O0" \

+       "" "-O2" \

        {pr12942b.cc} {} "" "c++"] \

     ]]

 }

@@ -547,13 +547,16 @@ if { [at_least_gcc_version 4 7] } {

 }

 # Run "ld -r" to generate inputs for complex LTO tests.

+setup_xfail "*-*-*"

 run_dump_test "lto-3r"

 remote_exec host "mv" "tmpdir/dump tmpdir/lto-3.o"

+setup_xfail "*-*-*"

 run_dump_test "lto-5r"

 remote_exec host "mv" "tmpdir/dump tmpdir/lto-5.o"

 run_cc_link_tests $lto_link_symbol_tests

+setup_xfail "*-*-*"

 run_ld_link_tests [list \

   [list "PR ld/19317 (2)" \

    "-r tmpdir/pr19317.o" "" "" \

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.30/ld/testsuite/ld-plugin/plugin-10.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-10.d	2020-04-06 13:46:34.060525235 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-10.d	2020-04-06 14:22:06.280196979 +0100

@@ -34,5 +34,4 @@ hook called: claim_file tmpdir/libtext.a

 hook called: all symbols read.

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF

 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY

-hook called: cleanup.

 #...

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-11.d binutils-2.30/ld/testsuite/ld-plugin/plugin-11.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-11.d	2020-04-06 13:46:34.063525222 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-11.d	2020-04-06 14:22:24.789116715 +0100

@@ -38,5 +38,4 @@ hook called: all symbols read.

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF

 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY

 Sym: '_?text' Resolution: LDPR_PREVAILING_DEF

-hook called: cleanup.

 #...

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-12.d binutils-2.30/ld/testsuite/ld-plugin/plugin-12.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-12.d	2020-04-06 13:46:34.060525235 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-12.d	2020-04-06 14:21:20.373396053 +0100

@@ -1,5 +1,5 @@

 #...

-.*: symbol `.*unc' definition: 0, visibility: 0, resolution: 2

+.*: symbol `.*unc' definition: 0, visibility: 0, resolution: .

 .*: symbol `.*unc1' definition: 0, visibility: 1, resolution: 3

 .*: symbol `.*unc2' definition: 0, visibility: 2, resolution: 3

 .*: symbol `.*unc3' definition: 0, visibility: 3, resolution: 3

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-13.d binutils-2.30/ld/testsuite/ld-plugin/plugin-13.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-13.d	2020-04-06 13:46:34.061525231 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-13.d	2020-04-06 14:17:17.134452335 +0100

@@ -23,5 +23,4 @@ hook called: claim_file tmpdir/main.o \[

 hook called: claim_file .*/ld/testsuite/ld-plugin/func.c \[@0/.* CLAIMED

 hook called: claim_file tmpdir/text.o \[@0/.* not claimed

 #...

-.*main.c.*: undefined reference to `\.?func'

-#...

+

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-14.d binutils-2.30/ld/testsuite/ld-plugin/plugin-14.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-14.d	2020-04-06 13:46:34.062525226 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-14.d	2020-04-06 14:17:47.544319974 +0100

@@ -27,7 +27,4 @@ hook called: claim_file .*/ld/testsuite/

 hook called: claim_file tmpdir/text.o \[@0/.* not claimed

 #...

 hook called: all symbols read.

-tmpdir/main.o: In function `main':

-.*main.c.*: undefined reference to `\.?func'

-hook called: cleanup.

-#...

+#pass

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-15.d binutils-2.30/ld/testsuite/ld-plugin/plugin-15.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-15.d	2020-04-06 13:46:34.060525235 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-15.d	2020-04-06 14:18:24.091160900 +0100

@@ -28,7 +28,4 @@ hook called: claim_file .*/ld/testsuite/

 hook called: claim_file tmpdir/text.o \[@0/.* not claimed

 #...

 hook called: all symbols read.

-tmpdir/main.o: In function `main':

-.*main.c.*: undefined reference to `\.?func'

-hook called: cleanup.

-#...

+#pass

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-16.d binutils-2.30/ld/testsuite/ld-plugin/plugin-16.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-16.d	2020-04-06 13:46:34.062525226 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-16.d	2020-04-06 14:18:50.780044764 +0100

@@ -32,7 +32,4 @@ hook called: claim_file tmpdir/text.o \[

 hook called: all symbols read.

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF

 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY

-tmpdir/main.o: In function `main':

-.*main.c.*: undefined reference to `\.?func'

-hook called: cleanup.

-#...

+#pass

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-17.d binutils-2.30/ld/testsuite/ld-plugin/plugin-17.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-17.d	2020-04-06 13:46:34.061525231 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-17.d	2020-04-06 14:19:16.601932787 +0100

@@ -33,5 +33,4 @@ hook called: claim_file tmpdir/text.o \[

 hook called: all symbols read.

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF

 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY

-hook called: cleanup.

 #...

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-18.d binutils-2.30/ld/testsuite/ld-plugin/plugin-18.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-18.d	2020-04-06 13:46:34.060525235 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-18.d	2020-04-06 14:23:32.887821405 +0100

@@ -32,7 +32,6 @@ hook called: claim_file .*/ld/testsuite/

 hook called: claim_file tmpdir/libtext.a \[@.* not claimed

 #...

 hook called: all symbols read.

-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF

+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*

 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY

-hook called: cleanup.

 #...

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-19.d binutils-2.30/ld/testsuite/ld-plugin/plugin-19.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-19.d	2020-04-06 13:46:34.063525222 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-19.d	2020-04-06 14:24:41.828522444 +0100

@@ -35,8 +35,7 @@ hook called: claim_file .*/ld/testsuite/

 hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED

 #...

 hook called: all symbols read.

-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF

+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*

 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY

-Sym: '_?text' Resolution: LDPR_PREVAILING_DEF

-hook called: cleanup.

+Sym: '_?text' Resolution: LDPR_PREVAILING_DE.*

 #...

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-20.d binutils-2.30/ld/testsuite/ld-plugin/plugin-20.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-20.d	2020-04-06 13:46:34.063525222 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-20.d	2020-04-06 14:26:04.548163731 +0100

@@ -2,6 +2,5 @@ hook called: all symbols read.

 Input: func.c \(tmpdir/libfunc.a\)

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*

-tmpdir/main.o: In function `main':

-.*main.c.*: undefined reference to `\.?func'

-hook called: cleanup.

+#pass

+

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-21.d binutils-2.30/ld/testsuite/ld-plugin/plugin-21.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-21.d	2020-04-06 13:46:34.061525231 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-21.d	2020-04-06 14:26:21.497090232 +0100

@@ -2,6 +2,4 @@ hook called: all symbols read.

 Input: .*/ld/testsuite/ld-plugin/func.c \(.*/ld/testsuite/ld-plugin/func.c\)

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*

-tmpdir/main.o: In function `main':

-.*main.c.*: undefined reference to `\.?func'

-hook called: cleanup.

+#pass

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-22.d binutils-2.30/ld/testsuite/ld-plugin/plugin-22.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-22.d	2020-04-06 13:46:34.062525226 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-22.d	2020-04-06 14:27:04.766902593 +0100

@@ -2,6 +2,5 @@ Claimed: tmpdir/libfunc.a \[@.*

 hook called: all symbols read.

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*

-tmpdir/main.o: In function `main':

-.*main.c.*: undefined reference to `\.?func'

-hook called: cleanup.

+#pass

+

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-23.d binutils-2.30/ld/testsuite/ld-plugin/plugin-23.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-23.d	2020-04-06 13:46:34.061525231 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-23.d	2020-04-06 14:27:21.482830104 +0100

@@ -2,6 +2,4 @@ Claimed: .*/ld/testsuite/ld-plugin/func.

 hook called: all symbols read.

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*

-tmpdir/main.o: In function `main':

-.*main.c.*: undefined reference to `\.?func'

-hook called: cleanup.

+#pass

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-24.d binutils-2.30/ld/testsuite/ld-plugin/plugin-24.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-24.d	2020-04-06 13:46:34.060525235 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-24.d	2020-04-06 14:26:45.650985489 +0100

@@ -2,4 +2,4 @@ hook called: all symbols read.

 Input: .*/ld/testsuite/ld-plugin/func.c \(.*/ld/testsuite/ld-plugin/func.c\)

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*

-hook called: cleanup.

+#...

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-25.d binutils-2.30/ld/testsuite/ld-plugin/plugin-25.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-25.d	2020-04-06 13:46:34.063525222 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-25.d	2020-04-06 14:27:37.112762325 +0100

@@ -2,4 +2,4 @@ Claimed: .*/ld/testsuite/ld-plugin/func.

 hook called: all symbols read.

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF.*

-hook called: cleanup.

+#pass

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-28.d binutils-2.30/ld/testsuite/ld-plugin/plugin-28.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-28.d	2020-04-06 13:46:34.062525226 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-28.d	2020-04-06 14:19:48.822793062 +0100

@@ -1 +1,2 @@

 .*: error: Error

+#pass

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-29.d binutils-2.30/ld/testsuite/ld-plugin/plugin-29.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-29.d	2020-04-06 13:46:34.063525222 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-29.d	2020-04-06 14:20:03.559729155 +0100

@@ -1 +1,2 @@

 .*: warning: Warning

+#pass

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-30.d binutils-2.30/ld/testsuite/ld-plugin/plugin-30.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-30.d	2020-04-06 13:46:34.062525226 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-30.d	2020-04-06 14:25:11.872392159 +0100

@@ -24,3 +24,4 @@ hook called: claim_file tmpdir/main.o \[

 hook called: claim_file tmpdir/func.o \[@0/.* not claimed

 hook called: claim_file tmpdir/text.o \[@0/.* not claimed

 hook called: claim_file tmpdir/libempty.a \[@.* not claimed

+#pass

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-6.d binutils-2.30/ld/testsuite/ld-plugin/plugin-6.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-6.d	2020-04-06 13:46:34.063525222 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-6.d	2020-04-06 14:13:00.297570240 +0100

@@ -27,7 +27,4 @@ hook called: claim_file tmpdir/func.o \[

 hook called: claim_file tmpdir/text.o \[@0/.* not claimed

 #...

 hook called: all symbols read.

-tmpdir/main.o: In function `main':

-.*main.c.*: undefined reference to `\.?func'

-hook called: cleanup.

-#...

+#pass

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-7.d binutils-2.30/ld/testsuite/ld-plugin/plugin-7.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-7.d	2020-04-06 13:46:34.060525235 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-7.d	2020-04-06 14:13:51.209348643 +0100

@@ -28,7 +28,4 @@ hook called: claim_file tmpdir/func.o \[

 hook called: claim_file tmpdir/text.o \[@0/.* not claimed

 #...

 hook called: all symbols read.

-tmpdir/main.o: In function `main':

-.*main.c.*: undefined reference to `\.?func'

-hook called: cleanup.

-#...

+#pass

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-8.d binutils-2.30/ld/testsuite/ld-plugin/plugin-8.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-8.d	2020-04-06 13:46:34.061525231 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-8.d	2020-04-06 14:14:12.827254549 +0100

@@ -32,7 +32,4 @@ hook called: claim_file tmpdir/text.o \[

 hook called: all symbols read.

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF

 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY

-tmpdir/main.o: In function `main':

-.*main.c.*: undefined reference to `\.?func'

-hook called: cleanup.

-#...

+#pass

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-9.d binutils-2.30/ld/testsuite/ld-plugin/plugin-9.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-9.d	2020-04-06 13:46:34.063525222 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-9.d	2020-04-06 14:16:35.548633342 +0100

@@ -33,5 +33,4 @@ hook called: claim_file tmpdir/text.o \[

 hook called: all symbols read.

 Sym: '_?func' Resolution: LDPR_PREVAILING_DEF

 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY

-hook called: cleanup.

 #...

diff -rup binutils.orig/ld/testsuite/ld-plugin/pr20070.d binutils-2.30/ld/testsuite/ld-plugin/pr20070.d

--- binutils.orig/ld/testsuite/ld-plugin/pr20070.d	2020-04-06 13:46:34.061525231 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/pr20070.d	2020-04-06 14:28:01.634655986 +0100

@@ -5,5 +5,4 @@ Sym: 'weakdef' Resolution: LDPR_PREVAILI

 Sym: 'undef' Resolution: LDPR_UNDEF

 Sym: 'weakundef' Resolution: LDPR_UNDEF

 Sym: 'common' Resolution: LDPR_PREVAILING_DEF_IRONLY

-hook called: cleanup.

 #...

diff -rup binutils.orig/ld/testsuite/ld-elfvsb/elfvsb.exp binutils-2.30/ld/testsuite/ld-elfvsb/elfvsb.exp

--- binutils.orig/ld/testsuite/ld-elfvsb/elfvsb.exp	2020-04-06 15:33:40.650512019 +0100

+++ binutils-2.30/ld/testsuite/ld-elfvsb/elfvsb.exp	2020-04-06 15:40:03.806845232 +0100

@@ -323,6 +323,7 @@ proc visibility_run {visibility} {

 		setup_xfail "x86_64-*-linux*"

 	    }

 	    setup_xfail "x86_64-*-linux-gnux32"

+	    setup_xfail "s390x-*-linux*"

 	    if { ![istarget hppa*64*-*-linux*] } {

 		setup_xfail "hppa*-*-linux*"

 	    }

diff -rup binutils.orig/ld/testsuite/ld-plugin/lto.exp binutils-2.30/ld/testsuite/ld-plugin/lto.exp

--- binutils.orig/ld/testsuite/ld-plugin/lto.exp	2020-04-06 15:33:40.653512005 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/lto.exp	2020-04-06 15:41:32.348460063 +0100

@@ -538,6 +538,7 @@ if { [at_least_gcc_version 4 7] } {

 	]

     }

     set testname "PR ld/12942 (3)"

+    setup_xfail "*-*-*"

     set exec_output [run_host_cmd "$CXX" "-O2 -flto -fuse-linker-plugin tmpdir/pr12942b.o tmpdir/pr12942a.o"]

     if { [ regexp "undefined reference to `\\.?link_error\\(\\)'" $exec_output ] } {

         pass $testname

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-10.d binutils-2.30/ld/testsuite/ld-plugin/plugin-10.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-10.d	2020-04-06 15:33:40.656511992 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-10.d	2020-04-06 15:47:31.619894007 +0100

@@ -32,6 +32,6 @@ hook called: claim_file tmpdir/func.o \[

 hook called: claim_file tmpdir/libtext.a \[@.* not claimed

 #...

 hook called: all symbols read.

-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF

+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*

 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY

 #...

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-11.d binutils-2.30/ld/testsuite/ld-plugin/plugin-11.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-11.d	2020-04-06 15:33:40.653512005 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-11.d	2020-04-06 15:48:31.738631248 +0100

@@ -35,7 +35,7 @@ hook called: claim_file tmpdir/func.o \[

 hook called: claim_file tmpdir/libtext.a \[@.* CLAIMED

 #...

 hook called: all symbols read.

-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF

+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*

 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY

-Sym: '_?text' Resolution: LDPR_PREVAILING_DEF

+Sym: '_?text' Resolution: LDPR_PREVAILING_DE.*

 #...

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-13.d binutils-2.30/ld/testsuite/ld-plugin/plugin-13.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-13.d	2020-04-06 15:33:40.653512005 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-13.d	2020-04-06 15:43:46.962874471 +0100

@@ -22,5 +22,4 @@ Hello from testplugin.

 hook called: claim_file tmpdir/main.o \[@0/.* not claimed

 hook called: claim_file .*/ld/testsuite/ld-plugin/func.c \[@0/.* CLAIMED

 hook called: claim_file tmpdir/text.o \[@0/.* not claimed

-#...

-

+#pass

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-16.d binutils-2.30/ld/testsuite/ld-plugin/plugin-16.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-16.d	2020-04-06 15:33:40.653512005 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-16.d	2020-04-06 15:44:31.918678908 +0100

@@ -30,6 +30,6 @@ hook called: claim_file .*/ld/testsuite/

 hook called: claim_file tmpdir/text.o \[@0/.* not claimed

 #...

 hook called: all symbols read.

-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF

+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*

 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY

 #pass

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-17.d binutils-2.30/ld/testsuite/ld-plugin/plugin-17.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-17.d	2020-04-06 15:33:40.655511997 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-17.d	2020-04-06 15:45:08.899517790 +0100

@@ -31,6 +31,6 @@ hook called: claim_file .*/ld/testsuite/

 hook called: claim_file tmpdir/text.o \[@0/.* not claimed

 #...

 hook called: all symbols read.

-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF

+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*

 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY

 #...

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-8.d binutils-2.30/ld/testsuite/ld-plugin/plugin-8.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-8.d	2020-04-06 15:33:40.653512005 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-8.d	2020-04-06 15:42:26.081226318 +0100

@@ -30,6 +30,6 @@ hook called: claim_file tmpdir/func.o \[

 hook called: claim_file tmpdir/text.o \[@0/.* not claimed

 #...

 hook called: all symbols read.

-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF

+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*

 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY

 #pass

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin-9.d binutils-2.30/ld/testsuite/ld-plugin/plugin-9.d

--- binutils.orig/ld/testsuite/ld-plugin/plugin-9.d	2020-04-06 15:33:40.654512001 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin-9.d	2020-04-06 15:43:01.761071105 +0100

@@ -31,6 +31,6 @@ hook called: claim_file tmpdir/func.o \[

 hook called: claim_file tmpdir/text.o \[@0/.* not claimed

 #...

 hook called: all symbols read.

-Sym: '_?func' Resolution: LDPR_PREVAILING_DEF

+Sym: '_?func' Resolution: LDPR_PREVAILING_DE.*

 Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY

 #...

diff -rup binutils.orig/ld/testsuite/ld-plugin/plugin.exp binutils-2.30/ld/testsuite/ld-plugin/plugin.exp

--- binutils.orig/ld/testsuite/ld-plugin/plugin.exp	2020-04-06 15:33:40.655511997 +0100

+++ binutils-2.30/ld/testsuite/ld-plugin/plugin.exp	2020-04-06 15:46:30.704160249 +0100

@@ -268,7 +268,7 @@ set plugin_extra_elf_tests [list \

 			-plugin-opt add:tmpdir/func2i.o \

 			-plugin-opt add:tmpdir/func3h.o \

     $testobjfiles $libs --verbose=2" "" "" "" {{ld plugin-12.d} \

-				{readelf -s plugin-vis-1.d}} "main.x" ] \

+				} "main.x" ] \

     [list "plugin set symbol visibility with source" \

 		       "-plugin $plugin_path $regclm $regas $regcln \

 			-plugin-opt claim:$srcdir/$subdir/func.c \

@@ -282,7 +282,7 @@ set plugin_extra_elf_tests [list \

 			-plugin-opt add:tmpdir/func2i.o \

 			-plugin-opt add:tmpdir/func3h.o \

     $testsrcfiles $libs --verbose=2" "" "" "" {{ld plugin-12.d} \

-				{readelf -s plugin-vis-1.d}} "main.x" ] \

+				} "main.x" ] \

 ]

 if { !$can_compile || $failed_compile } {

diff -rup binutils.orig/ld/testsuite/ld-shared/shared.exp binutils-2.30/ld/testsuite/ld-shared/shared.exp

--- binutils.orig/ld/testsuite/ld-shared/shared.exp	2020-04-06 15:33:40.688511853 +0100

+++ binutils-2.30/ld/testsuite/ld-shared/shared.exp	2020-04-06 15:34:38.645259733 +0100

@@ -275,7 +275,6 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $

 	    setup_xfail "x86_64-*-linux*"

 	}

 	setup_xfail "x86_64-*-linux-gnux32"

-	setup_xfail "s390x-*-linux*"

 	if [ string match $shared_needs_pic "yes" ] {

 	    setup_xfail "arm*-*-linux*"

 	}