From 1335b4e324414f01c2f79058a90d4ad3c43aecf3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 14 Feb 2022 15:28:25 +0000
Subject: Re-build zlib and libtommath for AMD64 and ARM64 to use the UCRT
 runtime (with llvm-clang toolset)

---
 compat/zlib/win64-arm/zlib1.dll       | Bin 92672 -> 92672 bytes
 compat/zlib/win64/libz.dll.a          | Bin 51638 -> 13002 bytes
 compat/zlib/win64/zlib1.dll           | Bin 116736 -> 99840 bytes
 libtommath/win64-arm/libtommath.dll   | Bin 69120 -> 69120 bytes
 libtommath/win64-arm/libtommath.dll.a | Bin 20816 -> 22478 bytes
 libtommath/win64/libtommath.dll       | Bin 81408 -> 80896 bytes
 libtommath/win64/libtommath.dll.a     | Bin 128166 -> 22478 bytes
 7 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/compat/zlib/win64-arm/zlib1.dll b/compat/zlib/win64-arm/zlib1.dll
index 7d08dd3..1f43308 100755
Binary files a/compat/zlib/win64-arm/zlib1.dll and b/compat/zlib/win64-arm/zlib1.dll differ
diff --git a/compat/zlib/win64/libz.dll.a b/compat/zlib/win64/libz.dll.a
index 93be06e..b0c8722 100644
Binary files a/compat/zlib/win64/libz.dll.a and b/compat/zlib/win64/libz.dll.a differ
diff --git a/compat/zlib/win64/zlib1.dll b/compat/zlib/win64/zlib1.dll
index 81195c3..e893cff 100755
Binary files a/compat/zlib/win64/zlib1.dll and b/compat/zlib/win64/zlib1.dll differ
diff --git a/libtommath/win64-arm/libtommath.dll b/libtommath/win64-arm/libtommath.dll
index 99c57a2..37bccf7 100755
Binary files a/libtommath/win64-arm/libtommath.dll and b/libtommath/win64-arm/libtommath.dll differ
diff --git a/libtommath/win64-arm/libtommath.dll.a b/libtommath/win64-arm/libtommath.dll.a
index 611522e..0108f90 100644
Binary files a/libtommath/win64-arm/libtommath.dll.a and b/libtommath/win64-arm/libtommath.dll.a differ
diff --git a/libtommath/win64/libtommath.dll b/libtommath/win64/libtommath.dll
index 2225faf..ace8fce 100755
Binary files a/libtommath/win64/libtommath.dll and b/libtommath/win64/libtommath.dll differ
diff --git a/libtommath/win64/libtommath.dll.a b/libtommath/win64/libtommath.dll.a
index 40adaf7..81be3c8 100644
Binary files a/libtommath/win64/libtommath.dll.a and b/libtommath/win64/libtommath.dll.a differ
-- 
cgit v0.12


From 11416a8c3aba74bef614771e7e212ebcc4632e7a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 14 Feb 2022 15:39:52 +0000
Subject: Use TCLSH_NATIVE for building the zip-file when cross-compiling

---
 win/makefile.vc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/win/makefile.vc b/win/makefile.vc
index 68c2aa7..ee29360 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -603,7 +603,7 @@ $(TCLSCRIPTZIP): $(TCLDDELIB) $(TCLREGLIB)
 !endif
 	@echo file delete -force {$@} > "$(OUT_DIR)\zipper.tcl"
 	@echo zipfs mkzip {$@} {$(LIBTCLVFS)} {$(LIBTCLVFS)} >> "$(OUT_DIR)\zipper.tcl"
-	@cd "$(OUT_DIR)" && $(TCLSH) zipper.tcl
+	@cd "$(OUT_DIR)" && $(TCLSH_NATIVE) zipper.tcl
 
 
 pkgs:
-- 
cgit v0.12


From 0fdf8385dfdc3e8f0c7a529590f0e61fcfd40525 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 14 Feb 2022 15:44:03 +0000
Subject: Fix regression caused by [d109376ad]: Move nmakehlp target down, so
 it doesn't become the default target.

---
 win/rules.vc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/win/rules.vc b/win/rules.vc
index b68b6b4..f8236f4 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -548,9 +548,6 @@ NMAKEHLPC = $(_TCLDIR)\win\nmakehlp.c
 
 !endif # NMAKEHLPC
 
-nmakehlp:
-	$(cc32) -nologo "$(NMAKEHLPC)" -link -subsystem:console
-
 # We always build nmakehlp even if it exists since we do not know
 # what source it was built from.
 !if "$(MACHINE)" == "$(NATIVE_ARCH)"
@@ -1613,6 +1610,9 @@ DEFAULT_BUILD_TARGET = $(PROJECT)
 
 default-target: $(DEFAULT_BUILD_TARGET)
 
+nmakehlp:
+	$(cc32) -nologo "$(NMAKEHLPC)" -link -subsystem:console
+
 !if $(MULTIPLATFORM_INSTALL)
 default-pkgindex:
 	@echo if {[package vsatisfies [package provide Tcl] 9.0-]} { > $(OUT_DIR)\pkgIndex.tcl
-- 
cgit v0.12