diff mbox series

[2/2] mesa: Simplify llvm-17 patch

Message ID 20230928230106.1058552-2-raj.khem@gmail.com
State Accepted, archived
Commit 97f97ff02514303b71a07e53d2a486a12861814e
Headers show
Series [1/2] mesa: Fix native build on hosts with llvm-dev installed | expand

Commit Message

Khem Raj Sept. 28, 2023, 11:01 p.m. UTC 
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>
---
 .../mesa/files/0001-gallium-Fix-build-with-llvm-17.patch   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
diff mbox series

Patch

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