https://github.com/jakeegan updated
https://github.com/llvm/llvm-project/pull/104806
>From 11f5d09315140772877bd460e72a3ddeeceb5641 Mon Sep 17 00:00:00 2001
From: Jake Egan <jake.e...@ibm.com>
Date: Mon, 19 Aug 2024 11:08:24 -0400
Subject: [PATCH 1/2] [clang][AIX] Fix -print-runtime-dir on AIX
---
clang/lib/Driver/ToolChain.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index 0e8577b1115e38..4059730fa36654 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -831,8 +831,8 @@ std::optional<std::string> ToolChain::getRuntimePath()
const {
llvm::sys::path::append(P, "lib");
if (auto Ret = getTargetSubDirPath(P))
return Ret;
- // Darwin does not use per-target runtime directory.
- if (Triple.isOSDarwin())
+ // Darwin and AIX does not use per-target runtime directory.
+ if (Triple.isOSDarwin() || Triple.isOSAIX())
return {};
llvm::sys::path::append(P, Triple.str());
return std::string(P);
>From fcb606f7b7ccdbaf88eaf091ea38c36c9bc0cd33 Mon Sep 17 00:00:00 2001
From: Jake Egan <jake.e...@ibm.com>
Date: Tue, 20 Aug 2024 11:13:10 -0400
Subject: [PATCH 2/2] Add test
---
clang/test/Driver/aix-print-runtime-dir.c | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 clang/test/Driver/aix-print-runtime-dir.c
diff --git a/clang/test/Driver/aix-print-runtime-dir.c
b/clang/test/Driver/aix-print-runtime-dir.c
new file mode 100644
index 00000000000000..0d68ad6fee005e
--- /dev/null
+++ b/clang/test/Driver/aix-print-runtime-dir.c
@@ -0,0 +1,11 @@
+// Test output of -print-runtime-dir on AIX
+
+// RUN: %clang -print-runtime-dir --target=powerpc-ibm-aix \
+// RUN: -resource-dir=%S/Inputs/resource_dir \
+// RUN: | FileCheck --check-prefix=PRINT-RUNTIME-DIR %s
+
+// RUN: %clang -print-runtime-dir --target=powerpc64-ibm-aix \
+// RUN: -resource-dir=%S/Inputs/resource_dir \
+// RUN: | FileCheck --check-prefix=PRINT-RUNTIME-DIR %s
+
+// PRINT-RUNTIME-DIR: lib{{/|\\}}aix{{$}}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
