* Import orphaned patches from sources.redhat.com:

	2002-05-02  Fernando Nasser  <fnasser@redhat.com>
	* doc/dejagnu.texi: Document KFAIL and KPASS.

	2002-02-20  Richard Henderson  <rth@redhat.com>
	* lib/target.exp (prune_warnings): Revert early "In function" strip,
	as this breaks g++.dg tests.  Match dangerous regexp without the
	"In function" header.

	2002-02-09  Richard Henderson  <rth@redhat.com>
	* lib/target.exp (prune_warnings): Strip "In function" etc early.
	Adjust "dangerous" regexp for glibc's tmpnam warning.

	2001-09-10  Jim Blandy  <jimb@redhat.com>
	* baseboards/rom68k-idp.exp: Use -Tidpgdb.ld as the linker script,
	so we get the version of the `outbyte' function that does console
	output in a way that GDB's rom68k target recognizes.  Note that
	the board can now do output.

	2000-04-25  Felix Lee  <flee@cygnus.com>
	* baseboards/tx39-sim.exp: Use idt, not dve linker script.  Delete
 	misleading comments and null statements.

8 files changed, 61 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index fdcdf6b..6aaeb2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,31 @@
 2004-01-30  Ben Elliston  <bje@wasabisystems.com>
 
+	Import orphaned patches from sources.redhat.com:
+
+	2002-05-02  Fernando Nasser  <fnasser@redhat.com>
+	* doc/dejagnu.texi: Document KFAIL and KPASS.
+
+	2002-02-20  Richard Henderson  <rth@redhat.com>
+	* lib/target.exp (prune_warnings): Revert early "In function" strip,
+	as this breaks g++.dg tests.  Match dangerous regexp without the
+	"In function" header.
+
+	2002-02-09  Richard Henderson  <rth@redhat.com>
+	* lib/target.exp (prune_warnings): Strip "In function" etc early.
+	Adjust "dangerous" regexp for glibc's tmpnam warning.
+
+	2001-09-10  Jim Blandy  <jimb@redhat.com>
+	* baseboards/rom68k-idp.exp: Use -Tidpgdb.ld as the linker script,
+	so we get the version of the `outbyte' function that does console
+	output in a way that GDB's rom68k target recognizes.  Note that
+	the board can now do output.
+
+	2000-04-25  Felix Lee  <flee@cygnus.com>
+	* baseboards/tx39-sim.exp: Use idt, not dve linker script.  Delete
+ 	misleading comments and null statements.
+	
+2004-01-30  Ben Elliston  <bje@wasabisystems.com>
+
 	* DejaGnu 1.4.4 released.
 
 2004-01-27  Ben Elliston  <bje@wasabisystems.com>
diff --git a/ChangeLog.0 b/ChangeLog.0
index af526b8..b211ad5 100644
--- a/ChangeLog.0
+++ b/ChangeLog.0
@@ -138,7 +138,7 @@ Wed Jun  5 14:52:15 PDT 2002   Joey Ekstrom <joey@ekstrom.org>
 
         * added documentation on xml capabilities
 
-2002-05-02  Fernando Nasser  <fnasser@localhost.localdomain>
+2002-05-02  Fernando Nasser  <fnasser@redhat.com>
 
         * runtest.exp: Add kfail_flag and kfail_prms variable
         initializations.
diff --git a/baseboards/rom68k-idp.exp b/baseboards/rom68k-idp.exp
index fc35cfb..2b2408d 100644
--- a/baseboards/rom68k-idp.exp
+++ b/baseboards/rom68k-idp.exp
@@ -63,8 +63,9 @@ if ![board_info $board exists output_format] {
     unset tempfil
 }
 
-# IDP linker script.
-set_board_info ldscript "-Wl,-Tidp.ld"
+# IDP linker script, with special console output routine for GDB.
+set_board_info ldscript "-Wl,-Tidpgdb.ld"
+
 # The idt interface can't return exit statuses, so gcc (ctorture et
 # al) needs to do what it can to get them.
 set_board_info needs_status_wrapper 1
@@ -75,9 +76,6 @@ set_board_info gdb_protocol  "rom68k"
 # Can't pass arguments to the program under test.
 set_board_info noargs 1
 
-# Nor can it do I/O in GDB.
-set_board_info gdb,noinferiorio 1
-
 # It has no signals.
 set_board_info gdb,nosignals 1
 
diff --git a/baseboards/tx39-sim.exp b/baseboards/tx39-sim.exp
index 6444126..5b16a0b 100644
--- a/baseboards/tx39-sim.exp
+++ b/baseboards/tx39-sim.exp
@@ -17,11 +17,6 @@
 # along with DejaGnu; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-# We need mips16.
-add_multilib_option ""
-
-# And we use the lsi linker script.
-set_board_info ldscript "-Wl,-Tdve.ld"
-
-# Otherwise we're the same as the standard MIPS simulator.
-load_base_board_description "mips-sim"
+# This file is unnecessary, but we'll keep it for now.
+# We're the same as the standard MIPS simulator.
+load_base_board_description "mips-sim";
diff --git a/baseboards/unix.exp b/baseboards/unix.exp
index 6bf4f43..782fdde 100644
--- a/baseboards/unix.exp
+++ b/baseboards/unix.exp
@@ -26,10 +26,6 @@ set_board_info compiler  "[find_gcc]"
 
 set_board_info bmk,use_alarm 1
 
