RFR: Merge jdk:master [v2]
J.Duke
duke at openjdk.java.net
Fri Jun 4 14:34:17 UTC 2021
> Hi all,
>
> this is an _automatically_ generated pull request to notify you that there is 1 commit from the branch `jdk:master`that can **not** be merged into the branch `master`:
>
> The following file contains merge conflicts:
>
> - src/java.base/macosx/native/libjli/java_md_macosx.m
>
> All Committers in this [project](https://openjdk.java.net/census#mobile) have access to my [personal fork](https://github.com/openjdk-bot/mobile) and can therefore help resolve these merge conflicts (you may want to coordinate who should do this).
> The following paragraphs will give an example on how to solve these merge conflicts and push the resulting merge commit to this pull request.
> The below commands should be run in a local clone of your [personal fork](https://wiki.openjdk.java.net/display/skara#Skara-Personalforks) of the [openjdk/mobile](https://github.com/openjdk/mobile) repository.
>
>
> # Ensure target branch is up to date
> $ git checkout master
> $ git pull https://github.com/openjdk/mobile.git master
>
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/mobile.git +8:openjdk-bot-8
> $ git checkout openjdk-bot-8
>
> # Merge the target branch
> $ git merge master
>
>
> When you have resolved the conflicts resulting from the `git merge` command above, run the following commands to create a merge commit:
>
>
> $ git add paths/to/files/with/conflicts
> $ git commit -m 'Merge jdk:master'
>
>
>
> When you have created the merge commit, run the following command to push the merge commit to this pull request:
>
>
> $ git push https://github.com/openjdk-bot/mobile.git openjdk-bot-8:8
>
>
> _Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly.
>
> Thanks,
> J. Duke
J. Duke has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains two commits:
- Merge jdk:master
- 8253795: Implementation of JEP 391: macOS/AArch64 Port
8253816: Support macOS W^X
8253817: Support macOS Aarch64 ABI in Interpreter
8253818: Support macOS Aarch64 ABI for compiled wrappers
8253819: Implement os/cpu for macOS/AArch64
8253839: Update tests and JDK code for macOS/Aarch64
8254941: Implement Serviceability Agent for macOS/AArch64
8255776: Change build system for macOS/AArch64
8262903: [macos_aarch64] Thread::current() called on detached thread
Co-authored-by: Vladimir Kempik <vkempik at openjdk.org>
Co-authored-by: Bernhard Urban-Forster <burban at openjdk.org>
Co-authored-by: Ludovic Henry <luhenry at openjdk.org>
Co-authored-by: Monica Beckwith <mbeckwit at openjdk.org>
Reviewed-by: erikj, ihse, prr, cjplummer, stefank, gziemski, aph, mbeckwit, luhenry
-------------
Changes: https://git.openjdk.java.net/mobile/pull/13/files
Webrev: https://webrevs.openjdk.java.net/?repo=mobile&pr=13&range=01
Stats: 2960 lines in 75 files changed: 2851 ins; 27 del; 82 mod
Patch: https://git.openjdk.java.net/mobile/pull/13.diff
Fetch: git fetch https://git.openjdk.java.net/mobile pull/13/head:pull/13
PR: https://git.openjdk.java.net/mobile/pull/13
More information about the mobile-dev
mailing list