summaryrefslogtreecommitdiff
path: root/lib/mesa/src/gallium/auxiliary/gallivm
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2015-12-23 13:27:37 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2015-12-23 13:27:37 +0000
commit5f7540fe56d9bd78811acbd834be64d07862b5a5 (patch)
treea88beb5592749f9418634348467950aeaf1f9d01 /lib/mesa/src/gallium/auxiliary/gallivm
parent2f35ab22e92c7e0d9211cd62d9e57904c69940a0 (diff)
Import Mesa 11.0.8
This seems to fix some of the problems with clutter/gnome reported to occur on r600 with 11.0.6
Diffstat (limited to 'lib/mesa/src/gallium/auxiliary/gallivm')
-rw-r--r--lib/mesa/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/mesa/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/lib/mesa/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index 7bda1184e..3ee708f4f 100644
--- a/lib/mesa/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/lib/mesa/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -536,6 +536,15 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
#if defined(PIPE_ARCH_PPC)
MAttrs.push_back(util_cpu_caps.has_altivec ? "+altivec" : "-altivec");
+#if HAVE_LLVM >= 0x0304
+ /*
+ * Make sure VSX instructions are disabled
+ * See LLVM bug https://llvm.org/bugs/show_bug.cgi?id=25503#c7
+ */
+ if (util_cpu_caps.has_altivec) {
+ MAttrs.push_back("-vsx");
+ }
+#endif
#endif
builder.setMAttrs(MAttrs);