From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Sun, 13 Feb 2022 13:04:40 +0000 (+0000)
Subject: clang-riscv64-multiarch
X-Git-Tag: archive/raspbian/1%12.0.1-20+rpi1^2~21
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=58e52cca5fb01db4d656c73841539ed141faef76;p=llvm-toolchain-12.git

clang-riscv64-multiarch

===================================================================

Gbp-Pq: Topic risc
Gbp-Pq: Name clang-riscv64-multiarch.diff
---

diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
index c4f385d0f0..f3c8fd3944 100644
--- a/clang/lib/Driver/ToolChains/Linux.cpp
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
@@ -155,6 +155,10 @@ std::string Linux::getMultiarchTriple(const Driver &D,
     if (D.getVFS().exists(SysRoot + "/lib/powerpc64le-linux-gnu"))
       return "powerpc64le-linux-gnu";
     break;
+  case llvm::Triple::riscv64:
+    if (D.getVFS().exists(SysRoot + "/lib/riscv64-linux-gnu"))
+      return "riscv64-linux-gnu";
+    break;
   case llvm::Triple::sparc:
     if (D.getVFS().exists(SysRoot + "/lib/sparc-linux-gnu"))
       return "sparc-linux-gnu";
@@ -667,6 +671,8 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
       "/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[] = {
@@ -745,6 +751,9 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
   case llvm::Triple::ppc64le:
     MultiarchIncludeDirs = PPC64LEMultiarchIncludeDirs;
     break;
+  case llvm::Triple::riscv64:
+    MultiarchIncludeDirs = RISCV64MultiarchIncludeDirs;
+    break;
   case llvm::Triple::sparc:
     MultiarchIncludeDirs = SparcMultiarchIncludeDirs;
     break;