Mesa (master): clover: Fix build against clang SVN >= r267772

Michel Dänzer daenzer at kemper.freedesktop.org
Thu Apr 28 07:41:27 UTC 2016


Module: Mesa
Branch: master
Commit: 860210ccfc0a90a4635fc930cd323bc426db5991
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=860210ccfc0a90a4635fc930cd323bc426db5991

Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Apr 28 12:57:03 2016 +0900

clover: Fix build against clang SVN >= r267772

(Re-pushing previous fix for clang SVN r265359, which was reverted in
the meantime)

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>

---

 src/gallium/state_trackers/clover/llvm/invocation.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index fb75788..96f6a48 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -206,6 +206,9 @@ namespace {
       // http://www.llvm.org/bugs/show_bug.cgi?id=19735
       c.getDiagnosticOpts().ShowCarets = false;
       c.getInvocation().setLangDefaults(c.getLangOpts(), clang::IK_OpenCL,
+#if HAVE_LLVM >= 0x0309
+                                        llvm::Triple(triple),
+#endif
                                         clang::LangStandard::lang_opencl11);
       c.createDiagnostics(
                           new clang::TextDiagnosticPrinter(




More information about the mesa-commit mailing list