This is an archive of the discontinued LLVM Phabricator instance.

Fix GNU strerror_r check for Android.
ClosedPublic

Authored by danalbert on Feb 16 2017, 3:17 PM.

Reviewers

Commits

Summary

Bionic didn't get a GNU style strerror_r until Android M. Until then
we unconditionally exposed the POSIX one. Expand the check to account
for this.

LGTM from the Android side.

LGTM

This revision is now accepted and ready to land.Mar 7 2017, 10:12 AM

This revision was automatically updated to reflect the committed changes.

Path

Size

openmp/

trunk/

runtime/

src/

4 lines

Show First 20 Lines • Show All 813 Lines • ▼ Show 20 Lines	#else // Non-Windows* OS: Linux* OS or OS X*

/*		/*
There are 2 incompatible versions of strerror_r:		There are 2 incompatible versions of strerror_r:

char * strerror_r( int, char *, size_t ); // GNU version		char * strerror_r( int, char *, size_t ); // GNU version
int strerror_r( int, char *, size_t ); // XSI version		int strerror_r( int, char *, size_t ); // XSI version
*/		*/

#if defined(__GLIBC__) && defined(_GNU_SOURCE)		#if (defined(__GLIBC__) && defined(_GNU_SOURCE)) \|\| \
		(defined(__BIONIC__) && defined(_GNU_SOURCE) && \
		__ANDROID_API__ >= __ANDROID_API_M__)

// GNU version of strerror_r.		// GNU version of strerror_r.

char buffer[ 2048 ];		char buffer[ 2048 ];
char * const err_msg = strerror_r( err, buffer, sizeof( buffer ) );		char * const err_msg = strerror_r( err, buffer, sizeof( buffer ) );
// Do not eliminate this assignment to temporary variable, otherwise compiler would		// Do not eliminate this assignment to temporary variable, otherwise compiler would
// not issue warning if strerror_r() returns `int' instead of expected `char *'.		// not issue warning if strerror_r() returns `int' instead of expected `char *'.
message = __kmp_str_format( "%s", err_msg );		message = __kmp_str_format( "%s", err_msg );
▲ Show 20 Lines • Show All 165 Lines • Show Last 20 Lines