Merge fe47ec625d into 951538d469

fix recursion in TLS init on Android
2025-05-03 22:19:32 +03:00 · 2025-04-08 14:01:35 -07:00 · 2025-03-31 15:51:53 -07:00
1 changed files with 2 additions and 2 deletions
--- a/src/options.c
+++ b/src/options.c
@ -425,14 +425,14 @@ static mi_decl_noinline void mi_recurse_exit_prim(void) {
 }

 static bool mi_recurse_enter(void) {
-  #if defined(__APPLE__) || defined(MI_TLS_RECURSE_GUARD)
+  #if defined(__APPLE__) || defined(__ANDROID__) || defined(MI_TLS_RECURSE_GUARD)
  if (_mi_preloading()) return false;
  #endif
  return mi_recurse_enter_prim();
 }

 static void mi_recurse_exit(void) {
-  #if defined(__APPLE__) || defined(MI_TLS_RECURSE_GUARD)
+  #if defined(__APPLE__) || defined(__ANDROID__) || defined(MI_TLS_RECURSE_GUARD)
  if (_mi_preloading()) return;
  #endif
  mi_recurse_exit_prim();
Author	SHA1	Message	Date
Eduard Voronkin	99f886bdb1	Merge `fe47ec625d` into `951538d469`	2025-04-08 14:01:35 -07:00
Eduard Voronkin	fe47ec625d	fix recursion in TLS init on Android	2025-03-31 15:51:53 -07:00