diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2011-04-19 23:55:20 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2011-04-19 23:55:20 +0000 |
| commit | 924699845aa00558edb940e9d53d38591dc09a43 (patch) | |
| tree | e740b2b775f7ccc89e7326f841fac21f7bc249da /llvm | |
| parent | fcd2389b7a3d06f45d9ce5269deff07ae6944932 (diff) | |
| download | bcm5719-llvm-924699845aa00558edb940e9d53d38591dc09a43.tar.gz bcm5719-llvm-924699845aa00558edb940e9d53d38591dc09a43.zip | |
ADT/Triple: Drop support for -osx style triples, we are going with -macosx
instead.
llvm-svn: 129836
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/include/llvm/ADT/Triple.h | 6 | ||||
| -rw-r--r-- | 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 90a4db120e7..2f427c02ddc 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 38cb15a50e6..ad93121d02d 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")) |
