| Andrew Geissler | 78b7279 | 2022-06-14 06:47:25 -0500 | [diff] [blame] | 1 | From cfde5ba7d10ae1e9d0c259dd1e7027e9bad8f83c Mon Sep 17 00:00:00 2001 |
| 2 | From: Mingli Yu <mingli.yu@windriver.com> |
| 3 | Date: Mon, 6 Jun 2022 17:53:20 +0800 |
| 4 | Subject: [PATCH] xxhash.h: Fix build with gcc-12 |
| 5 | |
| 6 | Remove 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 | |
| 17 | Upstream-Status: Submitted [https://github.com/ccache/ccache/pull/1089] |
| 18 | |
| 19 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
| 20 | --- |
| 21 | src/third_party/xxhash.h | 2 +- |
| 22 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 23 | |
| 24 | diff --git a/src/third_party/xxhash.h b/src/third_party/xxhash.h |
| 25 | index 08ab794..c754e99 100644 |
| 26 | --- a/src/third_party/xxhash.h |
| 27 | +++ b/src/third_party/xxhash.h |
| 28 | @@ -1501,7 +1501,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) |
| 29 | # define XXH_NO_INLINE static |
| 30 | /* enable inlining hints */ |
| 31 | #elif defined(__GNUC__) || defined(__clang__) |
| 32 | -# define XXH_FORCE_INLINE static __inline__ __attribute__((always_inline, unused)) |
| 33 | +# define XXH_FORCE_INLINE static |
| 34 | # define XXH_NO_INLINE static __attribute__((noinline)) |
| 35 | #elif defined(_MSC_VER) /* Visual Studio */ |
| 36 | # define XXH_FORCE_INLINE static __forceinline |
| 37 | -- |
| 38 | 2.25.1 |
| 39 | |