From patchwork Wed Oct 17 19:59:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Howarth X-Patchwork-Id: 192135 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 443D72C0091 for ; Thu, 18 Oct 2012 06:59:17 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1351108758; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition:User-Agent:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=crel4pS6xo3vwdC+j8QNq4eBjjM=; b=EKVcnmFjotO4raC Kppt9rFrehWkMxcfGnutkJYQl7313UnTc0smsSxHGFf0hrkgMgpkGyR4MqUb2D4D /QZpSsjyJ3Mw2UojPq6dyby1DoNUyKcvWnkycTyz6snjtFxuaAFZIStJ0Ul4J2WZ JbcmfwOYKFJefbgSIl0vaFiqNjcQ= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type:Content-Disposition:User-Agent:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=GRoKRjXsOJgc7C3euCmGIBqHvN6RdzowQ8czi/prHSL0SqDkSY16PbTvXZ7sng WyXwjwuLsN/mycSMDYrycAoA2uv5S4dPiAcI109+OvhnCchzw2Uqr3ZQ6xuk8dHE vCXA71CSnPmDIIc7218iG/C85Jo1XHUmv51dNdfMhL498=; Received: (qmail 30146 invoked by alias); 17 Oct 2012 19:59:14 -0000 Received: (qmail 30138 invoked by uid 22791); 17 Oct 2012 19:59:13 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from bromo.med.uc.edu (HELO bromo.med.uc.edu) (129.137.3.146) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 17 Oct 2012 19:59:07 +0000 Received: from bromo.med.uc.edu (localhost.localdomain [127.0.0.1]) by bromo.med.uc.edu (Postfix) with ESMTP id 569A9B005C; Wed, 17 Oct 2012 15:59:06 -0400 (EDT) Received: (from howarth@localhost) by bromo.med.uc.edu (8.14.3/8.14.3/Submit) id q9HJx5TY013095; Wed, 17 Oct 2012 15:59:05 -0400 Date: Wed, 17 Oct 2012 15:59:05 -0400 From: Jack Howarth To: gcc-patches@gcc.gnu.org Cc: dominiq@lps.ens.fr, mikestump@comcast.net, iain@codesourcery.com Subject: [PATCH] partial fix for PR target/54404 Message-ID: <20121017195905.GA13093@bromo.med.uc.edu> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) 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 The attached patch eliminates the failures in g++.dg/other/darwin-cfstring1.C and obj-c++.dg/strings/const-cfstring-2.mm by adding -ftrack-macro-expansion=0 to dg-options which partially eliminates the remaining failures in PR target/54404. These changes eliminate the failures... FAIL: g++.dg/other/darwin-cfstring1.C -std=gnu++98 (test for errors, line 21) FAIL: g++.dg/other/darwin-cfstring1.C -std=gnu++98 (test for errors, line 22) FAIL: g++.dg/other/darwin-cfstring1.C -std=gnu++98 (test for excess errors) FAIL: g++.dg/other/darwin-cfstring1.C -std=gnu++11 (test for errors, line 21) FAIL: g++.dg/other/darwin-cfstring1.C -std=gnu++11 (test for errors, line 22) FAIL: g++.dg/other/darwin-cfstring1.C -std=gnu++11 (test for excess errors) FAIL: obj-c++.dg/strings/const-cfstring-2.mm -fnext-runtime (test for warnings, line 22) FAIL: obj-c++.dg/strings/const-cfstring-2.mm -fnext-runtime (test for warnings, line 23) FAIL: obj-c++.dg/strings/const-cfstring-2.mm -fnext-runtime (test for warnings, line 25) FAIL: obj-c++.dg/strings/const-cfstring-2.mm -fnext-runtime (test for warnings, line 26) at -m32/-m64 on darwin. Tested on x86_64-apple-darwin12, x86_64-apple-darwin10 and powerpc-apple-darwin9. Okay for gcc trunk? Jack gcc/testsuite/ 2012-10-17 Dominique Dhumieres Jack Howarth PR target/54404 * g++.dg/other/darwin-cfstring1.C: Add -ftrack-macro-expansion=0 to dg-options. * obj-c++.dg/strings/const-cfstring-2.mm: Likewise. Index: gcc/testsuite/g++.dg/other/darwin-cfstring1.C =================================================================== --- gcc/testsuite/g++.dg/other/darwin-cfstring1.C (revision 192531) +++ gcc/testsuite/g++.dg/other/darwin-cfstring1.C (working copy) @@ -4,7 +4,7 @@ /* Developed by Ziemowit Laski . */ /* { dg-do compile { target *-*-darwin* } } */ -/* { dg-options "-mconstant-cfstrings" } */ +/* { dg-options "-ftrack-macro-expansion=0 -mconstant-cfstrings" } */ #include Index: gcc/testsuite/obj-c++.dg/strings/const-cfstring-2.mm =================================================================== --- gcc/testsuite/obj-c++.dg/strings/const-cfstring-2.mm (revision 192531) +++ gcc/testsuite/obj-c++.dg/strings/const-cfstring-2.mm (working copy) @@ -6,7 +6,7 @@ /* So far, CFString is darwin-only. */ /* { dg-do compile { target *-*-darwin* } } */ /* { dg-skip-if "NeXT only" { *-*-* } { "-fgnu-runtime" } { "" } } */ -/* { dg-options "-mconstant-cfstrings -Wnonportable-cfstrings" } */ +/* { dg-options "-ftrack-macro-expansion=0 -mconstant-cfstrings -Wnonportable-cfstrings" } */ #import #import