Skip to content

[clang][AIX] Strip unknown environment component for per target runtime directory #140850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 24, 2025
Merged

[clang][AIX] Strip unknown environment component for per target runtime directory #140850

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
120423a
Handle triple environment component for target runtime directory on AIX
jakeegan May 21, 2025
6ed30e6
Fix formatting
jakeegan May 21, 2025
2f230ce
Only strip -unknown environment component
jakeegan May 23, 2025
2d679ad
Fix formatting
jakeegan May 23, 2025
f2359e6
Add 64-bit check
jakeegan May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions clang/lib/Driver/ToolChain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,6 +935,14 @@ ToolChain::getTargetSubDirPath(StringRef BaseDir) const {
if (auto Path = getPathForTriple(T))
return *Path;

// On AIX, the environment component is not used in the target sub dir name.
if (T.isOSAIX() && T.hasEnvironment()) {
llvm::Triple AIXTriple(T.getArchName(), T.getVendorName(),
llvm::Triple::getOSTypeName(T.getOS()));
if (auto Path = getPathForTriple(AIXTriple))
return *Path;
}

if (T.isOSzOS() &&
(!T.getOSVersion().empty() || !T.getEnvironmentVersion().empty())) {
// Build the triple without version information
Expand Down
4 changes: 4 additions & 0 deletions clang/test/Driver/aix-print-runtime-dir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir\
// RUN: | FileCheck --check-prefix=PRINT-RUNTIME-DIR64-PER-TARGET %s

// RUN: %clang -print-runtime-dir --target=powerpc-ibm-aix-unknown \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir\
// RUN: | FileCheck --check-prefix=PRINT-RUNTIME-DIR32-PER-TARGET %s

// PRINT-RUNTIME-DIR: lib{{/|\\}}aix{{$}}
// PRINT-RUNTIME-DIR32-PER-TARGET: lib{{/|\\}}powerpc-ibm-aix{{$}}
// PRINT-RUNTIME-DIR64-PER-TARGET: lib{{/|\\}}powerpc64-ibm-aix{{$}}