Mesa (master): clover: Fix build with LLVM 3.4

[Tom Stellard]

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

Author: Tom Stellard <thomas.stell...@amd.com>
Date:   Thu Jun 27 09:41:34 2013 -0700

clover: Fix build with LLVM 3.4

Reported on IRC by lordheavy

---

 .../state_trackers/clover/llvm/invocation.cpp      |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp 
b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index 2d115ed..90bc53b 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -43,7 +43,9 @@
 #include <llvm/PassManager.h>
 #include <llvm/Support/TargetSelect.h>
 #include <llvm/Support/MemoryBuffer.h>
+#if HAVE_LLVM < 0x0303
 #include <llvm/Support/PathV1.h>
+#endif
 #include <llvm/Transforms/IPO.h>
 #include <llvm/Transforms/IPO/PassManagerBuilder.h>
 
@@ -222,20 +224,18 @@ namespace {
 
       llvm::PassManager PM;
       llvm::PassManagerBuilder Builder;
-      llvm::sys::Path libclc_path =
-                            llvm::sys::Path(LIBCLC_LIBEXECDIR + processor +
-                                           "-" + triple + ".bc");
-
+      std::string libclc_path = LIBCLC_LIBEXECDIR + processor + "-"
+                                                  + triple + ".bc";
       // Link the kernel with libclc
 #if HAVE_LLVM < 0x0303
       bool isNative;
       llvm::Linker linker("clover", mod);
-      linker.LinkInFile(libclc_path, isNative);
+      linker.LinkInFile(llvm::sys::Path(libclc_path), isNative);
       mod = linker.releaseModule();
 #else
       std::string err_str;
       llvm::SMDiagnostic err;
-      llvm::Module *libclc_mod = llvm::ParseIRFile(libclc_path.str(), err,
+      llvm::Module *libclc_mod = llvm::ParseIRFile(libclc_path, err,
                                                    mod->getContext());
       if (llvm::Linker::LinkModules(mod, libclc_mod,
                                     llvm::Linker::DestroySource,

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit