diff mbox series

[AUH] valgrind: upgrading to 3.26.0 SUCCEEDED

Message ID 0101019a564ec66a-6e8ca640-e5b9-4051-b703-8d4bf8fa1ba7-000000@us-west-2.amazonses.com
State New
Headers show
Series [AUH] valgrind: upgrading to 3.26.0 SUCCEEDED | expand

Commit Message

auh@yoctoproject.org Nov. 5, 2025, 11:16 p.m. UTC
Hello,

this email is a notification from the Auto Upgrade Helper
that the automatic attempt to upgrade the recipe(s) *valgrind* to *3.26.0* has Succeeded.

Next steps:
    - apply the patch: git am 0001-valgrind-upgrade-3.25.1-3.26.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 c895b188bb5747cf9d0d40d502f9f0d306e7d2a7 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Wed, 5 Nov 2025 18:41:35 +0000
Subject: [PATCH] valgrind: upgrade 3.25.1 -> 3.26.0

---
 ...tax-for-pushsection-directive-in-inl.patch |   31 -
 ...e-Drop-setting-mcpu-cortex-a8-on-arm.patch |    4 +-
 .../0001-docs-Disable-manual-validation.patch |    6 +-
 ...etting-mcpu-to-cortex-a8-on-arm-arch.patch |    6 +-
 ...check-tests-Fix-timerfd-syscall-test.patch |   10 +-
 ...-vgtests-remove-fullpath-after-flags.patch |    2 +-
 ...eak_cmsg.stderr.exp-adjust-tmp-paths.patch |    2 +-
 ...ame-_sifields-to-__si_fields-on-musl.patch |    2 +-
 .../0001-tests-arm-Use-O-instead-of-O0.patch  |    2 +-
 ...-filter_xml_frames-do-not-filter-usr.patch |    2 +-
 ...-include-directive-path-for-config.h.patch |    2 +-
 ...t-for-PPC-instructions-mfatbu-mfatbl.patch |    8 +-
 ...n-for-targets-which-don-t-support-it.patch |    2 +-
 .../valgrind/valgrind/fixed-perl-path.patch   |    8 +-
 .../valgrind/valgrind/s390x_vec_op_t.patch    |    4 +-
 ...te-march-mcpu-mfpu-for-ARM-test-apps.patch |    2 +-
 ...-ld-XXX.so-strlen-intercept-optional.patch |    4 +-
 .../valgrind/valgrind_3.25.1.bb               |  116 --
 .../valgrind/valgrind_3.26.0.bb               | 1116 +++++++++++++++++
 19 files changed, 1149 insertions(+), 180 deletions(-)
 delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-Use-portable-syntax-for-pushsection-directive-in-inl.patch
 delete mode 100644 meta/recipes-devtools/valgrind/valgrind_3.25.1.bb
 create mode 100644 meta/recipes-devtools/valgrind/valgrind_3.26.0.bb
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 b59c544223..0000000000
--- 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-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch b/meta/recipes-devtools/valgrind/valgrind/0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch
index 3c8bec82b3..2093707ff0 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch
@@ -1,4 +1,4 @@ 
-From 5a776e61af5ab7f0cfd10cde55c796189686916f Mon Sep 17 00:00:00 2001
+From bd65a36254ee2c513385e3ee18922e6db165fc68 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 10 May 2024 16:27:34 -0700
 Subject: [PATCH] configure: Drop setting mcpu=cortex-a8 on arm
@@ -16,7 +16,7 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 2dfbd1c..b42fdd4 100755
+index e30e4c1..a250680 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -251,13 +251,13 @@ case "${host_cpu}" in
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 fbd799eeea..ad473ac9e8 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 4f674f458b1f0675abdc0ced01239e99bfa40de8 Mon Sep 17 00:00:00 2001
+From 322077d5ba4b8fcf9ddc06ae11fce7fde219da0a 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
@@ -19,10 +19,10 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/docs/Makefile.am b/docs/Makefile.am
-index 68a3da5..9833d5c 100644
+index 7e5ed38..63a1aa7 100644
 --- a/docs/Makefile.am
 +++ b/docs/Makefile.am
-@@ -202,7 +202,7 @@ valid-manpages: $(MANPAGES_XML_FILES)
+@@ -223,7 +223,7 @@ valid-manpages: $(MANPAGES_XML_FILES)
  	  fi \
  	fi
  
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 f8d1e87ba9..cd55d4e032 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 c878aaacadf8ec723be882f9335cb33240df13d6 Mon Sep 17 00:00:00 2001
+From fa546b57e7cd21d42dacacd7503689a68cf5dfec 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
@@ -19,10 +19,10 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  2 files changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am
-index 7adc5c6..cac23c9 100755
+index b8c5fd0..c55775a 100644
 --- a/helgrind/tests/Makefile.am
 +++ b/helgrind/tests/Makefile.am
-@@ -226,9 +226,9 @@ if ! VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
+@@ -227,9 +227,9 @@ if ! VGCONF_PLATFORMS_INCLUDE_X86_DARWIN
  endif
  
  if VGCONF_PLATFORMS_INCLUDE_ARM_LINUX
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 200b2602cb..21db164d53 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 3a51ed107f67732910dec12279a9279e158afbe7 Mon Sep 17 00:00:00 2001
+From 72e13528ec922a73b222c9cac21e667743ebebbf 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
@@ -16,10 +16,10 @@  Signed-off-by: Khem Raj <raj.khem@gmail.com>
  3 files changed, 15 insertions(+), 3 deletions(-)
 
 diff --git a/config.h.in b/config.h.in
-index 00db1a6..23fd77a 100644
+index 0d4d170..f02b05a 100644
 --- a/config.h.in
 +++ b/config.h.in
-@@ -409,6 +409,9 @@
+@@ -421,6 +421,9 @@
  /* Define to 1 if you have the <sys/sysnvl.h> header file. */
  #undef HAVE_SYS_SYSNVL_H
  
@@ -30,10 +30,10 @@  index 00db1a6..23fd77a 100644
  #undef HAVE_SYS_TIME_H
  
 diff --git a/configure.ac b/configure.ac
