From 9b54192c878fbc002af03422140f20d415a87b3aab2b84e4f429c927426c7d1d Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Sun, 6 Sep 2015 17:20:03 +0000
Subject: [PATCH] Accepting request 329271 from home:namtrac:branches:X11:XOrg

- Add U_mesa-llvm37.patch to fix build with llvm 3.7

OBS-URL: https://build.opensuse.org/request/show/329271
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=466
---
 Mesa.changes        |  5 +++++
 Mesa.spec           |  3 +++
 U_mesa-llvm37.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 U_mesa-llvm37.patch

diff --git a/Mesa.changes b/Mesa.changes
index d541ee5..4f1edc1 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Sep  5 11:45:32 UTC 2015 - idonmez@suse.com
+
+- Add U_mesa-llvm37.patch to fix build with llvm 3.7
+
 -------------------------------------------------------------------
 Sat Aug 22 14:17:01 UTC 2015 - zaitor@opensuse.org
 
diff --git a/Mesa.spec b/Mesa.spec
index 93154b4..88294df 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -56,6 +56,8 @@ Patch11:        u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
 Patch13:        u_mesa-8.0.1-fix-16bpp.patch
 # Patch from Fedora, use shmget when available, under llvmpipe
 Patch15:        u_mesa-8.0-llvmpipe-shmget.patch
+# Upstream commit to fix build with llvm 3.7
+Patch16:        U_mesa-llvm37.patch   
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
 BuildRequires:  bison
@@ -515,6 +517,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 # required for building against wayland of openSUSE 13.1
 %patch0 -p1
 %endif
+%patch16 -p1
 ### disabled, but not dropped yet; these still need investigation in
 ### order to figure out whether the issue is still reproducable and
 ### hence a fix is required
diff --git a/U_mesa-llvm37.patch b/U_mesa-llvm37.patch
new file mode 100644
index 0000000..a6473de
--- /dev/null
+++ b/U_mesa-llvm37.patch
@@ -0,0 +1,45 @@
+From 147ffd48166d851341cadd12de98895f32ec25a2 Mon Sep 17 00:00:00 2001
+From: Vinson Lee <vlee@freedesktop.org>
+Date: Tue, 26 May 2015 22:18:28 -0700
+Subject: gallivm: Do not use NoFramePointerElim with LLVM 3.7.
+
+TargetOptions::NoFramePointerElim was removed in llvm-3.7.0svn r238244
+"Remove NoFramePointerElim and NoFramePointerElimOverride from
+TargetOptions and remove ExecutionEngine's dependence on CodeGen. NFC."
+
+Signed-off-by: Vinson Lee <vlee@freedesktop.org>
+Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+index be3e834..76c302f 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+@@ -277,8 +277,10 @@ disassemble(const void* func, llvm::raw_ostream & Out)
+    options.StackAlignmentOverride = 4;
+ #endif
+ #if defined(DEBUG) || defined(PROFILE)
++#if HAVE_LLVM < 0x0307
+    options.NoFramePointerElim = true;
+ #endif
++#endif
+    OwningPtr<TargetMachine> TM(T->createTargetMachine(Triple, sys::getHostCPUName(), "", options));
+ 
+    /*
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index 5e8a634..ffed9e6 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -439,8 +439,10 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
+ #if HAVE_LLVM < 0x0304
+    options.NoFramePointerElimNonLeaf = true;
+ #endif
++#if HAVE_LLVM < 0x0307
+    options.NoFramePointerElim = true;
+ #endif
++#endif
+ 
+    builder.setEngineKind(EngineKind::JIT)
+           .setErrorStr(&Error)
+-- 
+cgit v0.10.2
+