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

8315578: PPC builds are broken after JDK-8304913 #186

Closed
wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Sep 21, 2023

Clean backport to unbreak another build configuration.

Additional testing:

  • macosx-aarch64-server-fastdebug, jdk/internal/util/ArchTest.java

Progress

  • Change must not contain extraneous whitespace
  • JDK-8315578 needs maintainer approval
  • Commit message must refer to an issue

Issue

  • JDK-8315578: PPC builds are broken after JDK-8304913 (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 186

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u/pull/186.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 21, 2023

👋 Welcome back shade! 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 changed the title Backport 9559e035d2692d9d61bec2a13b5239a98db077ac 8315578: PPC builds are broken after JDK-8304913 Sep 21, 2023
@openjdk
Copy link

openjdk bot commented Sep 21, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented Sep 21, 2023

⚠️ @shipilev This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 21, 2023
@shipilev
Copy link
Member Author

/approval request "Another clean backport to unbreak JDK 21 build on another architecture"

@openjdk
Copy link

openjdk bot commented Sep 21, 2023

@shipilev The approval request has been created successfully.

@openjdk openjdk bot added the approval label Sep 21, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 21, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Sep 22, 2023

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

8315578: PPC builds are broken after JDK-8304913

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

  • fa64237: 8314632: Intra-case dominance check fails in the presence of a guard
  • 742ff74: 8314226: Series of colon-style fallthrough switch cases with guards compiled incorrectly
  • cea4062: 8316031: SSLFlowDelegate should not log from synchronized block
  • c0adad2: 8316400: Exclude jdk/jfr/event/runtime/TestResidentSetSizeEvent.java on AIX
  • c86bad5: 8316387: Exclude more failing multicast tests on AIX after JDK-8315651
  • b9f54bd: 8315651: Stop hiding AIX specific multicast socket errors via NetworkConfiguration (aix)
  • f33c9a3: 8313244: NM flags handling in configure process

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 ready Pull request is ready to be integrated and removed approval labels Sep 22, 2023
@shipilev
Copy link
Member Author

Push approval granted.

/integrate

@openjdk
Copy link

openjdk bot commented Sep 22, 2023

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

  • fa64237: 8314632: Intra-case dominance check fails in the presence of a guard
  • 742ff74: 8314226: Series of colon-style fallthrough switch cases with guards compiled incorrectly
  • cea4062: 8316031: SSLFlowDelegate should not log from synchronized block
  • c0adad2: 8316400: Exclude jdk/jfr/event/runtime/TestResidentSetSizeEvent.java on AIX
  • c86bad5: 8316387: Exclude more failing multicast tests on AIX after JDK-8315651
  • b9f54bd: 8315651: Stop hiding AIX specific multicast socket errors via NetworkConfiguration (aix)
  • f33c9a3: 8313244: NM flags handling in configure process

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 22, 2023

@shipilev Pushed as commit e2bfc22.

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

@shipilev shipilev deleted the JDK-8315578-ppc-builds branch October 19, 2023 18:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant