diff options
| author | Edward Welbourne <[email protected]> | 2024-06-05 17:43:37 +0200 |
|---|---|---|
| committer | Edward Welbourne <[email protected]> | 2024-07-11 15:57:50 +0200 |
| commit | efab6e69831c7fc8d35f18e211bda20f854f2f39 (patch) | |
| tree | c8344926ad1bbc76212edf2680b70558d572cafd | |
| parent | ed7becd9cba582640f19704b5c439e5f6807bc29 (diff) | |
QtTest 3rdparty: update valgrind headers to v23.0
Nothing hugely consequential, although __VALGRIND_MINOR__ was
previously out of step with the version given in qt_attribution.json.
[ChangeLog][Third-Party Code] Updated QtTest's Valgrind headers to
version 3.23.
Pick-to: 6.8
Fixes: QTBUG-126080
Change-Id: Ie2c9d41d4f35cd497b1dcf9a366cf4b319b361ad
Reviewed-by: Jason McDonald <[email protected]>
| -rw-r--r-- | src/testlib/3rdparty/valgrind/qt_attribution.json | 2 | ||||
| -rw-r--r-- | src/testlib/3rdparty/valgrind/valgrind_p.h | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/testlib/3rdparty/valgrind/qt_attribution.json b/src/testlib/3rdparty/valgrind/qt_attribution.json index f828a1fc072..f1ea241f803 100644 --- a/src/testlib/3rdparty/valgrind/qt_attribution.json +++ b/src/testlib/3rdparty/valgrind/qt_attribution.json @@ -10,7 +10,7 @@ "Description": "An instrumentation framework for building dynamic analysis tools.", "Homepage": "http://valgrind.org/", - "Version": "3.22.0", + "Version": "3.23.0", "License": "BSD 4-clause \"Original\" or \"Old\" License", "LicenseId": "BSD-4-Clause", "LicenseFile": "LICENSE.txt", diff --git a/src/testlib/3rdparty/valgrind/valgrind_p.h b/src/testlib/3rdparty/valgrind/valgrind_p.h index f5e5518265e..3a7ff4ac35c 100644 --- a/src/testlib/3rdparty/valgrind/valgrind_p.h +++ b/src/testlib/3rdparty/valgrind/valgrind_p.h @@ -89,7 +89,7 @@ || (__VALGRIND_MAJOR__ == 3 && __VALGRIND_MINOR__ >= 6)) */ #define __VALGRIND_MAJOR__ 3 -#define __VALGRIND_MINOR__ 20 +#define __VALGRIND_MINOR__ 23 #include <stdarg.h> @@ -112,6 +112,7 @@ #undef PLAT_amd64_darwin #undef PLAT_x86_freebsd #undef PLAT_amd64_freebsd +#undef PLAT_arm64_freebsd #undef PLAT_x86_win32 #undef PLAT_amd64_win64 #undef PLAT_x86_linux @@ -137,6 +138,8 @@ # define PLAT_x86_freebsd 1 #elif defined(__FreeBSD__) && defined(__amd64__) # define PLAT_amd64_freebsd 1 +#elif defined(__FreeBSD__) && defined(__aarch64__) && !defined(__arm__) +# define PLAT_arm64_freebsd 1 #elif (defined(__MINGW32__) && defined(__i386__)) \ || defined(__CYGWIN32__) \ || (defined(_WIN32) && defined(_M_IX86)) @@ -768,9 +771,9 @@ typedef #endif /* PLAT_arm_linux */ -/* ------------------------ arm64-linux ------------------------- */ +/* ------------------------ arm64-{linux,freebsd} ------------------------- */ -#if defined(PLAT_arm64_linux) +#if defined(PLAT_arm64_linux) || defined(PLAT_arm64_freebsd) typedef struct { @@ -835,7 +838,7 @@ typedef ); \ } while (0) -#endif /* PLAT_arm64_linux */ +#endif /* PLAT_arm64_linux || PLAT_arm64_freebsd */ /* ------------------------ s390x-linux ------------------------ */ @@ -4283,7 +4286,7 @@ typedef /* ------------------------ arm64-linux ------------------------ */ -#if defined(PLAT_arm64_linux) +#if defined(PLAT_arm64_linux) || defined(PLAT_arm64_freebsd) /* These regs are trashed by the hidden call. */ #define __CALLER_SAVED_REGS \ |