<div dir="ltr"><div>Fixes the build for me here, and cl-program-tester from piglit seems to work just fine for the few tests I just ran.<br><br></div>--Aaron<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Oct 28, 2015 at 9:47 AM, Laurent Carlier <span dir="ltr"><<a href="mailto:lordheavym@gmail.com" target="_blank">lordheavym@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><a href="https://bugs.freedesktop.org/show_bug.cgi?id=92705" rel="noreferrer" target="_blank">https://bugs.freedesktop.org/show_bug.cgi?id=92705</a><br>
<br>
v2.1: use Linker::Flags::None instead of 0 and emplace_back()<br>
<span class=""><br>
Signed-off-by: Laurent Carlier <<a href="mailto:lordheavym@gmail.com">lordheavym@gmail.com</a>><br>
---<br>
 src/gallium/state_trackers/clover/llvm/invocation.cpp | 6 +++++-<br>
 1 file changed, 5 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp<br>
index d74b50d..a36dbd6 100644<br>
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp<br>
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp<br>
@@ -247,8 +247,12 @@ namespace {<br>
       // attribute.  This attribute will prevent Clang from creating<br>
       // illegal uses of barrier() (e.g. Moving barrier() inside a conditional<br>
       // that is no executed by all threads) during its optimizaton passes.<br>
+#if HAVE_LLVM >= 0x0308<br>
</span>+      c.getCodeGenOpts().LinkBitcodeFiles.emplace_back(llvm::Linker::Flags::None,<br>
+                                                       libclc_path);<br>
<div class="HOEnZb"><div class="h5">+#else<br>
       c.getCodeGenOpts().LinkBitcodeFile = libclc_path;<br>
-<br>
+#endif<br>
       optimization_level = c.getCodeGenOpts().OptimizationLevel;<br>
<br>
       // Compile the code<br>
--<br>
2.6.2<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</div></div></blockquote></div><br></div>