diff mbox

[gomp4,committed] Fix a merge glitch

Message ID 20130918104245.GJ1817@tucnak.redhat.com
State New
Headers show

Commit Message

Jakub Jelinek Sept. 18, 2013, 10:42 a.m. UTC 
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  <jakub@redhat.com>

	* 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
diff mbox

Patch

--- 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) \