Merge pull request #4426 from halide/srj-wasmlld

Fix lld::wasm::link() call for trunk LLVM
halide · Dec 4, 2019 · acbdc37 · acbdc37
2 parents 6656f57 + 78dd627
commit acbdc37
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/WasmExecutor.cpp b/src/WasmExecutor.cpp
@@ -1238,12 +1238,21 @@ std::vector<char> compile_to_wasm(const Module &module, const std::string &fn_na
     for (int i = 0; i < c; ++i)
         lld_args[i] = lld_arg_strs[i].c_str();
 
+#if LLVM_VERSION >= 100
+    std::string lld_errs_string;
+    llvm::raw_string_ostream lld_errs(lld_errs_string);
+
+    if (!lld::wasm::link(lld_args, /*CanExitEarly*/ false, llvm::outs(), lld_errs)) {
+        internal_error << "lld::wasm::link failed: (" << lld_errs.str() << ")\n";
+    }
+#else
     std::string lld_errs_string;
     llvm::raw_string_ostream lld_errs(lld_errs_string);
 
     if (!lld::wasm::link(lld_args, /*CanExitEarly*/ false, lld_errs)) {
         internal_error << "lld::wasm::link failed: (" << lld_errs.str() << ")\n";
     }
+#endif
 
 #if WASM_DEBUG_LEVEL
     wasm_output.detach();