From 9dfd7c5f75c806801b1b4b4d405899236c09ba75 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Wed, 26 Feb 2014 08:46:08 +1100 Subject: [PATCH] Revert "Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa" This reverts commit 1b79582f322d4a89dd6d197c8d4962c788ae7f25, reversing changes made to 376a98d345dfc3da8d5b0f1e489196f861c4e754. --- src/gallium/state_trackers/clover/llvm/invocation.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp index cdf32b6e3fb..e8266693bd0 100644 --- 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(); -- 2.30.2