diff mbox series

[AUH] valgrind: upgrading to 3.22.0 FAILED

Message ID 0101018c6dd72b23-82df7620-3314-4b64-b020-b5b81b2f20e1-000000@us-west-2.amazonses.com
State New
Headers show
Series [AUH] valgrind: upgrading to 3.22.0 FAILED | expand

Commit Message

auh@yoctoproject.org Dec. 15, 2023, 2:17 p.m. UTC
Hello,

this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe *valgrind* to *3.22.0* has Failed(do_compile).

Detailed error information:

do_compile failed



Next steps:
    - apply the patch: git am 0001-valgrind-upgrade-3.21.0-3.22.0.patch
    - check the changes to upstream patches and summarize them in the commit message,
    - compile an image that contains the package
    - perform some basic sanity tests
    - amend the patch and sign it off: git commit -s --reset-author --amend
    - send it to the appropriate mailing list

Alternatively, if you believe the recipe should not be upgraded at this time,
you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that
automatic upgrades would no longer be attempted.

Please review the attached files for further information and build/update failures.
Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler

Regards,
The Upgrade Helper

-- >8 --
From 5af8f8263601c7f12264583dbd486f5f8ed43037 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Fri, 15 Dec 2023 09:32:38 +0000
Subject: [PATCH] valgrind: upgrade 3.21.0 -> 3.22.0

---
 ...ions-static-to-avoid-assembler-error.patch |  24 +-
 ...rn-a-valid-exit_code-from-vg_regtest.patch |  10 +-
 .../0001-docs-Disable-manual-validation.patch |  10 +-
 ...opcode-not-supported-on-mips32-linux.patch |  18 +-
 ...etting-mcpu-to-cortex-a8-on-arm-arch.patch |  20 +-
 ...check-tests-Fix-timerfd-syscall-test.patch |  33 +-
 ...-vgtests-remove-fullpath-after-flags.patch |  10 +-
 ...eak_cmsg.stderr.exp-adjust-tmp-paths.patch |   8 +-
 ...inux-seg_override.c-add-missing-incl.patch |  30 --
 ...ame-_sifields-to-__si_fields-on-musl.patch |  10 +-
 ...-filter_xml_frames-do-not-filter-usr.patch |  10 +-
 ...ntext-APIs-are-not-available-on-musl.patch |  14 +-
 ...-include-directive-path-for-config.h.patch |  10 +-
 ...est-wrapper-to-support-PTEST-formats.patch |   6 +-
 ...020-Committing-changes-from-do_patch.patch | 332 ++++++++++++++++++
 ...t-for-PPC-instructions-mfatbu-mfatbl.patch |  26 +-
 ...n-for-targets-which-don-t-support-it.patch |   6 +-
 .../valgrind/valgrind/fixed-perl-path.patch   |   2 +-
 .../valgrind/valgrind/s390x_vec_op_t.patch    |  12 +-
 ...te-march-mcpu-mfpu-for-ARM-test-apps.patch |  10 +-
 ...-ld-XXX.so-strlen-intercept-optional.patch |  10 +-
 ...{valgrind_3.21.0.bb => valgrind_3.22.0.bb} |   4 +-
 22 files changed, 445 insertions(+), 170 deletions(-)
 delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-none-tests-x86-linux-seg_override.c-add-missing-incl.patch
 create mode 100644 meta/recipes-devtools/valgrind/valgrind/0020-Committing-changes-from-do_patch.patch
 rename meta/recipes-devtools/valgrind/{valgrind_3.21.0.bb => valgrind_3.22.0.bb} (98%)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-Make-local-functions-static-to-avoid-assembler-error.patch b/meta/recipes-devtools/valgrind/valgrind/0001-Make-local-functions-static-to-avoid-assembler-error.patch
index 8d2ca5733e..7592ce5e47 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-Make-local-functions-static-to-avoid-assembler-error.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-Make-local-functions-static-to-avoid-assembler-error.patch
@@ -1,4 +1,4 @@ 
-From 2155c1b2cf00e744e280c493eb74bf457dfcc3b1 Mon Sep 17 00:00:00 2001
+From c0c6f7b87023a2136b0e04fd589853638ec4bbf6 Mon Sep 17 00:00:00 2001
 From: Randy MacLeod <Randy.MacLeod@windriver.com>
 Date: Sun, 21 Oct 2018 15:09:31 -0400
 Subject: [PATCH] Make local functions static to avoid assembler error
@@ -21,12 +21,13 @@  and more importantly also avoid an assembler error:
 Upstream-Status: Submitted https://bugs.kde.org/show_bug.cgi?id=400164
 
 Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
+
 ---
  helgrind/tests/annotate_hbefore.c | 34 +++++++++++++++----------------
  1 file changed, 17 insertions(+), 17 deletions(-)
 
 diff --git a/helgrind/tests/annotate_hbefore.c b/helgrind/tests/annotate_hbefore.c
-index e311714f7..f55514e45 100644
+index 259d3b6..8438701 100644
 --- a/helgrind/tests/annotate_hbefore.c
 +++ b/helgrind/tests/annotate_hbefore.c
 @@ -24,7 +24,7 @@ typedef  unsigned long int  UWord;
