diff options
| -rw-r--r-- | default_build_settings.cmake | 2 | ||||
| -rw-r--r-- | dist/vespa.spec | 6 | ||||
| -rw-r--r-- | eval/src/vespa/eval/eval/llvm/compile_cache.h | 1 | ||||
| -rw-r--r-- | eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/default_build_settings.cmake b/default_build_settings.cmake index d6781f14e75..e29e4c32017 100644 --- a/default_build_settings.cmake +++ b/default_build_settings.cmake @@ -77,7 +77,7 @@ endfunction() function(setup_vespa_default_build_settings_fedora_32) message("-- Setting up default build settings for fedora 32") set(DEFAULT_EXTRA_INCLUDE_DIRECTORY "${VESPA_DEPS}/include" "/usr/include/openblas" PARENT_SCOPE) - set(DEFAULT_VESPA_LLVM_VERSION "9" PARENT_SCOPE) + set(DEFAULT_VESPA_LLVM_VERSION "10" PARENT_SCOPE) endfunction() function(setup_vespa_default_build_settings_ubuntu_18_10) diff --git a/dist/vespa.spec b/dist/vespa.spec index 3a336496f4c..c54e4442167 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -81,7 +81,7 @@ BuildRequires: gtest-devel BuildRequires: gmock-devel %endif %if 0%{?fc32} -BuildRequires: llvm-devel >= 9.0.0 +BuildRequires: llvm-devel >= 10.0.0 BuildRequires: boost-devel >= 1.69 BuildRequires: gtest-devel BuildRequires: gmock-devel @@ -174,8 +174,8 @@ Requires: llvm-libs >= 9.0.0 %define _vespa_llvm_version 9 %endif %if 0%{?fc32} -Requires: llvm-libs >= 9.0.0 -%define _vespa_llvm_version 9 +Requires: llvm-libs >= 10.0.0 +%define _vespa_llvm_version 10 %endif %define _extra_link_directory %{_vespa_deps_prefix}/lib64 %define _extra_include_directory %{_vespa_deps_prefix}/include;/usr/include/openblas diff --git a/eval/src/vespa/eval/eval/llvm/compile_cache.h b/eval/src/vespa/eval/eval/llvm/compile_cache.h index 65cec9c0d48..aaadec772a5 100644 --- a/eval/src/vespa/eval/eval/llvm/compile_cache.h +++ b/eval/src/vespa/eval/eval/llvm/compile_cache.h @@ -5,6 +5,7 @@ #include "compiled_function.h" #include <vespa/vespalib/util/executor.h> #include <condition_variable> +#include <atomic> #include <mutex> namespace vespalib { diff --git a/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp b/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp index 1d5515d7f4a..e2ec8d52a68 100644 --- a/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp +++ b/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp @@ -21,6 +21,9 @@ #undef NDEBUG #endif #include <llvm/Transforms/IPO/PassManagerBuilder.h> +#if LLVM_VERSION_MAJOR > 9 +#include <llvm/Support/ManagedStatic.h> +#endif #include <vespa/eval/eval/check_type.h> #include <vespa/vespalib/stllike/hash_set.h> #include <vespa/vespalib/util/approx.h> |