diff options
-rw-r--r-- | binutils/testsuite/lib/binutils-common.exp | 21 | ||||
-rw-r--r-- | ld/testsuite/ld-elf/fatal-warnings-2a.d | 4 | ||||
-rw-r--r-- | ld/testsuite/ld-elf/fatal-warnings-2b.d | 4 | ||||
-rw-r--r-- | ld/testsuite/ld-elf/fatal-warnings-3a.d | 4 | ||||
-rw-r--r-- | ld/testsuite/ld-elf/fatal-warnings-3b.d | 4 | ||||
-rw-r--r-- | ld/testsuite/ld-elf/fatal-warnings-4a.d | 4 | ||||
-rw-r--r-- | ld/testsuite/ld-elf/fatal-warnings-4b.d | 4 |
7 files changed, 33 insertions, 12 deletions
diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp index dc140f8..b304801 100644 --- a/binutils/testsuite/lib/binutils-common.exp +++ b/binutils/testsuite/lib/binutils-common.exp @@ -275,6 +275,27 @@ proc is_generic { } { return 0 } +# Return true if target uses the standard ELF emulation. +proc is_standard_elf { } { + if { ![is_elf_format] || [is_generic] } { + return 0 + } + + # These targets don't use elf.em. + if { [istarget "fr30-*-*"] + || [istarget "frv-*-elf"] + || [istarget "ft32-*-*"] + || [istarget "iq2000-*-*"] + || [istarget "mn10200-*-*"] + || [istarget "moxie-*-moxiebox*"] + || [istarget "msp430-*-*"] + || [istarget "mt-*-*"] } { + return 0 + } + + return 1 +} + # True if the object format is ELF with unused section symbols. proc is_elf_unused_section_symbols {} { global AS ASFLAGS READELF diff --git a/ld/testsuite/ld-elf/fatal-warnings-2a.d b/ld/testsuite/ld-elf/fatal-warnings-2a.d index 5c46f43..b17abb1 100644 --- a/ld/testsuite/ld-elf/fatal-warnings-2a.d +++ b/ld/testsuite/ld-elf/fatal-warnings-2a.d @@ -2,5 +2,5 @@ #source: start.s #ld: -z bad-option1 -z bad-option2 #warning: -z bad-option1 ignored -#xfail: [is_generic] -# generic linker targets don't support -z options. +#xfail: ![is_standard_elf] +# These targets don't support -z options. diff --git a/ld/testsuite/ld-elf/fatal-warnings-2b.d b/ld/testsuite/ld-elf/fatal-warnings-2b.d index 5fa94e4..7aedb53 100644 --- a/ld/testsuite/ld-elf/fatal-warnings-2b.d +++ b/ld/testsuite/ld-elf/fatal-warnings-2b.d @@ -2,5 +2,5 @@ #source: start.s #ld: -z bad-option1 -z bad-option2 #warning: -z bad-option2 ignored -#xfail: [is_generic] -# generic linker targets don't support -z options. +#xfail: ![is_standard_elf] +# These targets don't support -z options. diff --git a/ld/testsuite/ld-elf/fatal-warnings-3a.d b/ld/testsuite/ld-elf/fatal-warnings-3a.d index a377b73..1b52f8f 100644 --- a/ld/testsuite/ld-elf/fatal-warnings-3a.d +++ b/ld/testsuite/ld-elf/fatal-warnings-3a.d @@ -2,5 +2,5 @@ #source: start.s #ld: --fatal-warnings -z bad-option1 -z bad-option2 #error: unsupported option: -z bad-option1 -#xfail: [is_generic] -# generic linker targets don't support -z options. +#xfail: ![is_standard_elf] +# These targets don't support -z options. diff --git a/ld/testsuite/ld-elf/fatal-warnings-3b.d b/ld/testsuite/ld-elf/fatal-warnings-3b.d index 87ea286..870a1eb2 100644 --- a/ld/testsuite/ld-elf/fatal-warnings-3b.d +++ b/ld/testsuite/ld-elf/fatal-warnings-3b.d @@ -2,5 +2,5 @@ #source: start.s #ld: --fatal-warnings -z bad-option1 -z bad-option2 #error: unsupported option: -z bad-option2 -#xfail: [is_generic] -# generic linker targets don't support -z options. +#xfail: ![is_standard_elf] +# These targets don't support -z options. diff --git a/ld/testsuite/ld-elf/fatal-warnings-4a.d b/ld/testsuite/ld-elf/fatal-warnings-4a.d index 4685e38..cf7373b 100644 --- a/ld/testsuite/ld-elf/fatal-warnings-4a.d +++ b/ld/testsuite/ld-elf/fatal-warnings-4a.d @@ -2,5 +2,5 @@ #source: start.s #ld: -z bad-option1 -z bad-option2 --fatal-warnings #error: unsupported option: -z bad-option1 -#xfail: [is_generic] -# generic linker targets don't support -z options. +#xfail: ![is_standard_elf] +# These targets don't support -z options. diff --git a/ld/testsuite/ld-elf/fatal-warnings-4b.d b/ld/testsuite/ld-elf/fatal-warnings-4b.d index 6fc2185..7cdb2b4 100644 --- a/ld/testsuite/ld-elf/fatal-warnings-4b.d +++ b/ld/testsuite/ld-elf/fatal-warnings-4b.d @@ -2,5 +2,5 @@ #source: start.s #ld: -z bad-option1 -z bad-option2 --fatal-warnings #error: unsupported option: -z bad-option2 -#xfail: [is_generic] -# generic linker targets don't support -z options. +#xfail: ![is_standard_elf] +# These targets don't support -z options. |