This is an archive of the discontinued LLVM Phabricator instance.

Make Triple::getOSVersion make sense for Android.
ClosedPublic

Authored by danalbert on Feb 26 2015, 6:39 PM.

Reviewers

Commits

danalbert retitled this revision from to Make Triple::getOSVersion make sense for Android..

danalbert updated this object.

danalbert edited the test plan for this revision. (Show Details)

danalbert added a reviewer: srhines.

danalbert set the repository for this revision to rL LLVM.

danalbert added a subscriber: Unknown Object (MLST).

Looks great

This revision is now accepted and ready to land.Mar 2 2015, 3:45 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

lib/

Support/

8 lines

Show First 20 Lines • Show All 708 Lines • ▼ Show 20 Lines	static unsigned EatNumber(StringRef &Str) {

return Result;		return Result;
}		}

void Triple::getOSVersion(unsigned &Major, unsigned &Minor,		void Triple::getOSVersion(unsigned &Major, unsigned &Minor,
unsigned &Micro) const {		unsigned &Micro) const {
StringRef OSName = getOSName();		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.		// Assume that the OS portion of the triple starts with the canonical name.
StringRef OSTypeName = getOSTypeName(getOS());		StringRef OSTypeName = getOSTypeName(getOS());
if (OSName.startswith(OSTypeName))		if (OSName.startswith(OSTypeName))
OSName = OSName.substr(OSTypeName.size());		OSName = OSName.substr(OSTypeName.size());

// Any unset version defaults to 0.		// Any unset version defaults to 0.
Major = Minor = Micro = 0;		Major = Minor = Micro = 0;

▲ Show 20 Lines • Show All 387 Lines • Show Last 20 Lines