diff options
| author | Nathan Moinvaziri <nathan@nathanm.com> | 2022-01-22 09:27:58 -0800 |
|---|---|---|
| committer | Hans Kristian Rosbach <hk-github@circlestorm.org> | 2022-01-23 16:39:48 +0100 |
| commit | a5a0b40e17776e52fa981074925d825f3399b231 (patch) | |
| tree | 13e1f378ba54390a687cfa6a9b0b21f59148972b | |
| parent | 0911015e485ad03c4167798506b7ce4f83d16d41 (diff) | |
| download | Project-Tick-a5a0b40e17776e52fa981074925d825f3399b231.tar.gz Project-Tick-a5a0b40e17776e52fa981074925d825f3399b231.zip | |
Move cpu_feature includes out of zutil.h.
| -rw-r--r-- | arch/x86/crc32_fold_pclmulqdq.c | 2 | ||||
| -rw-r--r-- | cpu_features.c | 3 | ||||
| -rw-r--r-- | cpu_features.h | 9 | ||||
| -rw-r--r-- | deflate.c | 1 | ||||
| -rw-r--r-- | inflate.c | 1 | ||||
| -rw-r--r-- | zutil.h | 10 |
6 files changed, 14 insertions, 12 deletions
diff --git a/arch/x86/crc32_fold_pclmulqdq.c b/arch/x86/crc32_fold_pclmulqdq.c index a01cdf775c..6e429d6274 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 70bfcb698c..6ef5aa2c4b 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 103356b3e6..7dea3a6830 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(); @@ -48,6 +48,7 @@ */ #include "zbuild.h" +#include "cpu_features.h" #include "deflate.h" #include "deflate_p.h" #include "functable.h" @@ -5,6 +5,7 @@ #include "zbuild.h" #include "zutil.h" +#include "cpu_features.h" #include "inftrees.h" #include "inflate.h" #include "inffast.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_ */ |