rebase + move wasm patches

debian/patches/series

@@ -146,10 +146,13 @@ libcxxabi-fix-link-builtins.diff
 llvm-runtimes-builtins-build-check.diff
 compilerrt-builtins-arch-fix-armhf.diff
 compilerrt-build-scudo-standalone-option.diff
-wasm-ld-path.diff
 python3-scan-build.py
-wasm-compiler-rt-default.diff
+
-wasm-sysroot-usr.diff
+# wasm patches
+wasm/wasm-ld-path.diff
+wasm/wasm-compiler-rt-default.diff
+wasm/wasm-sysroot-usr.diff
+
 issue-54242.diff
 revert-update-doc.diff
 fix-typo.diff

debian/patches/wasm/wasm-sysroot-usr.diff

@@ -1,6 +1,8 @@
---- a/clang/lib/Driver/ToolChains/WebAssembly.cpp
+Index: llvm-toolchain-14-14.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp
-+++ b/clang/lib/Driver/ToolChains/WebAssembly.cpp
+===================================================================
-@@ -174,7 +174,7 @@ WebAssembly::WebAssembly(const Driver &D
+--- llvm-toolchain-14-14.0.6.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp
++++ llvm-toolchain-14-14.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp
+@@ -172,7 +172,7 @@ WebAssembly::WebAssembly(const Driver &D
  
    getProgramPaths().push_back(getDriver().getInstalledDir());
  
@@ -9,7 +11,7 @@
    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
+@@ -396,6 +396,7 @@ void WebAssembly::AddClangSystemIncludeA
      return;
  
    const Driver &D = getDriver();
@@ -17,7 +19,7 @@
  
    if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
      SmallString<128> P(D.ResourceDir);
-@@ -427,10 +428,10 @@ void WebAssembly::AddClangSystemIncludeA
+@@ -421,10 +422,10 @@ void WebAssembly::AddClangSystemIncludeA
  
    if (getTriple().getOS() != llvm::Triple::UnknownOS) {
      const std::string MultiarchTriple =
@@ -31,10 +33,11 @@
  }
  
  void WebAssembly::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
-@@ -478,6 +479,17 @@ Tool *WebAssembly::buildLinker() const {
+@@ -467,3 +468,15 @@ SanitizerMask WebAssembly::getSupportedS
+ Tool *WebAssembly::buildLinker() const {
    return new tools::wasm::Linker(*this);
  }
- 
++
 +std::string WebAssembly::computeSysRoot() const {
 +  if (!getDriver().SysRoot.empty())
 +    return getDriver().SysRoot;
@@ -46,15 +49,14 @@
 +  return std::string();
 +}
 +
- void WebAssembly::addLibCxxIncludePaths(
+Index: llvm-toolchain-14-14.0.6/clang/lib/Driver/ToolChains/WebAssembly.h
-     const llvm::opt::ArgList &DriverArgs,
+===================================================================
-     llvm::opt::ArgStringList &CC1Args) const {
+--- llvm-toolchain-14-14.0.6.orig/clang/lib/Driver/ToolChains/WebAssembly.h
---- a/clang/lib/Driver/ToolChains/WebAssembly.h
++++ llvm-toolchain-14-14.0.6/clang/lib/Driver/ToolChains/WebAssembly.h
-+++ b/clang/lib/Driver/ToolChains/WebAssembly.h
+@@ -80,6 +80,8 @@ private:
-@@ -89,6 +89,8 @@ private:
+   std::string getMultiarchTriple(const Driver &D,
-                              llvm::opt::ArgStringList &CC1Args) const;
+                                  const llvm::Triple &TargetTriple,
-   void addLibStdCXXIncludePaths(const llvm::opt::ArgList &DriverArgs,
+                                  StringRef SysRoot) const override;
-                                 llvm::opt::ArgStringList &CC1Args) const;
 +
 +  std::string computeSysRoot() const override;
  };