summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/gallivm
diff options
context:
space:
mode:
authorJan Vesely <jan.vesely@rutgers.edu>2014-08-04 18:50:02 -0400
committerMichel Dänzer <michel.daenzer@amd.com>2014-08-05 12:52:56 +0900
commite28136343b6aa7dfff8ec85f6463574d6625b5a6 (patch)
tree3039dc12da64e63d6aa2d54ec668adfe93cef06e /src/gallium/auxiliary/gallivm
parent6b834af77ec41ea974238580b23d28a5f6335090 (diff)
downloadexternal_mesa3d-e28136343b6aa7dfff8ec85f6463574d6625b5a6.zip
external_mesa3d-e28136343b6aa7dfff8ec85f6463574d6625b5a6.tar.gz
external_mesa3d-e28136343b6aa7dfff8ec85f6463574d6625b5a6.tar.bz2
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>
Diffstat (limited to 'src/gallium/auxiliary/gallivm')
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_debug.cpp8
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 413a0c2..b6b52c8 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
+
#include <llvm/Support/TargetRegistry.h>
#include <llvm/MC/MCSubtargetInfo.h>
@@ -271,7 +275,11 @@ disassemble(const void* func, llvm::raw_ostream & Out)
#endif
OwningPtr<TargetMachine> TM(T->createTargetMachine(Triple, sys::getHostCPUName(), "", options));
+#if HAVE_LLVM >= 0x0306
+ const TargetInstrInfo *TII = TM->getSubtargetImpl()->getInstrInfo();
+#else
const TargetInstrInfo *TII = TM->getInstrInfo();
+#endif
/*
* Wrap the data in a MemoryObject