Merge commit 'upstream/2.20'

[msp430-binutils.git] / ld / testsuite / ld-scripts / weak.exp

diff --git a/ld/testsuite/ld-scripts/weak.exp b/ld/testsuite/ld-scripts/weak.exp
index de28755e682a808a16c4b886adef466579d474aa..d021df7093d17cac5cc2b96388274a93480efd61 100644 (file)
--- 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, 2006, 2007
+#   Copyright 1999, 2000, 2002, 2004, 2005, 2006, 2007, 2009
 #   Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
@@ -32,7 +32,7 @@ if {! [is_elf_format] && ! [is_pecoff_format]} {
 # Weak symbols are broken for non-i386 PE targets.
 if {! [istarget i?86-*-*]} {
     setup_xfail *-*-pe*
-    setup_xfail x86_64-*-mingw*
+    setup_xfail x86_64-*-pe*
 }
 
 # hppa64 and or32 are incredibly broken
@@ -60,14 +60,13 @@ set weak_regexp_little \
 if {! [ld_simple_link $ld tmpdir/weak "$flags -T $srcdir/$subdir/weak.t tmpdir/weak1.o tmpdir/weak2.o"] } then {
     fail $testname
 } else {
-    if {[which $objdump] == 0} then {
+    if {![is_remote host] && [which $objdump] == 0} then {
        unresolved $testname
        set LDFLAGS "$saved_LDFLAGS"
        return
     }
 
-    verbose -log "$objdump -s tmpdir/weak"
-    catch "exec $objdump -s tmpdir/weak" exec_output
+    set exec_output [run_host_cmd "$objdump" "-s tmpdir/weak"]
     set exec_output [prune_warnings $exec_output]
     verbose -log $exec_output