On 08/04/2017 12:22 AM, Jan Vesely wrote: > Signed-off-by: Jan Vesely <[email protected]> > --- > src/gallium/state_trackers/clover/llvm/codegen/native.cpp | 2 +- > src/gallium/state_trackers/clover/llvm/compat.hpp | 6 ++++++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/src/gallium/state_trackers/clover/llvm/codegen/native.cpp > b/src/gallium/state_trackers/clover/llvm/codegen/native.cpp > index b9e6750719..12c83a92b6 100644 > --- a/src/gallium/state_trackers/clover/llvm/codegen/native.cpp > +++ b/src/gallium/state_trackers/clover/llvm/codegen/native.cpp > @@ -115,7 +115,7 @@ namespace { > std::unique_ptr<TargetMachine> tm { > t->createTargetMachine(target.triple, target.cpu, "", {}, > compat::default_reloc_model, > - ::llvm::CodeModel::Default, > + compat::default_code_model, > ::llvm::CodeGenOpt::Default) }; > if (!tm) > fail(r_log, build_error(), > diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp > b/src/gallium/state_trackers/clover/llvm/compat.hpp > index 06d3b6ffe6..b22ecfa6b2 100644 > --- a/src/gallium/state_trackers/clover/llvm/compat.hpp > +++ b/src/gallium/state_trackers/clover/llvm/compat.hpp > @@ -174,6 +174,12 @@ namespace clover { > #endif > } > > +#if HAVE_LLVM >= 0x0600 > + const auto default_code_model = ::llvm::None; > +#else > + const auto default_code_model = ::llvm::CodeModel::Default; > +#endif > + > #if HAVE_LLVM >= 0x0309 > const auto default_reloc_model = ::llvm::None; > #else >
This patch ended up being ignored, though Mesa seems to compile fine. Did r310200 address it? Regards, Vedran -- Vedran Miletić vedran.miletic.net _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
