diff options
| author | Timothy Arceri <[email protected]> | 2014-02-26 08:39:32 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2014-02-26 08:39:32 +1100 |
| commit | 1b79582f322d4a89dd6d197c8d4962c788ae7f25 (patch) | |
| tree | 8465709dc9fa54939cc0fef264659f6c33c7bbc5 | |
| parent | 376a98d345dfc3da8d5b0f1e489196f861c4e754 (diff) | |
| parent | fcd499730b225ec5a35902893c059086ba11b590 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa
ry,
| -rw-r--r-- | src/gallium/state_trackers/clover/llvm/invocation.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp index e8266693bd0..cdf32b6e3fb 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(); |