diff --git a/debian/patches/risc/clang-riscv64-multiarch.diff b/debian/patches/risc/clang-riscv64-multiarch.diff index 62119f83..c7aa313f 100644 --- a/debian/patches/risc/clang-riscv64-multiarch.diff +++ b/debian/patches/risc/clang-riscv64-multiarch.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_11~++20200409051253+d08105482e1/clang/lib/Driver/ToolChains/Linux.cpp +Index: llvm-toolchain-snapshot_13~++20210322120055+02b51e5316cd/clang/lib/Driver/ToolChains/Linux.cpp =================================================================== ---- 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 +--- llvm-toolchain-snapshot_13~++20210322120055+02b51e5316cd.orig/clang/lib/Driver/ToolChains/Linux.cpp ++++ llvm-toolchain-snapshot_13~++20210322120055+02b51e5316cd/clang/lib/Driver/ToolChains/Linux.cpp +@@ -161,6 +161,10 @@ std::string Linux::getMultiarchTriple(co if (D.getVFS().exists(SysRoot + "/lib/powerpc64le-linux-gnu")) return "powerpc64le-linux-gnu"; break; @@ -13,22 +13,3 @@ Index: llvm-toolchain-snapshot_11~++20200409051253+d08105482e1/clang/lib/Driver/ case llvm::Triple::sparc: if (D.getVFS().exists(SysRoot + "/lib/sparc-linux-gnu")) return "sparc-linux-gnu"; -@@ -761,6 +765,8 @@ void Linux::AddClangSystemIncludeArgs(co - "/usr/include/powerpc64-linux-gnu"}; - const StringRef PPC64LEMultiarchIncludeDirs[] = { - "/usr/include/powerpc64le-linux-gnu"}; -+ const StringRef RISCV64MultiarchIncludeDirs[] = { -+ "/usr/include/riscv64-linux-gnu"}; - const StringRef SparcMultiarchIncludeDirs[] = { - "/usr/include/sparc-linux-gnu"}; - const StringRef Sparc64MultiarchIncludeDirs[] = { -@@ -836,6 +842,9 @@ void Linux::AddClangSystemIncludeArgs(co - case llvm::Triple::ppc64le: - MultiarchIncludeDirs = PPC64LEMultiarchIncludeDirs; - break; -+ case llvm::Triple::riscv64: -+ MultiarchIncludeDirs = RISCV64MultiarchIncludeDirs; -+ break; - case llvm::Triple::sparc: - MultiarchIncludeDirs = SparcMultiarchIncludeDirs; - break;