diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2017-12-28 15:37:03 -0800 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2017-12-28 15:37:03 -0800 |
| commit | 11d1ac4c0cbe66b838e2a7af4ac335fc34eda2d6 (patch) | |
| tree | 6b157abea27f947438eab47353be2f9876571f77 /include/grpc/impl/codegen/port_platform.h | |
| parent | 2e04b2dd0c9aed66a14e6810b18e8c5b9b4f8a04 (diff) | |
Add an exception in TLS to use pthread library instead of __thread for Android NDK with GCC as the compiler
Diffstat (limited to 'include/grpc/impl/codegen/port_platform.h')
| -rw-r--r-- | include/grpc/impl/codegen/port_platform.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h index 5a0ed85111..f4bc3eb3e0 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -305,20 +305,23 @@ * This is primarily because of linker problems and toolchain misconfiguration: * TLS isn't supported until NDK r12b per * https://developer.android.com/ndk/downloads/revision_history.html + * TLS also does not work with Android NDK if GCC is being used as the compiler + * instead of Clang. * Since NDK r16, `__NDK_MAJOR__` and `__NDK_MINOR__` are defined in * <android/ndk-version.h>. For NDK < r16, users should define these macros, * e.g. `-D__NDK_MAJOR__=11 -D__NKD_MINOR__=0` for NDK r11. */ -#if defined(__ANDROID__) && defined(__clang__) && defined(GPR_GCC_TLS) +#if defined(__ANDROID__) && defined(GPR_GCC_TLS) #if __has_include(<android/ndk-version.h>) #include <android/ndk-version.h> #endif /* __has_include(<android/ndk-version.h>) */ -#if defined(__ANDROID__) && defined(__clang__) && defined(__NDK_MAJOR__) && \ - defined(__NDK_MINOR__) && \ - ((__NDK_MAJOR__ < 12) || ((__NDK_MAJOR__ == 12) && (__NDK_MINOR__ < 1))) +#if (defined(__clang__) && defined(__NDK_MAJOR__) && defined(__NDK_MINOR__) && \ + ((__NDK_MAJOR__ < 12) || \ + ((__NDK_MAJOR__ == 12) && (__NDK_MINOR__ < 1)))) || \ + (defined(__GNUC__) && !defined(__clang__)) #undef GPR_GCC_TLS #define GPR_PTHREAD_TLS 1 #endif -#endif /*defined(__ANDROID__) && defined(__clang__) && defined(GPR_GCC_TLS) */ +#endif /*defined(__ANDROID__) && defined(GPR_GCC_TLS) */ #if defined(__has_include) #if __has_include(<atomic>) |