diff options
| author | Jan Vesely <jan.vesely@rutgers.edu> | 2014-08-04 18:50:02 -0400 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-09-02 12:29:58 +0100 |
| commit | 8fe85c7742d91322682f2c415c9450b47d43a5ac (patch) | |
| tree | 9d5419e8b1e6cf428250bb8687784d5be048f87c /src/gallium | |
| parent | c89719e955f11dd08a110dd768db5bb05a3d4cdd (diff) | |
gallivm: Fix build with latest LLVM
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
(cherry picked from commit e28136343b6aa7dfff8ec85f6463574d6625b5a6)
Nominated-by: Marek Olšák <maraeo@gmail.com>
Conflicts:
src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp index 7e43b514b66..2629aaa66d6 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp @@ -34,6 +34,10 @@ #include <llvm/Support/Format.h> #include <llvm/Support/MemoryObject.h> +#if HAVE_LLVM >= 0x0306 +#include <llvm/Target/TargetSubtargetInfo.h> +#endif + #if HAVE_LLVM >= 0x0300 #include <llvm/Support/TargetRegistry.h> #include <llvm/MC/MCSubtargetInfo.h> @@ -302,7 +306,11 @@ disassemble(const void* func, llvm::raw_ostream & Out) OwningPtr<TargetMachine> TM(T->createTargetMachine(Triple, "")); #endif +#if HAVE_LLVM >= 0x0306 + const TargetInstrInfo *TII = TM->getSubtargetImpl()->getInstrInfo(); +#else const TargetInstrInfo *TII = TM->getInstrInfo(); +#endif /* * Wrap the data in a MemoryObject |