@@ -101,7 +102,7 @@  index e311714f7..f55514e45 100644
  {
    UWord success;
    UWord block[3] = { (UWord)addr, nyu, expected};
-@@ -256,7 +256,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
+@@ -285,7 +285,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
  
  // mips64
  /* return 1 if success, 0 if failure */
@@ -110,7 +111,7 @@  index e311714f7..f55514e45 100644
  {
    UWord success;
    UWord block[3] = { (UWord)addr, nyu, expected};
-@@ -287,7 +287,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
+@@ -316,7 +316,7 @@ UWord do_acasW ( UWord* addr, UWord expected, UWord nyu )
  
  #endif
  
@@ -119,7 +120,7 @@  index e311714f7..f55514e45 100644
  {
     while (1) {
        UWord old = *w;
-@@ -301,7 +301,7 @@ void atomic_incW ( UWord* w )
+@@ -330,7 +330,7 @@ void atomic_incW ( UWord* w )
  
  #define NNN 1000000
  
@@ -128,7 +129,7 @@  index e311714f7..f55514e45 100644
  {
    UWord* w = (UWord*)arg;
    int i;
-@@ -331,10 +331,10 @@ int main ( void )
+@@ -360,10 +360,10 @@ int main ( void )
  
  #endif
  
@@ -141,7 +142,7 @@  index e311714f7..f55514e45 100644
  {
     struct timespec ts = { 0, 1 * 1000 * 1000 };
     // We do the sleep in small pieces to have scheduling
-@@ -348,7 +348,7 @@ void delayXms ( int i )
+@@ -376,7 +376,7 @@ void delayXms ( int i )
     }
  }
  
@@ -150,7 +151,7 @@  index e311714f7..f55514e45 100644
  {
    UWord w0 = *w;
    UWord volatile * wV = w;
-@@ -357,7 +357,7 @@ void do_wait ( UWord* w )
+@@ -385,7 +385,7 @@ void do_wait ( UWord* w )
    ANNOTATE_HAPPENS_AFTER(w);
  }
  
@@ -159,7 +160,7 @@  index e311714f7..f55514e45 100644
  {
    ANNOTATE_HAPPENS_BEFORE(w);
    atomic_incW(w);
-@@ -365,7 +365,7 @@ void do_signal ( UWord* w )
+@@ -393,7 +393,7 @@ void do_signal ( UWord* w )
  
  
  
@@ -168,7 +169,7 @@  index e311714f7..f55514e45 100644
  {
    UWord* w = (UWord*)arg;
    delayXms(500);    // ensure t2 gets to its wait first
-@@ -376,7 +376,7 @@ void* thread_fn1 ( void* arg )
+@@ -404,7 +404,7 @@ void* thread_fn1 ( void* arg )
    return NULL;
  }
  
@@ -177,6 +178,3 @@  index e311714f7..f55514e45 100644
  {
    UWord* w = (UWord*)arg;
    do_wait(w);      // wait for h-b edge from first thread
--- 
-2.17.0
-
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-Return-a-valid-exit_code-from-vg_regtest.patch b/meta/recipes-devtools/valgrind/valgrind/0001-Return-a-valid-exit_code-from-vg_regtest.patch
index e7af5efecc..0b5ec459c8 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-Return-a-valid-exit_code-from-vg_regtest.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-Return-a-valid-exit_code-from-vg_regtest.patch
@@ -1,4 +1,4 @@ 
-From 5eebdefd2251803e7d21081745018fcb16b2ba71 Mon Sep 17 00:00:00 2001
+From c7e13db3404efa559a8cc2565ad8979a4ca783b8 Mon Sep 17 00:00:00 2001
 From: Randy MacLeod <Randy.MacLeod@windriver.com>
 Date: Wed, 8 May 2019 20:16:52 -0400
 Subject: [PATCH] Return a valid exit_code from vg_regtest
@@ -6,15 +6,16 @@  Subject: [PATCH] Return a valid exit_code from vg_regtest
 Upstream-Status: Pending
 
 Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
+
 ---
  tests/vg_regtest.in | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in
-index 909af3be8..f2799c4e3 100755
+index e4bd8cb..fd575b2 100755
 --- a/tests/vg_regtest.in
 +++ b/tests/vg_regtest.in
-@@ -403,6 +403,7 @@ sub mysystem($)
+@@ -401,6 +401,7 @@ sub mysystem($)
              exit 1;
          }
      }
@@ -22,6 +23,3 @@  index 909af3be8..f2799c4e3 100755
  }
  # if $keepunfiltered, copies $1 to $1.unfiltered.out
  # renames $0 tp $1
--- 
-2.17.0
-
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-docs-Disable-manual-validation.patch b/meta/recipes-devtools/valgrind/valgrind/0001-docs-Disable-manual-validation.patch
index 256ddb0c34..d9e545ebde 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-docs-Disable-manual-validation.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-docs-Disable-manual-validation.patch
@@ -1,4 +1,4 @@ 
-From 99fc6fe9b66becac3c94068129e84217330a71a6 Mon Sep 17 00:00:00 2001
+From 78129e4979caa4cfc2f1d111662dbb4d41e41d19 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 13 Jan 2022 18:26:02 -0800
 Subject: [PATCH] docs: Disable manual validation
@@ -14,15 +14,16 @@  Fixes
 
 Upstream-Status: Inappropriate [OE-Specific]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
  docs/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/docs/Makefile.am b/docs/Makefile.am
-index d4250e8..c500306 100644
+index f9ba4e3..0b5a663 100644
 --- a/docs/Makefile.am
 +++ b/docs/Makefile.am
-@@ -192,7 +192,7 @@ valid-manpages: $(MANPAGES_XML_FILES)
+@@ -194,7 +194,7 @@ valid-manpages: $(MANPAGES_XML_FILES)
  	  touch $@; \
  	fi
  
@@ -31,6 +32,3 @@  index d4250e8..c500306 100644
  
  # The text version of the FAQ.
  FAQ.txt:
--- 
-2.34.1
-
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-fix-opcode-not-supported-on-mips32-linux.patch b/meta/recipes-devtools/valgrind/valgrind/0001-fix-opcode-not-supported-on-mips32-linux.patch
index 39b624d9f6..75ed9a5e6e 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-fix-opcode-not-supported-on-mips32-linux.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-fix-opcode-not-supported-on-mips32-linux.patch
@@ -1,7 +1,7 @@ 
-From fb5362f205b37c5060fcd764a7ed393abe4f2f3d Mon Sep 17 00:00:00 2001
+From be582ff8378908599dd4f96cc64b320c2a12e937 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Fri, 27 Jul 2018 17:39:37 +0800
-Subject: [PATCH 1/2] fix opcode not supported on mips32-linux
+Subject: [PATCH] fix opcode not supported on mips32-linux
 
 While build tests(`make check') on mips32-linux, there are
 serial failures such as:
@@ -24,6 +24,7 @@  but missed to pass them to tests which caused the above failure
 
 Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=396905]
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
 ---
  helgrind/tests/Makefile.am    | 5 +++++
  memcheck/tests/Makefile.am    | 5 +++++
@@ -31,10 +32,10 @@  Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  3 files changed, 14 insertions(+)
 
 diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am
-index ad1af191a..6209d35a7 100644
+index 2f323d3..e10d9c0 100755
 --- a/helgrind/tests/Makefile.am
 +++ b/helgrind/tests/Makefile.am
-@@ -214,6 +214,11 @@ check_PROGRAMS += annotate_rwlock
+@@ -243,6 +243,11 @@ check_PROGRAMS += getaddrinfo
  endif
  
  AM_CFLAGS   += $(AM_FLAG_M3264_PRI)
@@ -47,10 +48,10 @@  index ad1af191a..6209d35a7 100644
  
  LDADD = -lpthread
 diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
-index 84e49405f..aff861a32 100644
+index 47b5384..3d92b32 100644
 --- a/memcheck/tests/Makefile.am
 +++ b/memcheck/tests/Makefile.am
-@@ -443,6 +443,11 @@ check_PROGRAMS += reach_thread_register
+@@ -590,6 +590,11 @@ check_PROGRAMS += wcsncpy
  endif
  
  AM_CFLAGS   += $(AM_FLAG_M3264_PRI)
@@ -63,7 +64,7 @@  index 84e49405f..aff861a32 100644
  
  if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX
 diff --git a/none/tests/mips32/Makefile.am b/none/tests/mips32/Makefile.am
-index d11591d45..602cd26f6 100644
+index 70099ff..713ff20 100644
 --- a/none/tests/mips32/Makefile.am
 +++ b/none/tests/mips32/Makefile.am
 @@ -99,6 +99,10 @@ check_PROGRAMS = \
@@ -77,6 +78,3 @@  index d11591d45..602cd26f6 100644
  AM_CFLAGS    += @FLAG_M32@
  AM_CXXFLAGS  += @FLAG_M32@
  AM_CCASFLAGS += @FLAG_M32@
--- 
-2.17.1
-
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch
index 073713c139..2d59127774 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch
@@ -1,4 +1,4 @@ 
-From 715cf122388f3527afa5649cebf9f1522c240693 Mon Sep 17 00:00:00 2001
+From 297705711fa2a3678248fa4858b40b3e8c9eef02 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 20 Apr 2017 10:11:16 -0700
 Subject: [PATCH] makefiles: Drop setting -mcpu to cortex-a8 on arm
@@ -13,6 +13,7 @@  Fixes
 Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=454346]
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
  Makefile.all.am            |  6 +++---
  helgrind/tests/Makefile.am |  6 +++---
@@ -20,10 +21,10 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  3 files changed, 15 insertions(+), 15 deletions(-)
 
 diff --git a/Makefile.all.am b/Makefile.all.am
-index 02059a3..c7c4700 100644
+index 94d65f2..b47ced7 100755
 --- a/Makefile.all.am
 +++ b/Makefile.all.am
-@@ -197,11 +197,11 @@ AM_CCASFLAGS_PPC64LE_LINUX  = @FLAG_M64@ -g
+@@ -234,11 +234,11 @@ AM_CCASFLAGS_X86_FREEBSD    = @FLAG_M32@ -g
  
  AM_FLAG_M3264_ARM_LINUX   = @FLAG_M32@
  AM_CFLAGS_ARM_LINUX       = @FLAG_M32@ \
@@ -39,10 +40,10 @@  index 02059a3..c7c4700 100644
  AM_FLAG_M3264_ARM64_LINUX = @FLAG_M64@
  AM_CFLAGS_ARM64_LINUX     = @FLAG_M64@ $(AM_CFLAGS_BASE)
 diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am
-index df82169..07eb66a 100644
+index 3e2efad..2f323d3 100755
 --- a/helgrind/tests/Makefile.am
 +++ b/helgrind/tests/Makefile.am
-@@ -189,9 +189,9 @@ if ! VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
+@@ -216,9 +216,9 @@ if ! VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
  endif
  
  if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX
@@ -56,10 +57,10 @@  index df82169..07eb66a 100644
  annotate_hbefore_CFLAGS = $(AM_CFLAGS)
  tc07_hbl1_CFLAGS        = $(AM_CFLAGS)
 diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am
-index 024eb6d..ccecb90 100644
+index b337d77..a932164 100644
 --- a/none/tests/arm/Makefile.am
 +++ b/none/tests/arm/Makefile.am
-@@ -52,10 +52,10 @@ allexec_CFLAGS		= $(AM_CFLAGS) @FLAG_W_NO_NONNULL@
+@@ -56,10 +56,10 @@ allexec_CFLAGS		= $(AM_CFLAGS) @FLAG_W_NO_NONNULL@
  # need special helping w.r.t -mfpu and -mfloat-abi, though.
  # Also force -O0 since -O takes hundreds of MB of memory 
  # for v6intThumb.c.
@@ -73,7 +74,7 @@  index 024eb6d..ccecb90 100644
  
  v8crypto_a_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -marm
  v8crypto_t_CFLAGS = $(AM_CFLAGS) -g -O0 -mfpu=crypto-neon-fp-armv8 -mthumb
-@@ -65,23 +65,23 @@ v8memory_a_CFLAGS = $(AM_CFLAGS) -g -O0 \
+@@ -72,23 +72,23 @@ v8memory_a_CFLAGS = $(AM_CFLAGS) -g -O0 \
  v8memory_t_CFLAGS = $(AM_CFLAGS) -g -O0 \
  			-march=armv8-a -mfpu=crypto-neon-fp-armv8 -mthumb
  
@@ -103,6 +104,3 @@  index 024eb6d..ccecb90 100644
 +vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mfpu=vfpv3
  
  vfpv4_fma_CFLAGS  = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm
--- 
-2.12.2
-
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch
index 15fbbe954f..ea1ab62b86 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-tests-Fix-timerfd-syscall-test.patch
@@ -1,4 +1,4 @@ 
-From 5d411fd147d652e9d7bb259f4048693c6e4742aa Mon Sep 17 00:00:00 2001
+From 7a46041519bd9f0174721b852dd05ee3be9baf2d Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 9 Mar 2020 16:30:19 -0700
 Subject: [PATCH] memcheck/tests: Fix timerfd syscall test
@@ -9,15 +9,18 @@  have the implementation or syscall is not defined
 
 Upstream-Status: Submitted [https://sourceforge.net/p/valgrind/mailman/message/36943897/]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
- config.h.in                            |  9 +++++++++
- configure.ac                           |  3 +++
- memcheck/tests/linux/timerfd-syscall.c | 10 ++++++++--
- 5 files changed, 32 insertions(+), 2 deletions(-)
+ config.h.in                            |  3 +++
+ configure.ac                           |  1 +
+ memcheck/tests/linux/timerfd-syscall.c | 14 +++++++++++---
+ 3 files changed, 15 insertions(+), 3 deletions(-)
 
+diff --git a/config.h.in b/config.h.in
+index bb50854..e392f2a 100644
 --- a/config.h.in
 +++ b/config.h.in
-@@ -301,6 +301,9 @@
+@@ -400,6 +400,9 @@
  /* Define to 1 if you have the <sys/sysnvl.h> header file. */
  #undef HAVE_SYS_SYSNVL_H
  
@@ -27,9 +30,11 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  /* Define to 1 if you have the <sys/time.h> header file. */
  #undef HAVE_SYS_TIME_H
  
+diff --git a/configure.ac b/configure.ac
+index bf024ac..bc3e5e6 100755
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4098,6 +4098,7 @@ AC_CHECK_HEADERS([       \
+@@ -4814,6 +4814,7 @@ AC_CHECK_HEADERS([       \
          sys/syscall.h    \
          sys/sysnvl.h     \
          sys/time.h       \
@@ -37,9 +42,11 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
          sys/types.h      \
          ])
  
+diff --git a/memcheck/tests/linux/timerfd-syscall.c b/memcheck/tests/linux/timerfd-syscall.c
+index 61d75b5..1ba888a 100644
 --- a/memcheck/tests/linux/timerfd-syscall.c
 +++ b/memcheck/tests/linux/timerfd-syscall.c
-@@ -45,6 +45,9 @@
+@@ -42,6 +42,9 @@
  #if defined(HAVE_SYS_TIME_H)
  #include <sys/time.h>
  #endif
@@ -49,7 +56,7 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  #if defined(HAVE_SYS_TYPES_H)
  #include <sys/types.h>
  #endif
-@@ -54,7 +57,8 @@
+@@ -51,7 +54,8 @@
   * timerfd_* system call numbers introduced in 2.6.23. These constants are
   * not yet in the glibc 2.7 headers, that is why they are defined here.
   */
@@ -59,7 +66,7 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  #if defined(__x86_64__)
  #define __NR_timerfd_create  283
  #elif defined(__i386__)
-@@ -67,8 +71,10 @@
+@@ -64,8 +68,10 @@
  #error Cannot detect your architecture!
  #endif
  #endif
@@ -71,7 +78,7 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  #if defined(__x86_64__)
  #define __NR_timerfd_settime 286
  #define __NR_timerfd_gettime 287
-@@ -85,7 +91,7 @@
+@@ -82,7 +88,7 @@
  #error Cannot detect your architecture!
  #endif
  #endif
@@ -80,7 +87,7 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  
  
  /* Definitions from include/linux/timerfd.h */
-@@ -127,6 +133,7 @@ void set_timespec(struct timespec *tmr,
+@@ -124,6 +130,7 @@ void set_timespec(struct timespec *tmr, unsigned long long ustime)
    tmr->tv_nsec = (long) (1000ULL * (ustime % 1000000ULL));
  }
  
@@ -88,7 +95,7 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  int timerfd_create(int clockid, int flags)
  {
    return syscall(__NR_timerfd_create, clockid, flags);
-@@ -142,6 +149,7 @@ int timerfd_gettime(int ufc, struct itim
+@@ -139,6 +146,7 @@ int timerfd_gettime(int ufc, struct itimerspec *otmr)
  {
    return syscall(__NR_timerfd_gettime, ufc, otmr);
  }
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-vgtests-remove-fullpath-after-flags.patch b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-vgtests-remove-fullpath-after-flags.patch
index dce8b52ba3..d48be40ab6 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-vgtests-remove-fullpath-after-flags.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-memcheck-vgtests-remove-fullpath-after-flags.patch
@@ -1,4 +1,4 @@ 
-From 3ff82dcb844f98dbf67c69f11f6516bc234725a9 Mon Sep 17 00:00:00 2001
+From f33a0db78a57bb367a809bcbb0750eb7472f9873 Mon Sep 17 00:00:00 2001
 From: Stacy Gaikovaia <Stacy.Gaikovaia@windriver.com>
 Date: Wed, 16 Sep 2020 13:45:07 -0400
 Subject: [PATCH] memcheck vgtests remove fullpath-after flags
@@ -14,13 +14,14 @@  paths in corresponding tests .bb script.
 Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Stacy Gaikovaia <Stacy.Gaikovaia@windriver.com>
+
 ---
  memcheck/tests/badfree3.vgtest | 2 +-
  memcheck/tests/varinfo5.vgtest | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/memcheck/tests/badfree3.vgtest b/memcheck/tests/badfree3.vgtest
-index 3dfc5fd8a..4ee03f00a 100644
+index 3dfc5fd..4ee03f0 100644
 --- a/memcheck/tests/badfree3.vgtest
 +++ b/memcheck/tests/badfree3.vgtest
 @@ -1,3 +1,3 @@
@@ -29,7 +30,7 @@  index 3dfc5fd8a..4ee03f00a 100644
 +vgopts: -q
  stderr_filter_args: badfree.c
 diff --git a/memcheck/tests/varinfo5.vgtest b/memcheck/tests/varinfo5.vgtest
-index 063d00dce..79c4a72a4 100644
+index 063d00d..79c4a72 100644
 --- a/memcheck/tests/varinfo5.vgtest
 +++ b/memcheck/tests/varinfo5.vgtest
 @@ -1,3 +1,3 @@
@@ -37,6 +38,3 @@  index 063d00dce..79c4a72a4 100644
 -vgopts: --fullpath-after=memcheck/  --fullpath-after=coregrind/ --read-var-info=yes --read-inline-info=yes -q
 +vgopts: --read-var-info=yes --read-inline-info=yes -q
  stderr_filter: filter_varinfo3
--- 
-2.25.1
-
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch
index e421ac6c80..6b21937b2a 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch
@@ -1,4 +1,4 @@ 
-From f405297d3382cd98391d02f397e2387da1f42879 Mon Sep 17 00:00:00 2001
+From cc8bd9a423ef3f048bdbef2ec8eba71757cee5b3 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Fri, 24 Jan 2020 17:55:39 +0100
 Subject: [PATCH] none/tests/fdleak_cmsg.stderr.exp: adjust /tmp paths
@@ -8,12 +8,13 @@  valgrind output changes accordingly
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
 ---
  none/tests/fdleak_cmsg.stderr.exp | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/none/tests/fdleak_cmsg.stderr.exp b/none/tests/fdleak_cmsg.stderr.exp
-index 6e5a797b9..0ede1ab18 100644
+index 0fe56ea..5a0605e 100644
 --- a/none/tests/fdleak_cmsg.stderr.exp
 +++ b/none/tests/fdleak_cmsg.stderr.exp
 @@ -25,10 +25,10 @@ Open file descriptor ...: /dev/null
@@ -29,6 +30,3 @@  index 6e5a797b9..0ede1ab18 100644
     ...
  
  Open AF_UNIX socket ...: <unknown>
--- 
-2.17.1
-
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-x86-linux-seg_override.c-add-missing-incl.patch b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-x86-linux-seg_override.c-add-missing-incl.patch
deleted file mode 100644
index 5e36c28523..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-x86-linux-seg_override.c-add-missing-incl.patch
+++ /dev/null
@@ -1,30 +0,0 @@ 
-From 978d9ed7f857f2cdcd2a8632f3c2feb56b99c825 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Mon, 8 May 2023 11:56:35 +0200
-Subject: [PATCH] none/tests/x86-linux/seg_override.c: add missing include for
- musl builds
-
-Otherwise SYS_modify_ldt is undefined.
-
-Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=382034]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
-
----
- none/tests/x86-linux/seg_override.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/none/tests/x86-linux/seg_override.c b/none/tests/x86-linux/seg_override.c
-index ca8fbfe..4ef4394 100644
---- a/none/tests/x86-linux/seg_override.c
-+++ b/none/tests/x86-linux/seg_override.c
-@@ -3,6 +3,10 @@
- #include <errno.h>
- #include <string.h>
- #include "../../../config.h"
-+#if defined(MUSL_LIBC)
-+#include <syscall.h>
-+#include <unistd.h>
-+#endif
- 
- 
- /* Stuff from Wine. */
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch b/meta/recipes-devtools/valgrind/valgrind/0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch
index 27366153f7..12dd88cac3 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch
@@ -1,17 +1,18 @@ 
-From 64ad2744acfb4fa40b1c114633a053f87125a203 Mon Sep 17 00:00:00 2001
+From 7d6947e1656435d3cc88f63ebb0d68a84b62e22c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 10 Jun 2017 00:46:39 -0700
-Subject: [PATCH 1/6] sigqueue: Rename _sifields to __si_fields on musl
+Subject: [PATCH] sigqueue: Rename _sifields to __si_fields on musl
 
 Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
  memcheck/tests/linux/sigqueue.c | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/memcheck/tests/linux/sigqueue.c b/memcheck/tests/linux/sigqueue.c
-index d18bd72..acb7cba 100644
+index 4b6fb0f..d37fe93 100644
 --- a/memcheck/tests/linux/sigqueue.c
 +++ b/memcheck/tests/linux/sigqueue.c
 @@ -8,6 +8,11 @@
@@ -26,6 +27,3 @@  index d18bd72..acb7cba 100644
  int main(int argc, char **argv)
  {
    siginfo_t *si;
--- 
-2.13.1
-
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-filter_xml_frames-do-not-filter-usr.patch b/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-filter_xml_frames-do-not-filter-usr.patch
index bf0f0ded21..9bbf8706db 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-filter_xml_frames-do-not-filter-usr.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-valgrind-filter_xml_frames-do-not-filter-usr.patch
@@ -1,7 +1,7 @@ 
-From d1dea3c2bcf1e22baab39e2c0b8ca59db8a5bc37 Mon Sep 17 00:00:00 2001
+From 37f6150560313a8ce9f58bd4fe618f9944215abe Mon Sep 17 00:00:00 2001
 From: Randy MacLeod <Randy.MacLeod@windriver.com>
 Date: Mon, 13 May 2019 17:12:21 -0400
-Subject: [PATCH 1/2] valgrind: filter_xml_frames: do not filter /usr
+Subject: [PATCH] valgrind: filter_xml_frames: do not filter /usr
 
 filter_xml_frames is intended to filter system paths under
 '/usr' that vary from platform to platform. In the ptest case
@@ -16,12 +16,13 @@  any negative impact.
 Upstream-Status: Inappropriate [Yocto specific]
 
 Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
+
 ---
  tests/filter_xml_frames | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/tests/filter_xml_frames b/tests/filter_xml_frames
-index f1fa3f070..04fbc82de 100755
+index f1fa3f0..04fbc82 100755
 --- a/tests/filter_xml_frames
 +++ b/tests/filter_xml_frames
 @@ -47,7 +47,8 @@ while (my $line = <>)
@@ -34,6 +35,3 @@  index f1fa3f070..04fbc82de 100755
      }
  }
  
--- 
-2.17.0
-
diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch b/meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch
index 7f0e38cb95..09e0500500 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch
@@ -1,4 +1,4 @@ 
-From 26c104adf6c5162572b7aa2fac89d0835b7f8f0b Mon Sep 17 00:00:00 2001
+From 363d3fcb6372087adf9b98abcfb6b11b63ef05b5 Mon Sep 17 00:00:00 2001
 From: Randy MacLeod <Randy.MacLeod@windriver.com>
 Date: Tue, 16 Oct 2018 21:27:46 -0400
 Subject: [PATCH] context APIs are not available on musl
@@ -14,13 +14,14 @@  for valgrind-3.17.
 Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=434775]
 
 Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
+
 ---
  drd/tests/swapcontext.c              | 6 ++++++
  memcheck/tests/linux/stack_changes.c | 7 ++++++-
  2 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/drd/tests/swapcontext.c b/drd/tests/swapcontext.c
-index 622c70bc5..5e72bb0f3 100644
+index 2cb969a..3a9d4fa 100644
 --- a/drd/tests/swapcontext.c
 +++ b/drd/tests/swapcontext.c
 @@ -20,6 +20,7 @@
@@ -31,7 +32,7 @@  index 622c70bc5..5e72bb0f3 100644
  typedef struct thread_local {
    ucontext_t uc[3];
    size_t nrsw;
-@@ -67,9 +68,11 @@ void *worker(void *data)
+@@ -71,9 +72,11 @@ void *worker(void *data)
    swapcontext(&tlocal->uc[0], &tlocal->uc[1]);
    return NULL;
  }
@@ -43,7 +44,7 @@  index 622c70bc5..5e72bb0f3 100644
    enum { NR = 32 };
    thread_local_t tlocal[NR];
    pthread_t thread[NR];
-@@ -94,6 +97,9 @@ int main(int argc, char *argv[])
+@@ -99,6 +102,9 @@ int main(int argc, char *argv[])
  
    for (i = 0; i < NR; i++)
      pthread_join(thread[i], NULL);
@@ -54,7 +55,7 @@  index 622c70bc5..5e72bb0f3 100644
    return 0;
  }
 diff --git a/memcheck/tests/linux/stack_changes.c b/memcheck/tests/linux/stack_changes.c
-index 7f97b90a5..a26cb4ae6 100644
+index 7f97b90..a26cb4a 100644
 --- a/memcheck/tests/linux/stack_changes.c
 +++ b/memcheck/tests/linux/stack_changes.c
 @@ -10,6 +10,7 @@
@@ -87,6 +88,3 @@  index 7f97b90a5..a26cb4ae6 100644
 +#endif
      return 0;
  }
--- 
-2.17.1
-
diff --git a/meta/recipes-devtools/valgrind/valgrind/0003-correct-include-directive-path-for-config.h.patch b/meta/recipes-devtools/valgrind/valgrind/0003-correct-include-directive-path-for-config.h.patch
index c2965c40df..feee4d2f5a 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0003-correct-include-directive-path-for-config.h.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0003-correct-include-directive-path-for-config.h.patch
@@ -1,7 +1,7 @@ 
-From ecbdea7bd8b08205f1bc3f6b72d4b4a80f313fcb Mon Sep 17 00:00:00 2001
+From e857fdbf79e38951ccea0227df587a692f4ff66d Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 10 Jun 2017 01:03:17 -0700
-Subject: [PATCH 3/6] correct include directive path for config.h
+Subject: [PATCH] correct include directive path for config.h
 
 when building out of source tree, it can not find
 the generated config.h otherwise
@@ -9,13 +9,14 @@  the generated config.h otherwise
 Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
  memcheck/tests/linux/syscalls-2007.c  | 2 +-
  memcheck/tests/linux/syslog-syscall.c | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/memcheck/tests/linux/syscalls-2007.c b/memcheck/tests/linux/syscalls-2007.c
-index b61c6d5..cc3fd62 100644
+index b91df82..c15c3eb 100644
 --- a/memcheck/tests/linux/syscalls-2007.c
 +++ b/memcheck/tests/linux/syscalls-2007.c
 @@ -10,7 +10,7 @@
@@ -40,6 +41,3 @@  index 1143722..21e758b 100644
  #include <stdio.h>
  #if defined(HAVE_SYS_KLOG_H)
  #include <sys/klog.h>
--- 
-2.13.1
-
diff --git a/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch b/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch
index fea3b00f62..a3a75211a4 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0005-Modify-vg_test-wrapper-to-support-PTEST-formats.patch
@@ -1,4 +1,4 @@ 
-From e244a72c6f8803550f37e81f72bbae039651013b Mon Sep 17 00:00:00 2001
+From 44dbeba08f47dfcfef004e191b6b24ddf7687349 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Tue, 15 Dec 2015 15:50:44 +0200
 Subject: [PATCH] Modify vg_test wrapper to support PTEST formats
@@ -24,6 +24,7 @@  Increase time limit to 90 s.
 (double of the expected time of drd/tests/std_list on qemuarm64)
 
 Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
+
 ---
  tests/vg_regtest.in | 75 +++++++++++++++++++++++++++++++++------------
  1 file changed, 55 insertions(+), 20 deletions(-)
@@ -252,6 +253,3 @@  index ad18800..e4bd8cb 100755
      }
      print "\n";
  }
--- 
-2.30.2
-
diff --git a/meta/recipes-devtools/valgrind/valgrind/0020-Committing-changes-from-do_patch.patch b/meta/recipes-devtools/valgrind/valgrind/0020-Committing-changes-from-do_patch.patch
new file mode 100644
index 0000000000..dd17060950
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/0020-Committing-changes-from-do_patch.patch
@@ -0,0 +1,332 @@ 
+From 24b32d113f2928c77eff900ee2b4486321c95676 Mon Sep 17 00:00:00 2001
+From: OpenEmbedded <oe.patch@oe>
+Date: Fri, 15 Dec 2023 09:31:32 +0000
+Subject: [PATCH] Committing changes from do_patch
+
+---
+ memcheck/tests/badfree3.stderr.exp |   4 +-
+ memcheck/tests/varinfo5.stderr.exp | 216 ++++++++++++++---------------
+ 2 files changed, 110 insertions(+), 110 deletions(-)
+
+diff --git a/memcheck/tests/badfree3.stderr.exp b/memcheck/tests/badfree3.stderr.exp
+index 20e48a6..b518703 100644
+--- a/memcheck/tests/badfree3.stderr.exp
++++ b/memcheck/tests/badfree3.stderr.exp
+@@ -1,11 +1,11 @@
+ Invalid free() / delete / delete[] / realloc()
+    at 0x........: free (vg_replace_malloc.c:...)
+-   by 0x........: main (tests/badfree.c:12)
++   by 0x........: main (badfree.c:12)
+  Address 0x........ is not stack'd, malloc'd or (recently) free'd
+ 
+ Invalid free() / delete / delete[] / realloc()
+    at 0x........: free (vg_replace_malloc.c:...)
+-   by 0x........: main (tests/badfree.c:15)
++   by 0x........: main (badfree.c:15)
+  Address 0x........ is on thread 1's stack
+  in frame #1, created by main (badfree.c:7)
+ 
+diff --git a/memcheck/tests/varinfo5.stderr.exp b/memcheck/tests/varinfo5.stderr.exp
+index 1a10d03..0fd1190 100644
+--- a/memcheck/tests/varinfo5.stderr.exp
++++ b/memcheck/tests/varinfo5.stderr.exp
+@@ -1,191 +1,191 @@
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: varinfo1_main (tests/varinfo5so.c:52)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:154)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: varinfo1_main (varinfo5so.c:52)
++   by 0x........: varinfo5_main (varinfo5so.c:154)
++   by 0x........: main (varinfo5.c:5)
+  Address 0x........ is 1 bytes inside a block of size 3 alloc'd
+    at 0x........: malloc (vg_replace_malloc.c:...)
+-   by 0x........: varinfo1_main (tests/varinfo5so.c:50)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:154)
+-   by 0x........: main (tests/varinfo5.c:5)
++   by 0x........: varinfo1_main (varinfo5so.c:50)
++   by 0x........: varinfo5_main (varinfo5so.c:154)
++   by 0x........: main (varinfo5.c:5)
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: varinfo1_main (tests/varinfo5so.c:55)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:154)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: varinfo1_main (varinfo5so.c:55)
++   by 0x........: varinfo5_main (varinfo5so.c:154)
++   by 0x........: main (varinfo5.c:5)
+  Location 0x........ is 0 bytes inside global var "global_u1"
+  declared at varinfo5so.c:38
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: varinfo1_main (tests/varinfo5so.c:56)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:154)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: varinfo1_main (varinfo5so.c:56)
++   by 0x........: varinfo5_main (varinfo5so.c:154)
++   by 0x........: main (varinfo5.c:5)
+  Location 0x........ is 0 bytes inside global var "global_i1"
+  declared at varinfo5so.c:40
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: varinfo1_main (tests/varinfo5so.c:57)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:154)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: varinfo1_main (varinfo5so.c:57)
++   by 0x........: varinfo5_main (varinfo5so.c:154)
++   by 0x........: main (varinfo5.c:5)
+  Location 0x........ is 0 bytes inside global_u2[3],
+  a global variable declared at varinfo5so.c:42
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: varinfo1_main (tests/varinfo5so.c:58)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:154)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: varinfo1_main (varinfo5so.c:58)
++   by 0x........: varinfo5_main (varinfo5so.c:154)
++   by 0x........: main (varinfo5.c:5)
+  Location 0x........ is 0 bytes inside global_i2[7],
+  a global variable declared at varinfo5so.c:44
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: varinfo1_main (tests/varinfo5so.c:59)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:154)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: varinfo1_main (varinfo5so.c:59)
++   by 0x........: varinfo5_main (varinfo5so.c:154)
++   by 0x........: main (varinfo5.c:5)
+  Location 0x........ is 0 bytes inside local var "local"
+  declared at varinfo5so.c:49, in frame #X of thread 1
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: foo2 (tests/varinfo5so.c:71)
+-   by 0x........: varinfo2_main (tests/varinfo5so.c:81)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:155)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: foo2 (varinfo5so.c:71)
++   by 0x........: varinfo2_main (varinfo5so.c:81)
++   by 0x........: varinfo5_main (varinfo5so.c:155)
++   by 0x........: main (varinfo5.c:5)
+  Location 0x........ is 0 bytes inside var[7],
+  declared at varinfo5so.c:69, in frame #X of thread 1
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: foo2 (tests/varinfo5so.c:73)
+-   by 0x........: varinfo2_main (tests/varinfo5so.c:81)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:155)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: foo2 (varinfo5so.c:73)
++   by 0x........: varinfo2_main (varinfo5so.c:81)
++   by 0x........: varinfo5_main (varinfo5so.c:155)
++   by 0x........: main (varinfo5.c:5)
+  Location 0x........ is 2 bytes inside var.bar,
+  declared at varinfo5so.c:72, in frame #X of thread 1
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: foo2 (tests/varinfo5so.c:76)
+-   by 0x........: varinfo2_main (tests/varinfo5so.c:81)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:155)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: foo2 (varinfo5so.c:76)
++   by 0x........: varinfo2_main (varinfo5so.c:81)
++   by 0x........: varinfo5_main (varinfo5so.c:155)
++   by 0x........: main (varinfo5.c:5)
+  Location 0x........ is 1 byte inside local var "var"
+  declared at varinfo5so.c:67, in frame #X of thread 1
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: foo3 (tests/varinfo5so.c:106)
+-   by 0x........: varinfo3_main (tests/varinfo5so.c:118)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:156)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: foo3 (varinfo5so.c:106)
++   by 0x........: varinfo3_main (varinfo5so.c:118)
++   by 0x........: varinfo5_main (varinfo5so.c:156)
++   by 0x........: main (varinfo5.c:5)
+  Location 0x........ is 0 bytes inside static_global_def[1],
+  a global variable declared at varinfo5so.c:87
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: foo3 (tests/varinfo5so.c:107)
+-   by 0x........: varinfo3_main (tests/varinfo5so.c:118)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:156)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: foo3 (varinfo5so.c:107)
++   by 0x........: varinfo3_main (varinfo5so.c:118)
++   by 0x........: varinfo5_main (varinfo5so.c:156)
++   by 0x........: main (varinfo5.c:5)
+  Location 0x........ is 0 bytes inside nonstatic_global_def[2],
+  a global variable declared at varinfo5so.c:88
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: foo3 (tests/varinfo5so.c:108)
+-   by 0x........: varinfo3_main (tests/varinfo5so.c:118)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:156)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: foo3 (varinfo5so.c:108)
++   by 0x........: varinfo3_main (varinfo5so.c:118)
++   by 0x........: varinfo5_main (varinfo5so.c:156)
++   by 0x........: main (varinfo5.c:5)
+  Location 0x........ is 0 bytes inside static_global_undef[3],
+  a global variable declared at varinfo5so.c:89
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: foo3 (tests/varinfo5so.c:109)
+-   by 0x........: varinfo3_main (tests/varinfo5so.c:118)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:156)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: foo3 (varinfo5so.c:109)
++   by 0x........: varinfo3_main (varinfo5so.c:118)
++   by 0x........: varinfo5_main (varinfo5so.c:156)
++   by 0x........: main (varinfo5.c:5)
+  Location 0x........ is 0 bytes inside nonstatic_global_undef[4],
+  a global variable declared at varinfo5so.c:90
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: bar3 (tests/varinfo5so.c:94)
+-   by 0x........: foo3 (tests/varinfo5so.c:110)
+-   by 0x........: varinfo3_main (tests/varinfo5so.c:118)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:156)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: bar3 (varinfo5so.c:94)
++   by 0x........: foo3 (varinfo5so.c:110)
++   by 0x........: varinfo3_main (varinfo5so.c:118)
++   by 0x........: varinfo5_main (varinfo5so.c:156)
++   by 0x........: main (varinfo5.c:5)
+  Address 0x........ is 5 bytes inside data symbol "static_local_def.XXXX"
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: bar3 (tests/varinfo5so.c:95)
+-   by 0x........: foo3 (tests/varinfo5so.c:110)
+-   by 0x........: varinfo3_main (tests/varinfo5so.c:118)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:156)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: bar3 (varinfo5so.c:95)
++   by 0x........: foo3 (varinfo5so.c:110)
++   by 0x........: varinfo3_main (varinfo5so.c:118)
++   by 0x........: varinfo5_main (varinfo5so.c:156)
++   by 0x........: main (varinfo5.c:5)
+  Location 0x........ is 0 bytes inside nonstatic_local_def[6],
+  declared at varinfo5so.c:103, in frame #X of thread 1
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: bar3 (tests/varinfo5so.c:96)
+-   by 0x........: foo3 (tests/varinfo5so.c:110)
+-   by 0x........: varinfo3_main (tests/varinfo5so.c:118)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:156)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: bar3 (varinfo5so.c:96)
++   by 0x........: foo3 (varinfo5so.c:110)
++   by 0x........: varinfo3_main (varinfo5so.c:118)
++   by 0x........: varinfo5_main (varinfo5so.c:156)
++   by 0x........: main (varinfo5.c:5)
+  Address 0x........ is 7 bytes inside data symbol "static_local_undef.XXXX"
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: bar3 (tests/varinfo5so.c:97)
+-   by 0x........: foo3 (tests/varinfo5so.c:110)
+-   by 0x........: varinfo3_main (tests/varinfo5so.c:118)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:156)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: bar3 (varinfo5so.c:97)
++   by 0x........: foo3 (varinfo5so.c:110)
++   by 0x........: varinfo3_main (varinfo5so.c:118)
++   by 0x........: varinfo5_main (varinfo5so.c:156)
++   by 0x........: main (varinfo5.c:5)
+  Location 0x........ is 0 bytes inside nonstatic_local_undef[8],
+  declared at varinfo5so.c:105, in frame #X of thread 1
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: blah4 (tests/varinfo5so.c:137)
+-   by 0x........: varinfo4_main (tests/varinfo5so.c:146)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:157)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: blah4 (varinfo5so.c:137)
++   by 0x........: varinfo4_main (varinfo5so.c:146)
++   by 0x........: varinfo5_main (varinfo5so.c:157)
++   by 0x........: main (varinfo5.c:5)
+  Location 0x........ is 1 byte inside a[3].xyzzy[21].c1,
+  declared at varinfo5so.c:135, in frame #X of thread 1
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: blah4 (tests/varinfo5so.c:138)
+-   by 0x........: varinfo4_main (tests/varinfo5so.c:146)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:157)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: blah4 (varinfo5so.c:138)
++   by 0x........: varinfo4_main (varinfo5so.c:146)
++   by 0x........: varinfo5_main (varinfo5so.c:157)
++   by 0x........: main (varinfo5.c:5)
+  Location 0x........ is 0 bytes inside a[5].bong,
+  declared at varinfo5so.c:135, in frame #X of thread 1
+ 
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: blah4 (tests/varinfo5so.c:139)
+-   by 0x........: varinfo4_main (tests/varinfo5so.c:146)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:157)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: blah4 (varinfo5so.c:139)
++   by 0x........: varinfo4_main (varinfo5so.c:146)
++   by 0x........: varinfo5_main (varinfo5so.c:157)
++   by 0x........: main (varinfo5.c:5)
+  Location 0x........ is 1 byte inside a[3].xyzzy[21].c2[2],
+  declared at varinfo5so.c:135, in frame #X of thread 1
+ 
+ answer is 0
+ Uninitialised byte(s) found during client check request
+-   at 0x........: croak (tests/varinfo5so.c:29)
+-   by 0x........: fun_c (tests/varinfo5so.c:164)
+-   by 0x........: fun_b (tests/varinfo5so.c:168)
+-   by 0x........: fun_a (tests/varinfo5so.c:172)
+-   by 0x........: inlinetest (tests/varinfo5so.c:178)
+-   by 0x........: varinfo5_main (tests/varinfo5so.c:158)
+-   by 0x........: main (tests/varinfo5.c:5)
++   at 0x........: croak (varinfo5so.c:29)
++   by 0x........: fun_c (varinfo5so.c:164)
++   by 0x........: fun_b (varinfo5so.c:168)
++   by 0x........: fun_a (varinfo5so.c:172)
++   by 0x........: inlinetest (varinfo5so.c:178)
++   by 0x........: varinfo5_main (varinfo5so.c:158)
++   by 0x........: main (varinfo5.c:5)
+  Address 0x........ is on thread 1's stack
+  in frame #X, created by varinfo5_main (varinfo5so.c:153)
+ 
diff --git a/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch b/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
index 51cd3532d3..c32285aaca 100644
--- a/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
@@ -1,4 +1,4 @@ 
-From 0bf4b0ac18d1ea41b32ad781d214b295ca1998f3 Mon Sep 17 00:00:00 2001
+From e33c0f10afad31ae7ef9b1ee5e19cf029591e721 Mon Sep 17 00:00:00 2001
 From: Aneesh Bansal <aneesh.bansal@freescale.com>
 Date: Mon, 21 Nov 2011 17:31:39 +0530
 Subject: [PATCH] Added support for PPC instructions mfatbu, mfatbl.
@@ -10,18 +10,18 @@  disInstr(ppc): unhandled instruction: 0x7C0F82A6
 Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=289836]
 
 Signed-off-by: Aneesh Bansal <aneesh.bansal@freescale.com>
----
 
- VEX/priv/guest_ppc_defs.h    |    2 ++
- VEX/priv/guest_ppc_helpers.c |   18 ++++++++++++++++++
- VEX/priv/guest_ppc_toIR.c    |   22 ++++++++++++++++++++++
- 3 files changed, 42 insertions(+), 0 deletions(-)
+---
+ VEX/priv/guest_ppc_defs.h    |  2 ++
+ VEX/priv/guest_ppc_helpers.c | 18 ++++++++++++++++++
+ VEX/priv/guest_ppc_toIR.c    | 22 ++++++++++++++++++++++
+ 3 files changed, 42 insertions(+)
 
 diff --git a/VEX/priv/guest_ppc_defs.h b/VEX/priv/guest_ppc_defs.h
-index dd3c62e..11a34aa 100644
+index 220fbf1..cd259f3 100644
 --- a/VEX/priv/guest_ppc_defs.h
 +++ b/VEX/priv/guest_ppc_defs.h
-@@ -146,6 +146,8 @@ extern UInt ppc32g_dirtyhelper_MFSPR_268_269 ( UInt );
+@@ -233,6 +233,8 @@ extern UInt ppc32g_dirtyhelper_MFSPR_268_269 ( UInt );
  
  extern UInt ppc32g_dirtyhelper_MFSPR_287 ( void );
  
@@ -31,10 +31,10 @@  index dd3c62e..11a34aa 100644
                                       UInt vD_idx, UInt sh,
                                       UInt shift_right );
 diff --git a/VEX/priv/guest_ppc_helpers.c b/VEX/priv/guest_ppc_helpers.c
-index 11aa428..b49ea3f 100644
+index 2611e52..72c349b 100644
 --- a/VEX/priv/guest_ppc_helpers.c
 +++ b/VEX/priv/guest_ppc_helpers.c
-@@ -119,6 +119,24 @@ UInt ppc32g_dirtyhelper_MFSPR_287 ( void )
+@@ -118,6 +118,24 @@ UInt ppc32g_dirtyhelper_MFSPR_287 ( void )
  #  endif
  }
  
@@ -60,10 +60,10 @@  index 11aa428..b49ea3f 100644
  /* CALLED FROM GENERATED CODE */
  /* DIRTY HELPER (reads guest state, writes guest mem) */
 diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c
-index f8d220d..37c8974 100644
+index d05cce3..723e06a 100644
 --- a/VEX/priv/guest_ppc_toIR.c
 +++ b/VEX/priv/guest_ppc_toIR.c
-@@ -5657,6 +5657,28 @@ static Bool dis_proc_ctl ( VexAbiInfo* vbi, UInt theInstr )
+@@ -11875,6 +11875,28 @@ static Bool dis_proc_ctl ( const VexAbiInfo* vbi, UInt prefix, UInt theInstr )
           break;
        }
  
@@ -92,5 +92,3 @@  index f8d220d..37c8974 100644
        default:
           vex_printf("dis_proc_ctl(ppc)(mfspr,SPR)(0x%x)\n", SPR);
           return False;
--- 
-1.7.0.4
diff --git a/meta/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch b/meta/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch
index 82b8344279..8792433bfb 100644
--- a/meta/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/avoid-neon-for-targets-which-don-t-support-it.patch
@@ -1,4 +1,4 @@ 
-From 8facc29c3c56e6cf9cfef70986cf73876044a3fb Mon Sep 17 00:00:00 2001
+From c7d80ca2ca3297a35f3fb0433e77bb7c7fb8e239 Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <armccurdy@gmail.com>
 Date: Tue, 19 Jan 2016 16:42:36 -0800
 Subject: [PATCH] avoid neon for targets which don't support it
@@ -11,6 +11,7 @@  support neon.
 Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=454346]
 
 Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
+
 ---
  memcheck/tests/sh-mem-random.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -28,6 +29,3 @@  index ae82248..816e139 100644
              /* On arm32, many compilers generate a 64-bit float move
                 using two 32 bit integer registers, which completely
                 defeats this test.  Hence force a 64-bit NEON load and
--- 
-1.9.1
-
diff --git a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
index b9804e7451..cc0c72b227 100644
--- a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
@@ -1,4 +1,4 @@ 
-From beaa5b64c60d501fa9cd59fdc563e5f5bccf6882 Mon Sep 17 00:00:00 2001
+From 8592038ebdb7a60c9df218e98d0b3da7eda492c2 Mon Sep 17 00:00:00 2001
 From: Qing He <qing.he@intel.com>
 Date: Tue, 31 Aug 2010 22:51:58 +0800
 Subject: [PATCH] valgrind: fix perl scripts
diff --git a/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch b/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch
index bde1241dc7..bdca607d61 100644
--- a/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch
@@ -1,7 +1,7 @@ 
-From 8154d38bac5cdb3675cfdaf562ab9da01988b263 Mon Sep 17 00:00:00 2001
+From 68a1ac56019f3e9af146a6cee3330e6258d8df5d Mon Sep 17 00:00:00 2001
 From: Yi Fan Yu <yifan.yu@windriver.com>
 Date: Wed, 17 Mar 2021 12:16:31 -0400
-Subject: [PATCH 19/20] remove s390x_vec_op_t
+Subject: [PATCH] remove s390x_vec_op_t
 
 s390x_vec_op_t is not needed anywhere, only elements of enum are accessed
 removing it ensures that valgrind can be built with -fno-common option
@@ -13,15 +13,16 @@  Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
+
 ---
  VEX/priv/guest_s390_defs.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/VEX/priv/guest_s390_defs.h b/VEX/priv/guest_s390_defs.h
-index 9054290..dab8002 100644
+index 24f3798..7b8be78 100644
 --- a/VEX/priv/guest_s390_defs.h
 +++ b/VEX/priv/guest_s390_defs.h
-@@ -284,7 +284,7 @@ typedef enum {
+@@ -279,7 +279,7 @@ typedef enum {
     S390_VEC_OP_VBPERM,
     S390_VEC_OP_VMSL,
     S390_VEC_OP_LAST             // supposed to be the last element in enum
@@ -30,6 +31,3 @@  index 9054290..dab8002 100644
  
  /* Arguments of s390x_dirtyhelper_vec_op(...) which are packed into one
     ULong variable.
--- 
-2.29.2
-
diff --git a/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch b/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch
index f15d04b173..35cbf360d8 100644
--- a/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch
@@ -1,4 +1,4 @@ 
-From d134dafc2f11e0d247420a0ba360bcdef77b4093 Mon Sep 17 00:00:00 2001
+From 5df24ca5c32bd96181474f55eb7e340fed3976c0 Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <armccurdy@gmail.com>
 Date: Tue, 19 Jan 2016 16:00:00 -0800
 Subject: [PATCH] use appropriate -march/-mcpu/-mfpu for ARM test apps
@@ -18,15 +18,16 @@  See similar cases in none/tests/arm/Makefile.am
 Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=454346]
 
 Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
+
 ---
  none/tests/arm/Makefile.am | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am
-index 4507a20..825290f 100644
+index 4776ea7..b337d77 100644
 --- a/none/tests/arm/Makefile.am
 +++ b/none/tests/arm/Makefile.am
-@@ -62,8 +62,10 @@ neon64_CFLAGS     = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \
+@@ -85,8 +85,10 @@ neon64_CFLAGS     = $(AM_CFLAGS) -g -O0 -mcpu=cortex-a8 \
  			-mfpu=neon \
  			-mthumb
  
@@ -39,6 +40,3 @@  index 4507a20..825290f 100644
 +vcvt_fixed_float_VFP_CFLAGS = $(AM_CFLAGS) -g -mcpu=cortex-a8 -mfpu=vfpv3
 +
 +vfpv4_fma_CFLAGS  = $(AM_CFLAGS) -g -O0 -march=armv7ve -mcpu=cortex-a15 -mfpu=vfpv4 -marm
--- 
-1.9.1
-
diff --git a/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch b/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch
index d04297dca8..96584e9e81 100644
--- a/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/valgrind-make-ld-XXX.so-strlen-intercept-optional.patch
@@ -1,4 +1,4 @@ 
-From 005bd11809a1ce65e9f2c28e884354a4741650b9 Mon Sep 17 00:00:00 2001
+From a0a7069cd8a869235afb2718ed58ad117faa492e Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <armccurdy@gmail.com>
 Date: Tue, 13 Dec 2016 11:29:55 +0800
 Subject: [PATCH] make ld-XXX.so strlen intercept optional
@@ -12,15 +12,16 @@  Upstream-Status: Inappropriate
 
 Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+
 ---
  coregrind/m_redir.c | 13 ++++++++++++-
  1 file changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c
-index ff35009..d7d6816 100644
+index cef241b..0a7dc5f 100644
 --- a/coregrind/m_redir.c
 +++ b/coregrind/m_redir.c
-@@ -1275,7 +1275,18 @@ static void add_hardwired_spec (const  HChar* sopatt, const HChar* fnpatt,
+@@ -1307,7 +1307,18 @@ static void add_hardwired_spec (const  HChar* sopatt, const HChar* fnpatt,
     spec->to_addr     = to_addr;
     spec->isWrap      = False;
     spec->isGlobal    = False;
@@ -40,6 +41,3 @@  index ff35009..d7d6816 100644
     /* VARIABLE PARTS */
     spec->mark        = False; /* not significant */
     spec->done        = False; /* not significant */
--- 
-1.9.1
-
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.21.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.22.0.bb
similarity index 98%
rename from meta/recipes-devtools/valgrind/valgrind_3.21.0.bb
rename to meta/recipes-devtools/valgrind/valgrind_3.22.0.bb
index 67a197c509..612bec190b 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.21.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.22.0.bb
@@ -36,9 +36,9 @@  SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
            file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \
            file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \
            file://0001-docs-Disable-manual-validation.patch \
-           file://0001-none-tests-x86-linux-seg_override.c-add-missing-incl.patch \
+           file://0020-Committing-changes-from-do_patch.patch \
            "
-SRC_URI[sha256sum] = "10ce1618bb3e33fad16eb79552b0a3e1211762448a0d7fce11c8a6243b9ac971"
+SRC_URI[sha256sum] = "c811db5add2c5f729944caf47c4e7a65dcaabb9461e472b578765dd7bf6d2d4c"
 UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar"
 
 COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64).*-linux'