Merge fe47ec625d into 951538d469

fix prctl.h includes for alpine linux/musl (hopefully fixes #1065 , #1066 , #1067 )
fix recursion in TLS init on Android
2025-05-03 22:19:32 +03:00 · 2025-04-08 14:01:35 -07:00 · 2025-04-08 13:56:31 -07:00 · 2025-03-31 15:51:53 -07:00
2 changed files with 5 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();
--- a/src/prim/unix/prim.c
+++ b/src/prim/unix/prim.c
@ -32,6 +32,9 @@ terms of the MIT license. A copy of the license can be found in the file
 #if defined(__linux__)
  #include <features.h>
  #include <sys/prctl.h>    // THP disable, PR_SET_VMA
+  #if !defined(PR_SET_VMA)
+  #include <linux/prctl.h>
+  #endif
  #if defined(__GLIBC__)
  #include <linux/mman.h>   // linux mmap flags
  #else
Author	SHA1	Message	Date
Eduard Voronkin	99f886bdb1	Merge `fe47ec625d` into `951538d469`	2025-04-08 14:01:35 -07:00
Daan	951538d469	fix prctl.h includes for alpine linux/musl (hopefully fixes #1065 , #1066 , #1067 )	2025-04-08 13:56:31 -07:00
Eduard Voronkin	fe47ec625d	fix recursion in TLS init on Android	2025-03-31 15:51:53 -07:00