[llvm-commits] [llvm] r129836 - in /llvm/trunk: include/llvm/ADT/Triple.h lib/Support/Triple.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Tue Apr 19 18:55:20 2011
New Revision: 129836

URL: http://llvm.org/viewvc/llvm-project?rev=129836&view=rev
Log:
ADT/Triple: Drop support for -osx style triples, we are going with -macosx
instead.

Modified:
    llvm/trunk/include/llvm/ADT/Triple.h
    llvm/trunk/lib/Support/Triple.cpp

Modified: llvm/trunk/include/llvm/ADT/Triple.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/Triple.h?rev=129836&r1=129835&r2=129836&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/Triple.h (original)
+++ llvm/trunk/include/llvm/ADT/Triple.h Tue Apr 19 18:55:20 2011
@@ -89,7 +89,6 @@
     MacOSX,
     MinGW32,    // i*86-pc-mingw32, *-w64-mingw32
     NetBSD,
-    OSX,
     OpenBSD,
     Psp,
     Solaris,
@@ -270,8 +269,7 @@
   /// 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 @@
     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.

Modified: llvm/trunk/lib/Support/Triple.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Triple.cpp?rev=129836&r1=129835&r2=129836&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Triple.cpp (original)
+++ llvm/trunk/lib/Support/Triple.cpp Tue Apr 19 18:55:20 2011
@@ -105,7 +105,6 @@
   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 @@
     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"))