diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-02 21:25:54 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-02 21:25:54 -0300 |
commit | 8b9ddc7fec12ba69e50ece961525c90bed96df99 (patch) | |
tree | fc12914f9d27317b3d3f1df6f0009f02ebb7668a /extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch | |
parent | 40134114ddb57a36863a256ffdc5b65a8edb5a67 (diff) | |
parent | d915cad658736d96368750201c34df752048751a (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/perl-berkeleydb/PKGBUILD
community/egoboo/PKGBUILD
community/kdenlive/PKGBUILD
community/postgis/PKGBUILD
core/lvm2/PKGBUILD
extra/gvfs/PKGBUILD
extra/libatasmart/PKGBUILD
extra/mesa/PKGBUILD
extra/pixman/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/system-config-printer/PKGBUILD
extra/xorg-server/PKGBUILD
kde-unstable/kdenetwork/PKGBUILD
multilib/lib32-mesa/PKGBUILD
testing/imagemagick/PKGBUILD
testing/php/PKGBUILD
testing/php/logrotate.d.php-fpm
testing/php/php-fpm.conf.in.patch
testing/php/rc.d.php-fpm
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch')
-rw-r--r-- | extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/extra/mesa/mesa-8.0.3-llvm-3.1-fixes.patch new file mode 100644 index 000000000..a567b5926 --- /dev/null +++ b/extra/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 + } + + |