Fix merge fallout.aldyh/cilk-in-gomp

Use flag_enable_cilkplus instead of flag_enable_cilk.

4 files changed, 6 insertions, 10 deletions

diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c
index 635c20ca85b..cdc92d53b9a 100644
--- a/gcc/c-family/c-pragma.c
+++ b/gcc/c-family/c-pragma.c
@@ -1358,7 +1358,7 @@ init_pragma (void)
 				      omp_pragmas[i].id, true, true);
     }
 
-  if (flag_enable_cilk && !flag_preprocess_only)
+  if (flag_enable_cilkplus && !flag_preprocess_only)
     {
       cpp_register_deferred_pragma (parse_in, NULL, "simd", 
 				    PRAGMA_CILK_SIMD, true, false);
diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index 57966692714..857813474c9 100644
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -839,10 +839,6 @@ Recognize built-in functions
 fbuiltin-
 C ObjC C++ ObjC++ Joined
 
-fcilkplus
-C ObjC C++ ObjC++ LTO Report Var(flag_enable_cilk) Init(0)
-Enable Cilk
-
 fcanonical-system-headers
 C ObjC C++ ObjC++
 Where shorter, use canonicalized paths to systems headers.
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 6588a51df42..e064b32aeec 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -11864,7 +11864,7 @@ static bool
 c_parser_cilk_verify_simd (c_parser *parser,
 				  enum pragma_context context)
 {
-  if (!flag_enable_cilk)
+  if (!flag_enable_cilkplus)
     {
       warning (0, "pragma simd ignored because -fcilkplus is not enabled");
       c_parser_skip_until_found (parser, CPP_PRAGMA_EOL, NULL);
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index cb304add917..f5d1735964a 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -7413,7 +7413,7 @@ execute_expand_omp (void)
 static bool
 gate_expand_omp (void)
 {
-  return ((flag_openmp || flag_enable_cilk) && !seen_error ());
+  return ((flag_openmp || flag_enable_cilkplus) && !seen_error ());
 }
 
 struct gimple_opt_pass pass_expand_omp =
@@ -8604,7 +8604,7 @@ execute_lower_omp (void)
 
   /* This pass always runs, to provide PROP_gimple_lomp.
      But there is nothing to do unless -fopenmp is given.  */
-  if (!flag_openmp && !flag_enable_cilk)
+  if (!flag_openmp && !flag_enable_cilkplus)
     return 0;
 
   all_contexts = splay_tree_new (splay_tree_compare_pointers, 0,
@@ -8708,7 +8708,7 @@ diagnose_sb_0 (gimple_stmt_iterator *gsi_p,
 #endif
 
   bool cilkplus_block = false;
-  if (flag_enable_cilk)
+  if (flag_enable_cilkplus)
     {
       if ((branch_ctx
 	   && gimple_code (branch_ctx) == GIMPLE_OMP_FOR
@@ -8916,7 +8916,7 @@ diagnose_omp_structured_block_errors (void)
 static bool
 gate_diagnose_omp_blocks (void)
 {
-  return flag_openmp || flag_enable_cilk;
+  return flag_openmp || flag_enable_cilkplus;
 }
 
 struct gimple_opt_pass pass_diagnose_omp_blocks =