On Sat, 2017-09-16 at 18:30 +0200, Gert Wollny wrote:
> Am Freitag, den 15.09.2017, 21:41 -0400 schrieb Jan Vesely:
> [...]
>
> > > > > > a/src/gallium/state_trackers/clover/llvm/compat.hpp
> > > > > > b/src/gallium/state_trackers/clover/llvm/compat.hpp
> > > > > > index b22ecfa6b2..9bca6d82e8 100644
> > > > > > --- a/src/gallium/state_trackers/clover/llvm/compat.hpp
> > > > > > +++ b/src/gallium/state_trackers/clover/llvm/compat.hpp
> > > > > > @@ -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
> > > > > > + }
> > > > > > }
> > > > > > }
> > > > > > }
>
> It seems that this breaks building with llvm-3.6 [1]. If this is
> intentional, then the according test environment should be removed from
> .travis.yml.thanks for reporting this. The attached patch should fix the issue. I'm setting up travis for my branch, but it's still blowing up on --enable- omx being deprecated. regards, Jan > > Best, > Gert > > [1] https://travis-ci.org/gerddie/mesa/jobs/276283003 > > In file included from llvm/codegen/bitcode.cpp:35:0: > ./llvm/compat.hpp: In function ‘void > clover::llvm::compat::set_diagnostic_handler(llvm::LLVMContext&, T*, > void*)’: > ./llvm/compat.hpp:208:15: error: invalid use of incomplete type ‘class > llvm::LLVMContext’ > In file included from /usr/lib/llvm- > 3.6/include/llvm/IR/DerivedTypes.h:21:0, > from /usr/lib/llvm- > 3.6/include/llvm/IR/DataLayout.h:25, > from /usr/lib/llvm-3.6/include/llvm/IR/Module.h:20, > from ./llvm/codegen.hpp:35, > from llvm/codegen/bitcode.cpp:34: > /usr/lib/llvm-3.6/include/llvm/IR/Type.h:32:7: error: forward > declaration of ‘class llvm::LLVMContext’ > > > -- Jan Vesely <jan.ves...@rutgers.edu>
From 7109802f9d262675a669531c2c5c01efa3751a04 Mon Sep 17 00:00:00 2001 From: Jan Vesely <jan.ves...@rutgers.edu> Date: Sat, 16 Sep 2017 18:06:07 -0400 Subject: [PATCH] clover: add missing include to compat.h Fixes build issues with llvm-3.6 Fixes: 3115687f9b9830417c408228db2bc679e346bba6 (clover: Fix build after LLVM r313390) Signed-off-by: Jan Vesely <jan.ves...@rutgers.edu> --- src/gallium/state_trackers/clover/llvm/compat.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp b/src/gallium/state_trackers/clover/llvm/compat.hpp index 23b111d710..f8b56516d5 100644 --- a/src/gallium/state_trackers/clover/llvm/compat.hpp +++ b/src/gallium/state_trackers/clover/llvm/compat.hpp @@ -36,6 +36,7 @@ #include "util/algorithm.hpp" +#include <llvm/IR/LLVMContext.h> #include <llvm/Linker/Linker.h> #include <llvm/Transforms/IPO.h> #include <llvm/Target/TargetMachine.h> -- 2.13.5
signature.asc
Description: This is a digitally signed message part
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
