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

ry,
This commit is contained in:
Timothy Arceri 2014-02-26 08:39:32 +11:00
commit 1b79582f32

View file

@ -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();