Author: Simi Pallipurath Date: 2025-12-19T12:56:40Z New Revision: e4169e7bc10f743761d00a1a1642fdfe2d853969
URL: https://github.com/llvm/llvm-project/commit/e4169e7bc10f743761d00a1a1642fdfe2d853969 DIFF: https://github.com/llvm/llvm-project/commit/e4169e7bc10f743761d00a1a1642fdfe2d853969.diff LOG: [Clang][Driver] Fix the missing Target-Triple-Level include path resolution in Baremetal Driver (#165321) The current baremetal driver implementation does not have a way to derive the target-triple-level include path within the sysroot. This feature is especially useful in setups where header paths deviate from the default bare-metal assumptions. For example, when headers are shared across target triples, it becomes necessary to organise them under target-triple-specific directories to ensure correct resolution.. Added: clang/test/Driver/Inputs/multiarch-sysroot-tree/aarch64-unknown-none-elf/include/c++/v1/.keep clang/test/Driver/Inputs/multiarch-sysroot-tree/arm-unknown-none-eabi/include/c++/v1/.keep Modified: clang/lib/Driver/ToolChains/BareMetal.cpp clang/test/Driver/baremetal.cpp Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/BareMetal.cpp b/clang/lib/Driver/ToolChains/BareMetal.cpp index 8d598be9ffb0a..6574651b72a3e 100644 --- a/clang/lib/Driver/ToolChains/BareMetal.cpp +++ b/clang/lib/Driver/ToolChains/BareMetal.cpp @@ -408,6 +408,8 @@ void BareMetal::AddClangSystemIncludeArgs(const ArgList &DriverArgs, if (DriverArgs.hasArg(options::OPT_nostdlibinc)) return; + const Driver &D = getDriver(); + if (std::optional<std::string> Path = getStdlibIncludePath()) addSystemInclude(DriverArgs, CC1Args, *Path); @@ -419,6 +421,12 @@ void BareMetal::AddClangSystemIncludeArgs(const ArgList &DriverArgs, llvm::sys::path::append(Dir, "include"); addSystemInclude(DriverArgs, CC1Args, Dir.str()); } + SmallString<128> Dir(SysRootDir); + llvm::sys::path::append(Dir, getTripleString()); + if (D.getVFS().exists(Dir)) { + llvm::sys::path::append(Dir, "include"); + addSystemInclude(DriverArgs, CC1Args, Dir.str()); + } } } @@ -498,7 +506,7 @@ void BareMetal::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, addSystemInclude(DriverArgs, CC1Args, TargetDir.str()); break; } - // Add generic path if nothing else succeeded so far. + // Add generic paths if nothing else succeeded so far. llvm::sys::path::append(Dir, "include", "c++", "v1"); addSystemInclude(DriverArgs, CC1Args, Dir.str()); break; @@ -528,6 +536,17 @@ void BareMetal::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, } } } + switch (GetCXXStdlibType(DriverArgs)) { + case ToolChain::CST_Libcxx: { + SmallString<128> Dir(SysRootDir); + llvm::sys::path::append(Dir, Target, "include", "c++", "v1"); + if (D.getVFS().exists(Dir)) + addSystemInclude(DriverArgs, CC1Args, Dir.str()); + break; + } + case ToolChain::CST_Libstdcxx: + break; + } } void baremetal::StaticLibTool::ConstructJob(Compilation &C, const JobAction &JA, diff --git a/clang/test/Driver/Inputs/multiarch-sysroot-tree/aarch64-unknown-none-elf/include/c++/v1/.keep b/clang/test/Driver/Inputs/multiarch-sysroot-tree/aarch64-unknown-none-elf/include/c++/v1/.keep new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/clang/test/Driver/Inputs/multiarch-sysroot-tree/arm-unknown-none-eabi/include/c++/v1/.keep b/clang/test/Driver/Inputs/multiarch-sysroot-tree/arm-unknown-none-eabi/include/c++/v1/.keep new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/clang/test/Driver/baremetal.cpp b/clang/test/Driver/baremetal.cpp index 7d929fe122465..986aaff5b630d 100644 --- a/clang/test/Driver/baremetal.cpp +++ b/clang/test/Driver/baremetal.cpp @@ -4,6 +4,18 @@ // RUN: | FileCheck -check-prefixes=CHECK-STATIC-LIB %s // CHECK-STATIC-LIB: {{.*}}llvm-ar{{.*}}" "rcsD" +// RUN: %clang %s -### --target=arm-none-eabi -o %t.out 2>&1 \ +// RUN: --sysroot=%S/Inputs/multiarch-sysroot-tree \ +// RUN: | FileCheck --check-prefix=CHECK-ARM %s +// CHECK-ARM: "-internal-isystem" "{{[^"]+}}multiarch-sysroot-tree{{[/\\]+}}arm-unknown-none-eabi{{[/\\]+}}include{{[/\\]+}}c++{{[/\\]+}}v1" +// CHECK-ARM: "-internal-isystem" "{{[^"]+}}multiarch-sysroot-tree{{[/\\]+}}arm-unknown-none-eabi{{[/\\]+}}include" + +// RUN: %clang %s -### --target=aarch64-none-elf -o %t.out 2>&1 \ +// RUN: --sysroot=%S/Inputs/multiarch-sysroot-tree \ +// RUN: | FileCheck --check-prefix=CHECK-AARCH64 %s +// CHECK-AARCH64: "-internal-isystem" "{{[^"]+}}multiarch-sysroot-tree{{[/\\]+}}aarch64-unknown-none-elf{{[/\\]+}}include{{[/\\]+}}c++{{[/\\]+}}v1" +// CHECK-AARCH64: "-internal-isystem" "{{[^"]+}}multiarch-sysroot-tree{{[/\\]+}}aarch64-unknown-none-elf{{[/\\]+}}include" + // RUN: %clang %s -### --target=armv6m-none-eabi -o %t.out 2>&1 \ // RUN: -T semihosted.lds \ // RUN: -L some/directory/user/asked/for \ _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
