From: Hans Kristian Rosbach Date: Thu, 4 Jan 2024 14:36:19 +0000 (+0100) Subject: Move chunkset and inffast C fallbacks to arch/generic X-Git-Tag: 2.2.0~124 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30856c33bfe863e8ccfec8676f2ac7cc9963d921;p=thirdparty%2Fzlib-ng.git Move chunkset and inffast C fallbacks to arch/generic --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ea36dcd1..647ef0be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1006,10 +1006,10 @@ set(ZLIB_PRIVATE_HDRS set(ZLIB_SRCS arch/generic/adler32_c.c arch/generic/adler32_fold_c.c + arch/generic/chunkset_c.c arch/generic/crc32_braid_c.c arch/generic/crc32_fold_c.c adler32.c - chunkset.c compare256.c compress.c cpu_features.c diff --git a/Makefile.in b/Makefile.in index 6d60d803..153c0eb5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -76,10 +76,10 @@ pkgconfigdir = ${libdir}/pkgconfig OBJZ = \ arch/generic/adler32_c.o \ arch/generic/adler32_fold_c.o \ + arch/generic/chunkset_c.o \ arch/generic/crc32_braid_c.o \ arch/generic/crc32_fold_c.o \ adler32.o \ - chunkset.o \ compare256.o \ compress.o \ cpu_features.o \ @@ -116,10 +116,10 @@ OBJC = $(OBJZ) $(OBJG) PIC_OBJZ = \ arch/generic/adler32_c.lo \ arch/generic/adler32_fold_c.lo \ + arch/generic/chunkset_c.lo \ arch/generic/crc32_braid_c.lo \ arch/generic/crc32_fold_c.lo \ adler32.lo \ - chunkset.lo \ compare256.lo \ compress.lo \ cpu_features.lo \ diff --git a/arch/generic/Makefile.in b/arch/generic/Makefile.in index 31770f6a..d473f601 100644 --- a/arch/generic/Makefile.in +++ b/arch/generic/Makefile.in @@ -15,6 +15,7 @@ TOPDIR=$(SRCTOP) all: \ adler32_c.o adler32_c.lo \ adler32_fold_c.o adler32_fold_c.lo \ + chunkset_c.o chunkset_c.lo \ crc32_braid_c.o crc32_braid_c.lo \ crc32_fold_c.o crc32_fold_c.lo @@ -31,6 +32,12 @@ adler32_fold_c.o: $(SRCDIR)/adler32_fold_c.c $(SRCTOP)/zbuild.h $(SRCTOP)/funct adler32_fold_c.lo: $(SRCDIR)/adler32_fold_c.c $(SRCTOP)/zbuild.h $(SRCTOP)/functable.h $(SRCDIR)/adler32_fold_c.h $(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/adler32_fold_c.c +chunkset_c.o: $(SRCDIR)/chunkset_c.c $(SRCTOP)/zbuild.h $(SRCTOP)/chunkset_tpl.h $(SRCTOP)/inffast_tpl.h + $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/chunkset_c.c + +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 + 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/chunkset.c b/arch/generic/chunkset_c.c similarity index 100% rename from chunkset.c rename to arch/generic/chunkset_c.c diff --git a/win32/Makefile.a64 b/win32/Makefile.a64 index 985b758d..aefa525c 100644 --- a/win32/Makefile.a64 +++ b/win32/Makefile.a64 @@ -47,7 +47,7 @@ OBJS = \ adler32_c.obj \ adler32_fold_c.obj \ arm_features.obj \ - chunkset.obj \ + chunkset_c.obj \ compare256.obj \ compress.obj \ cpu_features.obj \ @@ -184,7 +184,7 @@ SRCDIR = $(TOP) adler32.obj: $(SRCDIR)/adler32.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/adler32_p.h 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.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h +chunkset_c.obj: $(SRCDIR)/arch/generic/chunkset_c.c $(SRCDIR)/zbuild.h $(SRCDIR)/chunkset_tpl.h $(SRCDIR)/inffast_tpl.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 5c7ae6bd..b175bcce 100644 --- a/win32/Makefile.arm +++ b/win32/Makefile.arm @@ -52,7 +52,7 @@ OBJS = \ adler32_c.obj \ adler32_fold_c.obj \ arm_features.obj \ - chunkset.obj \ + chunkset_c.obj \ compare256.obj \ compress.obj \ cpu_features.obj \ @@ -211,7 +211,7 @@ gzread.obj: $(SRCDIR)/gzread.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/z gzwrite.obj: $(SRCDIR)/gzwrite.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h 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.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h +chunkset_c.obj: $(SRCDIR)/arch/generic/chunkset_c.c $(SRCDIR)/zbuild.h $(SRCDIR)/chunkset_tpl.h $(SRCDIR)/inffast_tpl.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 fb02db36..639dc141 100644 --- a/win32/Makefile.msc +++ b/win32/Makefile.msc @@ -54,7 +54,7 @@ OBJS = \ adler32_sse42.obj \ adler32_ssse3.obj \ adler32_fold_c.obj \ - chunkset.obj \ + chunkset_c.obj \ chunkset_avx2.obj \ chunkset_sse2.obj \ chunkset_ssse3.obj \ @@ -206,10 +206,10 @@ gzread.obj: $(SRCDIR)/gzread.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/z gzwrite.obj: $(SRCDIR)/gzwrite.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h $(SRCDIR)/zutil_p.h 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.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h -chunkset_avx2.obj: $(SRCDIR)/arch/x86/chunkset_avx2.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h -chunkset_sse2.obj: $(SRCDIR)/arch/x86/chunkset_sse2.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h -chunkset_ssse3.obj: $(SRCDIR)/arch/x86/chunkset_ssse3.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h +chunkset_c.obj: $(SRCDIR)/arch/generic/chunkset_c.c $(SRCDIR)/zbuild.h $(SRCDIR)/chunkset_tpl.h $(SRCDIR)/inffast_tpl.h +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 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