GerbilSoft/zlib-ng
1
Fork 0
mirror of https://github.com/GerbilSoft/zlib-ng.git synced 2025-06-18 11:35:35 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

IBM zSystems: Hardcode HWCAP_S390_VXRS

Browse Source 
Compiling zlib-ng with glibc 2.17 (minimum version still supported by
crosstool-ng) fails due to the lack of HWCAP_S390_VX - it was
introduced in glibc 2.23.

Strictly speaking, this is a problem with the feature detection logic
in cmake. However, it's not worth disabling the s390x vectorized CRC32
if the hwcap constant is missing and the compiler intrinsics are
available.

So fix by hardcoding the constant. It's a part of the kernel ABI,
which does not change.
This commit is contained in:
Ilya Leoshkevich 2024-08-09 10:29:20 +02:00 committed by Hans Kristian Rosbach
parent 2c801bd43a
commit f858914696
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/s390_features.c
View File

@ -6,7 +6,7 @@
#endif
#ifndef HWCAP_S390_VXRS
#define HWCAP_S390_VXRS HWCAP_S390_VX
#define HWCAP_S390_VXRS (1 << 11)
#endif
void Z_INTERNAL s390_check_features(struct s390_cpu_features *features) {

2
cmake/detect-intrinsics.cmake
View File

@ -433,7 +433,7 @@ macro(check_s390_intrinsics)
check_c_source_compiles(
"#include <sys/auxv.h>
#ifndef HWCAP_S390_VXRS
#define HWCAP_S390_VXRS HWCAP_S390_VX
#define HWCAP_S390_VXRS (1 << 11)
#endif
int main() {
return (getauxval(AT_HWCAP) & HWCAP_S390_VXRS);