52 lines
2.3 KiB
Diff
52 lines
2.3 KiB
Diff
|
From 542a27fa1cfafaf76772e793549d9f4d288d03a9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ilya Isaev <ilya.isaev@intel.com>
|
||
|
|
Date: Fri, 8 Oct 2021 10:18:16 +0300
|
||
|
|
Subject: [PATCH] Detect 32 bit x86 systems while adding -mwaitpkg option
|
||
|
|
|
||
|
|
Signed-off-by: Ilya Isaev <ilya.isaev@intel.com>
|
||
|
|
---
|
||
|
|
cmake/compilers/Clang.cmake | 2 +-
|
||
|
|
cmake/compilers/GNU.cmake | 2 +-
|
||
|
|
cmake/compilers/MSVC.cmake | 2 +-
|
||
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/cmake/compilers/Clang.cmake b/cmake/compilers/Clang.cmake
|
||
|
|
index bb7401e34..d551d3be2 100644
|
||
|
|
--- a/cmake/compilers/Clang.cmake
|
||
|
|
+++ b/cmake/compilers/Clang.cmake
|
||
|
|
@@ -44,7 +44,7 @@ if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
# Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
|
||
|
|
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
|
||
|
|
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
|
||
|
|
set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake
|
||
|
|
index 86958e3a8..fee1c3bc2 100644
|
||
|
|
--- a/cmake/compilers/GNU.cmake
|
||
|
|
+++ b/cmake/compilers/GNU.cmake
|
||
|
|
@@ -36,7 +36,7 @@ if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_CXX_DEPENDS_USE_COMPILER)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
# Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
|
||
|
|
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
|
||
|
|
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
|
||
|
|
set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<AND:$<NOT:$<CXX_COMPILER_ID:Intel>>,$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},11.0>>>:-mwaitpkg>)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
diff --git a/cmake/compilers/MSVC.cmake b/cmake/compilers/MSVC.cmake
|
||
|
|
index acf0952cf..2d2c29a6f 100644
|
||
|
|
--- a/cmake/compilers/MSVC.cmake
|
||
|
|
+++ b/cmake/compilers/MSVC.cmake
|
||
|
|
@@ -72,7 +72,7 @@ if (TBB_WINDOWS_DRIVER)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
if (CMAKE_CXX_COMPILER_ID MATCHES "(Clang|IntelLLVM)")
|
||
|
|
- if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
|
||
|
|
+ if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
|
||
|
|
set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm -mwaitpkg)
|
||
|
|
endif()
|
||
|
|
set(TBB_OPENMP_NO_LINK_FLAG TRUE)
|