diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 8289b23db9e..245d1d007c8 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/dlltool.exp: Set XFAIL if $target_xfail is yes.
+
 2004-10-23  Aaron W. LaFramboise  <aaron98wiridge9@aaronwl.com>
 
 	* binutils-all/alias.def: New file.
diff --git a/binutils/testsuite/binutils-all/dlltool.exp b/binutils/testsuite/binutils-all/dlltool.exp
index 3f6cd315d4e..a2cd2f61591 100644
--- a/binutils/testsuite/binutils-all/dlltool.exp
+++ b/binutils/testsuite/binutils-all/dlltool.exp
@@ -45,6 +45,10 @@ if ![string match "" $err] then {
     pass "dlltool (fastcall export)"
 }
 
+if { "$target_xfail" == "yes" } {
+    setup_xfail *-*
+}
+
 verbose "$DLLTOOL -p prefix -l tmpdir/libalias.a -d $srcdir/$subdir/alias.def $dlltool_gas_flag" 1
 catch "exec $DLLTOOL -p prefix -l tmpdir/libalias.a -d $srcdir/$subdir/alias.def $dlltool_gas_flag" err