Attachment 51029 Details for Bug 40754 – patch

[patch] patch

llvm-3.0.patch (text/plain), 1.67 KB, created by ojab on 2011-09-10 08:29:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ojab

Created: 2011-09-10 08:29:08 UTC

Size: 1.67 KB

patch

obsolete

>From 973221968117c50b141b700350d2e83befff4fce Mon Sep 17 00:00:00 2001
>From: ojab <ojab@ojab.ru>
>Date: Sat, 10 Sep 2011 19:23:20 +0400
>Subject: [PATCH] gallivm: fix build with LLVM 3.0svn
>
>LLVM 3.0svn refactored instprinter and mcdisassembler to take a SubtargetInfo.
>See revision 139237 of LLVM.
>---
> src/gallium/auxiliary/gallivm/lp_bld_debug.cpp |   14 +++++++++++++-
> 1 files changed, 13 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..b8a97da 100644
>--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
>+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
>@@ -210,11 +210,20 @@ lp_disassemble(const void* func)
>       return;
>    }
> 
>+#if HAVE_LLVM >= 0x0300
>+   const MCSubtargetInfo *STI = T->createMCSubtargetInfo(Triple.c_str(), "", "");
>+   if (!STI) {
>+      debug_printf("error: no subtarget info for target %s\n", Triple.c_str());
>+      return;
>+   }
>+   OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler(*STI));
>+#else
>    OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler());
>    if (!DisAsm) {
>       debug_printf("error: no disassembler for target %s\n", Triple.c_str());
>       return;
>    }
>+#endif
> 
>    raw_debug_ostream Out;
> 
>@@ -223,7 +232,10 @@ 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
>-- 
>1.7.6
>

Actions: View | Splinter Review

Attachments on bug 40754: 51029

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.