[Mesa-dev] [PATCH] clover: fix building fix clang-3.8

[Francisco Jerez]

Laurent Carlier <lordheavym at gmail.com> writes:

> https://bugs.freedesktop.org/show_bug.cgi?id=92705
>
> v2: use Linker::Flags::None instead of 0
>
> Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
> ---
>  src/gallium/state_trackers/clover/llvm/invocation.cpp | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> index d74b50d..a36dbd6 100644
> --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
> +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
> @@ -247,8 +247,12 @@ namespace {
>        // attribute.  This attribute will prevent Clang from creating
>        // illegal uses of barrier() (e.g. Moving barrier() inside a conditional
>        // that is no executed by all threads) during its optimizaton passes.
> +#if HAVE_LLVM >= 0x0308
> +      c.getCodeGenOpts().LinkBitcodeFiles.push_back(std::make_pair(llvm::Linker::Flags::None,
> +                                                                   libclc_path));

Also why not emplace_back() instead of push_back(std::make_pair())?

> +#else
>        c.getCodeGenOpts().LinkBitcodeFile = libclc_path;
> -
> +#endif
>        optimization_level = c.getCodeGenOpts().OptimizationLevel;
>  
>        // Compile the code
> -- 
> 2.6.2
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 212 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20151028/68264af9/attachment-0001.sig>