replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

instead.

llvm-svn: 129836
This commit is contained in:
Daniel Dunbar 2011-04-19 23:55:20 +00:00
parent fcd2389b7a
commit 924699845a
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/include/llvm/ADT/Triple.h
View File

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

3
llvm/lib/Support/Triple.cpp
View File

@ -105,7 +105,6 @@ const char *Triple::getOSTypeName(OSType Kind) {
case MacOSX: return "macosx"; case MacOSX: return "macosx";
case MinGW32: return "mingw32"; case MinGW32: return "mingw32";
case NetBSD: return "netbsd"; case NetBSD: return "netbsd";
case OSX: return "osx";
case OpenBSD: return "openbsd"; case OpenBSD: return "openbsd";
case Psp: return "psp"; case Psp: return "psp";
case Solaris: return "solaris"; case Solaris: return "solaris";
@ -329,8 +328,6 @@ Triple::OSType Triple::ParseOS(StringRef OSName) {
return MinGW32; return MinGW32;
else if (OSName.startswith("netbsd")) else if (OSName.startswith("netbsd"))
return NetBSD; return NetBSD;
else if (OSName.startswith("osx"))
return OSX;
else if (OSName.startswith("openbsd")) else if (OSName.startswith("openbsd"))
return OpenBSD; return OpenBSD;
else if (OSName.startswith("psp")) else if (OSName.startswith("psp"))