From patchwork Wed Sep 2 07:49:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 513337 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 777131401E7 for ; Wed, 2 Sep 2015 17:49:23 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=Fe+qVyKv; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:references:cc:from:to:message-id:date:mime-version :in-reply-to:content-type; q=dns; s=default; b=Zc1lwwtkLO7N6R1i/ 4z8jHkEo5KAyV4QFoNtmWEijNaaP4BihawD7yLO3JdYYnSgTi7m9Sb0V1NRSCJRx 5XemarIRqC0aFJUEDnj/0/7u9HX4xrD0Guxu+oAobRvqj7tFUrr7T/CgTwt9rMVd NfQtNVSCZC9UreQ6+xP7uNc4mA= 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:references:cc:from:to:message-id:date:mime-version :in-reply-to:content-type; s=default; bh=5iVQkqgRlDghqHtvt4LS981 tzT8=; b=Fe+qVyKvawaWgg/Su7URjnNwSuvDPeJIfMnlANep2ektdLg8mGQnYFF 88nPKPYa2qoZU1gBatrBa2KAc4R9XBMiu45+EoVs8281OiAxUd8hwUwiob2ydbj9 /DPXaGNLA//rMCIk/M4QuXK4AzvcPjxx3dMqCeWm+DmU4kCAHAyM= Received: (qmail 10683 invoked by alias); 2 Sep 2015 07:49:16 -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 10660 invoked by uid 89); 2 Sep 2015 07:49:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 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; Wed, 02 Sep 2015 07:49:13 +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 1ZX2n7-0002EJ-51 from Tom_deVries@mentor.com ; Wed, 02 Sep 2015 00:49:09 -0700 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; Wed, 2 Sep 2015 08:49:07 +0100 Subject: Re: [gomp4] expunge shared_size from launch API References: <55E49162.70202@acm.org> <55E57AD4.6070108@mentor.com> CC: Nathan Sidwell From: Tom de Vries To: GCC Patches Message-ID: <55E6A9F1.3030102@mentor.com> Date: Wed, 2 Sep 2015 09:49:05 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <55E57AD4.6070108@mentor.com> On 01-09-15 12:15, Tom de Vries wrote: > On 31/08/15 19:39, Nathan Sidwell wrote: >> * builtin-types.def (DEF_FUNCTION_TYPE_VAR_6): Define. > > Committed attached follow-up patch to fix the ada build. > > Thanks, > - Tom > > > > 0001-Fix-gomp-4_0-branch-ada-build.patch > > > Fix gomp-4_0-branch ada build > > 2015-09-01 Tom de Vries > > * gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_6): Define. > --- > gcc/ada/gcc-interface/utils.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c > index 66ba904..e32a539 100644 > --- a/gcc/ada/gcc-interface/utils.c > +++ b/gcc/ada/gcc-interface/utils.c > @@ -5376,6 +5376,8 @@ enum c_builtin_type > #define DEF_FUNCTION_TYPE_VAR_4(NAME, RETURN, ARG1, ARG2, ARG3, ARG4) NAME, > #define DEF_FUNCTION_TYPE_VAR_5(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \ > NAME, > +#define DEF_FUNCTION_TYPE_VAR_6(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ > + ARG6) NAME, > #define DEF_FUNCTION_TYPE_VAR_7(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ > ARG6, ARG7) NAME, > #define DEF_FUNCTION_TYPE_VAR_12(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ > @@ -5399,6 +5401,7 @@ enum c_builtin_type > #undef DEF_FUNCTION_TYPE_VAR_3 > #undef DEF_FUNCTION_TYPE_VAR_4 > #undef DEF_FUNCTION_TYPE_VAR_5 > +#undef DEF_FUNCTION_TYPE_VAR_6 > #undef DEF_FUNCTION_TYPE_VAR_7 > #undef DEF_FUNCTION_TYPE_VAR_12 > #undef DEF_POINTER_TYPE > @@ -5506,6 +5509,9 @@ install_builtin_function_types (void) > def_fn_type (ENUM, RETURN, 1, 4, ARG1, ARG2, ARG3, ARG4); > #define DEF_FUNCTION_TYPE_VAR_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \ > def_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, ARG4, ARG5); > +#define DEF_FUNCTION_TYPE_VAR_6(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ > + ARG6) \ > + def_fn_type (ENUM, RETURN, 1, 7, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6); And of course, the argument for the 'n' parameter of def_fn_type should be '6' for DEF_FUNCTION_TYPE_VAR_6, not '7'. Fixed in attached patch, committed. Thanks, - Tom Fix DEF_FUNCTION_TYPE_VAR_6 in install_builtin_function_types 2015-09-02 Tom de Vries * gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_6): Fix define in install_builtin_function_types --- gcc/ada/gcc-interface/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c index e32a539..2ffc436 100644 --- a/gcc/ada/gcc-interface/utils.c +++ b/gcc/ada/gcc-interface/utils.c @@ -5511,7 +5511,7 @@ install_builtin_function_types (void) def_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, ARG4, ARG5); #define DEF_FUNCTION_TYPE_VAR_6(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ ARG6) \ - def_fn_type (ENUM, RETURN, 1, 7, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6); + def_fn_type (ENUM, RETURN, 1, 6, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6); #define DEF_FUNCTION_TYPE_VAR_7(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ ARG6, ARG7) \ def_fn_type (ENUM, RETURN, 1, 7, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7); -- 1.9.1