Mesa (master): Re-commit 'clover: Fix build with LLVM 3.5'
Tom Stellard
tstellar at kemper.freedesktop.org
Tue Feb 25 22:43:57 UTC 2014
Module: Mesa
Branch: master
Commit: 54df6a049110464c4ba2ad97b12b69ede927eca4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=54df6a049110464c4ba2ad97b12b69ede927eca4
Author: Tom Stellard <thomas.stellard at amd.com>
Date: Tue Feb 25 13:32:37 2014 -0800
Re-commit 'clover: Fix build with LLVM 3.5'
This was accidentally reverted in 9dfd7c5f75c806801b1b4b4d405899236c09ba75
---
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 e826669..cdf32b6 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -297,8 +297,10 @@ namespace {
llvm::Argument &arg = *I;
#if HAVE_LLVM < 0x0302
llvm::TargetData TD(kernel_func->getParent());
-#else
+#elif HAVE_LLVM < 0x0304
llvm::DataLayout TD(kernel_func->getParent()->getDataLayout());
+#else
+ llvm::DataLayout TD(mod);
#endif
llvm::Type *arg_type = arg.getType();
More information about the mesa-commit
mailing list