rebase of the patch

This commit is contained in:
Sylvestre Ledru 2024-03-19 09:51:11 +01:00
parent 7eec61e6a3
commit 6291f05e5f

View File

@ -1,27 +1,25 @@
Index: llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h Index: llvm-toolchain-snapshot_19~++20240319094628+703920d4138d/clang/lib/Driver/ToolChains/WebAssembly.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_19~++20240220124703+f122268c0441.orig/clang/lib/Driver/ToolChains/WebAssembly.h --- llvm-toolchain-snapshot_19~++20240319094628+703920d4138d.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp
+++ llvm-toolchain-snapshot_19~++20240220124703+f122268c0441/clang/lib/Driver/ToolChains/WebAssembly.h +++ llvm-toolchain-snapshot_19~++20240319094628+703920d4138d/clang/lib/Driver/ToolChains/WebAssembly.cpp
@@ -10,9 +10,13 @@ @@ -20,6 +20,11 @@
#define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_WEBASSEMBLY_H #include "llvm/Support/Path.h"
#include "llvm/Support/VirtualFileSystem.h"
#include "Gnu.h"
+#include "llvm/Config/llvm-config.h" // for LLVM_VERSION_MAJOR +#include "llvm/Config/llvm-config.h" // for LLVM_VERSION_MAJOR
#include "clang/Driver/Tool.h" +
#include "clang/Driver/ToolChain.h"
+#define TOSTR2(X) #X +#define TOSTR2(X) #X
+#define TOSTR(X) TOSTR2(X) +#define TOSTR(X) TOSTR2(X)
+ +
namespace clang { using namespace clang::driver;
namespace driver { using namespace clang::driver::tools;
namespace tools { using namespace clang::driver::toolchains;
@@ -67,7 +71,7 @@ private: @@ -241,7 +246,7 @@ WebAssembly::WebAssembly(const Driver &D
llvm::opt::ArgStringList &CmdArgs) const override; const char *WebAssembly::getDefaultLinker() const {
SanitizerMask getSupportedSanitizers() const override; if (getOS() == "wasip2")
return "wasm-component-ld";
- return "wasm-ld";
+ return "wasm-ld-" TOSTR(LLVM_VERSION_MAJOR);
}
- const char *getDefaultLinker() const override { return "wasm-ld"; } bool WebAssembly::IsMathErrnoDefault() const { return false; }
+ const char *getDefaultLinker() const override { return "wasm-ld-" TOSTR(LLVM_VERSION_MAJOR); }
CXXStdlibType GetDefaultCXXStdlibType() const override {
return ToolChain::CST_Libcxx;