Rename CPU feature header and source files for consistency.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ccac51cbf107160b29956d77b057e2093299bb8c..472cf2f092d9ae2bba4e5d421144f93fe91b74ae 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -600,8 +600,8 @@ if(WITH_OPTIM)
                 endif()
             endif()
         endif()
-        list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/arm.h)
-        list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/armfeature.c)
+        list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/arm_features.h)
+        list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/arm_features.c)
         if(WITH_ACLE AND NOT MSVC AND NOT "${ARCH}" MATCHES "armv[2-7]")
             check_acle_compiler_flag()
             if(HAVE_ACLE_FLAG)
@@ -645,8 +645,8 @@ if(WITH_OPTIM)
             check_power8_intrinsics()
         endif()
         if(HAVE_VMX OR HAVE_POWER8_INTRIN)
-            list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/power.h)
-            list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/power.c)
+            list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/power_features.h)
+            list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/power_features.c)
         endif()
         # VMX specific options and files
         if(WITH_ALTIVEC)
@@ -686,7 +686,8 @@ if(WITH_OPTIM)
     elseif(BASEARCH_S360_FOUND)
         if(WITH_CRC32_VX)
             add_definitions(-DS390_FEATURES)
-            list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/s390.c)
+            list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/s390_features.h)
+            list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/s390_features.c)
         endif()
         if(WITH_DFLTCC_DEFLATE OR WITH_DFLTCC_INFLATE)
             list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/dfltcc_common.c)
@@ -712,8 +713,8 @@ if(WITH_OPTIM)
         endif()
     elseif(BASEARCH_X86_FOUND)
         add_definitions(-DX86_FEATURES)
-        list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/x86.h)
-        list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/x86.c)
+        list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/x86_features.h)
+        list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/x86_features.c)
         if(MSVC)
             list(APPEND ZLIB_ARCH_HDRS fallback_builtins.h)
         endif()

diff --git a/arch/arm/Makefile.in b/arch/arm/Makefile.in
index 39c9a6a3bb474da68f7ab6a43a052c029354c9b1..f47325c2319718ab075c029b13633524f23eedf2 100644 (file)
--- a/arch/arm/Makefile.in
+++ b/arch/arm/Makefile.in
@@ -18,7 +18,7 @@ TOPDIR=$(SRCTOP)
 
 all: \
        adler32_neon.o adler32_neon.lo \
-       armfeature.o armfeature.lo \
+       arm_features.o arm_features.lo \
        chunkset_neon.o chunkset_neon.lo \
        crc32_acle.o crc32_acle.lo \
        slide_hash_neon.o slide_hash_neon.lo \
