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

8283402: Update to gcc 11.2 on Linux #761

Closed

Conversation

kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Mar 25, 2022

This patch updates the compiler to gcc 11.2 on Linux, in order to match JDK 19 -- see JDK-8283057.

I ran a full build and test, including media and WebKit.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (2 reviews required, with at least 1 Reviewer, 1 Author)

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 761

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/761.diff

@kevinrushforth
Copy link
Member Author

/reviewers 2

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 25, 2022

👋 Welcome back kcr! 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 Ready for review label Mar 25, 2022
@openjdk
Copy link

openjdk bot commented Mar 25, 2022

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

@mlbridge
Copy link

mlbridge bot commented Mar 25, 2022

Webrevs

@kevinrushforth
Copy link
Member Author

This patch updates the compiler to gcc 10.3

Copy/paste error. That should be 11.2 (I updated the Description).

@kevinrushforth kevinrushforth removed the request for review from arapte March 28, 2022 13:54
Copy link
Member

@arapte arapte left a comment

Choose a reason for hiding this comment

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

I shall do a test build and update.

@kevinrushforth kevinrushforth requested a review from arapte March 28, 2022 13:56
@@ -83,8 +83,8 @@ jobs:
run: |
set -x
sudo apt-get update
sudo apt-get install libgl1-mesa-dev libx11-dev libxxf86vm-dev libxt-dev pkg-config libgtk2.0-dev libgtk-3-dev libxtst-dev gcc-10=10.3.0-1ubuntu1~20.04 g++-10=10.3.0-1ubuntu1~20.04
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
sudo apt-get install libgl1-mesa-dev libx11-dev libxxf86vm-dev libxt-dev pkg-config libgtk2.0-dev libgtk-3-dev libxtst-dev gcc-11 g++-11
Copy link
Collaborator

Choose a reason for hiding this comment

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

Did this install 11.2? The CI is using Focal, and afaik there is no gcc-11.2 for focal?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, it will use whatever the latest is for GitHub actions. There doesn't seem to be an 11.2 package for GHA. It should be sufficient for most testing, but highlights one of the limitations of relying on GitHub Actions for anything more than a sanity test.

Copy link
Member Author

Choose a reason for hiding this comment

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

(based on the printout I see in the log files, the current version of gcc 1.x available on the GHA Linux nodes is 11.1)

Copy link
Collaborator

Choose a reason for hiding this comment

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

11.1 is what I'm using on 18.04 and 20.04 as well. I wonder if that is good enough, or are there particular reasons why you want to update to 11.2 ?

@kevinrushforth
Copy link
Member Author

are there particular reasons why you want to update to 11.2 ?

Updating to gcc 11.2 matches JDK 19 -- JDK-8283057.

Copy link
Member

@arapte arapte left a comment

Choose a reason for hiding this comment

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

Build on Ubuntu 20.04 looked fine to me.

@kevinrushforth kevinrushforth marked this pull request as draft March 30, 2022 11:53
@openjdk openjdk bot removed the rfr Ready for review label Mar 30, 2022
@kevinrushforth
Copy link
Member Author

Given that the gcc 11.2 compiler isn't available for the latest Ubuntu LTS, 20.04, it seems worth putting this on hold for a bit. I have moved it to Draft.

@johanvos
Copy link
Collaborator

This is working on our build/ci pipeline now, using a dedicated devkit that is very similar to the one produced by https://github.com/openjdk/jdk/tree/master/make/devkit .
I think this PR can now be reviewed/integrated.

@kevinrushforth kevinrushforth marked this pull request as ready for review June 25, 2022 13:28
@openjdk openjdk bot added the rfr Ready for review label Jun 25, 2022
@kevinrushforth
Copy link
Member Author

@johanvos @arapte This is ready for review again.

Copy link
Collaborator

@johanvos johanvos left a comment

Choose a reason for hiding this comment

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

I confirm this works with a GCC 11.2 built from source (on an Ubuntu 22.0.4 system).

@openjdk
Copy link

openjdk bot commented Jul 9, 2022

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

8283402: Update to gcc 11.2 on Linux

Reviewed-by: arapte, jvos

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

  • 187fbe1: 8289381: Fix warnings: The assignment to variable has no effect
  • 60c75b8: 8274771: Map, FlatMap and OrElse fluent bindings for ObservableValue
  • 178d898: 8276056: Control.skin.setSkin(Skin) fails to call dispose() on discarded Skin
  • fc6a602: 8289587: IllegalArgumentException: Color.rgb's red parameter (-16776961) expects color values 0-255
  • 4dcd9e0: 8289171: Blank final field 'dialog' may not have been initialized in scene.control.Dialog:521
  • 28b8220: 8279297: Remove Shape::setMode method
  • 77ecfb7: 8289390: Fix warnings: type parameter E is hiding the type E
  • 704baa3: 8289396: Fix warnings: Null pointer access: The variable instance can only be null at this location

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 Ready to be integrated label Jul 9, 2022
@kevinrushforth
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jul 11, 2022

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

  • cbb53b2: 8289952: Visual Studio libs msvcp140_1.dll and msvcp140_2.dll missing from build
  • 187fbe1: 8289381: Fix warnings: The assignment to variable has no effect
  • 60c75b8: 8274771: Map, FlatMap and OrElse fluent bindings for ObservableValue
  • 178d898: 8276056: Control.skin.setSkin(Skin) fails to call dispose() on discarded Skin
  • fc6a602: 8289587: IllegalArgumentException: Color.rgb's red parameter (-16776961) expects color values 0-255
  • 4dcd9e0: 8289171: Blank final field 'dialog' may not have been initialized in scene.control.Dialog:521
  • 28b8220: 8279297: Remove Shape::setMode method
  • 77ecfb7: 8289390: Fix warnings: type parameter E is hiding the type E
  • 704baa3: 8289396: Fix warnings: Null pointer access: The variable instance can only be null at this location

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 11, 2022
@openjdk openjdk bot closed this Jul 11, 2022
@openjdk openjdk bot removed ready Ready to be integrated rfr Ready for review labels Jul 11, 2022
@openjdk
Copy link

openjdk bot commented Jul 11, 2022

@kevinrushforth Pushed as commit c7d3fd9.

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

@kevinrushforth kevinrushforth deleted the 8283402-gcc-11.2 branch July 11, 2022 22:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants