Skip to content

[Driver] Enable LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON on AIX. #132821

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 1 commit into from
Mar 28, 2025
Merged

[Driver] Enable LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON on AIX. #132821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions clang/include/clang/Driver/ToolChain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,9 @@ class ToolChain {
StringRef Component,
FileType Type = ToolChain::FT_Static) const;

// Returns Triple without the OSs version.
llvm::Triple getTripleWithoutOSVersion() const;

// Returns the target specific runtime path if it exists.
std::optional<std::string> getRuntimePath() const;

Expand Down
34 changes: 22 additions & 12 deletions clang/lib/Driver/ToolChain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,8 +779,6 @@ std::string ToolChain::getCompilerRT(const ArgList &Args, StringRef Component,
if (Path.empty())
Path = P;
}
if (getTriple().isOSAIX())
Path.clear();

// Check the filename for the old layout if the new one does not exist.
CRTBasename =
Expand Down Expand Up @@ -846,6 +844,16 @@ ToolChain::getFallbackAndroidTargetPath(StringRef BaseDir) const {
return std::string(P);
}

llvm::Triple ToolChain::getTripleWithoutOSVersion() const {
return (Triple.hasEnvironment()
? llvm::Triple(Triple.getArchName(), Triple.getVendorName(),
llvm::Triple::getOSTypeName(Triple.getOS()),
llvm::Triple::getEnvironmentTypeName(
Triple.getEnvironment()))
: llvm::Triple(Triple.getArchName(), Triple.getVendorName(),
llvm::Triple::getOSTypeName(Triple.getOS())));
}

