u

Author: shulaoda

libmimalloc-sys/build.rs

@@ -55,9 +55,47 @@ fn patch_apple_tls_model_for_v3() {
         return;
     }
 
-    const OLD: &str = "#if defined(_WIN32)\n  #define MI_TLS_MODEL_DYNAMIC_WIN32        1    \n#elif defined(__APPLE__) && MI_HAS_TLS_SLOT && !defined(__POWERPC__)  // macOS on arm64 or x64\n  // #define MI_TLS_MODEL_DYNAMIC_PTHREADS  1    // also works but a bit slower\n  #define MI_TLS_MODEL_FIXED_SLOT           1\n  #define MI_TLS_MODEL_FIXED_SLOT_DEFAULT   108  // seems unused. @apple: it would be great to get 2 official slots for custom allocators :-)\n  #define MI_TLS_MODEL_FIXED_SLOT_CACHED    109\n  // we used before __PTK_FRAMEWORK_OLDGC_KEY9 (89) but that seems used now.\n  // see <https://github.com/rweichler/substrate/blob/master/include/pthread_machdep.h>\n#elif defined(__APPLE__) || defined(__OpenBSD__) || defined(__ANDROID__)\n  #define MI_TLS_MODEL_DYNAMIC_PTHREADS     1\n  // #define MI_TLS_MODEL_DYNAMIC_PTHREADS_DEFAULT_ENTRY_IS_NULL  1\n#else\n  #define MI_TLS_MODEL_THREAD_LOCAL         1\n#endif";
+    // The block we're looking for in upstream's prim.h (v3.3.2).
+    // Each line is a separate string literal joined by concat! — preserves
+    // exact whitespace (including trailing spaces) and is immune to editor
+    // "trim trailing whitespace" settings.
+    const OLD: &str = concat!(
+        "#if defined(_WIN32)\n",
+        "  #define MI_TLS_MODEL_DYNAMIC_WIN32        1    \n",
+        "#elif defined(__APPLE__) && MI_HAS_TLS_SLOT && !defined(__POWERPC__)  // macOS on arm64 or x64\n",
+        "  // #define MI_TLS_MODEL_DYNAMIC_PTHREADS  1    // also works but a bit slower\n",
+        "  #define MI_TLS_MODEL_FIXED_SLOT           1\n",
+        "  #define MI_TLS_MODEL_FIXED_SLOT_DEFAULT   108  // seems unused. @apple: it would be great to get 2 official slots for custom allocators :-)\n",
+        "  #define MI_TLS_MODEL_FIXED_SLOT_CACHED    109\n",
+        "  // we used before __PTK_FRAMEWORK_OLDGC_KEY9 (89) but that seems used now.\n",
+        "  // see <https://github.com/rweichler/substrate/blob/master/include/pthread_machdep.h>\n",
+        "#elif defined(__APPLE__) || defined(__OpenBSD__) || defined(__ANDROID__)\n",
+        "  #define MI_TLS_MODEL_DYNAMIC_PTHREADS     1\n",
+        "  // #define MI_TLS_MODEL_DYNAMIC_PTHREADS_DEFAULT_ENTRY_IS_NULL  1\n",
+        "#else\n",
+        "  #define MI_TLS_MODEL_THREAD_LOCAL         1\n",
+        "#endif",
+    );
 
-    const NEW: &str = "#if defined(_WIN32)\n  #define MI_TLS_MODEL_DYNAMIC_WIN32        1\n// --- mimalloc-safe vendor patch: Apple uses THREAD_LOCAL + RECURSE_GUARD ---\n// See libmimalloc-sys/build.rs::patch_apple_tls_model_for_v3 for rationale.\n#elif defined(__APPLE__) && !defined(__POWERPC__)  // macOS on arm64 or x64\n  #define MI_TLS_MODEL_THREAD_LOCAL         1\n  #ifndef MI_TLS_RECURSE_GUARD\n  #define MI_TLS_RECURSE_GUARD              1\n  #endif\n// --- end mimalloc-safe vendor patch ---\n#elif defined(__OpenBSD__) || defined(__ANDROID__)\n  #define MI_TLS_MODEL_DYNAMIC_PTHREADS     1\n  // #define MI_TLS_MODEL_DYNAMIC_PTHREADS_DEFAULT_ENTRY_IS_NULL  1\n#else\n  #define MI_TLS_MODEL_THREAD_LOCAL         1\n#endif";
+    // Replacement: route Apple to THREAD_LOCAL + RECURSE_GUARD.
+    const NEW: &str = concat!(
+        "#if defined(_WIN32)\n",
+        "  #define MI_TLS_MODEL_DYNAMIC_WIN32        1\n",
+        "// --- mimalloc-safe vendor patch: Apple uses THREAD_LOCAL + RECURSE_GUARD ---\n",
+        "// See libmimalloc-sys/build.rs::patch_apple_tls_model_for_v3 for rationale.\n",
+        "#elif defined(__APPLE__) && !defined(__POWERPC__)  // macOS on arm64 or x64\n",
+        "  #define MI_TLS_MODEL_THREAD_LOCAL         1\n",
+        "  #ifndef MI_TLS_RECURSE_GUARD\n",
+        "  #define MI_TLS_RECURSE_GUARD              1\n",
+        "  #endif\n",
+        "// --- end mimalloc-safe vendor patch ---\n",
+        "#elif defined(__OpenBSD__) || defined(__ANDROID__)\n",
+        "  #define MI_TLS_MODEL_DYNAMIC_PTHREADS     1\n",
+        "  // #define MI_TLS_MODEL_DYNAMIC_PTHREADS_DEFAULT_ENTRY_IS_NULL  1\n",
+        "#else\n",
+        "  #define MI_TLS_MODEL_THREAD_LOCAL         1\n",
+        "#endif",
+    );
 
     assert!(
         content.contains(OLD),