From 2b5e1c7e788d5ab03354bbe2a156212224bfec64 Mon Sep 17 00:00:00 2001
From: Takakuri <k.takakuri@fujitsu.com>
Date: Thu, 6 Nov 2025 15:56:10 +0900
Subject: [PATCH] 8371387: [8u] hotspot needs to recognise latest VS2022

---
 hotspot/make/windows/makefiles/compile.make | 2 +-
 hotspot/make/windows/makefiles/sanity.make  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hotspot/make/windows/makefiles/compile.make b/hotspot/make/windows/makefiles/compile.make
index 26c215f8d06..797fef435fa 100644
--- a/hotspot/make/windows/makefiles/compile.make
+++ b/hotspot/make/windows/makefiles/compile.make
@@ -172,7 +172,7 @@ COMPILER_NAME=VS2017
 !if "$(MSC_VER)" >= "1920" && "$(MSC_VER)" <= "1929"
 COMPILER_NAME=VS2019
 !endif
-!if "$(MSC_VER)" >= "1930" && "$(MSC_VER)" <= "1938"
+!if "$(MSC_VER)" >= "1930" && "$(MSC_VER)" <= "1944"
 COMPILER_NAME=VS2022
 !endif
 !endif
diff --git a/hotspot/make/windows/makefiles/sanity.make b/hotspot/make/windows/makefiles/sanity.make
index 4e75bf7ce44..59c4fa98fe7 100644
--- a/hotspot/make/windows/makefiles/sanity.make
+++ b/hotspot/make/windows/makefiles/sanity.make
@@ -34,7 +34,8 @@ checkCL:
 	if "$(MSC_VER)" NEQ "1920" if "$(MSC_VER)" NEQ "1921" if "$(MSC_VER)" NEQ "1922" if "$(MSC_VER)" NEQ "1923" if "$(MSC_VER)" NEQ "1924" \
 	if "$(MSC_VER)" NEQ "1925" if "$(MSC_VER)" NEQ "1926" if "$(MSC_VER)" NEQ "1927" if "$(MSC_VER)" NEQ "1928" if "$(MSC_VER)" NEQ "1929" \
 	if "$(MSC_VER)" NEQ "1930" if "$(MSC_VER)" NEQ "1931" if "$(MSC_VER)" NEQ "1932" if "$(MSC_VER)" NEQ "1933" if "$(MSC_VER)" NEQ "1934" \
-	if "$(MSC_VER)" NEQ "1935" if "$(MSC_VER)" NEQ "1936" if "$(MSC_VER)" NEQ "1937" if "$(MSC_VER)" NEQ "1938" \
+	if "$(MSC_VER)" NEQ "1935" if "$(MSC_VER)" NEQ "1936" if "$(MSC_VER)" NEQ "1937" if "$(MSC_VER)" NEQ "1938" if "$(MSC_VER)" NEQ "1939" \
+    if "$(MSC_VER)" NEQ "1940" if "$(MSC_VER)" NEQ "1941" if "$(MSC_VER)" NEQ "1942" if "$(MSC_VER)" NEQ "1943" if "$(MSC_VER)" NEQ "1944" \
 	echo *** WARNING *** unrecognized cl.exe version $(MSC_VER) ($(RAW_MSC_VER)).  Use FORCE_MSC_VER to override automatic detection.
 
 checkLink:
@@ -46,5 +47,6 @@ checkLink:
 	if "$(LD_VER)" NEQ "1420" if "$(LD_VER)" NEQ "1421" if "$(LD_VER)" NEQ "1422" if "$(LD_VER)" NEQ "1423" if "$(LD_VER)" NEQ "1424" \
 	if "$(LD_VER)" NEQ "1425" if "$(LD_VER)" NEQ "1426" if "$(LD_VER)" NEQ "1427" if "$(LD_VER)" NEQ "1428" if "$(LD_VER)" NEQ "1429" \
 	if "$(LD_VER)" NEQ "1430" if "$(LD_VER)" NEQ "1431" if "$(LD_VER)" NEQ "1432" if "$(LD_VER)" NEQ "1433" if "$(LD_VER)" NEQ "1434" \
-	if "$(LD_VER)" NEQ "1435" if "$(LD_VER)" NEQ "1436" if "$(LD_VER)" NEQ "1437" if "$(LD_VER)" NEQ "1438" \
+	if "$(LD_VER)" NEQ "1435" if "$(LD_VER)" NEQ "1436" if "$(LD_VER)" NEQ "1437" if "$(LD_VER)" NEQ "1438" if "$(LD_VER)" NEQ "1439" \
+    if "$(LD_VER)" NEQ "1440" if "$(LD_VER)" NEQ "1441" if "$(LD_VER)" NEQ "1442" if "$(LD_VER)" NEQ "1443" if "$(LD_VER)" NEQ "1444" \
 	echo *** WARNING *** unrecognized link.exe version $(LD_VER) ($(RAW_LD_VER)).  Use FORCE_LD_VER to override automatic detection.