From: Hans Kristian Rosbach Date: Thu, 4 Jan 2024 15:54:58 +0000 (+0100) Subject: Move compare256 and longest_match C fallbacks to arch/generic X-Git-Tag: 2.2.0~120 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86250d40fa3f436f28e83160757902c8804912ed;p=thirdparty%2Fzlib-ng.git Move compare256 and longest_match C fallbacks to arch/generic --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 233eacb4..9ae46d69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1007,12 +1007,12 @@ set(ZLIB_SRCS arch/generic/adler32_c.c arch/generic/adler32_fold_c.c arch/generic/chunkset_c.c + arch/generic/compare256_c.c arch/generic/crc32_braid_c.c arch/generic/crc32_fold_c.c arch/generic/insert_string_c.c arch/generic/slide_hash_c.c adler32.c - compare256.c compress.c cpu_features.c crc32_braid.c diff --git a/Makefile.in b/Makefile.in index 2027764a..cc3c5a4a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -77,12 +77,12 @@ OBJZ = \ arch/generic/adler32_c.o \ arch/generic/adler32_fold_c.o \ arch/generic/chunkset_c.o \ + arch/generic/compare256_c.o \ arch/generic/crc32_braid_c.o \ arch/generic/crc32_fold_c.o \ arch/generic/insert_string_c.o \ arch/generic/slide_hash_c.o \ adler32.o \ - compare256.o \ compress.o \ cpu_features.o \ crc32_braid.o \ @@ -117,12 +117,12 @@ PIC_OBJZ = \ arch/generic/adler32_c.lo \ arch/generic/adler32_fold_c.lo \ arch/generic/chunkset_c.lo \ + arch/generic/compare256_c.lo \ arch/generic/crc32_braid_c.lo \ arch/generic/crc32_fold_c.lo \ arch/generic/insert_string_c.lo \ arch/generic/slide_hash_c.lo \ adler32.lo \ - compare256.lo \ compress.lo \ cpu_features.lo \ crc32_braid.lo \ diff --git a/arch/generic/Makefile.in b/arch/generic/Makefile.in index 3cf94cc7..fd32b3ec 100644 --- a/arch/generic/Makefile.in +++ b/arch/generic/Makefile.in @@ -16,6 +16,7 @@ all: \ adler32_c.o adler32_c.lo \ adler32_fold_c.o adler32_fold_c.lo \ chunkset_c.o chunkset_c.lo \ + compare256_c.o compare256_c.lo \ crc32_braid_c.o crc32_braid_c.lo \ crc32_fold_c.o crc32_fold_c.lo \ insert_string_c.o insert_string_c.lo \ @@ -40,6 +41,12 @@ chunkset_c.o: $(SRCDIR)/chunkset_c.c $(SRCTOP)/zbuild.h $(SRCTOP)/chunkset_tpl. chunkset_c.lo: $(SRCDIR)/chunkset_c.c $(SRCTOP)/zbuild.h $(SRCTOP)/chunkset_tpl.h $(SRCTOP)/inffast_tpl.h $(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_c.c +compare256_c.o: $(SRCDIR)/compare256_c.c $(SRCTOP)/zbuild.h $(SRCTOP)/zutil_p.h $(SRCTOP)/deflate.h $(SRCTOP)/fallback_builtins.h + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/compare256_c.c + +compare256_c.lo: $(SRCDIR)/compare256_c.c $(SRCTOP)/zbuild.h $(SRCTOP)/zutil_p.h $(SRCTOP)/deflate.h $(SRCTOP)/fallback_builtins.h + $(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/compare256_c.c + crc32_braid_c.o: $(SRCDIR)/crc32_braid_c.c $(SRCTOP)/zbuild.h $(SRCTOP)/crc32_braid_p.h $(SRCTOP)/crc32_braid_tbl.h $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/crc32_braid_c.c diff --git a/compare256.c b/arch/generic/compare256_c.c similarity index 100% rename from compare256.c rename to arch/generic/compare256_c.c diff --git a/win32/Makefile.a64 b/win32/Makefile.a64 index 49f3de33..9122416f 100644 --- a/win32/Makefile.a64 +++ b/win32/Makefile.a64 @@ -48,7 +48,7 @@ OBJS = \ adler32_fold_c.obj \ arm_features.obj \ chunkset_c.obj \ - compare256.obj \ + compare256_c.obj \ compress.obj \ cpu_features.obj \ crc32_braid.obj \ @@ -185,6 +185,7 @@ adler32.obj: $(SRCDIR)/adler32.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCD adler32_c.obj: $(SRCDIR)/arch/generic/adler32_c.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/adler32_p.h adler32_fold_c.obj: $(SRCDIR)/arch/generic/adler32_fold_c.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/arch/generic/adler32_fold_c.h chunkset_c.obj: $(SRCDIR)/arch/generic/chunkset_c.c $(SRCDIR)/zbuild.h $(SRCDIR)/chunkset_tpl.h $(SRCDIR)/inffast_tpl.h +compare256_c.obj: $(SRCDIR)/arch/generic/compare256_c.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil_p.h $(SRCDIR)/deflate.h $(SRCDIR)/fallback_builtins.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 diff --git a/win32/Makefile.arm b/win32/Makefile.arm index f46ed5cd..d0f8c74a 100644 --- a/win32/Makefile.arm +++ b/win32/Makefile.arm @@ -53,7 +53,7 @@ OBJS = \ adler32_fold_c.obj \ arm_features.obj \ chunkset_c.obj \ - compare256.obj \ + compare256_c.obj \ compress.obj \ cpu_features.obj \ crc32_braid.obj \ @@ -212,6 +212,7 @@ gzwrite.obj: $(SRCDIR)/gzwrite.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR) compress.obj: $(SRCDIR)/compress.c $(SRCDIR)/zbuild.h $(SRCDIR)/zlib$(SUFFIX).h uncompr.obj: $(SRCDIR)/uncompr.c $(SRCDIR)/zbuild.h $(SRCDIR)/zlib$(SUFFIX).h chunkset_c.obj: $(SRCDIR)/arch/generic/chunkset_c.c $(SRCDIR)/zbuild.h $(SRCDIR)/chunkset_tpl.h $(SRCDIR)/inffast_tpl.h +compare256_c.obj: $(SRCDIR)/arch/generic/compare256_c.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil_p.h $(SRCDIR)/deflate.h $(SRCDIR)/fallback_builtins.h cpu_features.obj: $(SRCDIR)/cpu_features.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h crc32_braid.obj: $(SRCDIR)/crc32_braid.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/crc32_braid_tbl.h crc32_braid_c.obj: $(SRCDIR)/arch/generic/crc32_braid_c.c $(SRCDIR)/zbuild.h $(SRCDIR)/crc32_braid_p.h $(SRCDIR)/crc32_braid_tbl.h diff --git a/win32/Makefile.msc b/win32/Makefile.msc index b4a9960d..6313a483 100644 --- a/win32/Makefile.msc +++ b/win32/Makefile.msc @@ -58,7 +58,7 @@ OBJS = \ chunkset_avx2.obj \ chunkset_sse2.obj \ chunkset_ssse3.obj \ - compare256.obj \ + compare256_c.obj \ compare256_avx2.obj \ compare256_sse2.obj \ compress.obj \ @@ -210,6 +210,9 @@ chunkset_c.obj: $(SRCDIR)/arch/generic/chunkset_c.c $(SRCDIR)/zbuild.h $(SRCDIR) chunkset_avx2.obj: $(SRCDIR)/arch/x86/chunkset_avx2.c $(SRCDIR)/zbuild.h $(SRCDIR)/chunkset_tpl.h $(SRCDIR)/inffast_tpl.h $(SRCDIR)/arch/generic/chunk_permute_table.h chunkset_sse2.obj: $(SRCDIR)/arch/x86/chunkset_sse2.c $(SRCDIR)/zbuild.h $(SRCDIR)/chunkset_tpl.h $(SRCDIR)/inffast_tpl.h chunkset_ssse3.obj: $(SRCDIR)/arch/x86/chunkset_ssse3.c $(SRCDIR)/zbuild.h $(SRCDIR)/chunkset_tpl.h $(SRCDIR)/inffast_tpl.h $(SRCDIR)/arch/generic/chunk_permute_table.h +compare256_c.obj: $(SRCDIR)/arch/generic/compare256_c.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil_p.h $(SRCDIR)/deflate.h $(SRCDIR)/fallback_builtins.h +compare256_avx2.obj: $(SRCDIR)/arch/x86/compare256_avx2.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil_p.h $(SRCDIR)/deflate.h $(SRCDIR)/fallback_builtins.h +compare256_sse2.obj: $(SRCDIR)/arch/x86/compare256_sse2.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil_p.h $(SRCDIR)/deflate.h $(SRCDIR)/fallback_builtins.h cpu_features.obj: $(SRCDIR)/cpu_features.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h crc32_braid.obj: $(SRCDIR)/crc32_braid.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/crc32_braid_tbl.h crc32_braid_c.obj: $(SRCDIR)/arch/generic/crc32_braid_c.c $(SRCDIR)/zbuild.h $(SRCDIR)/crc32_braid_p.h $(SRCDIR)/crc32_braid_tbl.h