openharmony/third_party_mimalloc
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_mimalloc.git synced 2026-07-19 12:52:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-slice

Browse Source
This commit is contained in:
Daan
2021-12-15 16:05:20 -08:00
parent ae42b8bfd5 a5ba442ec0
commit 836b67b60b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mimalloc-internal.h
+2 -2
View File
@@ -854,8 +854,8 @@ static inline void mi_tls_slot_set(size_t slot, void* value) mi_attr_noexcept {
}
static inline mi_threadid_t _mi_thread_id(void) mi_attr_noexcept {
#if defined(__BIONIC__) && (defined(__arm__) || defined(__aarch64__))
// on Android, slot 1 is the thread ID (pointer to pthread internal struct)
#if defined(__arm__) || (defined(__BIONIC__) && defined(__aarch64__))
// issue #384, #495: on arm32 and arm32/arm64 Android, slot 1 is the thread ID (pointer to pthread internal struct)
return (uintptr_t)mi_tls_slot(1);
#else
// in all our other targets, slot 0 is the pointer to the thread control block