summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-06-11 20:26:39 -0700
committerKhem Raj <raj.khem@gmail.com>2021-06-14 17:39:06 -0700
commitc37942613e70c49c9fce3247c1427d0a1c10ad21 (patch)
tree4321ea5fae5b2040af89e104c963dfc0b99a8b8c
parentbc2b5e4b874968745fdcfbcea43e2eb8eafa592e (diff)
downloadmeta-clang-c37942613e70c49c9fce3247c1427d0a1c10ad21.tar.gz
mesa: Do not StackAlignmentOverride on llvm >= 13
This has been removed see https://reviews.llvm.org/D103048 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes-graphics/mesa/mesa/clang13.patch15
-rw-r--r--recipes-graphics/mesa/mesa_%.bbappend6
2 files changed, 20 insertions, 1 deletions
diff --git a/recipes-graphics/mesa/mesa/clang13.patch b/recipes-graphics/mesa/mesa/clang13.patch
new file mode 100644
index 0000000..8387b34
--- /dev/null
+++ b/recipes-graphics/mesa/mesa/clang13.patch
@@ -0,0 +1,15 @@
1--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
2+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
3@@ -351,8 +351,12 @@ lp_build_create_jit_compiler_for_module(
4 */
5 TargetOptions options;
6 #if defined(PIPE_ARCH_X86)
7+#if LLVM_VERSION_MAJOR >= 13
8+ // do nothing
9+#else
10 options.StackAlignmentOverride = 4;
11 #endif
12+#endif
13
14 builder.setEngineKind(EngineKind::JIT)
15 .setErrorStr(&Error)
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index ddf5305..d382f40 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,3 +1,7 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3SRC_URI_append_toolchain-clang = " file://clang13.patch "
4
1LDFLAGS_append_toolchain-clang = " -latomic -lm" 5LDFLAGS_append_toolchain-clang = " -latomic -lm"
2DEPENDS_append_toolchain-clang = " libatomic-ops" 6DEPENDS_append_toolchain-clang = " libatomic-ops"
3 7
@@ -6,4 +10,4 @@ EXTRA_OEMASON_append_toolchain-clang_x86-64 = " -Dasm=false"
6 10
7export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-config" 11export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-config"
8 12
9PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, clang clang-native elfutils" 13PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true -Ddraw-use-llvm=true,-Dllvm=false,clang clang-native elfutils"