From: Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
Date: Sat, 24 Dec 2005 18:57:18 +0000 (+0000)
Subject: backport: re PR target/18489 (mmix-knuth-mmixware testsuite failure: g++.dg/rtti... 
X-Git-Tag: releases/gcc-3.4.6~206
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38d560a2cecaf7a39489946f950233cec96b5ce2;p=thirdparty%2Fgcc.git

backport: re PR target/18489 (mmix-knuth-mmixware testsuite failure: g++.dg/rtti/tinfo1.C)

	Backport:
	2005-02-09  Joseph S. Myers  <joseph@codesourcery.com>

	* g++.dg/rtti/tinfo1.C: Allow newline after assembler label.

	2004-11-28  Hans-Peter Nilsson  <hp@bitrange.com>

	PR target/18489
	* g++.dg/rtti/tinfo1.C: In pattern for label definition ending
	delimeter, match space and TAB as well as ":".

	Backport portions of:
	2004-11-04  Ben Elliston  <bje@au.ibm.com>

	* g++.dg/rtti/tinfo1.C: Remove xfails.

From-SVN: r109042
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cd2317adab3b..d7107bf8ac9c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,21 @@
+2005-12-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	Backport:
+	2005-02-09  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* g++.dg/rtti/tinfo1.C: Allow newline after assembler label.
+
+	2004-11-28  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	PR target/18489
+	* g++.dg/rtti/tinfo1.C: In pattern for label definition ending
+	delimeter, match space and TAB as well as ":".
+
+	Backport portions of:
+	2004-11-04  Ben Elliston  <bje@au.ibm.com>
+
+	* g++.dg/rtti/tinfo1.C: Remove xfails.
+
 2005-12-22  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	PR testsuite/20772
diff --git a/gcc/testsuite/g++.dg/rtti/tinfo1.C b/gcc/testsuite/g++.dg/rtti/tinfo1.C
index 28f2527e87cb..345e39f9fd39 100644
--- a/gcc/testsuite/g++.dg/rtti/tinfo1.C
+++ b/gcc/testsuite/g++.dg/rtti/tinfo1.C
@@ -1,7 +1,7 @@
 // Test if a local definition is in a linkonce/comdat section.
 // { dg-do compile }
-// { dg-final { scan-assembler "_ZTIP9CTemplateIhE:" { xfail *-*-* } } }
-// { dg-final { scan-assembler-not ".globl\[ 	\]+_ZTIP9CTemplateIhE" { xfail *-*-* } } }
+// { dg-final { scan-assembler "_ZTIP9CTemplateIhE\[: \t\n\]" } }
+// { dg-final { scan-assembler-not ".globl\[ 	\]+_ZTIP9CTemplateIhE" } }
 // { dg-final { scan-assembler-not ".section\[^\n\r\]*_ZTIP9CTemplateIhE\[^\n\r\]*" { xfail *-*-* } } };