From patchwork Wed Sep 18 10:42:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 275666 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 85F542C00D1 for ; Wed, 18 Sep 2013 20:42:56 +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:date :from:to:subject:message-id:reply-to:mime-version:content-type; q=dns; s=default; b=hp++bMKzjYEPT+fByW4HpNsUgsCO6v2M18TAVoURRt5 k7Yni6XawplQCV4cour70cv7s6YQkL5a2VNr5gF1GIMpborZyA/WJfMzpqKX+ZAD vv6059k/45AjhF8vmDAnu0Dieauq6Q4QY1yvFUIxZwDI7lCvkWCyhgvHsCsPRtzI = 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:date :from:to:subject:message-id:reply-to:mime-version:content-type; s=default; bh=6sWa3xou3J+hFsEgtfooYzT5vpA=; b=IB8dJvH2FkqZ1JXQC Avv31LTN+CR/Wd/qAOsnqq1O0tB2aZ4yg5QGFmLAsj4Dfu8eXmvt5FUe2IqFdXQf DhrNz8BKrVgCID+SLry9+CAeJzCCp28RLhvucI9ZJ/WuDZZsikS0dg1Svy88ISXU ZfsbH9PvOnnYB8LnH76UL7XoJA= Received: (qmail 21562 invoked by alias); 18 Sep 2013 10:42:50 -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 21547 invoked by uid 89); 18 Sep 2013 10:42:50 -0000 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 18 Sep 2013 10:42:50 +0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8IAgm4T003900 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 18 Sep 2013 06:42:48 -0400 Received: from tucnak.zalov.cz (vpn1-5-4.ams2.redhat.com [10.36.5.4]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r8IAgkOl004367 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 18 Sep 2013 06:42:47 -0400 Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.14.7/8.14.7) with ESMTP id r8IAgjbv004025 for ; Wed, 18 Sep 2013 12:42:45 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.14.7/8.14.7/Submit) id r8IAgjmi004024 for gcc-patches@gcc.gnu.org; Wed, 18 Sep 2013 12:42:45 +0200 Date: Wed, 18 Sep 2013 12:42:45 +0200 From: Jakub Jelinek To: gcc-patches@gcc.gnu.org Subject: [gomp4, committed] Fix a merge glitch Message-ID: <20130918104245.GJ1817@tucnak.redhat.com> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes Hi! I've merged again trunk into gomp-4_0-branch, but have noticed that in the earlier merge I've added the #defines together with the corresponding structures/enums into tree-core.h, when apparently the defines belong into tree.h. 2013-09-18 Jakub Jelinek * tree-core.h (OMP_CLAUSE_DEPEND_KIND, OMP_CLAUSE_MAP_KIND, OMP_CLAUSE_MAP_ZERO_BIAS_ARRAY_SECTION, OMP_CLAUSE_PROC_BIND_KIND): Move definitions... * tree.h (OMP_CLAUSE_DEPEND_KIND, OMP_CLAUSE_MAP_KIND, OMP_CLAUSE_MAP_ZERO_BIAS_ARRAY_SECTION, OMP_CLAUSE_PROC_BIND_KIND): ... here. Jakub --- gcc/tree-core.h.jj 2013-09-16 15:53:39.000000000 +0200 +++ gcc/tree-core.h 2013-09-16 16:03:12.526490432 +0200 @@ -1083,9 +1083,6 @@ enum omp_clause_depend_kind OMP_CLAUSE_DEPEND_INOUT }; -#define OMP_CLAUSE_DEPEND_KIND(NODE) \ - (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_DEPEND)->omp_clause.subcode.depend_kind) - enum omp_clause_map_kind { OMP_CLAUSE_MAP_ALLOC, @@ -1098,15 +1095,6 @@ enum omp_clause_map_kind OMP_CLAUSE_MAP_POINTER }; -#define OMP_CLAUSE_MAP_KIND(NODE) \ - (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_MAP)->omp_clause.subcode.map_kind) - -/* Nonzero if this map clause is for array (rather than pointer) based array - section with zero bias. Both the non-decl OMP_CLAUSE_MAP and - correspoidng OMP_CLAUSE_MAP_POINTER clause are marked with this flag. */ -#define OMP_CLAUSE_MAP_ZERO_BIAS_ARRAY_SECTION(NODE) \ - (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_MAP)->base.public_flag) - enum omp_clause_proc_bind_kind { /* Numbers should match omp_proc_bind_t enum in omp.h. */ @@ -1117,9 +1105,6 @@ enum omp_clause_proc_bind_kind OMP_CLAUSE_PROC_BIND_SPREAD = 4 }; -#define OMP_CLAUSE_PROC_BIND_KIND(NODE) \ - (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_PROC_BIND)->omp_clause.subcode.proc_bind_kind) - struct GTY(()) tree_exp { struct tree_typed typed; location_t locus; --- gcc/tree.h.jj 2013-09-16 15:52:31.000000000 +0200 +++ gcc/tree.h 2013-09-16 16:08:22.134892606 +0200 @@ -1266,6 +1266,21 @@ extern void protected_set_expr_location #define OMP_CLAUSE_SCHEDULE_CHUNK_EXPR(NODE) \ OMP_CLAUSE_OPERAND (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_SCHEDULE), 0) +#define OMP_CLAUSE_DEPEND_KIND(NODE) \ + (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_DEPEND)->omp_clause.subcode.depend_kind) + +#define OMP_CLAUSE_MAP_KIND(NODE) \ + (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_MAP)->omp_clause.subcode.map_kind) + +/* Nonzero if this map clause is for array (rather than pointer) based array + section with zero bias. Both the non-decl OMP_CLAUSE_MAP and + correspoidng OMP_CLAUSE_MAP_POINTER clause are marked with this flag. */ +#define OMP_CLAUSE_MAP_ZERO_BIAS_ARRAY_SECTION(NODE) \ + (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_MAP)->base.public_flag) + +#define OMP_CLAUSE_PROC_BIND_KIND(NODE) \ + (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_PROC_BIND)->omp_clause.subcode.proc_bind_kind) + #define OMP_CLAUSE_COLLAPSE_EXPR(NODE) \ OMP_CLAUSE_OPERAND (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_COLLAPSE), 0) #define OMP_CLAUSE_COLLAPSE_ITERVAR(NODE) \