summaryrefslogtreecommitdiffstats
path: root/openmp
diff options
context:
space:
mode:
authorJonathan Peyton <jonathan.l.peyton@intel.com>2015-09-18 16:24:46 +0000
committerJonathan Peyton <jonathan.l.peyton@intel.com>2015-09-18 16:24:46 +0000
commitcab67cc3ff2896d03a46da8a5eb0823290267252 (patch)
treea641774da470bd73923384741c0ac3b0f5a9ca41 /openmp
parente7229f4921bef04dc441b02be4505aab761bc9f5 (diff)
downloadbcm5719-llvm-cab67cc3ff2896d03a46da8a5eb0823290267252.tar.gz
bcm5719-llvm-cab67cc3ff2896d03a46da8a5eb0823290267252.zip
[OMPT] Correct an incorrect OMPT ifdef
An ifdef for OMPT_TRACE needs to be OMPT_BLAME so that both instances of a callback are controlled by the same ifdef. Patch by John Mellor-Crummey Differential Revision: http://reviews.llvm.org/D12911 llvm-svn: 248001
Diffstat (limited to 'openmp')
-rw-r--r--openmp/runtime/src/kmp_barrier.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/openmp/runtime/src/kmp_barrier.cpp b/openmp/runtime/src/kmp_barrier.cpp
index 470db1a95ee..c2f26fde797 100644
--- a/openmp/runtime/src/kmp_barrier.cpp
+++ b/openmp/runtime/src/kmp_barrier.cpp
@@ -1514,7 +1514,7 @@ __kmp_join_barrier(int gtid)
#if OMPT_SUPPORT
if (ompt_status & ompt_status_track) {
-#if OMPT_TRACE
+#if OMPT_BLAME
if ((ompt_status == ompt_status_track_callback) &&
ompt_callbacks.ompt_callback(ompt_event_barrier_end)) {
ompt_callbacks.ompt_callback(ompt_event_barrier_end)(
OpenPOWER on IntegriCloud