Skip to content

Conversation

@backwaterred
Copy link
Contributor

@backwaterred backwaterred commented Apr 4, 2022

#993

Backport of:

8224214: [AIX] Remove support for legacy xlc compiler

Reviewed-by: erikj, kbarrett, mdoerr, dholmes

Backport Notes:

  • ptrQueue.hpp The backport added procedure definitions to the hpp file that were not implemented in the cpp file. I removed these.
  • oopStorage.hpp The backport added procedure definitions to the hpp file that were not implemented in the cpp file. I removed these.
  • globalDefinitions_xlc.hpp Add version check for xlc 16.

Progress

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

Issue

  • JDK-8224214: [AIX] Remove support for legacy xlc compiler

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 996

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 4, 2022

👋 Welcome back backwaterred! 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 b7821ad399f2e70f19eff7aca8bf8226fcc311be 8224214: [AIX] Remove support for legacy xlc compiler Apr 4, 2022
@openjdk
Copy link

openjdk bot commented Apr 4, 2022

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Apr 4, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 4, 2022

Webrevs

@TheRealMDoerr
Copy link
Contributor

This one needs rebasing because JDK-8218965 is integrated.

Reviewed-by: erikj, kbarrett, mdoerr, dholmes

Backport Conflicts:
- make/autoconf/toolchain.m4: Update header year.
- src/hotspot/share/gc/g1/ptrQueue.hpp: Remove procedure definition (cpp
does not contian impl).
- src/hotspot/share/gc/shared/oopStorage.hpp: Remove procedure
definition (cpp does not contain impl).
- src/hotspot/share/runtime/vm_version.cpp: Remove ~100 lines not
present in base version.
- src/hotspot/share/utilities/globalDefinitions_xlc.hpp: Add xlc version
check.
@backwaterred backwaterred force-pushed the backport-only-8224214 branch from 3e10d11 to 887b5e1 Compare April 5, 2022 14:06
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented Apr 5, 2022

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

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

8224214: [AIX] Remove support for legacy xlc compiler

Reviewed-by: mdoerr

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 (@TheRealMDoerr) 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 Apr 5, 2022
@backwaterred
Copy link
Contributor Author

After some discussion with others, I realized that this would make building with an older version of xlc and using the -with-harfbuzz=system workaround impossible. As a result, I'm closing this PR and removing it from the order proposed in #993. The other PRs should not affect support for older xlc versions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base ready Pull request is ready to be integrated rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

2 participants