diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-10-16 17:42:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-16 17:42:28 +0200 |
commit | d904efb1c5a26846462c6e960b72ae0f91af49fe (patch) | |
tree | 4a435a0b65cbf39f6e5c00e90f1cd6dedf714e67 | |
parent | 17149c1354cc0a94290a5600bea2f1303d2dda31 (diff) | |
parent | d84429ee1524998695bcc84a9439fc2f8ee8636f (diff) |
Merge pull request #28951 from vespa-engine/balder/require-ivybridge-as-minimum
Use ivybridge as default for x86-64
-rw-r--r-- | default_build_settings.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 1e2981a2780..14766fc612c 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -134,8 +134,9 @@ function(vespa_use_default_build_settings) # Require haswell cpu or newer when compiling with clang on linux. set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=haswell -mtune=skylake") else() - if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0) + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0) # Temporary workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108599 + # Also xxhash-0.8.2 heavy inlining being too hard on GCC 12 and up set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=ivybridge") else() set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-msse3 -mcx16 -mtune=intel") |