diff options
| author | Vinson Lee <vlee@freedesktop.org> | 2014-10-19 00:13:33 -0700 |
|---|---|---|
| committer | Vinson Lee <vlee@freedesktop.org> | 2014-10-21 15:40:47 -0700 |
| commit | 1ab6543431b5a4eaf589cdabf2227088dd62ce6f (patch) | |
| tree | 5ffd1912ae50248a30011f92a18ac64ef0a08bba /src/gallium | |
| parent | 43b243236824ce80daaa5cb4af5db94aaca0855e (diff) | |
clover: Fix build error with LLVM 3.4.
DataLayoutPass was added in LLVM 3.5 r202168, commit
57edc9d4ff1648568a5dd7e9958649065b260dca "Make DataLayout a plain
object, not a pass.".
This patch fixes this build error with LLVM 3.4.
CXX llvm/libclllvm_la-invocation.lo
llvm/invocation.cpp: In function 'void {anonymous}::optimize(llvm::Module*, unsigned int, const std::vector<llvm::Function*>&)':
llvm/invocation.cpp:324:18: error: expected type-specifier
PM.add(new llvm::DataLayoutPass(mod));
^
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85189
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
Diffstat (limited to 'src/gallium')
| -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 507daa0e37..7c31008f52 100644 --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp @@ -344,7 +344,9 @@ namespace { llvm::Function *kernel = *I; export_list.push_back(kernel->getName().data()); } -#if HAVE_LLVM < 0x0306 +#if HAVE_LLVM < 0x0305 + PM.add(new llvm::DataLayout(mod)); +#elif HAVE_LLVM < 0x0306 PM.add(new llvm::DataLayoutPass(mod)); #else PM.add(new llvm::DataLayoutPass()); |