From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 28 Sep 2023 23:01:06 +0000 (-0700)
Subject: mesa: Simplify llvm-17 patch
X-Git-Tag: yocto-5.2~4979
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97f97ff02514303b71a07e53d2a486a12861814e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

mesa: Simplify llvm-17 patch

llvm-17 support patch had redundant checks for llvm-17, Simplify them as
submitted in v3 upstream

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---

diff --git a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch
index 0ca7a22b45b..165708145a7 100644
--- a/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch
+++ b/meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
 +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
-@@ -42,19 +42,23 @@
+@@ -42,8 +42,10 @@
  
  #include <llvm/Config/llvm-config.h>
  #include <llvm-c/Analysis.h>
@@ -27,10 +27,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  #include <llvm-c/Transforms/Utils.h>
  #endif
  #include <llvm-c/BitWriter.h>
- #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
+@@ -53,8 +55,10 @@
  #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64)
  #include <llvm-c/Transforms/IPO.h>
  #endif