diff options
| author | Tobias Droste <tdroste@gmx.de> | 2011-09-15 02:39:26 +0200 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2011-09-15 15:53:04 -0600 |
| commit | 1795372feec77e62cbe150f5853e063b9e53acd2 (patch) | |
| tree | 645b597af791af3235aca4caad9cde85294ae1e4 /src/gallium/auxiliary | |
| parent | 72e0a9226ddf9282a0351e71c0272882473c836d (diff) | |
| download | external_mesa3d-1795372feec77e62cbe150f5853e063b9e53acd2.zip external_mesa3d-1795372feec77e62cbe150f5853e063b9e53acd2.tar.gz external_mesa3d-1795372feec77e62cbe150f5853e063b9e53acd2.tar.bz2 | |
gallivm: fix build with LLVM 3.0svn
LLVM 3.0svn added SubtargetInfo as additional parameter to
createMCDisassembler() and createMCInstPrinter().
See revision 139237 of LLVM.
Signed-off-by: Tobias Droste <tdroste@gmx.de>
Signed-off-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp index 401e0e2..b9892d6 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp @@ -210,7 +210,12 @@ lp_disassemble(const void* func) return; } +#if HAVE_LLVM >= 0x0300 + const MCSubtargetInfo *STI = T->createMCSubtargetInfo(Triple, sys::getHostCPUName(), ""); + OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler(*STI)); +#else OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler()); +#endif if (!DisAsm) { debug_printf("error: no disassembler for target %s\n", Triple.c_str()); return; @@ -223,7 +228,11 @@ lp_disassemble(const void* func) #else int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); #endif -#if HAVE_LLVM >= 0x0208 + +#if HAVE_LLVM >= 0x0300 + OwningPtr<MCInstPrinter> Printer( + T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); +#elif HAVE_LLVM >= 0x0208 OwningPtr<MCInstPrinter> Printer( T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo)); #else |