[Mesa-dev] [PATCH] clover: fix building fix clang-3.8

Laurent Carlier lordheavym at gmail.com
Wed Oct 28 07:29:55 PDT 2015


https://bugs.freedesktop.org/show_bug.cgi?id=92705

v2: use Linker::Flags::None instead of 0

Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
---
 src/gallium/state_trackers/clover/llvm/invocation.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index d74b50d..a36dbd6 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -247,8 +247,12 @@ namespace {
       // attribute.  This attribute will prevent Clang from creating
       // illegal uses of barrier() (e.g. Moving barrier() inside a conditional
       // that is no executed by all threads) during its optimizaton passes.
+#if HAVE_LLVM >= 0x0308
+      c.getCodeGenOpts().LinkBitcodeFiles.push_back(std::make_pair(llvm::Linker::Flags::None,
+                                                                   libclc_path));
+#else
       c.getCodeGenOpts().LinkBitcodeFile = libclc_path;
-
+#endif
       optimization_level = c.getCodeGenOpts().OptimizationLevel;
 
       // Compile the code
-- 
2.6.2



More information about the mesa-dev mailing list