i386.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. diff --git a/cmake/compilers/Clang.cmake b/cmake/compilers/Clang.cmake
  2. index bb7401e34..d551d3be2 100644
  3. --- a/cmake/compilers/Clang.cmake
  4. +++ b/cmake/compilers/Clang.cmake
  5. @@ -44,7 +44,7 @@ if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
  6. endif()
  7. # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
  8. -if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
  9. +if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
  10. set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>)
  11. endif()
  12. diff --git a/cmake/compilers/GNU.cmake b/cmake/compilers/GNU.cmake
  13. index 86958e3a8..fee1c3bc2 100644
  14. --- a/cmake/compilers/GNU.cmake
  15. +++ b/cmake/compilers/GNU.cmake
  16. @@ -36,7 +36,7 @@ if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_CXX_DEPENDS_USE_COMPILER)
  17. endif()
  18. # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
  19. -if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
  20. +if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
  21. 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>)
  22. endif()
  23. diff --git a/cmake/compilers/MSVC.cmake b/cmake/compilers/MSVC.cmake
  24. index acf0952cf..2d2c29a6f 100644
  25. --- a/cmake/compilers/MSVC.cmake
  26. +++ b/cmake/compilers/MSVC.cmake
  27. @@ -72,7 +72,7 @@ if (TBB_WINDOWS_DRIVER)
  28. endif()
  29. if (CMAKE_CXX_COMPILER_ID MATCHES "(Clang|IntelLLVM)")
  30. - if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
  31. + if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64|i.86)")
  32. set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm -mwaitpkg)
  33. endif()
  34. set(TBB_OPENMP_NO_LINK_FLAG TRUE)