ADT/Triple: Drop support for -osx style triples, we are going with -macosx

instead.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@129836 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/ADT/Triple.h b/include/llvm/ADT/Triple.h
index 90a4db120e741bca3ee77037c47eeac5f528d895..2f427c02ddca546a3661117901475c7279905079 100644 (file)
--- a/include/llvm/ADT/Triple.h
+++ b/include/llvm/ADT/Triple.h
@@ -89,7 +89,6 @@ public:
     MacOSX,
     MinGW32,    // i*86-pc-mingw32, *-w64-mingw32
     NetBSD,
-    OSX,
     OpenBSD,
     Psp,
     Solaris,
@@ -270,8 +269,7 @@ public:
   /// isOSX - Is this an OS X triple. For legacy reasons, we support both
   /// "darwin" and "osx" as OS X triples.
   bool isOSX() const {
-    return getOS() == Triple::Darwin || getOS() == Triple::OSX ||
-      getOS() == Triple::MacOSX;
+    return getOS() == Triple::Darwin || getOS() == Triple::MacOSX;
   }
 
   /// isOSDarwin - Is this a "Darwin" OS (OS X or iOS).
@@ -293,7 +291,7 @@ public:
     assert(isOSX() && "Not an OS X triple!");
 
     // If this is OS X, expect a sane version number.
-    if (getOS() == Triple::OSX || getOS() == Triple::MacOSX)
+    if (getOS() == Triple::MacOSX)
       return isOSVersionLT(Major, Minor, Micro);
 
     // Otherwise, compare to the "Darwin" number.

diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp
index 38cb15a50e666b5c3fafc614de7f728160bf97e2..ad93121d02d087cc1b3b728f89e3f68ce0d4bb9d 100644 (file)
--- a/lib/Support/Triple.cpp
+++ b/lib/Support/Triple.cpp
@@ -105,7 +105,6 @@ const char *Triple::getOSTypeName(OSType Kind) {
   case MacOSX: return "macosx";
   case MinGW32: return "mingw32";
   case NetBSD: return "netbsd";
-  case OSX: return "osx";
   case OpenBSD: return "openbsd";
   case Psp: return "psp";
   case Solaris: return "solaris";
@@ -329,8 +328,6 @@ Triple::OSType Triple::ParseOS(StringRef OSName) {
     return MinGW32;
   else if (OSName.startswith("netbsd"))
     return NetBSD;
-  else if (OSName.startswith("osx"))
-    return OSX;
   else if (OSName.startswith("openbsd"))
     return OpenBSD;
   else if (OSName.startswith("psp"))