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

8264650: Cross-compilation to macos/aarch64 #3325

Closed

Conversation

@AntonKozlov
Copy link
Member

@AntonKozlov AntonKozlov commented Apr 2, 2021

Please review adding necessary flags for cross-compilation on macos/x86 targeting macos/aarch64.

All CFLAGS, CXXFLAGS, LDFLAGS need target CPU flag -arch arm64.
This patch adds the flag along e.g -m64.

Tested:

  • cross-compilation
    • macos/x86 -> macos/aarch64: configure --openjdk-target=aarch64-apple-darwin
    • macos/aarch64 -> macos/x86: configure --openjdk-target=x86_64-apple-darwin
  • native compilation:
    • macos/aarch64
    • macos/x86

Progress

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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3325

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 2, 2021

👋 Welcome back akozlov! 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 2, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 2, 2021

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

  • build

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.

@openjdk openjdk bot added the build label Apr 2, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 2, 2021

Webrevs

@@ -265,6 +265,11 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
fi
fi
if test "x$OPENJDK_TARGET_OS" = xmacosx &&
test "x$OPENJDK_TARGET_CPU" = xaarch64; then

This comment has been minimized.

@erikj79

erikj79 Apr 2, 2021
Member

Thank you for getting on this!
For symmetry, and to enable cross compilation on both directions, can we add the necessary flag for x64 too?

Also, I doubt it matters much, but we could also only set these flags if COMPILE_TYPE=cross.

This comment has been minimized.

@erikj79

erikj79 Apr 2, 2021
Member

Thinking again, it doesn't hurt to be explicit about this. Better always set these flags to avoid surprises.

This comment has been minimized.

@AntonKozlov

AntonKozlov Apr 2, 2021
Author Member

Cool, I haven't thought it is possible, although clearly it should be :) Thanks! Fixed by always setting the flag. I also rely on Github Action to check this with Xcode 11.3.1, it seems to be fine https://github.com/AntonKozlov/jdk/runs/2256008843

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

@openjdk openjdk bot commented Apr 2, 2021

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

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

  • 0039c18: 8264475: CopyArea ignores clip state in metal rendering pipeline
  • f084bd2: 8262355: Support for AVX-512 opmask register allocation.
  • 0780666: 8254050: HotSpot Style Guide should permit using the "override" virtual specifier
  • f259eea: 8264393: JDK-8258284 introduced dangling TLH race
  • 9b2232b: 8264123: add ThreadsList.is_valid() support
  • e8eda65: 8264664: use text blocks in javac module tests
  • cec66cf: 8264572: ForkJoinPool.getCommonPoolParallelism() reports always 1
  • 9c283da: 8264662: ProblemList vmTestbase/jit/escape/AdaptiveBlocking/AdaptiveBlocking001/AdaptiveBlocking001.java on win-x64 with ZGC
  • eb0ac86: 8264655: Minor internal doc comment cleanup
  • 3991b32: 8264539: Improve failure message of java/nio/file/WatchService/SensitivityModifier.java
  • ... and 6 more: https://git.openjdk.java.net/jdk/compare/885916eda023f313c429f5ea3f0cefd3a9574837...master

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@erikj79) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready label Apr 2, 2021
@AntonKozlov
Copy link
Member Author

@AntonKozlov AntonKozlov commented Apr 5, 2021

/integrate

@openjdk openjdk bot added the sponsor label Apr 5, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 5, 2021

@AntonKozlov
Your change (at version df62dd0) is now ready to be sponsored by a Committer.

@VladimirKempik
Copy link

@VladimirKempik VladimirKempik commented Apr 5, 2021

/sponsor

@openjdk openjdk bot closed this Apr 5, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 5, 2021

@VladimirKempik @AntonKozlov Since your change was applied there have been 16 commits pushed to the master branch:

  • 0039c18: 8264475: CopyArea ignores clip state in metal rendering pipeline
  • f084bd2: 8262355: Support for AVX-512 opmask register allocation.
  • 0780666: 8254050: HotSpot Style Guide should permit using the "override" virtual specifier
  • f259eea: 8264393: JDK-8258284 introduced dangling TLH race
  • 9b2232b: 8264123: add ThreadsList.is_valid() support
  • e8eda65: 8264664: use text blocks in javac module tests
  • cec66cf: 8264572: ForkJoinPool.getCommonPoolParallelism() reports always 1
  • 9c283da: 8264662: ProblemList vmTestbase/jit/escape/AdaptiveBlocking/AdaptiveBlocking001/AdaptiveBlocking001.java on win-x64 with ZGC
  • eb0ac86: 8264655: Minor internal doc comment cleanup
  • 3991b32: 8264539: Improve failure message of java/nio/file/WatchService/SensitivityModifier.java
  • ... and 6 more: https://git.openjdk.java.net/jdk/compare/885916eda023f313c429f5ea3f0cefd3a9574837...master

Your commit was automatically rebased without conflicts.

Pushed as commit 7f9ece2.

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