Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.

8250605: Linux x86_32 builds fail after JDK-8249821 #302

Closed
wants to merge 1 commit into from

Conversation

omikhaltsova
Copy link
Contributor

@omikhaltsova omikhaltsova commented Dec 9, 2021

I'd like to backport JDK-8250605 to jdk13u for parity with jdk11u.
The patch applied manually because the patched file is in another directory: make/lib/Awt2dLibraries.gmk instead of make/modules/java.desktop/lib/Awt2dLibraries.gmk.
I observed the same cast warnings (not errors due to --disable-warnings-as-errors) at the compile time on the Linux 32 bits platform.

/home/ec2-user/workspace/zulu13-build-linux32/zulu-src.git/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c: In function 'setupBlitVector':
/home/ec2-user/workspace/zulu13-build-linux32/zulu-src.git/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c:108:21: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
             ginfo = (GlyphInfo*)imagePtrs[g];
                     ^
/home/ec2-user/workspace/zulu13-build-linux32/zulu-src.git/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c:121:21: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
             ginfo = (GlyphInfo*)imagePtrs[g];
                     ^
/home/ec2-user/workspace/zulu13-build-linux32/zulu-src.git/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c: In function 'setupLCDBlitVector':
/home/ec2-user/workspace/zulu13-build-linux32/zulu-src.git/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c:534:17: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
         ginfo = (GlyphInfo*)imagePtrs[0];
                 ^
/home/ec2-user/workspace/zulu13-build-linux32/zulu-src.git/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c:569:21: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
             ginfo = (GlyphInfo*)imagePtrs[g];
                     ^
...

After applying this patch they were fixed.


Progress

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

Issue

  • JDK-8250605: Linux x86_32 builds fail after JDK-8249821

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk13u-dev pull/302/head:pull/302
$ git checkout pull/302

Update a local copy of the PR:
$ git checkout pull/302
$ git pull https://git.openjdk.java.net/jdk13u-dev pull/302/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 302

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk13u-dev/pull/302.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 9, 2021

👋 Welcome back omikhaltcova! 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 5b99c6ae1f442f670fdb4dbf99987d5cc08033b5 8250605: Linux x86_32 builds fail after JDK-8249821 Dec 9, 2021
@openjdk
Copy link

openjdk bot commented Dec 9, 2021

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Dec 9, 2021
@mlbridge
Copy link

mlbridge bot commented Dec 9, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Dec 10, 2021

@omikhaltsova This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8250605: Linux x86_32 builds fail after JDK-8249821

Reviewed-by: yan

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.

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 (@yan-too) 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 Pull request is ready to be integrated label Dec 10, 2021
@omikhaltsova
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 10, 2021
@openjdk
Copy link

openjdk bot commented Dec 10, 2021

@omikhaltsova
Your change (at version 95d98ef) is now ready to be sponsored by a Committer.

@yan-too
Copy link
Collaborator

yan-too commented Dec 10, 2021

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 10, 2021

Going to push as commit 2149624.

@openjdk openjdk bot closed this Dec 10, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Dec 10, 2021
@openjdk
Copy link

openjdk bot commented Dec 10, 2021

@yan-too @omikhaltsova Pushed as commit 2149624.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport integrated Pull request has been integrated
2 participants