mesa: Update clang-17 patch to upstream v2

(From OE-Core rev: 1172774088a81dfa0447cf7d39caf115bd6c6a7c)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2023-09-22 09:37:21 -07:00
committed by Richard Purdie
parent f15f380650
commit bfc5f9f808

View File

@@ -1,4 +1,4 @@
From 865762e0a767a121206d818bdd58301afbf30104 Mon Sep 17 00:00:00 2001
From c8e9776abc3dfd3f2411797a90a03e7fa16263ef Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 23 Jun 2023 01:20:38 -0700
Subject: [PATCH] gallium: Fix build with llvm 17
@@ -10,14 +10,12 @@ so add conditions to exclude them for llvm >= 17
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/gallium/auxiliary/gallivm/lp_bld_init.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
index 24d0823..3d4573e 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
@@ -42,8 +42,10 @@
@@ -42,19 +42,23 @@
#include <llvm/Config/llvm-config.h>
#include <llvm-c/Analysis.h>
@@ -29,6 +27,17 @@ index 24d0823..3d4573e 100644
#include <llvm-c/Transforms/Utils.h>
#endif
#include <llvm-c/BitWriter.h>
--
2.41.0
#if GALLIVM_USE_NEW_PASS == 1
#include <llvm-c/Transforms/PassBuilder.h>
-#elif GALLIVM_HAVE_CORO == 1
+#elif GALLIVM_HAVE_CORO == 1 && LLVM_VERSION_MAJOR < 17
#if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64)
#include <llvm-c/Transforms/IPO.h>
#endif
+#if LLVM_VERSION_MAJOR < 17
#include <llvm-c/Transforms/Coroutines.h>
#endif
+#endif
unsigned gallivm_perf = 0;