Skip to content

Commit 0b780af

Browse files
antonvozniaPaul Hohensee
authored andcommitted
8371967: Add Visual Studio 2026 to build toolchain for Windows
8373593: Support latest VS2026 MSC_VER in abstract_vm_version.cpp Reviewed-by: phh Backport-of: dcba014
1 parent 3e223dd commit 0b780af

4 files changed

Lines changed: 20 additions & 3 deletions

File tree

doc/building.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ <h3 id="microsoft-visual-studio">Microsoft Visual Studio</h3>
598598
(Note that this version is often presented as "MSVC 14.28", and reported
599599
by cl.exe as 19.28.) Older versions will not be accepted by
600600
<code>configure</code> and will not work. The maximum accepted version
601-
of Visual Studio is 2022.</p>
601+
of Visual Studio is 2026.</p>
602602
<p>If you have multiple versions of Visual Studio installed,
603603
<code>configure</code> will by default pick the latest. You can request
604604
a specific version to be used by setting

doc/building.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ available for this update.
389389
The minimum accepted version is Visual Studio 2019 version 16.8. (Note that this
390390
version is often presented as "MSVC 14.28", and reported by cl.exe as 19.28.)
391391
Older versions will not be accepted by `configure` and will not work. The
392-
maximum accepted version of Visual Studio is 2022.
392+
maximum accepted version of Visual Studio is 2026.
393393

394394
If you have multiple versions of Visual Studio installed, `configure` will by
395395
default pick the latest. You can request a specific version to be used by

make/autoconf/toolchain_microsoft.m4

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
################################################################################
2727
# The order of these defines the priority by which we try to find them.
28-
VALID_VS_VERSIONS="2022 2019"
28+
VALID_VS_VERSIONS="2022 2019 2026"
2929

3030
VS_DESCRIPTION_2019="Microsoft Visual Studio 2019"
3131
VS_VERSION_INTERNAL_2019=142
@@ -57,6 +57,21 @@ VS_SDK_PLATFORM_NAME_2022=
5757
VS_SUPPORTED_2022=true
5858
VS_TOOLSET_SUPPORTED_2022=true
5959

60+
VS_DESCRIPTION_2026="Microsoft Visual Studio 2026"
61+
VS_VERSION_INTERNAL_2026=145
62+
VS_MSVCR_2026=vcruntime140.dll
63+
VS_VCRUNTIME_1_2026=vcruntime140_1.dll
64+
VS_MSVCP_2026=msvcp140.dll
65+
VS_ENVVAR_2026="VS180COMNTOOLS"
66+
VS_USE_UCRT_2026="true"
67+
VS_VS_INSTALLDIR_2026="Microsoft Visual Studio/18"
68+
VS_EDITIONS_2026="BuildTools Community Professional Enterprise"
69+
VS_SDK_INSTALLDIR_2026=
70+
VS_VS_PLATFORM_NAME_2026="v145"
71+
VS_SDK_PLATFORM_NAME_2026=
72+
VS_SUPPORTED_2026=true
73+
VS_TOOLSET_SUPPORTED_2026=true
74+
6075
################################################################################
6176

6277
AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],

src/hotspot/share/runtime/abstract_vm_version.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,8 @@ const char* Abstract_VM_Version::internal_vm_info_string() {
262262
#define HOTSPOT_BUILD_COMPILER "MS VC++ 17.13 (VS2022)"
263263
#elif _MSC_VER == 1944
264264
#define HOTSPOT_BUILD_COMPILER "MS VC++ 17.14 (VS2022)"
265+
#elif _MSC_VER == 1950
266+
#define HOTSPOT_BUILD_COMPILER "MS VC++ 18.0 (VS2026)"
265267
#else
266268
#define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER)
267269
#endif

0 commit comments

Comments
 (0)