[PATCH] Avoid spurious testsuite failures

[Andreas Schwab]

The ia64 assembler sometimes gives the following warning:

Warning: Additional NOP may be necessary to workaround Itanium processor A/B step errata

Unless compiling with -mb-step these warnings are harmless, because the
code is not supposed to run on such processors, but the assembler does not
know.

Tested on ia64-linux.

Andreas.

gcc/testsuite/ChangeLog:
	* lib/prune.exp (prune_gcc_output): Ignore errata warning from
	IA64 assembler.

libstdc++-v3/ChangeLog:
	* testsuite/lib/prune.exp (prune_g++_output): Ignore errata
	warning from IA64 assembler.

--- gcc/testuite/lib/prune.exp.~1.10.~	2003-04-22 10:01:10.000000000 +0200
+++ gcc/testuite/lib/prune.exp	2004-03-16 10:40:04.000000000 +0100
@@ -1,4 +1,4 @@
-#   Copyright (C) 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
+#   Copyright (C) 1997, 1999, 2000, 2002, 2004 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,6 +28,10 @@ proc prune_gcc_output { text } {
     regsub -all "(^|\n)\[^\n\]*: warning: -f(pic|PIC) ignored for target\[^\n\]*" $text "" text
     regsub -all "(^|\n)\[^\n\]*: warning: -f(pic|PIC)( and -fpic are| is)? not supported\[^\n\]*" $text "" text
 
+    # Ignore errata warning from IA64 assembler.
+    regsub -all "(^|\n)\[^\n\]*: Additional NOP may be necessary to workaround Itanium processor A/B step errata" $text "" text
+    regsub -all "(^|\n)\[^\n*\]*: Assembler messages:\[^\n\]*" $text "" text
+
     # It would be nice to avoid passing anything to gcc that would cause it to
     # issue these messages (since ignoring them seems like a hack on our part),
     # but that's too difficult in the general case.  For example, sometimes
--- libstdc++-v3/testsuite/lib/prune.exp.~1.3.~	2002-01-07 10:49:04.000000000 +0100
+++ libstdc++-v3/testsuite/lib/prune.exp	2004-03-12 00:39:35.000000000 +0100
@@ -1,4 +1,4 @@
-#   Copyright (C) 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+#   Copyright (C) 1997, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,5 +25,9 @@ proc prune_g++_output { text } {
     # definitions, etc as these confuse dejagnu
     regsub -all "(^|\n)\[^\n\]*: In function \[^\n\]*" $text "" text
 
+    # Ignore errata warning from IA64 assembler.
+    regsub -all "(^|\n)\[^\n\]*: Additional NOP may be necessary to workaround Itanium processor A/B step errata" $text "" text
+    regsub -all "(^|\n)\[^\n*\]*: Assembler messages:\[^\n\]*" $text "" text
+
     return $text
 }

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."