LLVM trunk: tool_output_file -> ToolOutputFile

schets · Nov 8, 2017 · c2669b2 · c2669b2
1 parent 2d5ff94
commit c2669b2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/cbackend.cpp b/cbackend.cpp
@@ -5519,7 +5519,11 @@ WriteCXXFile(llvm::Module *module, const char *fn, int vectorWidth,
     std::error_code error;
 #endif
 
+#if ISPC_LLVM_VERSION <= ISPC_LLVM_5_0
     llvm::tool_output_file *of = new llvm::tool_output_file(fn, error, flags);
+#else // LLVM 6.0+
+    llvm::ToolOutputFile *of = new llvm::ToolOutputFile(fn, error, flags);
+#endif
 
 #if ISPC_LLVM_VERSION <= ISPC_LLVM_3_5 // 3.2, 3.3, 3.4, 3.5
     if (error.size()) {

diff --git a/module.cpp b/module.cpp
@@ -1532,8 +1532,10 @@ Module::writeObjectFileOrAssembly(llvm::TargetMachine *targetMachine,
 
 #if ISPC_LLVM_VERSION <= ISPC_LLVM_3_6
     llvm::tool_output_file *of = new llvm::tool_output_file(outFileName, error, flags);
-#else // LLVM 3.7+
+#elif ISPC_LLVM_VERSION <= ISPC_LLVM_5_0 // LLVM 3.7-5.0
     std::unique_ptr<llvm::tool_output_file> of (new llvm::tool_output_file(outFileName, error, flags));
+#else // LLVM 6.0+
+    std::unique_ptr<llvm::ToolOutputFile> of (new llvm::ToolOutputFile(outFileName, error, flags));
 #endif
 
 #if ISPC_LLVM_VERSION <= ISPC_LLVM_3_5