Use mimalloc to fix musl performance issues

6 files changed, 46 insertions, 30 deletions

diff --git a/TARGETS b/TARGETS
index fa600b0..ace854f 100644
--- a/TARGETS
+++ b/TARGETS
@@ -18,19 +18,23 @@
   , "arguments_config": ["CONFIG_TARGET", "TOOLCHAIN_CONFIG"]
   , "target": {"type": "var", "name": "CONFIG_TARGET"}
   , "config":
-    { "type": "singleton_map"
-    , "key": "TOOLCHAIN_CONFIG"
-    , "value":
-      { "type": "map_union"
-      , "$1":
-        [ {"type": "singleton_map", "key": "FAMILY", "value": "gnu"}
-        , {"type": "singleton_map", "key": "STATIC_RUNLIBS", "value": true}
-        , { "type": "var"
-          , "name": "TOOLCHAIN_CONFIG"
-          , "default": {"type": "empty_map"}
+    { "type": "let*"
+    , "bindings":
+      [ ["FINAL_LDFLAGS", ["-l:mimalloc.o"]]
+      , [ "TOOLCHAIN_CONFIG"
+        , { "type": "map_union"
+          , "$1":
+            [ {"type": "singleton_map", "key": "FAMILY", "value": "gnu"}
+            , {"type": "singleton_map", "key": "STATIC_RUNLIBS", "value": true}
+            , { "type": "var"
+              , "name": "TOOLCHAIN_CONFIG"
+              , "default": {"type": "empty_map"}
+              }
+            ]
           }
         ]
-      }
+      ]
+    , "body": {"type": "env", "vars": ["FINAL_LDFLAGS", "TOOLCHAIN_CONFIG"]}
     }
   }
 }
diff --git a/etc/repos.json b/etc/repos.json
index 4eaa779..2711a89 100644
--- a/etc/repos.json
+++ b/etc/repos.json
@@ -53,6 +53,7 @@
       , "mpc": "imported-toolchain/imports/mpc-1.3.1"
       , "mpfr": "imported-toolchain/imports/mpfr-4.2.1"
       , "gcc": "imported-toolchain/compilers/gcc-13.2.0-native"
+      , "mimalloc": "imported-toolchain/imports/mimalloc-2.1.2"
       }
     }
   , "imported-toolchain/compilers/gcc-13.2.0-native":
@@ -140,6 +141,17 @@
     , "target_root": "imported-toolchain/imports"
     , "target_file_name": "files.TARGETS"
     }
+  , "imported-toolchain/imports/mimalloc-2.1.2":
+    { "repository":
+      { "type": "archive"
+      , "content": "da9d9ced476e35074380f3e240b59970dc443cd8"
+      , "fetch": "https://github.com/microsoft/mimalloc/archive/refs/tags/v2.1.2.tar.gz"
+      , "sha256": "2b1bff6f717f9725c70bf8d79e4786da13de8a270059e4ba0bdd262ae7be46eb"
+      , "subdir": "mimalloc-2.1.2"
+      }
+    , "target_root": "imported-toolchain/imports"
+    , "target_file_name": "files.TARGETS"
+    }
   , "imported-toolchain/imports/mpc-1.3.1":
     { "repository":
       { "type": "archive"
@@ -259,7 +271,7 @@
       { "type": "git"
       , "repository": "https://github.com/just-buildsystem/bootstrappable-toolchain"
       , "branch": "master"
-      , "commit": "1dd86efdebb18ebf099396f45b366677b66a5cfd"
+      , "commit": "67e7ba44cf7cf845cbb7f0f41e423ed3b9f1d7c6"
       , "subdir": "etc/patches"
       }
     }
@@ -469,7 +481,7 @@
       { "type": "git"
       , "repository": "https://github.com/just-buildsystem/bootstrappable-toolchain"
       , "branch": "master"
-      , "commit": "1dd86efdebb18ebf099396f45b366677b66a5cfd"
+      , "commit": "67e7ba44cf7cf845cbb7f0f41e423ed3b9f1d7c6"
       , "subdir": "src/bootstrap"
       }
     }
@@ -478,7 +490,7 @@
       { "type": "git"
       , "repository": "https://github.com/just-buildsystem/bootstrappable-toolchain"
       , "branch": "master"
-      , "commit": "1dd86efdebb18ebf099396f45b366677b66a5cfd"
+      , "commit": "67e7ba44cf7cf845cbb7f0f41e423ed3b9f1d7c6"
       , "subdir": "src/compilers"
       }
     }
@@ -487,7 +499,7 @@
       { "type": "git"
       , "repository": "https://github.com/just-buildsystem/bootstrappable-toolchain"
       , "branch": "master"
-      , "commit": "1dd86efdebb18ebf099396f45b366677b66a5cfd"
+      , "commit": "67e7ba44cf7cf845cbb7f0f41e423ed3b9f1d7c6"
       , "subdir": "etc/defaults"
       }
     }
