diff options
| -rw-r--r-- | groups.d/030.cross_toolchain.group | 4 | ||||
| -rw-r--r-- | groups.d/040.host_toolchain.group | 4 | ||||
| -rw-r--r-- | groups.d/110.native_toolchain.group | 4 | ||||
| l--------- | patches/musl_full-1.2.4.local.patch | 1 | ||||
| l--------- | patches/musl_full_cross-1.2.4.local.patch | 1 | ||||
| l--------- | patches/musl_full_host-1.2.4.local.patch | 1 | ||||
| l--------- | patches/musl_no_complex_cross-1.2.4.local.patch | 1 | ||||
| l--------- | patches/musl_no_complex_host-1.2.4.local.patch | 1 | ||||
| -rw-r--r-- | patches/musl_sqrtl_const_expression-1.2.4.patch | 13 |
9 files changed, 24 insertions, 6 deletions
diff --git a/groups.d/030.cross_toolchain.group b/groups.d/030.cross_toolchain.group index 8b13b27a..be1082d0 100644 --- a/groups.d/030.cross_toolchain.group +++ b/groups.d/030.cross_toolchain.group @@ -120,8 +120,8 @@ CROSS_TOOLCHAIN_RPM_DISABLE=1; : ${PKG_MPFR_CROSS_CONFIGURE_ARGS:="--disable-assembly --disable-nls --prefix= --with-gmp=${PREFIX_LOCAL}"}; : ${PKG_MPFR_CROSS_PREFIX:=${PREFIX_LOCAL}}; : ${PKG_MUSL_FULL_CROSS_DEPENDS:="gcc_stage1_cross gcc_runtime_cross"}; -: ${PKG_MUSL_FULL_CROSS_SHA256SUM:=7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4}; -: ${PKG_MUSL_FULL_CROSS_VERSION:=1.2.3}; +: ${PKG_MUSL_FULL_CROSS_SHA256SUM:=7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039}; +: ${PKG_MUSL_FULL_CROSS_VERSION:=1.2.4}; : ${PKG_MUSL_FULL_CROSS_URL:="http://www.musl-libc.org/releases/musl-${PKG_MUSL_FULL_CROSS_VERSION}.tar.gz"} : ${PKG_MUSL_FULL_CROSS_URLS_GIT:="mmglue=${DEFAULT_GITROOT}/mmglue@main"}; : ${PKG_MUSL_FULL_CROSS_BASE_DIR:=${BUILD_WORKDIR}/musl_full-cross-${DEFAULT_TARGET}}; diff --git a/groups.d/040.host_toolchain.group b/groups.d/040.host_toolchain.group index efb39b66..ea470115 100644 --- a/groups.d/040.host_toolchain.group +++ b/groups.d/040.host_toolchain.group @@ -110,8 +110,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:=7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4}; -: ${PKG_MUSL_FULL_HOST_VERSION:=1.2.3}; +: ${PKG_MUSL_FULL_HOST_SHA256SUM:=7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039}; +: ${PKG_MUSL_FULL_HOST_VERSION:=1.2.4}; : ${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 e312b690..f516563f 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:=7d5b0b6062521e4627e099e4c9dc8248d32a30285e959b7eecaa780cf8cfd4a4}; -: ${PKG_MUSL_FULL_VERSION:=1.2.3}; +: ${PKG_MUSL_FULL_SHA256SUM:=7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039}; +: ${PKG_MUSL_FULL_VERSION:=1.2.4}; : ${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.4.local.patch b/patches/musl_full-1.2.4.local.patch new file mode 120000 index 00000000..7a8ede04 --- /dev/null +++ b/patches/musl_full-1.2.4.local.patch @@ -0,0 +1 @@ +musl_sqrtl_const_expression-1.2.4.patch
\ No newline at end of file diff --git a/patches/musl_full_cross-1.2.4.local.patch b/patches/musl_full_cross-1.2.4.local.patch new file mode 120000 index 00000000..7a8ede04 --- /dev/null +++ b/patches/musl_full_cross-1.2.4.local.patch @@ -0,0 +1 @@ +musl_sqrtl_const_expression-1.2.4.patch
\ No newline at end of file diff --git a/patches/musl_full_host-1.2.4.local.patch b/patches/musl_full_host-1.2.4.local.patch new file mode 120000 index 00000000..7a8ede04 --- /dev/null +++ b/patches/musl_full_host-1.2.4.local.patch @@ -0,0 +1 @@ +musl_sqrtl_const_expression-1.2.4.patch
\ No newline at end of file diff --git a/patches/musl_no_complex_cross-1.2.4.local.patch b/patches/musl_no_complex_cross-1.2.4.local.patch new file mode 120000 index 00000000..7a8ede04 --- /dev/null +++ b/patches/musl_no_complex_cross-1.2.4.local.patch @@ -0,0 +1 @@ +musl_sqrtl_const_expression-1.2.4.patch
\ No newline at end of file diff --git a/patches/musl_no_complex_host-1.2.4.local.patch b/patches/musl_no_complex_host-1.2.4.local.patch new file mode 120000 index 00000000..7a8ede04 --- /dev/null +++ b/patches/musl_no_complex_host-1.2.4.local.patch @@ -0,0 +1 @@ +musl_sqrtl_const_expression-1.2.4.patch
\ No newline at end of file diff --git a/patches/musl_sqrtl_const_expression-1.2.4.patch b/patches/musl_sqrtl_const_expression-1.2.4.patch new file mode 100644 index 00000000..f0513f69 --- /dev/null +++ b/patches/musl_sqrtl_const_expression-1.2.4.patch @@ -0,0 +1,13 @@ +diff --git a/src/math/sqrtl.c b/src/math/sqrtl.c +index 1b9f19c7..0a8efb9f 100644 +--- musl-1.2.4.orig/src/math/sqrtl.c ++++ musl-1.2.4/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; |