aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2024-08-16 13:46:54 +0200
committerGitHub Enterprise <[email protected]>2024-08-16 13:46:54 +0200
commit8a4f0f0303c39bb6215839509479e2629f61d2f7 (patch)
treebbcd2a17f18a0f320e34057c4cdd4b625f796f8b
parent5.5.4-pre3 (diff)
downloadzen-8a4f0f0303c39bb6215839509479e2629f61d2f7.tar.xz
zen-8a4f0f0303c39bb6215839509479e2629f61d2f7.zip
enable mimalloc on arm64 (#120)
* enable mimalloc on arm64
-rw-r--r--CHANGELOG.md1
-rw-r--r--xmake.lua18
2 files changed, 9 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ad3dc3c2..04f0f5550 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
- Improvement: Retry writing GC state if it fails to handle transient problems
- Improvement: If GC operation fails we report an error, after that errors are demoted to warnings until we manage to do a successful GC run. This is to reduce spam on Sentry.
- Improvement: Removed stats for CId entries when doing GCv2 without cleaning up CId references
+- Improvement: Enabled mimalloc on arm64
- Improvement: Enabled Sentry support on arm64
## 5.5.3
diff --git a/xmake.lua b/xmake.lua
index 62c02c629..d7221711e 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -39,16 +39,14 @@ if is_plat("windows") then
add_requires("7z")
end
- if has_config("zensentry") then
- if is_plat("linux") then
- add_requires("vcpkg::sentry-native 0.5.4")
- else
- add_requires("vcpkg::sentry-native")
- end
- end
+add_requires("vcpkg::mimalloc")
-if not is_arch("arm64") then
- add_requires("vcpkg::mimalloc")
+if has_config("zensentry") then
+ if is_plat("linux") then
+ add_requires("vcpkg::sentry-native 0.5.4")
+ else
+ add_requires("vcpkg::sentry-native")
+ end
end
add_rules("mode.debug", "mode.release")
@@ -124,6 +122,7 @@ if not is_arch("arm64") then
set_description("Enables Sentry support in Zen")
option_end()
add_define_by_config("ZEN_USE_SENTRY", "zensentry")
+end
option("zenmimalloc")
set_default(true)
@@ -131,7 +130,6 @@ if not is_arch("arm64") then
set_description("Use MiMalloc as Zen's allocator")
option_end()
add_define_by_config("ZEN_USE_MIMALLOC", "zenmimalloc")
-end
if is_os("windows") then
option("httpsys")