Update Valgrind to version 3.22.0

[ChangeLog][Third-Party Code] Updated Valgrind header used by QtTest. The change only affects portability of s390 inline assembler. Task-number: QTBUG-121346 Pick-to: 6.7 6.6 6.5 Change-Id: I7eca3b13d4f5475693c548b85b837d5d4b4b090f Reviewed-by: Kai Köhne <[email protected]>
CbtSlave · Feb 6, 2024 · 79badf1 · 79badf1
1 parent c05f987
commit 79badf1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/testlib/3rdparty/qt_attribution.json b/src/testlib/3rdparty/qt_attribution.json
@@ -4,12 +4,13 @@
         "Name": "Valgrind",
         "QDocModule": "qttestlib",
         "QtUsage": "Used on Linux ond MacOS in the Qt Test module.",
-        "Comment": { "UpstreamFiles": [ "include/valgrind.h.in", "callgrind/callgrind.h" ] },
+        "Comment": { "UpstreamFiles": [ "include/valgrind.h.in", "callgrind/callgrind.h" ],
+                     "License": "These two files are BSD; the rest of valgrind is GPL" },
         "Files": [ "valgrind_p.h", "callgrind_p.h" ],
 
         "Description": "An instrumentation framework for building dynamic analysis tools.",
         "Homepage": "http://valgrind.org/",
-        "Version": "3.20.0",
+        "Version": "3.22.0",
         "License": "BSD 4-clause \"Original\" or \"Old\" License",
         "LicenseId": "BSD-4-Clause",
         "LicenseFile": "VALGRIND_LICENSE.txt",

diff --git a/src/testlib/3rdparty/valgrind_p.h b/src/testlib/3rdparty/valgrind_p.h
@@ -4748,7 +4748,7 @@ typedef
       "lgr 1,%1\n\t" /* copy the argvec pointer in r1 */          \
       "lgr 7,11\n\t"                                              \
       "lgr 11,%2\n\t"                                             \
-      ".cfi_def_cfa r11, 0\n\t"
+      ".cfi_def_cfa 11, 0\n\t"
 #  define VALGRIND_CFI_EPILOGUE                                   \
       "lgr 11, 7\n\t"                                             \
       ".cfi_restore_state\n\t"