Move cpu_feature includes out of zutil.h.

This commit is contained in:
Nathan Moinvaziri 2022-01-22 09:27:58 -08:00 committed by Hans Kristian Rosbach
parent 0911015e48
commit a5a0b40e17
6 changed files with 14 additions and 12 deletions

View File

@ -24,6 +24,8 @@
#include <wmmintrin.h>
#include <smmintrin.h> // _mm_extract_epi32
#include "x86.h"
#include "../../crc32_fold.h"
#ifdef X86_VPCLMULQDQ_CRC

View File

@ -4,7 +4,8 @@
*/
#include "zbuild.h"
#include "zutil.h"
#include "cpu_features.h"
Z_INTERNAL void cpu_check_features(void) {
static int features_checked = 0;

View File

@ -9,8 +9,15 @@
#include "deflate.h"
#include "crc32_fold.h"
#ifdef X86_FEATURES
#if defined(X86_FEATURES)
# include "arch/x86/x86.h"
# include "fallback_builtins.h"
#elif defined(ARM_FEATURES)
# include "arch/arm/arm.h"
#elif defined(PPC_FEATURES) || defined(POWER_FEATURES)
# include "arch/power/power.h"
#elif defined(S390_FEATURES)
# include "arch/s390/s390.h"
#endif
extern void cpu_check_features();

View File

@ -48,6 +48,7 @@
*/
#include "zbuild.h"
#include "cpu_features.h"
#include "deflate.h"
#include "deflate_p.h"
#include "functable.h"

View File

@ -5,6 +5,7 @@
#include "zbuild.h"
#include "zutil.h"
#include "cpu_features.h"
#include "inftrees.h"
#include "inflate.h"
#include "inffast.h"

10
zutil.h
View File

@ -259,14 +259,4 @@ void Z_INTERNAL zng_cfree(void *opaque, void *ptr);
# define ALIGNED_(x) __declspec(align(x))
#endif
#if defined(X86_FEATURES)
# include "arch/x86/x86.h"
#elif defined(ARM_FEATURES)
# include "arch/arm/arm.h"
#elif defined(PPC_FEATURES) || defined(POWER_FEATURES)
# include "arch/power/power.h"
#elif defined(S390_FEATURES)
# include "arch/s390/s390.h"
#endif
#endif /* ZUTIL_H_ */