diff --git a/15ce80f9f2760609d8cc68cea76d3f3217ab70e1.patch b/15ce80f9f2760609d8cc68cea76d3f3217ab70e1.patch new file mode 100644 index 0000000..ac2f958 --- /dev/null +++ b/15ce80f9f2760609d8cc68cea76d3f3217ab70e1.patch @@ -0,0 +1,43 @@ +From 15ce80f9f2760609d8cc68cea76d3f3217ab70e1 Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Tue, 30 Nov 2021 23:19:38 +0100 +Subject: [PATCH] Fix compilation on RHEL 7 ppc64le (gcc 4.8) + +--- + xxhash.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/xxhash.h b/xxhash.h +index 08ab794..7850622 100644 +--- a/xxhash.h ++++ b/xxhash.h +@@ -4129,7 +4129,7 @@ XXH3_accumulate_512_vsx( void* XXH_RESTRICT acc, + const void* XXH_RESTRICT secret) + { + /* presumed aligned */ +- unsigned long long* const xacc = (unsigned long long*) acc; ++ unsigned int* const xacc = (unsigned int*) acc; + xxh_u64x2 const* const xinput = (xxh_u64x2 const*) input; /* no alignment restriction */ + xxh_u64x2 const* const xsecret = (xxh_u64x2 const*) secret; /* no alignment restriction */ + xxh_u64x2 const v32 = { 32, 32 }; +@@ -4145,7 +4145,7 @@ XXH3_accumulate_512_vsx( void* XXH_RESTRICT acc, + /* product = ((xxh_u64x2)data_key & 0xFFFFFFFF) * ((xxh_u64x2)shuffled & 0xFFFFFFFF); */ + xxh_u64x2 const product = XXH_vec_mulo((xxh_u32x4)data_key, shuffled); + /* acc_vec = xacc[i]; */ +- xxh_u64x2 acc_vec = vec_xl(0, xacc + 2 * i); ++ xxh_u64x2 acc_vec = (xxh_u64x2)vec_xl(0, xacc + 4 * i); + acc_vec += product; + + /* swap high and low halves */ +@@ -4155,7 +4155,7 @@ XXH3_accumulate_512_vsx( void* XXH_RESTRICT acc, + acc_vec += vec_xxpermdi(data_vec, data_vec, 2); + #endif + /* xacc[i] = acc_vec; */ +- vec_xst(acc_vec, 0, xacc + 2 * i); ++ vec_xst((xxh_u32x4)acc_vec, 0, xacc + 4 * i); + } + } + +-- +2.39.2 + diff --git a/xxhash.changes b/xxhash.changes index f649eba..8eefbff 100644 --- a/xxhash.changes +++ b/xxhash.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 8 21:28:23 UTC 2023 - Michael Gorse + +- Add 15ce80f9f2760609d8cc68cea76d3f3217ab70e1.patch: fix build + failure on ppc64le when using gcc 7 (boo#1208794). + ------------------------------------------------------------------- Mon Dec 20 10:27:32 UTC 2021 - Dirk Müller diff --git a/xxhash.spec b/xxhash.spec index 2a89a4b..08223e9 100644 --- a/xxhash.spec +++ b/xxhash.spec @@ -1,7 +1,7 @@ # # spec file for package xxhash # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,7 @@ URL: https://github.com/Cyan4973/xxHash Source0: https://github.com/Cyan4973/xxHash/archive/v%{version}.tar.gz#/xxHash-%{version}.tar.gz Patch0: xxhash-avoid-armv6-unaligned-access.patch Patch1: https://github.com/Cyan4973/xxHash/commit/836f4e735cf368542f14005e41d2f84ec29dfd60.patch +Patch2: https://github.com/Cyan4973/xxHash/commit/15ce80f9f2760609d8cc68cea76d3f3217ab70e1.patch BuildRequires: gcc-c++ BuildRequires: pkgconfig