OSDN Git Service

clover: Fix build after llvm r309911
authorJan Vesely <jan.vesely@rutgers.edu>
Thu, 3 Aug 2017 21:26:07 +0000 (17:26 -0400)
committerJan Vesely <jan.vesely@rutgers.edu>
Fri, 4 Aug 2017 00:59:16 +0000 (20:59 -0400)
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
src/gallium/state_trackers/clover/llvm/codegen/native.cpp
src/gallium/state_trackers/clover/llvm/compat.hpp

index b9e6750..12c83a9 100644 (file)
@@ -115,7 +115,7 @@ namespace {
       std::unique_ptr<TargetMachine> tm {
          t->createTargetMachine(target.triple, target.cpu, "", {},
                                 compat::default_reloc_model,
-                                ::llvm::CodeModel::Default,
+                                compat::default_code_model,
                                 ::llvm::CodeGenOpt::Default) };
       if (!tm)
          fail(r_log, build_error(),
index 06d3b6f..b22ecfa 100644 (file)
@@ -174,6 +174,12 @@ namespace clover {
 #endif
          }
 
+#if HAVE_LLVM >= 0x0600
+         const auto default_code_model = ::llvm::None;
+#else
+         const auto default_code_model = ::llvm::CodeModel::Default;
+#endif
+
 #if HAVE_LLVM >= 0x0309
          const auto default_reloc_model = ::llvm::None;
 #else