mesa: Simplify llvm-17 patch

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

(From OE-Core rev: 97f97ff02514303b71a07e53d2a486a12861814e)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2023-09-28 16:01:06 -07:00
committed by Richard Purdie
parent 7b7a439953
commit d153a11bd0

View File

@@ -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