From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Sat, 22 Jan 2022 17:27:58 +0000 (-0800)
Subject: Move cpu_feature includes out of zutil.h.
X-Git-Tag: 2.1.0-beta1~429
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5a0b40e17776e52fa981074925d825f3399b231;p=thirdparty%2Fzlib-ng.git

Move cpu_feature includes out of zutil.h.
---

diff --git a/arch/x86/crc32_fold_pclmulqdq.c b/arch/x86/crc32_fold_pclmulqdq.c
index a01cdf77..6e429d62 100644
--- a/arch/x86/crc32_fold_pclmulqdq.c
+++ b/arch/x86/crc32_fold_pclmulqdq.c
@@ -24,6 +24,8 @@
 #include <wmmintrin.h>
 #include <smmintrin.h> // _mm_extract_epi32
 
+#include "x86.h"
+
 #include "../../crc32_fold.h"
 
 #ifdef X86_VPCLMULQDQ_CRC
diff --git a/cpu_features.c b/cpu_features.c
index 70bfcb69..6ef5aa2c 100644
--- a/cpu_features.c
+++ b/cpu_features.c
@@ -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;
diff --git a/cpu_features.h b/cpu_features.h
index 103356b3..7dea3a68 100644
--- a/cpu_features.h
+++ b/cpu_features.h
@@ -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();
diff --git a/deflate.c b/deflate.c
index 8f569bf2..5919cdb3 100644
--- a/deflate.c
+++ b/deflate.c
@@ -48,6 +48,7 @@
  */
 
 #include "zbuild.h"
+#include "cpu_features.h"
 #include "deflate.h"
 #include "deflate_p.h"
 #include "functable.h"
diff --git a/inflate.c b/inflate.c
index 44a50e61..1e8806a4 100644
--- a/inflate.c
+++ b/inflate.c
@@ -5,6 +5,7 @@
 
 #include "zbuild.h"
 #include "zutil.h"
+#include "cpu_features.h"
 #include "inftrees.h"
 #include "inflate.h"
 #include "inffast.h"
diff --git a/zutil.h b/zutil.h
index 660fabda..324fd992 100644
--- a/zutil.h
+++ b/zutil.h
@@ -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_ */