diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-02-14 22:05:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-14 22:05:10 +0100 |
| commit | b173d4bd32ca845e91e1464fb6812a040025cb9b (patch) | |
| tree | d1bd92bfa47859db28aee9d1729c4b83f39b8409 /eval | |
| parent | 4037f6a6c61e9dfc90b1a1abef68ea2e88212b9b (diff) | |
| parent | 9f35db16a1e823296c8089ac646ed6de77f34086 (diff) | |
Merge pull request #12204 from vespa-engine/toregge/fedora-rawhide-now-uses-llvm-10
Use llvm 10 on Fedora rawhide.
Diffstat (limited to 'eval')
| -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 |
2 files changed, 4 insertions, 0 deletions
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> |