From d84429ee1524998695bcc84a9439fc2f8ee8636f Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Mon, 16 Oct 2023 13:42:16 +0000 Subject: Use ivybridge as default for x86-64 --- default_build_settings.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'default_build_settings.cmake') 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") -- cgit v1.2.3