Skip to content

8308270: ARM32 build broken after JDK-8304913 #14028

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

Closed

Conversation

bulasevich
Copy link
Contributor

@bulasevich bulasevich commented May 17, 2023

Build issue happens after https://git.openjdk.org/jdk/pull/13585:

$ make bundles
...
jdk.tools.jlink.plugin.PluginException: ModuleTarget is malformed: No enum constant jdk.internal.util.Architecture.ARM
	at jdk.jlink/jdk.tools.jlink.builder.DefaultImageBuilder.storeFiles(DefaultImageBuilder.java:181)
	at jdk.jlink/jdk.tools.jlink.internal.ImagePluginStack.storeFiles(ImagePluginStack.java:486)
	at jdk.jlink/jdk.tools.jlink.internal.ImageFileCreator.writeImage(ImageFileCreator.java:168)
	at jdk.jlink/jdk.tools.jlink.internal.ImageFileCreator.create(ImageFileCreator.java:100)
	at jdk.jlink/jdk.tools.jlink.internal.JlinkTask$ImageHelper.retrieve(JlinkTask.java:860)
	at jdk.jlink/jdk.tools.jlink.internal.ImagePluginStack.operate(ImagePluginStack.java:194)
	at jdk.jlink/jdk.tools.jlink.internal.JlinkTask.createImage(JlinkTask.java:423)
	at jdk.jlink/jdk.tools.jlink.internal.JlinkTask.run(JlinkTask.java:286)
	at jdk.jlink/jdk.tools.jlink.internal.Main.run(Main.java:56)
	at jdk.jlink/jdk.tools.jlink.internal.Main.main(Main.java:34)

With this PR I follow the #13357 change to add a missing ARM32 architecture to the list of supported architectures: X64, X86, AARCH64, RISCV64, S390, PPC64.


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14028

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 17, 2023

👋 Welcome back bulasevich! 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 May 17, 2023

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

  • core-libs

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 core-libs core-libs-dev@openjdk.org label May 17, 2023
@bulasevich bulasevich force-pushed the arm32_Architecture_enum branch from b6a90aa to ef7df99 Compare May 17, 2023 14:52
@bulasevich bulasevich marked this pull request as ready for review May 17, 2023 17:38
@openjdk openjdk bot added the rfr Pull request is ready for review label May 17, 2023
@mlbridge
Copy link

mlbridge bot commented May 17, 2023

Webrevs

Copy link
Member

@tstuefe tstuefe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Thanks for fixing this.

@openjdk
Copy link

openjdk bot commented May 17, 2023

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

8308270: ARM32 build broken after JDK-8304913

Reviewed-by: stuefe, rriggs

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

  • 6073edf: 8307483: New micros for j.u.c.LockSupport
  • 2409448: 8307365: JvmtiStressModule hit SIGSEGV in JvmtiEventControllerPrivate::recompute_thread_enabled
  • 950c5df: 8307299: Move more DnD tests to open
  • 8bedf2e: 8308292: Problemlist vmTestbase/nsk/jvmti/AttachOnDemand/attach020/TestDescription.java
  • 6d4782b: 8307976: (fs) Files.createDirectories(dir) returns dir::toAbsolutePath instead of dir
  • f57c783: 8308239: Tighten up accessibility of nested classes in java.lang.invoke
  • 64f6681: 8308246: PPC64le build broken after JDK-8304913
  • 5763be7: 8307326: Package jdk.internal.classfile.java.lang.constant become obsolete
  • c7951cf: 8306304: Fix xlc17 clang warnings in ppc and aix code
  • 285c833: 8308043: Deadlock in TestCSLocker.java due to blocking GC while allocating
  • ... and 2 more: https://git.openjdk.org/jdk/compare/e34ecc97e63c4565f09b0c80d194c4708c408c10...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.

➡️ 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 Pull request is ready to be integrated label May 17, 2023
Copy link
Contributor

@RogerRiggs RogerRiggs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look good, thanks for addition.

@bulasevich
Copy link
Contributor Author

Thank you for reviewing!

@bulasevich
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented May 18, 2023

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

  • 902585b: 8308110: Resolve multiple definition of 'JNI_OnLoad_jsound' linking error
  • 6073edf: 8307483: New micros for j.u.c.LockSupport
  • 2409448: 8307365: JvmtiStressModule hit SIGSEGV in JvmtiEventControllerPrivate::recompute_thread_enabled
  • 950c5df: 8307299: Move more DnD tests to open
  • 8bedf2e: 8308292: Problemlist vmTestbase/nsk/jvmti/AttachOnDemand/attach020/TestDescription.java
  • 6d4782b: 8307976: (fs) Files.createDirectories(dir) returns dir::toAbsolutePath instead of dir
  • f57c783: 8308239: Tighten up accessibility of nested classes in java.lang.invoke
  • 64f6681: 8308246: PPC64le build broken after JDK-8304913
  • 5763be7: 8307326: Package jdk.internal.classfile.java.lang.constant become obsolete
  • c7951cf: 8306304: Fix xlc17 clang warnings in ppc and aix code
  • ... and 3 more: https://git.openjdk.org/jdk/compare/e34ecc97e63c4565f09b0c80d194c4708c408c10...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 18, 2023

@bulasevich Pushed as commit 83c096d.

💡 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
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants