Mesa (master): clover: Fix build against clang SVN >= r299965
Michel Dänzer
daenzer at kemper.freedesktop.org
Thu Apr 13 04:00:15 UTC 2017
Module: Mesa
Branch: master
Commit: a981e68c26dc4079a335101da0033185030207f6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a981e68c26dc4079a335101da0033185030207f6
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Wed Apr 12 17:17:34 2017 +0900
clover: Fix build against clang SVN >= r299965
clang::LangAS::Offset is gone, the behaviour is as if it was 0.
v2: Introduce and use clover::llvm::compat::lang_as_offset (Francisco
Jerez)
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
---
src/gallium/state_trackers/clover/llvm/codegen/common.cpp | 2 +-
src/gallium/state_trackers/clover/llvm/compat.hpp | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/gallium/state_trackers/clover/llvm/codegen/common.cpp b/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
index 13ccd591c1..3b0014d879 100644
--- a/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
+++ b/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
@@ -129,7 +129,7 @@ namespace {
cast<::llvm::PointerType>(actual_type)->getAddressSpace();
if (address_space == address_spaces[clang::LangAS::opencl_local
- - clang::LangAS::Offset]) {
+ - compat::lang_as_offset]) {
args.emplace_back(module::argument::local, arg_api_size,
target_size, target_align,
module::argument::zero_ext);
diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp b/src/gallium/state_trackers/clover/llvm/compat.hpp
index 906367b314..67d2d0fd54 100644
--- a/src/gallium/state_trackers/clover/llvm/compat.hpp
+++ b/src/gallium/state_trackers/clover/llvm/compat.hpp
@@ -67,6 +67,12 @@ namespace clover {
typedef ::llvm::TargetLibraryInfo target_library_info;
#endif
+#if HAVE_LLVM >= 0x0500
+ const auto lang_as_offset = 0;
+#else
+ const auto lang_as_offset = clang::LangAS::Offset;
+#endif
+
inline void
set_lang_defaults(clang::CompilerInvocation &inv,
clang::LangOptions &lopts, clang::InputKind ik,
More information about the mesa-commit
mailing list