-# Set host_library_path to pick up libs such as libstdc++
-
-#set_board_info host_library_path "[file dirname [file dirname [file dirname [file dirname [file dirname [exec [find_gcc] --print-prog-name=cc1]]]]]]/lib"
-
 # Do not use -lm on Cygwin
 if { [istarget "*-*-cygwin*"] } {
     set_board_info mathlib ""
@@ -39,4 +35,3 @@ if { [istarget "*-*-cygwin*"] } {
 if { [istarget "alpha*-*"] } {
     set_board_info ieee_multilib_flags "-mieee"
 }
-
diff --git a/doc/dejagnu.texi b/doc/dejagnu.texi
index cd41018..1fea03a 100644
--- a/doc/dejagnu.texi
+++ b/doc/dejagnu.texi
@@ -683,6 +683,14 @@ A pleasant kind of failure: a test was known to fail, but succeeded.
 This may indicate progress; inspect the test case to determine whether
 you should amend it to stop expecting failure.
 
+@item KPASS
+@kindex KPASS
+@cindex successful test, unexpected
+@cindex unexpected success
+A pleasant kind of failure: a test was known to fail, but succeeded.
+This may indicate progress; inspect the test case to determine whether
+you should amend it to stop expecting failure.
+
 @item FAIL
 @kindex FAIL
 @cindex failing test, unexpected
@@ -2068,6 +2076,15 @@ list of configuration target names.  It is only necessary to call
 @code{clear_kfail} if a test case ends without calling either
 @code{pass} or @code{fail}, after calling @code{setup_kfail}.
 
+@item clear_kfail @var{config}
+@cindex cancelling known failure
+@cindex known failure, cancelling
+Cancel a known failure (previously declared with @code{setup_kfail})
+for a particular set of configurations.  The @var{config} argument is a
+list of configuration target names.  It is only necessary to call
+@code{clear_kfail} if a test case ends without calling either
+@code{pass} or @code{fail}, after calling @code{setup_kfail}.
+
 @item verbose @r{[}-log@r{]} @r{[}-n@r{]} @r{[}--@r{]} @r{[}--@r{]} "@var{string}" @var{number}
 @cindex @code{verbose} builtin function
 Test cases can use this function to issue helpful messages depending on
diff --git a/lib/target.exp b/lib/target.exp
index b981a09..950f9c8 100644
--- a/lib/target.exp
+++ b/lib/target.exp
@@ -268,16 +268,23 @@ proc prune_warnings { text } {
     regsub -all "(^|\n)(\[^\n\]*: warning: reference to compatibility glob\[^\n\]*\n?)" $text "\\1" text
 
     # GNU ld warns about functions marked as dangerous in GNU libc.
-    regsub -all "(^|\n)\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*function is dangerous\[^\n\]*" $text "" text
-
-     # GNU ld warns about functions marked as dangerous in GNU libc.
+    regsub -all "(^|\n)\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*is dangerous\[^\n\]*" $text "" text
      regsub -all "(^|\n)\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*the use of \[^\n\]* is dangerous, better use \[^\n\]*" $text "" text
+    regsub -all "(^|\n)\[^\n\]*is dangerous\[^\n\]*" $text "" text
 
      # Libgloss libnosys defines functions that warn when linked in
     regsub -all "(^|\n)\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*is not implemented and will always fail\[^\n\]*" $text "" text
+    regsub -all "(^|\n)\[^\n\]*is not implemented and will always fail\[^\n\]*" $text "" text
+
+    # libstdc++-v3 tests can emit cpplib warnings due to duplicate -isystem / -I flags
+    regsub -all "(^|\n)\[^\n\]*: warning: changing search order for system directory\[^\n\]*" $text "" text
+    regsub -all "(^|\n)\[^\n\]*: warning:   as it has already been specified\[^\n\]*" $text "" text
 
     # Cygwin cc1 warns about -fpic and -fPIC
-    regsub -all ".*: warning: -f(pic|PIC) ignored for target .*" $text "" text
+    regsub -all "(^|\n)\[^\n\]*: warning: -f(pic|PIC) ignored for target \[^\n\]*" $text "" text
+
+    # Ignore linker warning when searching 64bit libraries in /lib.
+    regsub -all "(^|\n)\[^\n\]*: skipping incompatible \[^\n\]* when searching for \[^\n\]*" $text "" text
 
     # It might be tempting to get carried away and delete blank lines, etc.
     # Just delete *exactly* what we're ask to, and that's it.
diff --git a/runtest.exp b/runtest.exp
index 7baaa54..1d0084d 100755
--- a/runtest.exp
+++ b/runtest.exp
@@ -1194,7 +1194,6 @@ for { set i 0 } { $i < $argc } { incr i } {
 	    exit 1
 	}
     }
-
 }
 
 #