Michel Dänzer <mic...@daenzer.net> writes: > From: Michel Dänzer <michel.daen...@amd.com> > > raw_svector_ostream::flush() is now unnecessary and forbidden: > > CXX llvm/libclllvm_la-invocation.lo > ../../../../../src/gallium/state_trackers/clover/llvm/invocation.cpp: In > function 'clover::module {anonymous}::build_module_llvm(llvm::Module*, > unsigned int (&)[7])': > ../../../../../src/gallium/state_trackers/clover/llvm/invocation.cpp:574:29: > error: use of deleted function 'void llvm::raw_svector_ostream::flush()' > bitcode_ostream.flush(); > ^ > In file included from > /home/daenzer/src/llvm-git/llvm/include/clang/Basic/VirtualFileSystem.h:22:0, > from > /home/daenzer/src/llvm-git/llvm/include/clang/Basic/FileManager.h:20, > from > /home/daenzer/src/llvm-git/llvm/include/clang/Basic/SourceManager.h:38, > from > /home/daenzer/src/llvm-git/llvm/include/clang/Frontend/CompilerInstance.h:16, > from > ../../../../../src/gallium/state_trackers/clover/llvm/invocation.cpp:25: > /home/daenzer/src/llvm-git/llvm/include/llvm/Support/raw_ostream.h:512:8: > note: declared here > void flush() = delete; > ^ > Makefile:862: recipe for target 'llvm/libclllvm_la-invocation.lo' failed > > Signed-off-by: Michel Dänzer <michel.daen...@amd.com>
Thanks, Reviewed-by: Francisco Jerez <curroje...@riseup.net> > --- > src/gallium/state_trackers/clover/llvm/invocation.cpp | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp > b/src/gallium/state_trackers/clover/llvm/invocation.cpp > index 86859af..63c3f8e 100644 > --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp > +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp > @@ -571,7 +571,9 @@ namespace { > llvm::raw_svector_ostream bitcode_ostream(llvm_bitcode); > llvm::BitstreamWriter writer(llvm_bitcode); > llvm::WriteBitcodeToFile(mod, bitcode_ostream); > +#if HAVE_LLVM < 0x0308 > bitcode_ostream.flush(); > +#endif > > const std::vector<llvm::Function *> kernels = find_kernels(mod); > for (unsigned i = 0; i < kernels.size(); ++i) { > -- > 2.5.0 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev
signature.asc
Description: PGP signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev