Snap for 7592596 from 4526f2dd482d45160973f6b6d2d3162437b30a7a to tm-release

Change-Id: I66dc3c957c468e26ed05a5b855d99be171d86023

3 files changed, 8 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index 80eede97..15f7d63c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -201,6 +201,11 @@ cc_library {
             system_shared_libs: [],
             header_libs: ["libc_headers"],
         },
+        musl: {
+            // Linking against musl uses libjemalloc5 by default, list only
+            // libc_musl here to avoid a circular dependency.
+            system_shared_libs: ["libc_musl"],
+        },
     },
 }
 
diff --git a/include/jemalloc/internal/jemalloc_internal_defs_host.h b/include/jemalloc/internal/jemalloc_internal_defs_host.h
index 38f91bc2..f4c973bf 100644
--- a/include/jemalloc/internal/jemalloc_internal_defs_host.h
+++ b/include/jemalloc/internal/jemalloc_internal_defs_host.h
@@ -376,6 +376,8 @@
 /*
  * Defined if strerror_r returns char * if _GNU_SOURCE is defined.
  */
+#ifdef __GLIBC__
 #define JEMALLOC_STRERROR_R_RETURNS_CHAR_WITH_GNU_SOURCE 
+#endif
 
 #endif /* JEMALLOC_INTERNAL_DEFS_H_ */
diff --git a/src/jemalloc.c b/src/jemalloc.c
index 0584362f..bf5976b3 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -111,7 +111,7 @@ static uint8_t	malloc_slow_flags;
 
 #ifdef JEMALLOC_THREADED_INIT
 /* Used to let the initializing thread recursively allocate. */
-#  define NO_INITIALIZER	((unsigned long)0)
+#  define NO_INITIALIZER	((pthread_t)0)
 #  define INITIALIZER		pthread_self()
 #  define IS_INITIALIZER	(malloc_initializer == pthread_self())
 static pthread_t		malloc_initializer = NO_INITIALIZER;