From 0fc5ad03cf3f9349d633f098de605fdf5e21c6fd7fc02525d2dee8966af3b6db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 11 Jul 2019 18:34:11 +0000 Subject: [PATCH] Accepting request 714685 from home:bfrogers:branches:devel:libraries:c_c++ - Tweak zlib-power8-fate325307.patch to have type of crc32_vpmsum conform to usage bsc#1141059 OBS-URL: https://build.opensuse.org/request/show/714685 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zlib?expand=0&rev=59 --- zlib-power8-fate325307.patch | 8 +++++--- zlib.changes | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/zlib-power8-fate325307.patch b/zlib-power8-fate325307.patch index 0584508..a422789 100644 --- a/zlib-power8-fate325307.patch +++ b/zlib-power8-fate325307.patch @@ -5,6 +5,8 @@ Subject: [PATCH 1/8] Add Power8+ optimized crc32-vpmsum from https://github.com/antonblanchard/crc32-vpmsum/ This is the C implementation created by Rogerio Alves +Bruce R. - Tweaked patch to have type of crc32_vpmsum conform to usage +(see bsc#1141059) --- power8-crc/clang_workaround.h | 69 +++ power8-crc/crc32_constants.h | 1206 +++++++++++++++++++++++++++++++++++++++++ @@ -1389,10 +1391,10 @@ Index: zlib-1.2.11/contrib/power8-crc/vec_crc32.c +#define CRC32_FUNCTION crc32_vpmsum +#endif + -+unsigned int CRC32_FUNCTION(unsigned int crc, const unsigned char *p, ++unsigned long CRC32_FUNCTION(unsigned long crc_l, const unsigned char *p, + unsigned long len) +{ -+ unsigned int prealign; ++ unsigned int prealign, crc = (unsigned int)crc_l; + unsigned int tail; + + /* For zlib API */ @@ -1427,7 +1429,7 @@ Index: zlib-1.2.11/contrib/power8-crc/vec_crc32.c + crc ^= 0xffffffff; +#endif + -+ return crc; ++ return (unsigned long)crc; +} + +#if defined (__clang__) diff --git a/zlib.changes b/zlib.changes index b747478..617688e 100644 --- a/zlib.changes +++ b/zlib.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jul 11 16:09:34 UTC 2019 - Bruce Rogers + +- Tweak zlib-power8-fate325307.patch to have type of crc32_vpmsum + conform to usage + bsc#1141059 + ------------------------------------------------------------------- Tue Jul 2 07:22:36 UTC 2019 - Martin Liška