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

[Aaron Watry]

I had come up with an almost identical patch last night, but hadn't
gotten around to testing it before turning in.

Reviewed-by: Aaron Watry <awatry at gmail.com>

On Tue, Aug 6, 2019 at 12:59 PM Jan Vesely <jan.vesely at rutgers.edu> wrote:
>
> 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
>
> --
> 2.21.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev