4 files changed, 12 insertions, 12 deletions
diff --git a/win/configure b/win/configure
index 71fd218..ade169b 100755
--- a/win/configure
+++ b/win/configure
@@ -3482,7 +3482,7 @@ echo "${ECHO_T}$ac_cv_cross" >&6
 		RC="x86_64-w64-mingw32-windres"
 	    ;;
 	    arm64|aarch64)
-		CC="aarch64-w64-mingw32-clang"
+		CC="aarch64-w64-mingw32-${CC}"
 		LD="aarch64-w64-mingw32-ld"
 		AR="aarch64-w64-mingw32-ar"
 		RANLIB="aarch64-w64-mingw32-ranlib"
diff --git a/win/rules.vc b/win/rules.vc
index 372d70a..47c0742 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -816,8 +816,7 @@ DOTSEPARATED=$(DOTSEPARATED:b=.)
 #           configuration (ignored for Tcl itself)
 # _USE_64BIT_TIME_T - forces a build using 64-bit time_t for 32-bit build
 #           (CRT library should support this, not needed for Tcl 9.x)
-# TCL_UTF_MAX=4 - forces a build allowing 4-byte UTF-8 sequences internally.
-#           (Not needed for Tcl 9.x)
+# TCL_UTF_MAX=3 - forces a build using UTF-16 internally (not recommended).
 # Further, LINKERFLAGS are modified based on above.
 
 # Default values for all the above
@@ -884,9 +883,9 @@ USE_THREAD_ALLOC= 0
 _USE_64BIT_TIME_T = 1
 !endif
 
-!if [nmakehlp -f $(OPTS) "utfmax"]
-!message *** Force allowing 4-byte UTF-8 sequences internally
-TCL_UTF_MAX = 4
+!if [nmakehlp -f $(OPTS) "utf16"]
+!message *** Force UTF-16 internally
+TCL_UTF_MAX = 3
 !endif
 !endif
 
@@ -1423,13 +1422,13 @@ OPTDEFINES	= $(OPTDEFINES) /DNO_STRTOI64=1
 !if "$(_USE_64BIT_TIME_T)" == "1"
 OPTDEFINES	= $(OPTDEFINES) /D_USE_64BIT_TIME_T=1
 !endif
-!if "$(TCL_UTF_MAX)" == "4"
-OPTDEFINES	= $(OPTDEFINES) /DTCL_UTF_MAX=4
-!endif
 
 # _ATL_XP_TARGETING - Newer SDK's need this to build for XP
 COMPILERFLAGS  = /D_ATL_XP_TARGETING
 !endif
+!if "$(TCL_UTF_MAX)" == "3"
+OPTDEFINES	= $(OPTDEFINES) /DTCL_UTF_MAX=3
+!endif
 
 # Like the TEA system only set this non empty for non-Tk extensions
 # Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME
@@ -1471,8 +1470,8 @@ cdebug = $(cdebug) -Zi
 
 !endif # $(DEBUG)
 
-# cwarn includes default warning levels.
-cwarn = $(WARNINGS)
+# cwarn includes default warning levels, also C4090 (buggy) and C4146 is useless.
+cwarn = $(WARNINGS) -wd4090 -wd4146
 
 !if "$(MACHINE)" == "AMD64" || "$(MACHINE)" == "ARM64"
 # Disable pointer<->int warnings related to cast between different sizes
diff --git a/win/tcl.m4 b/win/tcl.m4
index ddf57f7..d5105cb 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -583,7 +583,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 		RC="x86_64-w64-mingw32-windres"
 	    ;;
 	    arm64|aarch64)
-		CC="aarch64-w64-mingw32-clang"
+		CC="aarch64-w64-mingw32-${CC}"
 		LD="aarch64-w64-mingw32-ld"
 		AR="aarch64-w64-mingw32-ar"
 		RANLIB="aarch64-w64-mingw32-ranlib"
diff --git a/win/tkWinPort.h b/win/tkWinPort.h
index 0118608..7978730 100644
--- a/win/tkWinPort.h
+++ b/win/tkWinPort.h
@@ -95,6 +95,7 @@
  * See ticket [916c1095438eae56]: GetVersionExW triggers warnings
  */
 #if defined(_MSC_VER)
+#   pragma warning(disable:4090) /* see: https://developercommunity.visualstudio.com/t/c-compiler-incorrect-propagation-of-const-qualifie/390711 */
 #   pragma warning(disable:4146)
 #   pragma warning(disable:4267)
 #   pragma warning(disable:4244)