Merge tag 'debian/11.0.0-5' into proxmox/buster

[llvm-toolchain.git] / debian / patches / risc / clang-riscv64-multiarch.diff

diff --git a/debian/patches/risc/clang-riscv64-multiarch.diff b/debian/patches/risc/clang-riscv64-multiarch.diff
index e33aa732d017e01e5a74f9e487dfe6f66b13a75c..62119f833265d638d016b162ff77204564e11efb 100644 (file)
--- a/debian/patches/risc/clang-riscv64-multiarch.diff
+++ b/debian/patches/risc/clang-riscv64-multiarch.diff
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/ToolChains/Linux.cpp
+Index: llvm-toolchain-snapshot_11~++20200409051253+d08105482e1/clang/lib/Driver/ToolChains/Linux.cpp
 ===================================================================
---- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/clang/lib/Driver/ToolChains/Linux.cpp
-+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/ToolChains/Linux.cpp
-@@ -151,6 +151,10 @@ static std::string getMultiarchTriple(co
+--- llvm-toolchain-snapshot_11~++20200409051253+d08105482e1.orig/clang/lib/Driver/ToolChains/Linux.cpp
++++ llvm-toolchain-snapshot_11~++20200409051253+d08105482e1/clang/lib/Driver/ToolChains/Linux.cpp
+@@ -151,6 +151,10 @@ std::string Linux::getMultiarchTriple(co
      if (D.getVFS().exists(SysRoot + "/lib/powerpc64le-linux-gnu"))
        return "powerpc64le-linux-gnu";
      break;
@@ -13,7 +13,7 @@ Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/T
    case llvm::Triple::sparc:
      if (D.getVFS().exists(SysRoot + "/lib/sparc-linux-gnu"))
        return "sparc-linux-gnu";
-@@ -760,6 +764,8 @@ void Linux::AddClangSystemIncludeArgs(co
+@@ -761,6 +765,8 @@ void Linux::AddClangSystemIncludeArgs(co
        "/usr/include/powerpc64-linux-gnu"};
    const StringRef PPC64LEMultiarchIncludeDirs[] = {
        "/usr/include/powerpc64le-linux-gnu"};
@@ -22,7 +22,7 @@ Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/clang/lib/Driver/T
    const StringRef SparcMultiarchIncludeDirs[] = {
        "/usr/include/sparc-linux-gnu"};
    const StringRef Sparc64MultiarchIncludeDirs[] = {
-@@ -835,6 +841,9 @@ void Linux::AddClangSystemIncludeArgs(co
+@@ -836,6 +842,9 @@ void Linux::AddClangSystemIncludeArgs(co
    case llvm::Triple::ppc64le:
      MultiarchIncludeDirs = PPC64LEMultiarchIncludeDirs;
      break;