diff options
author | root <root@rshg054.dnsready.net> | 2012-05-28 17:43:57 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-05-28 17:43:57 +0000 |
commit | 483f7de4ab6a706517279a24d2efc969f4a1996d (patch) | |
tree | 128a7513d3e42c4d8812b5fd11a4afb116399762 /multilib-testing/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch | |
parent | 89dd7b5f30d48c708092a71b1c8285090fe91505 (diff) |
Mon May 28 17:43:57 UTC 2012
Diffstat (limited to 'multilib-testing/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch')
-rw-r--r-- | multilib-testing/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/multilib-testing/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/multilib-testing/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch new file mode 100644 index 000000000..922577aef --- /dev/null +++ b/multilib-testing/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch @@ -0,0 +1,44 @@ +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +index a50a51d..f1bb4d9 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +@@ -235,7 +235,24 @@ lp_disassemble(const void* func) + int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); + #endif + +-#if HAVE_LLVM >= 0x0300 ++#if HAVE_LLVM >= 0x0301 ++ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple)); ++ if (!MRI) { ++ debug_printf("error: no register info for target %s\n", Triple.c_str()); ++ return; ++ } ++ ++ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo()); ++ if (!MII) { ++ debug_printf("error: no instruction info for target %s\n", Triple.c_str()); ++ return; ++ } ++#endif ++ ++#if HAVE_LLVM >= 0x0301 ++ OwningPtr<MCInstPrinter> Printer( ++ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); ++#elif HAVE_LLVM == 0x0300 + OwningPtr<MCInstPrinter> Printer( + T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); + #elif HAVE_LLVM >= 0x0208 +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index fe7616b..68f8808 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -62,7 +62,11 @@ + extern "C" void + lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE) + { ++#if HAVE_LLVM >= 0x0301 ++ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener()); ++#else + llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener()); ++#endif + } |