From: Nathan Moinvaziri Date: Sun, 16 Aug 2020 03:45:41 +0000 (-0700) Subject: Harmonize the CPU architecture preprocessor definitions. X-Git-Tag: 1.9.9-b1~100 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8aeacbfa285556fccef8f01af68bf02f1e671b0;p=thirdparty%2Fzlib-ng.git Harmonize the CPU architecture preprocessor definitions. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c3448ea..852c1a2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -645,7 +645,7 @@ endif() if(WITH_OPTIM) if(BASEARCH_ARM_FOUND) - add_definitions(-DARM_CPUID) + add_definitions(-DARM_FEATURES) list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/arm.h) list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/armfeature.c) if(WITH_ACLE AND NOT MSVC) @@ -692,7 +692,7 @@ if(WITH_OPTIM) list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/dfltcc_inflate.c) endif() elseif(BASEARCH_X86_FOUND) - add_definitions(-DX86_CPUID) + add_definitions(-DX86_FEATURES) list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/x86.h) list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/x86.c) if(MSVC) diff --git a/configure b/configure index ee7fbf85..df19fd3c 100755 --- a/configure +++ b/configure @@ -1129,8 +1129,8 @@ case "${ARCH}" in # Enable arch-specific optimizations if test $without_optimizations -eq 0; then - CFLAGS="${CFLAGS} -DX86_CPUID" - SFLAGS="${SFLAGS} -DX86_CPUID" + CFLAGS="${CFLAGS} -DX86_FEATURES" + SFLAGS="${SFLAGS} -DX86_FEATURES" ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} x86.o" ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} x86.lo" @@ -1197,8 +1197,8 @@ case "${ARCH}" in ARCHDIR=arch/arm if test $without_optimizations -eq 0; then - CFLAGS="${CFLAGS} -DARM_CPUID" - SFLAGS="${SFLAGS} -DARM_CPUID" + CFLAGS="${CFLAGS} -DARM_FEATURES" + SFLAGS="${SFLAGS} -DARM_FEATURES" ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} armfeature.o" ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} armfeature.lo" fi @@ -1324,8 +1324,8 @@ case "${ARCH}" in fi if test $without_optimizations -eq 0; then - CFLAGS="${CFLAGS} -DARM_CPUID" - SFLAGS="${SFLAGS} -DARM_CPUID" + CFLAGS="${CFLAGS} -DARM_FEATURES" + SFLAGS="${SFLAGS} -DARM_FEATURES" ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} armfeature.o" ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} armfeature.lo" diff --git a/deflate.c b/deflate.c index 20e7f667..014f56c8 100644 --- a/deflate.c +++ b/deflate.c @@ -262,9 +262,9 @@ int32_t ZEXPORT PREFIX(deflateInit2_)(PREFIX3(stream) *strm, int32_t level, int3 int wrap = 1; static const char my_version[] = PREFIX2(VERSION); -#if defined(X86_CPUID) +#if defined(X86_FEATURES) x86_check_features(); -#elif defined(ARM_CPUID) +#elif defined(ARM_FEATURES) arm_check_features(); #endif diff --git a/fallback_builtins.h b/fallback_builtins.h index f8557921..314ad326 100644 --- a/fallback_builtins.h +++ b/fallback_builtins.h @@ -5,7 +5,7 @@ #if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64) || defined(_M_ARM) || defined(_M_ARM64) #include -#ifdef X86_CPUID +#ifdef X86_FEATURES # include "arch/x86/x86.h" #endif @@ -13,7 +13,7 @@ * Because of that assumption trailing_zero is not initialized and the return value of _BitScanForward is not checked */ static __forceinline unsigned long __builtin_ctz(uint32_t value) { -#ifdef X86_CPUID +#ifdef X86_FEATURES if (x86_cpu_has_tzcnt) return _tzcnt_u32(value); #endif @@ -28,7 +28,7 @@ static __forceinline unsigned long __builtin_ctz(uint32_t value) { * Because of that assumption trailing_zero is not initialized and the return value of _BitScanForward64 is not checked */ static __forceinline unsigned long long __builtin_ctzll(uint64_t value) { -#ifdef X86_CPUID +#ifdef X86_FEATURES if (x86_cpu_has_tzcnt) return _tzcnt_u64(value); #endif diff --git a/functable.c b/functable.c index cc1f070f..1d43551c 100644 --- a/functable.c +++ b/functable.c @@ -10,7 +10,7 @@ #include "functable.h" -#ifdef X86_CPUID +#ifdef X86_FEATURES # include "fallback_builtins.h" #endif @@ -133,11 +133,11 @@ ZLIB_INTERNAL void cpu_check_features(void) static int features_checked = 0; if (features_checked) return; -#ifdef X86_CPUID +#if defined(X86_FEATURES) x86_check_features(); -#elif ARM_CPUID +#elif defined(ARM_FEATURES) arm_check_features(); -#elif POWER_FEATURES +#elif defined(POWER_FEATURES) power_check_features(); #endif features_checked = 1; diff --git a/inflate.c b/inflate.c index 340f854b..4f99c0e2 100644 --- a/inflate.c +++ b/inflate.c @@ -130,9 +130,9 @@ int32_t ZEXPORT PREFIX(inflateInit2_)(PREFIX3(stream) *strm, int32_t windowBits, int32_t ret; struct inflate_state *state; -#if defined(X86_CPUID) +#if defined(X86_FEATURES) x86_check_features(); -#elif defined(ARM_CPUID) +#elif defined(ARM_FEATURES) arm_check_features(); #endif diff --git a/win32/Makefile.a64 b/win32/Makefile.a64 index 763736c6..11f0dd9f 100644 --- a/win32/Makefile.a64 +++ b/win32/Makefile.a64 @@ -29,7 +29,7 @@ WFLAGS = \ -DUNALIGNED_OK \ -DUNALIGNED64_OK \ -D_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 \ - -DARM_CPUID \ + -DARM_FEATURES \ # LDFLAGS = -nologo -debug -incremental:no -opt:ref -manifest ARFLAGS = -nologo diff --git a/win32/Makefile.arm b/win32/Makefile.arm index 881b10fe..aa00330a 100644 --- a/win32/Makefile.arm +++ b/win32/Makefile.arm @@ -28,7 +28,7 @@ WFLAGS = \ -D_CRT_NONSTDC_NO_DEPRECATE \ -DUNALIGNED_OK \ -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 \ - -DARM_CPUID \ + -DARM_FEATURES \ # LDFLAGS = -nologo -debug -incremental:no -opt:ref -manifest ARFLAGS = -nologo diff --git a/win32/Makefile.msc b/win32/Makefile.msc index 4e3f09a9..b3670885 100644 --- a/win32/Makefile.msc +++ b/win32/Makefile.msc @@ -26,7 +26,7 @@ CFLAGS = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC) WFLAGS = \ -D_CRT_SECURE_NO_DEPRECATE \ -D_CRT_NONSTDC_NO_DEPRECATE \ - -DX86_CPUID \ + -DX86_FEATURES \ -DX86_PCLMULQDQ_CRC \ -DX86_SSE2 \ -DX86_SSE42_CRC_INTRIN \ diff --git a/zutil.h b/zutil.h index 1b918d9c..1699f4ba 100644 --- a/zutil.h +++ b/zutil.h @@ -246,9 +246,9 @@ void ZLIB_INTERNAL zng_cfree(void *opaque, void *ptr); # endif #endif -#if defined(X86_CPUID) +#if defined(X86_FEATURES) # include "arch/x86/x86.h" -#elif defined(ARM_CPUID) +#elif defined(ARM_FEATURES) # include "arch/arm/arm.h" #elif defined(POWER_FEATURES) # include "arch/power/power.h"