diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-16 08:08:22 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-16 08:08:22 +0000 |
| commit | da60ebd681d40d731b1554131f6625479a07030a (patch) | |
| tree | 783edcf0f46f55fbb297cdba2b1f461f9bba50ab | |
| parent | ee7f8914962bcc6fbbb76a692b1a9a5d4f8b5333 (diff) | |
| parent | 1b5f81aaf1952b0026c090a4b9c36b86b1fb56db (diff) | |
| download | jemalloc_new-da60ebd681d40d731b1554131f6625479a07030a.tar.gz | |
Snap for 8189365 from 1b5f81aaf1952b0026c090a4b9c36b86b1fb56db to tm-frc-os-statsd-release
Change-Id: I09e86612b90292a11dfff6140b0c2ed91c565ed4
| -rw-r--r-- | Android.bp | 7 | ||||
| -rw-r--r-- | include/jemalloc/internal/jemalloc_internal_defs_host.h | 2 | ||||
| -rw-r--r-- | src/jemalloc.c | 2 |
3 files changed, 1 insertions, 10 deletions
@@ -201,11 +201,6 @@ 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"], - }, }, } @@ -359,7 +354,6 @@ cc_library_static { cflags: [ "-U_FORTIFY_SOURCE", "-DJEMALLOC_INTEGRATION_TEST", - "-DJEMALLOC_NO_RENAME", ], local_include_dirs: [ @@ -396,7 +390,6 @@ cc_test { cflags: common_cflags + [ "-DJEMALLOC_INTEGRATION_TEST", - "-DJEMALLOC_NO_RENAME", ], local_include_dirs: common_c_local_includes + [ diff --git a/include/jemalloc/internal/jemalloc_internal_defs_host.h b/include/jemalloc/internal/jemalloc_internal_defs_host.h index f4c973bf..38f91bc2 100644 --- a/include/jemalloc/internal/jemalloc_internal_defs_host.h +++ b/include/jemalloc/internal/jemalloc_internal_defs_host.h @@ -376,8 +376,6 @@ /* * 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 bf5976b3..0584362f 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 ((pthread_t)0) +# define NO_INITIALIZER ((unsigned long)0) # define INITIALIZER pthread_self() # define IS_INITIALIZER (malloc_initializer == pthread_self()) static pthread_t malloc_initializer = NO_INITIALIZER; |