From patchwork Tue Feb 3 10:37:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 435771 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E1D93140188 for ; Tue, 3 Feb 2015 21:40:13 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:mime-version:content-type:from:in-reply-to:date:cc :message-id:references:to; q=dns; s=default; b=ddEbStFna3kbw6Hra Eh3W7vkt5x0J3Gh0I4pFl7X8VwUD0W0+IICn/cce3e6jZipUlC682ytIdHg2x31C HzXh3j5X92dHWw5rnD8zJVbV6Aos+cz1FliMGl27WAmXLQdMGymH4Cg7/G4Iubaa Kgp6E7FD9soz8P6/fpZTyenbE4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:mime-version:content-type:from:in-reply-to:date:cc :message-id:references:to; s=default; bh=Pl6OvG6HwQMqYU772U1h2zL mPqE=; b=Vl80IqkBzvASjHQB/1fz2Eoa2oO5u2OjHhifgrRnF4o04JnHLBaswTx Sm4cSw+NfCQkvhfWPAXq18gSxWaGbqdrvET7QflenpMYU/mxA8adzhhOrQAzfJSe DXFz8GoaQXBdEp5MXi29JzFpMWSo9UUNgJSf2D9Zt6h7IoGX6hgE= Received: (qmail 26026 invoked by alias); 3 Feb 2015 10:37:59 -0000 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 Received: (qmail 25996 invoked by uid 89); 3 Feb 2015 10:37:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 03 Feb 2015 10:37:57 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1YIarh-0007ir-BY from Iain_Sandoe@mentor.com ; Tue, 03 Feb 2015 02:37:53 -0800 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.224.2; Tue, 3 Feb 2015 10:37:51 +0000 Subject: Re: [patch] Fix invalid attributes in libstdc++ MIME-Version: 1.0 (Apple Message framework v1283) From: Iain Sandoe In-Reply-To: <20150201151029.GM3360@redhat.com> Date: Tue, 3 Feb 2015 10:37:48 +0000 CC: , Message-ID: <3A7FBC5A-AB69-4690-A451-BC7D15E12432@codesourcery.com> References: <20150129130229.GJ3360@redhat.com> <20150201150818.GL3360@redhat.com> <20150201151029.GM3360@redhat.com> To: Jonathan Wakely Hi Jonathan, On 1 Feb 2015, at 15:10, Jonathan Wakely wrote: > On 01/02/15 15:08 +0000, Jonathan Wakely wrote: >> I failed to CC gcc-patches on this patch ... >> >> On 29/01/15 13:02 +0000, Jonathan Wakely wrote: >>> Jakub pointed out that we have some attributes that don't use the >>> reserved namespace, e.g. __attribute__ ((always_inline)). >>> >>> This is a 4.9/5 regression and the fix was pre-approved by Jakub so >>> I've committed it to trunk. >>> >>> When we're back in stage1 I'll fix the TODO comments in the new tests >>> (see PR64857) and will also rename testsuite/17_intro/headers/c++200x >>> to .../c++2011. >>> > > The new test fails on darwin (PR64883) and --enable-threads=single > targets (PR64885). > > This is a workaround for 64883. Tested x86_64-linux, committed to > trunk. > the following additional tweaks provide further work-arounds. ... checked on darwin12 and darwin14. I have a fixincludes patch for next stage #1. Iain diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_attributes.cc b/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_attributes.cc index 76a935e..6fc362a 100644 --- a/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_attributes.cc +++ b/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_attributes.cc @@ -26,11 +26,11 @@ // darwin headers use these, see PR 64883 # define deprecated 1 # define noreturn 1 +# define visibility 1 #endif #define packed 1 #define pure 1 #define unused 1 -#define visibility 1 #include // TODO: this is missing from #include diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++200x/all_attributes.cc b/libstdc++-v3/testsuite/17_intro/headers/c++200x/all_attributes.cc index c7ec27a..0726e3f 100644 --- a/libstdc++-v3/testsuite/17_intro/headers/c++200x/all_attributes.cc +++ b/libstdc++-v3/testsuite/17_intro/headers/c++200x/all_attributes.cc @@ -22,11 +22,14 @@ // Don't test 'const' and 'noreturn' because they are reserved anyway. #define abi_tag 1 #define always_inline 1 -#define deprecated 1 +#ifndef __APPLE__ +// darwin headers use these, see PR 64883 +# define visibility 1 +# define deprecated 1 +#endif #define packed 1 #define pure 1 #define unused 1 -#define visibility 1 #include // TODO: this is missing from #include // TODO: this is missing from diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++2014/all_attributes.cc b/libstdc++-v3/testsuite/17_intro/headers/c++2014/all_attributes.cc index 533a6f1..06bcb8e 100644 --- a/libstdc++-v3/testsuite/17_intro/headers/c++2014/all_attributes.cc +++ b/libstdc++-v3/testsuite/17_intro/headers/c++2014/all_attributes.cc @@ -22,11 +22,14 @@ // Don't test 'const' and 'noreturn' because they are reserved anyway. #define abi_tag 1 #define always_inline 1 -#define deprecated 1 +#ifndef __APPLE__ +// darwin headers use these, see PR 64883 +# define deprecated 1 +# define visibility 1 +#endif #define packed 1 #define pure 1 #define unused 1 -#define visibility 1 #include // TODO: this is missing from #include // TODO: this is missing from