mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 02:29:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jim wang 2024-10-29 20:27:34 +00:00 committed by GitHub
parent 8313d8ee76
commit c54f02999b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/mimalloc/fix-param.patch Normal file
View File

@ -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
ports/mimalloc/portfile.cmake
View File

@ -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

1
ports/mimalloc/vcpkg.json
View File

@ -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",

2
versions/baseline.json
View File

@ -5910,7 +5910,7 @@
},
"mimalloc": {
"baseline": "2.1.7",
"port-version": 0
"port-version": 1
},
"mimicpp": {
"baseline": "4",

5
versions/m-/mimalloc.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7c5bd4a682e8abd9ad95f184c32040d4fed94dfb",
"version": "2.1.7",
"port-version": 1
},
{
"git-tree": "36add89e108365f4632d31d0ff7cc877101a9fad",
"version": "2.1.7",