This is an archive of the discontinued LLVM Phabricator instance.

Differential D122030

Driver: Make macOS the default target OS for -arch arm64
AcceptedPublic

Authored by dexonsmith on Mar 18 2022, 1:17 PM.

Details

Reviewers
arphaman
ab
steven_wu
Summary

This is a follow up to 565603cc94d79a8d0de6df840fd53714899fb890,
which made macOS the default target OS for -arch arm64 when
running on an Apple Silicon Mac. Now it'll be the default when
running on an Intel Mac too.

clang/test/Driver/apple-arm64-arch.c was a bit odd before: it was added
for the above commit, but tested the inverse behaviour and XFAIL'ed on
Apple Silicon. This inverts it to the (new) behaviour (that's now
correct regardless) and removes the XFAIL.

Radar-Id: rdar://90500294

Diff Detail

Event Timeline

dexonsmith created this revision.Mar 18 2022, 1:17 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 18 2022, 1:17 PM
Herald added a subscriber: kristof.beyls. · View Herald Transcript
dexonsmith requested review of this revision.Mar 18 2022, 1:17 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 18 2022, 1:17 PM
dexonsmith mentioned this in D121997: [clang][driver] Fix compilation database dump with multiple architectures.Mar 18 2022, 1:20 PM
arphaman accepted this revision.Mar 18 2022, 1:26 PM
This revision is now accepted and ready to land.Mar 18 2022, 1:26 PM
Harbormaster completed remote builds in B155107: Diff 416587.Mar 18 2022, 1:56 PM

Revision Contents

PathSize
clang/
lib/
Driver/
ToolChains/
11 lines
test/
Driver/
3 lines

Diff 416587

clang/lib/Driver/ToolChains/Darwin.cpp

Show First 20 Lines • Show All 1,994 Lines • ▼ Show 20 Lines
/// Tries to infer the target OS from the -arch. /// Tries to infer the target OS from the -arch.
Optional<DarwinPlatform> Optional<DarwinPlatform>
inferDeploymentTargetFromArch(DerivedArgList &Args, const Darwin &Toolchain, inferDeploymentTargetFromArch(DerivedArgList &Args, const Darwin &Toolchain,
const llvm::Triple &Triple, const llvm::Triple &Triple,
const Driver &TheDriver) { const Driver &TheDriver) {
llvm::Triple::OSType OSTy = llvm::Triple::UnknownOS; llvm::Triple::OSType OSTy = llvm::Triple::UnknownOS;
StringRef MachOArchName = Toolchain.getMachOArchName(Args); StringRef MachOArchName = Toolchain.getMachOArchName(Args);
if (MachOArchName == "arm64" || MachOArchName == "arm64e") { if (MachOArchName == "arm64" || MachOArchName == "arm64e")
#if __arm64__
// A clang running on an Apple Silicon mac defaults
// to building for mac when building for arm64 rather than
// defaulting to iOS.
OSTy = llvm::Triple::MacOSX; OSTy = llvm::Triple::MacOSX;
#else else if (MachOArchName == "armv7" || MachOArchName == "armv7s")
OSTy = llvm::Triple::IOS;
#endif
} else if (MachOArchName == "armv7" || MachOArchName == "armv7s")
OSTy = llvm::Triple::IOS; OSTy = llvm::Triple::IOS;
else if (MachOArchName == "armv7k" || MachOArchName == "arm64_32") else if (MachOArchName == "armv7k" || MachOArchName == "arm64_32")
OSTy = llvm::Triple::WatchOS; OSTy = llvm::Triple::WatchOS;
else if (MachOArchName != "armv6m" && MachOArchName != "armv7m" && else if (MachOArchName != "armv6m" && MachOArchName != "armv7m" &&
MachOArchName != "armv7em") MachOArchName != "armv7em")
OSTy = llvm::Triple::MacOSX; OSTy = llvm::Triple::MacOSX;
if (OSTy == llvm::Triple::UnknownOS) if (OSTy == llvm::Triple::UnknownOS)
return None; return None;
▲ Show 20 Lines • Show All 1,273 Lines • Show Last 20 Lines

clang/test/Driver/apple-arm64-arch.c

// RUN: env SDKROOT="/" %clang -arch arm64 -c -### %s 2>&1 | \ // RUN: env SDKROOT="/" %clang -arch arm64 -c -### %s 2>&1 | \
// RUN: FileCheck %s // RUN: FileCheck %s
// //
// REQUIRES: system-darwin // REQUIRES: system-darwin
// XFAIL: apple-silicon-mac
// //
// CHECK: "-triple" "arm64-apple-ios{{[0-9.]+}}" // CHECK: "-triple" "arm64-apple-macosx{{[0-9.]+}}"