From 9884676d9da9c691ba0d223836b5bf70740ee7e3 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 30 Jan 2023 11:29:34 +1030 Subject: [PATCH] testsuite XPASSes This adjusts the testsuite to get rid of a number of XPASSes that have appeared. Someone might like to look into a better patch for the s390 change. aarch64-pe XPASS: weak symbols arm-nacl XPASS: rgn-over8 mcore-pe XPASS: ld-scripts/provide-8 mips64-linux-gnuabi64 XPASS: vers4 mips64-linux-gnuabi64 XPASS: vers4b mips-linux-gnu XPASS: vers4 mips-linux-gnu XPASS: vers4b s390-linux-gnu XPASS: undefined line sh4-linux-gnu XPASS: --gc-sections with __start_SECTIONNAME sh-coff XPASS: objcopy object (simple copy) sh-coff XPASS: objcopy executable (pr25662) binutils/ * testsuite/binutils-all/objcopy.exp: Don't xfail "simple copy" and "pr25662" on sh-*-coff. Remove all non-ELF xfails on "ELF unknown section type" test. ld/ * testsuite/ld-elfvers/vers.exp (vers4, vers4b): Don't xfail all mips, just xfail mips irix. * testsuite/ld-gc/pr19161.d: Don't xfail sh. * testsuite/ld-scripts/rgn-over8-ok.d: Don't xfail nacl. * testsuite/ld-scripts/weak.exp: Don't xfail aarch64-pe. * testsuite/ld-undefined/undefined.exp: Conditionally xfail "undefined line" depending on gcc version for s390. --- binutils/testsuite/binutils-all/objcopy.exp | 9 --------- ld/testsuite/ld-elfvers/vers.exp | 4 ++-- ld/testsuite/ld-gc/pr19161.d | 2 +- ld/testsuite/ld-scripts/rgn-over8-ok.d | 6 +----- ld/testsuite/ld-scripts/weak.exp | 3 ++- ld/testsuite/ld-undefined/undefined.exp | 7 ++++++- 6 files changed, 12 insertions(+), 19 deletions(-) diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp index 77af5ba84ba..361e430f119 100644 --- a/binutils/testsuite/binutils-all/objcopy.exp +++ b/binutils/testsuite/binutils-all/objcopy.exp @@ -127,7 +127,6 @@ proc objcopy_test {testname srcfile type asflags ldflags} { } setup_xfail "hppa*-*-*" -setup_xfail "sh-*-coff*" setup_xfail "tic54x-*-*" clear_xfail "hppa*64*-*-hpux*" "hppa*-*-linux*" "hppa*-*-lites*" clear_xfail "hppa*-*-*n*bsd*" "hppa*-*-*elf*" @@ -1215,14 +1214,7 @@ set elf64 "" if [is_elf_format] { objcopy_test_symbol_manipulation objcopy_test_elf_common_symbols - - setup_xfail "hppa*-*-*" - setup_xfail "sh-*-coff*" - setup_xfail "tic54x-*-*" - clear_xfail "hppa*64*-*-hpux*" "hppa*-*-linux*" "hppa*-*-lites*" - clear_xfail "hppa*-*-*n*bsd*" "hppa*-*-*elf*" objcopy_test "ELF unknown section type" unknown.s object "" "" - objcopy_test_readelf "ELF group 1" group.s objcopy_test_readelf "ELF group 2" group-2.s objcopy_test_readelf "ELF group 3" group-3.s @@ -1461,7 +1453,6 @@ run_dump_test "pr23633" run_dump_test "set-section-alignment" setup_xfail "hppa*-*-*" -setup_xfail "sh-*-coff*" setup_xfail "spu-*-*" clear_xfail "hppa*64*-*-hpux*" "hppa*-*-linux*" "hppa*-*-lites*" clear_xfail "hppa*-*-*n*bsd*" "hppa*-*-*elf*" diff --git a/ld/testsuite/ld-elfvers/vers.exp b/ld/testsuite/ld-elfvers/vers.exp index 236ebbce7bc..b266cc0226f 100644 --- a/ld/testsuite/ld-elfvers/vers.exp +++ b/ld/testsuite/ld-elfvers/vers.exp @@ -801,13 +801,13 @@ build_exec "vers3" vers3.c vers3 "-Wl,--no-as-needed" vers1.so vers3.ver vers3.d # This test fails on MIPS. On the MIPS we must put foo in the dynamic # symbol table, which the test does not expect. -setup_xfail "mips*-*-*" +setup_xfail "mips*-*-irix*" build_exec "vers4" vers4.c vers4 "" "" "" "" vers4.sym build_exec "vers4a" vers4.c vers4a "-Wl,-export-dynamic" "" vers4a.ver vers4a.dsym vers4a.sym # Verify that --no-export-dynamic undoes the effect of --export-dynamic. -setup_xfail "mips*-*-*" +setup_xfail "mips*-*-irix*" build_exec "vers4b" vers4.c vers4b "-Wl,-export-dynamic -Wl,--no-export-dynamic" "" "" "" vers4.sym diff --git a/ld/testsuite/ld-gc/pr19161.d b/ld/testsuite/ld-gc/pr19161.d index 474cbd4b1b4..75069649633 100644 --- a/ld/testsuite/ld-gc/pr19161.d +++ b/ld/testsuite/ld-gc/pr19161.d @@ -3,7 +3,7 @@ #ld: --gc-sections -e main tmpdir/pr19161-1.o tmpdir/pr19161-2.o #nm: --format=bsd #xfail: epiphany-*-* frv-*-* iq2000-*-* lm32-*-* m32c-*-* -#xfail: mips64vr-*-* msp430-*-* powerpc*-*-eabivle rl78-*-* rx-*-* sh*-*-* +#xfail: mips64vr-*-* msp430-*-* powerpc*-*-eabivle rl78-*-* rx-*-* #... 0*[1-9a-f]+[0-9a-f]*[ ](d|D)[ ]_*__start_my_section diff --git a/ld/testsuite/ld-scripts/rgn-over8-ok.d b/ld/testsuite/ld-scripts/rgn-over8-ok.d index fe6b1c9c21f..300e94788ab 100644 --- a/ld/testsuite/ld-scripts/rgn-over8-ok.d +++ b/ld/testsuite/ld-scripts/rgn-over8-ok.d @@ -2,13 +2,9 @@ # source: rgn-over8.s # ld: -T rgn-over8.t # objdump: -w -h -# xfail: rx-*-* *-*-nacl* +# xfail: rx-*-* # FAILS on the RX because the linker has to set LMA == VMA for the # Renesas loader. -# FAILs on NaCl targets because the linker extends the first segment -# to fill out the page, making its p_vaddr+p_memsz cover the sh_addr -# of .bss too, which makes BFD compute its LMA from the p_paddr of the -# text segment. .*: file format .* diff --git a/ld/testsuite/ld-scripts/weak.exp b/ld/testsuite/ld-scripts/weak.exp index 9df57c7d97f..654cf716164 100644 --- a/ld/testsuite/ld-scripts/weak.exp +++ b/ld/testsuite/ld-scripts/weak.exp @@ -28,7 +28,8 @@ if { [is_elf_format] } { setup_xfail hppa64-*-* } elseif { [is_pecoff_format] } { # Weak symbols are broken for most PE targets. - if { ![istarget i?86-*-*] + if { ![istarget aarch64-*-*] + && ![istarget i?86-*-*] && ![istarget sh-*-*] && ![istarget x86_64-*-*] } { setup_xfail *-*-* diff --git a/ld/testsuite/ld-undefined/undefined.exp b/ld/testsuite/ld-undefined/undefined.exp index 0d76c9e2593..69a8f9bf6a9 100644 --- a/ld/testsuite/ld-undefined/undefined.exp +++ b/ld/testsuite/ld-undefined/undefined.exp @@ -141,7 +141,12 @@ if { ![check_compiler_available] } { # error message is 8 instead of 9. On 64 bit s/390 this works # because of the new brasl instruction that doesn't need a literal # pool entry. - setup_xfail s390-*-* + # FIXME: this test has been an XPASS since 2021-04 (and maybe + # earlier, that's just where my logs went back to). Testing the + # gcc version is a wild guess at what might have changed. + if ![at_least_gcc_version 11 0] { + setup_xfail s390-*-* + } # See comments above for Xtensa. setup_xfail xtensa*-*-linux* -- 2.30.2