Mesa (master): clover: Fix build error with LLVM 3.4.
Vinson Lee
vlee at kemper.freedesktop.org
Tue Oct 21 22:41:37 UTC 2014
Module: Mesa
Branch: master
Commit: 1ab6543431b5a4eaf589cdabf2227088dd62ce6f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1ab6543431b5a4eaf589cdabf2227088dd62ce6f
Author: Vinson Lee <vlee at freedesktop.org>
Date: Sun Oct 19 00:13:33 2014 -0700
clover: Fix build error with LLVM 3.4.
DataLayoutPass was added in LLVM 3.5 r202168, commit
57edc9d4ff1648568a5dd7e9958649065b260dca "Make DataLayout a plain
object, not a pass.".
This patch fixes this build error with LLVM 3.4.
CXX llvm/libclllvm_la-invocation.lo
llvm/invocation.cpp: In function 'void {anonymous}::optimize(llvm::Module*, unsigned int, const std::vector<llvm::Function*>&)':
llvm/invocation.cpp:324:18: error: expected type-specifier
PM.add(new llvm::DataLayoutPass(mod));
^
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85189
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
---
src/gallium/state_trackers/clover/llvm/invocation.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index 507daa0..7c31008 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -344,7 +344,9 @@ namespace {
llvm::Function *kernel = *I;
export_list.push_back(kernel->getName().data());
}
-#if HAVE_LLVM < 0x0306
+#if HAVE_LLVM < 0x0305
+ PM.add(new llvm::DataLayout(mod));
+#elif HAVE_LLVM < 0x0306
PM.add(new llvm::DataLayoutPass(mod));
#else
PM.add(new llvm::DataLayoutPass());
More information about the mesa-commit
mailing list