From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Thu, 4 Jan 2024 14:53:15 +0000 (+0100)
Subject: Move insert_string and update_hash C fallbacks to arch/generic.
X-Git-Tag: 2.2.0~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a1722a22fd150d2069bd37a9244d173dde8c01f;p=thirdparty%2Fzlib-ng.git

Move insert_string and update_hash C fallbacks to arch/generic.
Also add missing insert_string dependencies to windows makefiles.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 647ef0be..d2db5f63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1009,6 +1009,7 @@ set(ZLIB_SRCS
     arch/generic/chunkset_c.c
     arch/generic/crc32_braid_c.c
     arch/generic/crc32_fold_c.c
+    arch/generic/insert_string_c.c
     adler32.c
     compare256.c
     compress.c
@@ -1027,7 +1028,6 @@ set(ZLIB_SRCS
     infback.c
     inflate.c
     inftrees.c
-    insert_string.c
     insert_string_roll.c
     slide_hash.c
     trees.c
diff --git a/Makefile.in b/Makefile.in
index 153c0eb5..e917c5d4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,6 +79,7 @@ OBJZ = \
 	arch/generic/chunkset_c.o \
 	arch/generic/crc32_braid_c.o \
 	arch/generic/crc32_fold_c.o \
+	arch/generic/insert_string_c.o \
 	adler32.o \
 	compare256.o \
 	compress.o \
@@ -97,7 +98,6 @@ OBJZ = \
 	infback.o \
 	inflate.o \
 	inftrees.o \
-	insert_string.o \
 	insert_string_roll.o \
 	slide_hash.o \
 	trees.o \
@@ -119,6 +119,7 @@ PIC_OBJZ = \
 	arch/generic/chunkset_c.lo \
 	arch/generic/crc32_braid_c.lo \
 	arch/generic/crc32_fold_c.lo \
+	arch/generic/insert_string_c.lo \
 	adler32.lo \
 	compare256.lo \
 	compress.lo \
@@ -137,7 +138,6 @@ PIC_OBJZ = \
 	infback.lo \
 	inflate.lo \
 	inftrees.lo \
-	insert_string.lo \
 	insert_string_roll.lo \
 	slide_hash.lo \
 	trees.lo \
diff --git a/arch/generic/Makefile.in b/arch/generic/Makefile.in
index d473f601..96fe13b7 100644
--- a/arch/generic/Makefile.in
+++ b/arch/generic/Makefile.in
@@ -17,7 +17,8 @@ all: \
  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
+ crc32_fold_c.o crc32_fold_c.lo \
+ insert_string_c.o insert_string_c.lo
 
 
 adler32_c.o: $(SRCDIR)/adler32_c.c  $(SRCTOP)/zbuild.h $(SRCTOP)/adler32_p.h
@@ -50,6 +51,11 @@ crc32_fold_c.o: $(SRCDIR)/crc32_fold_c.c  $(SRCTOP)/zbuild.h $(SRCTOP)/functable
 crc32_fold_c.lo: $(SRCDIR)/crc32_fold_c.c  $(SRCTOP)/zbuild.h $(SRCTOP)/functable.h $(SRCDIR)/crc32_fold_c.h
 	$(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/crc32_fold_c.c
 
+insert_string_c.o: $(SRCDIR)/insert_string_c.c  $(SRCTOP)/zbuild.h $(SRCTOP)/deflate.h $(SRCTOP)/insert_string_tpl.h
+	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/insert_string_c.c
+
+insert_string_c.lo: $(SRCDIR)/insert_string_c.c  $(SRCTOP)/zbuild.h $(SRCTOP)/deflate.h $(SRCTOP)/insert_string_tpl.h
+	$(CC) $(SFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/insert_string_c.c
 
 mostlyclean: clean
 clean:
diff --git a/insert_string.c b/arch/generic/insert_string_c.c
similarity index 100%
rename from insert_string.c
rename to arch/generic/insert_string_c.c
diff --git a/win32/Makefile.a64 b/win32/Makefile.a64
index aefa525c..b5798968 100644
--- a/win32/Makefile.a64
+++ b/win32/Makefile.a64
@@ -67,7 +67,7 @@ OBJS = \
 	infback.obj \
 	inflate.obj \
 	inftrees.obj \
-	insert_string.obj \
+	insert_string_c.obj \
 	insert_string_roll.obj \
 	slide_hash.obj \
 	trees.obj \
@@ -207,6 +207,7 @@ deflate_stored.obj: $(SRCDIR)/deflate_stored.c $(SRCDIR)/zbuild.h $(SRCDIR)/defl
 infback.obj: $(SRCDIR)/infback.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h $(SRCDIR)/inflate.h $(SRCDIR)/inflate_p.h $(SRCDIR)/functable.h
 inflate.obj: $(SRCDIR)/inflate.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h $(SRCDIR)/inflate.h $(SRCDIR)/inflate_p.h $(SRCDIR)/functable.h $(SRCDIR)/functable.h
 inftrees.obj: $(SRCDIR)/inftrees.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h
+insert_string_c.obj: $(SRCDIR)/arch/generic/insert_string_c.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/insert_string_tpl.h
 slide_hash.obj: $(SRCDIR)/slide_hash.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h
 slide_hash_neon.obj: $(SRCDIR)/arch/arm/slide_hash_neon.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h
 trees.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/trees_tbl.h
diff --git a/win32/Makefile.arm b/win32/Makefile.arm
index b175bcce..e1e92016 100644
--- a/win32/Makefile.arm
+++ b/win32/Makefile.arm
@@ -72,7 +72,7 @@ OBJS = \
 	infback.obj \
 	inflate.obj \
 	inftrees.obj \
-	insert_string.obj \
+	insert_string_c.obj \
 	insert_string_roll.obj \
 	slide_hash.obj \
 	trees.obj \
@@ -228,6 +228,7 @@ deflate_stored.obj: $(SRCDIR)/deflate_stored.c $(SRCDIR)/zbuild.h $(SRCDIR)/defl
 infback.obj: $(SRCDIR)/infback.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h $(SRCDIR)/inflate.h $(SRCDIR)/inflate_p.h $(SRCDIR)/functable.h
 inflate.obj: $(SRCDIR)/inflate.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h $(SRCDIR)/inflate.h $(SRCDIR)/inflate_p.h $(SRCDIR)/functable.h $(SRCDIR)/functable.h
 inftrees.obj: $(SRCDIR)/inftrees.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h
+insert_string_c.obj: $(SRCDIR)/arch/generic/insert_string_c.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/insert_string_tpl.h
 slide_hash.obj: $(SRCDIR)/slide_hash.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h
 trees.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/trees_tbl.h
 zutil.obj: $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/zutil_p.h
diff --git a/win32/Makefile.msc b/win32/Makefile.msc
index 639dc141..cb0672ed 100644
--- a/win32/Makefile.msc
+++ b/win32/Makefile.msc
@@ -80,7 +80,7 @@ OBJS = \
 	infback.obj \
 	inflate.obj \
 	inftrees.obj \
-	insert_string.obj \
+	insert_string_c.obj \
 	insert_string_roll.obj \
 	insert_string_sse42.obj \
 	slide_hash.obj \
@@ -228,6 +228,9 @@ deflate_stored.obj: $(SRCDIR)/deflate_stored.c $(SRCDIR)/zbuild.h $(SRCDIR)/defl
 infback.obj: $(SRCDIR)/infback.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h $(SRCDIR)/inflate.h $(SRCDIR)/inflate_p.h $(SRCDIR)/functable.h
 inflate.obj: $(SRCDIR)/inflate.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h $(SRCDIR)/inflate.h $(SRCDIR)/inflate_p.h $(SRCDIR)/functable.h $(SRCDIR)/functable.h $(SRCDIR)/functable.h
 inftrees.obj: $(SRCDIR)/inftrees.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/inftrees.h
+insert_string_c.obj: $(SRCDIR)/arch/generic/insert_string_c.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/insert_string_tpl.h
+insert_string_roll.obj: $(SRCDIR)/insert_string_roll.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/insert_string_tpl.h
+insert_string_sse42.obj: $(SRCDIR)/arch/x86/insert_string_sse42.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/insert_string_tpl.h
 slide_hash.obj: $(SRCDIR)/slide_hash.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h
 slide_hash_avx2.obj: $(SRCDIR)/arch/x86/slide_hash_avx2.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h
 slide_hash_sse2.obj: $(SRCDIR)/arch/x86/slide_hash_sse2.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h