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

8265982: JDK-8264188 breaks build on macOS-aarch64 #3697

Closed

Conversation

@magicus
Copy link
Member

@magicus magicus commented Apr 26, 2021

Unfortunately JDK-8264188 broke the build on macosx-aarch64.

The likely culprit for this is that the newly introduced assembly file was named ".s" instead of ".S". However, I have still not verified that this (completely) fixes the issue, since my job got stuck in our CI system. Since this is a P1, I wanted to speed on the process by submitting this PR for review even though the results are not yet in. (I will not push until they are.)


Progress

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

Issue

  • JDK-8265982: JDK-8264188 breaks build on macOS-aarch64

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3697

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 26, 2021

👋 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 openjdk bot added the rfr label Apr 26, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 26, 2021

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

  • hotspot-runtime

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

@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 26, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Apr 26, 2021

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

8265982: JDK-8264188 breaks build on macOS-aarch64

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

  • efe6b93: 8265961: Fix comments in logging.properties
  • 65c19c4: 4926314: Optimize Reader.read(CharBuffer)
  • 082abbd: 8265900: Use pattern matching for instanceof at module jdk.compiler(part 2)
  • 851b219: 8265901: Use pattern matching for instanceof at module jdk.compiler(part 3)

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 26, 2021
@magicus
Copy link
Member Author

@magicus magicus commented Apr 26, 2021

/integrate

Copy link
Contributor

@shipilev shipilev left a comment

FWIW, macos-aarch64 jobs in GHA are passing. Looks good!

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

@openjdk openjdk bot commented Apr 26, 2021

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

  • efe6b93: 8265961: Fix comments in logging.properties
  • 65c19c4: 4926314: Optimize Reader.read(CharBuffer)
  • 082abbd: 8265900: Use pattern matching for instanceof at module jdk.compiler(part 2)
  • 851b219: 8265901: Use pattern matching for instanceof at module jdk.compiler(part 3)

Your commit was automatically rebased without conflicts.

Pushed as commit b524a81.

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

@magicus magicus deleted the fix-macosx-aarch64-compile-error branch Oct 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants