* ld-selective/sel-dump.exp: Use is_elf_format, xfail assorted targets.

	* ld-selective/selective.exp: Likewise.

2 files changed, 11 insertions, 44 deletions

diff --git a/ld/testsuite/ld-selective/sel-dump.exp b/ld/testsuite/ld-selective/sel-dump.exp
index 273271c728..b3e8517a0e 100644
--- a/ld/testsuite/ld-selective/sel-dump.exp
+++ b/ld/testsuite/ld-selective/sel-dump.exp
@@ -17,24 +17,15 @@
 
 # Test for ELF here, so we don't have to qualify on ELF specifically
 # in every .d-file.
-
-if { ![istarget *-*-linux*]
-     && ![istarget *-*-gnu]
-     && ![istarget hppa*64*-*-hpux*]
-     && ![istarget *-*-elf] } {
+if ![is_elf_format] {
     return
 }
 
-if { [istarget *-*-linux*aout*] \
-     || [istarget *-*-linux*oldld*] } {
-    return
-}
-
-load_lib ld-lib.exp
-
 set test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
 for { set i 0 } { $i < [llength $test_list] } { incr i } {
     # We need to strip the ".d", but can leave the dirname.
     verbose [file rootname [lindex $test_list $i]]
+    setup_xfail "alpha*-*" "arc*-*" "d30v*-*" "dlx*-*" "i370*-*" "i860*-*"
+    setup_xfail "i960*-*" "ia64*-*" "mn10200-*" "or32-*" "pj-*" "sparc64*-*"
     run_dump_test [file rootname [lindex $test_list $i]]
 }
diff --git a/ld/testsuite/ld-selective/selective.exp b/ld/testsuite/ld-selective/selective.exp
index d2e4885373..a8f1326437 100644
--- a/ld/testsuite/ld-selective/selective.exp
+++ b/ld/testsuite/ld-selective/selective.exp
@@ -18,34 +18,8 @@
 # Written by Catherine Moore (clm@cygnus.com)
 # Make sure that constructors are handled correctly.
 
-
-# AOUT based ports do not support selective linking
-if {[istarget "*-*-*aout*"] \
-    || [istarget "*-*-*bout*"] \
-    || [istarget "vax-*-ultrix*"]} {
-    return
-}
-
-# COFF based ports do not support selective linking
-if {[istarget "*-*-coff"]} {
-    return
-}
-if {[istarget "*-*-pe"]} {
-    return
-}
-
-# Alpha does not support selective linking
-if {[istarget "alpha*-*-*"]} {
-    return
-}
-
-# IA64 does not support selective linking
-if {[istarget "ia64-*-*"]} {
-    return
-}
-
-# s390 does not support selective linking
-if {[istarget "s390*-*-*"]} {
+# Only ELF based ports support selective linking
+if ![is_elf_format] {
     return
 }
 
@@ -60,11 +34,11 @@ if {[istarget "s390*-*-*"]} {
 #
 # FIXME: Instead of table, read settings from each source-file.
 set seltests {
-  {selective1 C   1.c  {}       {}    {dropme1 dropme2} {alpha*-*}}
-  {selective2 C   2.c  {}       {}    {foo} {alpha*-* mips*-*}}
+  {selective1 C   1.c  {}       {}    {dropme1 dropme2} {}}
+  {selective2 C   2.c  {}       {}    {foo} {mips*-*}}
   {selective3 C   2.c  {-u foo} {foo} {{foo 0}} {mips*-*}}
-  {selective4 C++ 3.cc {}       {start a A::foo() B::foo()} {A::bar()} {alpha*-*  mips*-*}}
-  {selective5 C++ 4.cc {}       {start a A::bar()} {A::foo() B::foo()} {alpha*-*  mips*-*}}
+  {selective4 C++ 3.cc {}       {start a A::foo() B::foo()} {A::bar()} {mips*-*}}
+  {selective5 C++ 4.cc {}       {start a A::bar()} {A::foo() B::foo()} {mips*-*}}
   {selective6 C++ 5.cc {}       {start a A::bar()}
     {A::foo() B::foo() dropme1() dropme2()} {*-*-*}}
 }
@@ -104,6 +78,8 @@ foreach testitem $seltests {
     foreach xfail_target $xfails {
 	setup_xfail $xfail_target
     }
+    setup_xfail "alpha*-*" "arc*-*" "d30v*-*" "dlx*-*" "i370*-*" "i860*-*"
+    setup_xfail "i960*-*" "ia64*-*" "mn10200-*" "or32-*" "pj-*" "sparc64*-*"
 
     # It's either C or C++ at the moment.
     if { $testtype == "C++" } {