From eb12b17047e25eac70ba32b79144216e86d3baa4 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 25 Jan 2024 10:08:04 -0800 Subject: elf: Add is_standard_elf PR ld/31289 tests failed for fr30-elf, frv-elf, ft32-elf, iq2000-elf, mn10200-elf, ms1-elf and msp430-elf targets: FAIL: ld-elf/fatal-warnings-2a FAIL: ld-elf/fatal-warnings-2b FAIL: ld-elf/fatal-warnings-3a FAIL: ld-elf/fatal-warnings-3b FAIL: ld-elf/fatal-warnings-4a FAIL: ld-elf/fatal-warnings-4b even though PR ld/31289 targets xfail for [is_generic] targets. These targets not only don't use the generic_link_hash_table linker, but also don't use the standard ELF emulation. Add is_standard_elf for ELF targets which use the standard ELF emulation and replace [is_generic] with ![is_standard_elf] in PR ld/31289 tests. binutils/ PR ld/31289 * testsuite/lib/binutils-common.exp (is_standard_elf): New. ld/ PR ld/31289 * testsuite/lib/binutils-common.exp (is_generic): Return 1 for fr30-*-*, frv-*-elf, ft32-*-*, iq2000-*-*, mn10200-*-*, moxie-*-moxiebox*, msp430-*-* and mt-*-*. * testsuite/ld-elf/fatal-warnings-2a.d: Replace [is_generic] with ![is_standard_elf]. * testsuite/ld-elf/fatal-warnings-2b.d: Likewise. * testsuite/ld-elf/fatal-warnings-3a.d: Likewise. * testsuite/ld-elf/fatal-warnings-3b.d: Likewise. * testsuite/ld-elf/fatal-warnings-4a.d: Likewise. * testsuite/ld-elf/fatal-warnings-4b.d: Likewise. --- binutils/testsuite/lib/binutils-common.exp | 21 +++++++++++++++++++++ ld/testsuite/ld-elf/fatal-warnings-2a.d | 4 ++-- ld/testsuite/ld-elf/fatal-warnings-2b.d | 4 ++-- ld/testsuite/ld-elf/fatal-warnings-3a.d | 4 ++-- ld/testsuite/ld-elf/fatal-warnings-3b.d | 4 ++-- ld/testsuite/ld-elf/fatal-warnings-4a.d | 4 ++-- 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. -- cgit v1.1