From 6da08d28671b3840e77224cd441a031913431d48 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 13 May 2024 22:14:17 -0400
Subject: [PATCH 1/2] mimalloc: update to 2.1.6

---
 srcpkgs/mimalloc/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mimalloc/template b/srcpkgs/mimalloc/template
index 3f098c48245f89..41b861db6d2a9d 100644
--- a/srcpkgs/mimalloc/template
+++ b/srcpkgs/mimalloc/template
@@ -1,6 +1,6 @@
 # Template file for 'mimalloc'
 pkgname=mimalloc
-version=2.1.2
+version=2.1.6
 revision=1
 build_style=cmake
 configure_args="$(vopt_bool secure MI_SECURE)"
@@ -8,13 +8,17 @@ short_desc="General purpose allocator with excellent performance characteristics
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="MIT"
 homepage="https://github.com/microsoft/mimalloc"
-distfiles="https://github.com/microsoft/mimalloc/archive/v${version}.tar.gz"
-checksum=2b1bff6f717f9725c70bf8d79e4786da13de8a270059e4ba0bdd262ae7be46eb
+distfiles="https://github.com/microsoft/mimalloc/archive/refs/tags/v${version}.tar.gz"
+checksum=0ec960b656f8623de35012edacb988f8edcc4c90d2ce6c19f1d290fbb4872ccc
 
 build_options="secure"
 build_options_default="secure"
 desc_option_secure="Build mimalloc in secure mode"
 
+if [ "${XBPS_TARGET_LIBC}" = "musl" ]; then
+	configure_args+=" MI_LIBC_MUSL=ON"
+fi
+
 post_install() {
 	vlicense LICENSE
 }

From 1598fdacdf9a1cd48d6df6e152be9b9d670a6493 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 13 May 2024 22:41:38 -0400
Subject: [PATCH 2/2] mold: update to 2.31.0

---
 srcpkgs/mold/patches/fix-arm-yield.patch | 24 ++++++++++++++++++++++++
 srcpkgs/mold/template                    |  4 ++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/mold/patches/fix-arm-yield.patch

diff --git a/srcpkgs/mold/patches/fix-arm-yield.patch b/srcpkgs/mold/patches/fix-arm-yield.patch
new file mode 100644
index 00000000000000..817b56be331377
--- /dev/null
+++ b/srcpkgs/mold/patches/fix-arm-yield.patch
@@ -0,0 +1,24 @@
+From 4510f4af81e65544fcd02826f253d3dc9e7fae9e Mon Sep 17 00:00:00 2001
+From: Rui Ueyama <ruiu@cs.stanford.edu>
+Date: Sat, 4 May 2024 13:05:00 +0900
+Subject: [PATCH] Use `pause` instruction on ARM7 and ARM8
+
+https://github.com/rui314/mold/issues/1250
+---
+ common/common.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/common/common.h b/common/common.h
+index 72dc34ff1..a9a52d6c5 100644
+--- a/common/common.h
++++ b/common/common.h
+@@ -528,6 +528,8 @@ static inline void pause() {
+   asm volatile("pause");
+ #elif defined(__aarch64__)
+   asm volatile("yield");
++#elif defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__)
++  asm volatile("yield");
+ #endif
+ }
+ 
+
diff --git a/srcpkgs/mold/template b/srcpkgs/mold/template
index d898e1b1119d19..d20d757eab534d 100644
--- a/srcpkgs/mold/template
+++ b/srcpkgs/mold/template
@@ -1,6 +1,6 @@
 # Template file for 'mold'
 pkgname=mold
-version=2.4.1
+version=2.31.0
 revision=1
 build_style=cmake
 configure_args="-DMOLD_USE_SYSTEM_MIMALLOC=ON -DMOLD_USE_SYSTEM_TBB=ON"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://github.com/rui314/mold"
 changelog="https://github.com/rui314/mold/releases"
 distfiles="https://github.com/rui314/mold/archive/refs/tags/v${version}.tar.gz"
-checksum=c9853d007d6a1b4f3e36b7314346751f4cc91bc43c76e30db51709b53b44dd68
+checksum=3dc3af83a5d22a4b29971bfad17261851d426961c665480e2ca294e5c74aa1e5
 
 post_install() {
 	vlicense LICENSE