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

[Francisco Jerez]

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

Please move this preprocessor magic into an llvm/compat.hpp definition.
Thanks!

>         { 110, clang::LangStandard::lang_opencl11},
>         { 120, clang::LangStandard::lang_opencl12},
>         { 200, clang::LangStandard::lang_opencl20},
> -- 
> 2.14.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 227 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180321/c1e4d00f/attachment.sig>