summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Hahnfeld <hahnjo@hahnjo.de>2018-08-02 14:34:08 +0000
committerJonas Hahnfeld <hahnjo@hahnjo.de>2018-08-02 14:34:08 +0000
commitef8f73728858598b479301c20586a13039d15927 (patch)
tree8ecdb62afffaaf2f9cd1d62548bb26b1f9c3fdf3
parent5b57eb4b09083e5b0f50de3ffb64a19034d78263 (diff)
downloadbcm5719-llvm-ef8f73728858598b479301c20586a13039d15927.tar.gz
bcm5719-llvm-ef8f73728858598b479301c20586a13039d15927.zip
[OMPT] Disable by default on Windows
This is broken per PR36561 and PR36574, so disable it for now until somebody interested can take a look. OMPT can still be activated manually by passing -DLIBOMP_OMPT_SUPPORT=ON during configuration. Differential Revision: https://reviews.llvm.org/D50086 llvm-svn: 338721
-rw-r--r--openmp/README.rst2
-rw-r--r--openmp/runtime/CMakeLists.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/openmp/README.rst b/openmp/README.rst
index 9fb34dfc2fb..63afb70d521 100644
--- a/openmp/README.rst
+++ b/openmp/README.rst
@@ -194,7 +194,7 @@ Optional Features
**LIBOMP_OMPT_SUPPORT** = ``ON|OFF``
Include support for the OpenMP Tools Interface (OMPT).
This option is supported and ``ON`` by default for x86, x86_64, AArch64, and
- PPC64 on Linux*, Windows*, and macOS*.
+ PPC64 on Linux* and macOS*.
This option is ``OFF`` if this feature is not supported for the platform.
**LIBOMP_OMPT_OPTIONAL** = ``ON|OFF``
diff --git a/openmp/runtime/CMakeLists.txt b/openmp/runtime/CMakeLists.txt
index 5d1e0f7d01d..447b3cd810a 100644
--- a/openmp/runtime/CMakeLists.txt
+++ b/openmp/runtime/CMakeLists.txt
@@ -302,7 +302,7 @@ endif()
# OMPT-support defaults to ON for OpenMP 5.0+ and if the requirements in
# cmake/config-ix.cmake are fulfilled.
set(OMPT_DEFAULT FALSE)
-if ((${LIBOMP_OMP_VERSION} GREATER 49) AND (LIBOMP_HAVE_OMPT_SUPPORT))
+if ((${LIBOMP_OMP_VERSION} GREATER 49) AND (LIBOMP_HAVE_OMPT_SUPPORT) AND (NOT WIN32))
set(OMPT_DEFAULT TRUE)
endif()
set(LIBOMP_OMPT_SUPPORT ${OMPT_DEFAULT} CACHE BOOL
OpenPOWER on IntegriCloud