diff options
| author | Khem Raj <raj.khem@gmail.com> | 2023-09-28 16:01:06 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-29 23:11:59 +0100 |
| commit | d153a11bd08af2f4ae04ad3c7e0379d60265ed05 (patch) | |
| tree | a533feeb9b67facd8e4995db6984d56dec6bac81 /meta/recipes-graphics/mesa | |
| parent | 7b7a439953443aa35a3462e43e34579198d3a33f (diff) | |
| download | poky-d153a11bd08af2f4ae04ad3c7e0379d60265ed05.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-graphics/mesa')
| -rw-r--r-- | meta/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch | 7 |
1 files changed, 2 insertions, 5 deletions
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 0ca7a22b45..165708145a 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> | |||
| 15 | 15 | ||
| 16 | --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c | 16 | --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c |
| 17 | +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c | 17 | +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c |
| 18 | @@ -42,19 +42,23 @@ | 18 | @@ -42,8 +42,10 @@ |
| 19 | 19 | ||
| 20 | #include <llvm/Config/llvm-config.h> | 20 | #include <llvm/Config/llvm-config.h> |
| 21 | #include <llvm-c/Analysis.h> | 21 | #include <llvm-c/Analysis.h> |
| @@ -27,10 +27,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 27 | #include <llvm-c/Transforms/Utils.h> | 27 | #include <llvm-c/Transforms/Utils.h> |
| 28 | #endif | 28 | #endif |
| 29 | #include <llvm-c/BitWriter.h> | 29 | #include <llvm-c/BitWriter.h> |
| 30 | #if GALLIVM_USE_NEW_PASS == 1 | 30 | @@ -53,8 +55,10 @@ |
| 31 | #include <llvm-c/Transforms/PassBuilder.h> | ||
| 32 | -#elif GALLIVM_HAVE_CORO == 1 | ||
| 33 | +#elif GALLIVM_HAVE_CORO == 1 && LLVM_VERSION_MAJOR < 17 | ||
| 34 | #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) | 31 | #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) |
| 35 | #include <llvm-c/Transforms/IPO.h> | 32 | #include <llvm-c/Transforms/IPO.h> |
| 36 | #endif | 33 | #endif |