mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-06-26 08:20:37 +00:00
Remove debian/patches/wasm-*, old cruft from a mv
Commit 2084cb7
moved the wasm patches to debian/patches/wasm/, but the
older, now unused (not referenced in d/p/series) files remained behind
on the three-way merge for the 15 branch. Remove them.
This commit is contained in:
parent
0af59c9be3
commit
10acff747e
31
debian/patches/wasm-compiler-rt-default.diff
vendored
31
debian/patches/wasm-compiler-rt-default.diff
vendored
@ -1,31 +0,0 @@
|
||||
--- a/clang/lib/Driver/ToolChains/WebAssembly.cpp
|
||||
+++ b/clang/lib/Driver/ToolChains/WebAssembly.cpp
|
||||
@@ -369,6 +369,18 @@ ToolChain::RuntimeLibType WebAssembly::G
|
||||
return ToolChain::RLT_CompilerRT;
|
||||
}
|
||||
|
||||
+ToolChain::RuntimeLibType WebAssembly::GetRuntimeLibType(
|
||||
+ const ArgList &Args) const {
|
||||
+ if (Arg *A = Args.getLastArg(options::OPT_rtlib_EQ)) {
|
||||
+ StringRef Value = A->getValue();
|
||||
+ if (Value != "compiler-rt")
|
||||
+ getDriver().Diag(clang::diag::err_drv_unsupported_rtlib_for_platform)
|
||||
+ << Value << "WebAssembly";
|
||||
+ }
|
||||
+
|
||||
+ return ToolChain::RLT_CompilerRT;
|
||||
+}
|
||||
+
|
||||
ToolChain::CXXStdlibType
|
||||
WebAssembly::GetCXXStdlibType(const ArgList &Args) const {
|
||||
if (Arg *A = Args.getLastArg(options::OPT_stdlib_EQ)) {
|
||||
--- a/clang/lib/Driver/ToolChains/WebAssembly.h
|
||||
+++ b/clang/lib/Driver/ToolChains/WebAssembly.h
|
||||
@@ -61,6 +61,7 @@ private:
|
||||
llvm::opt::ArgStringList &CC1Args,
|
||||
Action::OffloadKind DeviceOffloadKind) const override;
|
||||
RuntimeLibType GetDefaultRuntimeLibType() const override;
|
||||
+ RuntimeLibType GetRuntimeLibType(const llvm::opt::ArgList &Args) const override;
|
||||
CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const override;
|
||||
void
|
||||
AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
|
62
debian/patches/wasm-sysroot-usr.diff
vendored
62
debian/patches/wasm-sysroot-usr.diff
vendored
@ -1,62 +0,0 @@
|
||||
--- a/clang/lib/Driver/ToolChains/WebAssembly.cpp
|
||||
+++ b/clang/lib/Driver/ToolChains/WebAssembly.cpp
|
||||
@@ -174,7 +174,7 @@ WebAssembly::WebAssembly(const Driver &D
|
||||
|
||||
getProgramPaths().push_back(getDriver().getInstalledDir());
|
||||
|
||||
- auto SysRoot = getDriver().SysRoot;
|
||||
+ std::string SysRoot = computeSysRoot();
|
||||
if (getTriple().getOS() == llvm::Triple::UnknownOS) {
|
||||
// Theoretically an "unknown" OS should mean no standard libraries, however
|
||||
// it could also mean that a custom set of libraries is in use, so just add
|
||||
@@ -402,6 +402,7 @@ void WebAssembly::AddClangSystemIncludeA
|
||||
return;
|
||||
|
||||
const Driver &D = getDriver();
|
||||
+ std::string SysRoot = computeSysRoot();
|
||||
|
||||
if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
|
||||
SmallString<128> P(D.ResourceDir);
|
||||
@@ -427,10 +428,10 @@ void WebAssembly::AddClangSystemIncludeA
|
||||
|
||||
if (getTriple().getOS() != llvm::Triple::UnknownOS) {
|
||||
const std::string MultiarchTriple =
|
||||
- getMultiarchTriple(D, getTriple(), D.SysRoot);
|
||||
- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include/" + MultiarchTriple);
|
||||
+ getMultiarchTriple(D, getTriple(), SysRoot);
|
||||
+ addSystemInclude(DriverArgs, CC1Args, SysRoot + "/include/" + MultiarchTriple);
|
||||
}
|
||||
- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include");
|
||||
+ addSystemInclude(DriverArgs, CC1Args, SysRoot + "/include");
|
||||
}
|
||||
|
||||
void WebAssembly::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
|
||||
@@ -478,6 +479,17 @@ Tool *WebAssembly::buildLinker() const {
|
||||
return new tools::wasm::Linker(*this);
|
||||
}
|
||||
|
||||
+std::string WebAssembly::computeSysRoot() const {
|
||||
+ if (!getDriver().SysRoot.empty())
|
||||
+ return getDriver().SysRoot;
|
||||
+
|
||||
+ std::string Path = "/usr";
|
||||
+ if (getVFS().exists(Path))
|
||||
+ return Path;
|
||||
+
|
||||
+ return std::string();
|
||||
+}
|
||||
+
|
||||
void WebAssembly::addLibCxxIncludePaths(
|
||||
const llvm::opt::ArgList &DriverArgs,
|
||||
llvm::opt::ArgStringList &CC1Args) const {
|
||||
--- a/clang/lib/Driver/ToolChains/WebAssembly.h
|
||||
+++ b/clang/lib/Driver/ToolChains/WebAssembly.h
|
||||
@@ -89,6 +89,8 @@ private:
|
||||
llvm::opt::ArgStringList &CC1Args) const;
|
||||
void addLibStdCXXIncludePaths(const llvm::opt::ArgList &DriverArgs,
|
||||
llvm::opt::ArgStringList &CC1Args) const;
|
||||
+
|
||||
+ std::string computeSysRoot() const override;
|
||||
};
|
||||
|
||||
} // end namespace toolchains
|
Loading…
Reference in New Issue
Block a user