Landing patch set 7 from https://codereview.chromium.org/1450113003/

runtime/vm/os_thread_linux.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"  // NOLINT
 #if defined(TARGET_OS_LINUX)
 
 #include "vm/os_thread.h"
 
 #include <errno.h>  // NOLINT
 #include <sys/resource.h>  // NOLINT
 #include <sys/syscall.h>  // NOLINT
 #include <sys/time.h>  // NOLINT
 
 #include "platform/assert.h"
+#include "platform/utils.h"
 
 namespace dart {
 
-static char* strerror_helper(int err, char* buffer, size_t bufsize) {
-#if !defined(__GLIBC__) || \
-    ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE)
-  // Use the standard version
-  return strerror_r(err, buffer, bufsize) == 0 ?
-    buffer : const_cast<char*>("strerror_r failed");
-#else
-  // Use the gnu specific version
-  return strerror_r(err, buffer, bufsize);
-#endif
-}
-
 #define VALIDATE_PTHREAD_RESULT(result) \
   if (result != 0) { \
     const int kBufferSize = 1024; \
     char error_buf[kBufferSize]; \
     FATAL2("pthread error: %d (%s)", result, \
-           strerror_helper(result, error_buf, kBufferSize)); \
+           Utils::StrError(result, error_buf, kBufferSize)); \
   }
 
 
 #if defined(DEBUG)
 #define ASSERT_PTHREAD_SUCCESS(result) VALIDATE_PTHREAD_RESULT(result)
 #else
 // NOTE: This (currently) expands to a no-op.
 #define ASSERT_PTHREAD_SUCCESS(result) ASSERT(result == 0)
 #endif
 
 
 #ifdef DEBUG
 #define RETURN_ON_PTHREAD_FAILURE(result) \
   if (result != 0) { \
     const int kBufferSize = 1024; \
     char error_buf[kBufferSize]; \
     fprintf(stderr, "%s:%d: pthread error: %d (%s)\n", \
             __FILE__, __LINE__, result, \
-            strerror_helper(result, error_buf, kBufferSize)); \
+            Utils::StrError(result, error_buf, kBufferSize)); \
     return result; \
   }
 #else
 #define RETURN_ON_PTHREAD_FAILURE(result) \
   if (result != 0) return result;
 #endif
 
 
 static void ComputeTimeSpecMicros(struct timespec* ts, int64_t micros) {
   int64_t secs = micros / kMicrosecondsPerSecond;
@@ skipping 358 matching lines @@
 void Monitor::NotifyAll() {
   // When running with assertions enabled we track the owner.
   ASSERT(IsOwnedByCurrentThread());
   int result = pthread_cond_broadcast(data_.cond());
   VALIDATE_PTHREAD_RESULT(result);
 }
 
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_LINUX)