@@ -496,7 +508,7 @@
       { "type": "git"
       , "repository": "https://github.com/just-buildsystem/bootstrappable-toolchain"
       , "branch": "master"
-      , "commit": "1dd86efdebb18ebf099396f45b366677b66a5cfd"
+      , "commit": "67e7ba44cf7cf845cbb7f0f41e423ed3b9f1d7c6"
       , "subdir": "etc/imports"
       }
     }
@@ -505,7 +517,7 @@
       { "type": "git"
       , "repository": "https://github.com/just-buildsystem/bootstrappable-toolchain"
       , "branch": "master"
-      , "commit": "1dd86efdebb18ebf099396f45b366677b66a5cfd"
+      , "commit": "67e7ba44cf7cf845cbb7f0f41e423ed3b9f1d7c6"
       , "subdir": "toolchains"
       }
     }
@@ -514,7 +526,7 @@
       { "type": "git"
       , "repository": "https://github.com/just-buildsystem/bootstrappable-toolchain"
       , "branch": "master"
-      , "commit": "1dd86efdebb18ebf099396f45b366677b66a5cfd"
+      , "commit": "67e7ba44cf7cf845cbb7f0f41e423ed3b9f1d7c6"
       , "subdir": "src/tools"
       }
     }
diff --git a/hashes/arm64.GITBLOBIDS b/hashes/arm64.GITBLOBIDS
index f4777e3..5b25288 100644
--- a/hashes/arm64.GITBLOBIDS
+++ b/hashes/arm64.GITBLOBIDS
@@ -1,12 +1,12 @@
 {
   "bin/just": {
     "file_type": "x",
-    "id": "ffd6f0740af52d6d49369cae50c383e9b7df07ed",
-    "size": 20439968
+    "id": "9d66702dd0b2910b2b6aa8a6f13a5ecf3253aad6",
+    "size": 20592208
   },
   "bin/just-mr": {
     "file_type": "x",
-    "id": "648a9142a8b7ebde102cfb55e4b2c4bae88a26d8",
-    "size": 12494272
+    "id": "379f673217b93012816ffd74c891a154e1ba070a",
+    "size": 12648424
   }
 }
diff --git a/hashes/arm64.SHA256SUMS b/hashes/arm64.SHA256SUMS
index 05d0822..8d8d707 100644
--- a/hashes/arm64.SHA256SUMS
+++ b/hashes/arm64.SHA256SUMS
@@ -1,2 +1,2 @@
-f32a6bff194c56c24b9105ad89fc16c07ed1afae4e45f1419d246a53e670742e  bin/just
-44ad7785a7d7d01a2542286413f0c3eaa316c0c7893729ed64e0c4806471bb94  bin/just-mr
+9bdc8a3dfd9918e4a701f9571011bac724429ac4b5c869a71422f3de6b134b71  bin/just
+b1a84ff2bbc71334f589b21a9ef98d0b6d5381a8f5d5bbf977c9be2b2c5f98dd  bin/just-mr
diff --git a/hashes/x86_64.GITBLOBIDS b/hashes/x86_64.GITBLOBIDS
index 9db2936..94c5b89 100644
--- a/hashes/x86_64.GITBLOBIDS
+++ b/hashes/x86_64.GITBLOBIDS
@@ -1,12 +1,12 @@
 {
   "bin/just": {
     "file_type": "x",
-    "id": "2b7e6a855225a159cf26b2cfc38e059a544c5a93",
-    "size": 22228824
+    "id": "c4f8d5dff5f01435beef3c34c215291ac334d44f",
+    "size": 22349328
   },
   "bin/just-mr": {
     "file_type": "x",
-    "id": "9bf46cda138cf03d99f319f80e3d3ce5a83408a1",
-    "size": 13354216
+    "id": "e2025d148cdf83498fb458ef809416ee6969684c",
+    "size": 13479888
   }
 }
diff --git a/hashes/x86_64.SHA256SUMS b/hashes/x86_64.SHA256SUMS
index 06626ea..1a53bae 100644
--- a/hashes/x86_64.SHA256SUMS
+++ b/hashes/x86_64.SHA256SUMS
@@ -1,2 +1,2 @@
-ab7f306729767bf303d8780d936ca7687303bb0891b9a5e2f53ef825878a2fdb  bin/just
-f63472619dde297e099171caa0786f3bfe4a51b680992067de35d15693060810  bin/just-mr
+a3f7b0e0ea93240d1a01ec74c52344207589fb742b9fd7f20d39590c9e66c91f  bin/just
+3c09d74c1c80d48c59599fc39f9584f4f941fdf75047742f8ee5c97ec2024f3e  bin/just-mr