diff mbox

[google] Backport patch r175881 from gcc-4_6-branch to google/gcc-4_6 (issue4695051)

Message ID 20110713071242.DCBB42140E@guozhiwei.sha.corp.google.com
State New
Headers show

Commit Message

Carrot Wei July 13, 2011, 7:12 a.m. UTC
Hi

This patch fixes a testing error on arm backend. It has been tested on both
x86 and arm target with following commands.

make check-g++ RUNTESTFLAGS="--target_board=arm-sim/thumb/arch=armv7-a dg.exp=anon-ns1.C"
make check-g++ RUNTESTFLAGS="dg.exp=anon-ns1.C"

thanks
Carrot

2011-07-13  Guozhi Wei  <carrot@google.com>

	Backport from gcc-4_6-branch

	2011-07-05  Jason Merrill  <jason@redhat.com>

		PR testsuite/49643
		* g++.dg/rtti/anon-ns1.C: Allow for null-termination.


 	Backport from gcc-4_6-branch

--
This patch is available for review at http://codereview.appspot.com/4695051

Comments

Diego Novillo July 13, 2011, 11:37 a.m. UTC | #1
On Wed, Jul 13, 2011 at 03:12, Guozhi Wei <carrot@google.com> wrote:
> Hi
>
> This patch fixes a testing error on arm backend. It has been tested on both
> x86 and arm target with following commands.
>
> make check-g++ RUNTESTFLAGS="--target_board=arm-sim/thumb/arch=armv7-a dg.exp=anon-ns1.C"
> make check-g++ RUNTESTFLAGS="dg.exp=anon-ns1.C"

Carrot, did you backport this patch with svnmerge.py?


Thanks.  Diego.
diff mbox

Patch

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 176194)
+++ ChangeLog	(working copy)
@@ -1,3 +1,8 @@ 
+2011-07-05  Jason Merrill  <jason@redhat.com>
+
+	PR testsuite/49643
+	* g++.dg/rtti/anon-ns1.C: Allow for null-termination.
+
 2011-07-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* ada/acats/run_acats (which): Extract last field from type -p,
Index: g++.dg/rtti/anon-ns1.C
===================================================================
--- g++.dg/rtti/anon-ns1.C	(revision 176194)
+++ g++.dg/rtti/anon-ns1.C	(working copy)
@@ -2,7 +2,7 @@ 
 // The typeinfo name for A should start with * so we compare
 // it by address rather than contents.
 
-// { dg-final { scan-assembler "\"\*N\[^\"\]+1AE\"" } }
+// { dg-final { scan-assembler "\"\*N\[^\"\]+1AE" } }
 
 namespace
 {