[aarch64-port-dev ] Integrated: Merge

Anton Kozlov akozlov at openjdk.java.net
Tue Nov 17 15:06:37 UTC 2020


On Mon, 16 Nov 2020 20:27:05 GMT, Anton Kozlov <akozlov at openjdk.org> wrote:

> This PR is a part of #5 and it merges recent changes from openjdk/jdk master. Few fixes are made to make the merge buildable and functional
> 
> * d81cca31ab7, 0ab1e1ccb7d -- revert "Import JDK-8234930 v2: Use MAP_JIT when allocating pages for code cache on macOS" to make a complete commit after (b41b3a949e3)
> f7c60d7c098 Merge remote-tracking branch 'upstream/master' into macos-aarch64-public -- have no conflicts
> 051357ef977 Fix merge -- replicates changes in os_bsd_aarch64 and fixes build
> 33c47611da3 Add missing include StubRoutines inline -- a missing part of f888accb52c
> b41b3a949e3 Import JDK-8234930 v3: Use MAP_JIT when allocating pages for code cache on macOS -- a complete change to introduce MAP_JIT, may change in future
> 
> It's also tests merge-style PR (https://github.com/openjdk/aarch64-port/pull/5#issuecomment-726893549). Let's see how it will be processed by SKARA tooling. Vanilla Github merge ability made commit with my personal email 499487333abcb0700e8d1403df778ddb65cc9886, probably something we would not like to have :)

This pull request has now been integrated.

Changeset: b41b3a94
Author:    Anton Kozlov <akozlov at openjdk.org>
Committer: Anton Kozlov <akozlov at azul.com>
URL:       https://git.openjdk.java.net/aarch64-port/commit/b41b3a94
Stats:     71 lines in 19 files changed: 26 ins; 0 del; 45 mod

Import JDK-8234930 v3: Use MAP_JIT when allocating pages for code cache on macOS

-------------

PR: https://git.openjdk.java.net/aarch64-port/pull/6


More information about the aarch64-port-dev mailing list