diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-14 14:20:05 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-14 14:20:05 (GMT) |
| commit | 582797d60d9147f88571d8e4fb56b9e442a13bc5 (patch) | |
| tree | 24f0618cf7d529402040f57cd1b06411a5342e43 | |
| parent | 46007941c79dfbd5c661d1f46888db7d54730d2e (diff) | |
| parent | a6d654648aac247aba2e0877bd39aa807d5d31c7 (diff) | |
| download | tcl-582797d60d9147f88571d8e4fb56b9e442a13bc5.zip tcl-582797d60d9147f88571d8e4fb56b9e442a13bc5.tar.gz tcl-582797d60d9147f88571d8e4fb56b9e442a13bc5.tar.bz2 | |
Merge 8.6
| -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 | 4 | ||||
| -rw-r--r-- | win/tcl.m4 | 4 | ||||
| -rwxr-xr-x | win/x86_64-w64-mingw32-nmakehlp.exe | bin | 0 -> 25600 bytes |
5 files changed, 4 insertions, 4 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 310189a..3ae3d41 100755 --- a/win/configure +++ b/win/configure @@ -4107,7 +4107,7 @@ printf "%s\n" "$ac_cv_cross" >&6; } 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" @@ -4203,7 +4203,7 @@ printf "%s\n" "$ac_cv_win32" >&6; } if test "$ac_cv_win32" != "yes"; then as_fn_error $? "${CC} cannot produce win32 executables." "$LINENO" 5 fi - if test "$MACHINE" != "ARM64"; then + if test "$do64bit" != "arm64"; then extra_cflags="$extra_cflags -DHAVE_CPUID=1" fi @@ -527,7 +527,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" @@ -593,7 +593,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 |