Skip to content
This repository has been archived by the owner on Jul 17, 2024. It is now read-only.
/ jdk22u Public archive

8329958: Windows x86 build fails: downcallLinker.cpp(36) redefinition #224

Closed

Conversation

dholmes-ora
Copy link
Member

@dholmes-ora dholmes-ora commented May 27, 2024

Trivial backport to fix Windows 32-bit build issue.

Thanks.


Progress

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

Issue

  • JDK-8329958: Windows x86 build fails: downcallLinker.cpp(36) redefinition (Bug - P3 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 224

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk22u/pull/224.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 27, 2024

👋 Welcome back dholmes! 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 27, 2024

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

8329958: Windows x86 build fails: downcallLinker.cpp(36) redefinition

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 changed the title Backport 86eb5d9f3be30ff9df1318f18ab73c7129c978f6 8329958: Windows x86 build fails: downcallLinker.cpp(36) redefinition May 27, 2024
@openjdk
Copy link

openjdk bot commented May 27, 2024

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

@openjdk openjdk bot added backport clean approval rfr Pull request is ready for review labels May 27, 2024
@mlbridge
Copy link

mlbridge bot commented May 27, 2024

Webrevs

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels May 28, 2024
@dholmes-ora
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented May 28, 2024

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

  • 70bd2c7: 8328075: Shenandoah: Avoid forwarding when objects don't move in full-GC
  • f867d97: 8331746: Create a test to verify that the cmm id is not ignored
  • 3ed85b9: 8316328: Test jdk/jfr/event/oldobject/TestSanityDefault.java times out for some heap sizes
  • 851922d: 8331164: createJMHBundle.sh download jars fail when url needed to be redirected
  • 3663b2d: 8327501: Common ForkJoinPool prevents class unloading in some cases
  • b96b4f6: 8332490: JMH org.openjdk.bench.java.util.zip.InflaterInputStreams.inflaterInputStreamRead OOM

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 28, 2024

@dholmes-ora Pushed as commit 66cdc14.

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

@dholmes-ora dholmes-ora deleted the backport-dholmes-ora-86eb5d9f branch May 28, 2024 23:20
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant