commit f92a51133f855f87d2cb5d92e2fa13c69ee1efd6
author Peyton, Jonathan L <jonathan.l.peyton@intel.com> Tue Mar 02 07:44:15 2021 -0600
committer Copybara-Service <copybara-worker@google.com> Thu Mar 18 05:44:50 2021 -0700
tree a3251bfbd9ab27582dc83f66c5fabc49f5631c59
parent d70cd3606bbac146b378c47207e28ad237d32603

[OpenMP] Fix clang-cl build error regarding TSX intrinsics

Fix for https://bugs.llvm.org/show_bug.cgi?id=49339

The CMake check for the RTM intrinsics needs the -mrtm flag to be set
during the test. This way clang-cl correctly detects it has the
_xbegin() intrinsic. Otherwise, the CMake check fails.

Differential Revision: https://reviews.llvm.org/D97413

GitOrigin-RevId: e83380fccc2cc9842bdcfd268efddf6fce90544d

runtime/cmake/config-ix.cmake

diff --git a/runtime/cmake/config-ix.cmake b/runtime/cmake/config-ix.cmake
index 0b3556b..56d0ddb 100644
--- a/runtime/cmake/config-ix.cmake
+++ b/runtime/cmake/config-ix.cmake
@@ -175,6 +175,10 @@
       }
       int main() { int a = __kmp_umwait(0, 1000); return a; }")
   check_cxx_source_compiles("${source_code}" LIBOMP_HAVE_WAITPKG_INTRINSICS)
+  set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
+  if (LIBOMP_HAVE_MRTM_FLAG)
+    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -mrtm")
+  endif()
   set(source_code "// check for attribute rtm and rtm intrinsics
       #ifdef IMMINTRIN_H
       #include <immintrin.h>
@@ -191,6 +195,7 @@
       int main() { int a = __kmp_xbegin(); return a; }")
   check_cxx_source_compiles("${source_code}" LIBOMP_HAVE_RTM_INTRINSICS)
   set(CMAKE_REQUIRED_DEFINITIONS)
+  set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
 endif()
 
 # Find perl executable