rebase of the patch

This commit is contained in:
Sylvestre Ledru 2022-02-04 08:24:04 +01:00
parent 08d9ed7f82
commit 7e9763f69d

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-13-13.0.1~+rc1/clang/lib/Driver/ToolChains/WebAssembly.h
Index: llvm-toolchain-snapshot_15~++20220204082107+5e97d37b9608/clang/lib/Driver/ToolChains/WebAssembly.h
===================================================================
--- llvm-toolchain-13-13.0.1~+rc1.orig/clang/lib/Driver/ToolChains/WebAssembly.h
+++ llvm-toolchain-13-13.0.1~+rc1/clang/lib/Driver/ToolChains/WebAssembly.h
--- llvm-toolchain-snapshot_15~++20220204082107+5e97d37b9608.orig/clang/lib/Driver/ToolChains/WebAssembly.h
+++ llvm-toolchain-snapshot_15~++20220204082107+5e97d37b9608/clang/lib/Driver/ToolChains/WebAssembly.h
@@ -10,9 +10,13 @@
#define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_WEBASSEMBLY_H
@ -16,12 +16,12 @@ Index: llvm-toolchain-13-13.0.1~+rc1/clang/lib/Driver/ToolChains/WebAssembly.h
namespace clang {
namespace driver {
namespace tools {
@@ -67,7 +71,7 @@ private:
@@ -68,7 +72,7 @@ private:
llvm::opt::ArgStringList &CmdArgs) const override;
SanitizerMask getSupportedSanitizers() const override;
- const char *getDefaultLinker() const override { return "wasm-ld"; }
+ const char *getDefaultLinker() const override { return "wasm-ld-" TOSTR(LLVM_VERSION_MAJOR); }
Tool *buildLinker() const override;
CXXStdlibType GetDefaultCXXStdlibType() const override {
return ToolChain::CST_Libcxx;