From b0ee49d21ba0c4b7f9817db01dc247255eebd516 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sat, 20 Jun 2020 10:47:32 +0930 Subject: [PATCH] ecoff testsuite fixes The aim of this change is to remove a whole lot of "assembly failed" errors for ecoff targets. * testsuite/ld-alpha/alpha.exp: Exclude *ecoff targets. * testsuite/ld-elf/binutils.exp: Likewise. * testsuite/ld-elf/tls.exp: Likewise. * testsuite/ld-elf/tls_common.exp: Likewise. * testsuite/ld-scripts/phdrs2.exp: Likewise. --- ld/ChangeLog | 8 ++++++++ ld/testsuite/ld-alpha/alpha.exp | 4 ++-- ld/testsuite/ld-elf/binutils.exp | 8 ++++---- ld/testsuite/ld-elf/tls.exp | 8 ++++---- ld/testsuite/ld-elf/tls_common.exp | 8 ++++---- ld/testsuite/ld-scripts/phdrs2.exp | 22 +++++++++++----------- 6 files changed, 33 insertions(+), 25 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index c47fbca01c8..f9e4a43ce1e 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,11 @@ +2020-06-20 Alan Modra + + * testsuite/ld-alpha/alpha.exp: Exclude *ecoff targets. + * testsuite/ld-elf/binutils.exp: Likewise. + * testsuite/ld-elf/tls.exp: Likewise. + * testsuite/ld-elf/tls_common.exp: Likewise. + * testsuite/ld-scripts/phdrs2.exp: Likewise. + 2020-06-20 Alan Modra * testsuite/ld-sh/sh.exp: Don't run relax tests for non-ELF. diff --git a/ld/testsuite/ld-alpha/alpha.exp b/ld/testsuite/ld-alpha/alpha.exp index f4a395bed49..084f7f99608 100644 --- a/ld/testsuite/ld-alpha/alpha.exp +++ b/ld/testsuite/ld-alpha/alpha.exp @@ -22,8 +22,8 @@ # Test Alpha ELF linking; all types of relocs. This tests the # assembler and tools like objdump as well as the linker. -if { !([istarget "alpha*-*-elf*"] - || [istarget "alpha*-*-linux*"]) } { +if { !([istarget alpha*-*-elf*] + || ([istarget alpha*-*-linux*] && ![istarget *ecoff])) } { return } diff --git a/ld/testsuite/ld-elf/binutils.exp b/ld/testsuite/ld-elf/binutils.exp index ecaecdd05bf..fc54c9869fa 100644 --- a/ld/testsuite/ld-elf/binutils.exp +++ b/ld/testsuite/ld-elf/binutils.exp @@ -23,10 +23,10 @@ # Make sure that binutils can correctly handle ld output in ELF. -if { ![istarget *-*-linux*] - && ![istarget arm*-*-uclinuxfdpiceabi] - && ![istarget *-*-nacl*] - && ![istarget *-*-gnu*]} { +if { !([istarget *-*-linux*] + || [istarget arm*-*-uclinuxfdpiceabi] + || [istarget *-*-nacl*] + || [istarget *-*-gnu*]) || [istarget *ecoff] } then { return } diff --git a/ld/testsuite/ld-elf/tls.exp b/ld/testsuite/ld-elf/tls.exp index 15c382fcb4f..8afbb9f1297 100644 --- a/ld/testsuite/ld-elf/tls.exp +++ b/ld/testsuite/ld-elf/tls.exp @@ -21,10 +21,10 @@ # Make sure that binutils can correctly handle TLS. -if { ![istarget *-*-linux*] - && ![istarget arm*-*-uclinuxfdpiceabi] - && ![istarget *-*-nacl*] - && ![istarget *-*-gnu*] } { +if { !([istarget *-*-linux*] + || [istarget arm*-*-uclinuxfdpiceabi] + || [istarget *-*-nacl*] + || [istarget *-*-gnu*]) || [istarget *ecoff] } then { return } diff --git a/ld/testsuite/ld-elf/tls_common.exp b/ld/testsuite/ld-elf/tls_common.exp index 3e14ccfc215..2b6532550fd 100644 --- a/ld/testsuite/ld-elf/tls_common.exp +++ b/ld/testsuite/ld-elf/tls_common.exp @@ -23,10 +23,10 @@ # Make sure that binutils can correctly handle ld output in ELF. -if { ![istarget *-*-linux*] - && ![istarget arm*-*-uclinuxfdpiceabi] - && ![istarget *-*-nacl*] - && ![istarget *-*-gnu*] } { +if { !([istarget *-*-linux*] + || [istarget arm*-*-uclinuxfdpiceabi] + || [istarget *-*-nacl*] + || [istarget *-*-gnu*]) || [istarget *ecoff] } then { return } diff --git a/ld/testsuite/ld-scripts/phdrs2.exp b/ld/testsuite/ld-scripts/phdrs2.exp index d781c6dafbb..2fae24fed57 100644 --- a/ld/testsuite/ld-scripts/phdrs2.exp +++ b/ld/testsuite/ld-scripts/phdrs2.exp @@ -19,17 +19,17 @@ # MA 02110-1301, USA. # PHDRS2 is only meaningful for ELF. -if { ![istarget *-*-sysv4*] \ - && ![istarget *-*-unixware*] \ - && ![istarget *-*-elf*] \ - && ![istarget *-*-eabi*] \ - && ![istarget hppa*64*-*-hpux*] \ - && ![istarget *-*-linux*] \ - && ![istarget arm*-*-uclinuxfdpiceabi] \ - && ![istarget *-*-gnu*] \ - && ![istarget *-*-irix5*] \ - && ![istarget *-*-irix6*] \ - && ![istarget *-*-solaris2*] } { +if { !([istarget *-*-sysv4*] + || [istarget *-*-unixware*] + || [istarget *-*-elf*] + || [istarget *-*-eabi*] + || [istarget hppa*64*-*-hpux*] + || [istarget *-*-linux*] + || [istarget arm*-*-uclinuxfdpiceabi] + || [istarget *-*-gnu*] + || [istarget *-*-irix5*] + || [istarget *-*-irix6*] + || [istarget *-*-solaris2*]) || [istarget *ecoff] } then { return } -- 2.30.2