[jdk8u-dev] RFR: 8257620: Do not use objc_msgSend_stret to get macOS version
Olga Mikhaltsova
omikhaltcova at openjdk.org
Thu Nov 3 11:32:09 UTC 2022
On Tue, 1 Nov 2022 20:44:38 GMT, Ben Taylor <btaylor at openjdk.org> wrote:
> This backports [JDK-8257620](https://bugs.openjdk.org/browse/JDK-8257620) for parity with Oracle JDK8 and OpenJDK 11+.
>
> The backport is not clean because [JDK-8269850](https://bugs.openjdk.org/browse/JDK-8269850) was applied first in 8u. If that change is backed out and reapplied after this backport, both are clean.
>
> Change applied with:
> - `git revert 43cfe27fa3a11dd6d4fffcb1c1336ac7fdd0233b` (backout JDK-8269850)
> - `git backport --from https://github.com/openjdk/jdk d4c7db5060978302382549246f9ad6831f19377d` (apply JDK-8257620)
> - `git backport --from https://github.com/openjdk/jdk 3b1b8fc646493eae5f4df828afe29abb75fa5e60` (re-apply JDK-826985)
> - `git rebase -i HEAD~3` (squash commits)
Patched file location difference:
JDK: `./src/java.base/macosx/native/libjava/java_props_macosx.c`
JDK8: `./jdk/src/solaris/native/java/lang/java_props_macosx.c`
It seems it's not possible to apply this patch avoiding manual merge in a way described, right?
-------------
PR: https://git.openjdk.org/jdk8u-dev/pull/153
More information about the jdk8u-dev
mailing list