Skip to content

[AArch64] Bump default CPUs for iOS 18/watchOS 26 to A10/S9. #162325

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
Oct 7, 2025
Merged

[AArch64] Bump default CPUs for iOS 18/watchOS 26 to A10/S9. #162325

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
7 changes: 5 additions & 2 deletions clang/lib/Driver/ToolChains/Arch/AArch64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,18 @@ std::string aarch64::getAArch64TargetCPU(const ArgList &Args,
// iOS 26 only runs on apple-a12 and later CPUs.
if (!Triple.isOSVersionLT(26))
return "apple-a12";
// arm64 (non-e) iOS 18 only runs on apple-a10 and later CPUs.
if (!Triple.isOSVersionLT(18) && !Triple.isArm64e())
return "apple-a10";
}

if (Triple.isWatchOS()) {
assert(!Triple.isSimulatorEnvironment() && "watchossim should be mac-like");
// arm64_32/arm64e watchOS requires S4 before watchOS 26, S6 after.
if (Triple.getArch() == llvm::Triple::aarch64_32 || Triple.isArm64e())
return Triple.isOSVersionLT(26) ? "apple-s4" : "apple-s6";
// arm64 (non-e, non-32) watchOS comes later, and requires S6 anyway.
return "apple-s6";
// arm64 (non-e, non-32) watchOS comes later, and requires S9 anyway.
return "apple-s9";
}

if (Triple.isXROS()) {
Expand Down
10 changes: 8 additions & 2 deletions clang/test/Driver/aarch64-cpu-defaults-appleos26.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@
// RUN: %clang -target arm64-apple-ios26 -### -c %s 2>&1 | FileCheck %s --check-prefix=A12
// RUN: %clang -target arm64e-apple-ios26 -### -c %s 2>&1 | FileCheck %s --check-prefix=A12

/// iOS 18 came before iOS 26, compare its defaults.
// RUN: %clang -target arm64-apple-ios18 -### -c %s 2>&1 | FileCheck %s --check-prefix=A10
// RUN: %clang -target arm64e-apple-ios18 -### -c %s 2>&1 | FileCheck %s --check-prefix=A12

/// arm64e/arm64_32 watchOS 26 default to apple-s6.
// RUN: %clang -target arm64e-apple-watchos26 -### -c %s 2>&1 | FileCheck %s --check-prefix=S6
// RUN: %clang -target arm64_32-apple-watchos26 -### -c %s 2>&1 | FileCheck %s --check-prefix=S6

/// arm64 is new in watchOS 26, and defaults to apple-s6.
// RUN: %clang -target arm64-apple-watchos26 -### -c %s 2>&1 | FileCheck %s --check-prefix=S6
/// arm64 is new in watchOS 26, and defaults to apple-s9.
// RUN: %clang -target arm64-apple-watchos26 -### -c %s 2>&1 | FileCheck %s --check-prefix=S9

/// llvm usually treats tvOS like iOS, but it runs on different hardware.
// RUN: %clang -target arm64-apple-tvos26 -### -c %s 2>&1 | FileCheck %s --check-prefix=A7
Expand All @@ -18,5 +22,7 @@
/// Simulators are tested with other Mac-like targets in aarch64-mac-cpus.c.

// A12: "-target-cpu" "apple-a12"
// A10: "-target-cpu" "apple-a10"
// S6: "-target-cpu" "apple-s6"
// S9: "-target-cpu" "apple-s9"
// A7: "-target-cpu" "apple-a7"