|
| 1 | +diff -up oneTBB-2021.12.0/cmake/compilers/Clang.cmake.orig oneTBB-2021.12.0/cmake/compilers/Clang.cmake |
| 2 | +--- oneTBB-2021.12.0/cmake/compilers/Clang.cmake.orig 2024-02-13 04:49:20.000000000 -0700 |
| 3 | ++++ oneTBB-2021.12.0/cmake/compilers/Clang.cmake 2024-06-07 13:22:47.627930378 -0600 |
| 4 | +@@ -48,11 +48,6 @@ endif() |
| 5 | + set(TBB_WARNING_LEVEL -Wall -Wextra $<$<BOOL:${TBB_STRICT}>:-Werror>) |
| 6 | + set(TBB_TEST_WARNING_FLAGS -Wshadow -Wcast-qual -Woverloaded-virtual -Wnon-virtual-dtor) |
| 7 | + |
| 8 | +-# Ignore -Werror set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled. |
| 9 | +-if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag) |
| 10 | +- tbb_remove_compile_flag(-Werror) |
| 11 | +-endif() |
| 12 | +- |
| 13 | + # Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors |
| 14 | + if (CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|amd64|i.86|x86)" AND NOT EMSCRIPTEN) |
| 15 | + set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},12.0>>:-mwaitpkg>) |
| 16 | +diff -up oneTBB-2021.12.0/cmake/compilers/GNU.cmake.orig oneTBB-2021.12.0/cmake/compilers/GNU.cmake |
| 17 | +--- oneTBB-2021.12.0/cmake/compilers/GNU.cmake.orig 2024-02-13 04:49:20.000000000 -0700 |
| 18 | ++++ oneTBB-2021.12.0/cmake/compilers/GNU.cmake 2024-06-07 13:22:47.627930378 -0600 |
| 19 | +@@ -42,11 +42,6 @@ endif() |
| 20 | + |
| 21 | + set(TBB_COMMON_LINK_LIBS ${CMAKE_DL_LIBS}) |
| 22 | + |
| 23 | +-# Ignore -Werror set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled. |
| 24 | +-if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag) |
| 25 | +- tbb_remove_compile_flag(-Werror) |
| 26 | +-endif() |
| 27 | +- |
| 28 | + if (NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL Intel) |
| 29 | + # gcc 6.0 and later have -flifetime-dse option that controls elimination of stores done outside the object lifetime |
| 30 | + set(TBB_DSE_FLAG $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},6.0>>:-flifetime-dse=1>) |
0 commit comments