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

8328177: Move LDFLAGS_JDK[LIB/EXE] to JdkNativeCompilation.gmk #18343

Closed
wants to merge 1 commit into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Mar 18, 2024

Similar to JDK-8328157, we want to move the setting of LDFLAGS to LDFLAGS_JDK[LIB/EXE into SetupJdkLibrary and SetupJdkExecutable.


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-8328177: Move LDFLAGS_JDK[LIB/EXE] to JdkNativeCompilation.gmk (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18343

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 18, 2024

👋 Welcome back ihse! 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 bot commented Mar 18, 2024

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

8328177: Move LDFLAGS_JDK[LIB/EXE] to JdkNativeCompilation.gmk

Reviewed-by: erikj

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

  • 86f1744: 8328248: Convert javax/swing/JSlider/6587742/bug6587742.java applet test to main
  • 7baec66: 8328168: Epsilon: Premature OOM when allocating object larger than uncommitted heap size
  • c342188: 8328074: Add jcheck whitespace checking for assembly files

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 rfr Pull request is ready for review label Mar 18, 2024
@openjdk
Copy link

openjdk bot commented Mar 18, 2024

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

  • build
  • client
  • core-libs
  • net
  • serviceability

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 serviceability serviceability-dev@openjdk.org build build-dev@openjdk.org client client-libs-dev@openjdk.org core-libs core-libs-dev@openjdk.org net net-dev@openjdk.org labels Mar 18, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 18, 2024

Webrevs

@magicus
Copy link
Member Author

magicus commented Mar 18, 2024

/label -client -core-libs -net -serviceability

@openjdk openjdk bot removed client client-libs-dev@openjdk.org core-libs core-libs-dev@openjdk.org net net-dev@openjdk.org serviceability serviceability-dev@openjdk.org labels Mar 18, 2024
@openjdk
Copy link

openjdk bot commented Mar 18, 2024

@magicus
The client label was successfully removed.

The core-libs label was successfully removed.

The net label was successfully removed.

The serviceability label was successfully removed.

@magicus
Copy link
Member Author

magicus commented Mar 18, 2024

I have verified with COMPARE_BUILD that there is no change whatsoever in the resulting binaries, for all platforms in Oracle CI: Linux x64/aarch64, macOS x64/aarch64 and Windows x64.

@magicus
Copy link
Member Author

magicus commented Mar 18, 2024

Also, to be clear, my intention is to try and remove quirks and workarounds like APPEND_LDFLAGS; but to do that I want to focus on cleaning up one library at the time. Now I just want to lay the groundwork of having a sane API.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 18, 2024
@magicus
Copy link
Member Author

magicus commented Mar 18, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Mar 18, 2024

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

  • f3af918: 8327945: Inline HasScavengableOops
  • fb390d2: 8327839: Crash with unboxing and widening primitive conversion in switch
  • 86f1744: 8328248: Convert javax/swing/JSlider/6587742/bug6587742.java applet test to main
  • 7baec66: 8328168: Epsilon: Premature OOM when allocating object larger than uncommitted heap size
  • c342188: 8328074: Add jcheck whitespace checking for assembly files

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 18, 2024

@magicus Pushed as commit 9e98118.

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

@magicus magicus deleted the set-ldflags-automatically branch March 18, 2024 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants