KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clover/llvm: Fix build against LLVM/Clang 4.0 

The opencl 1.0 langstandard was renamed in 5.0+

v2: Move preprocessor check into compat.hpp

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
This commit is contained in:
Aaron Watry 2018-03-21 20:21:51 -05:00
parent c135316555
commit 23100acc8f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/state_trackers/clover/llvm/compat.hpp
View File

@ -89,8 +89,10 @@ namespace clover {
#if 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;
const clang::LangStandard::Kind lang_opencl10 = clang::LangStandard::lang_opencl;
#endif
inline void

2
src/gallium/state_trackers/clover/llvm/invocation.cpp
View File

@ -85,7 +85,7 @@ namespace {
};
const clc_version_lang_std cl_version_lang_stds[] = {
{ 100, clang::LangStandard::lang_opencl10},
{ 100, compat::lang_opencl10},
{ 110, clang::LangStandard::lang_opencl11},
{ 120, clang::LangStandard::lang_opencl12},
{ 200, clang::LangStandard::lang_opencl20},