[Mesa-dev] [PATCH v2] clover: Fix build after clang r367864

Dieter Nützel Dieter at nuetzel-hh.de
Wed Aug 7 02:13:21 UTC 2019


Back from vacation try to bring all stuff on par - LLVM 10 (with Clover) 
- and boom...

Acked-by: Dieter Nützel <Dieter at nuetzel-hh.de>
Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>

Thank you Jan!

Dieter

Am 06.08.2019 19:59, schrieb Jan Vesely:
> v2: Drop special case of llvm-9
> Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>
> ---
>  src/gallium/state_trackers/clover/llvm/compat.hpp | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp
> b/src/gallium/state_trackers/clover/llvm/compat.hpp
> index 0ecf622a9af..b040902fcfe 100644
> --- a/src/gallium/state_trackers/clover/llvm/compat.hpp
> +++ b/src/gallium/state_trackers/clover/llvm/compat.hpp
> @@ -79,11 +79,17 @@ namespace clover {
>  #endif
>           }
> 
> -#if HAVE_LLVM >= 0x0500
> +#if HAVE_LLVM >= 0x1000
> +         const clang::InputKind ik_opencl = clang::Language::OpenCL;
> +#elif HAVE_LLVM >= 0x0500
>           const clang::InputKind ik_opencl = clang::InputKind::OpenCL;
> -         const clang::LangStandard::Kind lang_opencl10 =
> clang::LangStandard::lang_opencl10;
>  #else
>           const clang::InputKind ik_opencl = clang::IK_OpenCL;
> +#endif
> +
> +#if HAVE_LLVM >= 0x0500
> +         const clang::LangStandard::Kind lang_opencl10 =
> clang::LangStandard::lang_opencl10;
> +#else
>           const clang::LangStandard::Kind lang_opencl10 =
> clang::LangStandard::lang_opencl;
>  #endif


More information about the mesa-dev mailing list