[openwrt/openwrt] valgrind: Update to version 3.23
LEDE Commits
lede-commits at lists.infradead.org
Sat Oct 5 03:26:53 PDT 2024
hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/1a55d90320c169e1e45faa88e5ade69f85af1c9c
commit 1a55d90320c169e1e45faa88e5ade69f85af1c9c
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Thu Oct 3 18:24:13 2024 +0200
valgrind: Update to version 3.23
Release notes:
https://valgrind.org/docs/manual/dist.news.html
The patch `130-fix_arm_arch_detection.patch` was added upstream in
https://sourceware.org/git/?p=valgrind.git;a=commitdiff;h=5bdb86cc9a962f04f2dd3816b7d3a96288b09b72
Replace `010-mips-Fix-new-syscall-numbers.patch` with backport from
upstream.
Backport patch `020-no-member-guest_IP_AT_SYSCALL.patch` to fix a
compile problem on MIPS.
Small size increase:
1527884 bin/packages/mips_24kc-old/base/valgrind_3.22.0-r1_mips_24kc.ipk
3352210 bin/packages/mips_24kc-old/base/valgrind-cachegrind_3.22.0-r1_mips_24kc.ipk
3522982 bin/packages/mips_24kc-old/base/valgrind-callgrind_3.22.0-r1_mips_24kc.ipk
3573577 bin/packages/mips_24kc-old/base/valgrind-drd_3.22.0-r1_mips_24kc.ipk
3647835 bin/packages/mips_24kc-old/base/valgrind-helgrind_3.22.0-r1_mips_24kc.ipk
3383239 bin/packages/mips_24kc-old/base/valgrind-massif_3.22.0-r1_mips_24kc.ipk
22332 bin/packages/mips_24kc-old/base/valgrind-vgdb_3.22.0-r1_mips_24kc.ipk
1541969 bin/packages/mips_24kc-new/base/valgrind_3.23.0-r1_mips_24kc.ipk
3378595 bin/packages/mips_24kc-new/base/valgrind-cachegrind_3.23.0-r1_mips_24kc.ipk
3548415 bin/packages/mips_24kc-new/base/valgrind-callgrind_3.23.0-r1_mips_24kc.ipk
3592715 bin/packages/mips_24kc-new/base/valgrind-drd_3.23.0-r1_mips_24kc.ipk
3664706 bin/packages/mips_24kc-new/base/valgrind-helgrind_3.23.0-r1_mips_24kc.ipk
3411485 bin/packages/mips_24kc-new/base/valgrind-massif_3.23.0-r1_mips_24kc.ipk
22869 bin/packages/mips_24kc-new/base/valgrind-vgdb_3.23.0-r1_mips_24kc.ipk
Link: https://github.com/openwrt/openwrt/pull/16584
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
package/devel/valgrind/Makefile | 4 +-
...rind-MIPS-VexGuestArchState-has-no-member.patch | 61 ++++++++
.../patches/010-mips-Fix-new-syscall-numbers.patch | 143 ------------------
...p-using-shared-syscall-numbers-for-mips32.patch | 159 +++++++++++++++++++++
...p-using-shared-syscall-numbers-for-mips64.patch | 152 ++++++++++++++++++++
.../valgrind/patches/100-fix_configure_check.patch | 2 +-
.../patches/130-fix_arm_arch_detection.patch | 17 ---
.../valgrind/patches/130-mips_fix_soft_float.patch | 12 +-
8 files changed, 381 insertions(+), 169 deletions(-)
diff --git a/package/devel/valgrind/Makefile b/package/devel/valgrind/Makefile
index 9f8a2e9e79..a8e47db7c8 100644
--- a/package/devel/valgrind/Makefile
+++ b/package/devel/valgrind/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=valgrind
-PKG_VERSION:=3.22.0
+PKG_VERSION:=3.23.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://sourceware.org/pub/valgrind/
-PKG_HASH:=c811db5add2c5f729944caf47c4e7a65dcaabb9461e472b578765dd7bf6d2d4c
+PKG_HASH:=c5c34a3380457b9b75606df890102e7df2c702b9420c2ebef9540f8b5d56264d
PKG_MAINTAINER:=Felix Fietkau <nbd at nbd.name>
PKG_LICENSE:=GPL-2.0+
diff --git a/package/devel/valgrind/patches/010-486180-Valgrind-MIPS-VexGuestArchState-has-no-member.patch b/package/devel/valgrind/patches/010-486180-Valgrind-MIPS-VexGuestArchState-has-no-member.patch
new file mode 100644
index 0000000000..912ac38831
--- /dev/null
+++ b/package/devel/valgrind/patches/010-486180-Valgrind-MIPS-VexGuestArchState-has-no-member.patch
@@ -0,0 +1,61 @@
+From 7214886886bce9029f325214156c02dcfff760d5 Mon Sep 17 00:00:00 2001
+From: Paul Floyd <pjfloyd at wanadoo.fr>
+Date: Sat, 27 Apr 2024 13:07:07 +0200
+Subject: 486180 - [Valgrind][MIPS] 'VexGuestArchState' has no member named
+ 'guest_IP_AT_SYSCALL'
+
+---
+ NEWS | 34 ++++++++++++++++++++++++++++++++++
+ VEX/priv/guest_mips_helpers.c | 4 ++++
+ VEX/pub/libvex_guest_mips32.h | 6 +++---
+ VEX/pub/libvex_guest_mips64.h | 2 ++
+ configure.ac | 6 +++---
+ 5 files changed, 46 insertions(+), 6 deletions(-)
+
+--- a/VEX/priv/guest_mips_helpers.c
++++ b/VEX/priv/guest_mips_helpers.c
+@@ -187,6 +187,8 @@ void LibVEX_GuestMIPS32_initialise( /*OU
+ vex_state->guest_w1.w64[1] = 0;
+ vex_state->guest_w2.w64[0] = 0;
+ vex_state->guest_w2.w64[1] = 0;
++
++ vex_state->guest_IP_AT_SYSCALL = 0;
+ }
+
+ void LibVEX_GuestMIPS64_initialise ( /*OUT*/ VexGuestMIPS64State * vex_state )
+@@ -294,6 +296,8 @@ void LibVEX_GuestMIPS64_initialise ( /*O
+ vex_state->guest_LLaddr = 0xFFFFFFFFFFFFFFFFULL;
+ vex_state->guest_LLdata = 0;
+
++ vex_state->guest_IP_AT_SYSCALL = 0;
++
+ vex_state->guest_MSACSR = 0;
+ }
+
+--- a/VEX/pub/libvex_guest_mips32.h
++++ b/VEX/pub/libvex_guest_mips32.h
+@@ -188,10 +188,10 @@ typedef
+
+ /* 1016 */ UInt guest_MSACSR;
+
+- /* 1020 */ UInt _padding3;
++ /* 1020 */ UInt guest_IP_AT_SYSCALL;
+
+- /* 1020 */ ULong guest_LLdata64;
+- /* 1028 */ ULong _padding4;
++ /* 1024 */ ULong guest_LLdata64;
++ /* 1032 */ ULong _padding3;
+ } VexGuestMIPS32State;
+ /*---------------------------------------------------------------*/
+ /*--- Utility functions for MIPS32 guest stuff. ---*/
+--- a/VEX/pub/libvex_guest_mips64.h
++++ b/VEX/pub/libvex_guest_mips64.h
+@@ -184,6 +184,8 @@ typedef
+ /* 1144 */ UInt guest_MSACSR;
+
+ /* 1148 */ UInt _padding2;
++ /* 1152 */ ULong guest_IP_AT_SYSCALL;
++ /* 1160 */ ULong _padding3;
+
+ } VexGuestMIPS64State;
+
diff --git a/package/devel/valgrind/patches/010-mips-Fix-new-syscall-numbers.patch b/package/devel/valgrind/patches/010-mips-Fix-new-syscall-numbers.patch
deleted file mode 100644
index 5967b0cada..0000000000
--- a/package/devel/valgrind/patches/010-mips-Fix-new-syscall-numbers.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 82e935c564699456a766044faa39367b47cce793 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke at hauke-m.de>
-Date: Sun, 31 Oct 2021 23:11:11 +0100
-Subject: [PATCH] mips: Fix new syscall numbers
-
-The MIPS32 and MIPS64 O32 ABI are adding 4000 to all syscall numbers.
-The MIPS64 N64 ABI adds 5000 to each syscall and the MIPS64 N32 ABI adds
-6000 to each syscall number. We can not use the shared file for MIPS and
-have to define this for each sycall separately.
-
-Without this change valgrind is not able to detect new syscalls like
-clock_gettime64 correctly.
-
-Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
----
- include/pub_tool_vkiscnums_asm.h | 3 --
- include/vki/vki-scnums-mips32-linux.h | 40 +++++++++++++++++++++++++++
- include/vki/vki-scnums-mips64-linux.h | 40 +++++++++++++++++++++++++++
- 3 files changed, 80 insertions(+), 3 deletions(-)
-
---- a/include/pub_tool_vkiscnums_asm.h
-+++ b/include/pub_tool_vkiscnums_asm.h
-@@ -63,15 +63,12 @@
- # include "vki/vki-scnums-arm64-linux.h"
-
- #elif defined(VGP_mips32_linux)
--# include "vki/vki-scnums-shared-linux.h"
--# include "vki/vki-scnums-32bit-linux.h"
- # include "vki/vki-scnums-mips32-linux.h"
-
- #elif defined(VGP_nanomips_linux)
- # include "vki/vki-scnums-nanomips-linux.h"
-
- #elif defined(VGP_mips64_linux)
--# include "vki/vki-scnums-shared-linux.h"
- # include "vki/vki-scnums-mips64-linux.h"
-
- #elif defined(VGP_x86_freebsd) || defined(VGP_amd64_freebsd)
---- a/include/vki/vki-scnums-mips32-linux.h
-+++ b/include/vki/vki-scnums-mips32-linux.h
-@@ -401,6 +401,46 @@
- #define __NR_pkey_free (__NR_Linux + 365)
- #define __NR_statx (__NR_Linux + 366)
-
-+#define __NR_clock_gettime64 (__NR_Linux + 403)
-+#define __NR_clock_settime64 (__NR_Linux + 404)
-+#define __NR_clock_adjtime64 (__NR_Linux + 405)
-+#define __NR_clock_getres_time64 (__NR_Linux + 406)
-+#define __NR_clock_nanosleep_time64 (__NR_Linux + 407)
-+#define __NR_timer_gettime64 (__NR_Linux + 408)
-+#define __NR_timer_settime64 (__NR_Linux + 409)
-+#define __NR_timerfd_gettime64 (__NR_Linux + 410)
-+#define __NR_timerfd_settime64 (__NR_Linux + 411)
-+#define __NR_utimensat_time64 (__NR_Linux + 412)
-+#define __NR_pselect6_time64 (__NR_Linux + 413)
-+#define __NR_ppoll_time64 (__NR_Linux + 414)
-+#define __NR_io_pgetevents_time64 (__NR_Linux + 416)
-+#define __NR_recvmmsg_time64 (__NR_Linux + 417)
-+#define __NR_mq_timedsend_time64 (__NR_Linux + 418)
-+#define __NR_mq_timedreceive_time64 (__NR_Linux + 419)
-+#define __NR_semtimedop_time64 (__NR_Linux + 420)
-+#define __NR_rt_sigtimedwait_time64 (__NR_Linux + 421)
-+#define __NR_futex_time64 (__NR_Linux + 422)
-+#define __NR_sched_rr_get_interval_time64 (__NR_Linux + 423)
-+#define __NR_pidfd_send_signal (__NR_Linux + 424)
-+#define __NR_io_uring_setup (__NR_Linux + 425)
-+#define __NR_io_uring_enter (__NR_Linux + 426)
-+#define __NR_io_uring_register (__NR_Linux + 427)
-+#define __NR_open_tree (__NR_Linux + 428)
-+#define __NR_move_mount (__NR_Linux + 429)
-+#define __NR_fsopen (__NR_Linux + 430)
-+#define __NR_fsconfig (__NR_Linux + 431)
-+#define __NR_fsmount (__NR_Linux + 432)
-+#define __NR_fspick (__NR_Linux + 433)
-+
-+#define __NR_pidfd_open (__NR_Linux + 434)
-+#define __NR_clone3 (__NR_Linux + 435)
-+#define __NR_close_range (__NR_Linux + 436)
-+#define __NR_openat2 (__NR_Linux + 437)
-+
-+#define __NR_faccessat2 (__NR_Linux + 439)
-+
-+#define __NR_epoll_pwait2 (__NR_Linux + 441)
-+
- /*
- * Offset of the last Linux o32 flavoured syscall
- */
---- a/include/vki/vki-scnums-mips64-linux.h
-+++ b/include/vki/vki-scnums-mips64-linux.h
-@@ -363,6 +363,26 @@
- #define __NR_pkey_free (__NR_Linux + 325)
- #define __NR_statx (__NR_Linux + 326)
-
-+#define __NR_pidfd_send_signal (__NR_Linux + 424)
-+#define __NR_io_uring_setup (__NR_Linux + 425)
-+#define __NR_io_uring_enter (__NR_Linux + 426)
-+#define __NR_io_uring_register (__NR_Linux + 427)
-+#define __NR_open_tree (__NR_Linux + 428)
-+#define __NR_move_mount (__NR_Linux + 429)
-+#define __NR_fsopen (__NR_Linux + 430)
-+#define __NR_fsconfig (__NR_Linux + 431)
-+#define __NR_fsmount (__NR_Linux + 432)
-+#define __NR_fspick (__NR_Linux + 433)
-+
-+#define __NR_pidfd_open (__NR_Linux + 434)
-+#define __NR_clone3 (__NR_Linux + 435)
-+#define __NR_close_range (__NR_Linux + 436)
-+#define __NR_openat2 (__NR_Linux + 437)
-+
-+#define __NR_faccessat2 (__NR_Linux + 439)
-+
-+#define __NR_epoll_pwait2 (__NR_Linux + 441)
-+
- #elif defined(VGABI_N32)
-
- /*
-@@ -702,6 +722,26 @@
- #define __NR_pkey_free (__NR_Linux + 329)
- #define __NR_statx (__NR_Linux + 330)
-
-+#define __NR_pidfd_send_signal (__NR_Linux + 424)
-+#define __NR_io_uring_setup (__NR_Linux + 425)
-+#define __NR_io_uring_enter (__NR_Linux + 426)
-+#define __NR_io_uring_register (__NR_Linux + 427)
-+#define __NR_open_tree (__NR_Linux + 428)
-+#define __NR_move_mount (__NR_Linux + 429)
-+#define __NR_fsopen (__NR_Linux + 430)
-+#define __NR_fsconfig (__NR_Linux + 431)
-+#define __NR_fsmount (__NR_Linux + 432)
-+#define __NR_fspick (__NR_Linux + 433)
-+
-+#define __NR_pidfd_open (__NR_Linux + 434)
-+#define __NR_clone3 (__NR_Linux + 435)
-+#define __NR_close_range (__NR_Linux + 436)
-+#define __NR_openat2 (__NR_Linux + 437)
-+
-+#define __NR_faccessat2 (__NR_Linux + 439)
-+
-+#define __NR_epoll_pwait2 (__NR_Linux + 441)
-+
- #else
- #error unknown mips64 abi
- #endif
diff --git a/package/devel/valgrind/patches/020-mips-skip-using-shared-syscall-numbers-for-mips32.patch b/package/devel/valgrind/patches/020-mips-skip-using-shared-syscall-numbers-for-mips32.patch
new file mode 100644
index 0000000000..a519341887
--- /dev/null
+++ b/package/devel/valgrind/patches/020-mips-skip-using-shared-syscall-numbers-for-mips32.patch
@@ -0,0 +1,159 @@
+From 54d6ad3348fb50f5b972fe9c05d0d8757bfe73ba Mon Sep 17 00:00:00 2001
+From: Aleksandar Rikalo <arikalo at gmail.com>
+Date: Fri, 10 May 2024 17:59:28 +0200
+Subject: mips: skip using shared syscall numbers for mips32
+
+mips does not use shared syscall numbers, so we can not use
+vki-scnums-shared-linux.h.
+
+This partially fixes KDE #444781.
+
+Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
+Signed-off-by: Aleksandar Rikalo <arikalo at gmail.com>
+---
+ coregrind/m_syswrap/syswrap-mips32-linux.c | 1 +
+ include/pub_tool_vkiscnums_asm.h | 2 -
+ include/vki/vki-scnums-mips32-linux.h | 105 ++++++++++++++++-----
+ 3 files changed, 83 insertions(+), 25 deletions(-)
+
+--- a/coregrind/m_syswrap/syswrap-mips32-linux.c
++++ b/coregrind/m_syswrap/syswrap-mips32-linux.c
+@@ -1110,6 +1110,7 @@ static SyscallTableEntry syscall_main_ta
+ LINX_ (__NR_pwritev2, sys_pwritev2), // 362
+ //..
+ LINXY(__NR_statx, sys_statx), // 366
++ GENX_(__NR_rseq, sys_ni_syscall), // 367
+
+ LINXY(__NR_clock_gettime64, sys_clock_gettime64), // 403
+ LINX_(__NR_clock_settime64, sys_clock_settime64), // 404
+--- a/include/pub_tool_vkiscnums_asm.h
++++ b/include/pub_tool_vkiscnums_asm.h
+@@ -63,8 +63,6 @@
+ # include "vki/vki-scnums-arm64-linux.h"
+
+ #elif defined(VGP_mips32_linux)
+-# include "vki/vki-scnums-shared-linux.h"
+-# include "vki/vki-scnums-32bit-linux.h"
+ # include "vki/vki-scnums-mips32-linux.h"
+
+ #elif defined(VGP_nanomips_linux)
+--- a/include/vki/vki-scnums-mips32-linux.h
++++ b/include/vki/vki-scnums-mips32-linux.h
+@@ -380,35 +380,94 @@
+ #define __NR_setns (__NR_Linux + 343)
+ #define __NR_process_vm_readv (__NR_Linux + 345)
+ #define __NR_process_vm_writev (__NR_Linux + 346)
+-#define __NR_kcmp (__NR_Linux + 347)
+-#define __NR_finit_module (__NR_Linux + 348)
+-#define __NR_sched_setattr (__NR_Linux + 349)
+-#define __NR_sched_getattr (__NR_Linux + 350)
+-#define __NR_renameat2 (__NR_Linux + 351)
+-#define __NR_seccomp (__NR_Linux + 352)
+-#define __NR_getrandom (__NR_Linux + 353)
+-#define __NR_memfd_create (__NR_Linux + 354)
+-#define __NR_bpf (__NR_Linux + 355)
+-#define __NR_execveat (__NR_Linux + 356)
+-#define __NR_userfaultfd (__NR_Linux + 357)
+-#define __NR_membarrier (__NR_Linux + 358)
+-#define __NR_mlock2 (__NR_Linux + 359)
+-#define __NR_copy_file_range (__NR_Linux + 360)
+-#define __NR_preadv2 (__NR_Linux + 361)
+-#define __NR_pwritev2 (__NR_Linux + 362)
+-#define __NR_pkey_mprotect (__NR_Linux + 363)
+-#define __NR_pkey_alloc (__NR_Linux + 364)
+-#define __NR_pkey_free (__NR_Linux + 365)
+-#define __NR_statx (__NR_Linux + 366)
+-
++#define __NR_kcmp (__NR_Linux + 347)
++#define __NR_finit_module (__NR_Linux + 348)
++#define __NR_sched_setattr (__NR_Linux + 349)
++#define __NR_sched_getattr (__NR_Linux + 350)
++#define __NR_renameat2 (__NR_Linux + 351)
++#define __NR_seccomp (__NR_Linux + 352)
++#define __NR_getrandom (__NR_Linux + 353)
++#define __NR_memfd_create (__NR_Linux + 354)
++#define __NR_bpf (__NR_Linux + 355)
++#define __NR_execveat (__NR_Linux + 356)
++#define __NR_userfaultfd (__NR_Linux + 357)
++#define __NR_membarrier (__NR_Linux + 358)
++#define __NR_mlock2 (__NR_Linux + 359)
++#define __NR_copy_file_range (__NR_Linux + 360)
++#define __NR_preadv2 (__NR_Linux + 361)
++#define __NR_pwritev2 (__NR_Linux + 362)
++#define __NR_pkey_mprotect (__NR_Linux + 363)
++#define __NR_pkey_alloc (__NR_Linux + 364)
++#define __NR_pkey_free (__NR_Linux + 365)
++#define __NR_statx (__NR_Linux + 366)
++#define __NR_rseq (__NR_Linux + 367)
++#define __NR_io_pgetevents (__NR_Linux + 368)
++#define __NR_semget (__NR_Linux + 393)
++#define __NR_semctl (__NR_Linux + 394)
++#define __NR_shmget (__NR_Linux + 395)
++#define __NR_shmctl (__NR_Linux + 396)
++#define __NR_shmat (__NR_Linux + 397)
++#define __NR_shmdt (__NR_Linux + 398)
++#define __NR_msgget (__NR_Linux + 399)
++#define __NR_msgsnd (__NR_Linux + 400)
++#define __NR_msgrcv (__NR_Linux + 401)
++#define __NR_msgctl (__NR_Linux + 402)
++#define __NR_clock_gettime64 (__NR_Linux + 403)
++#define __NR_clock_settime64 (__NR_Linux + 404)
++#define __NR_clock_adjtime64 (__NR_Linux + 405)
++#define __NR_clock_getres_time64 (__NR_Linux + 406)
++#define __NR_clock_nanosleep_time64 (__NR_Linux + 407)
++#define __NR_timer_gettime64 (__NR_Linux + 408)
++#define __NR_timer_settime64 (__NR_Linux + 409)
++#define __NR_timerfd_gettime64 (__NR_Linux + 410)
++#define __NR_timerfd_settime64 (__NR_Linux + 411)
++#define __NR_utimensat_time64 (__NR_Linux + 412)
++#define __NR_pselect6_time64 (__NR_Linux + 413)
++#define __NR_ppoll_time64 (__NR_Linux + 414)
++#define __NR_io_pgetevents_time64 (__NR_Linux + 416)
++#define __NR_recvmmsg_time64 (__NR_Linux + 417)
++#define __NR_mq_timedsend_time64 (__NR_Linux + 418)
++#define __NR_mq_timedreceive_time64 (__NR_Linux + 419)
++#define __NR_semtimedop_time64 (__NR_Linux + 420)
++#define __NR_rt_sigtimedwait_time64 (__NR_Linux + 421)
++#define __NR_futex_time64 (__NR_Linux + 422)
++#define __NR_sched_rr_get_interval_time64 (__NR_Linux + 423)
++#define __NR_pidfd_send_signal (__NR_Linux + 424)
++#define __NR_io_uring_setup (__NR_Linux + 425)
++#define __NR_io_uring_enter (__NR_Linux + 426)
++#define __NR_io_uring_register (__NR_Linux + 427)
++#define __NR_open_tree (__NR_Linux + 428)
++#define __NR_move_mount (__NR_Linux + 429)
++#define __NR_fsopen (__NR_Linux + 430)
++#define __NR_fsconfig (__NR_Linux + 431)
++#define __NR_fsmount (__NR_Linux + 432)
++#define __NR_fspick (__NR_Linux + 433)
++#define __NR_pidfd_open (__NR_Linux + 434)
++#define __NR_clone3 (__NR_Linux + 435)
++#define __NR_close_range (__NR_Linux + 436)
++#define __NR_openat2 (__NR_Linux + 437)
++#define __NR_pidfd_getfd (__NR_Linux + 438)
++#define __NR_faccessat2 (__NR_Linux + 439)
++#define __NR_process_madvise (__NR_Linux + 440)
++#define __NR_epoll_pwait2 (__NR_Linux + 441)
++#define __NR_mount_setattr (__NR_Linux + 442)
++#define __NR_quotactl_fd (__NR_Linux + 443)
++#define __NR_landlock_create_ruleset (__NR_Linux + 444)
++#define __NR_landlock_add_rule (__NR_Linux + 445)
++#define __NR_landlock_restrict_self (__NR_Linux + 446)
++#define __NR_process_mrelease (__NR_Linux + 448)
++#define __NR_futex_waitv (__NR_Linux + 449)
++#define __NR_set_mempolicy_home_node (__NR_Linux + 450)
++#define __NR_cachestat (__NR_Linux + 451)
++#define __NR_fchmodat2 (__NR_Linux + 452)
+ /*
+ * Offset of the last Linux o32 flavoured syscall
+ */
+-#define __NR_Linux_syscalls 366
++#define __NR_Linux_syscalls 366
+
+
+ #define __NR_O32_Linux 4000
+-#define __NR_O32_Linux_syscalls 366
++#define __NR_O32_Linux_syscalls 366
+
+
+ #endif /* __VKI_SCNUMS_MIPS32_LINUX_H */
diff --git a/package/devel/valgrind/patches/021-mips-skip-using-shared-syscall-numbers-for-mips64.patch b/package/devel/valgrind/patches/021-mips-skip-using-shared-syscall-numbers-for-mips64.patch
new file mode 100644
index 0000000000..759c5fdcd0
--- /dev/null
+++ b/package/devel/valgrind/patches/021-mips-skip-using-shared-syscall-numbers-for-mips64.patch
@@ -0,0 +1,152 @@
+From efaa17e53a750d5f0f4c138b507b1b104729ed67 Mon Sep 17 00:00:00 2001
+From: Petar Jovanovic <mips32r2 at gmail.com>
+Date: Mon, 24 Jun 2024 10:33:46 +0000
+Subject: mips: skip using shared syscall numbers for mips64
+
+mips does not use shared syscall numbers, so we can not use
+vki-scnums-shared-linux.h.
+
+This fixes KDE #444781.
+
+Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
+Signed-off-by: Aleksandar Rikalo <arikalo at gmail.com>
+---
+ coregrind/m_syswrap/syswrap-mips64-linux.c | 1 +
+ include/pub_tool_vkiscnums_asm.h | 1 -
+ include/vki/vki-scnums-mips64-linux.h | 98 ++++++++++++++++++++++
+ 3 files changed, 99 insertions(+), 1 deletion(-)
+
+--- a/coregrind/m_syswrap/syswrap-mips64-linux.c
++++ b/coregrind/m_syswrap/syswrap-mips64-linux.c
+@@ -813,6 +813,7 @@ static SyscallTableEntry syscall_main_ta
+ LINX_ (__NR_pwritev2, sys_pwritev2),
+ LINX_ (__NR_syncfs, sys_syncfs),
+ LINXY (__NR_statx, sys_statx),
++ GENX_ (__NR_rseq, sys_ni_syscall),
+ LINX_ (__NR_setns, sys_setns),
+ LINXY (__NR_io_uring_setup, sys_io_uring_setup),
+ LINXY (__NR_io_uring_enter, sys_io_uring_enter),
+--- a/include/pub_tool_vkiscnums_asm.h
++++ b/include/pub_tool_vkiscnums_asm.h
+@@ -70,7 +70,6 @@
+ # include "vki/vki-scnums-shared-linux.h"
+
+ #elif defined(VGP_mips64_linux)
+-# include "vki/vki-scnums-shared-linux.h"
+ # include "vki/vki-scnums-mips64-linux.h"
+
+ #elif defined(VGP_x86_freebsd) || defined(VGP_amd64_freebsd) || defined(VGP_arm64_freebsd)
+--- a/include/vki/vki-scnums-mips64-linux.h
++++ b/include/vki/vki-scnums-mips64-linux.h
+@@ -362,6 +362,45 @@
+ #define __NR_pkey_alloc (__NR_Linux + 324)
+ #define __NR_pkey_free (__NR_Linux + 325)
+ #define __NR_statx (__NR_Linux + 326)
++#define __NR_rseq (__NR_Linux + 327)
++#define __NR_io_pgetevents (__NR_Linux + 328)
++#define __NR_pidfd_send_signal (__NR_Linux + 424)
++#define __NR_io_uring_setup (__NR_Linux + 425)
++#define __NR_io_uring_enter (__NR_Linux + 426)
++#define __NR_io_uring_register (__NR_Linux + 427)
++#define __NR_open_tree (__NR_Linux + 428)
++#define __NR_move_mount (__NR_Linux + 429)
++#define __NR_fsopen (__NR_Linux + 430)
++#define __NR_fsconfig (__NR_Linux + 431)
++#define __NR_fsmount (__NR_Linux + 432)
++#define __NR_fspick (__NR_Linux + 433)
++#define __NR_pidfd_open (__NR_Linux + 434)
++#define __NR_clone3 (__NR_Linux + 435)
++#define __NR_close_range (__NR_Linux + 436)
++#define __NR_openat2 (__NR_Linux + 437)
++#define __NR_pidfd_getfd (__NR_Linux + 438)
++#define __NR_faccessat2 (__NR_Linux + 439)
++#define __NR_process_madvise (__NR_Linux + 440)
++#define __NR_epoll_pwait2 (__NR_Linux + 441)
++#define __NR_mount_setattr (__NR_Linux + 442)
++#define __NR_quotactl_fd (__NR_Linux + 443)
++#define __NR_landlock_create_ruleset (__NR_Linux + 444)
++#define __NR_landlock_add_rule (__NR_Linux + 445)
++#define __NR_landlock_restrict_self (__NR_Linux + 446)
++#define __NR_process_mrelease (__NR_Linux + 448)
++#define __NR_futex_waitv (__NR_Linux + 449)
++#define __NR_set_mempolicy_home_node (__NR_Linux + 450)
++#define __NR_cachestat (__NR_Linux + 451)
++#define __NR_fchmodat2 (__NR_Linux + 452)
++#define __NR_map_shadow_stack (__NR_Linux + 453)
++#define __NR_futex_wake (__NR_Linux + 454)
++#define __NR_futex_wait (__NR_Linux + 455)
++#define __NR_futex_requeue (__NR_Linux + 456)
++#define __NR_statmount (__NR_Linux + 457)
++#define __NR_listmount (__NR_Linux + 458)
++#define __NR_lsm_get_self_attr (__NR_Linux + 459)
++#define __NR_lsm_set_self_attr (__NR_Linux + 460)
++#define __NR_lsm_list_modules (__NR_Linux + 461)
+
+ #elif defined(VGABI_N32)
+
+@@ -701,6 +740,65 @@
+ #define __NR_pkey_alloc (__NR_Linux + 328)
+ #define __NR_pkey_free (__NR_Linux + 329)
+ #define __NR_statx (__NR_Linux + 330)
++#define __NR_rseq (__NR_Linux + 331)
++#define __NR_io_pgetevents (__NR_Linux + 332)
++#define __NR_clock_gettime64 (__NR_Linux + 403)
++#define __NR_clock_settime64 (__NR_Linux + 404)
++#define __NR_clock_adjtime64 (__NR_Linux + 405)
++#define __NR_clock_getres_time64 (__NR_Linux + 406)
++#define __NR_clock_nanosleep_time64 (__NR_Linux + 407)
++#define __NR_timer_gettime64 (__NR_Linux + 408)
++#define __NR_timer_settime64 (__NR_Linux + 409)
++#define __NR_timerfd_gettime64 (__NR_Linux + 410)
++#define __NR_timerfd_settime64 (__NR_Linux + 411)
++#define __NR_utimensat_time64 (__NR_Linux + 412)
++#define __NR_pselect6_time64 (__NR_Linux + 413)
++#define __NR_ppoll_time64 (__NR_Linux + 414)
++#define __NR_io_pgetevents_time64 (__NR_Linux + 416)
++#define __NR_recvmmsg_time64 (__NR_Linux + 417)
++#define __NR_mq_timedsend_time64 (__NR_Linux + 418)
++#define __NR_mq_timedreceive_time64 (__NR_Linux + 419)
++#define __NR_semtimedop_time64 (__NR_Linux + 420)
++#define __NR_rt_sigtimedwait_time64 (__NR_Linux + 421)
++#define __NR_futex_time64 (__NR_Linux + 422)
++#define __NR_sched_rr_get_interval_time64 (__NR_Linux + 423)
++#define __NR_pidfd_send_signal (__NR_Linux + 424)
++#define __NR_io_uring_setup (__NR_Linux + 425)
++#define __NR_io_uring_enter (__NR_Linux + 426)
++#define __NR_io_uring_register (__NR_Linux + 427)
++#define __NR_open_tree (__NR_Linux + 428)
++#define __NR_move_mount (__NR_Linux + 429)
++#define __NR_fsopen (__NR_Linux + 430)
++#define __NR_fsconfig (__NR_Linux + 431)
++#define __NR_fsmount (__NR_Linux + 432)
++#define __NR_fspick (__NR_Linux + 433)
++#define __NR_pidfd_open (__NR_Linux + 434)
++#define __NR_clone3 (__NR_Linux + 435)
++#define __NR_close_range (__NR_Linux + 436)
++#define __NR_openat2 (__NR_Linux + 437)
++#define __NR_pidfd_getfd (__NR_Linux + 438)
++#define __NR_faccessat2 (__NR_Linux + 439)
++#define __NR_process_madvise (__NR_Linux + 440)
++#define __NR_epoll_pwait2 (__NR_Linux + 441)
++#define __NR_mount_setattr (__NR_Linux + 442)
++#define __NR_quotactl_fd (__NR_Linux + 443)
++#define __NR_landlock_create_ruleset (__NR_Linux + 444)
++#define __NR_landlock_add_rule (__NR_Linux + 445)
++#define __NR_landlock_restrict_self (__NR_Linux + 446)
++#define __NR_process_mrelease (__NR_Linux + 448)
++#define __NR_futex_waitv (__NR_Linux + 449)
++#define __NR_set_mempolicy_home_node (__NR_Linux + 450)
++#define __NR_cachestat (__NR_Linux + 451)
++#define __NR_fchmodat2 (__NR_Linux + 452)
++#define __NR_map_shadow_stack (__NR_Linux + 453)
++#define __NR_futex_wake (__NR_Linux + 454)
++#define __NR_futex_wait (__NR_Linux + 455)
++#define __NR_futex_requeue (__NR_Linux + 456)
++#define __NR_statmount (__NR_Linux + 457)
++#define __NR_listmount (__NR_Linux + 458)
++#define __NR_lsm_get_self_attr (__NR_Linux + 459)
++#define __NR_lsm_set_self_attr (__NR_Linux + 460)
++#define __NR_lsm_list_modules (__NR_Linux + 461)
+
+ #else
+ #error unknown mips64 abi
diff --git a/package/devel/valgrind/patches/100-fix_configure_check.patch b/package/devel/valgrind/patches/100-fix_configure_check.patch
index 5fa51977e7..d771943db8 100644
--- a/package/devel/valgrind/patches/100-fix_configure_check.patch
+++ b/package/devel/valgrind/patches/100-fix_configure_check.patch
@@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -364,7 +364,7 @@ case "${host_os}" in
+@@ -381,7 +381,7 @@ case "${host_os}" in
# Ok, this is linux. Check the kernel version
AC_MSG_CHECKING([for the kernel version])
diff --git a/package/devel/valgrind/patches/130-fix_arm_arch_detection.patch b/package/devel/valgrind/patches/130-fix_arm_arch_detection.patch
deleted file mode 100644
index 9a7b591e70..0000000000
--- a/package/devel/valgrind/patches/130-fix_arm_arch_detection.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix FTBFS on armhf by correctly detecting the architecture
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/730844
-Author: Alessandro Ghedini <ghedo at debian.org>
-Last-Update: 2013-11-30
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -271,7 +271,7 @@ case "${host_cpu}" in
- ARCH_MAX="s390x"
- ;;
-
-- armv7*)
-+ arm*)
- AC_MSG_RESULT([ok (${host_cpu})])
- ARCH_MAX="arm"
- ;;
diff --git a/package/devel/valgrind/patches/130-mips_fix_soft_float.patch b/package/devel/valgrind/patches/130-mips_fix_soft_float.patch
index 7c7122ecac..f861646e80 100644
--- a/package/devel/valgrind/patches/130-mips_fix_soft_float.patch
+++ b/package/devel/valgrind/patches/130-mips_fix_soft_float.patch
@@ -14,7 +14,7 @@ This fixes the following error message when compiling with a GCC 10 MIPS BE 32:
--- a/VEX/priv/guest_mips_helpers.c
+++ b/VEX/priv/guest_mips_helpers.c
-@@ -616,6 +616,7 @@ extern UInt mips_dirtyhelper_calculate_F
+@@ -620,6 +620,7 @@ extern UInt mips_dirtyhelper_calculate_F
flt_op inst )
{
UInt ret = 0;
@@ -22,7 +22,7 @@ This fixes the following error message when compiling with a GCC 10 MIPS BE 32:
#if defined(__mips__)
VexGuestMIPS32State* guest_state = (VexGuestMIPS32State*)gs;
UInt loFsVal, hiFsVal, loFtVal, hiFtVal;
-@@ -698,6 +699,7 @@ extern UInt mips_dirtyhelper_calculate_F
+@@ -702,6 +703,7 @@ extern UInt mips_dirtyhelper_calculate_F
break;
}
#endif
@@ -30,7 +30,7 @@ This fixes the following error message when compiling with a GCC 10 MIPS BE 32:
return ret;
}
-@@ -707,6 +709,7 @@ extern UInt mips_dirtyhelper_calculate_F
+@@ -711,6 +713,7 @@ extern UInt mips_dirtyhelper_calculate_F
flt_op inst )
{
UInt ret = 0;
@@ -38,7 +38,7 @@ This fixes the following error message when compiling with a GCC 10 MIPS BE 32:
#if defined(__mips__) && ((__mips == 64) || \
(defined(__mips_isa_rev) && (__mips_isa_rev >= 2)))
#if defined(VGA_mips32)
-@@ -859,6 +862,7 @@ extern UInt mips_dirtyhelper_calculate_F
+@@ -863,6 +866,7 @@ extern UInt mips_dirtyhelper_calculate_F
break;
}
#endif
@@ -48,7 +48,7 @@ This fixes the following error message when compiling with a GCC 10 MIPS BE 32:
--- a/coregrind/m_machine.c
+++ b/coregrind/m_machine.c
-@@ -2109,6 +2109,7 @@ Bool VG_(machine_get_hwcaps)( void )
+@@ -2119,6 +2119,7 @@ Bool VG_(machine_get_hwcaps)( void )
we are using alternative way to determine FP mode */
ULong result = 0;
@@ -56,7 +56,7 @@ This fixes the following error message when compiling with a GCC 10 MIPS BE 32:
if (!VG_MINIMAL_SETJMP(env_unsup_insn)) {
__asm__ volatile (
".set push\n\t"
-@@ -2126,6 +2127,9 @@ Bool VG_(machine_get_hwcaps)( void )
+@@ -2136,6 +2137,9 @@ Bool VG_(machine_get_hwcaps)( void )
fpmode = (result != 0x3FF0000000000000ull);
}
More information about the lede-commits
mailing list