diff --git a/mesa3d-32/0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch b/mesa3d-32/0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch
new file mode 100644
index 00000000..7184c06a
--- /dev/null
+++ b/mesa3d-32/0196-gallivm-Update-for-RTDyldMemoryManager-becoming-an-u.patch
@@ -0,0 +1,33 @@
+From 89f4202c6b0477eba0ec62340b8882a4a5fa6949 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
+Date: Wed, 3 Dec 2014 07:48:26 +0000
+Subject: [PATCH 196/196] gallivm: Update for RTDyldMemoryManager becoming an
+ unique_ptr.
+
+Trivial.
+
+Fixes https://bugs.freedesktop.org/show_bug.cgi?id=86958
+---
+ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index fe3c754..5210acc 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -500,8 +500,12 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
+        MM = new ShaderMemoryManager(JMM);
+        *OutCode = MM->getGeneratedCode();
+ 
++#if HAVE_LLVM >= 0x0306
++       builder.setMCJITMemoryManager(std::unique_ptr<RTDyldMemoryManager>(MM));
++#else
+        builder.setMCJITMemoryManager(MM);
+ #endif
++#endif
+    } else {
+ #if HAVE_LLVM < 0x0306
+        BaseMemoryManager* JMM = reinterpret_cast<BaseMemoryManager*>(CMM);
+-- 
+2.2.1
+