summaryrefslogtreecommitdiffstats
path: root/openmp/runtime/src/kmp_runtime.c
diff options
context:
space:
mode:
authorJonathan Peyton <jonathan.l.peyton@intel.com>2015-09-21 17:24:46 +0000
committerJonathan Peyton <jonathan.l.peyton@intel.com>2015-09-21 17:24:46 +0000
commit441f33769eeae58532bb5e7f79c2d755ea984272 (patch)
treed1f9691d2b7243a7aac699e81138075d22145fac /openmp/runtime/src/kmp_runtime.c
parent7d8e7bd7b5aa6d0b4b4c469e0581d407c6205134 (diff)
downloadbcm5719-llvm-441f33769eeae58532bb5e7f79c2d755ea984272.tar.gz
bcm5719-llvm-441f33769eeae58532bb5e7f79c2d755ea984272.zip
Fix the OpenMP 3.0 build
This change adds guards to the code in places where they are missing to enable the OpenMP 3.0 build. Patch by Diego Caballero and Johnny Peyton Mailing List: http://lists.llvm.org/pipermail/openmp-dev/2015-September/000935.html llvm-svn: 248178
Diffstat (limited to 'openmp/runtime/src/kmp_runtime.c')
-rw-r--r--openmp/runtime/src/kmp_runtime.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/openmp/runtime/src/kmp_runtime.c b/openmp/runtime/src/kmp_runtime.c
index 10caaafd392..22fc3a17993 100644
--- a/openmp/runtime/src/kmp_runtime.c
+++ b/openmp/runtime/src/kmp_runtime.c
@@ -2362,9 +2362,11 @@ __kmp_join_call(ident_t *loc, int gtid
// But there is barrier for external team (league).
__kmp_internal_join( loc, gtid, team );
}
+#if OMP_40_ENABLED
else {
master_th->th.th_task_state = 0; // AC: no tasking in teams (out of any parallel)
}
+#endif /* OMP_40_ENABLED */
KMP_MB();
OpenPOWER on IntegriCloud