This is an archive of the discontinued LLVM Phabricator instance.

Differential D32748

[Triple] Add a "macos" OS type that acts as a synonym for "macosx"
ClosedPublic

Authored by arphaman on May 2 2017, 7:14 AM.

Details

Reviewers
chandlerc
Commits
rGc748d7b57b2e: [Triple] Add a "macos" OS type that acts as a synonym for "macosx"
rL302011: [Triple] Add a "macos" OS type that acts as a synonym for "macosx"
Summary

The "macosx" OS type is still the canonical type. In the future "macos" will become the canonical OS type (but we will still support "macosx").

Diff Detail

Repository
rL LLVM

Event Timeline

arphaman created this revision.May 2 2017, 7:14 AM
majnemer added a subscriber: majnemer.May 2 2017, 6:16 PM
majnemer added inline comments.
lib/Support/Triple.cpp
987–988

You could simplify this:

else if (getOS() == MacOSX)
  OSName.consume_front("macos");
chandlerc accepted this revision.May 2 2017, 10:35 PM

LGTM with David's suggested change.

This revision is now accepted and ready to land.May 2 2017, 10:35 PM
Closed by commit rL302011: [Triple] Add a "macos" OS type that acts as a synonym for "macosx" (authored by arphaman). · Explain WhyMay 3 2017, 3:55 AM
This revision was automatically updated to reflect the committed changes.
arphaman marked an inline comment as done.

Revision Contents

PathSize
lib/
Support/
4 lines
test/
CodeGen/
X86/
1 line

Diff 97444

lib/Support/Triple.cpp

Show First 20 Lines • Show All 453 Lines • ▼ Show 20 Lines return StringSwitch<Triple::OSType>(OSName)
.StartsWith("darwin", Triple::Darwin) .StartsWith("darwin", Triple::Darwin)
.StartsWith("dragonfly", Triple::DragonFly) .StartsWith("dragonfly", Triple::DragonFly)
.StartsWith("freebsd", Triple::FreeBSD) .StartsWith("freebsd", Triple::FreeBSD)
.StartsWith("fuchsia", Triple::Fuchsia) .StartsWith("fuchsia", Triple::Fuchsia)
.StartsWith("ios", Triple::IOS) .StartsWith("ios", Triple::IOS)
.StartsWith("kfreebsd", Triple::KFreeBSD) .StartsWith("kfreebsd", Triple::KFreeBSD)
.StartsWith("linux", Triple::Linux) .StartsWith("linux", Triple::Linux)
.StartsWith("lv2", Triple::Lv2) .StartsWith("lv2", Triple::Lv2)
.StartsWith("macosx", Triple::MacOSX) .StartsWith("macos", Triple::MacOSX)
.StartsWith("netbsd", Triple::NetBSD) .StartsWith("netbsd", Triple::NetBSD)
.StartsWith("openbsd", Triple::OpenBSD) .StartsWith("openbsd", Triple::OpenBSD)
.StartsWith("solaris", Triple::Solaris) .StartsWith("solaris", Triple::Solaris)
.StartsWith("win32", Triple::Win32) .StartsWith("win32", Triple::Win32)
.StartsWith("windows", Triple::Win32) .StartsWith("windows", Triple::Win32)
.StartsWith("haiku", Triple::Haiku) .StartsWith("haiku", Triple::Haiku)
.StartsWith("minix", Triple::Minix) .StartsWith("minix", Triple::Minix)
.StartsWith("rtems", Triple::RTEMS) .StartsWith("rtems", Triple::RTEMS)
▲ Show 20 Lines • Show All 508 Lines • ▼ Show 20 Lines
void Triple::getOSVersion(unsigned &Major, unsigned &Minor, void Triple::getOSVersion(unsigned &Major, unsigned &Minor,
unsigned &Micro) const { unsigned &Micro) const {
StringRef OSName = getOSName(); StringRef OSName = getOSName();
// Assume that the OS portion of the triple starts with the canonical name. // Assume that the OS portion of the triple starts with the canonical name.
StringRef OSTypeName = getOSTypeName(getOS()); StringRef OSTypeName = getOSTypeName(getOS());
if (OSName.startswith(OSTypeName)) if (OSName.startswith(OSTypeName))
OSName = OSName.substr(OSTypeName.size()); OSName = OSName.substr(OSTypeName.size());
else if (getOS() == MacOSX && OSName.startswith("macos"))
OSName = OSName.substr(strlen("macos"));
majnemerUnsubmitted
Done
ReplyInline Actions

You could simplify this:

else if (getOS() == MacOSX)
  OSName.consume_front("macos");
majnemer: You could simplify this: else if (getOS() == MacOSX) OSName.consume_front("macos");
parseVersionFromName(OSName, Major, Minor, Micro); parseVersionFromName(OSName, Major, Minor, Micro);
} }
bool Triple::getMacOSXVersion(unsigned &Major, unsigned &Minor, bool Triple::getMacOSXVersion(unsigned &Major, unsigned &Minor,
unsigned &Micro) const { unsigned &Micro) const {
getOSVersion(Major, Minor, Micro); getOSVersion(Major, Minor, Micro);
▲ Show 20 Lines • Show All 540 Lines • Show Last 20 Lines

test/CodeGen/X86/version_directive.ll

; RUN: llc -mtriple x86_64-apple-darwin15.0.0 -o - /dev/null | FileCheck %s ; RUN: llc -mtriple x86_64-apple-darwin15.0.0 -o - /dev/null | FileCheck %s
; RUN: llc -mtriple x86_64-apple-macosx10.11.0 -o - /dev/null | FileCheck %s ; RUN: llc -mtriple x86_64-apple-macosx10.11.0 -o - /dev/null | FileCheck %s
; RUN: llc -mtriple x86_64-apple-macos10.11.0 -o - /dev/null | FileCheck %s
; CHECK: .macosx_version_min 10, 11 ; CHECK: .macosx_version_min 10, 11