From 28a66f07f0695c740dc0e1b043cd36f90dbfb5ea Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 18 Mar 2019 11:11:39 +1030 Subject: [PATCH] csky ld testsuite fixes * testsuite/ld-elf/merge.d: Remove csky from xfails, add moxie. * testsuite/ld-elf/pr21884.d: Remove csky from xfails. * testsuite/ld-elf/shared.exp: Add csky to list not xfailing pr22374. * testsuite/ld-unique/pr21529.d: Remove csky from xfails --- ld/ChangeLog | 7 +++++++ ld/testsuite/ld-elf/merge.d | 8 ++++---- ld/testsuite/ld-elf/pr21884.d | 2 +- ld/testsuite/ld-elf/shared.exp | 1 + ld/testsuite/ld-unique/pr21529.d | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 76e2c719bab..9000cabf9de 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2019-03-18 Alan Modra + + * testsuite/ld-elf/merge.d: Remove csky from xfails, add moxie. + * testsuite/ld-elf/pr21884.d: Remove csky from xfails. + * testsuite/ld-elf/shared.exp: Add csky to list not xfailing pr22374. + * testsuite/ld-unique/pr21529.d: Remove csky from xfails + 2019-03-15 Nick Clifton PR 24262 diff --git a/ld/testsuite/ld-elf/merge.d b/ld/testsuite/ld-elf/merge.d index 28c713cd2f6..dc0bcc50ccd 100644 --- a/ld/testsuite/ld-elf/merge.d +++ b/ld/testsuite/ld-elf/merge.d @@ -1,11 +1,11 @@ #source: merge.s #ld: -T merge.ld #objdump: -s -#xfail: bfin-*-* cr16-*-* cris*-*-* crx-*-* csky-*-* d10v-*-* d30v-*-* dlx-*-* +#xfail: bfin-*-* cr16-*-* cris*-*-* crx-*-* d10v-*-* d30v-*-* dlx-*-* #xfail: fr30-*-* frv-*-* ft32-*-* h8300-*-* hppa*64*-*-* ip2k-*-* iq2000-*-* -#xfail: lm32-*-* m68hc11-*-* mcore-*-* mep-*-* metag-*-* mn102*-*-* ms1-*-* -#xfail: nds32*-*-* nios2-*-* or32-*-* pj-*-* pru-*-* s12z-*-* score-*-* tic6x-*-* -#xfail: vax-*-* xgate-*-* xstormy16-*-* xtensa*-*-* +#xfail: lm32-*-* m68hc11-*-* mcore-*-* mep-*-* metag-*-* mn102*-*-* moxie-*-* +#xfail: ms1-*-* nds32*-*-* nios2-*-* or32-*-* pj-*-* pru-*-* s12z-*-* score-*-* +#xfail: tic6x-*-* vax-*-* xgate-*-* xstormy16-*-* xtensa*-*-* .*: file format .*elf.* diff --git a/ld/testsuite/ld-elf/pr21884.d b/ld/testsuite/ld-elf/pr21884.d index c230924156d..3d44ccfe602 100644 --- a/ld/testsuite/ld-elf/pr21884.d +++ b/ld/testsuite/ld-elf/pr21884.d @@ -3,7 +3,7 @@ #ld: -T pr21884.t #objdump: -b binary -s #xfail: aarch64*-*-* arm*-*-* avr-*-* ia64-*-* m68hc1*-*-* nds32*-*-* -#xfail: riscv*-*-* score-*-* v850-*-* csky-*-* +#xfail: riscv*-*-* score-*-* v850-*-* # Skip targets which can't change output format to binary. .*: file format binary diff --git a/ld/testsuite/ld-elf/shared.exp b/ld/testsuite/ld-elf/shared.exp index 217694c5185..fc19bc056b9 100644 --- a/ld/testsuite/ld-elf/shared.exp +++ b/ld/testsuite/ld-elf/shared.exp @@ -459,6 +459,7 @@ run_ld_link_tests [list \ "-shared" "" "$AFLAGS_PIC" "pr22374b.s" {} "pr22374.so" ] \ ] if { ![istarget "alpha-*-*"] + && ![istarget "csky-*-*"] && ![istarget "frv-*-*"] && ![istarget "hppa*-*-*"] && ![istarget "i?86-*-*"] diff --git a/ld/testsuite/ld-unique/pr21529.d b/ld/testsuite/ld-unique/pr21529.d index 0e6332e42f4..fb637943909 100644 --- a/ld/testsuite/ld-unique/pr21529.d +++ b/ld/testsuite/ld-unique/pr21529.d @@ -1,6 +1,6 @@ #ld: --oformat binary -T pr21529.ld -e main #objdump: -s -b binary -#xfail: aarch64*-*-* arm*-*-* avr-*-* ia64-*-* m68hc1*-*-* nds32*-*-* riscv*-*-* score-*-* v850-*-* csky-*-* +#xfail: aarch64*-*-* arm*-*-* avr-*-* ia64-*-* m68hc1*-*-* nds32*-*-* riscv*-*-* score-*-* v850-*-* # Skip targets which can't change output format to binary. #pass -- 2.30.2