From b13373466bd7e8ac2d587cbd2489b1396fbb2f82 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 19 Feb 2025 16:27:10 +0100 Subject: [PATCH] package/valgrind: update to 3.24.0 See here for a changelog: https://valgrind.org/docs/manual/dist.news.html Patches 0003/0004 are applied upstream and so got removed here. Signed-off-by: Waldemar Brodkorb Signed-off-by: Julien Olivain --- ...ninitialized-err-in-handle_extension.patch | 47 ------------------- ...st_IP_AT_SYSCALL-in-handle_extension.patch | 33 ------------- package/valgrind/valgrind.hash | 4 +- package/valgrind/valgrind.mk | 2 +- 4 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 package/valgrind/0003-Fix-uninitialized-err-in-handle_extension.patch delete mode 100644 package/valgrind/0004-Avoid-use-of-guest_IP_AT_SYSCALL-in-handle_extension.patch diff --git a/package/valgrind/0003-Fix-uninitialized-err-in-handle_extension.patch b/package/valgrind/0003-Fix-uninitialized-err-in-handle_extension.patch deleted file mode 100644 index c6a6b3dce3..0000000000 --- a/package/valgrind/0003-Fix-uninitialized-err-in-handle_extension.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 94c2e5c6be23c6323f24deacdad5f98fb9f0b1c2 Mon Sep 17 00:00:00 2001 -From: Andreas Arnez -Date: Wed, 15 May 2024 14:32:42 +0200 -Subject: [PATCH] Fix uninitialized `err' in handle_extension() - -In handle_extension(), in the case of a second return from SCHEDSETJMP the -variable `err' would be used uninitialized. Fix this by avoiding any -access to `err' in this case. - -Signed-off-by: Andreas Arnez -Signed-off-by: Waldemar Brodkorb -Upstream: https://sourceware.org/git/?p=valgrind.git;a=commit;h=94c2e5c6be23c6323f24deacdad5f98fb9f0b1c2 ---- - coregrind/m_scheduler/scheduler.c | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c -index fc8cf7c9c..29751bb28 100644 ---- a/coregrind/m_scheduler/scheduler.c -+++ b/coregrind/m_scheduler/scheduler.c -@@ -1233,7 +1233,10 @@ static void handle_extension(ThreadId tid) - SCHEDSETJMP(tid, jumped, err = VG_(client_extension)(tid)); - vg_assert(VG_(is_running_thread)(tid)); - -- if (err != ExtErr_OK) { -+ if (jumped != (UWord)0) { -+ block_signals(); -+ VG_(poll_signals)(tid); -+ } else if (err != ExtErr_OK) { - ThreadState* tst = VG_(get_ThreadState)(tid); - Addr addr = tst->arch.vex.guest_IP_AT_SYSCALL; - switch (err) { -@@ -1244,11 +1247,6 @@ static void handle_extension(ThreadId tid) - VG_(core_panic)("scheduler: bad return code from extension"); - } - } -- -- if (jumped != (UWord)0) { -- block_signals(); -- VG_(poll_signals)(tid); -- } - } - - /* tid just requested a jump to the noredir version of its current --- -2.39.2 - diff --git a/package/valgrind/0004-Avoid-use-of-guest_IP_AT_SYSCALL-in-handle_extension.patch b/package/valgrind/0004-Avoid-use-of-guest_IP_AT_SYSCALL-in-handle_extension.patch deleted file mode 100644 index 006e24096e..0000000000 --- a/package/valgrind/0004-Avoid-use-of-guest_IP_AT_SYSCALL-in-handle_extension.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 16249b21456d681b5d98400287b8dbd926050c75 Mon Sep 17 00:00:00 2001 -From: Andreas Arnez -Date: Wed, 15 May 2024 14:32:42 +0200 -Subject: [PATCH] Avoid use of guest_IP_AT_SYSCALL in handle_extension() - -The guest state field guest_IP_AT_SYSCALL is referenced in -handle_extension(), even though it may not be defined by all -architectures. Avoid its use altogether. - -Signed-off-by: Andreas Arnez -Signed-off-by: Waldemar Brodkorb -Upstream: https://sourceware.org/git/?p=valgrind.git;a=commit;h=16249b21456d681b5d98400287b8dbd926050c75 ---- - coregrind/m_scheduler/scheduler.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c -index 29751bb28..cc8d070b7 100644 ---- a/coregrind/m_scheduler/scheduler.c -+++ b/coregrind/m_scheduler/scheduler.c -@@ -1237,8 +1237,7 @@ static void handle_extension(ThreadId tid) - block_signals(); - VG_(poll_signals)(tid); - } else if (err != ExtErr_OK) { -- ThreadState* tst = VG_(get_ThreadState)(tid); -- Addr addr = tst->arch.vex.guest_IP_AT_SYSCALL; -+ Addr addr = VG_(get_IP)(tid); - switch (err) { - case ExtErr_Illop: - VG_(synth_sigill)(tid, addr); --- -2.39.2 - diff --git a/package/valgrind/valgrind.hash b/package/valgrind/valgrind.hash index 9cb66b583a..203a0770e1 100644 --- a/package/valgrind/valgrind.hash +++ b/package/valgrind/valgrind.hash @@ -1,7 +1,7 @@ # From https://valgrind.org/downloads/current.html -sha1 ec410c75d3920d4f9249a5cfa2cac31e1bf6d586 valgrind-3.23.0.tar.bz2 +sha1 6fc0470fedc0d85dae3e042297cabd13c6100749 valgrind-3.24.0.tar.bz2 # locally computed -sha256 c5c34a3380457b9b75606df890102e7df2c702b9420c2ebef9540f8b5d56264d valgrind-3.23.0.tar.bz2 +sha256 71aee202bdef1ae73898ccf7e9c315134fa7db6c246063afc503aef702ec03bd valgrind-3.24.0.tar.bz2 # License files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index a5cb4b1c03..f0638f464b 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -4,7 +4,7 @@ # ################################################################################ -VALGRIND_VERSION = 3.23.0 +VALGRIND_VERSION = 3.24.0 VALGRIND_SITE = https://sourceware.org/pub/valgrind VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 VALGRIND_LICENSE = GPL-2.0, GFDL-1.2