Skip to content

[clang][driver] Fix -print-target-triple OS version for apple targets #104037

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
Aug 15, 2024
Merged

[clang][driver] Fix -print-target-triple OS version for apple targets #104037

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
13 changes: 10 additions & 3 deletions clang/lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2271,8 +2271,7 @@ bool Driver::HandleImmediateArgs(Compilation &C) {
return false;
}

if (C.getArgs().hasArg(options::OPT_print_libgcc_file_name)) {
ToolChain::RuntimeLibType RLT = TC.GetRuntimeLibType(C.getArgs());
auto initializeTargets = [&]() {
const llvm::Triple Triple(TC.ComputeEffectiveClangTriple(C.getArgs()));
// The 'Darwin' toolchain is initialized only when its arguments are
// computed. Get the default arguments for OFK_None to ensure that
Expand All @@ -2282,6 +2281,12 @@ bool Driver::HandleImmediateArgs(Compilation &C) {
// FIXME: For some more esoteric targets the default toolchain is not the
// correct one.
C.getArgsForToolChain(&TC, Triple.getArchName(), Action::OFK_None);
return Triple;
};

if (C.getArgs().hasArg(options::OPT_print_libgcc_file_name)) {
ToolChain::RuntimeLibType RLT = TC.GetRuntimeLibType(C.getArgs());
const llvm::Triple Triple = initializeTargets();
RegisterEffectiveTriple TripleRAII(TC, Triple);
switch (RLT) {
case ToolChain::RLT_CompilerRT:
Expand Down Expand Up @@ -2325,7 +2330,9 @@ bool Driver::HandleImmediateArgs(Compilation &C) {
}

if (C.getArgs().hasArg(options::OPT_print_target_triple)) {
llvm::outs() << TC.getTripleString() << "\n";
initializeTargets();
llvm::Triple Triple(TC.ComputeEffectiveClangTriple(C.getArgs()));
llvm::outs() << Triple.getTriple() << "\n";
return false;
}

Expand Down
42 changes: 42 additions & 0 deletions clang/test/Driver/darwin-print-target-triple.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// Test the output of -print-target-triple on Darwin.
// See https://github.com/llvm/llvm-project/issues/61762

//
// All platforms
//

// RUN: %clang -print-target-triple \
// RUN: --target=x86_64-apple-macos -mmacos-version-min=15 \
// RUN: -resource-dir=%S/Inputs/resource_dir 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-CLANGRT-MACOS %s
// CHECK-CLANGRT-MACOS: x86_64-apple-macosx15.0.0

// RUN: %clang -print-target-triple \
// RUN: --target=arm64-apple-ios -mios-version-min=9 \
// RUN: -resource-dir=%S/Inputs/resource_dir 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-CLANGRT-IOS %s
// CHECK-CLANGRT-IOS: arm64-apple-ios9.0.0

// RUN: %clang -print-target-triple \
// RUN: --target=arm64-apple-watchos -mwatchos-version-min=3 \
// RUN: -resource-dir=%S/Inputs/resource_dir 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-CLANGRT-WATCHOS %s
// CHECK-CLANGRT-WATCHOS: arm64-apple-watchos3.0.0

// RUN: %clang -print-target-triple \
// RUN: --target=armv7k-apple-watchos -mwatchos-version-min=3 \
// RUN: -resource-dir=%S/Inputs/resource_dir 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-CLANGRT-WATCHOS-ARMV7K %s
// CHECK-CLANGRT-WATCHOS-ARMV7K: thumbv7-apple-watchos3.0.0

// RUN: %clang -print-target-triple \
// RUN: --target=arm64-apple-tvos -mtvos-version-min=1\
// RUN: -resource-dir=%S/Inputs/resource_dir 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-CLANGRT-TVOS %s
// CHECK-CLANGRT-TVOS: arm64-apple-tvos1.0.0

// RUN: %clang -print-target-triple \
// RUN: --target=arm64-apple-driverkit \
// RUN: -resource-dir=%S/Inputs/resource_dir 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-CLANGRT-DRIVERKIT %s
// CHECK-CLANGRT-DRIVERKIT: arm64-apple-driverkit19.0.0
Loading