mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-29 16:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #925 from TroutZhang/patch-1

Browse Source 
Fix crash on Android due to wrong TLS model
This commit is contained in:
Bartosz Taudul 2024-11-16 11:58:05 +01:00 committed by GitHub
commit 5120ad8311
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/client/tracy_rpmalloc.cpp
View File

@ -690,7 +690,9 @@ static pthread_key_t _memory_thread_heap;
# define _Thread_local __declspec(thread) # define _Thread_local __declspec(thread)
# define TLS_MODEL # define TLS_MODEL
# else # else
# ifndef __HAIKU__ # if defined(__ANDROID__) && __ANDROID_API__ >= 29 && defined(__NDK_MAJOR__) && __NDK_MAJOR__ >= 26
# define TLS_MODEL __attribute__((tls_model("local-dynamic")))
# elif !defined(__HAIKU__)
# define TLS_MODEL __attribute__((tls_model("initial-exec"))) # define TLS_MODEL __attribute__((tls_model("initial-exec")))
# else # else
# define TLS_MODEL # define TLS_MODEL