-index b42fdd4..ec95146 100755
+index a250680..870f44d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4892,6 +4892,7 @@ AC_CHECK_HEADERS([       \
+@@ -4926,6 +4926,7 @@ AC_CHECK_HEADERS([       \
          sys/syscall.h    \
          sys/sysnvl.h     \
          sys/time.h       \
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 9a3596cac1..71d0e4811e 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 b703b0d11adc9147a7d97817bd771ac40b8c4d39 Mon Sep 17 00:00:00 2001
+From 8b476ef9cbc87950ab33645f2312f9d920b259fa 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
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 7deca99202..51f91998fd 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 bbb5e8a6fc5eec178f8077ab006ab42c009528d4 Mon Sep 17 00:00:00 2001
+From caee0a73d3f3b264713cd74a1aca4244d23d5407 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
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 efa6c2c895..7dfb876df5 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,4 +1,4 @@ 
-From c287382a1f3dd9f2db3df54dde54b4b266791bb9 Mon Sep 17 00:00:00 2001
+From be299212b2131682d8fe8ad393ecd86a70b097e2 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] sigqueue: Rename _sifields to __si_fields on musl
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-tests-arm-Use-O-instead-of-O0.patch b/meta/recipes-devtools/valgrind/valgrind/0001-tests-arm-Use-O-instead-of-O0.patch
index 3eea195579..2e484dc1b6 100644
--- a/meta/recipes-devtools/valgrind/valgrind/0001-tests-arm-Use-O-instead-of-O0.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-tests-arm-Use-O-instead-of-O0.patch
@@ -1,4 +1,4 @@ 
-From 8087ae8dcc46f3f81af58ed9b7176761b988ee61 Mon Sep 17 00:00:00 2001
+From 3eb1b7354d149c5519471e8b796a5e0c0f874bc9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 10 May 2024 17:44:47 -0700
 Subject: [PATCH] tests/arm: Use -O instead of -O0
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 c64c2afd3f..02e65dbc92 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,4 +1,4 @@ 
-From f8fbebcf69e4a8bf2122b7c55f2ce372377af1bc Mon Sep 17 00:00:00 2001
+From 6856b9f402850bcccb2acb33a44505850fcaab08 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] valgrind: filter_xml_frames: do not filter /usr
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 3acb5a28f4..02a3b897d0 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,4 +1,4 @@ 
-From de4d7e478515b63f049b211266d9b946c15cc0b9 Mon Sep 17 00:00:00 2001
+From d9d4530f8aa4d7bb6d258c4d2c78909941e25856 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] correct include directive path for config.h
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 109caf76ab..686a0abb2f 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 85bff993087cd7367ffc35de525c2bf6162398d2 Mon Sep 17 00:00:00 2001
+From d5ab43be3946298f4a3a17a52fbf00fe7af7c067 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.
@@ -17,7 +17,7 @@  Signed-off-by: Aneesh Bansal <aneesh.bansal@freescale.com>
  3 files changed, 42 insertions(+)
 
 diff --git a/VEX/priv/guest_ppc_defs.h b/VEX/priv/guest_ppc_defs.h
-index 220fbf1..cd259f3 100644
+index f5571c4..7b80c96 100644
 --- a/VEX/priv/guest_ppc_defs.h
 +++ b/VEX/priv/guest_ppc_defs.h
 @@ -233,6 +233,8 @@ extern UInt ppc32g_dirtyhelper_MFSPR_268_269 ( UInt );
@@ -30,7 +30,7 @@  index 220fbf1..cd259f3 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 2611e52..72c349b 100644
+index 106f57e..c3b08e4 100644
 --- a/VEX/priv/guest_ppc_helpers.c
 +++ b/VEX/priv/guest_ppc_helpers.c
 @@ -118,6 +118,24 @@ UInt ppc32g_dirtyhelper_MFSPR_287 ( void )
@@ -59,7 +59,7 @@  index 2611e52..72c349b 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 18716dd..b2e72a0 100644
+index 231e914..28708b0 100644
 --- a/VEX/priv/guest_ppc_toIR.c
 +++ b/VEX/priv/guest_ppc_toIR.c
 @@ -11875,6 +11875,28 @@ static Bool dis_proc_ctl ( const VexAbiInfo* vbi, UInt prefix, UInt theInstr )
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 1597b3a021..ddb61b17fb 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 596372bc9b4d31bc9811881cfa747d99a8c25141 Mon Sep 17 00:00:00 2001
+From 02d54537392735ac36b1b6e03737f8a238c11735 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
diff --git a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
index 6bfc6035ed..61f2ed44e1 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 408f9b39ca4f5709b668f13829a94c4cae855006 Mon Sep 17 00:00:00 2001
+From d8b0e15f5c26ffa5dcfdd90a28ef338df9939a5f 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
@@ -24,7 +24,7 @@  Signed-off-by: Maxin B. John <maxin.john@intel.com>
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/massif/ms_print.in b/massif/ms_print.in
-index a206ce4..df1bc31 100755
+index ecd9f38..33139de 100644
 --- a/massif/ms_print.in
 +++ b/massif/ms_print.in
 @@ -1,4 +1,4 @@
@@ -34,7 +34,7 @@  index a206ce4..df1bc31 100755
  ##--------------------------------------------------------------------##
  ##--- Massif's results printer                         ms_print.in ---##
 diff --git a/perf/vg_perf.in b/perf/vg_perf.in
-index 90ee1d2..c585096 100644
+index cc27834..0e49550 100644
 --- a/perf/vg_perf.in
 +++ b/perf/vg_perf.in
 @@ -1,4 +1,4 @@
@@ -44,7 +44,7 @@  index 90ee1d2..c585096 100644
  ##--- Valgrind performance testing script                  vg_perf ---##
  ##--------------------------------------------------------------------##
 diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in
-index 3471322..49e1114 100755
+index 0d7ec71..b44eb89 100644
 --- a/tests/vg_regtest.in
 +++ b/tests/vg_regtest.in
 @@ -1,4 +1,4 @@
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 19690e5ebb..48bbeab992 100644
--- a/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch
@@ -1,4 +1,4 @@ 
-From 8c92089741d809cfd18354f1b4df18cd28398a20 Mon Sep 17 00:00:00 2001
+From de8984c1ff3ae148564be9ac62eb235feeb1a977 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] remove s390x_vec_op_t
@@ -18,7 +18,7 @@  Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/VEX/priv/guest_s390_defs.h b/VEX/priv/guest_s390_defs.h
-index 29efa01..3a8f0a0 100644
+index a780e83..46609ac 100644
 --- a/VEX/priv/guest_s390_defs.h
 +++ b/VEX/priv/guest_s390_defs.h
 @@ -285,7 +285,7 @@ typedef enum {
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 0c18a63c2b..554441c08d 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 a5cd00f1c2d78e2a15f4a0c595f5ac10ca4c3290 Mon Sep 17 00:00:00 2001
+From c1d239ec88224940cdd0e42c81034405501c2b47 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
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 ca7f721d9c..c5778f98ce 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 b407514aa1a4fd3667b30527260e271da34ce4a7 Mon Sep 17 00:00:00 2001
+From 49e276593f6f620468eac32c7179c3d57637964d 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
@@ -17,7 +17,7 @@  Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
  1 file changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c
-index 63172b9..1b5bf95 100644
+index e0f596f..4631564 100644
 --- a/coregrind/m_redir.c
 +++ b/coregrind/m_redir.c
 @@ -1321,7 +1321,18 @@ static void add_hardwired_spec (const  HChar* sopatt, const HChar* fnpatt,
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.25.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.25.1.bb
deleted file mode 100644
index a8b0be5767..0000000000
--- a/meta/recipes-devtools/valgrind/valgrind_3.25.1.bb
+++ /dev/null
@@ -1,116 +0,0 @@ 
-SUMMARY = "Valgrind memory debugger and instrumentation framework"
-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 \
-                    file://COPYING.DOCS;md5=24ea4c7092233849b4394699333b5c56"
-
-SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
-           file://fixed-perl-path.patch \
-           file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \
-           file://use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch \
-           file://avoid-neon-for-targets-which-don-t-support-it.patch \
-           file://0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch \
-           file://valgrind-make-ld-XXX.so-strlen-intercept-optional.patch \
-           file://0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch \
-           file://0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch \
-           file://0003-correct-include-directive-path-for-config.h.patch \
-           file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \
-           file://0001-memcheck-vgtests-remove-fullpath-after-flags.patch \
-           file://s390x_vec_op_t.patch \
-           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-tests-arm-Use-O-instead-of-O0.patch \
-           file://0001-Use-portable-syntax-for-pushsection-directive-in-inl.patch \
-           "
-SRC_URI[sha256sum] = "61deb8d0727b45c268efdc1b3b6c9e679cd97cbf5ee4b28d1dead7c8b7a271af"
-UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar"
-
-COMPATIBLE_HOST = '(i.86|x86_64|arm|aarch64|mips|powerpc|powerpc64|riscv64).*-linux'
-
-# valgrind supports armv7 and above
-COMPATIBLE_HOST:armv4 = 'null'
-COMPATIBLE_HOST:armv5 = 'null'
-COMPATIBLE_HOST:armv6 = 'null'
-
-# valgrind fails with powerpc soft-float
-COMPATIBLE_HOST:powerpc = "${@bb.utils.contains('TARGET_FPU', 'soft', 'null', '.*-linux', d)}"
-
-# X32 isn't supported by valgrind at this time
-COMPATIBLE_HOST:linux-gnux32 = 'null'
-COMPATIBLE_HOST:linux-muslx32 = 'null'
-
-# Disable for some MIPS variants
-COMPATIBLE_HOST:mipsarchr6 = 'null'
-COMPATIBLE_HOST:linux-gnun32 = 'null'
-
-# Disable for powerpc64 with musl
-COMPATIBLE_HOST:libc-musl:powerpc64 = 'null'
-
-inherit autotools-brokensep multilib_header
-
-EXTRA_OECONF = "--enable-tls --without-mpicc"
-EXTRA_OECONF += "${@['--enable-only32bit','--enable-only64bit'][d.getVar('SITEINFO_BITS') != '32']}"
-
-# valgrind checks host_cpu "armv7*)", so we need to over-ride the autotools.bbclass default --host option
-EXTRA_OECONF:append:arm = " --host=armv7${HOST_VENDOR}-${HOST_OS}"
-
-EXTRA_OEMAKE = "-w"
-
-CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'"
-
-# valgrind likes to control its own optimisation flags. It generally defaults
-# to -O2 but uses -O0 for some specific test apps etc. Passing our own flags
-# (via CFLAGS) means we interfere with that. Only pass DEBUG_FLAGS to it
-# which fixes build path issue in DWARF.
-SELECTED_OPTIMIZATION = "${DEBUG_LEVELFLAG}"
-
-# Split out various helper scripts to separate packages to avoid the
-# main package depending on perl and python.
-PACKAGES =+ "${PN}-cachegrind ${PN}-massif ${PN}-callgrind"
-
-FILES:${PN}-cachegrind = "${bindir}/cg_*"
-FILES:${PN}-massif = "${bindir}/ms_*"
-FILES:${PN}-callgrind = "${bindir}/callgrind_*"
-
-RDEPENDS:${PN}-cachegrind = "${PN} python3-core"
-RDEPENDS:${PN}-massif = "${PN} perl"
-RDEPENDS:${PN}-callgrind = "${PN} perl"
-
-do_configure:prepend () {
-    rm -rf ${S}/config.h
-}
-
-do_install:append () {
-    install -m 644 ${B}/default.supp ${D}/${libexecdir}/valgrind/
-    oe_multilib_header valgrind/config.h
-}
-
-VALGRINDARCH ?= "${TARGET_ARCH}"
-VALGRINDARCH:aarch64 = "arm64"
-VALGRINDARCH:x86-64 = "amd64"
-VALGRINDARCH:x86 = "x86"
-VALGRINDARCH:mips = "mips32"
-VALGRINDARCH:mipsel = "mips32"
-VALGRINDARCH:mips64el = "mips64"
-VALGRINDARCH:powerpc = "ppc"
-VALGRINDARCH:powerpc64 = "ppc64"
-VALGRINDARCH:powerpc64le = "ppc64le"
-
-INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libexecdir}/valgrind/vgpreload_memcheck-${VALGRINDARCH}-linux.so"
-
-# valgrind needs debug information for ld.so at runtime in order to
-# redirect functions like strlen.
-RRECOMMENDS:${PN} += "${TCLIBC}-dbg"
-
-# Valgrind needs intrinsics which are not provided by clang
-# m_signals.c:2213:7: error: __builtin_longjmp is not supported for the current target
-# 2213 |       VG_MINIMAL_LONGJMP(tst->sched_jmpbuf);
-#      |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-# It needs something like - https://bugs.kde.org/show_bug.cgi?id=369723
-TOOLCHAIN:riscv64 = "gcc"
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.26.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.26.0.bb
new file mode 100644
index 0000000000..e12be59d39
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind_3.26.0.bb
@@ -0,0 +1,1116 @@ 
+# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
+# The following is the difference between the old and the new license text.
+# Please update the LICENSE value if needed, and summarize the changes in
+# the commit message via 'License-Update:' tag.
+# (example: 'License-Update: copyright years updated.')
+#
+# The changes:
+#
+# --- COPYING
+# +++ COPYING
+# @@ -1,281 +1,622 @@
+#                      GNU GENERAL PUBLIC LICENSE
+# -                       Version 2, June 1991
+# -
+# - Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+# - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# +                       Version 3, 29 June 2007
+# +
+# + Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+#   Everyone is permitted to copy and distribute verbatim copies
+#   of this license document, but changing it is not allowed.
+#  
+#                              Preamble
+#  
+# -  The licenses for most software are designed to take away your
+# -freedom to share and change it.  By contrast, the GNU General Public
+# -License is intended to guarantee your freedom to share and change free
+# -software--to make sure the software is free for all its users.  This
+# -General Public License applies to most of the Free Software
+# -Foundation's software and to any other program whose authors commit to
+# -using it.  (Some other Free Software Foundation software is covered by
+# -the GNU Lesser General Public License instead.)  You can apply it to
+# +  The GNU General Public License is a free, copyleft license for
+# +software and other kinds of works.
+# +
+# +  The licenses for most software and other practical works are designed
+# +to take away your freedom to share and change the works.  By contrast,
+# +the GNU General Public License is intended to guarantee your freedom to
+# +share and change all versions of a program--to make sure it remains free
+# +software for all its users.  We, the Free Software Foundation, use the
+# +GNU General Public License for most of our software; it applies also to
+# +any other work released this way by its authors.  You can apply it to
+#  your programs, too.
+#  
+#    When we speak of free software, we are referring to freedom, not
+#  price.  Our General Public Licenses are designed to make sure that you
+#  have the freedom to distribute copies of free software (and charge for
+# -this service if you wish), that you receive source code or can get it
+# -if you want it, that you can change the software or use pieces of it
+# -in new free programs; and that you know you can do these things.
+# -
+# -  To protect your rights, we need to make restrictions that forbid
+# -anyone to deny you these rights or to ask you to surrender the rights.
+# -These restrictions translate to certain responsibilities for you if you
+# -distribute copies of the software, or if you modify it.
+# +them if you wish), that you receive source code or can get it if you
+# +want it, that you can change the software or use pieces of it in new
+# +free programs, and that you know you can do these things.
+# +
+# +  To protect your rights, we need to prevent others from denying you
+# +these rights or asking you to surrender the rights.  Therefore, you have
+# +certain responsibilities if you distribute copies of the software, or if
+# +you modify it: responsibilities to respect the freedom of others.
+#  
+#    For example, if you distribute copies of such a program, whether
+# -gratis or for a fee, you must give the recipients all the rights that
+# -you have.  You must make sure that they, too, receive or can get the
+# -source code.  And you must show them these terms so they know their
+# -rights.
+# -
+# -  We protect your rights with two steps: (1) copyright the software, and
+# -(2) offer you this license which gives you legal permission to copy,
+# -distribute and/or modify the software.
+# -
+# -  Also, for each author's protection and ours, we want to make certain
+# -that everyone understands that there is no warranty for this free
+# -software.  If the software is modified by someone else and passed on, we
+# -want its recipients to know that what they have is not the original, so
+# -that any problems introduced by others will not reflect on the original
+# -authors' reputations.
+# -
+# -  Finally, any free program is threatened constantly by software
+# -patents.  We wish to avoid the danger that redistributors of a free
+# -program will individually obtain patent licenses, in effect making the
+# -program proprietary.  To prevent this, we have made it clear that any
+# -patent must be licensed for everyone's free use or not licensed at all.
+# +gratis or for a fee, you must pass on to the recipients the same
+# +freedoms that you received.  You must make sure that they, too, receive
+# +or can get the source code.  And you must show them these terms so they
+# +know their rights.
+# +
+# +  Developers that use the GNU GPL protect your rights with two steps:
+# +(1) assert copyright on the software, and (2) offer you this License
+# +giving you legal permission to copy, distribute and/or modify it.
+# +
+# +  For the developers' and authors' protection, the GPL clearly explains
+# +that there is no warranty for this free software.  For both users' and
+# +authors' sake, the GPL requires that modified versions be marked as
+# +changed, so that their problems will not be attributed erroneously to
+# +authors of previous versions.
+# +
+# +  Some devices are designed to deny users access to install or run
+# +modified versions of the software inside them, although the manufacturer
+# +can do so.  This is fundamentally incompatible with the aim of
+# +protecting users' freedom to change the software.  The systematic
+# +pattern of such abuse occurs in the area of products for individuals to
+# +use, which is precisely where it is most unacceptable.  Therefore, we
+# +have designed this version of the GPL to prohibit the practice for those
+# +products.  If such problems arise substantially in other domains, we
+# +stand ready to extend this provision to those domains in future versions
+# +of the GPL, as needed to protect the freedom of users.
+# +
+# +  Finally, every program is threatened constantly by software patents.
+# +States should not allow patents to restrict development and use of
+# +software on general-purpose computers, but in those that do, we wish to
+# +avoid the special danger that patents applied to a free program could
+# +make it effectively proprietary.  To prevent this, the GPL assures that
+# +patents cannot be used to render the program non-free.
+#  
+#    The precise terms and conditions for copying, distribution and
+#  modification follow.
+#  
+# -                    GNU GENERAL PUBLIC LICENSE
+# -   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+# -
+# -  0. This License applies to any program or other work which contains
+# -a notice placed by the copyright holder saying it may be distributed
+# -under the terms of this General Public License.  The "Program", below,
+# -refers to any such program or work, and a "work based on the Program"
+# -means either the Program or any derivative work under copyright law:
+# -that is to say, a work containing the Program or a portion of it,
+# -either verbatim or with modifications and/or translated into another
+# -language.  (Hereinafter, translation is included without limitation in
+# -the term "modification".)  Each licensee is addressed as "you".
+# -
+# -Activities other than copying, distribution and modification are not
+# -covered by this License; they are outside its scope.  The act of
+# -running the Program is not restricted, and the output from the Program
+# -is covered only if its contents constitute a work based on the
+# -Program (independent of having been made by running the Program).
+# -Whether that is true depends on what the Program does.
+# -
+# -  1. You may copy and distribute verbatim copies of the Program's
+# -source code as you receive it, in any medium, provided that you
+# -conspicuously and appropriately publish on each copy an appropriate
+# -copyright notice and disclaimer of warranty; keep intact all the
+# -notices that refer to this License and to the absence of any warranty;
+# -and give any other recipients of the Program a copy of this License
+# -along with the Program.
+# -
+# -You may charge a fee for the physical act of transferring a copy, and
+# -you may at your option offer warranty protection in exchange for a fee.
+# -
+# -  2. You may modify your copy or copies of the Program or any portion
+# -of it, thus forming a work based on the Program, and copy and
+# -distribute such modifications or work under the terms of Section 1
+# -above, provided that you also meet all of these conditions:
+# -
+# -    a) You must cause the modified files to carry prominent notices
+# -    stating that you changed the files and the date of any change.
+# -
+# -    b) You must cause any work that you distribute or publish, that in
+# -    whole or in part contains or is derived from the Program or any
+# -    part thereof, to be licensed as a whole at no charge to all third
+# -    parties under the terms of this License.
+# -
+# -    c) If the modified program normally reads commands interactively
+# -    when run, you must cause it, when started running for such
+# -    interactive use in the most ordinary way, to print or display an
+# -    announcement including an appropriate copyright notice and a
+# -    notice that there is no warranty (or else, saying that you provide
+# -    a warranty) and that users may redistribute the program under
+# -    these conditions, and telling the user how to view a copy of this
+# -    License.  (Exception: if the Program itself is interactive but
+# -    does not normally print such an announcement, your work based on
+# -    the Program is not required to print an announcement.)
+# -
+# -These requirements apply to the modified work as a whole.  If
+# -identifiable sections of that work are not derived from the Program,
+# -and can be reasonably considered independent and separate works in
+# -themselves, then this License, and its terms, do not apply to those
+# -sections when you distribute them as separate works.  But when you
+# -distribute the same sections as part of a whole which is a work based
+# -on the Program, the distribution of the whole must be on the terms of
+# -this License, whose permissions for other licensees extend to the
+# -entire whole, and thus to each and every part regardless of who wrote it.
+# -
+# -Thus, it is not the intent of this section to claim rights or contest
+# -your rights to work written entirely by you; rather, the intent is to
+# -exercise the right to control the distribution of derivative or
+# -collective works based on the Program.
+# -
+# -In addition, mere aggregation of another work not based on the Program
+# -with the Program (or with a work based on the Program) on a volume of
+# -a storage or distribution medium does not bring the other work under
+# -the scope of this License.
+# -
+# -  3. You may copy and distribute the Program (or a work based on it,
+# -under Section 2) in object code or executable form under the terms of
+# -Sections 1 and 2 above provided that you also do one of the following:
+# -
+# -    a) Accompany it with the complete corresponding machine-readable
+# -    source code, which must be distributed under the terms of Sections
+# -    1 and 2 above on a medium customarily used for software interchange; or,
+# -
+# -    b) Accompany it with a written offer, valid for at least three
+# -    years, to give any third party, for a charge no more than your
+# -    cost of physically performing source distribution, a complete
+# -    machine-readable copy of the corresponding source code, to be
+# -    distributed under the terms of Sections 1 and 2 above on a medium
+# -    customarily used for software interchange; or,
+# -
+# -    c) Accompany it with the information you received as to the offer
+# -    to distribute corresponding source code.  (This alternative is
+# -    allowed only for noncommercial distribution and only if you
+# -    received the program in object code or executable form with such
+# -    an offer, in accord with Subsection b above.)
+# -
+# -The source code for a work means the preferred form of the work for
+# -making modifications to it.  For an executable work, complete source
+# -code means all the source code for all modules it contains, plus any
+# -associated interface definition files, plus the scripts used to
+# -control compilation and installation of the executable.  However, as a
+# -special exception, the source code distributed need not include
+# -anything that is normally distributed (in either source or binary
+# -form) with the major components (compiler, kernel, and so on) of the
+# -operating system on which the executable runs, unless that component
+# -itself accompanies the executable.
+# -
+# -If distribution of executable or object code is made by offering
+# -access to copy from a designated place, then offering equivalent
+# -access to copy the source code from the same place counts as
+# -distribution of the source code, even though third parties are not
+# -compelled to copy the source along with the object code.
+# -
+# -  4. You may not copy, modify, sublicense, or distribute the Program
+# -except as expressly provided under this License.  Any attempt
+# -otherwise to copy, modify, sublicense or distribute the Program is
+# -void, and will automatically terminate your rights under this License.
+# -However, parties who have received copies, or rights, from you under
+# -this License will not have their licenses terminated so long as such
+# -parties remain in full compliance.
+# -
+# -  5. You are not required to accept this License, since you have not
+# -signed it.  However, nothing else grants you permission to modify or
+# -distribute the Program or its derivative works.  These actions are
+# -prohibited by law if you do not accept this License.  Therefore, by
+# -modifying or distributing the Program (or any work based on the
+# -Program), you indicate your acceptance of this License to do so, and
+# -all its terms and conditions for copying, distributing or modifying
+# -the Program or works based on it.
+# -
+# -  6. Each time you redistribute the Program (or any work based on the
+# -Program), the recipient automatically receives a license from the
+# -original licensor to copy, distribute or modify the Program subject to
+# -these terms and conditions.  You may not impose any further
+# -restrictions on the recipients' exercise of the rights granted herein.
+# -You are not responsible for enforcing compliance by third parties to
+# +                       TERMS AND CONDITIONS
+# +
+# +  0. Definitions.
+# +
+# +  "This License" refers to version 3 of the GNU General Public License.
+# +
+# +  "Copyright" also means copyright-like laws that apply to other kinds of
+# +works, such as semiconductor masks.
+# +
+# +  "The Program" refers to any copyrightable work licensed under this
+# +License.  Each licensee is addressed as "you".  "Licensees" and
+# +"recipients" may be individuals or organizations.
+# +
+# +  To "modify" a work means to copy from or adapt all or part of the work
+# +in a fashion requiring copyright permission, other than the making of an
+# +exact copy.  The resulting work is called a "modified version" of the
+# +earlier work or a work "based on" the earlier work.
+# +
+# +  A "covered work" means either the unmodified Program or a work based
+# +on the Program.
+# +
+# +  To "propagate" a work means to do anything with it that, without
+# +permission, would make you directly or secondarily liable for
+# +infringement under applicable copyright law, except executing it on a
+# +computer or modifying a private copy.  Propagation includes copying,
+# +distribution (with or without modification), making available to the
+# +public, and in some countries other activities as well.
+# +
+# +  To "convey" a work means any kind of propagation that enables other
+# +parties to make or receive copies.  Mere interaction with a user through
+# +a computer network, with no transfer of a copy, is not conveying.
+# +
+# +  An interactive user interface displays "Appropriate Legal Notices"
+# +to the extent that it includes a convenient and prominently visible
+# +feature that (1) displays an appropriate copyright notice, and (2)
+# +tells the user that there is no warranty for the work (except to the
+# +extent that warranties are provided), that licensees may convey the
+# +work under this License, and how to view a copy of this License.  If
+# +the interface presents a list of user commands or options, such as a
+# +menu, a prominent item in the list meets this criterion.
+# +
+# +  1. Source Code.
+# +
+# +  The "source code" for a work means the preferred form of the work
+# +for making modifications to it.  "Object code" means any non-source
+# +form of a work.
+# +
+# +  A "Standard Interface" means an interface that either is an official
+# +standard defined by a recognized standards body, or, in the case of
+# +interfaces specified for a particular programming language, one that
+# +is widely used among developers working in that language.
+# +
+# +  The "System Libraries" of an executable work include anything, other
+# +than the work as a whole, that (a) is included in the normal form of
+# +packaging a Major Component, but which is not part of that Major
+# +Component, and (b) serves only to enable use of the work with that
+# +Major Component, or to implement a Standard Interface for which an
+# +implementation is available to the public in source code form.  A
+# +"Major Component", in this context, means a major essential component
+# +(kernel, window system, and so on) of the specific operating system
+# +(if any) on which the executable work runs, or a compiler used to
+# +produce the work, or an object code interpreter used to run it.
+# +
+# +  The "Corresponding Source" for a work in object code form means all
+# +the source code needed to generate, install, and (for an executable
+# +work) run the object code and to modify the work, including scripts to
+# +control those activities.  However, it does not include the work's
+# +System Libraries, or general-purpose tools or generally available free
+# +programs which are used unmodified in performing those activities but
+# +which are not part of the work.  For example, Corresponding Source
+# +includes interface definition files associated with source files for
+# +the work, and the source code for shared libraries and dynamically
+# +linked subprograms that the work is specifically designed to require,
+# +such as by intimate data communication or control flow between those
+# +subprograms and other parts of the work.
+# +
+# +  The Corresponding Source need not include anything that users
+# +can regenerate automatically from other parts of the Corresponding
+# +Source.
+# +
+# +  The Corresponding Source for a work in source code form is that
+# +same work.
+# +
+# +  2. Basic Permissions.
+# +
+# +  All rights granted under this License are granted for the term of
+# +copyright on the Program, and are irrevocable provided the stated
+# +conditions are met.  This License explicitly affirms your unlimited
+# +permission to run the unmodified Program.  The output from running a
+# +covered work is covered by this License only if the output, given its
+# +content, constitutes a covered work.  This License acknowledges your
+# +rights of fair use or other equivalent, as provided by copyright law.
+# +
+# +  You may make, run and propagate covered works that you do not
+# +convey, without conditions so long as your license otherwise remains
+# +in force.  You may convey covered works to others for the sole purpose
+# +of having them make modifications exclusively for you, or provide you
+# +with facilities for running those works, provided that you comply with
+# +the terms of this License in conveying all material for which you do
+# +not control copyright.  Those thus making or running the covered works
+# +for you must do so exclusively on your behalf, under your direction
+# +and control, on terms that prohibit them from making any copies of
+# +your copyrighted material outside their relationship with you.
+# +
+# +  Conveying under any other circumstances is permitted solely under
+# +the conditions stated below.  Sublicensing is not allowed; section 10
+# +makes it unnecessary.
+# +
+# +  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+# +
+# +  No covered work shall be deemed part of an effective technological
+# +measure under any applicable law fulfilling obligations under article
+# +11 of the WIPO copyright treaty adopted on 20 December 1996, or
+# +similar laws prohibiting or restricting circumvention of such
+# +measures.
+# +
+# +  When you convey a covered work, you waive any legal power to forbid
+# +circumvention of technological measures to the extent such circumvention
+# +is effected by exercising rights under this License with respect to
+# +the covered work, and you disclaim any intention to limit operation or
+# +modification of the work as a means of enforcing, against the work's
+# +users, your or third parties' legal rights to forbid circumvention of
+# +technological measures.
+# +
+# +  4. Conveying Verbatim Copies.
+# +
+# +  You may convey verbatim copies of the Program's source code as you
+# +receive it, in any medium, provided that you conspicuously and
+# +appropriately publish on each copy an appropriate copyright notice;
+# +keep intact all notices stating that this License and any
+# +non-permissive terms added in accord with section 7 apply to the code;
+# +keep intact all notices of the absence of any warranty; and give all
+# +recipients a copy of this License along with the Program.
+# +
+# +  You may charge any price or no price for each copy that you convey,
+# +and you may offer support or warranty protection for a fee.
+# +
+# +  5. Conveying Modified Source Versions.
+# +
+# +  You may convey a work based on the Program, or the modifications to
+# +produce it from the Program, in the form of source code under the
+# +terms of section 4, provided that you also meet all of these conditions:
+# +
+# +    a) The work must carry prominent notices stating that you modified
+# +    it, and giving a relevant date.
+# +
+# +    b) The work must carry prominent notices stating that it is
+# +    released under this License and any conditions added under section
+# +    7.  This requirement modifies the requirement in section 4 to
+# +    "keep intact all notices".
+# +
+# +    c) You must license the entire work, as a whole, under this
+# +    License to anyone who comes into possession of a copy.  This
+# +    License will therefore apply, along with any applicable section 7
+# +    additional terms, to the whole of the work, and all its parts,
+# +    regardless of how they are packaged.  This License gives no
+# +    permission to license the work in any other way, but it does not
+# +    invalidate such permission if you have separately received it.
+# +
+# +    d) If the work has interactive user interfaces, each must display
+# +    Appropriate Legal Notices; however, if the Program has interactive
+# +    interfaces that do not display Appropriate Legal Notices, your
+# +    work need not make them do so.
+# +
+# +  A compilation of a covered work with other separate and independent
+# +works, which are not by their nature extensions of the covered work,
+# +and which are not combined with it such as to form a larger program,
+# +in or on a volume of a storage or distribution medium, is called an
+# +"aggregate" if the compilation and its resulting copyright are not
+# +used to limit the access or legal rights of the compilation's users
+# +beyond what the individual works permit.  Inclusion of a covered work
+# +in an aggregate does not cause this License to apply to the other
+# +parts of the aggregate.
+# +
+# +  6. Conveying Non-Source Forms.
+# +
+# +  You may convey a covered work in object code form under the terms
+# +of sections 4 and 5, provided that you also convey the
+# +machine-readable Corresponding Source under the terms of this License,
+# +in one of these ways:
+# +
+# +    a) Convey the object code in, or embodied in, a physical product
+# +    (including a physical distribution medium), accompanied by the
+# +    Corresponding Source fixed on a durable physical medium
+# +    customarily used for software interchange.
+# +
+# +    b) Convey the object code in, or embodied in, a physical product
+# +    (including a physical distribution medium), accompanied by a
+# +    written offer, valid for at least three years and valid for as
+# +    long as you offer spare parts or customer support for that product
+# +    model, to give anyone who possesses the object code either (1) a
+# +    copy of the Corresponding Source for all the software in the
+# +    product that is covered by this License, on a durable physical
+# +    medium customarily used for software interchange, for a price no
+# +    more than your reasonable cost of physically performing this
+# +    conveying of source, or (2) access to copy the
+# +    Corresponding Source from a network server at no charge.
+# +
+# +    c) Convey individual copies of the object code with a copy of the
+# +    written offer to provide the Corresponding Source.  This
+# +    alternative is allowed only occasionally and noncommercially, and
+# +    only if you received the object code with such an offer, in accord
+# +    with subsection 6b.
+# +
+# +    d) Convey the object code by offering access from a designated
+# +    place (gratis or for a charge), and offer equivalent access to the
+# +    Corresponding Source in the same way through the same place at no
+# +    further charge.  You need not require recipients to copy the
+# +    Corresponding Source along with the object code.  If the place to
+# +    copy the object code is a network server, the Corresponding Source
+# +    may be on a different server (operated by you or a third party)
+# +    that supports equivalent copying facilities, provided you maintain
+# +    clear directions next to the object code saying where to find the
+# +    Corresponding Source.  Regardless of what server hosts the
+# +    Corresponding Source, you remain obligated to ensure that it is
+# +    available for as long as needed to satisfy these requirements.
+# +
+# +    e) Convey the object code using peer-to-peer transmission, provided
+# +    you inform other peers where the object code and Corresponding
+# +    Source of the work are being offered to the general public at no
+# +    charge under subsection 6d.
+# +
+# +  A separable portion of the object code, whose source code is excluded
+# +from the Corresponding Source as a System Library, need not be
+# +included in conveying the object code work.
+# +
+# +  A "User Product" is either (1) a "consumer product", which means any
+# +tangible personal property which is normally used for personal, family,
+# +or household purposes, or (2) anything designed or sold for incorporation
+# +into a dwelling.  In determining whether a product is a consumer product,
+# +doubtful cases shall be resolved in favor of coverage.  For a particular
+# +product received by a particular user, "normally used" refers to a
+# +typical or common use of that class of product, regardless of the status
+# +of the particular user or of the way in which the particular user
+# +actually uses, or expects or is expected to use, the product.  A product
+# +is a consumer product regardless of whether the product has substantial
+# +commercial, industrial or non-consumer uses, unless such uses represent
+# +the only significant mode of use of the product.
+# +
+# +  "Installation Information" for a User Product means any methods,
+# +procedures, authorization keys, or other information required to install
+# +and execute modified versions of a covered work in that User Product from
+# +a modified version of its Corresponding Source.  The information must
+# +suffice to ensure that the continued functioning of the modified object
+# +code is in no case prevented or interfered with solely because
+# +modification has been made.
+# +
+# +  If you convey an object code work under this section in, or with, or
+# +specifically for use in, a User Product, and the conveying occurs as
+# +part of a transaction in which the right of possession and use of the
+# +User Product is transferred to the recipient in perpetuity or for a
+# +fixed term (regardless of how the transaction is characterized), the
+# +Corresponding Source conveyed under this section must be accompanied
+# +by the Installation Information.  But this requirement does not apply
+# +if neither you nor any third party retains the ability to install
+# +modified object code on the User Product (for example, the work has
+# +been installed in ROM).
+# +
+# +  The requirement to provide Installation Information does not include a
+# +requirement to continue to provide support service, warranty, or updates
+# +for a work that has been modified or installed by the recipient, or for
+# +the User Product in which it has been modified or installed.  Access to a
+# +network may be denied when the modification itself materially and
+# +adversely affects the operation of the network or violates the rules and
+# +protocols for communication across the network.
+# +
+# +  Corresponding Source conveyed, and Installation Information provided,
+# +in accord with this section must be in a format that is publicly
+# +documented (and with an implementation available to the public in
+# +source code form), and must require no special password or key for
+# +unpacking, reading or copying.
+# +
+# +  7. Additional Terms.
+# +
+# +  "Additional permissions" are terms that supplement the terms of this
+# +License by making exceptions from one or more of its conditions.
+# +Additional permissions that are applicable to the entire Program shall
+# +be treated as though they were included in this License, to the extent
+# +that they are valid under applicable law.  If additional permissions
+# +apply only to part of the Program, that part may be used separately
+# +under those permissions, but the entire Program remains governed by
+# +this License without regard to the additional permissions.
+# +
+# +  When you convey a copy of a covered work, you may at your option
+# +remove any additional permissions from that copy, or from any part of
+# +it.  (Additional permissions may be written to require their own
+# +removal in certain cases when you modify the work.)  You may place
+# +additional permissions on material, added by you to a covered work,
+# +for which you have or can give appropriate copyright permission.
+# +
+# +  Notwithstanding any other provision of this License, for material you
+# +add to a covered work, you may (if authorized by the copyright holders of
+# +that material) supplement the terms of this License with terms:
+# +
+# +    a) Disclaiming warranty or limiting liability differently from the
+# +    terms of sections 15 and 16 of this License; or
+# +
+# +    b) Requiring preservation of specified reasonable legal notices or
+# +    author attributions in that material or in the Appropriate Legal
+# +    Notices displayed by works containing it; or
+# +
+# +    c) Prohibiting misrepresentation of the origin of that material, or
+# +    requiring that modified versions of such material be marked in
+# +    reasonable ways as different from the original version; or
+# +
+# +    d) Limiting the use for publicity purposes of names of licensors or
+# +    authors of the material; or
+# +
+# +    e) Declining to grant rights under trademark law for use of some
+# +    trade names, trademarks, or service marks; or
+# +
+# +    f) Requiring indemnification of licensors and authors of that
+# +    material by anyone who conveys the material (or modified versions of
+# +    it) with contractual assumptions of liability to the recipient, for
+# +    any liability that these contractual assumptions directly impose on
+# +    those licensors and authors.
+# +
+# +  All other non-permissive additional terms are considered "further
+# +restrictions" within the meaning of section 10.  If the Program as you
+# +received it, or any part of it, contains a notice stating that it is
+# +governed by this License along with a term that is a further
+# +restriction, you may remove that term.  If a license document contains
+# +a further restriction but permits relicensing or conveying under this
+# +License, you may add to a covered work material governed by the terms
+# +of that license document, provided that the further restriction does
+# +not survive such relicensing or conveying.
+# +
+# +  If you add terms to a covered work in accord with this section, you
+# +must place, in the relevant source files, a statement of the
+# +additional terms that apply to those files, or a notice indicating
+# +where to find the applicable terms.
+# +
+# +  Additional terms, permissive or non-permissive, may be stated in the
+# +form of a separately written license, or stated as exceptions;
+# +the above requirements apply either way.
+# +
+# +  8. Termination.
+# +
+# +  You may not propagate or modify a covered work except as expressly
+# +provided under this License.  Any attempt otherwise to propagate or
+# +modify it is void, and will automatically terminate your rights under
+# +this License (including any patent licenses granted under the third
+# +paragraph of section 11).
+# +
+# +  However, if you cease all violation of this License, then your
+# +license from a particular copyright holder is reinstated (a)
+# +provisionally, unless and until the copyright holder explicitly and
+# +finally terminates your license, and (b) permanently, if the copyright
+# +holder fails to notify you of the violation by some reasonable means
+# +prior to 60 days after the cessation.
+# +
+# +  Moreover, your license from a particular copyright holder is
+# +reinstated permanently if the copyright holder notifies you of the
+# +violation by some reasonable means, this is the first time you have
+# +received notice of violation of this License (for any work) from that
+# +copyright holder, and you cure the violation prior to 30 days after
+# +your receipt of the notice.
+# +
+# +  Termination of your rights under this section does not terminate the
+# +licenses of parties who have received copies or rights from you under
+# +this License.  If your rights have been terminated and not permanently
+# +reinstated, you do not qualify to receive new licenses for the same
+# +material under section 10.
+# +
+# +  9. Acceptance Not Required for Having Copies.
+# +
+# +  You are not required to accept this License in order to receive or
+# +run a copy of the Program.  Ancillary propagation of a covered work
+# +occurring solely as a consequence of using peer-to-peer transmission
+# +to receive a copy likewise does not require acceptance.  However,
+# +nothing other than this License grants you permission to propagate or
+# +modify any covered work.  These actions infringe copyright if you do
+# +not accept this License.  Therefore, by modifying or propagating a
+# +covered work, you indicate your acceptance of this License to do so.
+# +
+# +  10. Automatic Licensing of Downstream Recipients.
+# +
+# +  Each time you convey a covered work, the recipient automatically
+# +receives a license from the original licensors, to run, modify and
+# +propagate that work, subject to this License.  You are not responsible
+# +for enforcing compliance by third parties with this License.
+# +
+# +  An "entity transaction" is a transaction transferring control of an
+# +organization, or substantially all assets of one, or subdividing an
+# +organization, or merging organizations.  If propagation of a covered
+# +work results from an entity transaction, each party to that
+# +transaction who receives a copy of the work also receives whatever
+# +licenses to the work the party's predecessor in interest had or could
+# +give under the previous paragraph, plus a right to possession of the
+# +Corresponding Source of the work from the predecessor in interest, if
+# +the predecessor has it or can get it with reasonable efforts.
+# +
+# +  You may not impose any further restrictions on the exercise of the
+# +rights granted or affirmed under this License.  For example, you may
+# +not impose a license fee, royalty, or other charge for exercise of
+# +rights granted under this License, and you may not initiate litigation
+# +(including a cross-claim or counterclaim in a lawsuit) alleging that
+# +any patent claim is infringed by making, using, selling, offering for
+# +sale, or importing the Program or any portion of it.
+# +
+# +  11. Patents.
+# +
+# +  A "contributor" is a copyright holder who authorizes use under this
+# +License of the Program or a work on which the Program is based.  The
+# +work thus licensed is called the contributor's "contributor version".
+# +
+# +  A contributor's "essential patent claims" are all patent claims
+# +owned or controlled by the contributor, whether already acquired or
+# +hereafter acquired, that would be infringed by some manner, permitted
+# +by this License, of making, using, or selling its contributor version,
+# +but do not include claims that would be infringed only as a
+# +consequence of further modification of the contributor version.  For
+# +purposes of this definition, "control" includes the right to grant
+# +patent sublicenses in a manner consistent with the requirements of
+#  this License.
+#  
+# -  7. If, as a consequence of a court judgment or allegation of patent
+# -infringement or for any other reason (not limited to patent issues),
+# -conditions are imposed on you (whether by court order, agreement or
+# +  Each contributor grants you a non-exclusive, worldwide, royalty-free
+# +patent license under the contributor's essential patent claims, to
+# +make, use, sell, offer for sale, import and otherwise run, modify and
+# +propagate the contents of its contributor version.
+# +
+# +  In the following three paragraphs, a "patent license" is any express
+# +agreement or commitment, however denominated, not to enforce a patent
+# +(such as an express permission to practice a patent or covenant not to
+# +sue for patent infringement).  To "grant" such a patent license to a
+# +party means to make such an agreement or commitment not to enforce a
+# +patent against the party.
+# +
+# +  If you convey a covered work, knowingly relying on a patent license,
+# +and the Corresponding Source of the work is not available for anyone
+# +to copy, free of charge and under the terms of this License, through a
+# +publicly available network server or other readily accessible means,
+# +then you must either (1) cause the Corresponding Source to be so
+# +available, or (2) arrange to deprive yourself of the benefit of the
+# +patent license for this particular work, or (3) arrange, in a manner
+# +consistent with the requirements of this License, to extend the patent
+# +license to downstream recipients.  "Knowingly relying" means you have
+# +actual knowledge that, but for the patent license, your conveying the
+# +covered work in a country, or your recipient's use of the covered work
+# +in a country, would infringe one or more identifiable patents in that
+# +country that you have reason to believe are valid.
+# +
+# +  If, pursuant to or in connection with a single transaction or
+# +arrangement, you convey, or propagate by procuring conveyance of, a
+# +covered work, and grant a patent license to some of the parties
+# +receiving the covered work authorizing them to use, propagate, modify
+# +or convey a specific copy of the covered work, then the patent license
+# +you grant is automatically extended to all recipients of the covered
+# +work and works based on it.
+# +
+# +  A patent license is "discriminatory" if it does not include within
+# +the scope of its coverage, prohibits the exercise of, or is
+# +conditioned on the non-exercise of one or more of the rights that are
+# +specifically granted under this License.  You may not convey a covered
+# +work if you are a party to an arrangement with a third party that is
+# +in the business of distributing software, under which you make payment
+# +to the third party based on the extent of your activity of conveying
+# +the work, and under which the third party grants, to any of the
+# +parties who would receive the covered work from you, a discriminatory
+# +patent license (a) in connection with copies of the covered work
+# +conveyed by you (or copies made from those copies), or (b) primarily
+# +for and in connection with specific products or compilations that
+# +contain the covered work, unless you entered into that arrangement,
+# +or that patent license was granted, prior to 28 March 2007.
+# +
+# +  Nothing in this License shall be construed as excluding or limiting
+# +any implied license or other defenses to infringement that may
+# +otherwise be available to you under applicable patent law.
+# +
+# +  12. No Surrender of Others' Freedom.
+# +
+# +  If conditions are imposed on you (whether by court order, agreement or
+#  otherwise) that contradict the conditions of this License, they do not
+# -excuse you from the conditions of this License.  If you cannot
+# -distribute so as to satisfy simultaneously your obligations under this
+# -License and any other pertinent obligations, then as a consequence you
+# -may not distribute the Program at all.  For example, if a patent
+# -license would not permit royalty-free redistribution of the Program by
+# -all those who receive copies directly or indirectly through you, then
+# -the only way you could satisfy both it and this License would be to
+# -refrain entirely from distribution of the Program.
+# -
+# -If any portion of this section is held invalid or unenforceable under
+# -any particular circumstance, the balance of the section is intended to
+# -apply and the section as a whole is intended to apply in other
+# -circumstances.
+# -
+# -It is not the purpose of this section to induce you to infringe any
+# -patents or other property right claims or to contest validity of any
+# -such claims; this section has the sole purpose of protecting the
+# -integrity of the free software distribution system, which is
+# -implemented by public license practices.  Many people have made
+# -generous contributions to the wide range of software distributed
+# -through that system in reliance on consistent application of that
+# -system; it is up to the author/donor to decide if he or she is willing
+# -to distribute software through any other system and a licensee cannot
+# -impose that choice.
+# -
+# -This section is intended to make thoroughly clear what is believed to
+# -be a consequence of the rest of this License.
+# -
+# -  8. If the distribution and/or use of the Program is restricted in
+# -certain countries either by patents or by copyrighted interfaces, the
+# -original copyright holder who places the Program under this License
+# -may add an explicit geographical distribution limitation excluding
+# -those countries, so that distribution is permitted only in or among
+# -countries not thus excluded.  In such case, this License incorporates
+# -the limitation as if written in the body of this License.
+# -
+# -  9. The Free Software Foundation may publish revised and/or new versions
+# -of the General Public License from time to time.  Such new versions will
+# +excuse you from the conditions of this License.  If you cannot convey a
+# +covered work so as to satisfy simultaneously your obligations under this
+# +License and any other pertinent obligations, then as a consequence you may
+# +not convey it at all.  For example, if you agree to terms that obligate you
+# +to collect a royalty for further conveying from those to whom you convey
+# +the Program, the only way you could satisfy both those terms and this
+# +License would be to refrain entirely from conveying the Program.
+# +
+# +  13. Use with the GNU Affero General Public License.
+# +
+# +  Notwithstanding any other provision of this License, you have
+# +permission to link or combine any covered work with a work licensed
+# +under version 3 of the GNU Affero General Public License into a single
+# +combined work, and to convey the resulting work.  The terms of this
+# +License will continue to apply to the part which is the covered work,
+# +but the special requirements of the GNU Affero General Public License,
+# +section 13, concerning interaction through a network will apply to the
+# +combination as such.
+# +
+# +  14. Revised Versions of this License.
+# +
+# +  The Free Software Foundation may publish revised and/or new versions of
+# +the GNU General Public License from time to time.  Such new versions will
+#  be similar in spirit to the present version, but may differ in detail to
+#  address new problems or concerns.
+#  
+# -Each version is given a distinguishing version number.  If the Program
+# -specifies a version number of this License which applies to it and "any
+# -later version", you have the option of following the terms and conditions
+# -either of that version or of any later version published by the Free
+# -Software Foundation.  If the Program does not specify a version number of
+# -this License, you may choose any version ever published by the Free Software
+# -Foundation.
+# -
+# -  10. If you wish to incorporate parts of the Program into other free
+# -programs whose distribution conditions are different, write to the author
+# -to ask for permission.  For software which is copyrighted by the Free
+# -Software Foundation, write to the Free Software Foundation; we sometimes
+# -make exceptions for this.  Our decision will be guided by the two goals
+# -of preserving the free status of all derivatives of our free software and
+# -of promoting the sharing and reuse of software generally.
+# -
+# -                            NO WARRANTY
+# -
+# -  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+# -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+# -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+# -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+# -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+# -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+# -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+# -REPAIR OR CORRECTION.
+# -
+# -  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+# -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+# -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+# -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+# -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+# -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+# -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+# -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+# -POSSIBILITY OF SUCH DAMAGES.
+# +  Each version is given a distinguishing version number.  If the
+# +Program specifies that a certain numbered version of the GNU General
+# +Public License "or any later version" applies to it, you have the
+# +option of following the terms and conditions either of that numbered
+# +version or of any later version published by the Free Software
+# +Foundation.  If the Program does not specify a version number of the
+# +GNU General Public License, you may choose any version ever published
+# +by the Free Software Foundation.
+# +
+# +  If the Program specifies that a proxy can decide which future
+# +versions of the GNU General Public License can be used, that proxy's
+# +public statement of acceptance of a version permanently authorizes you
+# +to choose that version for the Program.
+# +
+# +  Later license versions may give you additional or different
+# +permissions.  However, no additional obligations are imposed on any
+# +author or copyright holder as a result of your choosing to follow a
+# +later version.
+# +
+# +  15. Disclaimer of Warranty.
+# +
+# +  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+# +APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+# +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+# +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+# +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# +PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+# +IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+# +ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+# +
+# +  16. Limitation of Liability.
+# +
+# +  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+# +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+# +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+# +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+# +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+# +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+# +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+# +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+# +SUCH DAMAGES.
+# +
+# +  17. Interpretation of Sections 15 and 16.
+# +
+# +  If the disclaimer of warranty and limitation of liability provided
+# +above cannot be given local legal effect according to their terms,
+# +reviewing courts shall apply local law that most closely approximates
+# +an absolute waiver of all civil liability in connection with the
+# +Program, unless a warranty or assumption of liability accompanies a
+# +copy of the Program in return for a fee.
+#  
+#                       END OF TERMS AND CONDITIONS
+#  
+# @@ -287,15 +628,15 @@
+#  
+#    To do so, attach the following notices to the program.  It is safest
+#  to attach them to the start of each source file to most effectively
+# -convey the exclusion of warranty; and each file should have at least
+# +state the exclusion of warranty; and each file should have at least
+#  the "copyright" line and a pointer to where the full notice is found.
+#  
+#      <one line to give the program's name and a brief idea of what it does.>
+#      Copyright (C) <year>  <name of author>
+#  
+# -    This program is free software; you can redistribute it and/or modify
+# +    This program is free software: you can redistribute it and/or modify
+#      it under the terms of the GNU General Public License as published by
+# -    the Free Software Foundation; either version 2 of the License, or
+# +    the Free Software Foundation, either version 3 of the License, or
+#      (at your option) any later version.
+#  
+#      This program is distributed in the hope that it will be useful,
+# @@ -303,37 +644,31 @@
+#      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#      GNU General Public License for more details.
+#  
+# -    You should have received a copy of the GNU General Public License along
+# -    with this program; if not, write to the Free Software Foundation, Inc.,
+# -    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# +    You should have received a copy of the GNU General Public License
+# +    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#  
+#  Also add information on how to contact you by electronic and paper mail.
+#  
+# -If the program is interactive, make it output a short notice like this
+# -when it starts in an interactive mode:
+# -
+# -    Gnomovision version 69, Copyright (C) year name of author
+# -    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+# +  If the program does terminal interaction, make it output a short
+# +notice like this when it starts in an interactive mode:
+# +
+# +    <program>  Copyright (C) <year>  <name of author>
+# +    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+#      This is free software, and you are welcome to redistribute it
+#      under certain conditions; type `show c' for details.
+#  
+#  The hypothetical commands `show w' and `show c' should show the appropriate
+# -parts of the General Public License.  Of course, the commands you use may
+# -be called something other than `show w' and `show c'; they could even be
+# -mouse-clicks or menu items--whatever suits your program.
+# -
+# -You should also get your employer (if you work as a programmer) or your
+# -school, if any, to sign a "copyright disclaimer" for the program, if
+# -necessary.  Here is a sample; alter the names:
+# -
+# -  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+# -  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+# -
+# -  <signature of Ty Coon>, 1 April 1989
+# -  Ty Coon, President of Vice
+# -
+# -This General Public License does not permit incorporating your program into
+# -proprietary programs.  If your program is a subroutine library, you may
+# -consider it more useful to permit linking proprietary applications with the
+# -library.  If this is what you want to do, use the GNU Lesser General
+# -Public License instead of this License.
+# +parts of the General Public License.  Of course, your program's commands
+# +might be different; for a GUI interface, you would use an "about box".
+# +
+# +  You should also get your employer (if you work as a programmer) or school,
+# +if any, to sign a "copyright disclaimer" for the program, if necessary.
+# +For more information on this, and how to apply and follow the GNU GPL, see
+# +<https://www.gnu.org/licenses/>.
+# +
+# +  The GNU General Public License does not permit incorporating your program
+# +into proprietary programs.  If your program is a subroutine library, you
+# +may consider it more useful to permit linking proprietary applications with
+# +the library.  If this is what you want to do, use the GNU Lesser General
+# +Public License instead of this License.  But first, please read
+# +<https://www.gnu.org/licenses/why-not-lgpl.html>.
+# --- include/pub_tool_basics.h
+# +++ include/pub_tool_basics.h
+# @@ -7,7 +7,7 @@
+#  
+#     This program is free software; you can redistribute it and/or
+#     modify it under the terms of the GNU General Public License as
+# -   published by the Free Software Foundation; either version 2 of the
+# +   published by the Free Software Foundation; either version 3 of the
+#     License, or (at your option) any later version.
+#  
+#     This program is distributed in the hope that it will be useful, but
+# --- include/valgrind.h
+# +++ include/valgrind.h
+# @@ -3,7 +3,7 @@
+#  
+#     Notice that the following BSD-style license applies to this one
+#     file (valgrind.h) only.  The rest of Valgrind is licensed under the
+# -   terms of the GNU General Public License, version 2, unless
+# +   terms of the GNU General Public License, version 3, unless
+#     otherwise indicated.  See the COPYING file in the source
+#     distribution for details.
+#  
+# @@ -49,7 +49,7 @@
+#  
+#     Notice that the above BSD-style license applies to this one file
+#     (valgrind.h) only.  The entire rest of Valgrind is licensed under
+# -   the terms of the GNU General Public License, version 2.  See the
+# +   the terms of the GNU General Public License, version 3.  See the
+#     COPYING file in the source distribution for details.
+#  
+#     ---------------------------------------------------------------- 
+# 
+#
+
+SUMMARY = "Valgrind memory debugger and instrumentation framework"
+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=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 \
+           file://fixed-perl-path.patch \
+           file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch \
+           file://use-appropriate-march-mcpu-mfpu-for-ARM-test-apps.patch \
+           file://avoid-neon-for-targets-which-don-t-support-it.patch \
+           file://0001-configure-Drop-setting-mcpu-cortex-a8-on-arm.patch \
+           file://valgrind-make-ld-XXX.so-strlen-intercept-optional.patch \
+           file://0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch \
+           file://0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch \
+           file://0003-correct-include-directive-path-for-config.h.patch \
+           file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \
+           file://0001-memcheck-vgtests-remove-fullpath-after-flags.patch \
+           file://s390x_vec_op_t.patch \
+           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-tests-arm-Use-O-instead-of-O0.patch \
+           "
+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'
+
+# valgrind supports armv7 and above
+COMPATIBLE_HOST:armv4 = 'null'
+COMPATIBLE_HOST:armv5 = 'null'
+COMPATIBLE_HOST:armv6 = 'null'
+
+# valgrind fails with powerpc soft-float
+COMPATIBLE_HOST:powerpc = "${@bb.utils.contains('TARGET_FPU', 'soft', 'null', '.*-linux', d)}"
+
+# X32 isn't supported by valgrind at this time
+COMPATIBLE_HOST:linux-gnux32 = 'null'
+COMPATIBLE_HOST:linux-muslx32 = 'null'
+
+# Disable for some MIPS variants
+COMPATIBLE_HOST:mipsarchr6 = 'null'
+COMPATIBLE_HOST:linux-gnun32 = 'null'
+
+# Disable for powerpc64 with musl
+COMPATIBLE_HOST:libc-musl:powerpc64 = 'null'
+
+inherit autotools-brokensep multilib_header
+
+EXTRA_OECONF = "--enable-tls --without-mpicc"
+EXTRA_OECONF += "${@['--enable-only32bit','--enable-only64bit'][d.getVar('SITEINFO_BITS') != '32']}"
+
+# valgrind checks host_cpu "armv7*)", so we need to over-ride the autotools.bbclass default --host option
+EXTRA_OECONF:append:arm = " --host=armv7${HOST_VENDOR}-${HOST_OS}"
+
+EXTRA_OEMAKE = "-w"
+
+CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'"
+
+# valgrind likes to control its own optimisation flags. It generally defaults
+# to -O2 but uses -O0 for some specific test apps etc. Passing our own flags
+# (via CFLAGS) means we interfere with that. Only pass DEBUG_FLAGS to it
+# which fixes build path issue in DWARF.
+SELECTED_OPTIMIZATION = "${DEBUG_LEVELFLAG}"
+
+# Split out various helper scripts to separate packages to avoid the
+# main package depending on perl and python.
+PACKAGES =+ "${PN}-cachegrind ${PN}-massif ${PN}-callgrind"
+
+FILES:${PN}-cachegrind = "${bindir}/cg_*"
+FILES:${PN}-massif = "${bindir}/ms_*"
+FILES:${PN}-callgrind = "${bindir}/callgrind_*"
+
+RDEPENDS:${PN}-cachegrind = "${PN} python3-core"
+RDEPENDS:${PN}-massif = "${PN} perl"
+RDEPENDS:${PN}-callgrind = "${PN} perl"
+
+do_configure:prepend () {
+    rm -rf ${S}/config.h
+}
+
+do_install:append () {
+    install -m 644 ${B}/default.supp ${D}/${libexecdir}/valgrind/
+    oe_multilib_header valgrind/config.h
+}
+
+VALGRINDARCH ?= "${TARGET_ARCH}"
+VALGRINDARCH:aarch64 = "arm64"
+VALGRINDARCH:x86-64 = "amd64"
+VALGRINDARCH:x86 = "x86"
+VALGRINDARCH:mips = "mips32"
+VALGRINDARCH:mipsel = "mips32"
+VALGRINDARCH:mips64el = "mips64"
+VALGRINDARCH:powerpc = "ppc"
+VALGRINDARCH:powerpc64 = "ppc64"
+VALGRINDARCH:powerpc64le = "ppc64le"
+
+INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libexecdir}/valgrind/vgpreload_memcheck-${VALGRINDARCH}-linux.so"
+
+# valgrind needs debug information for ld.so at runtime in order to
+# redirect functions like strlen.
+RRECOMMENDS:${PN} += "${TCLIBC}-dbg"
+
+# Valgrind needs intrinsics which are not provided by clang
+# m_signals.c:2213:7: error: __builtin_longjmp is not supported for the current target
+# 2213 |       VG_MINIMAL_LONGJMP(tst->sched_jmpbuf);
+#      |       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+# It needs something like - https://bugs.kde.org/show_bug.cgi?id=369723
+TOOLCHAIN:riscv64 = "gcc"