diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-14 14:15:28 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-14 14:15:28 (GMT) |
commit | dc5f6333607c9a69410aee0c72b9851a54300114 (patch) | |
tree | df8cf2be1281cb8f104ceb46dc3f06948c536a0c | |
parent | 7bc41fba5b8194878cdcaa64ad0c4d93e91180b6 (diff) | |
parent | 780dda171fc31acc8215cfa314f04c4c44875c96 (diff) | |
download | tcl-dc5f6333607c9a69410aee0c72b9851a54300114.zip tcl-dc5f6333607c9a69410aee0c72b9851a54300114.tar.gz tcl-dc5f6333607c9a69410aee0c72b9851a54300114.tar.bz2 |
Update libz.dll.a and zlib1.dll, use a UCRT runtime in stead of msvcrt for ARM64
-rw-r--r-- | compat/zlib/win64-arm/libz.dll.a | bin | 0 -> 13002 bytes | |||
-rwxr-xr-x | compat/zlib/win64-arm/zlib1.dll | bin | 84480 -> 92672 bytes | |||
-rwxr-xr-x | win/configure | 2 | ||||
-rw-r--r-- | win/tcl.m4 | 4 | ||||
-rwxr-xr-x | win/x86_64-w64-mingw32-nmakehlp.exe | bin | 0 -> 25600 bytes |
5 files changed, 3 insertions, 3 deletions
diff --git a/compat/zlib/win64-arm/libz.dll.a b/compat/zlib/win64-arm/libz.dll.a Binary files differnew file mode 100644 index 0000000..b6cbde7 --- /dev/null +++ b/compat/zlib/win64-arm/libz.dll.a diff --git a/compat/zlib/win64-arm/zlib1.dll b/compat/zlib/win64-arm/zlib1.dll Binary files differindex 2abef88..7d08dd3 100755 --- a/compat/zlib/win64-arm/zlib1.dll +++ b/compat/zlib/win64-arm/zlib1.dll diff --git a/win/configure b/win/configure index f815682..ab9771f 100755 --- a/win/configure +++ b/win/configure @@ -3477,7 +3477,7 @@ echo "${ECHO_T}$ac_cv_win32" >&6 echo "$as_me: error: ${CC} cannot produce win32 executables." >&2;} { (exit 1); exit 1; }; } fi - if test "$MACHINE" != "ARM64"; then + if test "$do64bit" != "arm64"; then extra_cflags="$extra_cflags -DHAVE_CPUID=1" fi @@ -583,7 +583,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ RC="x86_64-w64-mingw32-windres" ;; arm64|aarch64) - CC="aarch64-w64-mingw32-${CC}" + CC="aarch64-w64-mingw32-clang" LD="aarch64-w64-mingw32-ld" AR="aarch64-w64-mingw32-ar" RANLIB="aarch64-w64-mingw32-ranlib" @@ -649,7 +649,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ if test "$ac_cv_win32" != "yes"; then AC_MSG_ERROR([${CC} cannot produce win32 executables.]) fi - if test "$MACHINE" != "ARM64"; then + if test "$do64bit" != "arm64"; then extra_cflags="$extra_cflags -DHAVE_CPUID=1" fi diff --git a/win/x86_64-w64-mingw32-nmakehlp.exe b/win/x86_64-w64-mingw32-nmakehlp.exe Binary files differnew file mode 100755 index 0000000..2564ec9 --- /dev/null +++ b/win/x86_64-w64-mingw32-nmakehlp.exe |