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

[Daniel Dunbar]

Author: ddunbar
Date: Tue Apr 19 18:34:12 2011
New Revision: 129833

URL: http://llvm.org/viewvc/llvm-project?rev=129833&view=rev
Log:
ADT/Triple: Add support for Triple::MacOSX per feedback from Chris, will remove
Triple::OSX once Clang has moved.

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=129833&r1=129832&r2=129833&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ADT/Triple.h (original)
+++ llvm/trunk/include/llvm/ADT/Triple.h Tue Apr 19 18:34:12 2011
@@ -86,6 +86,7 @@
     IOS,
     Linux,
     Lv2,        // PS3
+    MacOSX,
     MinGW32,    // i*86-pc-mingw32, *-w64-mingw32
     NetBSD,
     OSX,
@@ -269,7 +270,8 @@
   /// 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;
+    return getOS() == Triple::Darwin || getOS() == Triple::OSX ||
+      getOS() == Triple::MacOSX;
   }
 
   /// isOSDarwin - Is this a "Darwin" OS (OS X or iOS).
@@ -291,7 +293,7 @@
     assert(isOSX() && "Not an OS X triple!");
 
     // If this is OS X, expect a sane version number.
-    if (getOS() == Triple::OSX)
+    if (getOS() == Triple::OSX || 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=129833&r1=129832&r2=129833&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Triple.cpp (original)
+++ llvm/trunk/lib/Support/Triple.cpp Tue Apr 19 18:34:12 2011
@@ -102,6 +102,7 @@
   case IOS: return "ios";
   case Linux: return "linux";
   case Lv2: return "lv2";
+  case MacOSX: return "macosx";
   case MinGW32: return "mingw32";
   case NetBSD: return "netbsd";
   case OSX: return "osx";
@@ -322,6 +323,8 @@
     return Linux;
   else if (OSName.startswith("lv2"))
     return Lv2;
+  else if (OSName.startswith("macosx"))
+    return MacOSX;
   else if (OSName.startswith("mingw32"))
     return MinGW32;
   else if (OSName.startswith("netbsd"))