From patchwork Thu May 22 19:45:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 351595 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 E4AF914003E for ; Fri, 23 May 2014 05:45:44 +1000 (EST) 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:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; q=dns; s=default; b=AtmSSMQmpG2GSme8 MTPR8sLuw8oIfgNAX3Bhgq/HGfAeo2KmGTOQqi96uQk4TchmOra+VyRHFXgvrXGM go3R+6KjkoguTjZP6Dgo9Wa1v/IAYw/Bcy6WI4NrwQA9n1axGlha0wfZDDGrUBJN otFUZTnqpEGcogsEGYn+RrLMqm0= 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:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=default; bh=ulKNSLK11MrSHSPoUioMJH NUUcg=; b=GW4Mr41fbKEDtqdvTuRs1rR8JHFZP/1Hi5P2Gc9D/P3BVIE4k7euDh vePcUCX2qM08r4kazoNJLxJEVElyNT4xBjlifL0BSSH/qtvRTw5E0kn67nt78y7U WM764DkCx2VZoUSSguUVudsKPCzalbvnxyCXuS5IM/a/oDo5/cz30= Received: (qmail 6955 invoked by alias); 22 May 2014 19:45:37 -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 6933 invoked by uid 89); 22 May 2014 19:45:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00 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; Thu, 22 May 2014 19:45:32 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1WnYvg-0005KV-3g from Thomas_Schwinge@mentor.com ; Thu, 22 May 2014 12:45:28 -0700 Received: from SVR-IES-FEM-02.mgc.mentorg.com ([137.202.0.106]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 22 May 2014 12:45:25 -0700 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.2.247.3; Thu, 22 May 2014 20:45:24 +0100 From: Thomas Schwinge To: CC: Jakub Jelinek Subject: Re: [1/6] OpenMP 4.0 C FE support In-Reply-To: <20131008195240.GA30970@tucnak.zalov.cz> References: <20131008195240.GA30970@tucnak.zalov.cz> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/23.4.1 (i486-pc-linux-gnu) Date: Thu, 22 May 2014 21:45:22 +0200 Message-ID: <87r43lvbql.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Tue, 8 Oct 2013 21:52:40 +0200, Jakub Jelinek wrote: > --- gcc/c/c-parser.c (.../trunk) (revision 203241) > +++ gcc/c/c-parser.c (.../branches/gomp-4_0-branch) (revision 203287) > +c_parser_omp_clause_thread_limit (c_parser *parser, tree list) > [...] > + location_t num_teams_loc = c_parser_peek_token (parser)->location; Applied in r210821: commit 22ac3f78e77bed5dd3ede9db86954581175dcd96 Author: tschwinge AuthorDate: Thu May 22 19:44:14 2014 +0000 Commit: tschwinge CommitDate: Thu May 22 19:44:14 2014 +0000 Fix copy'n'pasto. gcc/c/ * c-parser.c (c_parser_omp_clause_thread_limit): Rename num_teams_loc variable to num_thread_limit_loc. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210821 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/c/ChangeLog | 5 +++++ gcc/c/c-parser.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) Grüße, Thomas diff --git gcc/c/ChangeLog gcc/c/ChangeLog index 76d5c46..9acc6f7 100644 --- gcc/c/ChangeLog +++ gcc/c/ChangeLog @@ -1,3 +1,8 @@ +2014-05-22 Thomas Schwinge + + * c-parser.c (c_parser_omp_clause_thread_limit): Rename + num_teams_loc variable to num_thread_limit_loc. + 2014-05-21 Richard Sandiford * c-array-notation.c (expand_array_notations): Use void_node diff --git gcc/c/c-parser.c gcc/c/c-parser.c index bfc7147..a7e33b0 100644 --- gcc/c/c-parser.c +++ gcc/c/c-parser.c @@ -10453,7 +10453,7 @@ c_parser_omp_clause_num_teams (c_parser *parser, tree list) static tree c_parser_omp_clause_thread_limit (c_parser *parser, tree list) { - location_t num_teams_loc = c_parser_peek_token (parser)->location; + location_t num_thread_limit_loc = c_parser_peek_token (parser)->location; if (c_parser_require (parser, CPP_OPEN_PAREN, "expected %<(%>")) { location_t expr_loc = c_parser_peek_token (parser)->location; @@ -10483,7 +10483,7 @@ c_parser_omp_clause_thread_limit (c_parser *parser, tree list) check_no_duplicate_clause (list, OMP_CLAUSE_THREAD_LIMIT, "thread_limit"); - c = build_omp_clause (num_teams_loc, OMP_CLAUSE_THREAD_LIMIT); + c = build_omp_clause (num_thread_limit_loc, OMP_CLAUSE_THREAD_LIMIT); OMP_CLAUSE_THREAD_LIMIT_EXPR (c) = t; OMP_CLAUSE_CHAIN (c) = list; list = c;