@@ -30,11 +30,11 @@ adler32_neon.o:
 adler32_neon.lo:
        $(CC) $(SFLAGS) $(NEONFLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_neon.c
 
-armfeature.o:
-       $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/armfeature.c
+arm_features.o:
+       $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arm_features.c
 
-armfeature.lo:
-       $(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/armfeature.c
+arm_features.lo:
+       $(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arm_features.c
 
 chunkset_neon.o:
        $(CC) $(CFLAGS) $(NEONFLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_neon.c

diff --git a/arch/arm/armfeature.c b/arch/arm/arm_features.c
similarity index 100%
rename from arch/arm/armfeature.c
rename to arch/arm/arm_features.c

diff --git a/arch/arm/arm.h b/arch/arm/arm_features.h
similarity index 83%
rename from arch/arm/arm.h
rename to arch/arm/arm_features.h
index 378006efbd2624e34a4003e3ca55361a46e7d6f0..7998e7942244a8af7510bb424b91225f82f464d2 100644 (file)
--- a/arch/arm/arm.h
+++ b/arch/arm/arm_features.h
@@ -1,4 +1,4 @@
-/* arm.h -- check for ARM features.
+/* arm_features.h -- check for ARM features.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 

diff --git a/arch/power/Makefile.in b/arch/power/Makefile.in
index 344b221044e8b810cd98a593af3110f3fe693373..ca0e2ba9ca43af145c645b922b814196f2a4e011 100644 (file)
--- a/arch/power/Makefile.in
+++ b/arch/power/Makefile.in
@@ -17,8 +17,8 @@ SRCDIR=.
 SRCTOP=../..
 TOPDIR=$(SRCTOP)
 
-all: power.o \
-     power.lo \
+all: power_features.o \
+     power_features.lo \
      adler32_power8.o \
      adler32_power8.lo \
      adler32_vmx.o \
@@ -32,11 +32,11 @@ all: power.o \
      slide_hash_vmx.o \
      slide_hash_vmx.lo
 
-power.o:
-       $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/power.c
+power_features.o:
+       $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/power_features.c
 
-power.lo:
-       $(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/power.c
+power_features.lo:
+       $(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/power_features.c
 
 adler32_power8.o:
        $(CC) $(CFLAGS) $(P8FLAGS) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_power8.c

diff --git a/arch/power/power.c b/arch/power/power_features.c
similarity index 91%
rename from arch/power/power.c
rename to arch/power/power_features.c
index d17fe3f4f33c17af3f72479060d3eb23cfb27fd1..60c5e53f2f11d8a29112dfe77772693348343d46 100644 (file)
--- a/arch/power/power.c
+++ b/arch/power/power_features.c
@@ -1,4 +1,4 @@
-/* POWER feature check
+/* power_features.c - POWER feature check
  * Copyright (C) 2020 Matheus Castanho <msc@linux.ibm.com>, IBM
  * Copyright (C) 2021 Mika T. Lindqvist <postmaster@raasu.org>
  * For conditions of distribution and use, see copyright notice in zlib.h
@@ -6,7 +6,7 @@
 
 #include <sys/auxv.h>
 #include "../../zutil.h"
-#include "power.h"
+#include "power_features.h"
 
 Z_INTERNAL int power_cpu_has_altivec = 0;
 Z_INTERNAL int power_cpu_has_arch_2_07 = 0;

diff --git a/arch/power/power.h b/arch/power/power_features.h
similarity index 87%
rename from arch/power/power.h
rename to arch/power/power_features.h
index 81ce0096173fff65078dad9a5f633fb764b62c77..077bec11588708fb7c831acab06c9cfe0127266a 100644 (file)
--- a/arch/power/power.h
+++ b/arch/power/power_features.h
@@ -1,4 +1,4 @@
-/* power.h -- check for POWER CPU features
+/* power_features.h -- check for POWER CPU features
  * Copyright (C) 2020 Matheus Castanho <msc@linux.ibm.com>, IBM
  * Copyright (C) 2021 Mika T. Lindqvist <postmaster@raasu.org>
  * For conditions of distribution and use, see copyright notice in zlib.h

diff --git a/arch/s390/Makefile.in b/arch/s390/Makefile.in
index 9780f24cffcb4d72c9ce1961cac5c342ce42802e..39b5aae61909427492728ab4a316620f1ef9b5a7 100644 (file)
--- a/arch/s390/Makefile.in
+++ b/arch/s390/Makefile.in
@@ -14,11 +14,11 @@ SRCDIR=.
 SRCTOP=../..
 TOPDIR=$(SRCTOP)
 
-s390.o:
-       $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/s390.c
+s390_features.o:
+       $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/s390_features.c
 
-s390.lo:
-       $(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/s390.c
+s390_features.lo:
+       $(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/s390_features.c
 
 dfltcc_common.o:
        $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/dfltcc_common.c

diff --git a/arch/s390/s390.c b/arch/s390/s390_features.c
similarity index 87%
rename from arch/s390/s390.c
rename to arch/s390/s390_features.c
index a67bfc249a3f8996577abb47b4a994c24e0d40c1..1051d116a0d450e72f8e8f94190797131bd028b4 100644 (file)
--- a/arch/s390/s390.c
+++ b/arch/s390/s390_features.c
@@ -1,5 +1,5 @@
 #include "zutil.h"
-#include "s390.h"
+#include "s390_features.h"
 
 #include <sys/auxv.h>
 

diff --git a/arch/s390/s390.h b/arch/s390/s390_features.h
similarity index 66%
rename from arch/s390/s390.h
rename to arch/s390/s390_features.h
index 453c58137c86bbde2ef253d97eefa563c7f0dcc3..1e27b2386510cb80cae5ac30d3a52cb4524b12f2 100644 (file)
--- a/arch/s390/s390.h
+++ b/arch/s390/s390_features.h
@@ -1,5 +1,5 @@
-#ifndef S390_H_
-#define S390_H_
+#ifndef S390_FEATURES_H_
+#define S390_FEATURES_H_
 
 #include "zutil.h"
 

diff --git a/arch/x86/Makefile.in b/arch/x86/Makefile.in
index f0d7c38f9fdbbd56608320105210185bcb5d834e..9ef328ebef284bde56311660b58e58d46b06a767 100644 (file)
--- a/arch/x86/Makefile.in
+++ b/arch/x86/Makefile.in
@@ -24,7 +24,7 @@ SRCTOP=../..
 TOPDIR=$(SRCTOP)
 
 all: \
-       x86.o x86.lo \
+       x86_features.o x86_features.lo \
        adler32_avx2.o adler32_avx2.lo \
        adler32_avx512.o adler32_avx512.lo \
        adler32_avx512_vnni.o adler32_avx512_vnni.lo \
@@ -40,11 +40,11 @@ all: \
        slide_hash_avx2.o slide_hash_avx2.lo \
        slide_hash_sse2.o slide_hash_sse2.lo
 
-x86.o:
-       $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/x86.c
+x86_features.o:
+       $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/x86_features.c
 
-x86.lo:
-       $(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/x86.c
+x86_features.lo:
+       $(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/x86_features.c
 
 chunkset_avx.o:
        $(CC) $(CFLAGS) $(AVX2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_avx.c

diff --git a/arch/x86/crc32_fold_pclmulqdq.c b/arch/x86/crc32_fold_pclmulqdq.c
index d801c8ccb1c5797c561f1fbdbacd63fc9edeaa6f..2548bfbea30823585cfd68822f100a3db995d5a3 100644 (file)
--- a/arch/x86/crc32_fold_pclmulqdq.c
+++ b/arch/x86/crc32_fold_pclmulqdq.c
@@ -24,7 +24,7 @@
 #include <wmmintrin.h>
 #include <smmintrin.h> // _mm_extract_epi32
 
-#include "x86.h"
+#include "x86_features.h"
 
 #include "../../crc32_fold.h"
 

diff --git a/arch/x86/x86.c b/arch/x86/x86_features.c
similarity index 98%
rename from arch/x86/x86.c
rename to arch/x86/x86_features.c
index aec506261608c32cd9ba366c416564b8bd4eea2d..72ef885e826b530d4ff85cf90d626a92d154bc0c 100644 (file)
--- a/arch/x86/x86.c
+++ b/arch/x86/x86_features.c
@@ -1,4 +1,4 @@
-/* x86.c - x86 feature check
+/* x86_features.c - x86 feature check
  *
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  * Author:

diff --git a/arch/x86/x86.h b/arch/x86/x86_features.h
similarity index 84%
rename from arch/x86/x86.h
rename to arch/x86/x86_features.h
index 2e56c5d5670e03e5dd606624accff988fe2d68c3..97630ab6e6c438fd274670338ba0f30c7e33bc76 100644 (file)
--- a/arch/x86/x86.h
+++ b/arch/x86/x86_features.h
@@ -1,10 +1,10 @@
-/* x86.h -- check for CPU features
+/* x86_features.h -- check for CPU features
 * Copyright (C) 2013 Intel Corporation Jim Kukunas
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
 
-#ifndef CPU_H_
-#define CPU_H_
+#ifndef X86_FEATURES_H_
+#define X86_FEATURES_H_
 
 extern int x86_cpu_has_avx2;
 extern int x86_cpu_has_avx512;

diff --git a/configure b/configure
index 93b109b7ca45eb72ab13293d7dbe7f5c1612f934..126124a6c4f892f7c7f8ae58f1b3b3b720ff4233 100755 (executable)
--- a/configure
+++ b/configure
@@ -1479,8 +1479,8 @@ case "${ARCH}" in
             CFLAGS="${CFLAGS} -DX86_FEATURES"
             SFLAGS="${SFLAGS} -DX86_FEATURES"
 
-            ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} x86.o"
-            ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} x86.lo"
+            ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} x86_features.o"
+            ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} x86_features.lo"
 
             check_avx2_intrinsics
 
@@ -1601,8 +1601,8 @@ case "${ARCH}" in
         if test $without_optimizations -eq 0; then
             CFLAGS="${CFLAGS} -DARM_FEATURES"
             SFLAGS="${SFLAGS} -DARM_FEATURES"
-            ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} armfeature.o"
-            ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} armfeature.lo"
+            ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} arm_features.o"
+            ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} arm_features.lo"
 
             if test $LINUX -eq 1; then
                 cat > $test.c <<EOF
@@ -1814,8 +1814,8 @@ EOF
         if test $without_optimizations -eq 0; then
             CFLAGS="${CFLAGS} -DARM_FEATURES"
             SFLAGS="${SFLAGS} -DARM_FEATURES"
-            ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} armfeature.o"
-            ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} armfeature.lo"
+            ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} arm_features.o"
+            ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} arm_features.lo"
 
             if test $LINUX -eq 1; then
                 cat > $test.c <<EOF
@@ -1891,8 +1891,8 @@ EOF
                 SFLAGS="${SFLAGS} -DPPC_FEATURES"
             fi
             if test $HAVE_VMX -eq 1 -o $HAVE_POWER8_INTRIN -eq 1; then
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} power.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} power.lo"
+                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} power_features.o"
+                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} power_features.lo"
             fi
             if test $HAVE_VMX -eq 1 -a $HAVE_ALTIVEC_INTRIN -eq 1; then
                 CFLAGS="${CFLAGS} -DPPC_VMX_ADLER32 -DPPC_VMX_SLIDEHASH"
@@ -1926,8 +1926,8 @@ EOF
             if test $buildcrc32vx -eq 1; then
                 CFLAGS="${CFLAGS} -DS390_FEATURES"
                 SFLAGS="${SFLAGS} -DS390_FEATURES"
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} s390.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} s390.lo"
+                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} s390_features.o"
+                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} s390_features.lo"
             fi
 
             if test $builddfltccdeflate -eq 1 -o $builddfltccinflate -eq 1; then

diff --git a/cpu_features.h b/cpu_features.h
index ecb09eaa470b48a6660c632c53699a6936dc1774..6ae66a25e26d29b2350edb711b785c8bd80b6dae 100644 (file)
--- a/cpu_features.h
+++ b/cpu_features.h
@@ -10,14 +10,14 @@
 #include "crc32_fold.h"
 
 #if defined(X86_FEATURES)
-#  include "arch/x86/x86.h"
+#  include "arch/x86/x86_features.h"
 #  include "fallback_builtins.h"
 #elif defined(ARM_FEATURES)
-#  include "arch/arm/arm.h"
+#  include "arch/arm/arm_features.h"
 #elif defined(PPC_FEATURES) || defined(POWER_FEATURES)
-#  include "arch/power/power.h"
+#  include "arch/power/power_features.h"
 #elif defined(S390_FEATURES)
-#  include "arch/s390/s390.h"
+#  include "arch/s390/s390_features.h"
 #endif
 
 extern void cpu_check_features();

diff --git a/fallback_builtins.h b/fallback_builtins.h
index ee623a66f278ad40d30cc112f88a78919ec68ded..3554b6cc3d70284551096cbea3325ab8b2a09c27 100644 (file)
--- a/fallback_builtins.h
+++ b/fallback_builtins.h
@@ -6,7 +6,7 @@
 
 #include <intrin.h>
 #ifdef X86_FEATURES
-#  include "arch/x86/x86.h"
+#  include "arch/x86/x86_features.h"
 #endif
 
 /* This is not a general purpose replacement for __builtin_ctz. The function expects that value is != 0
@@ -37,7 +37,7 @@ static __forceinline unsigned long long __builtin_ctzll(uint64_t value) {
     return trailing_zero;
 }
 #define HAVE_BUILTIN_CTZLL
-#endif // Microsoft AMD64 
+#endif // Microsoft AMD64
 
 #endif // Microsoft AMD64/IA64/x86/ARM/ARM64 test
 #endif // _MSC_VER & !clang
@@ -73,7 +73,7 @@ static inline __m512i _mm512_zextsi128_si512(__m128i a) {
     out.val[3] = vqsubq_u16(a.val[3], b); \
 } while (0)
 
-/* Have to check for hard float ABI on GCC/clang, but not 
+/* Have to check for hard float ABI on GCC/clang, but not
  * on MSVC (we don't compile for the soft float ABI on windows)
  */
 #if !defined(ARM_NEON_HASLD4) && (defined(__ARM_FP) || defined(_MSC_VER))
@@ -102,4 +102,4 @@ static inline void vst1q_u16_x4(uint16_t *p, uint16x8x4_t a) {
 #endif // HASLD4 check and hard float
 #endif // ARM_NEON_SLIDEHASH
 
-#endif // include guard FALLBACK_BUILTINS_H 
+#endif // include guard FALLBACK_BUILTINS_H

diff --git a/win32/Makefile.a64 b/win32/Makefile.a64
index 1dc0815a3b291e6324dc110d312db04becf40c83..4df6f3d080e540d7f9c969871cec851e0d4e8a4b 100644 (file)
--- a/win32/Makefile.a64
+++ b/win32/Makefile.a64
@@ -45,7 +45,7 @@ SUFFIX =
 
 OBJS = \
        adler32.obj \
-       armfeature.obj \
+       arm_features.obj \
        chunkset.obj \
        compare256.obj \
        compress.obj \
@@ -181,7 +181,7 @@ SRCDIR = $(TOP)
 # Keep the dependences in sync with top-level Makefile.in
 adler32.obj: $(SRCDIR)/adler32.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/functable.h $(SRCDIR)/adler32_p.h
 chunkset.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h
-functable.obj: $(SRCDIR)/functable.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/zendian.h $(SRCDIR)/arch/x86/x86.h
+functable.obj: $(SRCDIR)/functable.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/zendian.h $(SRCDIR)/arch/x86/x86_features.h
 gzlib.obj: $(SRCDIR)/gzlib.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h
 gzread.obj: $(SRCDIR)/gzread.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h
 gzwrite.obj: $(SRCDIR)/gzwrite.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h

diff --git a/win32/Makefile.arm b/win32/Makefile.arm
index 7628b617fe57c2eb475c492bff1552d878b6251e..4cc902888d9b5049f7569c1ce1c3a4d29da70ec5 100644 (file)
--- a/win32/Makefile.arm
+++ b/win32/Makefile.arm
@@ -48,7 +48,7 @@ SUFFIX =
 
 OBJS = \
        adler32.obj \
-       armfeature.obj \
+       arm_features.obj \
        chunkset.obj \
        compare256.obj \
        compress.obj \
@@ -192,7 +192,7 @@ $(TOP)/zconf$(SUFFIX).h: zconf
 SRCDIR = $(TOP)
 # Keep the dependences in sync with top-level Makefile.in
 adler32.obj: $(SRCDIR)/adler32.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/functable.h $(SRCDIR)/adler32_p.h
-functable.obj: $(SRCDIR)/functable.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/zendian.h $(SRCDIR)/arch/x86/x86.h
+functable.obj: $(SRCDIR)/functable.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/zendian.h $(SRCDIR)/arch/x86/x86_features.h
 gzlib.obj: $(SRCDIR)/gzlib.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h
 gzread.obj: $(SRCDIR)/gzread.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h
 gzwrite.obj: $(SRCDIR)/gzwrite.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h

diff --git a/win32/Makefile.msc b/win32/Makefile.msc
index 0059606c5a761eaaf26f9245ea4a71d5c56f9103..56b97dbc8eac47ea6d77b3890e3420de98fa869b 100644 (file)
--- a/win32/Makefile.msc
+++ b/win32/Makefile.msc
@@ -84,7 +84,7 @@ OBJS = \
        trees.obj \
        uncompr.obj \
        zutil.obj \
-       x86.obj \
+       x86_features.obj \
        #
 !if "$(ZLIB_COMPAT)" != ""
 WITH_GZFILEOP = yes
@@ -183,7 +183,7 @@ $(TOP)/zconf$(SUFFIX).h: zconf
 SRCDIR = $(TOP)
 # Keep the dependences in sync with top-level Makefile.in
 adler32.obj: $(SRCDIR)/adler32.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/functable.h $(SRCDIR)/adler32_p.h
-functable.obj: $(SRCDIR)/functable.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/zendian.h $(SRCDIR)/arch/x86/x86.h
+functable.obj: $(SRCDIR)/functable.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/zendian.h $(SRCDIR)/arch/x86/x86_features.h
 gzlib.obj: $(SRCDIR)/gzlib.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h
 gzread.obj: $(SRCDIR)/gzread.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h
 gzwrite.obj: $(SRCDIR)/gzwrite.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h