From: Jonas Hahnfeld <hahnjo@hahnjo.de>
Date: Fri, 10 Nov 2017 15:17:57 +0000 (+0000)
Subject: [OMPT] Purge OMPT_BLAME and OMPT_TRACE
X-Git-Tag: llvmorg-6.0.0-rc1~3699
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d30cb27a17860bdbcc49153c35e3893aea6a2882;p=platform%2Fupstream%2Fllvm.git

[OMPT] Purge OMPT_BLAME and OMPT_TRACE

This was replace by OMPT_OPTIONAL.

llvm-svn: 317890
---

diff --git a/openmp/runtime/Build_With_CMake.txt b/openmp/runtime/Build_With_CMake.txt
index 1739e77..607e115 100644
--- a/openmp/runtime/Build_With_CMake.txt
+++ b/openmp/runtime/Build_With_CMake.txt
@@ -150,14 +150,11 @@ supported on Windows). If LIBOMP_ENABLE_SHARED is off, then static OpenMP
 libraries will be built instead of dynamic ones.
 
 -DLIBOMP_OMPT_SUPPORT=off|on
-Should OMPT support be included in the build? (Not supported on Windows)
-If LIBOMP_OMPT_SUPPORT is off, then both ompt_blame and ompt_trace are ignored.
+Should OMPT support be included in the build?
 
--DLIBOMP_OMPT_BLAME=on|off
-Should OMPT blame functionality be included in the build?
-
--DLIBOMP_OMPT_TRACE=on|off
-Should OMPT trace functionality be included in the build?
+-DLIBOMP_OMPT_OPTIONAL=on|off
+Should optional OMPT functionality be included in the build?
+Will be ignored if LIBOMP_OMPT_SUPPORT is off.
 
 -DLIBOMP_STATS=off|on
 Should include stats-gathering code be included in the build?
diff --git a/openmp/runtime/cmake/LibompExports.cmake b/openmp/runtime/cmake/LibompExports.cmake
index cda3159..1893b9f 100644
--- a/openmp/runtime/cmake/LibompExports.cmake
+++ b/openmp/runtime/cmake/LibompExports.cmake
@@ -27,8 +27,7 @@ endif()
 libomp_append(libomp_suffix .s1 LIBOMP_STATS)
 libomp_append(libomp_suffix .ompt LIBOMP_OMPT_SUPPORT)
 if(${LIBOMP_OMPT_SUPPORT})
-  libomp_append(libomp_suffix .no-ompt-blame IF_FALSE LIBOMP_OMPT_BLAME)
-  libomp_append(libomp_suffix .no-ompt-trace IF_FALSE LIBOMP_OMPT_TRACE)
+  libomp_append(libomp_suffix .optional LIBOMP_OMPT_OPTIONAL)
 endif()
 string(REPLACE ";" "" libomp_suffix "${libomp_suffix}")