https://github.com/jakeegan created
https://github.com/llvm/llvm-project/pull/140850
Previously, when the triple is `powerpc-ibm-aix-unknown`, the driver fails to
find subdirectory `lib/powerpc-ibm-aix`.
This ensures the correct runtime path is found if the triple has the
environment component attached.
>From 120423abadbfd63dbb50387fb5ce26ff0f3ff257 Mon Sep 17 00:00:00 2001
From: Jake Egan <jake.e...@ibm.com>
Date: Wed, 21 May 2025 01:51:00 -0400
Subject: [PATCH] Handle triple environment component for target runtime
directory on AIX
---
clang/lib/Driver/ToolChain.cpp | 7 +++++++
clang/test/Driver/aix-print-runtime-dir.c | 4 ++++
2 files changed, 11 insertions(+)
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index 664aafad0f680..90fb0375d1925 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -935,6 +935,13 @@ 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
diff --git a/clang/test/Driver/aix-print-runtime-dir.c
b/clang/test/Driver/aix-print-runtime-dir.c
index ffa4d15c21208..ad841cb4f9b5b 100644
--- a/clang/test/Driver/aix-print-runtime-dir.c
+++ b/clang/test/Driver/aix-print-runtime-dir.c
@@ -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{{$}}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
