Revert "Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa"

This reverts commit 1b79582f322d4a89dd6d197c8d4962c788ae7f25, reversing
changes made to 376a98d345dfc3da8d5b0f1e489196f861c4e754.

diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index cdf32b6e3fbaa4487a5ee2009ca8a3bd1bc5ce52..e8266693bd0172c3cac4da44e24947d68012925d 100644 (file)
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -297,10 +297,8 @@ namespace {
             llvm::Argument &arg = *I;
 #if HAVE_LLVM < 0x0302
             llvm::TargetData TD(kernel_func->getParent());
-#elif HAVE_LLVM < 0x0304
-            llvm::DataLayout TD(kernel_func->getParent()->getDataLayout());
 #else
-            llvm::DataLayout TD(mod);
+            llvm::DataLayout TD(kernel_func->getParent()->getDataLayout());
 #endif
 
             llvm::Type *arg_type = arg.getType();