From 3a4ce89f185a14f9dc8d439fd9d5cb7912ddcfc0 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Mon, 1 Jun 2015 23:45:25 +0000 Subject: [Support] Simplify Triple::getOSVersion Those who are interested in the Android version can use getEnvironmentVersion instead of getOSVersion. llvm-svn: 238798 --- llvm/lib/Support/Triple.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'llvm/lib/Support') diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp index 6c6b87ea5fb..4bfcd76ab87 100644 --- a/llvm/lib/Support/Triple.cpp +++ b/llvm/lib/Support/Triple.cpp @@ -815,21 +815,13 @@ void Triple::getEnvironmentVersion(unsigned &Major, unsigned &Minor, StringRef EnvironmentTypeName = getEnvironmentTypeName(getEnvironment()); if (EnvironmentName.startswith(EnvironmentTypeName)) EnvironmentName = EnvironmentName.substr(EnvironmentTypeName.size()); + parseVersionFromName(EnvironmentName, Major, Minor, Micro); } void Triple::getOSVersion(unsigned &Major, unsigned &Minor, unsigned &Micro) const { StringRef OSName = getOSName(); - - // For Android, we care about the Android version rather than the Linux - // version. - if (getEnvironment() == Android) { - OSName = getEnvironmentName().substr(strlen("android")); - if (OSName.startswith("eabi")) - OSName = OSName.substr(strlen("eabi")); - } - // Assume that the OS portion of the triple starts with the canonical name. StringRef OSTypeName = getOSTypeName(getOS()); if (OSName.startswith(OSTypeName)) -- cgit v1.2.3