Hi,
I tried to build mesa-9.2 GIT branch with llvm-3.4 on Ubuntu/precise
AMD64 and needed the 2 following patches:
[PATCH 1/2] gallivm: Remove llvm::DisablePrettyStackTrace for LLVM >= 3.4.
[PATCH 2/2] gallivm: Remove NoFramePointerElimNonLeaf for LLVM >= 3.4.
Not sure if mesa-9.2.x is still maintained.
If yes, please cherry-pick them.
Thanks in advance.
Regards,
- Sedat -
From aa1d3db0c80b6c11fb9d1c1c5eacd97eb9c4de29 Mon Sep 17 00:00:00 2001
From: Vinson Lee <v...@freedesktop.org>
Date: Sun, 3 Nov 2013 20:27:13 -0800
Subject: [PATCH 1/2] gallivm: Remove llvm::DisablePrettyStackTrace for LLVM >=
3.4.
LLVM 3.4 r193971 removed llvm::DisablePrettyStackTrace and made the
pretty stack trace opt-in rather than opt-out.
The default value of DisablePrettyStackTrace has changed to true in LLVM
3.4 and newer.
Signed-off-by: Vinson Lee <v...@freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=60929
Reviewed-by: Tom Stellard <thomas.stell...@amd.com>
Reviewed-by: Brian Paul <bri...@vmware.com>
---
src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index 1e5adb7..2f3020b 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -174,12 +174,14 @@ lp_set_target_options(void)
}
#endif
+#if HAVE_LLVM < 0x0304
/*
* By default LLVM adds a signal handler to output a pretty stack trace.
* This signal handler is never removed, causing problems when unloading the
* shared object where the gallium driver resides.
*/
llvm::DisablePrettyStackTrace = true;
+#endif
// If we have a native target, initialize it to ensure it is linked in and
// usable by the JIT.
--
1.9.0
From a8b18df4de204d452b1245417ac744b3d765159d Mon Sep 17 00:00:00 2001
From: Vinson Lee <v...@freedesktop.org>
Date: Wed, 24 Jul 2013 23:28:27 -0700
Subject: [PATCH 2/2] gallivm: Remove NoFramePointerElimNonLeaf for LLVM >=
3.4.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
TargetOptions::NoFramePointerElimNonLeaf was removed in LLVM 3.4
r187093.
Signed-off-by: Vinson Lee <v...@freedesktop.org>
Reviewed-by: José Fonseca <jfons...@vmware.com>
---
src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index 2f3020b..5d3e22f 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -283,7 +283,9 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
#endif
#if defined(DEBUG) || defined(PROFILE)
+#if HAVE_LLVM < 0x0304
options.NoFramePointerElimNonLeaf = true;
+#endif
options.NoFramePointerElim = true;
#endif
--
1.9.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
