From 18ece9b5c45e5e1dbf82b22cee54eb79945995d2 Mon Sep 17 00:00:00 2001 From: Matthias Baesken Date: Wed, 23 Mar 2022 08:30:20 +0000 Subject: [PATCH] 8282345: handle latest VS2022 in abstract_vm_version Backport-of: 735e86b0f71c97c2ba35c1cffd9b4492a8ca55bc --- src/hotspot/share/runtime/abstract_vm_version.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/hotspot/share/runtime/abstract_vm_version.cpp b/src/hotspot/share/runtime/abstract_vm_version.cpp index 494336e59c5..d13f5dd5779 100644 --- a/src/hotspot/share/runtime/abstract_vm_version.cpp +++ b/src/hotspot/share/runtime/abstract_vm_version.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -198,11 +198,7 @@ const char* Abstract_VM_Version::internal_vm_info_string() { #ifndef HOTSPOT_BUILD_COMPILER #ifdef _MSC_VER - #if _MSC_VER == 1600 - #define HOTSPOT_BUILD_COMPILER "MS VC++ 10.0 (VS2010)" - #elif _MSC_VER == 1700 - #define HOTSPOT_BUILD_COMPILER "MS VC++ 11.0 (VS2012)" - #elif _MSC_VER == 1800 + #if _MSC_VER == 1800 #define HOTSPOT_BUILD_COMPILER "MS VC++ 12.0 (VS2013)" #elif _MSC_VER == 1900 #define HOTSPOT_BUILD_COMPILER "MS VC++ 14.0 (VS2015)" @@ -238,6 +234,10 @@ const char* Abstract_VM_Version::internal_vm_info_string() { #define HOTSPOT_BUILD_COMPILER "MS VC++ 16.8 / 16.9 (VS2019)" #elif _MSC_VER == 1929 #define HOTSPOT_BUILD_COMPILER "MS VC++ 16.10 / 16.11 (VS2019)" + #elif _MSC_VER == 1930 + #define HOTSPOT_BUILD_COMPILER "MS VC++ 17.0 (VS2022)" + #elif _MSC_VER == 1931 + #define HOTSPOT_BUILD_COMPILER "MS VC++ 17.1 (VS2022)" #else #define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER) #endif