Skip to content

8306949: Resolve miscellaneous multiple symbol definition issues when statically linking JDK/VM natives with standard launcher #13682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from

Conversation

jianglizhou
Copy link
Contributor

@jianglizhou jianglizhou commented Apr 27, 2023

Resolve misc symbol issues observed when statically linking JDK/VM natives with the standard Java launcher executable. Use the same approaches adopted by earlier fixes for static linking related symbol problems (e.g. JDK-8306033):

  • Change findFunction() to be a static function in src/java.smartcardio/unix/native/libj2pcsc/pcsc_md.c.
  • Rename findFunction() to p11FindFunction() in libj2pkcs11 code.
  • Rename 'debug' to 'debug_j2pkcs11' in libj2pkcs11 code.
  • Rename 'jvm' to 'jvm_xawt' in libawt_xawt code.

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

  • JDK-8306949: Resolve miscellaneous multiple symbol definition issues when statically linking JDK/VM natives with standard launcher

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/13682/head:pull/13682
$ git checkout pull/13682

Update a local copy of the PR:
$ git checkout pull/13682
$ git pull https://git.openjdk.org/jdk.git pull/13682/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13682

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/13682.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 27, 2023

👋 Welcome back jiangli! 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 Apr 27, 2023
@openjdk
Copy link

openjdk bot commented Apr 27, 2023

@jianglizhou The following labels will be automatically applied to this pull request:

  • client
  • security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added security security-dev@openjdk.org client client-libs-dev@openjdk.org labels Apr 27, 2023
@mlbridge
Copy link

mlbridge bot commented Apr 27, 2023

Webrevs

@mrserb
Copy link
Member

mrserb commented Apr 27, 2023

The changes for jvm_xawt looks fine.

Copy link
Contributor

@AlanBateman AlanBateman left a comment

Choose a reason for hiding this comment

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

Looks okay.

@openjdk
Copy link

openjdk bot commented Apr 27, 2023

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8306949: Resolve miscellaneous multiple symbol definition issues when statically linking JDK/VM natives with standard launcher

Reviewed-by: alanb

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 10 new commits pushed to the master branch:

  • 96cdf93: 8306833: Change CardTable::_covered to static array
  • 1be80a4: 8287087: C2: perform SLP reduction analysis on-demand
  • ba43649: 8306976: UTIL_REQUIRE_SPECIAL warning on grep
  • cbccc4c: 8304265: Implementation of Foreign Function and Memory API (Third Preview)
  • 41d5853: 8306940: test/jdk/java/net/httpclient/XxxxInURI.java should call HttpClient::close
  • d94ce65: 8306858: Remove some remnants of CMS from SA agent
  • a83c02f: 8306654: Disable NMT location_printing_cheap_dead_xx tests again
  • de0c05d: 6995195: Static initialization deadlock in sun.java2d.loops.Blit and GraphicsPrimitiveMgr
  • 748476f: 8306732: TruncatedSeq::predict_next() attempts linear regression with only one data point
  • 27c5c10: 8306883: Thread stacksize is reported with wrong units in os::create_thread logging

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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 27, 2023
@jianglizhou
Copy link
Contributor Author

Thanks for the reviews.

@jianglizhou
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 27, 2023

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

  • 96cdf93: 8306833: Change CardTable::_covered to static array
  • 1be80a4: 8287087: C2: perform SLP reduction analysis on-demand
  • ba43649: 8306976: UTIL_REQUIRE_SPECIAL warning on grep
  • cbccc4c: 8304265: Implementation of Foreign Function and Memory API (Third Preview)
  • 41d5853: 8306940: test/jdk/java/net/httpclient/XxxxInURI.java should call HttpClient::close
  • d94ce65: 8306858: Remove some remnants of CMS from SA agent
  • a83c02f: 8306654: Disable NMT location_printing_cheap_dead_xx tests again
  • de0c05d: 6995195: Static initialization deadlock in sun.java2d.loops.Blit and GraphicsPrimitiveMgr
  • 748476f: 8306732: TruncatedSeq::predict_next() attempts linear regression with only one data point
  • 27c5c10: 8306883: Thread stacksize is reported with wrong units in os::create_thread logging

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 27, 2023
@openjdk openjdk bot closed this Apr 27, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 27, 2023
@openjdk
Copy link

openjdk bot commented Apr 27, 2023

@jianglizhou Pushed as commit fed262a.

💡 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
client client-libs-dev@openjdk.org integrated Pull request has been integrated security security-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

3 participants