fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

clover: Fix build after LLVM r313390

Browse source 
v2: pass llvm context reference instead of a pointer

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
This commit is contained in:
Jan Vesely 2017-09-15 20:34:42 -04:00
parent 5ef3c2bcef
commit 3115687f9b
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/state_trackers/clover/llvm/compat.hpp
View file

@ -198,6 +198,16 @@ namespace clover {
f(mod.getError().message());
#endif
}
template<typename T> void
set_diagnostic_handler(::llvm::LLVMContext &ctx,
T *diagnostic_handler, void *data) {
#if HAVE_LLVM >= 0x0600
ctx.setDiagnosticHandlerCallBack(diagnostic_handler, data);
#else
ctx.setDiagnosticHandler(diagnostic_handler, data);
#endif
}
}
}
}

2
src/gallium/state_trackers/clover/llvm/invocation.cpp
View file

@ -89,7 +89,7 @@ namespace {
create_context(std::string &r_log) {
init_targets();
std::unique_ptr<LLVMContext> ctx { new LLVMContext };
ctx->setDiagnosticHandler(diagnostic_handler, &r_log);
compat::set_diagnostic_handler(*ctx, diagnostic_handler, &r_log);
return ctx;
}