Mesa (master): st/clover: Fix build against LLVM SVN >= r216583

Michel Dänzer daenzer at kemper.freedesktop.org
Thu Aug 28 06:09:00 UTC 2014


Module: Mesa
Branch: master
Commit: eae9da879f3143507ef0e238a7e4faa87114d54e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=eae9da879f3143507ef0e238a7e4faa87114d54e

Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Aug 28 12:05:21 2014 +0900

st/clover: Fix build against LLVM SVN >= r216583

Reviewed-by: Francisco Jerez <currojerez at riseup.net>

---

 src/gallium/state_trackers/clover/llvm/invocation.cpp |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index d351bc5..7bca0d6 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -211,8 +211,13 @@ namespace {
                                  &c.getDiagnosticOpts()));
 #endif
 
+#if HAVE_LLVM >= 0x0306
+      c.getPreprocessorOpts().addRemappedFile(name,
+                                              llvm::MemoryBuffer::getMemBuffer(source).release());
+#else
       c.getPreprocessorOpts().addRemappedFile(name,
                                       llvm::MemoryBuffer::getMemBuffer(source));
+#endif
 
       // Setting this attribute tells clang to link this file before
       // performing any optimizations.  This is required so that




More information about the mesa-commit mailing list