[aarch64-port-dev ] RFR: Merge jdk:master

Anton Kozlov akozlov at openjdk.java.net
Mon Nov 16 20:31:41 UTC 2020


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 :)

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

Commit messages:
 - Import JDK-8234930 v3: Use MAP_JIT when allocating pages for code cache on macOS
 - Add missing include StubRoutines inline
 - Fix merge
 - Merge remote-tracking branch 'upstream/master' into macos-aarch64-public
 - 8256050: JVM crashes with -XX:+PrintDeoptimizationDetails
 - 8256054: C2: Floating-point min/max operations on vectors intermittently produce wrong results for NaN values
 - 8256048: Incomplete gitignore setting for netbeans project
 - 8255598: [PPC64] assert(Universe::heap()->is_in(result)) failed: object not in heap
 - 8255011: [TESTBUG] compiler/codecache/stress/UnexpectedDeoptimizationAllTest.java timed out
 - 8256038: G1: Improve comment about mark word handling of displaced mark words
 - ... and 504 more: https://git.openjdk.java.net/aarch64-port/compare/49948733...b41b3a94

The webrevs contain the adjustments done while merging with regards to each parent branch:
 - jdk-macos: https://webrevs.openjdk.java.net/?repo=aarch64-port&pr=6&range=00.0
 - jdk:master: https://webrevs.openjdk.java.net/?repo=aarch64-port&pr=6&range=00.1

Changes: https://git.openjdk.java.net/aarch64-port/pull/6/files
  Stats: 486664 lines in 2839 files changed: 410480 ins; 57516 del; 18668 mod
  Patch: https://git.openjdk.java.net/aarch64-port/pull/6.diff
  Fetch: git fetch https://git.openjdk.java.net/aarch64-port pull/6/head:pull/6

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


More information about the aarch64-port-dev mailing list