diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-12-09 23:52:38 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-12-09 23:52:38 (GMT) |
| commit | 9ab402ef3144d07898df8287aa911a4ce5d22592 (patch) | |
| tree | 6375438c42e3114c6c44a4da78fb22a2ef74a5e5 /abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch | |
| parent | 001434e04ddc008b1b7844d824b3fe2d6e5bb210 (diff) | |
| download | linhes_pkgbuild-9ab402ef3144d07898df8287aa911a4ce5d22592.zip linhes_pkgbuild-9ab402ef3144d07898df8287aa911a4ce5d22592.tar.gz linhes_pkgbuild-9ab402ef3144d07898df8287aa911a4ce5d22592.tar.bz2 | |
mesa 8.0: reverted from 9.0 because of the intel driver opengl hardlock problem.
refs #870
Diffstat (limited to 'abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch')
| -rw-r--r-- | abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch new file mode 100644 index 0000000..a567b59 --- /dev/null +++ b/abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch @@ -0,0 +1,46 @@ +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 + } + + |