Skip to content

Conversation

@apavlyutkin
Copy link
Contributor

@apavlyutkin apavlyutkin commented Nov 21, 2022

Hi!

Please review another portion of changes to add MSVS2019 support to jdk-8. This one adds recognition of MSVS2019 compiler/linker to the hotspot build scripts and applies build rules accordingly. Before the patch the scripts didn't not know how to link precompiled headers and builds failed with the error

ad_x86_64_pipeline.obj : error LNK2011: precompiled object not linked in; image may not run
jvm.dll : fatal error LNK1120: 1 unresolved externals

Verification: MSVS2019 (32/64-bits, release/debug) builds now fail with

awt_DCHolder.cpp
C:\PROGRA~2\MICROS~2\2019\COMMUN~1\VC\Tools\MSVC\14.29.30133\include\cstdlib(46): error C2039: 'Do_Not_Use_calloc_Use_safe_Calloc_Instead': is not a member of '`global namespace''
C:\PROGRA~2\MICROS~2\2019\COMMUN~1\VC\Tools\MSVC\14.29.30133\include\cstdlib(46): error C2873: 'Do_Not_Use_calloc_Use_safe_Calloc_Instead': symbol cannot be used in a using-declaration
C:\PROGRA~2\MICROS~2\2019\COMMUN~1\VC\Tools\MSVC\14.29.30133\include\cstdlib(52): error C2039: 'Do_Not_Use_malloc_Use_safe_Malloc_Instead': is not a member of '`global namespace''
C:\PROGRA~2\MICROS~2\2019\COMMUN~1\VC\Tools\MSVC\14.29.30133\include\cstdlib(52): error C2873: 'Do_Not_Use_malloc_Use_safe_Malloc_Instead': symbol cannot be used in a using-declaration
C:\PROGRA~2\MICROS~2\2019\COMMUN~1\VC\Tools\MSVC\14.29.30133\include\cstdlib(58): error C2039: 'Do_Not_Use_realloc_Use_safe_Realloc_Instead': is not a member of '`global namespace''
slowdebug/jdk/objs/libawt/awt_DCHolder.obj] Error 2
make[2]: *** Waiting for unfinished jobs....

that will be fixed by backporting of JDK-8241087

Regression: MSVS2017 (32/64-bits, release/debug) build - Ok


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev pull/187/head:pull/187
$ git checkout pull/187

Update a local copy of the PR:
$ git checkout pull/187
$ git pull https://git.openjdk.org/jdk8u-dev pull/187/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 187

View PR using the GUI difftool:
$ git pr show -t 187

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/187.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 21, 2022

👋 Welcome back apavlyutkin! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 21, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 21, 2022

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

Lgtm.

@openjdk
Copy link

openjdk bot commented Nov 21, 2022

@apavlyutkin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8297329: [8u] hotspot needs to recognise VS2019

Reviewed-by: phh

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 8 new commits pushed to the master branch:

  • 7eb2803: 8230305: Cgroups v2: Container awareness
  • 3b1bbef: 8297739: Bump update version of OpenJDK: 8u372
  • 41159a5: 8255559: Leak File Descriptors Because of ResolverLocalFilesystem#engineResolveURI()
  • df44cbf: 8073464: GC workers do not have thread names
  • 9f2f0c2: 6885993: Named Thread: introduce print() and print_on(outputStream* st) methods
  • c501bfa: 8269039: Disable SHA-1 Signed JARs
  • 5a32484: 8297141: Fix hotspot/test/runtime/SharedArchiveFile/DefaultUseWithClient.java for 8u
  • da0c382: 8241086: Test runtime/NMT/HugeArenaTracking.java is failing on 32bit Windows

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 21, 2022
@apavlyutkin
Copy link
Contributor Author

Paul, thank you for the review

@apavlyutkin
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 1, 2022
@openjdk
Copy link

openjdk bot commented Dec 1, 2022

@apavlyutkin
Your change (at version a7a11fd) is now ready to be sponsored by a Committer.

@yan-too
Copy link
Contributor

yan-too commented Dec 1, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 1, 2022

Going to push as commit 7b54850.
Since your change was applied there have been 9 commits pushed to the master branch:

  • e9acfce: 8295322: Tests for JDK-8271459 were not backported to 11u
  • 7eb2803: 8230305: Cgroups v2: Container awareness
  • 3b1bbef: 8297739: Bump update version of OpenJDK: 8u372
  • 41159a5: 8255559: Leak File Descriptors Because of ResolverLocalFilesystem#engineResolveURI()
  • df44cbf: 8073464: GC workers do not have thread names
  • 9f2f0c2: 6885993: Named Thread: introduce print() and print_on(outputStream* st) methods
  • c501bfa: 8269039: Disable SHA-1 Signed JARs
  • 5a32484: 8297141: Fix hotspot/test/runtime/SharedArchiveFile/DefaultUseWithClient.java for 8u
  • da0c382: 8241086: Test runtime/NMT/HugeArenaTracking.java is failing on 32bit Windows

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 1, 2022
@openjdk openjdk bot closed this Dec 1, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Dec 1, 2022
@openjdk
Copy link

openjdk bot commented Dec 1, 2022

@yan-too @apavlyutkin Pushed as commit 7b54850.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants