Skip to content
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

8264848: [macos] libjvm.dylib linker warning due to macOS version mismatch #3379

Closed
wants to merge 8 commits into from

Conversation

@RealLucy
Copy link

@RealLucy RealLucy commented Apr 7, 2021

May I please request reviews for this small build fix. It removes a linker warning by adding a assembly-time parameter which was previously missing. The same parameter is used at c++ compile time.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8264848: [macos] libjvm.dylib linker warning due to macOS version mismatch

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3379/head:pull/3379
$ git checkout pull/3379

Update a local copy of the PR:
$ git checkout pull/3379
$ git pull https://git.openjdk.java.net/jdk pull/3379/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3379

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3379.diff

@RealLucy RealLucy closed this Apr 7, 2021
@RealLucy RealLucy deleted the RealLucy:JDK-8264848 branch Apr 7, 2021
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 7, 2021

👋 Welcome back lucy! 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
Copy link

@openjdk openjdk bot commented Apr 7, 2021

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

  • build
  • hotspot

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.

@RealLucy RealLucy restored the RealLucy:JDK-8264848 branch Apr 7, 2021
@RealLucy RealLucy reopened this Apr 7, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 7, 2021

⚠️ @RealLucy This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@RealLucy RealLucy marked this pull request as ready for review Apr 7, 2021
@openjdk openjdk bot added the rfr label Apr 7, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 7, 2021

Webrevs

@erikj79
Copy link
Member

@erikj79 erikj79 commented Apr 7, 2021

So that's where that warning came from!

I don't think the comment needs to mention the warning. Otherwise this looks good to me.

@RealLucy
Copy link
Author

@RealLucy RealLucy commented Apr 7, 2021

Thank you Erik for having a look.
Would you also be willing to mark this PR as reviewed?

@erikj79
erikj79 approved these changes Apr 7, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 7, 2021

@RealLucy 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:

8264848: [macos] libjvm.dylib linker warning due to macOS version mismatch

Reviewed-by: erikj, dcubed, clanger

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

  • 6e2b82a: 8264731: Introduce InstanceKlass::method_at_itable_or_null()
  • 22b20f8: 8264424: Support OopStorage bulk allocation
  • ab3be72: 8264863: Update JCov version to support JDK 17
  • 774e5ae: 8264742: member variable _monitor of MonitorLocker is redundant
  • 7a99a98: 8262316: Reducing locks in RSA Blinding

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 label Apr 7, 2021
Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Thumbs up.

@dcubed-ojdk
Copy link
Member

@dcubed-ojdk dcubed-ojdk commented Apr 7, 2021

Side bar: I don't quite understand the commit history part of this PR.
It looks like this PR was used for something else before it was used
for this fix.

@RealLucy
Copy link
Author

@RealLucy RealLucy commented Apr 7, 2021

@dcubed-ojdk Please just ignore the commit history. For some reason I don't understand, my push of JDK-8264848 was appended to the pushes for JDK-8264173. With previous PRs, that did not happen. Luckily, GitHub was smart enough.

Btw, thanks a lot for the review!

Copy link
Contributor

@RealCLanger RealCLanger left a comment

Cool, Lutz, you found it 👍

@RealLucy
Copy link
Author

@RealLucy RealLucy commented Apr 8, 2021

Thank you for the review, Christoph!
I'll integrate the change today, early afternoon (UTC).

@RealLucy
Copy link
Author

@RealLucy RealLucy commented Apr 8, 2021

/integrate

@openjdk openjdk bot closed this Apr 8, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 8, 2021

@RealLucy Since your change was applied there have been 15 commits pushed to the master branch:

  • 214d6e2: 8263506: Make sun.net.httpserver.UnmodifiableHeaders unmodifiable
  • af13c64: 8264711: More runtime TRAPS cleanups
  • 3aec2d9: 8264718: Shenandoah: enable string deduplication during root scanning
  • 255afbe: 8264672: runtime/ParallelLoad/ParallelSuperTest.java timed out
  • ec599da: 8264633: Add missing logging to PlatformRecording#stop
  • e89542f: 8264352: AArch64: Optimize vector "not/andNot" for NEON and SVE
  • 016db40: 8263907: Specification of CellRendererPane::paintComponent(..Rectangle) should clearly mention which method it delegates the call to
  • 78d1164: 8214455: Relocate CDS archived regions to the top of the G1 heap
  • 88eb291: 8264809: test-lib fails to build due to some warnings in ASN1Formatter and jfr
  • a863ab6: 8264551: Unexpected warning when jpackage creates an exe
  • ... and 5 more: https://git.openjdk.java.net/jdk/compare/d3fdd7399daec8b51b587ca9e3aa2338a98e0b1c...master

Your commit was automatically rebased without conflicts.

Pushed as commit 04fa1ed.

💡 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
4 participants