Upstream changes from Android.

include/core/SkThread_platform.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkThread_platform_DEFINED
@@ skipping 43 matching lines @@
 #else // !SK_BUILD_FOR_ANDROID_NDK
 
 /* The platform atomics operations are slightly more efficient than the
  * GCC built-ins, so use them.
  */
 #include <utils/Atomic.h>
 
 #define sk_atomic_inc(addr)         android_atomic_inc(addr)
 #define sk_atomic_add(addr, inc)    android_atomic_add(inc, addr)
 #define sk_atomic_dec(addr)         android_atomic_dec(addr)
-void sk_membar_aquire__after_atomic_dec() {
+
+static inline __attribute__((always_inline)) void sk_membar_aquire__after_atomic_dec() {
     //HACK: Android is actually using full memory barriers.
     //      Should this change, uncomment below.
     //int dummy;
     //android_atomic_aquire_store(0, &dummy);
 }
-int32_t sk_atomic_conditional_inc(int32_t* addr) {
+static inline __attribute__((always_inline)) int32_t sk_atomic_conditional_inc(int32_t* addr) {
     while (true) {
         int32_t value = *addr;
         if (value == 0) {
             return 0;
         }
         if (0 == android_atomic_release_cas(value, value + 1, addr)) {
             return value;
         }
     }
 }
-void sk_membar_aquire__after_atomic_conditional_inc() {
+static inline __attribute__((always_inline)) void sk_membar_aquire__after_atomic_conditional_inc() {
     //HACK: Android is actually using full memory barriers.
     //      Should this change, uncomment below.
     //int dummy;
     //android_atomic_aquire_store(0, &dummy);
 }
 
 #endif // !SK_BUILD_FOR_ANDROID_NDK
 
 #else  // !SK_BUILD_FOR_ANDROID
 
@@ skipping 95 matching lines @@
 typedef SkMutex SkBaseMutex;
 
 #define SK_DECLARE_STATIC_MUTEX(name)           static SkBaseMutex  name
 #define SK_DECLARE_GLOBAL_MUTEX(name)           SkBaseMutex  name
 #define SK_DECLARE_MUTEX_ARRAY(name, count)     SkBaseMutex name[count]
 
 #endif // !SK_USE_POSIX_THREADS
 
 
 #endif