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

8218965: aix: support xlclang++ in the compiler detection #995

Closed

Conversation

backwaterred
Copy link
Contributor

@backwaterred backwaterred commented Apr 4, 2022

#993

Backport of:
8218965: aix: support xlclang++ in the compiler detection

Reviewed-by: ihse, mdoerr

Backport Notes:

  • hb-atomic-private.hh was modified by the backported commit, but not present in the source. I discarded these changes.

Progress

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

Issue

  • JDK-8218965: aix: support xlclang++ in the compiler detection

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 995

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

Using diff file

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

Reviewed-by: ihse, mdoerr

Backport Conflicts:
- Removed: src/java.desktop/share/native/libfontmanager/harfbuzz/hb-atomic-private.hh (rm in current, updated in backport)
@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 d9463e629ed4375475c27c3d07c5e9bb36d6886a 8218965: aix: support xlclang++ in the compiler detection 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 rfr labels Apr 4, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 4, 2022

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

LGTM. Right, the code using __ibmxl__ was removed with the later upgrade to 2.8.0.

@openjdk
Copy link

openjdk bot commented Apr 4, 2022

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

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

8218965: aix:  support xlclang++ in the compiler detection

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

  • f42e3d2: 8253939: [TESTBUG] Increase coverage of the cgroups detection code
  • 11196c4: 8278794: Infinite loop in DeflaterOutputStream.finish()
  • 9ce8530: 8279219: [REDO] C2 crash when allocating array of size too large
  • 31cbb82: 8245543: Cgroups: Incorrect detection logic on some systems (still reproducible)
  • 7f8a11b: 8280867: Cpuid1Ecx feature parsing is incorrect for AMD CPUs
  • fee03ea: 8275337: C1: assert(false) failed: live_in set of first block must be empty
  • 132c6c4: 8277093: Vector should throw ClassNotFoundException for a missing class of an element
  • a852ad1: 8272358: Some tests may fail when executed with other locales than the US
  • b08aae1: 8272908: Missing coverage for certain classes in com.sun.org.apache.xml.internal.security
  • 708017c: 8272964: java/nio/file/Files/InterruptCopy.java fails with java.lang.RuntimeException: Copy was not interrupted
  • ... and 49 more: https://git.openjdk.java.net/jdk11u-dev/compare/f3b76aee072a78dc989757040987d5d2f6161402...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.

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 label Apr 4, 2022
@takiguc
Copy link

takiguc commented Apr 5, 2022

Hello @backwaterred .
I tried to apply the patches with contributed order, but patch commands were failed.
Could you show me how to apply them ?

@TheRealMDoerr
Copy link
Contributor

TheRealMDoerr commented Apr 5, 2022

Hello @backwaterred .
I tried to apply the patches with contributed order, but patch commands were failed.
Could you show me how to apply them ?

I suggest to apply https://github.com/openjdk/jdk11u-dev/pull/993.diff which should be equivalent to applying all the individual PRs. (They will need rebasing each time because they are not "dependent" PRs).

@TheRealMDoerr
Copy link
Contributor

TheRealMDoerr commented Apr 5, 2022

Btw. this one is approved and ready for integration if there are no objections.

@backwaterred
Copy link
Contributor Author

backwaterred commented Apr 5, 2022

Thanks Martin.

/integrate

@openjdk openjdk bot added the sponsor label Apr 5, 2022
@openjdk
Copy link

openjdk bot commented Apr 5, 2022

@backwaterred
Your change (at version 0b0a995) is now ready to be sponsored by a Committer.

@TheRealMDoerr
Copy link
Contributor

TheRealMDoerr commented Apr 5, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Apr 5, 2022

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

  • f42e3d2: 8253939: [TESTBUG] Increase coverage of the cgroups detection code
  • 11196c4: 8278794: Infinite loop in DeflaterOutputStream.finish()
  • 9ce8530: 8279219: [REDO] C2 crash when allocating array of size too large
  • 31cbb82: 8245543: Cgroups: Incorrect detection logic on some systems (still reproducible)
  • 7f8a11b: 8280867: Cpuid1Ecx feature parsing is incorrect for AMD CPUs
  • fee03ea: 8275337: C1: assert(false) failed: live_in set of first block must be empty
  • 132c6c4: 8277093: Vector should throw ClassNotFoundException for a missing class of an element
  • a852ad1: 8272358: Some tests may fail when executed with other locales than the US
  • b08aae1: 8272908: Missing coverage for certain classes in com.sun.org.apache.xml.internal.security
  • 708017c: 8272964: java/nio/file/Files/InterruptCopy.java fails with java.lang.RuntimeException: Copy was not interrupted
  • ... and 49 more: https://git.openjdk.java.net/jdk11u-dev/compare/f3b76aee072a78dc989757040987d5d2f6161402...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Apr 5, 2022
@openjdk openjdk bot closed this Apr 5, 2022
@openjdk openjdk bot removed ready rfr sponsor labels Apr 5, 2022
@openjdk
Copy link

openjdk bot commented Apr 5, 2022

@TheRealMDoerr @backwaterred Pushed as commit 061c083.

💡 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
backport integrated
3 participants