From patchwork Wed Jul 13 07:12:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carrot Wei X-Patchwork-Id: 104478 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id D0AB8B6F74 for ; Wed, 13 Jul 2011 17:13:38 +1000 (EST) Received: (qmail 25376 invoked by alias); 13 Jul 2011 07:13:35 -0000 Received: (qmail 25368 invoked by uid 22791); 13 Jul 2011 07:13:34 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, SPF_HELO_PASS, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (216.239.44.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 13 Jul 2011 07:12:53 +0000 Received: from hpaq7.eem.corp.google.com (hpaq7.eem.corp.google.com [172.25.149.7]) by smtp-out.google.com with ESMTP id p6D7Cq1T015526; Wed, 13 Jul 2011 00:12:52 -0700 Received: from guozhiwei.sha.corp.google.com (guozhiwei.sha.corp.google.com [172.30.123.48]) by hpaq7.eem.corp.google.com with ESMTP id p6D7Cn4K023412; Wed, 13 Jul 2011 00:12:50 -0700 Received: by guozhiwei.sha.corp.google.com (Postfix, from userid 68690) id DCBB42140E; Wed, 13 Jul 2011 15:12:42 +0800 (CST) To: reply@codereview.appspotmail.com, davidxl@google.com, dougkwan@google.com, gcc-patches@gcc.gnu.org Subject: [google] Backport patch r175881 from gcc-4_6-branch to google/gcc-4_6 (issue4695051) Message-Id: <20110713071242.DCBB42140E@guozhiwei.sha.corp.google.com> Date: Wed, 13 Jul 2011 15:12:42 +0800 (CST) From: carrot@google.com (Guozhi Wei) X-System-Of-Record: true X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org 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 Backport from gcc-4_6-branch 2011-07-05 Jason Merrill 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 Index: ChangeLog =================================================================== --- ChangeLog (revision 176194) +++ ChangeLog (working copy) @@ -1,3 +1,8 @@ +2011-07-05 Jason Merrill + + PR testsuite/49643 + * g++.dg/rtti/anon-ns1.C: Allow for null-termination. + 2011-07-05 Rainer Orth * 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 {