* ld-elf/flags1.d: Don't xfail tic6x.

	* ld-scripts/weak.exp: Correct comments.  Don't xfail sh-pe.  Remove
	redundant xfail.
	* ld-selective/sel-dump.exp: Don't xfail alpha.
	* ld-selective/selective.exp: Run for alpha.
	* ld-undefined/weak-undef.exp: Don't xfail hppa64.

6 files changed, 12 insertions, 14 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 1bb19fe..3b31a91 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -98,7 +98,6 @@
 
 2011-05-03  Paul Brook  <paul@codesourcery.com>
 
-
 	* ld-tic6x/ehtype-reloc-1-rel.d: New test.
 	* ld-tic6x/ehtype-reloc-1.d: New test.
 	* ld-tic6x/ehtype-reloc-1.s: New test.
diff --git a/ld/testsuite/ld-elf/flags1.d b/ld/testsuite/ld-elf/flags1.d
index 2053de0..e6bb001 100644
--- a/ld/testsuite/ld-elf/flags1.d
+++ b/ld/testsuite/ld-elf/flags1.d
@@ -3,10 +3,10 @@
 #objcopy_linked_file: --set-section-flags .post_text_reserve=contents,alloc,load,readonly,code 
 #readelf: -l --wide
 #xfail: "avr-*-*" "dlx-*-*" "h8300-*-*" "i960-*-*" "ip2k-*-*" "m32r-*-*"
-#xfail: "moxie-*-*" "mt-*-*" "msp430-*-*" "tic6x-*-*"
+#xfail: "moxie-*-*" "mt-*-*" "msp430-*-*"
 #xfail: "*-*-hpux*" "hppa*64*-*-*"
-# Fails on the AVR, DLX, H8300, I960, IP2K, M32R, MOXIE, MT, MSP430 and
-#  TI C6X because the two sections are not merged into one segment.
+# Fails on the AVR, DLX, H8300, I960, IP2K, M32R, MOXIE, MT, and MSP430
+#  because the two sections are not merged into one segment.
 #  (There is no good reason why they have to be).
 # Fails on HPUX systems because the .type pseudo-op behaves differently.
 # Fails on hppa64 because a PHDR is always added.
diff --git a/ld/testsuite/ld-scripts/weak.exp b/ld/testsuite/ld-scripts/weak.exp
index d021df7..cba6e25 100644
--- a/ld/testsuite/ld-scripts/weak.exp
+++ b/ld/testsuite/ld-scripts/weak.exp
@@ -1,6 +1,6 @@
 # Test weak symbols.
 # By Ian Lance Taylor, Cygnus Solutions.
-#   Copyright 1999, 2000, 2002, 2004, 2005, 2006, 2007, 2009
+#   Copyright 1999, 2000, 2002, 2004, 2005, 2006, 2007, 2009, 2011
 #   Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
@@ -22,17 +22,16 @@
 
 set testname "weak symbols"
 
-# This test only works for ELF targets.
+# This test only works for ELF targets and some PE targets.
 # It ought to work for some a.out targets, but it doesn't.
 if {! [is_elf_format] && ! [is_pecoff_format]} {
     unsupported $testname
     return
 }
 
-# Weak symbols are broken for non-i386 PE targets.
-if {! [istarget i?86-*-*]} {
+# Weak symbols are broken for most PE targets.
+if {! [istarget i?86-*-*] && ! [istarget sh-*-*]} {
     setup_xfail *-*-pe*
-    setup_xfail x86_64-*-pe*
 }
 
 # hppa64 and or32 are incredibly broken
diff --git a/ld/testsuite/ld-selective/sel-dump.exp b/ld/testsuite/ld-selective/sel-dump.exp
index 5003d31..c78bd6e 100644
--- a/ld/testsuite/ld-selective/sel-dump.exp
+++ b/ld/testsuite/ld-selective/sel-dump.exp
@@ -1,5 +1,5 @@
 # Expect script for ld selective linking tests running run_dump_test
-#   Copyright 2002, 2005, 2004, 2007 Free Software Foundation, Inc.
+#   Copyright 2002, 2005, 2004, 2007, 2011 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -28,7 +28,7 @@ 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*-*" "am33*-*" "arc*-*" "d30v*-*" "dlx*-*"
+    setup_xfail "am33*-*" "arc*-*" "d30v*-*" "dlx*-*"
     setup_xfail "hppa*64-*-*" "i370*-*" "i860*-*" "i960*-*" "ia64*-*"
     setup_xfail "m88*-*" "mn10200-*" "mep-*" "or32-*" "pj-*"
     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 505db65..d4d30ec 100644
--- a/ld/testsuite/ld-selective/selective.exp
+++ b/ld/testsuite/ld-selective/selective.exp
@@ -28,7 +28,7 @@ if ![is_elf_format] {
 }
 
 # These targets do not support selective linking
-if {[istarget "alpha*-*-*"] || [istarget "am33*-*-*"] ||
+if {[istarget "am33*-*-*"] ||
     [istarget "arc-*-*"] || [istarget "d30v-*-*"] ||
     [istarget "dlx-*-*"] || [istarget "hppa*64*-*-*"] ||
     [istarget "i370-*-*"] || [istarget "i860-*-*"] ||
diff --git a/ld/testsuite/ld-undefined/weak-undef.exp b/ld/testsuite/ld-undefined/weak-undef.exp
index e7e949a..2f70eeb 100644
--- a/ld/testsuite/ld-undefined/weak-undef.exp
+++ b/ld/testsuite/ld-undefined/weak-undef.exp
@@ -1,5 +1,5 @@
 # Test handling of weak undefined symbols
-#   Copyright 2001, 2002, 2004, 2005, 2007, 2010
+#   Copyright 2001, 2002, 2004, 2005, 2007, 2010, 2011
 #   Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
@@ -50,7 +50,7 @@ if {! [istarget i?86-*-*]} {
     setup_xfail *-*-pe*
 }
 
-setup_xfail hppa64-*-* pj-*-*
+setup_xfail pj-*-*
 
 if {! [ld_assemble $as $srcdir/$subdir/weak-undef.s tmpdir/weak-undef.o]} then {
     # It's OK if .weak doesn't work on this target.