From 924699845aa00558edb940e9d53d38591dc09a43 Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Tue, 19 Apr 2011 23:55:20 +0000
Subject: [PATCH] ADT/Triple: Drop support for -osx style triples, we are going
 with -macosx instead.

llvm-svn: 129836
---
 llvm/include/llvm/ADT/Triple.h | 6 ++----
 llvm/lib/Support/Triple.cpp    | 3 ---
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/llvm/include/llvm/ADT/Triple.h b/llvm/include/llvm/ADT/Triple.h
index 90a4db120e74..2f427c02ddca 100644
--- a/llvm/include/llvm/ADT/Triple.h
+++ b/llvm/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/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp
index 38cb15a50e66..ad93121d02d0 100644
--- a/llvm/lib/Support/Triple.cpp
+++ b/llvm/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"))