[clang] [Hexagon] Search packaged builtins in resource dir (PR #238274)
via cfe-commits
cfe-commits at lists.llvm.org
Tue Nov 3 03:02:17 PST 2026
llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-clang-driver
Author: quic-k
<details>
<summary>Changes</summary>
Hexagon toolchains now add <resource-dir>/lib/hexagon/<variant> to the library search path for every target and libc, where <variant> is <cpu>[-G0][-pic]. The directory is searched before the sysroot.
The runtime choice for the link line now applies to all Hexagon libcs, so --rtlib=compiler-rt selects -lclang_rt.builtins instead of -lgcc on non-picolibc targets too. The default remains -lgcc.
---
Full diff: https://github.com/llvm/llvm-project/pull/238274.diff
2 Files Affected:
- (modified) clang/lib/Driver/ToolChains/Hexagon.cpp (+25-18)
- (added) clang/test/Driver/hexagon-library-search-path.c (+77)
``````````diff
diff --git a/clang/lib/Driver/ToolChains/Hexagon.cpp b/clang/lib/Driver/ToolChains/Hexagon.cpp
index ec2641301909d1..68a62883c07550 100644
--- a/clang/lib/Driver/ToolChains/Hexagon.cpp
+++ b/clang/lib/Driver/ToolChains/Hexagon.cpp
@@ -405,6 +405,10 @@ constructHexagonLinkArgs(Compilation &C, const JobAction &JA,
if (!Args.hasArg(options::OPT_nolibc))
CmdArgs.push_back("-lc");
+ // TODO: Linux (musl) ignores --rtlib and links -lclang_rt.builtins-hexagon,
+ // which does not match the packaged libclang_rt.builtins.a in
+ // <resource-dir>/lib/hexagon/<variant>. Use the same runtime selection and
+ // name as the other Hexagon targets, and update hexagon-toolchain-linux.c.
CmdArgs.push_back("-lclang_rt.builtins-hexagon");
}
if (D.CCCIsCXX()) {
@@ -518,14 +522,10 @@ constructHexagonLinkArgs(Compilation &C, const JobAction &JA,
if (!Args.hasArg(options::OPT_nolibc))
CmdArgs.push_back("-lc");
}
- if (HTC.GetCStdlibType(Args) == ToolChain::CST_Picolibc) {
- if (HTC.GetRuntimeLibType(Args) == ToolChain::RLT_CompilerRT)
- CmdArgs.push_back("-lclang_rt.builtins");
- else
- CmdArgs.push_back("-lgcc");
- } else {
+ if (HTC.GetRuntimeLibType(Args) == ToolChain::RLT_CompilerRT)
+ CmdArgs.push_back("-lclang_rt.builtins");
+ else
CmdArgs.push_back("-lgcc");
- }
CmdArgs.push_back("--end-group");
}
@@ -707,22 +707,29 @@ void HexagonToolChain::getHexagonLibraryPaths(const ArgList &Args,
bool IsPicolibc = GetCStdlibType(Args) == ToolChain::CST_Picolibc;
const std::string CpuVer = GetTargetCPUVersion(Args).str();
+ // -shared also implies -pic for library search paths.
+ bool HasPICOrShared = HasPIC || Args.hasArg(options::OPT_shared);
+ // Base case (no G0/pic): v68. G0: v68-G0, plus -pic if PIC or shared.
+ std::string LibraryVariant = CpuVer;
+ if (HasG0) {
+ LibraryVariant += "-G0";
+ if (HasPICOrShared)
+ LibraryVariant += "-pic";
+ }
+
+ // Hexagon builtins are packaged with the compiler, in
+ // <resource-dir>/lib/hexagon/<cpu>[-G0][-pic], for every Hexagon target.
+ // Searched before the sysroot so the packaged copy wins.
+ SmallString<128> ResourceLibDir(D.ResourceDir);
+ llvm::sys::path::append(ResourceLibDir, "lib", "hexagon", LibraryVariant);
+ LibPaths.push_back(std::string(ResourceLibDir));
+
for (auto &Dir : RootDirs) {
std::string LibDir = Dir + "/lib";
std::string LibDirCpu = LibDir + '/' + CpuVer;
if (IsPicolibc) {
// Flat layout: push only the single most-specific variant dir, then lib.
- // Base case (no G0/pic): lib/v68, lib.
- // -shared also implies -pic for Picolibc library search paths.
- bool HasPICOrShared = HasPIC || Args.hasArg(options::OPT_shared);
- if (HasG0) {
- std::string Variant = CpuVer + "-G0";
- if (HasPICOrShared)
- Variant += "-pic";
- LibPaths.push_back(LibDir + "/" + Variant);
- } else {
- LibPaths.push_back(LibDirCpu);
- }
+ LibPaths.push_back(LibDir + "/" + LibraryVariant);
} else {
// Nested layout (non-Picolibc): lib/v68/G0/pic, lib/v68/G0
if (HasG0) {
diff --git a/clang/test/Driver/hexagon-library-search-path.c b/clang/test/Driver/hexagon-library-search-path.c
new file mode 100644
index 00000000000000..762920883c595f
--- /dev/null
+++ b/clang/test/Driver/hexagon-library-search-path.c
@@ -0,0 +1,77 @@
+// REQUIRES: hexagon-registered-target
+
+// Every Hexagon toolchain searches <resource-dir>/lib/hexagon/<variant> for
+// builtins, whatever the target OS or libc. The variant is derived from the
+// CPU and the -G0 / -fpic flags in the same way for all of them.
+
+// -----------------------------------------------------------------------------
+// Default libc (no --cstdlib) for each Hexagon OS
+// -----------------------------------------------------------------------------
+// RUN: %clang --target=hexagon-none-elf -mcpu=hexagonv68 --sysroot= \
+// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin -### %s 2>&1 | FileCheck -check-prefix=CHECK-NONE -DRESOURCE_DIR=%clang-resource-dir %s
+// CHECK-NONE: "-L[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}hexagon{{/|\\\\}}v68"
+
+// RUN: %clang --target=hexagon-unknown-elf -mcpu=hexagonv68 --sysroot= \
+// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin -### %s 2>&1 | FileCheck -check-prefix=CHECK-UNKNOWN-ELF -DRESOURCE_DIR=%clang-resource-dir %s
+// CHECK-UNKNOWN-ELF: "-L[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}hexagon{{/|\\\\}}v68"
+
+// -----------------------------------------------------------------------------
+// Picolibc, for each Hexagon OS
+// -----------------------------------------------------------------------------
+// RUN: %clang --target=hexagon-none-elf --cstdlib=picolibc -mcpu=hexagonv68 --sysroot= \
+// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin -### %s 2>&1 | FileCheck -check-prefix=CHECK-PICOLIBC -DRESOURCE_DIR=%clang-resource-dir %s
+// CHECK-PICOLIBC: "-L[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}hexagon{{/|\\\\}}v68"
+
+// RUN: %clang --target=hexagon-h2-elf --cstdlib=picolibc -mcpu=hexagonv68 --sysroot= \
+// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin -### %s 2>&1 | FileCheck -check-prefix=CHECK-H2 -DRESOURCE_DIR=%clang-resource-dir %s
+// CHECK-H2: "-L[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}hexagon{{/|\\\\}}v68"
+
+// -----------------------------------------------------------------------------
+// Linux (musl)
+// -----------------------------------------------------------------------------
+// RUN: %clang --target=hexagon-unknown-linux-musl -mcpu=hexagonv68 -fuse-ld=lld \
+// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
+// RUN: --sysroot=%S/Inputs/basic_linux_libcxx_tree -### %s 2>&1 | FileCheck -check-prefix=CHECK-LINUX -DRESOURCE_DIR=%clang-resource-dir %s
+// CHECK-LINUX: "-L[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}hexagon{{/|\\\\}}v68"
+
+// -----------------------------------------------------------------------------
+// Variant selection: -G0 and -fpic select the matching packaged directory
+// -----------------------------------------------------------------------------
+// RUN: %clang --target=hexagon-none-elf -mcpu=hexagonv68 -G0 -fpic --sysroot= \
+// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin -### %s 2>&1 | FileCheck -check-prefix=CHECK-VARIANT-NONE -DRESOURCE_DIR=%clang-resource-dir %s
+// CHECK-VARIANT-NONE: "-L[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}hexagon{{/|\\\\}}v68-G0-pic"
+
+// RUN: %clang --target=hexagon-none-elf --cstdlib=picolibc -mcpu=hexagonv68 -G0 --sysroot= \
+// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin -### %s 2>&1 | FileCheck -check-prefix=CHECK-VARIANT-PICOLIBC -DRESOURCE_DIR=%clang-resource-dir %s
+// CHECK-VARIANT-PICOLIBC: "-L[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}hexagon{{/|\\\\}}v68-G0"
+
+// RUN: %clang --target=hexagon-unknown-linux-musl -mcpu=hexagonv68 -G0 -fpic -fuse-ld=lld \
+// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin \
+// RUN: --sysroot=%S/Inputs/basic_linux_libcxx_tree -### %s 2>&1 | FileCheck -check-prefix=CHECK-VARIANT-LINUX -DRESOURCE_DIR=%clang-resource-dir %s
+// CHECK-VARIANT-LINUX: "-L[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}hexagon{{/|\\\\}}v68-G0-pic"
+
+// -----------------------------------------------------------------------------
+// Resource dir is searched before the sysroot
+// -----------------------------------------------------------------------------
+// RUN: %clang --target=hexagon-none-elf -mcpu=hexagonv68 --sysroot= \
+// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin -### %s 2>&1 | FileCheck -check-prefix=CHECK-ORDER-NONE -DRESOURCE_DIR=%clang-resource-dir %s
+// CHECK-ORDER-NONE: "-L[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}hexagon{{/|\\\\}}v68"
+// CHECK-ORDER-NONE: "-L{{.*}}{{/|\\\\}}target{{/|\\\\}}hexagon{{/|\\\\}}lib{{/|\\\\}}v68"
+
+// RUN: %clang --target=hexagon-none-elf --cstdlib=picolibc -mcpu=hexagonv68 --sysroot= \
+// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin -### %s 2>&1 | FileCheck -check-prefix=CHECK-ORDER-PICOLIBC -DRESOURCE_DIR=%clang-resource-dir %s
+// CHECK-ORDER-PICOLIBC: "-L[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}hexagon{{/|\\\\}}v68"
+// CHECK-ORDER-PICOLIBC: "-L{{.*}}{{/|\\\\}}target{{/|\\\\}}picolibc{{/|\\\\}}hexagon-unknown-none-elf{{/|\\\\}}lib{{/|\\\\}}v68"
+
+// -----------------------------------------------------------------------------
+// Runtime selection: -lgcc by default, -lclang_rt.builtins with --rtlib=compiler-rt
+// -----------------------------------------------------------------------------
+// RUN: %clang --target=hexagon-none-elf -mcpu=hexagonv68 --sysroot= \
+// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin -### %s 2>&1 | FileCheck -check-prefix=CHECK-RT-DEFAULT %s
+// CHECK-RT-DEFAULT: "-lgcc"
+// CHECK-RT-DEFAULT-NOT: "-lclang_rt.builtins"
+
+// RUN: %clang --target=hexagon-none-elf -mcpu=hexagonv68 --rtlib=compiler-rt --sysroot= \
+// RUN: -ccc-install-dir %S/Inputs/hexagon_tree/Tools/bin -### %s 2>&1 | FileCheck -check-prefix=CHECK-RT-COMPILER-RT %s
+// CHECK-RT-COMPILER-RT: "-lclang_rt.builtins"
+// CHECK-RT-COMPILER-RT-NOT: "-lgcc"
``````````
</details>
https://github.com/llvm/llvm-project/pull/238274
More information about the cfe-commits
mailing list