summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-03-03 18:23:51 +0000
committerDan Albert <danalbert@google.com>2015-03-03 18:23:51 +0000
commit675cffcb91353b00bcc23f15e879925f6a0e1db3 (patch)
treea9da8ab16f459c2c04d41984252fae1907268e2a
parent23f94dfdf4e3de1722d2ce2e68be6ebf1e24071d (diff)
downloadbcm5719-llvm-675cffcb91353b00bcc23f15e879925f6a0e1db3.tar.gz
bcm5719-llvm-675cffcb91353b00bcc23f15e879925f6a0e1db3.zip
Make Triple::getOSVersion make sense for Android.
Reviewers: srhines Reviewed By: srhines Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D7928 llvm-svn: 231090
-rw-r--r--llvm/lib/Support/Triple.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp
index e74b23ca0ca..33472e51d17 100644
--- a/llvm/lib/Support/Triple.cpp
+++ b/llvm/lib/Support/Triple.cpp
@@ -714,6 +714,14 @@ 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))
OpenPOWER on IntegriCloud