musl: Upgrade to 1.2.6

Drop upstreamed patch for riscv syscall wirings

brings following changes

* 9fa28ece release 1.2.6
* 1347154c vdso: add support for GNU hash tables
* 149d8729 getgr*: validate group member lists from nscd backend
* 19f9aeaa sys/mman.h: add MADV_COLLAPSE from linux v6.1
* 56df2e1f sys/mman.h: add MADV_DONTNEED_LOCKED from linux v6.0
* bb5693fa sys/mman.h: add MADV_POPULATE_(READ|WRITE) from linux v5.14
* 9355c443 loongarch64: add lsx and lasx regset definition
* b5146b83 loongarch64: add fpu and simd context to signal.h
* 38b00812 loongarch64: add new reloc types and NT_LOONGARCH_HW_* into elf.h
* b37d241d fenv: add missing C dummy functions for loongarch64 soft float
* 5c901bb3 update syscalls up to linux 6.19
* 4268281a getifaddr: fix typo ssl to sll
* 5c26c890 mallocng: prevent stray ';' at top-level
* 1b76ff07 s390x: shuffle register usage in __tls_get_offset to avoid r0 as address

Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/musl/musl/0001-Update-syscalls-for-r32-rv64-from-kernel-6.4-through.patch b/meta/recipes-core/musl/musl/0001-Update-syscalls-for-r32-rv64-from-kernel-6.4-through.patch
deleted file mode 100644 (file)
index 78ba903..0000000
--- a/meta/recipes-core/musl/musl/0001-Update-syscalls-for-r32-rv64-from-kernel-6.4-through.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 31dce8e958f5185e7fda653214da12bbc75f244e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 4 Dec 2024 11:16:43 -0800
-Subject: [PATCH] Update syscalls for r32/rv64 from kernel 6.4 through 6.10
-
-Upstream-Status: Submitted [https://www.openwall.com/lists/musl/2024/12/04/3]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- arch/riscv32/bits/syscall.h.in | 11 +++++++++++
- arch/riscv64/bits/syscall.h.in | 11 +++++++++++
- 2 files changed, 22 insertions(+)
-
-diff --git a/arch/riscv32/bits/syscall.h.in b/arch/riscv32/bits/syscall.h.in
-index 9228d840..a54d9ffc 100644
---- a/arch/riscv32/bits/syscall.h.in
-+++ b/arch/riscv32/bits/syscall.h.in
-@@ -216,6 +216,7 @@
- #define __NR_perf_event_open 241
- #define __NR_accept4 242
- #define __NR_arch_specific_syscall 244
-+#define __NR_riscv_hwprobe 258
- #define __NR_prlimit64 261
- #define __NR_fanotify_init 262
- #define __NR_fanotify_mark 263
-@@ -295,6 +296,16 @@
- #define __NR_cachestat                451
- #define __NR_fchmodat2                452
- #define __NR_futex __NR_futex_time64
-+#define __NR_map_shadow_stack 453
-+#define __NR_futex_wake 454
-+#define __NR_futex_wait 455
-+#define __NR_futex_requeue 456
-+#define __NR_statmount 457
-+#define __NR_listmount 458
-+#define __NR_lsm_get_self_attr 459
-+#define __NR_lsm_list_modules 461
-+#define __NR_lsm_set_self_attr 460
-+#define __NR_mseal 462
- 
- #define __NR_sysriscv __NR_arch_specific_syscall
- #define __NR_riscv_flush_icache (__NR_sysriscv + 15)
-diff --git a/arch/riscv64/bits/syscall.h.in b/arch/riscv64/bits/syscall.h.in
-index e362bd0e..6991a89c 100644
---- a/arch/riscv64/bits/syscall.h.in
-+++ b/arch/riscv64/bits/syscall.h.in
-@@ -242,6 +242,7 @@
- #define __NR_accept4 242
- #define __NR_recvmmsg 243
- #define __NR_arch_specific_syscall 244
-+#define __NR_riscv_hwprobe 258
- #define __NR_wait4 260
- #define __NR_prlimit64 261
- #define __NR_fanotify_init 262
-@@ -304,6 +305,16 @@
- #define __NR_set_mempolicy_home_node  450
- #define __NR_cachestat                451
- #define __NR_fchmodat2                452
-+#define __NR_map_shadow_stack 453
-+#define __NR_futex_wake 454
-+#define __NR_futex_wait 455
-+#define __NR_futex_requeue 456
-+#define __NR_statmount 457
-+#define __NR_listmount 458
-+#define __NR_lsm_get_self_attr 459
-+#define __NR_lsm_list_modules 461
-+#define __NR_lsm_set_self_attr 460
-+#define __NR_mseal 462
- 
- #define __NR_sysriscv __NR_arch_specific_syscall
- #define __NR_riscv_flush_icache (__NR_sysriscv + 15)

diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 3f5fa37fbadf57187a773c4c0d1b6a6819e2eb94..3aec643c40e2bce665089bc0809a876d1df108ef 100644 (file)
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -4,16 +4,15 @@
 require musl.inc
 inherit linuxloader
 
-SRCREV = "0ccaf0572e9cccda2cced0f7ee659af4c1c6679a"
+SRCREV = "9fa28ece75d8a2191de7c5bb53bed224c5947417"
 
-BASEVER = "1.2.5"
+BASEVER = "1.2.6"
 
 PV = "${BASEVER}+git"
 
 SRC_URI = "git://git.musl-libc.org/musl;branch=master \
            file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \
            file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \
-           file://0001-Update-syscalls-for-r32-rv64-from-kernel-6.4-through.patch \
           "
 
 PROVIDES += "virtual/libc virtual/libiconv virtual/libintl virtual/crypt"