aboutsummaryrefslogtreecommitdiff
path: root/gcc/c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/c')
-rw-r--r--gcc/c/ChangeLog18
-rw-r--r--gcc/c/c-parser.c19
-rw-r--r--gcc/c/c-typeck.c20
-rw-r--r--gcc/c/gimple-parser.c1
4 files changed, 38 insertions, 20 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index f3626e2..d10faa0 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,21 @@
+2016-12-14 Martin Jambor <mjambor@suse.cz>
+
+ * c-parser.c: Include omp-general.h and omp-offload.h instead of
+ omp-low.h.
+ (c_finish_oacc_routine): Adjusted call to
+ get_oacc_fn_attrib, build_oacc_routine_dims and replace_oacc_fn_attrib
+ to use their new names.
+ (c_parser_oacc_enter_exit_data): Adjusted call to find_omp_clause to
+ use its new name.
+ (c_parser_oacc_update): Likewise.
+ (c_parser_omp_simd): Likewise.
+ (c_parser_omp_target_update): Likewise.
+ * c-typeck.c: Include omp-general.h instead of omp-low.h.
+ (c_finish_omp_cancel): Adjusted call to find_omp_clause to use its new
+ name.
+ (c_finish_omp_cancellation_point): Likewise.
+ * gimple-parser.c: Do not include omp-low.h
+
2016-12-02 Cesar Philippidis <cesar@codesourcery.com>
James Norris <jnorris@codesourcery.com>
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index f7bf9c4..a775b60 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -52,7 +52,8 @@ along with GCC; see the file COPYING3. If not see
#include "c-lang.h"
#include "c-family/c-objc.h"
#include "plugin.h"
-#include "omp-low.h"
+#include "omp-general.h"
+#include "omp-offload.h"
#include "builtins.h"
#include "gomp-constants.h"
#include "c-family/c-indentation.h"
@@ -13922,7 +13923,7 @@ c_parser_oacc_enter_exit_data (c_parser *parser, bool enter)
clauses = c_parser_oacc_all_clauses (parser, OACC_EXIT_DATA_CLAUSE_MASK,
"#pragma acc exit data");
- if (find_omp_clause (clauses, OMP_CLAUSE_MAP) == NULL_TREE)
+ if (omp_find_clause (clauses, OMP_CLAUSE_MAP) == NULL_TREE)
{
error_at (loc, enter
? "%<#pragma acc enter data%> has no data movement clause"
@@ -14241,7 +14242,7 @@ c_finish_oacc_routine (struct oacc_routine_data *data, tree fndecl,
return;
}
- if (get_oacc_fn_attrib (fndecl))
+ if (oacc_get_fn_attrib (fndecl))
{
error_at (data->loc,
"%<#pragma acc routine%> already applied to %qD", fndecl);
@@ -14259,8 +14260,8 @@ c_finish_oacc_routine (struct oacc_routine_data *data, tree fndecl,
}
/* Process the routine's dimension clauses. */
- tree dims = build_oacc_routine_dims (data->clauses);
- replace_oacc_fn_attrib (fndecl, dims);
+ tree dims = oacc_build_routine_dims (data->clauses);
+ oacc_replace_fn_attrib (fndecl, dims);
/* Add an "omp declare target" attribute. */
DECL_ATTRIBUTES (fndecl)
@@ -14292,7 +14293,7 @@ c_parser_oacc_update (c_parser *parser)
tree clauses = c_parser_oacc_all_clauses (parser, OACC_UPDATE_CLAUSE_MASK,
"#pragma acc update");
- if (find_omp_clause (clauses, OMP_CLAUSE_MAP) == NULL_TREE)
+ if (omp_find_clause (clauses, OMP_CLAUSE_MAP) == NULL_TREE)
{
error_at (loc,
"%<#pragma acc update%> must contain at least one "
@@ -15263,7 +15264,7 @@ c_parser_omp_simd (location_t loc, c_parser *parser,
{
omp_split_clauses (loc, OMP_SIMD, mask, clauses, cclauses);
clauses = cclauses[C_OMP_CLAUSE_SPLIT_SIMD];
- tree c = find_omp_clause (cclauses[C_OMP_CLAUSE_SPLIT_FOR],
+ tree c = omp_find_clause (cclauses[C_OMP_CLAUSE_SPLIT_FOR],
OMP_CLAUSE_ORDERED);
if (c && OMP_CLAUSE_ORDERED_EXPR (c))
{
@@ -16107,8 +16108,8 @@ c_parser_omp_target_update (location_t loc, c_parser *parser,
tree clauses
= c_parser_omp_all_clauses (parser, OMP_TARGET_UPDATE_CLAUSE_MASK,
"#pragma omp target update");
- if (find_omp_clause (clauses, OMP_CLAUSE_TO) == NULL_TREE
- && find_omp_clause (clauses, OMP_CLAUSE_FROM) == NULL_TREE)
+ if (omp_find_clause (clauses, OMP_CLAUSE_TO) == NULL_TREE
+ && omp_find_clause (clauses, OMP_CLAUSE_FROM) == NULL_TREE)
{
error_at (loc,
"%<#pragma omp target update%> must contain at least one "
diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index f0917ed..c134280 100644
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -43,7 +43,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree-iterator.h"
#include "gimplify.h"
#include "tree-inline.h"
-#include "omp-low.h"
+#include "omp-general.h"
#include "c-family/c-objc.h"
#include "c-family/c-ubsan.h"
#include "cilk.h"
@@ -12012,13 +12012,13 @@ c_finish_omp_cancel (location_t loc, tree clauses)
{
tree fn = builtin_decl_explicit (BUILT_IN_GOMP_CANCEL);
int mask = 0;
- if (find_omp_clause (clauses, OMP_CLAUSE_PARALLEL))
+ if (omp_find_clause (clauses, OMP_CLAUSE_PARALLEL))
mask = 1;
- else if (find_omp_clause (clauses, OMP_CLAUSE_FOR))
+ else if (omp_find_clause (clauses, OMP_CLAUSE_FOR))
mask = 2;
- else if (find_omp_clause (clauses, OMP_CLAUSE_SECTIONS))
+ else if (omp_find_clause (clauses, OMP_CLAUSE_SECTIONS))
mask = 4;
- else if (find_omp_clause (clauses, OMP_CLAUSE_TASKGROUP))
+ else if (omp_find_clause (clauses, OMP_CLAUSE_TASKGROUP))
mask = 8;
else
{
@@ -12027,7 +12027,7 @@ c_finish_omp_cancel (location_t loc, tree clauses)
"clauses");
return;
}
- tree ifc = find_omp_clause (clauses, OMP_CLAUSE_IF);
+ tree ifc = omp_find_clause (clauses, OMP_CLAUSE_IF);
if (ifc != NULL_TREE)
{
tree type = TREE_TYPE (OMP_CLAUSE_IF_EXPR (ifc));
@@ -12051,13 +12051,13 @@ c_finish_omp_cancellation_point (location_t loc, tree clauses)
{
tree fn = builtin_decl_explicit (BUILT_IN_GOMP_CANCELLATION_POINT);
int mask = 0;
- if (find_omp_clause (clauses, OMP_CLAUSE_PARALLEL))
+ if (omp_find_clause (clauses, OMP_CLAUSE_PARALLEL))
mask = 1;
- else if (find_omp_clause (clauses, OMP_CLAUSE_FOR))
+ else if (omp_find_clause (clauses, OMP_CLAUSE_FOR))
mask = 2;
- else if (find_omp_clause (clauses, OMP_CLAUSE_SECTIONS))
+ else if (omp_find_clause (clauses, OMP_CLAUSE_SECTIONS))
mask = 4;
- else if (find_omp_clause (clauses, OMP_CLAUSE_TASKGROUP))
+ else if (omp_find_clause (clauses, OMP_CLAUSE_TASKGROUP))
mask = 8;
else
{
diff --git a/gcc/c/gimple-parser.c b/gcc/c/gimple-parser.c
index 9b6af13..ddecaec 100644
--- a/gcc/c/gimple-parser.c
+++ b/gcc/c/gimple-parser.c
@@ -34,7 +34,6 @@ along with GCC; see the file COPYING3. If not see
#include "c-lang.h"
#include "c-family/c-objc.h"
#include "plugin.h"
-#include "omp-low.h"
#include "builtins.h"
#include "gomp-constants.h"
#include "c-family/c-indentation.h"
generated by cgit v1.1 at 2025-05-31 13:22:10 +0000