Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8282345: handle latest VS2022 in abstract_vm_version 
Reviewed-by: mbaesken
Backport-of: 735e86b0f71c97c2ba35c1cffd9b4492a8ca55bc
  • Loading branch information
@GoeLin
GoeLin committed Oct 12, 2022
1 parent 81e900a commit 1d9108f
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/hotspot/share/runtime/abstract_vm_version.cpp
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2019, 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 @@ -251,6 +251,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

3 comments on commit 1d9108f

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@AlexanderScherbatiy
Copy link

Choose a reason for hiding this comment

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

/backport jdk8u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 1d9108f Apr 10, 2023

Choose a reason for hiding this comment

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

@AlexanderScherbatiy Could not automatically backport 1d9108f4 to openjdk/jdk8u-dev due to conflicts in the following files:

  • src/hotspot/share/runtime/abstract_vm_version.cpp

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk8u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk8u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b AlexanderScherbatiy-backport-1d9108f4

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev.git 1d9108f4f7d07e1be916bd0595ff4262c4e835c5

# Backport the commit
$ git cherry-pick --no-commit 1d9108f4f7d07e1be916bd0595ff4262c4e835c5
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 1d9108f4f7d07e1be916bd0595ff4262c4e835c5'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk8u-dev with the title Backport 1d9108f4f7d07e1be916bd0595ff4262c4e835c5.

Please sign in to comment.