Module: Mesa Branch: 10.2 Commit: 8fe85c7742d91322682f2c415c9450b47d43a5ac URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8fe85c7742d91322682f2c415c9450b47d43a5ac
Author: Jan Vesely <[email protected]> Date: Mon Aug 4 18:50:02 2014 -0400 gallivm: Fix build with latest LLVM Signed-off-by: Jan Vesely <[email protected]> Reviewed-and-Tested-by: Michel Dänzer <[email protected]> (cherry picked from commit e28136343b6aa7dfff8ec85f6463574d6625b5a6) Nominated-by: Marek Olšák <[email protected]> Conflicts: src/gallium/auxiliary/gallivm/lp_bld_debug.cpp --- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp index 7e43b51..2629aaa 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 _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
