From patchwork Mon Feb 23 10:09:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 442396 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 23107140111 for ; Mon, 23 Feb 2015 21:20:34 +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:from :to:subject:in-reply-to:references:date:message-id:mime-version :content-type; q=dns; s=default; b=haPT7xXV1WdoRCFbdd/0LwAEC9MOc 1aOcUTf12haQ7bUBtOpVS62MvzB6NtUSodhQtXs9nzhFZOtwZMfEl0ys0oRS4zw5 GcFf6iSF2eiZPE724lwhw+dXOUGEZEBcj8X4fNuSXorRfhrRUhsxHLxotJSZrCAM NKLaHY061NhVzM= 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:from :to:subject:in-reply-to:references:date:message-id:mime-version :content-type; s=default; bh=KOdElhr0aYfFf0m3vLYd/34T0Ko=; b=ZuX d3g6zS7JSYmgt49dFh1VeQftFeD1Plrw1mKd0Tui779ZCyQ1sILtAe9V9Uuetq5r c1edaA2bgoLK7vBneFqyzKryfW4KrKXyVba4NNa6zfeOlnsENbEMfzvSWE0l/xHj QgcKQjdxdXnLBVnlSDTPON9kXDvMXk/ySS/LM01Y= Received: (qmail 17371 invoked by alias); 23 Feb 2015 10:18: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 6270 invoked by uid 89); 23 Feb 2015 10:18:34 -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-HELO: relay1.mentorg.com Received: from Unknown (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 23 Feb 2015 10:14:52 +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 1YPpwt-0003hZ-24 from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Mon, 23 Feb 2015 02:09:11 -0800 Received: from feldtkeller.schwinge.homeip.net (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; Mon, 23 Feb 2015 10:09:09 +0000 From: Thomas Schwinge To: Subject: Fix number of arguments parameter in Ada DEF_FUNCTION_TYPE_* (was: Merge current set of OpenACC changes from gomp-4_0-branch) In-Reply-To: <87egqvu77s.fsf@schwinge.name> References: <87egqvu77s.fsf@schwinge.name> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.4.1 (i586-pc-linux-gnu) Date: Mon, 23 Feb 2015 11:09:05 +0100 Message-ID: <87vbit9by6.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Thu, 15 Jan 2015 21:20:07 +0100, I wrote: > In r219682, I have committed to trunk our current set of OpenACC changes, > which we had prepared on gomp-4_0-branch. [...] > gcc/ada/ > * gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_8) > (DEF_FUNCTION_TYPE_VAR_12): New macros. Committed in r220910: commit 11d2c7638e26ab69df7167474c9aa8f5d4114703 Author: tschwinge Date: Mon Feb 23 10:06:49 2015 +0000 Fix number of arguments parameter in Ada DEF_FUNCTION_TYPE_*. gcc/ada/ * gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_8) (DEF_FUNCTION_TYPE_VAR_12): Fix number of arguments parameter. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220910 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/gcc-interface/utils.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) Grüße, Thomas diff --git gcc/ada/ChangeLog gcc/ada/ChangeLog index ddd6e10..06a51ac 100644 --- gcc/ada/ChangeLog +++ gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2015-02-23 Thomas Schwinge + + * gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_8) + (DEF_FUNCTION_TYPE_VAR_12): Fix number of arguments parameter. + 2015-02-22 Arnaud Charlet * doc/Makefile: postprocess texinfo files to update @dircategory diff --git gcc/ada/gcc-interface/utils.c gcc/ada/gcc-interface/utils.c index 44dad7b..d076da7 100644 --- gcc/ada/gcc-interface/utils.c +++ gcc/ada/gcc-interface/utils.c @@ -5477,11 +5477,11 @@ install_builtin_function_types (void) def_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, ARG4, ARG5); #define DEF_FUNCTION_TYPE_VAR_8(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ ARG6, ARG7, ARG8) \ - def_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, \ + def_fn_type (ENUM, RETURN, 1, 8, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, \ ARG7, ARG8); #define DEF_FUNCTION_TYPE_VAR_12(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ ARG6, ARG7, ARG8, ARG9, ARG10, ARG11, ARG12) \ - def_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, \ + def_fn_type (ENUM, RETURN, 1, 12, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, \ ARG7, ARG8, ARG9, ARG10, ARG11, ARG12); #define DEF_POINTER_TYPE(ENUM, TYPE) \ builtin_types[(int) ENUM] = build_pointer_type (builtin_types[(int) TYPE]);