diff options
| author | Dave Airlie <[email protected]> | 2020-02-13 10:35:51 +1000 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-02-15 04:15:00 +0000 |
| commit | e7375e17958993b90d9f01d76dbc7eacdbf8c195 (patch) | |
| tree | 5fdf7c030571eedf6b714b68d35fd1735df2bcfd /src/gallium/auxiliary/gallivm/lp_bld_init.c | |
| parent | a603822b2fcf61085d2e0b2995bc3f43d8ec164e (diff) | |
gallivm/s390: fix pass init order on s390 with llvm 8 (v2)
llvm 8 has some missing pass dependencies, fix the s390 case
as well.
v2: add ARM also (Michel)
Reviewed-by: Michel Dänzer <[email protected]>
Reviewed-by: Adam Jackson <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3805>
Diffstat (limited to 'src/gallium/auxiliary/gallivm/lp_bld_init.c')
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_init.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c index 6206d79cc54..4047f2bd781 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c @@ -46,7 +46,7 @@ #endif #include <llvm-c/BitWriter.h> #if GALLIVM_HAVE_CORO -#if LLVM_VERSION_MAJOR <= 8 && defined(PIPE_ARCH_AARCH64) +#if LLVM_VERSION_MAJOR <= 8 && (defined(PIPE_ARCH_AARCH64) || defined (PIPE_ARCH_ARM) || defined(PIPE_ARCH_S390)) #include <llvm-c/Transforms/IPO.h> #endif #include <llvm-c/Transforms/Coroutines.h> @@ -137,7 +137,8 @@ create_pass_manager(struct gallivm_state *gallivm) } #if GALLIVM_HAVE_CORO -#if LLVM_VERSION_MAJOR <= 8 && defined(PIPE_ARCH_AARCH64) +#if LLVM_VERSION_MAJOR <= 8 && (defined(PIPE_ARCH_AARCH64) || defined (PIPE_ARCH_ARM) || defined(PIPE_ARCH_S390)) + LLVMAddArgumentPromotionPass(gallivm->cgpassmgr); LLVMAddFunctionAttrsPass(gallivm->cgpassmgr); #endif LLVMAddCoroEarlyPass(gallivm->cgpassmgr); |