From patchwork Wed Nov 5 15:58:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 407065 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 B80F5140079 for ; Thu, 6 Nov 2014 02:59:14 +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:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; q=dns; s=default; b=NHp1zkKvF2/BZKqy aQOLmGvp4Q8f2pCGN1TnIIkMjF0ibSdcRbsmwlgUzzfdF5LJhIIOOEZ1s6mGfN7r M7Y4r7rJg1hTWxBKFLgSNFX3pBM+shvG9E+q6cZdsfXdX3mREciGx5P1k3SdRNty s+fGLZyMsOY61xhsm4fSxRy2jpE= 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=lRaKfAfwl6f/aSkrsStO2n 4pQy0=; b=mOdW3vTY6tLJXbrNMGEqo1WcmwTqXJw5l1eQwj1C2rVQuo32CClX/5 9aQGvSGqpEDYTTWdnjJwXWCzqyKoQJxcJIyHRFOUNa7SZrOUjggncMu0hAY9SbV4 LUrv6Twl5KXwdDk2IkWqjOErG7bmSIxwFjQU8vu/rwY8E26ZflWRs= Received: (qmail 31619 invoked by alias); 5 Nov 2014 15:59:07 -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 31605 invoked by uid 89); 5 Nov 2014 15:59:07 -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, RCVD_IN_DNSWL_NONE 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, 05 Nov 2014 15:59:06 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-03.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1Xm2z8-0007W0-Ql from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Wed, 05 Nov 2014 07:59:03 -0800 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-03.mgc.mentorg.com (137.202.0.108) with Microsoft SMTP Server id 14.3.181.6; Wed, 5 Nov 2014 15:59:01 +0000 From: Thomas Schwinge To: CC: James Norris Subject: Re: [gomp4] OpenACC / C++ In-Reply-To: <543E9EF1.7040108@codesourcery.com> References: <543E9EF1.7040108@codesourcery.com> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.3.1 (i586-pc-linux-gnu) Date: Wed, 5 Nov 2014 16:58:58 +0100 Message-ID: <87zjc5ej0d.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Wed, 15 Oct 2014 11:21:05 -0500, James Norris wrote: > This patch adds OpenACC support to C++ in the gomp4 branch. I found a few missing pieces; applied to gomp-4_0-branch in r217139: commit 09b8ef34550c377610c7a01aa2057fc8297e1b0a Author: tschwinge Date: Wed Nov 5 15:58:09 2014 +0000 OpenACC C++: Add a few missing pieces. gcc/cp/ * parser.c (cp_parser_omp_clause_name): Also look for "pcopy", "pcopyin", "pcopyout", "pcreate". Look for "wait" instead of "WAIT". git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@217139 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog.gomp | 6 ++++++ gcc/cp/parser.c | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) Grüße, Thomas diff --git gcc/cp/ChangeLog.gomp gcc/cp/ChangeLog.gomp index 89f3f22..024e6a5 100644 --- gcc/cp/ChangeLog.gomp +++ gcc/cp/ChangeLog.gomp @@ -1,3 +1,9 @@ +2014-11-05 Thomas Schwinge + + * parser.c (cp_parser_omp_clause_name): Also look for "pcopy", + "pcopyin", "pcopyout", "pcreate". Look for "wait" instead of + "WAIT". + 2014-11-03 Cesar Philippidis * parser.c (cp_parser_omp_clause_name): Also consider CPP_KEYWORD diff --git gcc/cp/parser.c gcc/cp/parser.c index e3afdca..3ef2de7 100644 --- gcc/cp/parser.c +++ gcc/cp/parser.c @@ -27535,13 +27535,17 @@ cp_parser_omp_clause_name (cp_parser *parser) result = PRAGMA_OMP_CLAUSE_PARALLEL; else if (!strcmp ("present", p)) result = PRAGMA_OMP_CLAUSE_PRESENT; - else if (!strcmp ("present_or_copy", p)) + else if (!strcmp ("present_or_copy", p) + || !strcmp ("pcopy", p)) result = PRAGMA_OMP_CLAUSE_PRESENT_OR_COPY; - else if (!strcmp ("present_or_copyin", p)) + else if (!strcmp ("present_or_copyin", p) + || !strcmp ("pcopyin", p)) result = PRAGMA_OMP_CLAUSE_PRESENT_OR_COPYIN; - else if (!strcmp ("present_or_copyout", p)) + else if (!strcmp ("present_or_copyout", p) + || !strcmp ("pcopyout", p)) result = PRAGMA_OMP_CLAUSE_PRESENT_OR_COPYOUT; - else if (!strcmp ("present_or_create", p)) + else if (!strcmp ("present_or_create", p) + || !strcmp ("pcreate", p)) result = PRAGMA_OMP_CLAUSE_PRESENT_OR_CREATE; else if (!strcmp ("private", p)) result = PRAGMA_OMP_CLAUSE_PRIVATE; @@ -27587,7 +27591,7 @@ cp_parser_omp_clause_name (cp_parser *parser) result = PRAGMA_CILK_CLAUSE_VECTORLENGTH; break; case 'w': - if (!strcmp ("WAIT", p)) + if (!strcmp ("wait", p)) result = PRAGMA_OMP_CLAUSE_WAIT; break; }