std::optional<std::string>
ToolChain::getTargetSubDirPath(StringRef BaseDir) const {
auto getPathForTriple =
Expand All @@ -864,14 +872,7 @@ ToolChain::getTargetSubDirPath(StringRef BaseDir) const {
if (T.isOSzOS() &&
(!T.getOSVersion().empty() || !T.getEnvironmentVersion().empty())) {
// Build the triple without version information
const llvm::Triple &TripleWithoutVersion =
(T.hasEnvironment()
? llvm::Triple(
T.getArchName(), T.getVendorName(),
llvm::Triple::getOSTypeName(T.getOS()),
llvm::Triple::getEnvironmentTypeName(T.getEnvironment()))
: llvm::Triple(T.getArchName(), T.getVendorName(),
llvm::Triple::getOSTypeName(T.getOS())));
const llvm::Triple &TripleWithoutVersion = getTripleWithoutOSVersion();
if (auto Path = getPathForTriple(TripleWithoutVersion))
return *Path;
}
Expand Down Expand Up @@ -909,9 +910,18 @@ std::optional<std::string> ToolChain::getRuntimePath() const {
llvm::sys::path::append(P, "lib");
if (auto Ret = getTargetSubDirPath(P))
return Ret;
// Darwin and AIX does not use per-target runtime directory.
if (Triple.isOSDarwin() || Triple.isOSAIX())
// Darwin does not use per-target runtime directory.
if (Triple.isOSDarwin())
return {};

// For AIX, get the triple without the OS version.
if (Triple.isOSAIX()) {
const llvm::Triple &TripleWithoutVersion = getTripleWithoutOSVersion();
llvm::sys::path::append(P, TripleWithoutVersion.str());
if (getVFS().exists(P))
return std::string(P);
return {};
}
llvm::sys::path::append(P, Triple.str());
return std::string(P);
}
Expand Down
Empty file added clang/test/Driver/Inputs/resource_dir/lib/aix/libclang_rt.builtins-powerpc.a
View file
Open in desktop
Empty file.
Empty file added clang/test/Driver/Inputs/resource_dir/lib/aix/libclang_rt.builtins-powerpc64.a
View file
Open in desktop
Empty file.
Empty file added ...ver/Inputs/resource_dir_with_per_target_subdir/lib/powerpc-ibm-aix/libclang_rt.builtins.a
View file
Open in desktop
Empty file.
Empty file added ...r/Inputs/resource_dir_with_per_target_subdir/lib/powerpc64-ibm-aix/libclang_rt.builtins.a
View file
Open in desktop
Empty file.
52 changes: 52 additions & 0 deletions clang/test/Driver/aix-ld.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,6 +1070,58 @@
// CHECK-FOPENMP-GOMP: "-lgomp"
// CHECK-FOPENMP: "-lc"

// Check powerpc-ibm-aix7.1.0.0, 32-bit per_target_runtime_dir.
// RUN: %clang %s -### 2>&1 \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
// RUN: --target=powerpc-ibm-aix7.1.0.0 \
// RUN: --sysroot %S/Inputs/aix_ppc_tree \
// RUN: --unwindlib=libunwind \
// RUN: | FileCheck --check-prefix=CHECK-LD32-PER-TARGET %s
// CHECK-LD32-PER-TARGET-NOT: warning:
// CHECK-LD32-PER-TARGET: "-cc1" "-triple" "powerpc-ibm-aix7.1.0.0"
// CHECK-LD32-PER-TARGET: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
// CHECK-LD32-PER-TARGET: "-isysroot" "[[SYSROOT:[^"]+]]"
// CHECK-LD32-PER-TARGET: "{{.*}}ld{{(.exe)?}}"
// CHECK-LD32-PER-TARGET-NOT: "-bnso"
// CHECK-LD32-PER-TARGET: "-b32"
// CHECK-LD32-PER-TARGET: "-bpT:0x10000000" "-bpD:0x20000000"
// CHECK-LD32-PER-TARGET: "[[SYSROOT]]/usr/lib{{/|\\\\}}crt0.o"
// CHECK-LD32-PER-TARGET: "[[SYSROOT]]/usr/lib{{/|\\\\}}crti.o"
// CHECK-LD32-PER-TARGET-NOT: "-lc++"
// CHECK-LD32-PER-TARGET-NOT: "-lc++abi"
// CHECK-LD32-PER-TARGET: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}powerpc-ibm-aix{{/|\\\\}}libclang_rt.builtins.a"
// CHECK-LD32-PER-TARGET-NOT: "--as-needed"
// CHECK-LD32-PER-TARGET: "-lunwind"
// CHECK-LD32-PER-TARGET-NOT: "--no-as-needed"
// CHECK-LD32-PER-TARGET-NOT: "-lm"
// CHECK-LD32-PER-TARGET: "-lc"

// Check powerpc64-ibm-aix7.1.0.0, 64-bit.
// RUN: %clang %s -### 2>&1 \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
// RUN: --target=powerpc64-ibm-aix7.1.0.0 \
// RUN: --sysroot %S/Inputs/aix_ppc_tree \
// RUN: --unwindlib=libunwind \
// RUN: | FileCheck --check-prefix=CHECK-LD64-PER-TARGET %s
// CHECK-LD64-PER-TARGET-NOT: warning:
// CHECK-LD64-PER-TARGET: "-cc1" "-triple" "powerpc64-ibm-aix7.1.0.0"
// CHECK-LD64-PER-TARGET: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
// CHECK-LD64-PER-TARGET: "-isysroot" "[[SYSROOT:[^"]+]]"
// CHECK-LD64-PER-TARGET: "{{.*}}ld{{(.exe)?}}"
// CHECK-LD64-PER-TARGET-NOT: "-bnso"
// CHECK-LD64-PER-TARGET: "-b64"
// CHECK-LD64-PER-TARGET: "-bpT:0x100000000" "-bpD:0x110000000"
// CHECK-LD64-PER-TARGET: "[[SYSROOT]]/usr/lib{{/|\\\\}}crt0_64.o"
// CHECK-LD64-PER-TARGET: "[[SYSROOT]]/usr/lib{{/|\\\\}}crti_64.o"
// CHECK-LD64-PER-TARGET-NOT: "-lc++"
// CHECK-LD64-PER-TARGET-NOT: "-lc++abi"
// CHECK-LD64-PER-TARGET: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}powerpc64-ibm-aix{{/|\\\\}}libclang_rt.builtins.a"
// CHECK-LD64-PER-TARGET-NOT: "--as-needed"
// CHECK-LD64-PER-TARGET: "-lunwind"
// CHECK-LD64-PER-TARGET-NOT: "--no-as-needed"
// CHECK-LD64-PER-TARGET-NOT: "-lm"
// CHECK-LD64-PER-TARGET: "-lc"

// Check powerpc-ibm-aix7.1.0.0, 32-bit. -fopenmp=libfoo results an error.
// RUN: not %clang %s 2>&1 -### \
// RUN: --target=powerpc-ibm-aix7.1.0.0 \
Expand Down
10 changes: 10 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 @@ -8,4 +8,14 @@
// RUN: -resource-dir=%S/Inputs/resource_dir \
// RUN: | FileCheck --check-prefix=PRINT-RUNTIME-DIR %s

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

// RUN: %clang -print-runtime-dir --target=powerpc64-ibm-aix \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir\
// RUN: | FileCheck --check-prefix=PRINT-RUNTIME-DIR64-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{{$}}
8 changes: 8 additions & 0 deletions clang/test/Driver/aix-rtlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
// RUN: %clang --target=powerpc64-ibm-aix -print-libgcc-file-name \
// RUN: -resource-dir=%S/Inputs/resource_dir \
// RUN: | FileCheck -check-prefix=CHECK64 %s
// RUN: %clang --target=powerpc-ibm-aix -print-libgcc-file-name \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
// RUN: | FileCheck -check-prefix=CHECK32-PER-TARGET %s
// RUN: %clang --target=powerpc64-ibm-aix -print-libgcc-file-name \
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
// RUN: | FileCheck -check-prefix=CHECK64-PER-TARGET %s

// CHECK32: resource_dir{{/|\\}}lib{{/|\\}}aix{{/|\\}}libclang_rt.builtins-powerpc.a
// CHECK64: resource_dir{{/|\\}}lib{{/|\\}}aix{{/|\\}}libclang_rt.builtins-powerpc64.a
// CHECK32-PER-TARGET: resource_dir_with_per_target_subdir{{/|\\}}lib{{/|\\}}powerpc-ibm-aix{{/|\\}}libclang_rt.builtins.a
// CHECK64-PER-TARGET: resource_dir_with_per_target_subdir{{/|\\}}lib{{/|\\}}powerpc64-ibm-aix{{/|\\}}libclang_rt.builtins.a