aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/builtins.def4
2 files changed, 9 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0817d24..4b35cb2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
2015-06-22 Tom de Vries <tom@codesourcery.com>
+ * builtins.def (DEF_GOMP_BUILTIN): Test
+ 'flag_tree_parallelize_loops > 1' instead of
+ 'flag_tree_parallelize_loops'. Test flag_cilkplus.
+
+2015-06-22 Tom de Vries <tom@codesourcery.com>
+
* dominance.c (calculate_dominance_info): Verify dominators if
early-out.
diff --git a/gcc/builtins.def b/gcc/builtins.def
index 55ce9f6..80e4a9c 100644
--- a/gcc/builtins.def
+++ b/gcc/builtins.def
@@ -182,7 +182,9 @@ along with GCC; see the file COPYING3. If not see
#define DEF_GOMP_BUILTIN(ENUM, NAME, TYPE, ATTRS) \
DEF_BUILTIN (ENUM, "__builtin_" NAME, BUILT_IN_NORMAL, TYPE, TYPE, \
false, true, true, ATTRS, false, \
- (flag_openmp || flag_tree_parallelize_loops \
+ (flag_openmp \
+ || flag_tree_parallelize_loops > 1 \
+ || flag_cilkplus \
|| flag_offload_abi != OFFLOAD_ABI_UNSET))
/* Builtin used by implementation of Cilk Plus. Most of these are decomposed