diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 072c904b067..6ea5ebf24f5 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR testsuite/40704
+	* test_summary: Filter out "\r". 
+
 2009-06-02  Alexandre Oliva  <aoliva@redhat.com>
 
 	* compare-debug: Don't fail just because of .eh_frame differences.
diff --git a/contrib/test_summary b/contrib/test_summary
index 9bb06051efd..f7cddf4af78 100755
--- a/contrib/test_summary
+++ b/contrib/test_summary
@@ -131,7 +131,7 @@ configflags == "" {
 $2 == "version" { save = $0; $1 = ""; $2 = ""; version = $0; gsub(/^ */, "", version); gsub(/\r$/, "", version); $0 = save; }
 /\===.*Summary/ { print ""; print; blanks=1; }
 /tests ===/ || /^(Target|Host|Native)/ || $2 == "version" { print; blanks=1; }
-/^(XPASS|FAIL|UNRESOLVED|WARNING|ERROR|# of )/ { print; }
+/^(XPASS|FAIL|UNRESOLVED|WARNING|ERROR|# of )/ { sub ("\r", ""); print; }
 /^using:/ { print ""; print; print ""; }
 # dumpall != 0 && /^X?(PASS|FAIL|UNTESTED)|^testcase/ { dumpall=0; }
 # dumpall != 0 { print; }