[Mesa-dev] [PATCH] clover/llvm: Fix build against LLVM/Clang 4.0

Mark Janes mark.a.janes at intel.com
Wed Mar 21 21:38:55 UTC 2018


This patch fixes the clover build for Clang 4.0, which is what the Intel
CI uses.

Tested-by: Mark Janes <mark.a.janes at intel.com>

Aaron Watry <awatry at gmail.com> writes:

> The opencl 1.0 langstandard was renamed in 5.0+
>
> Cc: Mark Janes <mark.a.janes at intel.com>
> ---
>  src/gallium/state_trackers/clover/llvm/invocation.cpp | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> index af78c2ae28..2fb3ce2365 100644
> --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> @@ -85,7 +85,11 @@ namespace {
>      };
>  
>      const clc_version_lang_std cl_version_lang_stds[] = {
> +#if HAVE_LLVM >= 0x0500
>         { 100, clang::LangStandard::lang_opencl10},
> +#else
> +       { 100, clang::LangStandard::lang_opencl},
> +#endif
>         { 110, clang::LangStandard::lang_opencl11},
>         { 120, clang::LangStandard::lang_opencl12},
>         { 200, clang::LangStandard::lang_opencl20},
> -- 
> 2.14.1


More information about the mesa-dev mailing list