Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mimalloc] Fix build error on x64-android #41694

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/mimalloc/fix-param.patch
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions ports/mimalloc/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ports/mimalloc/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5890,7 +5890,7 @@
},
"mimalloc": {
"baseline": "2.1.7",
"port-version": 0
"port-version": 1
},
"minc": {
"baseline": "2.4.03",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/mimalloc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7c5bd4a682e8abd9ad95f184c32040d4fed94dfb",
"version": "2.1.7",
"port-version": 1
},
{
"git-tree": "36add89e108365f4632d31d0ff7cc877101a9fad",
"version": "2.1.7",
Expand Down