Import from GCC tree:

2006-06-02  Richard Earnshaw  <rearnsha@arm.com>
		    Mike Stump  <mrs@apple.com>

	* compare_tests: Handle multilibs better.

ChangeLog

@@ -1,3 +1,11 @@
+2006-06-06  Ben Elliston  <bje@gnu.org>
+
+	Import from GCC tree:
+	2006-06-02  Richard Earnshaw  <rearnsha@arm.com>
+		    Mike Stump  <mrs@apple.com>
+
+	* compare_tests: Handle multilibs better.
+
 2006-06-06  Ben Elliston  <bje@gnu.org>
 
 	* doc/dejagnu.texi: Regnerate using Docbook2X 0.8.7.

contrib/compare_tests

@@ -22,8 +22,8 @@ if [ "$2" = "" ]; then
 	exit 2
 fi
 
-sed 's/^XFAIL/FAIL/; s/^XPASS/PASS/' < "$1" >$tmp1
-sed 's/^XFAIL/FAIL/; s/^XPASS/PASS/' < "$2" >$tmp2
+sed 's/^XFAIL/FAIL/; s/^XPASS/PASS/' < "$1" | awk '/^Running target / {target = $3} { if (target != "unix") { sub(/: /, "&"target": " ); }; print $0; }' >$tmp1
+sed 's/^XFAIL/FAIL/; s/^XPASS/PASS/' < "$2" | awk '/^Running target / {target = $3} { if (target != "unix") { sub(/: /, "&"target": " ); }; print $0; }' >$tmp2
 
 before=$tmp1
 now=$tmp2