diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-12-11 13:39:37 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-12-11 13:39:37 +0000 |
| commit | 6e3b6bc1c68407d8fc686a2da73762228445a208 (patch) | |
| tree | ad65e2d900e6cd0b0329b3c481baa085578f4ba0 /default_build_settings.cmake | |
| parent | 0fd1433ae0b506a7b3771cfa6307d2a3567614fe (diff) | |
Since https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108599 has now been resolved, we can now revert back to intended
compiler flags.
Diffstat (limited to 'default_build_settings.cmake')
| -rw-r--r-- | default_build_settings.cmake | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index 414c568e3cb..580124993e6 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -130,12 +130,9 @@ function(vespa_use_default_build_settings) message("-- CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}") if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") if(APPLE AND (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang"))) - elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0) - # Temporary workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108599 - set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=ivybridge") - else() + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") # Default to haswell cpu or newer - set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=haswell -mtune=skylake") + set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=haswell -mtune=skylake-avx512") endif() elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") set(DEFAULT_VESPA_CPU_ARCH_FLAGS "-march=armv8.2-a+fp16+dotprod+crypto -mtune=neoverse-n1") |