[clang] [llvm] [Driver] Merge CSKY bare-metal toolchain into BareMetal (PR #240290)

via cfe-commits cfe-commits at lists.llvm.org
Sun Nov 8 23:57:39 PST 2026


llvmorg-github-actions[bot] wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-clang-driver

Author: Brad Smith (brad0)

<details>
<summary>Changes</summary>

CSKYToolChain is only used for csky targets that are not Linux;
csky-*-linux-* is already handled by the generic Linux toolchain.
Fold the bare-metal handling into the BareMetal toolchain, as was
done for RISCVToolChain, and remove CSKYToolChain.

- Route csky in the default switch to BareMetal and add csky with an
  unknown OS to BareMetal::handlesTarget().
- Use the "cskyelf" linker emulation for non-Linux csky targets.
- With a GCC installation, use libgcc/libstdc++ and no unwind library,
  do not warn about multilibs, and apply the selected multilib's OS
  suffix to the GCC install and sysroot library paths when the
  multilib set does not provide a file paths callback.
- Add sysroot/include and sysroot/sys-include, link crti.o/crtn.o and
  -lnosys (or -lsemi with -msim) instead of -lgloss.

---

Patch is 26.79 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/240290.diff


21 Files Affected:

- (modified) clang/lib/Driver/CMakeLists.txt (-1) 
- (modified) clang/lib/Driver/Driver.cpp (+1-2) 
- (modified) clang/lib/Driver/ToolChains/BareMetal.cpp (+46-17) 
- (removed) clang/lib/Driver/ToolChains/CSKYToolChain.cpp (-204) 
- (removed) clang/lib/Driver/ToolChains/CSKYToolChain.h (-63) 
- (modified) clang/lib/Driver/ToolChains/CommonArgs.cpp (+3-1) 
- (added) clang/test/Driver/Inputs/basic_csky_elf_tree/csky-elf-noneabiv2/bin/ld () 
- (added) clang/test/Driver/Inputs/basic_csky_elf_tree/csky-elf-noneabiv2/include/.keep () 
- (added) clang/test/Driver/Inputs/basic_csky_elf_tree/csky-elf-noneabiv2/lib/ck860v/crt0.o () 
- (added) clang/test/Driver/Inputs/basic_csky_elf_tree/csky-elf-noneabiv2/lib/crt0.o () 
- (added) clang/test/Driver/Inputs/basic_csky_elf_tree/csky-elf-noneabiv2/sys-include/.keep () 
- (added) clang/test/Driver/Inputs/basic_csky_elf_tree/lib/gcc/csky-elf-noneabiv2/6.3.0/ck860v/crtbegin.o () 
- (added) clang/test/Driver/Inputs/basic_csky_elf_tree/lib/gcc/csky-elf-noneabiv2/6.3.0/ck860v/crtend.o () 
- (added) clang/test/Driver/Inputs/basic_csky_elf_tree/lib/gcc/csky-elf-noneabiv2/6.3.0/ck860v/crti.o () 
- (added) clang/test/Driver/Inputs/basic_csky_elf_tree/lib/gcc/csky-elf-noneabiv2/6.3.0/ck860v/crtn.o () 
- (added) clang/test/Driver/Inputs/basic_csky_elf_tree/lib/gcc/csky-elf-noneabiv2/6.3.0/crtbegin.o () 
- (added) clang/test/Driver/Inputs/basic_csky_elf_tree/lib/gcc/csky-elf-noneabiv2/6.3.0/crtend.o () 
- (added) clang/test/Driver/Inputs/basic_csky_elf_tree/lib/gcc/csky-elf-noneabiv2/6.3.0/crti.o () 
- (added) clang/test/Driver/Inputs/basic_csky_elf_tree/lib/gcc/csky-elf-noneabiv2/6.3.0/crtn.o () 
- (modified) clang/test/Driver/csky-toolchain.c (+32) 
- (modified) llvm/utils/gn/secondary/clang/lib/Driver/BUILD.gn (-1) 


``````````diff
diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt
index c33dfd2471f35a..f379f288417858 100644
--- a/clang/lib/Driver/CMakeLists.txt
+++ b/clang/lib/Driver/CMakeLists.txt
@@ -59,7 +59,6 @@ add_clang_library(clangDriver
   ToolChains/Clang.cpp
   ToolChains/CommonArgs.cpp
   ToolChains/CrossWindows.cpp
-  ToolChains/CSKYToolChain.cpp
   ToolChains/Cuda.cpp
   ToolChains/Cygwin.cpp
   ToolChains/Darwin.cpp
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index c6f0bb0325a440..b836f86ab102fc 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -13,7 +13,6 @@
 #include "ToolChains/AVR.h"
 #include "ToolChains/Arch/RISCV.h"
 #include "ToolChains/BareMetal.h"
-#include "ToolChains/CSKYToolChain.h"
 #include "ToolChains/Clang.h"
 #include "ToolChains/CrossWindows.h"
 #include "ToolChains/Cuda.h"
@@ -6445,7 +6444,7 @@ const ToolChain &Driver::getToolChain(const ArgList &Args,
         TC = std::make_unique<toolchains::SPIRVToolChain>(*this, Target, Args);
         break;
       case llvm::Triple::csky:
-        TC = std::make_unique<toolchains::CSKYToolChain>(*this, Target, Args);
+        TC = std::make_unique<toolchains::BareMetal>(*this, Target, Args);
         break;
       case llvm::Triple::amdgpu:
       case llvm::Triple::r600:
diff --git a/clang/lib/Driver/ToolChains/BareMetal.cpp b/clang/lib/Driver/ToolChains/BareMetal.cpp
index 619a7fb9746159..c60c95d79d0200 100644
--- a/clang/lib/Driver/ToolChains/BareMetal.cpp
+++ b/clang/lib/Driver/ToolChains/BareMetal.cpp
@@ -61,6 +61,11 @@ static bool isLoongArchBareMetal(const llvm::Triple &Triple) {
          Triple.getEnvironmentName() == "elf";
 }
 
+/// Is the triple csky-*-none-*?
+static bool isCSKYBareMetal(const llvm::Triple &Triple) {
+  return Triple.isCSKY() && Triple.getOS() == llvm::Triple::UnknownOS;
+}
+
 static bool findRISCVMultilibs(const Driver &D,
                                const llvm::Triple &TargetTriple,
                                const ArgList &Args, DetectedMultilibs &Result) {
@@ -222,29 +227,35 @@ static void addMultilibsFilePaths(const Driver &D, const MultilibSet &Multilibs,
 }
 
 // GCC mutltilibs will only work for those targets that have their multlib
-// structure encoded into GCCInstallation. Baremetal toolchain supports ARM,
-// AArch64, RISCV and PPC and of these only RISCV have GCC multilibs hardcoded
-// in GCCInstallation.
+// structure encoded into GCCInstallation. Of the targets supported by the
+// Baremetal toolchain only RISCV and CSKY have GCC multilibs hardcoded in
+// GCCInstallation.
 BareMetal::BareMetal(const Driver &D, const llvm::Triple &Triple,
                      const ArgList &Args)
     : Generic_ELF(D, Triple, Args) {
   IsGCCInstallationValid = initGCCInstallation(Triple, Args);
   std::string ComputedSysRoot = computeSysRoot();
   if (IsGCCInstallationValid) {
-    if (!isRISCVBareMetal(Triple))
+    if (!isRISCVBareMetal(Triple) && !isCSKYBareMetal(Triple))
       D.Diag(clang::diag::warn_drv_multilib_not_available_for_target);
 
     Multilibs = GCCInstallation.getMultilibs();
     SelectedMultilibs.assign({GCCInstallation.getMultilib()});
 
     path_list &Paths = getFilePaths();
-    // Add toolchain/multilib specific file paths.
-    addMultilibsFilePaths(D, Multilibs, SelectedMultilibs.back(),
-                          GCCInstallation.getInstallPath(), Paths);
+    // Add toolchain/multilib specific file paths. Multilib layouts that do
+    // not provide their own file paths (e.g. CSKY) use the OS suffix of the
+    // selected multilib instead.
+    std::string MultilibSuffix;
+    if (Multilibs.filePathsCallback())
+      addMultilibsFilePaths(D, Multilibs, SelectedMultilibs.back(),
+                            GCCInstallation.getInstallPath(), Paths);
+    else
+      MultilibSuffix = SelectedMultilibs.back().osSuffix();
     // Adding filepath for locating crt{begin,end}.o files.
-    Paths.push_back(GCCInstallation.getInstallPath().str());
+    Paths.push_back(GCCInstallation.getInstallPath().str() + MultilibSuffix);
     // Adding filepath for locating crt0.o file.
-    Paths.push_back(ComputedSysRoot + "/lib");
+    Paths.push_back(ComputedSysRoot + "/lib" + MultilibSuffix);
 
     ToolChain::path_list &PPaths = getProgramPaths();
     // Multilib cross-compiler GCC installations put ld in a triple-prefixed
@@ -288,7 +299,7 @@ bool BareMetal::handlesTarget(const llvm::Triple &Triple) {
   return arm::isARMEABIBareMetal(Triple) ||
          aarch64::isAArch64BareMetal(Triple) || isRISCVBareMetal(Triple) ||
          isPPCBareMetal(Triple) || isX86BareMetal(Triple) ||
-         isLoongArchBareMetal(Triple);
+         isLoongArchBareMetal(Triple) || isCSKYBareMetal(Triple);
 }
 
 Tool *BareMetal::buildLinker() const {
@@ -300,13 +311,13 @@ Tool *BareMetal::buildStaticLibTool() const {
 }
 
 ToolChain::CXXStdlibType BareMetal::GetDefaultCXXStdlibType() const {
-  if (getTriple().isRISCV() && IsGCCInstallationValid)
+  if ((getTriple().isRISCV() || getTriple().isCSKY()) && IsGCCInstallationValid)
     return ToolChain::CST_Libstdcxx;
   return ToolChain::CST_Libcxx;
 }
 
 ToolChain::RuntimeLibType BareMetal::GetDefaultRuntimeLibType() const {
-  if (getTriple().isRISCV() && IsGCCInstallationValid)
+  if ((getTriple().isRISCV() || getTriple().isCSKY()) && IsGCCInstallationValid)
     return ToolChain::RLT_Libgcc;
   return ToolChain::RLT_CompilerRT;
 }
@@ -315,7 +326,7 @@ ToolChain::RuntimeLibType BareMetal::GetDefaultRuntimeLibType() const {
 //       If valid, use `UNW_Libgcc`; otherwise, use `UNW_None`.
 ToolChain::UnwindLibType
 BareMetal::GetUnwindLibType(const llvm::opt::ArgList &Args) const {
-  if (getTriple().isRISCV())
+  if (getTriple().isRISCV() || getTriple().isCSKY())
     return ToolChain::UNW_None;
 
   return ToolChain::GetUnwindLibType(Args);
@@ -342,11 +353,22 @@ void BareMetal::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
 
   const SmallString<128> SysRootDir(computeSysRoot());
   if (!SysRootDir.empty()) {
-    for (const Multilib &M : getOrderedMultilibs()) {
+    if (getTriple().isCSKY()) {
+      // CSKY GCC toolchains share their headers between multilibs and keep
+      // fixed headers in sys-include.
       SmallString<128> Dir(SysRootDir);
-      llvm::sys::path::append(Dir, M.includeSuffix());
       llvm::sys::path::append(Dir, "include");
       addSystemInclude(DriverArgs, CC1Args, Dir.str());
+      SmallString<128> SysDir(SysRootDir);
+      llvm::sys::path::append(SysDir, "sys-include");
+      addSystemInclude(DriverArgs, CC1Args, SysDir.str());
+    } else {
+      for (const Multilib &M : getOrderedMultilibs()) {
+        SmallString<128> Dir(SysRootDir);
+        llvm::sys::path::append(Dir, M.includeSuffix());
+        llvm::sys::path::append(Dir, "include");
+        addSystemInclude(DriverArgs, CC1Args, Dir.str());
+      }
     }
     SmallString<128> Dir(SysRootDir);
     llvm::sys::path::append(Dir, getTripleString());
@@ -581,6 +603,8 @@ void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs.push_back(Args.MakeArgString(TC.GetFilePath(crt)));
     }
     if (TC.hasValidGCCInstallation() || detectGCCToolchainAdjacent(D)) {
+      if (Triple.isCSKY())
+        CmdArgs.push_back(Args.MakeArgString(TC.GetFilePath("crti.o")));
       auto RuntimeLib = TC.GetRuntimeLibType(Args);
       switch (RuntimeLib) {
       case (ToolChain::RLT_Libgcc): {
@@ -630,14 +654,19 @@ void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA,
     AddRunTimeLibs(TC, D, CmdArgs, Args);
     if (!Args.hasArg(options::OPT_nolibc))
       CmdArgs.push_back("-lc");
-    if (TC.hasValidGCCInstallation() || detectGCCToolchainAdjacent(D))
+    if (Triple.isCSKY())
+      CmdArgs.push_back(Args.hasArg(options::OPT_msim) ? "-lsemi" : "-lnosys");
+    else if (TC.hasValidGCCInstallation() || detectGCCToolchainAdjacent(D))
       CmdArgs.push_back("-lgloss");
     CmdArgs.push_back("--end-group");
   }
 
   if ((TC.hasValidGCCInstallation() || detectGCCToolchainAdjacent(D)) &&
-      NeedCRTs)
+      NeedCRTs) {
     CmdArgs.push_back(Args.MakeArgString(TC.GetFilePath(CRTEnd)));
+    if (Triple.isCSKY())
+      CmdArgs.push_back(Args.MakeArgString(TC.GetFilePath("crtn.o")));
+  }
 
   // The R_ARM_TARGET2 relocation must be treated as R_ARM_REL32 on arm*-*-elf
   // and arm*-*-eabi (the default is R_ARM_GOT_PREL, used on arm*-*-linux and
diff --git a/clang/lib/Driver/ToolChains/CSKYToolChain.cpp b/clang/lib/Driver/ToolChains/CSKYToolChain.cpp
deleted file mode 100644
index bee7b9d7281585..00000000000000
--- a/clang/lib/Driver/ToolChains/CSKYToolChain.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-//===--- CSKYToolchain.cpp - CSKY ToolChain Implementations ---*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "CSKYToolChain.h"
-#include "clang/Driver/CommonArgs.h"
-#include "clang/Driver/Compilation.h"
-#include "clang/Driver/InputInfo.h"
-#include "clang/Options/Options.h"
-#include "llvm/Option/ArgList.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-
-using namespace clang::driver;
-using namespace clang::driver::toolchains;
-using namespace clang::driver::tools;
-using namespace clang;
-using namespace llvm::opt;
-
-static void addMultilibsFilePaths(const Driver &D, const MultilibSet &Multilibs,
-                                  const Multilib &Multilib,
-                                  StringRef InstallPath,
-                                  ToolChain::path_list &Paths) {
-  if (const auto &PathsCallback = Multilibs.filePathsCallback())
-    for (const auto &Path : PathsCallback(Multilib))
-      addPathIfExists(D, InstallPath + Path, Paths);
-}
-
-/// CSKY Toolchain
-CSKYToolChain::CSKYToolChain(const Driver &D, const llvm::Triple &Triple,
-                             const ArgList &Args)
-    : Generic_ELF(D, Triple, Args) {
-  GCCInstallation.init(Triple, Args);
-  if (GCCInstallation.isValid()) {
-    Multilibs = GCCInstallation.getMultilibs();
-    SelectedMultilibs.assign({GCCInstallation.getMultilib()});
-    path_list &Paths = getFilePaths();
-    // Add toolchain/multilib specific file paths.
-    addMultilibsFilePaths(D, Multilibs, SelectedMultilibs.back(),
-                          GCCInstallation.getInstallPath(), Paths);
-    getFilePaths().push_back(GCCInstallation.getInstallPath().str() +
-                             SelectedMultilibs.back().osSuffix());
-    ToolChain::path_list &PPaths = getProgramPaths();
-    // Multilib cross-compiler GCC installations put ld in a triple-prefixed
-    // directory off of the parent of the GCC installation.
-    PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
-                           GCCInstallation.getTriple().str() + "/bin")
-                         .str());
-    PPaths.push_back((GCCInstallation.getParentLibPath() + "/../bin").str());
-    getFilePaths().push_back(computeSysRoot() + "/lib" +
-                             SelectedMultilibs.back().osSuffix());
-  } else {
-    getProgramPaths().push_back(D.Dir);
-    getFilePaths().push_back(computeSysRoot() + "/lib");
-  }
-}
-
-Tool *CSKYToolChain::buildLinker() const {
-  return new tools::CSKY::Linker(*this);
-}
-
-ToolChain::RuntimeLibType CSKYToolChain::GetDefaultRuntimeLibType() const {
-  return GCCInstallation.isValid() ? ToolChain::RLT_Libgcc
-                                   : ToolChain::RLT_CompilerRT;
-}
-
-ToolChain::UnwindLibType
-CSKYToolChain::GetUnwindLibType(const llvm::opt::ArgList &Args) const {
-  return ToolChain::UNW_None;
-}
-
-void CSKYToolChain::addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
-                                          llvm::opt::ArgStringList &CC1Args,
-                                          BoundArch BA,
-                                          Action::OffloadKind) const {
-  CC1Args.push_back("-nostdsysteminc");
-}
-
-void CSKYToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
-                                              ArgStringList &CC1Args) const {
-  if (DriverArgs.hasArg(options::OPT_nostdinc))
-    return;
-
-  if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) {
-    SmallString<128> Dir(computeSysRoot());
-    llvm::sys::path::append(Dir, "include");
-    addSystemInclude(DriverArgs, CC1Args, Dir.str());
-    SmallString<128> Dir2(computeSysRoot());
-    llvm::sys::path::append(Dir2, "sys-include");
-    addSystemInclude(DriverArgs, CC1Args, Dir2.str());
-  }
-}
-
-void CSKYToolChain::addLibStdCxxIncludePaths(
-    const llvm::opt::ArgList &DriverArgs,
-    llvm::opt::ArgStringList &CC1Args) const {
-  const GCCVersion &Version = GCCInstallation.getVersion();
-  StringRef TripleStr = GCCInstallation.getTriple().str();
-  const Multilib &Multilib = GCCInstallation.getMultilib();
-  addLibStdCXXIncludePaths(computeSysRoot() + "/include/c++/" + Version.Text,
-                           TripleStr, Multilib.includeSuffix(), DriverArgs,
-                           CC1Args);
-}
-
-std::string CSKYToolChain::computeSysRoot() const {
-  if (!getDriver().SysRoot.empty())
-    return getDriver().SysRoot;
-
-  SmallString<128> SysRootDir;
-  if (GCCInstallation.isValid()) {
-    StringRef LibDir = GCCInstallation.getParentLibPath();
-    StringRef TripleStr = GCCInstallation.getTriple().str();
-    llvm::sys::path::append(SysRootDir, LibDir, "..", TripleStr);
-  } else {
-    // Use the triple as provided to the driver. Unlike the parsed triple
-    // this has not been normalized to always contain every field.
-    llvm::sys::path::append(SysRootDir, getDriver().Dir, "..",
-                            getDriver().getTargetTriple());
-  }
-
-  if (!llvm::sys::fs::exists(SysRootDir))
-    return std::string();
-
-  return std::string(SysRootDir);
-}
-
-void CSKY::Linker::ConstructJob(Compilation &C, const JobAction &JA,
-                                const InputInfo &Output,
-                                const InputInfoList &Inputs,
-                                const ArgList &Args,
-                                const char *LinkingOutput) const {
-  const ToolChain &ToolChain = getToolChain();
-  const Driver &D = ToolChain.getDriver();
-  ArgStringList CmdArgs;
-
-  if (!D.SysRoot.empty())
-    CmdArgs.push_back(Args.MakeArgString("--sysroot=" + D.SysRoot));
-
-  CmdArgs.push_back("-m");
-  CmdArgs.push_back("cskyelf");
-
-  std::string Linker = getToolChain().GetLinkerPath();
-
-  bool WantCRTs =
-      !Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles);
-
-  const char *crtbegin, *crtend;
-  auto RuntimeLib = ToolChain.GetRuntimeLibType(Args);
-  if (RuntimeLib == ToolChain::RLT_Libgcc) {
-    crtbegin = "crtbegin.o";
-    crtend = "crtend.o";
-  } else {
-    assert(RuntimeLib == ToolChain::RLT_CompilerRT);
-    crtbegin = ToolChain.getCompilerRTArgString(Args, "crtbegin",
-                                                ToolChain::FT_Object);
-    crtend =
-        ToolChain.getCompilerRTArgString(Args, "crtend", ToolChain::FT_Object);
-  }
-
-  if (WantCRTs) {
-    CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crt0.o")));
-    CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crti.o")));
-    CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtbegin)));
-  }
-
-  Args.AddAllArgs(CmdArgs, options::OPT_L);
-  ToolChain.AddFilePathLibArgs(Args, CmdArgs);
-  Args.addAllArgs(CmdArgs, {options::OPT_T_Group, options::OPT_s,
-                            options::OPT_t, options::OPT_r});
-
-  AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
-
-  // TODO: add C++ includes and libs if compiling C++.
-
-  if (!Args.hasArg(options::OPT_nostdlib) &&
-      !Args.hasArg(options::OPT_nodefaultlibs)) {
-    if (ToolChain.ShouldLinkCXXStdlib(Args))
-      ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
-    CmdArgs.push_back("--start-group");
-    CmdArgs.push_back("-lc");
-    if (Args.hasArg(options::OPT_msim))
-      CmdArgs.push_back("-lsemi");
-    else
-      CmdArgs.push_back("-lnosys");
-    CmdArgs.push_back("--end-group");
-    AddRunTimeLibs(ToolChain, ToolChain.getDriver(), CmdArgs, Args);
-  }
-
-  if (WantCRTs) {
-    CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtend)));
-    CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crtn.o")));
-  }
-
-  CmdArgs.push_back("-o");
-  CmdArgs.push_back(Output.getFilename());
-  C.addCommand(std::make_unique<Command>(
-      JA, *this, ResponseFileSupport::AtFileCurCP(), Args.MakeArgString(Linker),
-      CmdArgs, Inputs, Output));
-}
-// CSKY tools end.
diff --git a/clang/lib/Driver/ToolChains/CSKYToolChain.h b/clang/lib/Driver/ToolChains/CSKYToolChain.h
deleted file mode 100644
index 3eb01d2d764e32..00000000000000
--- a/clang/lib/Driver/ToolChains/CSKYToolChain.h
+++ /dev/null
@@ -1,63 +0,0 @@
-//===--- CSKYToolchain.h - CSKY ToolChain Implementations -----*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_CSKYTOOLCHAIN_H
-#define LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_CSKYTOOLCHAIN_H
-
-#include "Gnu.h"
-#include "clang/Driver/ToolChain.h"
-
-namespace clang {
-namespace driver {
-namespace toolchains {
-
-class LLVM_LIBRARY_VISIBILITY CSKYToolChain : public Generic_ELF {
-public:
-  CSKYToolChain(const Driver &D, const llvm::Triple &Triple,
-                const llvm::opt::ArgList &Args);
-
-  void addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
-                             llvm::opt::ArgStringList &CC1Args, BoundArch BA,
-                             Action::OffloadKind) const override;
-  RuntimeLibType GetDefaultRuntimeLibType() const override;
-  UnwindLibType GetUnwindLibType(const llvm::opt::ArgList &Args) const override;
-  void
-  AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
-                            llvm::opt::ArgStringList &CC1Args) const override;
-  void
-  addLibStdCxxIncludePaths(const llvm::opt::ArgList &DriverArgs,
-                           llvm::opt::ArgStringList &CC1Args) const override;
-
-protected:
-  Tool *buildLinker() const override;
-
-private:
-  std::string computeSysRoot() const override;
-};
-
-} // end namespace toolchains
-
-namespace tools {
-namespace CSKY {
-class LLVM_LIBRARY_VISIBILITY Linker final : public Tool {
-public:
-  Linker(const ToolChain &TC) : Tool("CSKY::Linker", "ld", TC) {}
-  bool hasIntegratedCPP() const override { return false; }
-  bool isLinkJob() const override { return true; }
-  void ConstructJob(Compilation &C, const JobAction &JA,
-                    const InputInfo &Output, const InputInfoList &Inputs,
-                    const llvm::opt::ArgList &TCArgs,
-                    const char *LinkingOutput) const override;
-};
-} // end namespace CSKY
-} // end namespace tools
-
-} // end namespace driver
-} // end namespace clang
-
-#endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_CSKYTOOLCHAIN_H
diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp
index db5250db329a9f..33bdfbedc3bc95 100644
--- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -656,7 +656,9 @@ const char *tools::getLDMOption(const llvm::Triple &T, const ArgList &Args) {
   case llvm::Triple::ve:
     return "elf64ve";
   case llvm::Triple::csky:
-    return "cskyelf_linux";
+    if (T.isOSLinux())
+      return "cskyelf_linux";
+    return "cskyelf";
   default:
     return nullptr;
   }
diff --git a/clang/test/Driver/Inputs/basic_csky_elf_tree/csky-elf-noneabiv2/bin/ld b/clang/test/Driver/Inputs/basic_csky_elf_tree/csky-elf-noneabiv2/bin/ld
new file mode 100755
index 00000000000000..e69de29bb2d1d6
diff --git a/clang/test/Driver/Inputs/basic_csky_elf_tree/csky-elf-noneabiv2/include/.keep b/clang/test/Driver/Inputs/basic_csky_elf_tree/csky-elf-noneabiv2/include/.keep
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/clang/test/Driver/In...
[truncated]

``````````

</details>


https://github.com/llvm/llvm-project/pull/240290


More information about the cfe-commits mailing list