From c2400042ba2e9e152450583419c05b494f8bd987 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 5 Feb 2024 11:50:08 +0100 Subject: [PATCH] Update Valgrind to version 3.22.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [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.6 6.5 Change-Id: I7eca3b13d4f5475693c548b85b837d5d4b4b090f Reviewed-by: Kai Köhne (cherry picked from commit 79badf1b2c92cf937b2ded1cbae40cc69b358fba) Reviewed-by: Qt Cherry-pick Bot --- src/testlib/3rdparty/qt_attribution.json | 5 +++-- src/testlib/3rdparty/valgrind_p.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/testlib/3rdparty/qt_attribution.json b/src/testlib/3rdparty/qt_attribution.json index 25cdb5f9822..77f58e7d759 100644 --- 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 index 3aaa76746c2..f5e5518265e 100644 --- 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"