From patchwork Wed Dec 4 10:00:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 296467 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 81AB42C00A0 for ; Wed, 4 Dec 2013 21:00:54 +1100 (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=Lt8Sa/zmfbCM5xlo /33Kil4bnI5IiAWC7d/jhXOEaLuub2+hTdBQoX10GAa637S/bj6QybkKb4SU4/IR 6fA4rf63RKha9qWyi9FCf6lhvt+u30jNUlua1D0norJ4/OgfAzari64p+yQJQXg+ eAHlK1CPQRRCovSiHmZG6k1pZEA= 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=yRUfHV3acbXJfMaHDkCyix Ar6vM=; b=fyl61vtfoXk7ospUXpmmoKUNq0liZWOnbh+kurPwuBr+n9a51OQRRv xeBQ+ClEe3wHY0mVuU/IUEc71f7gvMIWGZ33794om4qPK7gb9AWbhEUukUqqlZvL 1NKfeXy+gj9ktR1Kj7uz2+uWDPMXSoBK5fKanEXqzh4CKoJ4LkYL0= Received: (qmail 9446 invoked by alias); 4 Dec 2013 10:00:41 -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 9416 invoked by uid 89); 4 Dec 2013 10:00:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, RDNS_NONE, URIBL_BLOCKED autolearn=no 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; Wed, 04 Dec 2013 10:00:36 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1Vo9Fk-0001Bz-JR from Thomas_Schwinge@mentor.com ; Wed, 04 Dec 2013 02:00:20 -0800 Received: from SVR-IES-FEM-02.mgc.mentorg.com ([137.202.0.106]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Wed, 4 Dec 2013 02:00:20 -0800 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; Wed, 4 Dec 2013 10:00:18 +0000 From: Thomas Schwinge To: CC: Subject: [gomp4] Restore GIMPLE_OACC_PARALLEL functionality (was: r205231 - in /branches/gomp-4_0-branch: ./ Chan...) In-Reply-To: <20131121202045.26205.qmail@sourceware.org> References: <20131121202045.26205.qmail@sourceware.org> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/23.4.1 (i486-pc-linux-gnu) Date: Wed, 4 Dec 2013 11:00:11 +0100 Message-ID: <87txepq6l0.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Thu, 21 Nov 2013 20:20:45 -0000, jakub@gcc.gnu.org wrote: > Author: jakub > Date: Thu Nov 21 20:20:44 2013 > New Revision: 205231 > > URL: http://gcc.gnu.org/viewcvs?rev=205231&root=gcc&view=rev > Log: > svn merge -r204964:205223 svn+ssh://gcc.gnu.org/svn/gcc/trunk Jakub, many thanks for handling the vast majority of the merge changes! I only had to fix one additional case, r205658: gcc/ * gimple.h (is_a_helper): Handle GIMPLE_OACC_PARALLEL. Grüße, Thomas --- gcc/gimple.h +++ gcc/gimple.h @@ -969,7 +969,8 @@ template <> inline bool is_a_helper ::test (const_gimple gs) { - return gs->code == GIMPLE_OMP_PARALLEL || gs->code == GIMPLE_OMP_TASK || gs->code == GIMPLE_OMP_TARGET; + return gs->code == GIMPLE_OMP_PARALLEL || gs->code == GIMPLE_OMP_TASK + || gs->code == GIMPLE_OMP_TARGET || gs->code == GIMPLE_OACC_PARALLEL; } template <>