blob: 67c74a1e8e3392694269d4845abc2728a29d7dd1 [file] [log] [blame]
Patrick Williams92b42cb2022-09-03 06:53:57 -05001From 550834a3ec2e05e379be63b084e7fa06a1723f84 Mon Sep 17 00:00:00 2001
Andrew Geissler78b72792022-06-14 06:47:25 -05002From: Mingli Yu <mingli.yu@windriver.com>
3Date: Mon, 6 Jun 2022 17:53:20 +0800
4Subject: [PATCH] xxhash.h: Fix build with gcc-12
5
6Remove inline attribute to fix below build failure:
7 | /buildarea/tmp/work/core2-64-poky-linux/ccache/4.6.1-r0/ccache-4.6.1/src/third_party/xxhash.h:3932:1: error: inlining failed in call to 'always_inline' 'XXH3_accumulate_512_sse2': function not considered for inlining
8 3932 | XXH3_accumulate_512_sse2( void* XXH_RESTRICT acc,
9 | ^~~~~~~~~~~~~~~~~~~~~~~~
10 /buildarea/tmp/work/core2-64-poky-linux/ccache/4.6.1-r0/ccache-4.6.1/src/third_party/xxhash.h:4369:9: note: called from here
11 4369 | f_acc512(acc,
12 | ^~~~~~~~~~~~~
13 4370 | in,
14 | ~~~
15 4371 | secret + n*XXH_SECRET_CONSUME_RATE);
16
Patrick Williams92b42cb2022-09-03 06:53:57 -050017Upstream-Status: Submitted [https://github.com/Cyan4973/xxHash/pull/720]
Andrew Geissler78b72792022-06-14 06:47:25 -050018
19Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Patrick Williams92b42cb2022-09-03 06:53:57 -050020
Andrew Geissler78b72792022-06-14 06:47:25 -050021---
22 src/third_party/xxhash.h | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/src/third_party/xxhash.h b/src/third_party/xxhash.h
26index 08ab794..c754e99 100644
27--- a/src/third_party/xxhash.h
28+++ b/src/third_party/xxhash.h
29@@ -1501,7 +1501,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size)
30 # define XXH_NO_INLINE static
31 /* enable inlining hints */
32 #elif defined(__GNUC__) || defined(__clang__)
33-# define XXH_FORCE_INLINE static __inline__ __attribute__((always_inline, unused))
34+# define XXH_FORCE_INLINE static
35 # define XXH_NO_INLINE static __attribute__((noinline))
36 #elif defined(_MSC_VER) /* Visual Studio */
37 # define XXH_FORCE_INLINE static __forceinline