* gas/config/tc-avr.c: Change ISA for devices with USB support to

[external/binutils.git] / ld / testsuite / ld-discard / discard.exp

diff --git a/ld/testsuite/ld-discard/discard.exp b/ld/testsuite/ld-discard/discard.exp
index 2131ffe..4fd4c43 100644 (file)
--- a/ld/testsuite/ld-discard/discard.exp
+++ b/ld/testsuite/ld-discard/discard.exp
@@ -1,5 +1,5 @@
 # Expect script for ld discard tests
-#   Copyright 2001, 2002, 2005, 2007 Free Software Foundation, Inc.
+#   Copyright 2001, 2002, 2005, 2007, 2010, 2012 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -25,14 +25,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*] \
+if { ![istarget *-*-linux*]
+     && ![istarget *-*-gnu*]
+     && ![istarget *-*-nacl*]
+     && ![istarget hppa*64*-*-hpux*]
      && ![istarget *-*-elf] } {
     return
 }
 
-if { [istarget *-*-linux*aout*] \
+if { [istarget *-*-linux*aout*]
      || [istarget *-*-linux*oldld*] } {
     return
 }
@@ -43,8 +44,5 @@ 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]]
-    # These fail because they use the generic linker.
-    setup_xfail "arc-*" "d30v-*" "dlx-*" "i960-*" "m6812-*" "m68hc12-*"
-    setup_xfail "or32-*" "pj-*"
     run_dump_test [file rootname [lindex $test_list $i]]
 }