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
This commit is contained in:
Tomáš Chvátal 2019-07-11 18:34:11 +00:00 committed by Git OBS Bridge
parent 7a53ad4872
commit 0fc5ad03cf
2 changed files with 12 additions and 3 deletions

View File

@ -5,6 +5,8 @@ Subject: [PATCH 1/8] Add Power8+ optimized crc32-vpmsum from
https://github.com/antonblanchard/crc32-vpmsum/ https://github.com/antonblanchard/crc32-vpmsum/
This is the C implementation created by Rogerio Alves <rogealve@br.ibm.com> This is the C implementation created by Rogerio Alves <rogealve@br.ibm.com>
Bruce R. - Tweaked patch to have type of crc32_vpmsum conform to usage
(see bsc#1141059)
--- ---
power8-crc/clang_workaround.h | 69 +++ power8-crc/clang_workaround.h | 69 +++
power8-crc/crc32_constants.h | 1206 +++++++++++++++++++++++++++++++++++++++++ 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 +#define CRC32_FUNCTION crc32_vpmsum
+#endif +#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 long len)
+{ +{
+ unsigned int prealign; + unsigned int prealign, crc = (unsigned int)crc_l;
+ unsigned int tail; + unsigned int tail;
+ +
+ /* For zlib API */ + /* For zlib API */
@ -1427,7 +1429,7 @@ Index: zlib-1.2.11/contrib/power8-crc/vec_crc32.c
+ crc ^= 0xffffffff; + crc ^= 0xffffffff;
+#endif +#endif
+ +
+ return crc; + return (unsigned long)crc;
+} +}
+ +
+#if defined (__clang__) +#if defined (__clang__)

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jul 11 16:09:34 UTC 2019 - Bruce Rogers <brogers@suse.com>
- 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 <mliska@suse.cz> Tue Jul 2 07:22:36 UTC 2019 - Martin Liška <mliska@suse.cz>