From 2b33e916ff8fe8d7c0ec80ba8e9640491ae603e4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 6 Jun 2024 21:52:26 -0700 Subject: [PATCH] googlebenchmark: Update patch and its status to backport Signed-off-by: Khem Raj --- ...ype-conversion-to-match-function-ret.patch | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch index d514cf192b..3017314abe 100644 --- a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch +++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch @@ -1,7 +1,8 @@ -From db704bcc344529039d7fb28be380658625a9c08d Mon Sep 17 00:00:00 2001 +From 7f0e99af540a333108b92d792923ec7fc9e9fad9 Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Tue, 28 May 2024 19:34:43 -0700 +Date: Tue, 28 May 2024 20:14:54 -0700 Subject: [PATCH] cycleclock: Fix type conversion to match function return type + (#1794) fixes build with clang19 @@ -10,25 +11,23 @@ src/cycleclock.h:208:52: error: implicit conversion changes signedness: 'uint64_ | ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~ 1 error generated. -Upstream-Status: Submitted [https://github.com/google/benchmark/pull/1794] +Upstream-Status: Backport [https://github.com/google/benchmark/commit/7f0e99af540a333108b92d792923ec7fc9e9fad9] Signed-off-by: Khem Raj --- - src/cycleclock.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/cycleclock.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cycleclock.h b/src/cycleclock.h -index a2584376..f96801c5 100644 +index a25843760..c657414e5 100644 --- a/src/cycleclock.h +++ b/src/cycleclock.h -@@ -205,7 +205,7 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() { +@@ -205,7 +205,8 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() { "sub %0, zero, %0\n" "and %1, %1, %0\n" : "=r"(cycles_hi0), "=r"(cycles_lo), "=r"(cycles_hi1)); - return (static_cast(cycles_hi1) << 32) | cycles_lo; -+ return static_cast((static_cast(cycles_hi1) << 32) | cycles_lo); ++ return static_cast((static_cast(cycles_hi1) << 32) | ++ cycles_lo); #else uint64_t cycles; asm volatile("rdtime %0" : "=r"(cycles)); --- -2.45.1 -