From: Jan Vesely <jan.vesely@rutgers.edu>
Date: Thu, 27 Apr 2017 16:11:37 +0000 (-0400)
Subject: clover: Fix build since clang r301442
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b295a528362239e4500c89e94e0af0cc78b896c1;p=mesa.git

clover: Fix build since clang r301442

v2: rename default_ik -> ik_opencl

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
---

diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp b/src/gallium/state_trackers/clover/llvm/compat.hpp
index cee51b9dd1b..06d3b6ffe6b 100644
--- a/src/gallium/state_trackers/clover/llvm/compat.hpp
+++ b/src/gallium/state_trackers/clover/llvm/compat.hpp
@@ -70,8 +70,10 @@ namespace clover {
 
 #if HAVE_LLVM >= 0x0500
          const auto lang_as_offset = 0;
+         const clang::InputKind ik_opencl = clang::InputKind::OpenCL;
 #else
          const auto lang_as_offset = clang::LangAS::Offset;
+         const clang::InputKind ik_opencl = clang::IK_OpenCL;
 #endif
 
          inline void
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index deebef5726c..6412377faab 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -126,7 +126,7 @@ namespace {
       c->getDiagnosticOpts().ShowCarets = false;
 
       compat::set_lang_defaults(c->getInvocation(), c->getLangOpts(),
-                                clang::IK_OpenCL, ::llvm::Triple(target.triple),
+                                compat::ik_opencl, ::llvm::Triple(target.triple),
                                 c->getPreprocessorOpts(),
                                 clang::LangStandard::lang_opencl11);