diff --git a/ports/mimalloc/fix-param.patch b/ports/mimalloc/fix-param.patch new file mode 100644 index 0000000000..e4c40afca0 --- /dev/null +++ b/ports/mimalloc/fix-param.patch @@ -0,0 +1,13 @@ +diff --git a/src/arena.c b/src/arena.c +index 648ee84..ee55989 100644 +--- a/src/arena.c ++++ b/src/arena.c +@@ -794,7 +794,7 @@ bool _mi_arena_segment_clear_abandoned(mi_segment_t* segment ) + // clears the thread_id. + void _mi_arena_segment_mark_abandoned(mi_segment_t* segment) + { +- mi_atomic_store_release(&segment->thread_id, 0); ++ mi_atomic_store_release(&segment->thread_id, (uintptr_t)0); + mi_assert_internal(segment->used == segment->abandoned); + if (segment->memid.memkind != MI_MEM_ARENA) { + // not in an arena; count it as abandoned and return diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake index 38fdd79acf..1b569f14f4 100644 --- a/ports/mimalloc/portfile.cmake +++ b/ports/mimalloc/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-cmake.patch add_ref_to_page_malloc_zero.patch + fix-param.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/mimalloc/vcpkg.json b/ports/mimalloc/vcpkg.json index 7bd68d2540..2a6c73211a 100644 --- a/ports/mimalloc/vcpkg.json +++ b/ports/mimalloc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mimalloc", "version": "2.1.7", + "port-version": 1, "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 02b6abad2f..b0d7f52f97 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5910,7 +5910,7 @@ }, "mimalloc": { "baseline": "2.1.7", - "port-version": 0 + "port-version": 1 }, "mimicpp": { "baseline": "4", diff --git a/versions/m-/mimalloc.json b/versions/m-/mimalloc.json index d6764267c9..164863a418 100644 --- a/versions/m-/mimalloc.json +++ b/versions/m-/mimalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c5bd4a682e8abd9ad95f184c32040d4fed94dfb", + "version": "2.1.7", + "port-version": 1 + }, { "git-tree": "36add89e108365f4632d31d0ff7cc877101a9fad", "version": "2.1.7",