File tree Expand file tree Collapse file tree 3 files changed +23
-1
lines changed
hotspot/make/windows/makefiles Expand file tree Collapse file tree 3 files changed +23
-1
lines changed Original file line number Diff line number Diff line change @@ -172,6 +172,9 @@ COMPILER_NAME=VS2017
172172!if "$(MSC_VER)" >= "1920" && "$(MSC_VER)" <= "1929"
173173COMPILER_NAME =VS2019
174174!endif
175+ !if "$(MSC_VER)" >= "1930" && "$(MSC_VER)" <= "1938"
176+ COMPILER_NAME =VS2022
177+ !endif
175178!endif
176179
177180# By default, we do not want to use the debug version of the msvcrt.dll file
@@ -336,6 +339,21 @@ MT=mt.exe
336339SAFESEH_FLAG = /SAFESEH
337340!endif
338341
342+ !if "$(COMPILER_NAME)" == "VS2022"
343+ PRODUCT_OPT_OPTION = /O2 /Oy-
344+ FASTDEBUG_OPT_OPTION = /O2 /Oy-
345+ DEBUG_OPT_OPTION = /Od
346+ GX_OPTION = /EHsc
347+ LD_FLAGS = /manifest $(LD_FLAGS )
348+ MP_FLAG = /MP
349+ # Manifest Tool - used in VS2005 and later to adjust manifests stored
350+ # as resources inside build artifacts.
351+ !if "x$(MT)" == "x"
352+ MT =mt.exe
353+ !endif
354+ SAFESEH_FLAG = /SAFESEH
355+ !endif
356+
339357!if "$(BUILDARCH)" == "i486"
340358LD_FLAGS = $(SAFESEH_FLAG ) $(LD_FLAGS )
341359!endif
Original file line number Diff line number Diff line change @@ -33,6 +33,8 @@ checkCL:
3333 if " $( MSC_VER) " NEQ " 1912" \
3434 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" \
3535 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" \
36+ 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" \
37+ if " $( MSC_VER) " NEQ " 1935" if " $( MSC_VER) " NEQ " 1936" if " $( MSC_VER) " NEQ " 1937" if " $( MSC_VER) " NEQ " 1938" \
3638 echo *** WARNING *** unrecognized cl.exe version $(MSC_VER ) ($( RAW_MSC_VER) ). Use FORCE_MSC_VER to override automatic detection.
3739
3840checkLink :
@@ -43,4 +45,6 @@ checkLink:
4345 if " $( LD_VER) " NEQ " 1412" \
4446 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" \
4547 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" \
48+ 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" \
49+ if " $( LD_VER) " NEQ " 1435" if " $( LD_VER) " NEQ " 1436" if " $( LD_VER) " NEQ " 1437" if " $( LD_VER) " NEQ " 1438" \
4650 echo *** WARNING *** unrecognized link.exe version $(LD_VER ) ($( RAW_LD_VER) ). Use FORCE_LD_VER to override automatic detection.
Original file line number Diff line number Diff line change @@ -129,7 +129,7 @@ CXX_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER
129129
130130!if "$(USE_PRECOMPILED_HEADER)" != "0"
131131CXX_USE_PCH =/Fp"vm.pch" /Yu"precompiled.hpp"
132- !if "$(COMPILER_NAME)" == "VS2012" || "$(COMPILER_NAME)" == "VS2013" || "$(COMPILER_NAME)" == "VS2015" || "$(COMPILER_NAME)" == "VS2017" || "$(COMPILER_NAME)" == "VS2019"
132+ !if "$(COMPILER_NAME)" == "VS2012" || "$(COMPILER_NAME)" == "VS2013" || "$(COMPILER_NAME)" == "VS2015" || "$(COMPILER_NAME)" == "VS2017" || "$(COMPILER_NAME)" == "VS2019" || "$(COMPILER_NAME)" == "VS2022"
133133# VS2012 and later require this object file to be listed:
134134LD_FLAGS =$(LD_FLAGS ) _build_pch_file.obj
135135!endif
You can’t perform that action at this time.
0 commit comments