diff mbox series

valgrind: Upgrade 3.25.1 -> 3.26.0

Message ID 20251110095650.3192469-1-mingli.yu@windriver.com
State New
Headers show
Series valgrind: Upgrade 3.25.1 -> 3.26.0 | expand

Commit Message

Yu, Mingli Nov. 10, 2025, 9:56 a.m. UTC
From: Mingli Yu <mingli.yu@windriver.com>

License-Update:
 License version and the copyright year updated [1].

Remove 0001-Use-portable-syntax-for-pushsection-directive-in-inl.patch
as the logic has been already included in the new version [2].

[1] https://sourceware.org/git/?p=valgrind.git;a=commit;h=3392155359822c0d4e8bb371862e92425054d02a
[2] https://sourceware.org/git/?p=valgrind.git;a=commitdiff;h=2fa8581c4974db57de80de915d16ce299eb9aa84

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 ...tax-for-pushsection-directive-in-inl.patch | 31 ---------------
 ...c-workaround-off64_t-not-defined-in-.patch | 38 +++++++++++++++++++
 ...{valgrind_3.25.1.bb => valgrind_3.26.0.bb} | 10 ++---
 3 files changed, 43 insertions(+), 36 deletions(-)
 delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-Use-portable-syntax-for-pushsection-directive-in-inl.patch
 create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-getdents_filter.c-workaround-off64_t-not-defined-in-.patch
 rename meta/recipes-devtools/valgrind/{valgrind_3.25.1.bb => valgrind_3.26.0.bb} (93%)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-Use-portable-syntax-for-pushsection-directive-in-inl.patch b/meta/recipes-devtools/valgrind/valgrind/0001-Use-portable-syntax-for-pushsection-directive-in-inl.patch
deleted file mode 100644
index b59c5442231..00000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-Use-portable-syntax-for-pushsection-directive-in-inl.patch
+++ /dev/null
@@ -1,31 +0,0 @@ 
-From 2089383a0e3a50f527337ea05188b3e302069888 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 14 May 2025 09:29:33 -0700
-Subject: [PATCH] Use portable syntax for pushsection directive in inline
- assembly
-
-'@' does not work with clang inline assembler, but '%' works with both
-gcc and clang. Therefore use '%' to make it more portable
-
-Fixes
-<inline asm>:1:41: error: expected '%<type>' or "<type>"
-
-Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=504222]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- coregrind/vg_preloaded.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c
-index 5bec51d..e4c2dbc 100644
---- a/coregrind/vg_preloaded.c
-+++ b/coregrind/vg_preloaded.c
-@@ -55,7 +55,7 @@
- /* Note: The "MS" section flags are to remove duplicates.  */
- #define DEFINE_GDB_PY_SCRIPT(script_name) \
-   asm("\
--.pushsection \".debug_gdb_scripts\", \"MS\",@progbits,1\n\
-+.pushsection \".debug_gdb_scripts\", \"MS\",%progbits,1\n\
- .byte 1 /* Python */\n\
- .asciz \"" script_name "\"\n\
- .popsection \n\
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-getdents_filter.c-workaround-off64_t-not-defined-in-.patch b/meta/recipes-devtools/valgrind/valgrind/0001-getdents_filter.c-workaround-off64_t-not-defined-in-.patch
new file mode 100644
index 00000000000..0fa8b936e3f
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-getdents_filter.c-workaround-off64_t-not-defined-in-.patch
@@ -0,0 +1,38 @@ 
+From 15ccaa2ebe66d77c25393dd9182d394e87e15577 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Mon, 10 Nov 2025 11:21:36 +0800
+Subject: [PATCH] getdents_filter.c: workaround off64_t not defined in musl
+
+Fixes:
+  getdents_filter.c:18:5: error: unknown type name 'off64_t'; did you mean 'off_t'?
+   18 |     off64_t  d_off;
+      |     ^~~~~~~
+      |     off_t
+  make[5]: *** [Makefile:920: getdents_filter.o] Error 1
+
+Upstream-Status: Pending
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ none/tests/linux/getdents_filter.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/none/tests/linux/getdents_filter.c b/none/tests/linux/getdents_filter.c
+index 361659f..d2c627f 100644
+--- a/none/tests/linux/getdents_filter.c
++++ b/none/tests/linux/getdents_filter.c
+@@ -13,6 +13,11 @@
+ #include <sys/syscall.h>
+ #include <sys/types.h>
+ 
++#ifndef off64_t
++typedef off_t off64_t;
++typedef ino_t ino64_t;
++#endif
++
+ struct linux_dirent64 {
+     ino64_t  d_ino;
+     off64_t  d_off;
+-- 
+2.34.1
+
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.25.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.26.0.bb
similarity index 93%
rename from meta/recipes-devtools/valgrind/valgrind_3.25.1.bb
rename to meta/recipes-devtools/valgrind/valgrind_3.26.0.bb
index a8b0be5767e..6f7d67df0ec 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.25.1.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.26.0.bb
@@ -3,9 +3,9 @@  HOMEPAGE = "http://valgrind.org/"
 DESCRIPTION = "Valgrind is an instrumentation framework for building dynamic analysis tools. There are Valgrind tools that can automatically detect many memory management and threading bugs, and profile your programs in detail."
 BUGTRACKER = "http://valgrind.org/support/bug_reports.html"
 LICENSE = "GPL-2.0-only & GPL-2.0-or-later & BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://include/pub_tool_basics.h;beginline=6;endline=29;md5=41c410e8d3f305aee7aaa666b2e4f366 \
-                    file://include/valgrind.h;beginline=1;endline=56;md5=ad3b317f3286b6b704575d9efe6ca5df \
+LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
+                    file://include/pub_tool_basics.h;beginline=6;endline=29;md5=9ba449d120f6845e6a432073278d6e3a \
+                    file://include/valgrind.h;beginline=1;endline=56;md5=993563aaa122558df9c5d743de074d04 \
                     file://COPYING.DOCS;md5=24ea4c7092233849b4394699333b5c56"
 
 SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
@@ -25,9 +25,9 @@  SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
            file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \
            file://0001-docs-Disable-manual-validation.patch \
            file://0001-tests-arm-Use-O-instead-of-O0.patch \
-           file://0001-Use-portable-syntax-for-pushsection-directive-in-inl.patch \
+           file://0001-getdents_filter.c-workaround-off64_t-not-defined-in-.patch \
            "
-SRC_URI[sha256sum] = "61deb8d0727b45c268efdc1b3b6c9e679cd97cbf5ee4b28d1dead7c8b7a271af"
+SRC_URI[sha256sum] = "8d54c717029106f1644aadaf802ab9692e53d93dd015cbd19e74190eba616bd7"
 UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar"
 
 COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64|riscv64).*-linux'