mimalloc: update to 3.3.1

This commit is contained in:
Mohamed Akram
2026-04-21 21:35:04 +04:00
parent ce22eb8669
commit cd4f7dffbd
3 changed files with 5 additions and 69 deletions
+5 -7
View File
@@ -8,7 +8,7 @@ PortGroup legacysupport 1.1
# arc4random, strndup
legacysupport.newest_darwin_requires_legacy 10
github.setup microsoft mimalloc 3.3.0 v
github.setup microsoft mimalloc 3.3.1 v
github.tarball_from archive
revision 0
@@ -22,13 +22,11 @@ description mimalloc is a compact general purpose allocator with \
long_description mimalloc is a general purpose allocator with excellent \
performance characteristics.
checksums rmd160 c1d34a2c3f43d88f08881636e4125f6bf704df49 \
sha256 cf227295c307efc6f16e90c485595f9bb91c5a5532a3000f81f08907f8fc56a2 \
size 1405778
checksums rmd160 406c68696826b8d86acce630af51cfe4e08f8cc5 \
sha256 42c16914168ac6741eeb407e83b93a12b2b7ee25a7e14e6b4807fab8b577a540 \
size 1408642
patchfiles patch-cmake.diff \
patch-alloc-override.diff \
patch-include-mimalloc-prim.diff
patchfiles patch-cmake.diff
compiler.c_standard 2011
compiler.cxx_standard 2017
@@ -1,32 +0,0 @@
From e5a36acbc9fc6a747effba1e618e2fd6ee69db98 Mon Sep 17 00:00:00 2001
From: Daan <daanl@outlook.com>
Date: Fri, 17 Apr 2026 11:56:56 -0700
Subject: [PATCH] potential fix for build on older macOS, issue #1270
---
src/alloc-override.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/alloc-override.c b/src/alloc-override.c
index f1d8e8fb..844a5335 100644
--- src/alloc-override.c
+++ src/alloc-override.c
@@ -92,12 +92,12 @@ typedef void* mi_nothrow_t;
MI_INTERPOSE_FUN(vfree,mi_cfree),
#endif
};
- MI_INTERPOSE_DECLS(_mi_interposes_10_7) __OSX_AVAILABLE(10.7) = {
- MI_INTERPOSE_MI(strndup),
- };
- MI_INTERPOSE_DECLS(_mi_interposes_10_15) __OSX_AVAILABLE(10.15) = {
- MI_INTERPOSE_MI(aligned_alloc),
- };
+ #if defined(MAC_OS_X_VERSION_10_7) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)
+ MI_INTERPOSE_DECLS(_mi_interposes_10_7) = { MI_INTERPOSE_MI(strndup) };
+ #endif
+ #if defined(MAC_OS_X_VERSION_10_15) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_15)
+ MI_INTERPOSE_DECLS(_mi_interposes_10_15) = { MI_INTERPOSE_MI(aligned_alloc) };
+ #endif
#ifdef __cplusplus
extern "C" {
@@ -1,30 +0,0 @@
From 4e6a5559bf1381cd0c87058c5f320400040d0cb5 Mon Sep 17 00:00:00 2001
From: Daan <daanl@outlook.com>
Date: Sat, 18 Apr 2026 10:57:10 -0700
Subject: [PATCH] potential fix for build for macOS on i386 (issue #1270)
---
include/mimalloc/prim.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/mimalloc/prim.h b/include/mimalloc/prim.h
index 089d3030..077a503c 100644
--- include/mimalloc/prim.h.orig 2026-04-16 02:16:35
+++ include/mimalloc/prim.h 2026-04-18 22:06:31
@@ -363,14 +363,14 @@
#if defined(_WIN32)
#define MI_TLS_MODEL_DYNAMIC_WIN32 1
-#elif defined(__APPLE__) // macOS
+#elif defined(__APPLE__) && MI_HAS_TLS_SLOT && !defined(__POWERPC__) // macOS on arm64 or x64
// #define MI_TLS_MODEL_DYNAMIC_PTHREADS 1 // also works but a bit slower
#define MI_TLS_MODEL_FIXED_SLOT 1
#define MI_TLS_MODEL_FIXED_SLOT_DEFAULT 108 // seems unused. @apple: it would be great to get 2 official slots for custom allocators :-)
#define MI_TLS_MODEL_FIXED_SLOT_CACHED 109
// we used before __PTK_FRAMEWORK_OLDGC_KEY9 (89) but that seems used now.
// see <https://github.com/rweichler/substrate/blob/master/include/pthread_machdep.h>
-#elif defined(__OpenBSD__) || defined(__ANDROID__)
+#elif defined(__APPLE__) || defined(__OpenBSD__) || defined(__ANDROID__)
#define MI_TLS_MODEL_DYNAMIC_PTHREADS 1
// #define MI_TLS_MODEL_DYNAMIC_PTHREADS_DEFAULT_ENTRY_IS_NULL 1
#else