<div dir="ltr">Add something to the unittest?<br><br>-eric</div><br><div class="gmail_quote">On Tue, Mar 3, 2015 at 10:31 AM Dan Albert <<a href="mailto:danalbert@google.com">danalbert@google.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: danalbert<br>
Date: Tue Mar  3 12:23:51 2015<br>
New Revision: 231090<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=231090&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project?rev=231090&view=rev</a><br>
Log:<br>
Make Triple::getOSVersion make sense for Android.<br>
<br>
Reviewers: srhines<br>
<br>
Reviewed By: srhines<br>
<br>
Subscribers: llvm-commits<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D7928" target="_blank">http://reviews.llvm.org/D7928</a><br>
<br>
Modified:<br>
    llvm/trunk/lib/Support/Triple.<u></u>cpp<br>
<br>
Modified: llvm/trunk/lib/Support/Triple.<u></u>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Triple.cpp?rev=231090&r1=231089&r2=231090&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/llvm/trunk/lib/<u></u>Support/Triple.cpp?rev=231090&<u></u>r1=231089&r2=231090&view=diff</a><br>
==============================<u></u>==============================<u></u>==================<br>
--- llvm/trunk/lib/Support/Triple.<u></u>cpp (original)<br>
+++ llvm/trunk/lib/Support/Triple.<u></u>cpp Tue Mar  3 12:23:51 2015<br>
@@ -714,6 +714,14 @@ void Triple::getOSVersion(unsigned &Majo<br>
                           unsigned &Micro) const {<br>
   StringRef OSName = getOSName();<br>
<br>
+  // For Android, we care about the Android version rather than the Linux<br>
+  // version.<br>
+  if (getEnvironment() == Android) {<br>
+    OSName = getEnvironmentName().substr(<u></u>strlen("android"));<br>
+    if (OSName.startswith("eabi"))<br>
+      OSName = OSName.substr(strlen("eabi"));<br>
+  }<br>
+<br>
   // Assume that the OS portion of the triple starts with the canonical name.<br>
   StringRef OSTypeName = getOSTypeName(getOS());<br>
   if (OSName.startswith(OSTypeName)<u></u>)<br>
<br>
<br>
______________________________<u></u>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/<u></u>mailman/listinfo/llvm-commits</a><br>
</blockquote></div>