| 1 |
From ce2df23205d2befc578bbcf4c5992034654b3895 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Jan Vesely <jan.vesely@rutgers.edu> |
| 3 |
Date: Thu, 13 Dec 2018 15:53:42 -0500 |
| 4 |
Subject: [PATCH 20/78] clover: Fix build after clang r348827 |
| 5 |
MIME-Version: 1.0 |
| 6 |
Content-Type: text/plain; charset=UTF-8 |
| 7 |
Content-Transfer-Encoding: 8bit |
| 8 |
|
| 9 |
CodeGenOptions were moved to Basic. |
| 10 |
|
| 11 |
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> |
| 12 |
Reviewed-by: Aaron Watry <awatry@gmail.com> |
| 13 |
Tested-by: Aaron Watry <awatry@gmail.com> |
| 14 |
Reviewed-by: Kai Wasserbäch <kai@dev.carbon-project.org> |
| 15 |
CC: mesa-stable@lists.freedesktop.org |
| 16 |
(cherry picked from commit e4f9a37ace750646fd75fbbdff9b5e77a0b26cfb) |
| 17 |
--- |
| 18 |
src/gallium/state_trackers/clover/llvm/compat.hpp | 7 ++++++- |
| 19 |
1 file changed, 6 insertions(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp b/src/gallium/state_trackers/clover/llvm/compat.hpp |
| 22 |
index 975012cbda..b91cb95a29 100644 |
| 23 |
--- a/src/gallium/state_trackers/clover/llvm/compat.hpp |
| 24 |
+++ b/src/gallium/state_trackers/clover/llvm/compat.hpp |
| 25 |
@@ -58,9 +58,14 @@ |
| 26 |
#include <llvm/Analysis/TargetLibraryInfo.h> |
| 27 |
|
| 28 |
#include <clang/Basic/TargetInfo.h> |
| 29 |
-#include <clang/Frontend/CodeGenOptions.h> |
| 30 |
#include <clang/Frontend/CompilerInstance.h> |
| 31 |
|
| 32 |
+#if HAVE_LLVM >= 0x0800 |
| 33 |
+#include <clang/Basic/CodeGenOptions.h> |
| 34 |
+#else |
| 35 |
+#include <clang/Frontend/CodeGenOptions.h> |
| 36 |
+#endif |
| 37 |
+ |
| 38 |
namespace clover { |
| 39 |
namespace llvm { |
| 40 |
namespace compat { |
| 41 |
-- |
| 42 |
2.20.1 |
| 43 |
|
Parent Directory
| 
Revision Log