[PATCH] D32748: [Triple] Add a "macos" OS type that acts as a synonym for "macosx"

[Alex Lorenz via Phabricator via llvm-commits]

arphaman created this revision.

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").


Repository:
  rL LLVM

https://reviews.llvm.org/D32748

Files:
  lib/Support/Triple.cpp
  test/CodeGen/X86/version_directive.ll


Index: test/CodeGen/X86/version_directive.ll
===================================================================
--- test/CodeGen/X86/version_directive.ll
+++ test/CodeGen/X86/version_directive.ll
@@ -1,4 +1,5 @@
 ; 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-macos10.11.0 -o - /dev/null | FileCheck %s
 
 ; CHECK: .macosx_version_min 10, 11
Index: lib/Support/Triple.cpp
===================================================================
--- lib/Support/Triple.cpp
+++ lib/Support/Triple.cpp
@@ -459,7 +459,7 @@
     .StartsWith("kfreebsd", Triple::KFreeBSD)
     .StartsWith("linux", Triple::Linux)
     .StartsWith("lv2", Triple::Lv2)
-    .StartsWith("macosx", Triple::MacOSX)
+    .StartsWith("macos", Triple::MacOSX)
     .StartsWith("netbsd", Triple::NetBSD)
     .StartsWith("openbsd", Triple::OpenBSD)
     .StartsWith("solaris", Triple::Solaris)
@@ -984,6 +984,8 @@
   StringRef OSTypeName = getOSTypeName(getOS());
   if (OSName.startswith(OSTypeName))
     OSName = OSName.substr(OSTypeName.size());
+  else if (getOS() == MacOSX && OSName.startswith("macos"))
+    OSName = OSName.substr(strlen("macos"));
 
   parseVersionFromName(OSName, Major, Minor, Micro);
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D32748.97444.patch
Type: text/x-patch
Size: 1321 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170502/b236de4b/attachment.bin>