Rename chorba SSE files to crc32_chorba for consistency

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d8a9d7a8384431761602081ee75256cbc2c7cce..ba0cbe8228d45cb8b8dafd4ec826be4c444675c9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1023,7 +1023,7 @@ if(WITH_OPTIM)
             check_sse2_intrinsics()
             if(HAVE_SSE2_INTRIN)
                 add_definitions(-DX86_SSE2)
-                set(SSE2_SRCS ${ARCHDIR}/chunkset_sse2.c ${ARCHDIR}/chorba_sse2.c ${ARCHDIR}/compare256_sse2.c ${ARCHDIR}/slide_hash_sse2.c)
+                set(SSE2_SRCS ${ARCHDIR}/chunkset_sse2.c ${ARCHDIR}/compare256_sse2.c ${ARCHDIR}/crc32_chorba_sse2.c ${ARCHDIR}/slide_hash_sse2.c)
                 list(APPEND ZLIB_ARCH_SRCS ${SSE2_SRCS})
                 if(ARCH_32BIT)
                     set_property(SOURCE ${SSE2_SRCS} PROPERTY COMPILE_FLAGS "${SSE2FLAG} ${NOLTOFLAG}")
@@ -1048,7 +1048,7 @@ if(WITH_OPTIM)
             check_sse41_intrinsics()
             if(HAVE_SSE41_INTRIN AND WITH_SSSE3)
                 add_definitions(-DX86_SSE41)
-                set(SSE41_SRCS ${ARCHDIR}/chorba_sse41.c)
+                set(SSE41_SRCS ${ARCHDIR}/crc32_chorba_sse41.c)
                 list(APPEND ZLIB_ARCH_SRCS ${SSE41_SRCS})
                 set_property(SOURCE ${SSE41_SRCS} PROPERTY COMPILE_FLAGS "${SSE41FLAG} ${NOLTOFLAG}")
             else()

diff --git a/arch/x86/Makefile.in b/arch/x86/Makefile.in
index 4972dd72c2154e5fcbe6f320f507bc114cd1e25a..addf5c6ea34ccd625b36b3bcfce7b4a7326131bd 100644 (file)
--- a/arch/x86/Makefile.in
+++ b/arch/x86/Makefile.in
@@ -35,11 +35,11 @@ all: \
        chunkset_avx512.o chunkset_avx512.lo \
        chunkset_sse2.o chunkset_sse2.lo \
        chunkset_ssse3.o chunkset_ssse3.lo \
-       chorba_sse2.o chorba_sse2.lo \
-       chorba_sse41.o chorba_sse41.lo \
        compare256_avx2.o compare256_avx2.lo \
        compare256_avx512.o compare256_avx512.lo \
        compare256_sse2.o compare256_sse2.lo \
+       crc32_chorba_sse2.o crc32_chorba_sse2.lo \
+       crc32_chorba_sse41.o crc32_chorba_sse41.lo \
        crc32_pclmulqdq.o crc32_pclmulqdq.lo \
        crc32_vpclmulqdq.o crc32_vpclmulqdq.lo \
        slide_hash_avx2.o slide_hash_avx2.lo \
@@ -75,18 +75,6 @@ chunkset_ssse3.o:
 chunkset_ssse3.lo:
        $(CC) $(SFLAGS) $(SSSE3FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_ssse3.c
 
-chorba_sse2.o:
-       $(CC) $(CFLAGS) $(SSE2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/chorba_sse2.c
-
-chorba_sse2.lo:
-       $(CC) $(SFLAGS) $(SSE2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/chorba_sse2.c
-
-chorba_sse41.o:
-       $(CC) $(CFLAGS) $(SSE41FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/chorba_sse41.c
-
-chorba_sse41.lo:
-       $(CC) $(SFLAGS) $(SSE41FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/chorba_sse41.c
-
 compare256_avx2.o:
        $(CC) $(CFLAGS) $(AVX2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/compare256_avx2.c
 
@@ -105,6 +93,18 @@ compare256_sse2.o:
 compare256_sse2.lo:
        $(CC) $(SFLAGS) $(SSE2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/compare256_sse2.c
 
+crc32_chorba_sse2.o:
+       $(CC) $(CFLAGS) $(SSE2FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/crc32_chorba_sse2.c
+
+crc32_chorba_sse2.lo:
+       $(CC) $(SFLAGS) $(SSE2FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/crc32_chorba_sse2.c
+
+crc32_chorba_sse41.o:
+       $(CC) $(CFLAGS) $(SSE41FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/crc32_chorba_sse41.c
+
+crc32_chorba_sse41.lo:
+       $(CC) $(SFLAGS) $(SSE41FLAG) $(NOLTOFLAG) -DPIC $(INCLUDES) -c -o $@ $(SRCDIR)/crc32_chorba_sse41.c
+
 crc32_pclmulqdq.o:
        $(CC) $(CFLAGS) $(PCLMULFLAG) $(SSE42FLAG) $(NOLTOFLAG) $(INCLUDES) -c -o $@ $(SRCDIR)/crc32_pclmulqdq.c
 

diff --git a/arch/x86/chorba_sse2.c b/arch/x86/crc32_chorba_sse2.c
similarity index 100%
rename from arch/x86/chorba_sse2.c
rename to arch/x86/crc32_chorba_sse2.c

diff --git a/arch/x86/chorba_sse41.c b/arch/x86/crc32_chorba_sse41.c
similarity index 100%
rename from arch/x86/chorba_sse41.c
rename to arch/x86/crc32_chorba_sse41.c

diff --git a/configure b/configure
index d28650546c51c7224cb085c5c7f76edeff3e9412..b3f60efc032c93519ea3cb24713be8e31335d968 100755 (executable)
--- a/configure
+++ b/configure
@@ -1902,8 +1902,8 @@ case "${ARCH}" in
             if test ${HAVE_SSE2_INTRIN} -eq 1; then
                 CFLAGS="${CFLAGS} -DX86_SSE2"
                 SFLAGS="${SFLAGS} -DX86_SSE2"
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} chunkset_sse2.o chorba_sse2.o compare256_sse2.o slide_hash_sse2.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} chunkset_sse2.lo chorba_sse2.lo compare256_sse2.lo slide_hash_sse2.lo"
+                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} chunkset_sse2.o compare256_sse2.o crc32_chorba_sse2.o slide_hash_sse2.o"
+                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} chunkset_sse2.lo compare256_sse2.lo crc32_chorba_sse2.lo slide_hash_sse2.lo"
             fi
 
             check_ssse3_intrinsics
@@ -1920,8 +1920,8 @@ case "${ARCH}" in
             if test ${HAVE_SSE41_INTRIN} -eq 1; then
                 CFLAGS="${CFLAGS} -DX86_SSE41"
                 SFLAGS="${SFLAGS} -DX86_SSE41"
-                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} chorba_sse41.o"
-                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} chorba_sse41.lo"
+                ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} crc32_chorba_sse41.o"
+                ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} crc32_chorba_sse41.lo"
             fi
 
             check_sse42_intrinsics