Skip to content

Commit

Permalink
8282345: handle latest VS2022 in abstract_vm_version
Browse files Browse the repository at this point in the history
Backport-of: 735e86b0f71c97c2ba35c1cffd9b4492a8ca55bc
  • Loading branch information
MBaesken committed Mar 23, 2022
1 parent d442446 commit 18ece9b
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions 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
Expand Down Expand Up @@ -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)"
Expand Down Expand Up @@ -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
Expand Down

1 comment on commit 18ece9b

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.