musl: upgrade to version 1.2.2.

5 files changed, 19 insertions, 4 deletions

diff --git a/groups.d/030.host_toolchain.group b/groups.d/030.host_toolchain.group
index 0e2372eb..f1055fcb 100644
--- a/groups.d/030.host_toolchain.group
+++ b/groups.d/030.host_toolchain.group
@@ -106,8 +106,8 @@ HOST_TOOLCHAIN_RPM_DISABLE=1;
 : ${PKG_MPFR_HOST_CONFIGURE_ARGS:="--disable-assembly --disable-nls --prefix= --with-gmp=${PREFIX}"};
 : ${PKG_MPFR_HOST_PREFIX:=${PREFIX}};
 : ${PKG_MUSL_FULL_HOST_DEPENDS:="gcc_stage1_host gcc_runtime_host"};
-: ${PKG_MUSL_FULL_HOST_SHA256SUM:=68af6e18539f646f9c41a3a2bb25be4a5cfa5a8f65f0bb647fd2bbfdf877e84b};
-: ${PKG_MUSL_FULL_HOST_VERSION:=1.2.1};
+: ${PKG_MUSL_FULL_HOST_SHA256SUM:=9b969322012d796dc23dda27a35866034fa67d8fb67e0e2c45c913c3d43219dd};
+: ${PKG_MUSL_FULL_HOST_VERSION:=1.2.2};
 : ${PKG_MUSL_FULL_HOST_URL:="http://www.musl-libc.org/releases/musl-${PKG_MUSL_FULL_HOST_VERSION}.tar.gz"}
 : ${PKG_MUSL_FULL_HOST_URLS_GIT:="mmglue=${DEFAULT_GITROOT}/mmglue@main"};
 : ${PKG_MUSL_FULL_HOST_BASE_DIR:=${BUILD_WORKDIR}/musl_full-host-${DEFAULT_TARGET}};
diff --git a/groups.d/110.native_toolchain.group b/groups.d/110.native_toolchain.group
index 7713e019..470bc496 100644
--- a/groups.d/110.native_toolchain.group
+++ b/groups.d/110.native_toolchain.group
@@ -60,8 +60,8 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_MPFR_URL:=ftp://ftp.gnu.org/gnu/mpfr/mpfr-${PKG_MPFR_VERSION}.tar.bz2};
 : ${PKG_MPFR_CONFIGURE_ARGS_EXTRA:="--disable-assembly --with-gmp=${PREFIX_NATIVE}"};
 : ${PKG_MUSL_FULL_DEPENDS:="binutils"};
-: ${PKG_MUSL_FULL_SHA256SUM:=68af6e18539f646f9c41a3a2bb25be4a5cfa5a8f65f0bb647fd2bbfdf877e84b};
-: ${PKG_MUSL_FULL_VERSION:=1.2.1};
+: ${PKG_MUSL_FULL_SHA256SUM:=9b969322012d796dc23dda27a35866034fa67d8fb67e0e2c45c913c3d43219dd};
+: ${PKG_MUSL_FULL_VERSION:=1.2.2};
 : ${PKG_MUSL_FULL_URL:="http://www.musl-libc.org/releases/musl-${PKG_MUSL_FULL_VERSION}.tar.gz"}
 : ${PKG_MUSL_FULL_URLS_GIT:="mmglue=${DEFAULT_GITROOT}/mmglue@main"};
 : ${PKG_MUSL_FULL_BASE_DIR:=${BUILD_WORKDIR}/musl_full-native-${DEFAULT_TARGET}};
diff --git a/patches/musl_full-1.2.2.local.patch b/patches/musl_full-1.2.2.local.patch
new file mode 120000
index 00000000..76f1e126
--- /dev/null
+++ b/patches/musl_full-1.2.2.local.patch
@@ -0,0 +1 @@
+musl_no_complex_host-1.2.2.local.patch
\ No newline at end of file
diff --git a/patches/musl_full_host-1.2.2.local.patch b/patches/musl_full_host-1.2.2.local.patch
new file mode 120000
index 00000000..76f1e126
--- /dev/null
+++ b/patches/musl_full_host-1.2.2.local.patch
@@ -0,0 +1 @@
+musl_no_complex_host-1.2.2.local.patch
\ No newline at end of file
diff --git a/patches/musl_no_complex_host-1.2.2.local.patch b/patches/musl_no_complex_host-1.2.2.local.patch
new file mode 100644
index 00000000..c2f78fe6
--- /dev/null
+++ b/patches/musl_no_complex_host-1.2.2.local.patch
@@ -0,0 +1,13 @@
+diff --git a/src/math/sqrtl.c b/src/math/sqrtl.c
+index 1b9f19c7..0a8efb9f 100644
+--- musl-1.2.2.orig/src/math/sqrtl.c
++++ musl-1.2.2/src/math/sqrtl.c
+@@ -227,7 +227,7 @@ long double sqrtl(long double x)
+ 	r = mul64(u, r) << 1;
+ 	/* |r sqrt(m) - 1| < 0x1.c001p-59, switch to 128bit */
+ 
+-	static const u128 threel = {.hi=three<<32, .lo=0};
++	static const u128 threel = {.hi=(uint64_t)0xc0000000<<32, .lo=0};
+ 	u128 rl, sl, dl, ul;
+ 	rl.hi = r;
+ 	rl.lo = 0;