JBR-TODO: set max_memory limit to texture pool (1gb) to avoid excessive usage of unified memory + log device capabilities

Introduction of JBR API changed the order of modules appearing in Java
Doc. This commit updates the corresponding tests to match the current
output with JBR API.

.github/README.md

@@ -0,0 +1,214 @@
+[![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
+
+# Welcome to JetBrains Runtime!
+
+JetBrains Runtime is a fork of [OpenJDK](https://github.com/openjdk/jdk) available for Windows, Mac OS X, and Linux.
+It supports enhanced class redefinition ([DCEVM](https://ssw.jku.at/dcevm/)),
+features optional [JCEF](https://github.com/JetBrains/jcef), a framework for embedding Chromium-based browsers,
+includes a number of improvements in font rendering, keyboards support, 
+windowing/focus subsystems, HiDPI, accessibility, and performance, provides better desktop integration
+and bugfixes not yet present in OpenJDK.
+
+> **_NOTE_**: This is a **development** branch that is periodically synchronized with 
+> the [OpenJDK master](https://github.com/openjdk/jdk/tree/master) branch.
+> 
+ Release builds are based on these branches:
+ * [jbr11](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr11) (JDK 11)
+ * [jbr17](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr17) (JDK 17)
+ 
+Download the latest releases of JetBrains Runtime to use with JetBrains IDEs. The full list
+can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntime/releases).
+
+## Releases based on JDK 17
+
+| IDE Version | Latest JBR                                                                                             | Date Released |
+|-------------|--------------------------------------------------------------------------------------------------------|---------------|
+| 2023.3      | [17.0.9-b1087.7](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.9b1087.7) | 20-Nov-2023   |
+| 2023.2      | [17.0.9-b1000.46](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.9b1000.46) | 01-Nov-2023   |
+| 2023.1      | [17.0.7-b829.16](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.7b829.16) | 06-Jun-2023   |
+| 2022.3      | [17.0.6-b653.34](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.6b653.34) | 28-Feb-2023   |
+| 2022.2      | [17.0.6-b469.82](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.6b469.82) | 06-Mar-2023   |
+
+## Releases based on JDK 11
+
+| IDE Version | Latest JBR                                                                                            | Date Released |
+|-------------|-------------------------------------------------------------------------------------------------------|---------------|
+| 2022.1      | [11_0_16-b2043.64](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr11_0_16b2043.64)     | 10-Nov-2022   |
+| 2021.3      | [11_0_14_1-b1751.46](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr11_0_14_1b1751.46) | 21-Feb-2022   |
+| 2021.2      | [11_0_13-b1504.49](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jb11_0_13-b1504.49)     | 15-Nov-2021   |
+| 2021.1      | [11.0.11+9-b1341.60](https://github.com/JetBrains/JetBrainsRuntime/issues/171#issuecomment-1248891540)| 15-Jun-2021   |
+| 2020.3      | [11_0_10-b1145.115](https://github.com/JetBrains/JetBrainsRuntime/issues/171#issuecomment-1249243977) | 21-Jun-2021   |
+
+## Contents
+- [Welcome to JetBrains Runtime](#welcome-to-jetbrains-runtime)
+  - [Why Use JetBrains Runtime?](#why-use-jetbrains-runtime)
+  - [Products Built on JetBrains Runtime](#products-built-on-jetbrains-runtime)
+  - [Getting Sources](#getting-sources)
+    - [macOS, Linux](#macos-linux)
+    - [Windows](#sources-windows)
+  - [Configuring the Build Environment](#configuring-the-build-environment)
+    - [Linux (Docker)](#linux-docker)
+    - [Ubuntu Linux](#ubuntu-linux)
+    - [Windows](#build-windows)
+    - [macOS](#macos)
+  - [Developing](#developing)
+  - [Contributing](#contributing)
+  - [Resources](#resources)
+
+## Why Use JetBrains Runtime?
+* **Embedded browser**: JetBrains Runtime includes the Java Chromium Embedded Framework ([JCEF](https://github.com/JetBrains/jcef)), which
+  enables you to embed a Chromium-based browsers in your JVM-based application. 
+ To use it, [download a build with JCEF](https://github.com/JetBrains/JetBrainsRuntime/releases).
+* **Enhanced class re-definition** with the [DCEVM](https://ssw.jku.at/dcevm/) technology that makes it easier to reload
+  changed code without restarting JVM; this feature needs to be explicitly enabled with `-XX:+AllowEnhancedClassRedefinition`.
+* **Better FPS performance** for graphics-intensive applications.
+* **Improved font rendering**, **keyboard input** (such as shortcuts and multinational keyboards),
+  **HiDPI** and **accessibility** support.
+* **Robust desktop experience**: GUI-related fixes often reach JetBrains Runtime much earlier than the corresponding version of OpenJDK.
+
+## Products Built on JetBrains Runtime
+* [Android Studio](https://developer.android.com/studio). The official IDE for Google's Android operating system.
+* [CLion](https://www.jetbrains.com/clion/). A cross-platform IDE for C and C++ from JetBrains.
+* [DataGrip](https://www.jetbrains.com/datagrip/). The IDE for Databases and SQL from JetBrains.
+* [GoLand](https://www.jetbrains.com/go/). The cross-platform Go IDE from JetBrains.
+* [IntelliJ IDEA](https://www.jetbrains.com/idea/). The IDE for JVM from JetBrains.
+* [JProfiler](https://www.ej-technologies.com/products/jprofiler/overview.html). The Java profiler.
+* [PhpStorm](https://www.jetbrains.com/phpstorm/). The PHP IDE from JetBrains.
+* [PyCharm](https://www.jetbrains.com/pycharm/). The Python IDE from JetBrains.
+* [Rider](https://www.jetbrains.com/rider/). The cross-platform .NET IDE from JetBrains.
+* [RubyMine](https://www.jetbrains.com/ruby/). The Ruby and Rails IDE from JetBrains.
+* [Toolbox App](https://www.jetbrains.com/toolbox-app/). JetBrains IDE manager.
+* [WebStorm](https://www.jetbrains.com/webstorm/). The JavaScript IDE from JetBrains.
+* [YourKit](https://www.yourkit.com/). Java and .NET profilers.
+
+## Getting Sources
+### macOS, Linux
+```
+git config --global core.autocrlf input
+git clone git@github.com:JetBrains/JetBrainsRuntime.git
+```
+
+### Windows
+<a name="sources-windows"></a>
+```
+git config --global core.autocrlf false
+git clone git@github.com:JetBrains/JetBrainsRuntime.git
+```
+
+## Configuring the Build Environment
+Here are quick per-platform instructions for those who can't wait to get started. 
+Please refer to [OpenJDK build docs](https://openjdk.java.net/groups/build/doc/building.html) for in-depth
+coverage of all the details.
+
+> **_TIP:_**  To get a preliminary report of what's missing, run `./configure` and check its output. 
+> It would usually have meaningful advice on how to solve the problem.
+
+### Linux (Docker)
+Create a container:
+```
+$ cd jb/project/docker
+$ docker build .
+...
+Successfully built 942ea9900054
+```
+Run these commands in the new container:
+```
+$ docker run -v `pwd`../../../../:/JetBrainsRuntime -it 942ea9900054
+# cd /JetBrainsRuntime
+# sh ./configure
+# make images CONF=linux-x86_64-normal-server-release
+```
+
+### Ubuntu Linux
+Install the necessary tools, libraries, and headers with:
+```
+$ sudo apt-get install autoconf make build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev \
+       libxt-dev libxrandr-dev libcups2-dev libfontconfig1-dev libasound2-dev
+```
+Get Java 18 (for instance, [Azul Zulu Builds of OpenJDK 18](https://www.azul.com/downloads/?version=java-18-sts&os=linux&package=jdk)).
+
+Then run the following:
+```
+$ cd JetBrainsRuntime
+$ git checkout main
+$ sh ./configure
+$ make images
+```
+This will build the release configuration under `./build/linux-x86_64-server-release/`.
+
+### Windows
+<a name="build-windows"></a>
+Install the following:
+* [Cygwin x64](http://www.cygwin.com/).
+  Required packages: `autoconf`, `binutils`, `cpio`, `diffutils`, `file`, `gawk`, `gcc-core`, `make`, `m4`, `unzip`, `zip`.  
+  Install those together with Cygwin.
+* [Visual Studio compiler toolset](https://visualstudio.microsoft.com/downloads/).
+  Install with the desktop development kit, which includes Windows SDK and compilers.
+  Visual Studio 2019 is supported by default.
+* Java 18 (for instance, [Azul Zulu Builds of OpenJDK 18](https://www.azul.com/downloads/?version=java-18-sts&os=windows&package=jdk)).
+  If you have problems while configuring, read [Java tips on Cygwin](http://horstmann.com/articles/cygwin-tips.html).
+
+From the command line: 
+```
+"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+"c:\Program_Files\cygwin64\bin\mintty.exe" /bin/bash -l
+```
+The first command sets up environment variables, the second starts a Cygwin shell with the proper environment.  
+
+In the Cygwin shell: 
+```
+$ cd JetBrainsRuntime
+$ git checkout main
+$ bash configure --with-toolchain-version=2019
+$ make images
+```
+This will build the release configuration under `./build/windows-x86_64-server-release/`.
+
+### macOS
+Install the following:
+* Xcode command line developer tools and `autoconf` via [Homebrew](https://brew.sh/).
+* Java 18 (for instance, [Azul Zulu Builds of OpenJDK 18](https://www.azul.com/downloads/?version=java-18-sts&os=macos&package=jdk)).
+
+From the command line:
+```
+$ cd JetBrainsRuntime
+$ git checkout main
+$ sh ./configure
+$ make images
+```
+This will build the release configuration under `./build/macosx-x86_64-server-release/`.
+
+## Developing
+You can use  [CLion](https://www.jetbrains.com/clion/) to develop native parts of the JetBrains Runtime and
+[IntelliJ IDEA](https://www.jetbrains.com/idea/) for the parts written in Java.
+Both require projects to be created.
+
+### CLion
+Run
+```
+$ make compile-commands
+```
+in the git root and open the resulting `build/.../compile_commands.json` file as a project.
+Then use `Tools | Compilation Database | Change Project Root` to point to git root of this repository.
+
+See also this detailed step-by-step tutorial for all platforms:
+[How to develop OpenJDK with CLion](https://blog.jetbrains.com/clion/2020/03/openjdk-with-clion/).
+
+### IDEA
+Run
+```
+$ sh ./bin/idea.sh
+```
+in the git root to generate project files (add `--help` for options). If you have multiple
+configurations (for example, `release` and `fastdebug`), supply the `--conf <conf_name>` argument.
+Then open the git root directory as a project in IDEA.
+
+## Contributing
+We are happy to receive your pull requests! 
+Before you submit one, please sign our [Contributor License Agreement (CLA)](https://www.jetbrains.com/agreements/cla/).
+
+## Resources
+* [JetBrains Runtime on GitHub](https://github.com/JetBrains/JetBrainsRuntime).
+* [OpenJDK build instructions](https://openjdk.java.net/groups/build/doc/building.html).
+* [OpenJDK test instructions](https://htmlpreview.github.io/?https://raw.githubusercontent.com/openjdk/jdk/master/doc/building.html#running-tests).
+* [How to develop OpenJDK with CLion](https://blog.jetbrains.com/clion/2020/03/openjdk-with-clion/).

.github/actions/do-build/action.yml

@@ -66,7 +66,7 @@ runs:
       shell: bash
 
     - name: 'Upload build logs'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: failure-logs-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: failure-logs
@@ -74,7 +74,7 @@ runs:
 
       # This is the best way I found to abort the job with an error message
     - name: 'Notify about build failures'
-      uses: actions/github-script@v7
+      uses: actions/github-script@v6
       with:
         script: core.setFailed('Build failed. See summary for details.')
       if: steps.check.outputs.failure == 'true'

.github/actions/get-bootjdk/action.yml

@@ -65,7 +65,7 @@ runs:
 
     - name: 'Check cache for BootJDK'
       id: get-cached-bootjdk
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: bootjdk/jdk
         key: boot-jdk-${{ inputs.platform }}-${{ steps.sha256.outputs.value }}

.github/actions/get-bundles/action.yml

@@ -48,14 +48,14 @@ runs:
   steps:
     - name: 'Download bundles artifact'
       id: download-bundles
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: bundles
       continue-on-error: true
 
     - name: 'Download bundles artifact (retry)'
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: bundles

.github/actions/get-jtreg/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@ runs:
 
     - name: 'Check cache for JTReg'
       id: get-cached-jtreg
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         path: jtreg/installed
         key: jtreg-${{ steps.version.outputs.value }}
@@ -56,14 +56,8 @@ runs:
 
     - name: 'Build JTReg'
       run: |
-        # If runner architecture is x64 set JAVA_HOME_17_X64 otherwise set to JAVA_HOME_17_arm64
-        if [[ '${{ runner.arch }}' == 'X64' ]]; then
-          JDK="$JAVA_HOME_17_X64"
-        else
-          JDK="$JAVA_HOME_17_arm64"
-        fi
         # Build JTReg and move files to the proper locations
-        bash make/build.sh --jdk "$JDK"
+        bash make/build.sh --jdk "$JAVA_HOME_17_X64"
         mkdir ../installed
         mv build/images/jtreg/* ../installed
       working-directory: jtreg/src

.github/actions/get-msys2/action.yml

@@ -30,7 +30,8 @@ runs:
   using: composite
   steps:
     - name: 'Install MSYS2'
-      uses: msys2/setup-msys2@v2.22.0
+      # use a specific release of msys2/setup-msys2 to prevent jtreg build failures on newer release
+      uses: msys2/setup-msys2@7efe20baefed56359985e327d329042cde2434ff
       with:
         install: 'autoconf tar unzip zip make'
         path-type: minimal

.github/actions/upload-bundles/action.yml

@@ -69,7 +69,7 @@ runs:
       shell: bash
 
     - name: 'Upload bundles artifact'
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: bundles

.github/scripts/gen-test-summary.sh

@@ -42,7 +42,6 @@ error_count=$(echo $errors | wc -w || true)
 
 if [[ "$failures" = "" && "$errors" = "" ]]; then
   # We know something went wrong, but not what
-  echo 'failure=true' >> $GITHUB_OUTPUT
   echo 'error-message=Unspecified test suite failure. Please see log for job for details.' >> $GITHUB_OUTPUT
   exit 0
 fi

.github/workflows/build-cross-compile.yml

@@ -120,7 +120,7 @@ jobs:
 
       - name: 'Check cache for sysroot'
         id: get-cached-sysroot
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: sysroot
           key: sysroot-${{ matrix.debian-arch }}-${{ hashFiles('./.github/workflows/build-cross-compile.yml') }}

.github/workflows/build-macos.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -31,9 +31,6 @@ on:
       platform:
         required: true
         type: string
-      runs-on:
-        required: true
-        type: string
       extra-conf-options:
         required: false
         type: string
@@ -58,7 +55,7 @@ on:
 jobs:
   build-macos:
     name: build
-    runs-on: ${{ inputs.runs-on }}
+    runs-on: macos-13
 
     strategy:
       fail-fast: false
@@ -77,7 +74,7 @@ jobs:
         id: bootjdk
         uses: ./.github/actions/get-bootjdk
         with:
-          platform: ${{ inputs.platform }}
+          platform: macos-x64
 
       - name: 'Get JTReg'
         id: jtreg
@@ -90,7 +87,7 @@ jobs:
       - name: 'Install toolchain and dependencies'
         run: |
           # Run Homebrew installation and xcode-select
-          brew install autoconf make
+          brew install make
           sudo xcode-select --switch /Applications/Xcode_${{ inputs.xcode-toolset-version }}.app/Contents/Developer
           # This will make GNU make available as 'make' and not only as 'gmake'
           echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH

.github/workflows/main.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -31,6 +31,7 @@ on:
       - master
       - pr/*
       - jdk*
+      - main
   workflow_dispatch:
     inputs:
       platforms:
@@ -60,7 +61,8 @@ jobs:
     outputs:
       linux-x64: ${{ steps.include.outputs.linux-x64 }}
       linux-x86: ${{ steps.include.outputs.linux-x86 }}
-      linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }}
+      # additional build options for linux-x64 are disabled
+      # linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }}
       linux-cross-compile: ${{ steps.include.outputs.linux-cross-compile }}
       macos-x64: ${{ steps.include.outputs.macos-x64 }}
       macos-aarch64: ${{ steps.include.outputs.macos-aarch64 }}
@@ -228,7 +230,6 @@ jobs:
     uses: ./.github/workflows/build-macos.yml
     with:
       platform: macos-x64
-      runs-on: 'macos-13'
       xcode-toolset-version: '14.3.1'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -240,8 +241,8 @@ jobs:
     uses: ./.github/workflows/build-macos.yml
     with:
       platform: macos-aarch64
-      runs-on: 'macos-14'
       xcode-toolset-version: '14.3.1'
+      extra-conf-options: '--openjdk-target=aarch64-apple-darwin'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.select.outputs.macos-aarch64 == 'true'
@@ -322,16 +323,6 @@ jobs:
       bootjdk-platform: macos-x64
       runs-on: macos-13
 
-  test-macos-aarch64:
-    name: macos-aarch64
-    needs:
-      - build-macos-aarch64
-    uses: ./.github/workflows/test.yml
-    with:
-      platform: macos-aarch64
-      bootjdk-platform: macos-aarch64
-      runs-on: macos-14
-
   test-windows-x64:
     name: windows-x64
     needs:
@@ -368,7 +359,7 @@ jobs:
         # Hack to get hold of the api environment variables that are only defined for actions
       - name: 'Get API configuration'
         id: api
-        uses: actions/github-script@v7
+        uses: actions/github-script@v6
         with:
           script: 'return { url: process.env["ACTIONS_RUNTIME_URL"], token: process.env["ACTIONS_RUNTIME_TOKEN"] }'
 

.github/workflows/pr.yml

@@ -0,0 +1,270 @@
+#
+# Copyright 2000-2023 JetBrains s.r.o.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+name: 'Build OpenJDK on pull request'
+
+on:
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  ###
+  ### Determine platforms to include
+  ###
+  select:
+    name: 'Select platforms'
+    runs-on: ubuntu-22.04
+    outputs:
+      linux-x64: ${{ steps.include.outputs.linux-x64 }}
+      linux-x86: ${{ steps.include.outputs.linux-x86 }}
+      linux-cross-compile: ${{ steps.include.outputs.linux-cross-compile }}
+      macos-x64: ${{ steps.include.outputs.macos-x64 }}
+      macos-aarch64: ${{ steps.include.outputs.macos-aarch64 }}
+      windows-x64: ${{ steps.include.outputs.windows-x64 }}
+      windows-aarch64: ${{ steps.include.outputs.windows-aarch64 }}
+      windows-x86: ${{ steps.include.outputs.windows-x86 }}
+
+    steps:
+      # This function must be inlined in main.yml, or we'd be forced to checkout the repo
+      - name: 'Check what jobs to run'
+        id: include
+        run: |
+          # Determine which platform jobs to run
+
+          # Returns 'true' if the input platform list matches any of the platform monikers given as argument,
+          # 'false' otherwise.
+          # arg $1: platform name or names to look for
+          function check_platform() {
+            if [[ $GITHUB_EVENT_NAME == workflow_dispatch ]]; then
+              input='${{ github.event.inputs.platforms }}'
+            elif [[ $GITHUB_EVENT_NAME == push ]]; then
+              if [[ '${{ !secrets.JDK_SUBMIT_FILTER || startsWith(github.ref, 'refs/heads/submit/') }}' == 'false' ]]; then
+                # If JDK_SUBMIT_FILTER is set, and this is not a "submit/" branch, don't run anything
+                >&2 echo 'JDK_SUBMIT_FILTER is set and not a "submit/" branch'
+                echo 'false'
+                return
+              else
+                input='${{ secrets.JDK_SUBMIT_PLATFORMS }}'
+              fi
+            fi
+
+            normalized_input="$(echo ,$input, | tr -d ' ')"
+            if [[ "$normalized_input" == ",," ]]; then
+              # For an empty input, assume all platforms should run
+              echo 'true'
+              return
+            else
+              # Check for all acceptable platform names
+              for part in $* ; do
+                if echo "$normalized_input" | grep -q -e ",$part," ; then
+                  echo 'true'
+                  return
+                fi
+              done
+            fi
+
+            echo 'false'
+          }
+
+          echo "linux-x64=$(check_platform linux-x64 linux x64)" >> $GITHUB_OUTPUT
+          echo "linux-x86=$(check_platform linux-x86 linux x86)" >> $GITHUB_OUTPUT
+          echo "linux-x64-variants=$(check_platform linux-x64-variants variants)" >> $GITHUB_OUTPUT
+          echo "linux-cross-compile=$(check_platform linux-cross-compile cross-compile)" >> $GITHUB_OUTPUT
+          echo "macos-x64=$(check_platform macos-x64 macos x64)" >> $GITHUB_OUTPUT
+          echo "macos-aarch64=$(check_platform macos-aarch64 macos aarch64)" >> $GITHUB_OUTPUT
+          echo "windows-x64=$(check_platform windows-x64 windows x64)" >> $GITHUB_OUTPUT
+          echo "windows-x86=$(check_platform windows-x86 windows x86)" >> $GITHUB_OUTPUT
+          echo "windows-aarch64=$(check_platform windows-aarch64 windows aarch64)" >> $GITHUB_OUTPUT
+          echo "docs=$(check_platform docs)" >> $GITHUB_OUTPUT
+
+  ###
+  ### Build jobs
+  ###
+
+  build-linux-x64:
+    name: linux-x64
+    needs: select
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      platform: linux-x64
+      gcc-major-version: '10'
+      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
+      configure-arguments: ${{ github.event.inputs.configure-arguments }}
+      make-arguments: ${{ github.event.inputs.make-arguments }}
+    # The linux-x64 jdk bundle is used as buildjdk for the cross-compile job
+    if: needs.select.outputs.linux-x64 == 'true' || needs.select.outputs.linux-cross-compile == 'true'
+
+  build-linux-x86:
+    name: linux-x86
+    needs: select
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      platform: linux-x86
+      gcc-major-version: '10'
+      gcc-package-suffix: '-multilib'
+      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
+      apt-architecture: 'i386'
+      # Some multilib libraries do not have proper inter-dependencies, so we have to
+      # install their dependencies manually.
+      apt-extra-packages: 'libfreetype6-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386'
+      extra-conf-options: '--with-target-bits=32'
+      configure-arguments: ${{ github.event.inputs.configure-arguments }}
+      make-arguments: ${{ github.event.inputs.make-arguments }}
+    if: needs.select.outputs.linux-x86 == 'true'
+
+  build-linux-cross-compile:
+    name: linux-cross-compile
+    needs:
+      - select
+      - build-linux-x64
+    uses: ./.github/workflows/build-cross-compile.yml
+    with:
+      gcc-major-version: '10'
+      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
+      apt-gcc-cross-version: '10.4.0-4ubuntu1~22.04cross1'
+      configure-arguments: ${{ github.event.inputs.configure-arguments }}
+      make-arguments: ${{ github.event.inputs.make-arguments }}
+    if: needs.select.outputs.linux-cross-compile == 'true'
+
+  build-macos-x64:
+    name: macos-x64
+    needs: select
+    uses: ./.github/workflows/build-macos.yml
+    with:
+      platform: macos-x64
+      xcode-toolset-version: '12.5.1'
+      configure-arguments: ${{ github.event.inputs.configure-arguments }}
+      make-arguments: ${{ github.event.inputs.make-arguments }}
+    if: needs.select.outputs.macos-x64 == 'true'
+
+  build-macos-aarch64:
+    name: macos-aarch64
+    needs: select
+    uses: ./.github/workflows/build-macos.yml
+    with:
+      platform: macos-aarch64
+      xcode-toolset-version: '12.5.1'
+      extra-conf-options: '--openjdk-target=aarch64-apple-darwin'
+      configure-arguments: ${{ github.event.inputs.configure-arguments }}
+      make-arguments: ${{ github.event.inputs.make-arguments }}
+    if: needs.select.outputs.macos-aarch64 == 'true'
+
+  build-windows-x64:
+    name: windows-x64
+    needs: select
+    uses: ./.github/workflows/build-windows.yml
+    with:
+      platform: windows-x64
+      msvc-toolset-version: '14.29'
+      msvc-toolset-architecture: 'x86.x64'
+      configure-arguments: ${{ github.event.inputs.configure-arguments }}
+      make-arguments: ${{ github.event.inputs.make-arguments }}
+    if: needs.select.outputs.windows-x64 == 'true'
+
+  build-windows-x86:
+    name: windows-x86
+    needs: select
+    uses: ./.github/workflows/build-windows.yml
+    with:
+      platform: windows-x86
+      msvc-toolset-version: '14.29'
+      msvc-toolset-architecture: 'x86'
+      configure-arguments: ${{ github.event.inputs.configure-arguments }}
+      make-arguments: ${{ github.event.inputs.make-arguments }}
+    if: needs.select.outputs.windows-x86 == 'true'
+
+  build-windows-aarch64:
+    name: windows-aarch64
+    needs: select
+    uses: ./.github/workflows/build-windows.yml
+    with:
+      platform: windows-aarch64
+      msvc-toolset-version: '14.29'
+      msvc-toolset-architecture: 'arm64'
+      make-target: 'hotspot'
+      extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
+      configure-arguments: ${{ github.event.inputs.configure-arguments }}
+      make-arguments: ${{ github.event.inputs.make-arguments }}
+    if: needs.select.outputs.windows-aarch64 == 'true'
+
+  build-docs:
+    name: docs
+    needs: select
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      platform: linux-x64
+      debug-levels: '[ "debug" ]'
+      make-target: 'docs-jdk-bundles'
+      # Make sure we never try to make full docs, since that would require a
+      # build JDK, and we do not need the additional testing of the graphs.
+      extra-conf-options: '--disable-full-docs'
+      gcc-major-version: '10'
+      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
+      configure-arguments: ${{ github.event.inputs.configure-arguments }}
+      make-arguments: ${{ github.event.inputs.make-arguments }}
+    if: needs.select.outputs.docs == 'true'
+
+  # Remove bundles so they are not misconstrued as binary distributions from the JDK project
+  remove-bundles:
+    name: 'Remove bundle artifacts'
+    runs-on: ubuntu-22.04
+    if: always()
+    needs:
+      - build-linux-x64
+      - build-linux-x86
+      - build-linux-cross-compile
+      - build-macos-x64
+      - build-macos-aarch64
+      - build-windows-x64
+      - build-windows-aarch64
+      - build-windows-x86
+
+    steps:
+      # Hack to get hold of the api environment variables that are only defined for actions
+      - name: 'Get API configuration'
+        id: api
+        uses: actions/github-script@v6
+        with:
+          script: 'return { url: process.env["ACTIONS_RUNTIME_URL"], token: process.env["ACTIONS_RUNTIME_TOKEN"] }'
+
+      - name: 'Remove bundle artifacts'
+        run: |
+          # Find and remove all bundle artifacts
+          ALL_ARTIFACT_URLS="$(curl -s \
+              -H 'Accept: application/json;api-version=6.0-preview' \
+              -H 'Authorization: Bearer ${{ fromJson(steps.api.outputs.result).token }}' \
+              '${{ fromJson(steps.api.outputs.result).url }}_apis/pipelines/workflows/${{ github.run_id }}/artifacts?api-version=6.0-preview')"
+          BUNDLE_ARTIFACT_URLS="$(echo "$ALL_ARTIFACT_URLS" | jq -r -c '.value | map(select(.name|startswith("bundles-"))) | .[].url')"
+          for url in $BUNDLE_ARTIFACT_URLS; do
+            echo "Removing $url"
+            curl -s \
+                -H 'Accept: application/json;api-version=6.0-preview' \
+                -H 'Authorization: Bearer ${{ fromJson(steps.api.outputs.result).token }}' \
+                -X DELETE "$url" \
+            || echo "Failed to remove bundle"
+          done

.github/workflows/test.yml

@@ -63,7 +63,6 @@ jobs:
           - 'hs/tier1 compiler part 1'
           - 'hs/tier1 compiler part 2'
           - 'hs/tier1 compiler part 3'
-          - 'hs/tier1 compiler not-xcomp'
           - 'hs/tier1 gc'
           - 'hs/tier1 runtime'
           - 'hs/tier1 serviceability'
@@ -91,17 +90,13 @@ jobs:
             debug-suffix: -debug
 
           - test-name: 'hs/tier1 compiler part 2'
-            test-suite: 'test/hotspot/jtreg/:tier1_compiler_2'
+            test-suite: 'test/hotspot/jtreg/:tier1_compiler_2 test/hotspot/jtreg/:tier1_compiler_not_xcomp'
             debug-suffix: -debug
 
           - test-name: 'hs/tier1 compiler part 3'
             test-suite: 'test/hotspot/jtreg/:tier1_compiler_3'
             debug-suffix: -debug
 
-          - test-name: 'hs/tier1 compiler not-xcomp'
-            test-suite: 'test/hotspot/jtreg/:tier1_compiler_not_xcomp'
-            debug-suffix: -debug
-
           - test-name: 'hs/tier1 gc'
             test-suite: 'test/hotspot/jtreg/:tier1_gc'
             debug-suffix: -debug
@@ -211,7 +206,7 @@ jobs:
         if: always()
 
       - name: 'Upload test results'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           path: results
           name: ${{ steps.package.outputs.artifact-name }}
@@ -219,7 +214,7 @@ jobs:
 
         # This is the best way I found to abort the job with an error message
       - name: 'Notify about test failures'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v6
         with:
           script: core.setFailed('${{ steps.run-tests.outputs.error-message }}')
         if: steps.run-tests.outputs.failure == 'true'

.jcheck/conf

@@ -15,7 +15,7 @@ version=0
 domain=openjdk.org
 
 [checks "whitespace"]
-files=.*\.cpp|.*\.hpp|.*\.c|.*\.h|.*\.java|.*\.cc|.*\.hh|.*\.m|.*\.mm|.*\.md|.*\.properties|.*\.gmk|.*\.m4|.*\.ac|Makefile
+files=.*\.cpp|.*\.hpp|.*\.c|.*\.h|.*\.java|.*\.cc|.*\.hh|.*\.m|.*\.mm|.*\.md|.*\.gmk|.*\.m4|.*\.ac|Makefile
 ignore-tabs=.*\.gmk|Makefile
 
 [checks "merge"]

README.md

@@ -1,3 +1,5 @@
+[![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
+
 # Welcome to the JDK!
 
 For build instructions please see the

bin/idea.sh

@@ -25,7 +25,26 @@
 # Shell script for generating an IDEA project from a given list of modules
 
 usage() {
-      echo "usage: $0 [-h|--help] [-v|--verbose] [-o|--output <path>] [-c|--conf <conf_name>] [modules]+"
+      echo "Usage: $0 [-h|--help] [-q|--quiet] [-a|--absolute-paths] [-r|--root <path>] [-o|--output <path>] [-c|--conf <conf_name>] [modules...]"
+      echo "    -h | --help"
+      echo "    -q | --quiet
+        No stdout output"
+      echo "    -a | --absolute-paths
+        Use absolute paths to this jdk, so that generated .idea
+        project files can be moved independently of jdk sources"
+      echo "    -r | --root <path>
+        Project content root
+        Default: $TOPLEVEL_DIR"
+      echo "    -o | --output <path>
+        Where .idea directory with project files will be generated
+        (e.g. using '-o .' will place project files in './.idea')
+        Default: same as --root"
+      echo "    -c | --conf <conf_name>
+        make configuration (release, slowdebug etc)"
+      echo "    [modules...]
+        Generate project modules for specific java modules
+        (e.g. 'java.base java.desktop')
+        Default: all existing modules (java.* and jdk.*)"
       exit 1
 }
 
@@ -33,10 +52,13 @@ SCRIPT_DIR=`dirname $0`
 #assume TOP is the dir from which the script has been called
 TOP=`pwd`
 cd $SCRIPT_DIR; SCRIPT_DIR=`pwd`
+if [ "x$TOPLEVEL_DIR" = "x" ] ; then
+  cd .. ; TOPLEVEL_DIR=`pwd`
+fi
 cd $TOP;
 
-IDEA_OUTPUT=$TOP/.idea
-VERBOSE="false"
+VERBOSE=true
+ABSOLUTE_PATHS=false
 CONF_ARG=
 while [ $# -gt 0 ]
 do
@@ -45,14 +67,24 @@ do
       usage
       ;;
 
-    -v | --vebose )
-      VERBOSE="true"
+    -q | --quiet )
+      VERBOSE=false
+      ;;
+
+    -a | --absolute-paths )
+      ABSOLUTE_PATHS=true
+      ;;
+
+    -r | --root )
+      TOPLEVEL_DIR="$2"
+      shift
       ;;
 
     -o | --output )
-      IDEA_OUTPUT=$2/.idea
+      IDEA_OUTPUT="$2/.idea"
       shift
       ;;
+
     -c | --conf )
       CONF_ARG="CONF_NAME=$2"
       shift
@@ -69,20 +101,17 @@ do
   shift
 done
 
-if [ -e $IDEA_OUTPUT ] ; then
-    rm -r $IDEA_OUTPUT
+if [ "x$IDEA_OUTPUT" = "x" ] ; then
+  IDEA_OUTPUT="$TOPLEVEL_DIR/.idea"
 fi
+
 mkdir -p $IDEA_OUTPUT || exit 1
-cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
+cd "$TOP" ; cd $TOPLEVEL_DIR; TOPLEVEL_DIR=`pwd`
+cd "$TOP" ; cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
+cd ..; IDEA_OUTPUT_PARENT=`pwd`
+cd "$SCRIPT_DIR/.." ; OPENJDK_DIR=`pwd`
 
-if [ "x$TOPLEVEL_DIR" = "x" ] ; then
-    cd $SCRIPT_DIR/..
-    TOPLEVEL_DIR=`pwd`
-    cd $IDEA_OUTPUT
-fi
-
-MAKE_DIR="$SCRIPT_DIR/../make"
-IDEA_MAKE="$MAKE_DIR/ide/idea/jdk"
+IDEA_MAKE="$OPENJDK_DIR/make/ide/idea/jdk"
 IDEA_TEMPLATE="$IDEA_MAKE/template"
 
 cp -r "$IDEA_TEMPLATE"/* "$IDEA_OUTPUT"
@@ -94,31 +123,31 @@ if [ -d "$TEMPLATES_OVERRIDE" ] ; then
     done
 fi
 
-if [ "$VERBOSE" = "true" ] ; then
-  echo "output dir: $IDEA_OUTPUT"
-  echo "idea template dir: $IDEA_TEMPLATE"
+if [ "$VERBOSE" = true ] ; then
+  echo "Will generate IDEA project files in \"$IDEA_OUTPUT\" for project \"$TOPLEVEL_DIR\""
 fi
 
-cd $TOP ; make -f "$IDEA_MAKE/idea.gmk" -I $MAKE_DIR/.. idea MAKEOVERRIDES= OUT=$IDEA_OUTPUT/env.cfg MODULES="$*" $CONF_ARG || exit 1
+cd $TOP ; make -f "$IDEA_MAKE/idea.gmk" -I "$OPENJDK_DIR" idea TOPLEVEL_DIR="$TOPLEVEL_DIR" \
+    MAKEOVERRIDES= IDEA_OUTPUT_PARENT="$IDEA_OUTPUT_PARENT" OUT="$IDEA_OUTPUT/env.cfg" MODULES="$*" $CONF_ARG || exit 1
 cd $SCRIPT_DIR
 
 . $IDEA_OUTPUT/env.cfg
 
-# Expect MODULE_ROOTS, MODULE_NAMES, BOOT_JDK & SPEC to be set
-if [ "x$MODULE_ROOTS" = "x" ] ; then
-  echo "FATAL: MODULE_ROOTS is empty" >&2; exit 1
+# Expect MODULES, MODULE_NAMES, RELATIVE_PROJECT_DIR, RELATIVE_BUILD_DIR to be set
+if [ "xMODULES" = "x" ] ; then
+  echo "FATAL: MODULES is empty" >&2; exit 1
 fi
 
 if [ "x$MODULE_NAMES" = "x" ] ; then
   echo "FATAL: MODULE_NAMES is empty" >&2; exit 1
 fi
 
-if [ "x$BOOT_JDK" = "x" ] ; then
-  echo "FATAL: BOOT_JDK is empty" >&2; exit 1
+if [ "x$RELATIVE_PROJECT_DIR" = "x" ] ; then
+  echo "FATAL: RELATIVE_PROJECT_DIR is empty" >&2; exit 1
 fi
 
-if [ "x$SPEC" = "x" ] ; then
-  echo "FATAL: SPEC is empty" >&2; exit 1
+if [ "x$RELATIVE_BUILD_DIR" = "x" ] ; then
+  echo "FATAL: RELATIVE_BUILD_DIR is empty" >&2; exit 1
 fi
 
 if [ -d "$TOPLEVEL_DIR/.hg" ] ; then
@@ -129,6 +158,43 @@ if [ -d "$TOPLEVEL_DIR/.git" ] ; then
     VCS_TYPE="Git"
 fi
 
+if [ "$ABSOLUTE_PATHS" = true ] ; then
+  if [ "x$PATHTOOL" != "x" ]; then
+    PROJECT_DIR="`$PATHTOOL -am $OPENJDK_DIR`"
+    TOPLEVEL_PROJECT_DIR="`$PATHTOOL -am $TOPLEVEL_DIR`"
+  else
+    PROJECT_DIR="$OPENJDK_DIR"
+    TOPLEVEL_PROJECT_DIR="$TOPLEVEL_DIR"
+  fi
+  MODULE_DIR="$PROJECT_DIR"
+  TOPLEVEL_MODULE_DIR="$TOPLEVEL_PROJECT_DIR"
+  cd "$IDEA_OUTPUT_PARENT" && cd "$RELATIVE_BUILD_DIR" && BUILD_DIR="`pwd`"
+  CLION_SCRIPT_TOPDIR="$OPENJDK_DIR"
+  CLION_PROJECT_DIR="$PROJECT_DIR"
+else
+  if [ "$RELATIVE_PROJECT_DIR" = "." ] ; then
+    PROJECT_DIR=""
+  else
+    PROJECT_DIR="/$RELATIVE_PROJECT_DIR"
+  fi
+  if [ "$RELATIVE_TOPLEVEL_PROJECT_DIR" = "." ] ; then
+    TOPLEVEL_PROJECT_DIR=""
+  else
+    TOPLEVEL_PROJECT_DIR="/$RELATIVE_TOPLEVEL_PROJECT_DIR"
+  fi
+  MODULE_DIR="\$MODULE_DIR\$$PROJECT_DIR"
+  PROJECT_DIR="\$PROJECT_DIR\$$PROJECT_DIR"
+  TOPLEVEL_MODULE_DIR="\$MODULE_DIR\$$TOPLEVEL_PROJECT_DIR"
+  TOPLEVEL_PROJECT_DIR="\$PROJECT_DIR\$$TOPLEVEL_PROJECT_DIR"
+  BUILD_DIR="\$PROJECT_DIR\$/$RELATIVE_BUILD_DIR"
+  CLION_SCRIPT_TOPDIR="$CLION_RELATIVE_PROJECT_DIR"
+  CLION_PROJECT_DIR="\$PROJECT_DIR\$/$CLION_SCRIPT_TOPDIR"
+fi
+if [ "$VERBOSE" = true ] ; then
+  echo "Project root: $PROJECT_DIR"
+  echo "Generating IDEA project files..."
+fi
+
 ### Replace template variables
 
 NUM_REPLACEMENTS=0
@@ -152,116 +218,106 @@ add_replacement() {
     eval TO$NUM_REPLACEMENTS='$2'
 }
 
+add_replacement "###PATHTOOL###" "$PATHTOOL"
+add_replacement "###CLION_SCRIPT_TOPDIR###" "$CLION_SCRIPT_TOPDIR"
+add_replacement "###CLION_PROJECT_DIR###" "$CLION_PROJECT_DIR"
+add_replacement "###PROJECT_DIR###" "$PROJECT_DIR"
+add_replacement "###MODULE_DIR###" "$MODULE_DIR"
+add_replacement "###TOPLEVEL_PROJECT_DIR###" "$TOPLEVEL_PROJECT_DIR"
+add_replacement "###TOPLEVEL_MODULE_DIR###" "$TOPLEVEL_MODULE_DIR"
 add_replacement "###MODULE_NAMES###" "$MODULE_NAMES"
 add_replacement "###VCS_TYPE###" "$VCS_TYPE"
-SPEC_DIR=`dirname $SPEC`
-if [ "x$CYGPATH" != "x" ]; then
-    add_replacement "###BUILD_DIR###" "`$CYGPATH -am $SPEC_DIR`"
-    add_replacement "###IMAGES_DIR###" "`$CYGPATH -am $SPEC_DIR`/images/jdk"
-    add_replacement "###ROOT_DIR###" "`$CYGPATH -am $TOPLEVEL_DIR`"
-    add_replacement "###IDEA_DIR###" "`$CYGPATH -am $IDEA_OUTPUT`"
+add_replacement "###BUILD_DIR###" "$BUILD_DIR"
+add_replacement "###RELATIVE_BUILD_DIR###" "$RELATIVE_BUILD_DIR"
+if [ "x$PATHTOOL" != "x" ]; then
+  add_replacement "###BASH_RUNNER_PREFIX###" "\$PROJECT_DIR\$/.idea/bash.bat"
+else
+  add_replacement "###BASH_RUNNER_PREFIX###" ""
+fi
+if [ "x$PATHTOOL" != "x" ]; then
     if [ "x$JT_HOME" = "x" ]; then
       add_replacement "###JTREG_HOME###" ""
     else
-      add_replacement "###JTREG_HOME###" "`$CYGPATH -am $JT_HOME`"
-    fi
-elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
-    add_replacement "###BUILD_DIR###" "`wslpath -am $SPEC_DIR`"
-    add_replacement "###IMAGES_DIR###" "`wslpath -am $SPEC_DIR`/images/jdk"
-    add_replacement "###ROOT_DIR###" "`wslpath -am $TOPLEVEL_DIR`"
-    add_replacement "###IDEA_DIR###" "`wslpath -am $IDEA_OUTPUT`"
-    if [ "x$JT_HOME" = "x" ]; then
-      add_replacement "###JTREG_HOME###" ""
-    else
-      add_replacement "###JTREG_HOME###" "`wslpath -am $JT_HOME`"
+      add_replacement "###JTREG_HOME###" "`$PATHTOOL -am $JT_HOME`"
     fi
 else
-    add_replacement "###BUILD_DIR###" "$SPEC_DIR"
     add_replacement "###JTREG_HOME###" "$JT_HOME"
-    add_replacement "###IMAGES_DIR###" "$SPEC_DIR/images/jdk"
-    add_replacement "###ROOT_DIR###" "$TOPLEVEL_DIR"
-    add_replacement "###IDEA_DIR###" "$IDEA_OUTPUT"
 fi
 
-SOURCE_PREFIX="<sourceFolder url=\"file://"
-SOURCE_POSTFIX="\" isTestSource=\"false\" />"
-
-for root in $MODULE_ROOTS; do
-    if [ "x$CYGPATH" != "x" ]; then
-      root=`$CYGPATH -am $root`
-    elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
-      root=`wslpath -am $root`
-    fi
-
-    SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
+MODULE_IMLS=""
+TEST_MODULE_DEPENDENCIES=""
+for module in $MODULE_NAMES; do
+    MODULE_IMLS="$MODULE_IMLS<module fileurl=\"file://\$PROJECT_DIR$/.idea/$module.iml\" filepath=\"\$PROJECT_DIR$/.idea/$module.iml\" /> "
+    TEST_MODULE_DEPENDENCIES="$TEST_MODULE_DEPENDENCIES<orderEntry type=\"module\" module-name=\"$module\" scope=\"TEST\" /> "
 done
-
-add_replacement "###SOURCE_ROOTS###" "$SOURCES"
+add_replacement "###MODULE_IMLS###" "$MODULE_IMLS"
+add_replacement "###TEST_MODULE_DEPENDENCIES###" "$TEST_MODULE_DEPENDENCIES"
 
 replace_template_dir "$IDEA_OUTPUT"
 
-### Compile the custom Logger
+### Generate module project files
 
-CLASSES=$IDEA_OUTPUT/classes
+if [ "$VERBOSE" = true ] ; then
+    echo "Generating project modules:"
+  fi
+(
+DEFAULT_IFS="$IFS"
+IFS='#'
+for value in $MODULES; do
+  (
+  eval "$value"
+  if [ "$VERBOSE" = true ] ; then
+    echo "    $module"
+  fi
+  MAIN_SOURCE_DIRS=""
+  CONTENT_ROOTS=""
+  IFS=' '
+  for dir in $moduleSrcDirs; do
+    case $dir in
+      "src/"*) MAIN_SOURCE_DIRS="$MAIN_SOURCE_DIRS <sourceFolder url=\"file://$MODULE_DIR/$dir\" isTestSource=\"false\" />" ;;
+      *"/support/gensrc/$module") ;; # Exclude generated sources to avoid module-info conflicts, see https://youtrack.jetbrains.com/issue/IDEA-185108
+      *) CONTENT_ROOTS="$CONTENT_ROOTS <content url=\"file://$MODULE_DIR/$dir\">\
+      <sourceFolder url=\"file://$MODULE_DIR/$dir\" isTestSource=\"false\" generated=\"true\" /></content>" ;;
+    esac
+  done
+  if [ "x$MAIN_SOURCE_DIRS" != "x" ] ; then
+    CONTENT_ROOTS="<content url=\"file://$MODULE_DIR/src/$module\">$MAIN_SOURCE_DIRS</content>$CONTENT_ROOTS"
+  fi
+  add_replacement "###MODULE_CONTENT_ROOTS###" "$CONTENT_ROOTS"
+  DEPENDENCIES=""
+  for dep in $moduleDependencies; do
+    case $MODULE_NAMES in # Exclude skipped modules from dependencies
+      *"$dep"*) DEPENDENCIES="$DEPENDENCIES<orderEntry type=\"module\" module-name=\"$dep\" /> "
+    esac
+  done
+  add_replacement "###DEPENDENCIES###" "$DEPENDENCIES"
+  cp "$IDEA_OUTPUT/module.iml" "$IDEA_OUTPUT/$module.iml"
+  IFS="$DEFAULT_IFS"
+  replace_template_file "$IDEA_OUTPUT/$module.iml"
+  )
+done
+)
+rm "$IDEA_OUTPUT/module.iml"
 
-if [ "x$ANT_HOME" = "x" ] ; then
-  # try some common locations
-  if [ -f "/usr/share/ant/lib/ant.jar" ] ; then
-    ANT_HOME="/usr/share/ant"
+### Create shell script runner for Windows
+
+if [ "x$PATHTOOL" != "x" ]; then
+  echo "@echo off" > "$IDEA_OUTPUT/bash.bat"
+  if [ "x$WSL_DISTRO_NAME" != "x" ] ; then
+    echo "wsl -d $WSL_DISTRO_NAME --cd \"%cd%\" -e %*" >> "$IDEA_OUTPUT/bash.bat"
   else
-    try_ant=$(ls /opt/homebrew/Cellar/ant/*/libexec/lib/ant.jar 2> /dev/null | sort -r | head -n 1)
-    if [ "x$try_ant" != "x" ] ; then
-      ANT_HOME=$(cd $(dirname $try_ant)/.. && pwd)
-    else
-      try_ant=$(ls /usr/local/Cellar/ant/*/libexec/lib/ant.jar 2> /dev/null | sort -r | head -n 1)
-      if [ "x$try_ant" != "x" ] ; then
-        ANT_HOME=$(cd $(dirname $try_ant)/.. && pwd)
-      fi
-    fi
-  fi
-else
-  if [ ! -f "$ANT_HOME/lib/ant.jar" ] ; then
-     echo "FATAL: ANT_HOME is incorrect. Try removing it and use autodetection, or fix the value" >&2; exit 1
+    echo "$WINENV_ROOT\bin\bash.exe -l -c \"cd %CD:\=/%/ && %*\"" >> "$IDEA_OUTPUT/bash.bat"
   fi
 fi
 
-if [ "x$ANT_HOME" = "x" ] ; then
-   echo "FATAL: cannot find ant. Try setting ANT_HOME." >&2; exit 1
-fi
-CP=$ANT_HOME/lib/ant.jar
-rm -rf $CLASSES; mkdir $CLASSES
 
-# If we have a Windows boot JDK, we need a .exe suffix
-if [ -e "$BOOT_JDK/bin/java.exe" ] ; then
-  JAVAC=javac.exe
-else
-  JAVAC=javac
-fi
 
-# If we are on WSL, the boot JDK might be either Windows or Linux,
-# and we need to use realpath instead of CYGPATH to make javac work on both.
-# We need to handle this case first since CYGPATH might be set on WSL.
-if [ "x$WSL_DISTRO_NAME" != "x" ]; then
-  JAVAC_SOURCE_FILE=`realpath --relative-to=./ $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
-  JAVAC_SOURCE_PATH=`realpath --relative-to=./ $IDEA_OUTPUT/src`
-  JAVAC_CLASSES=`realpath --relative-to=./ $CLASSES`
-  ANT_TEMP=`mktemp -d -p ./`
-  cp $ANT_HOME/lib/ant.jar $ANT_TEMP/ant.jar
-  JAVAC_CP=$ANT_TEMP/ant.jar
-elif [ "x$CYGPATH" != "x" ] ; then ## CYGPATH may be set in env.cfg
-  JAVAC_SOURCE_FILE=`$CYGPATH -am $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
-  JAVAC_SOURCE_PATH=`$CYGPATH -am $IDEA_OUTPUT/src`
-  JAVAC_CLASSES=`$CYGPATH -am $CLASSES`
-  JAVAC_CP=`$CYGPATH -am $CP`
-else
-  JAVAC_SOURCE_FILE=$IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java
-  JAVAC_SOURCE_PATH=$IDEA_OUTPUT/src
-  JAVAC_CLASSES=$CLASSES
-  JAVAC_CP=$CP
-fi
-
-$BOOT_JDK/bin/$JAVAC -d $JAVAC_CLASSES -sourcepath $JAVAC_SOURCE_PATH -cp $JAVAC_CP $JAVAC_SOURCE_FILE
-
-if [ "x$WSL_DISTRO_NAME" != "x" ]; then
-  rm -rf $ANT_TEMP
-fi
+if [ "$VERBOSE" = true ] ; then
+  IDEA_PROJECT_DIR="`dirname $IDEA_OUTPUT`"
+  if [ "x$PATHTOOL" != "x" ]; then
+    IDEA_PROJECT_DIR="`$PATHTOOL -am $IDEA_PROJECT_DIR`"
+  fi
+  echo "
+Now you can open \"$IDEA_PROJECT_DIR\" as IDEA project
+You can also run 'bash \"$IDEA_OUTPUT/jdk-clion/update-project.sh\"' to generate Clion project"
+fi

doc/building.html

@@ -92,8 +92,6 @@ id="toc-build-tools-requirements">Build Tools Requirements</a>
 <li><a href="#autoconf" id="toc-autoconf">Autoconf</a></li>
 <li><a href="#gnu-make" id="toc-gnu-make">GNU Make</a></li>
 <li><a href="#gnu-bash" id="toc-gnu-bash">GNU Bash</a></li>
-<li><a href="#graphviz-and-pandoc" id="toc-graphviz-and-pandoc">Graphviz
-and Pandoc</a></li>
 </ul></li>
 <li><a href="#running-configure" id="toc-running-configure">Running
 Configure</a>
@@ -526,7 +524,7 @@ header files as provided by your distribution.</p>
 <p>The basic tooling is provided as part of the core operating system,
 but you will most likely need to install developer packages.</p>
 <p>For apt-based distributions (Debian, Ubuntu, etc), try this:</p>
-<pre><code>sudo apt-get install build-essential autoconf</code></pre>
+<pre><code>sudo apt-get install build-essential</code></pre>
 <p>For rpm-based distributions (Fedora, Red Hat, etc), try this:</p>
 <pre><code>sudo yum groupinstall &quot;Development Tools&quot;</code></pre>
 <p>For Alpine Linux, aside from basic tooling, install the GNU versions
@@ -864,13 +862,6 @@ e.g. <code>configure MAKE=/opt/gnu/make</code>.</p>
 href="https://www.gnu.org/software/bash">GNU Bash</a>. No other shells
 are supported.</p>
 <p>At least version 3.2 of GNU Bash must be used.</p>
-<h3 id="graphviz-and-pandoc">Graphviz and Pandoc</h3>
-<p>In order to build the full docs (see the
-<code>--enable-full-docs</code> configure option) <a
-href="https://www.graphviz.org">Graphviz</a> and <a
-href="https://pandoc.org">Pandoc</a> are required. Any recent versions
-should work. For reference, and subject to change, Oracle builds use
-Graphviz 9.0.0 and Pandoc 2.19.2.</p>
 <h2 id="running-configure">Running Configure</h2>
 <p>To build the JDK, you need a "configuration", which consists of a
 directory where to store the build output, coupled with information
@@ -2166,26 +2157,15 @@ you can create a directory under <code>build</code> and run
 <code>configure</code> from there, e.g.
 <code>mkdir build/&lt;name&gt; &amp;&amp; cd build/&lt;name&gt; &amp;&amp; bash ../../configure</code>.</p>
 <p>Then you can build that configuration using
-<code>make CONF=&lt;selector&gt;</code>, where
-<code>&lt;selector&gt;</code> is interpreted as follows:</p>
-<ul>
-<li>If <code>&lt;selector&gt;</code> exacly matches the name of a
-configuration, this and only this configuration will be selected.</li>
-<li>If <code>&lt;selector&gt;</code> matches (i.e. is a substring of)
-the names of several configurations, then all these configurations will
-be selected.</li>
-<li>If <code>&lt;selector&gt;</code> is empty (i.e. <code>CONF=</code>),
-then all configurations will be selected.</li>
-<li>If <code>&lt;selector&gt;</code> begins with <code>!</code>, then
-all configurations <strong>not</strong> matching the string following
-<code>!</code> will be selected.</li>
-</ul>
-<p>A more specialized version, <code>CONF_NAME=&lt;name&gt;</code> also
-exists, which will only match if the given <code>&lt;name&gt;</code>
-exactly matches a single configuration.</p>
-<p>Alternatively, you can execute <code>make</code> in the configuration
-directory, e.g. <code>cd build/&lt;name&gt; &amp;&amp; make</code>.</p>
-<p><code>make CONF_NAME=&lt;name&gt;</code> or</p>
+<code>make CONF_NAME=&lt;name&gt;</code> or
+<code>make CONF=&lt;pattern&gt;</code>, where
+<code>&lt;pattern&gt;</code> is a substring matching one or several
+configurations, e.g. <code>CONF=debug</code>. The special empty pattern
+(<code>CONF=</code>) will match <em>all</em> available configuration, so
+<code>make CONF= hotspot</code> will build the <code>hotspot</code>
+target for all configurations. Alternatively, you can execute
+<code>make</code> in the configuration directory, e.g.
+<code>cd build/&lt;name&gt; &amp;&amp; make</code>.</p>
 <h3 id="handling-reconfigurations">Handling Reconfigurations</h3>
 <p>If you update the repository and part of the configure script has
 changed, the build system will force you to re-run

doc/building.md

@@ -349,7 +349,7 @@ will most likely need to install developer packages.
 For apt-based distributions (Debian, Ubuntu, etc), try this:
 
 ```
-sudo apt-get install build-essential autoconf
+sudo apt-get install build-essential
 ```
 
 For rpm-based distributions (Fedora, Red Hat, etc), try this:
@@ -685,14 +685,6 @@ shells are supported.
 
 At least version 3.2 of GNU Bash must be used.
 
-### Graphviz and Pandoc
-
-In order to build the full docs (see the `--enable-full-docs`
-configure option) [Graphviz](https://www.graphviz.org) and
-[Pandoc](https://pandoc.org) are required. Any recent versions should
-work. For reference, and subject to change, Oracle builds use Graphviz
-9.0.0 and Pandoc 2.19.2.
-
 ## Running Configure
 
 To build the JDK, you need a "configuration", which consists of a directory
@@ -1952,25 +1944,12 @@ configuration with the name `<name>`. Alternatively, you can create a directory
 under `build` and run `configure` from there, e.g. `mkdir build/<name> && cd
 build/<name> && bash ../../configure`.
 
-Then you can build that configuration using `make CONF=<selector>`, where
-`<selector>` is interpreted as follows:
-
-* If `<selector>` exacly matches the name of a configuration, this and only
-  this configuration will be selected.
-* If `<selector>` matches (i.e. is a substring of) the names of several
-  configurations, then all these configurations will be selected.
-* If `<selector>` is empty (i.e. `CONF=`), then all configurations will be
-  selected.
-* If `<selector>` begins with `!`, then all configurations **not** matching the
-  string following `!` will be selected.
-
-A more specialized version, `CONF_NAME=<name>` also exists, which will only
-match if the given `<name>` exactly matches a single configuration.
-
-Alternatively, you can execute `make` in the configuration directory, e.g. `cd
-build/<name> && make`.
-
-`make CONF_NAME=<name>` or
+Then you can build that configuration using `make CONF_NAME=<name>` or `make
+CONF=<pattern>`, where `<pattern>` is a substring matching one or several
+configurations, e.g. `CONF=debug`. The special empty pattern (`CONF=`) will
+match *all* available configuration, so `make CONF= hotspot` will build the
+`hotspot` target for all configurations. Alternatively, you can execute `make`
+in the configuration directory, e.g. `cd build/<name> && make`.
 
 ### Handling Reconfigurations
 

jb/branchdiff.py

@@ -0,0 +1,274 @@
+#!/usr/bin/env python3
+
+import argparse
+import os.path
+import sys
+import subprocess
+
+errors_count = 0
+
+
+def fatal(msg):
+    sys.stderr.write(f"[fatal] {msg}\n")
+    sys.exit(1)
+
+
+def error(msg):
+    global errors_count
+    errors_count += 1
+    sys.stderr.write(f"[error] {msg}\n")
+
+
+def verbose(options, *msg):
+    if options.verbose:
+        sys.stderr.write(f"[verbose] ")
+        sys.stderr.write(*msg)
+        sys.stderr.write('\n')
+
+
+def first_line(str):
+    return "" if not str else str.splitlines()[0]
+
+
+class Options:
+    def __init__(self):
+        ap = argparse.ArgumentParser(description="Show commit differences between branches of JBR git repos",
+                                     epilog="Example: %(prog)s  --from origin/jbr17 --to jbr17.b469 --path "
+                                            "src/hotspot --limit 200")
+        ap.add_argument('--jbr', dest='jbrpath', help='path to JBR git root', required=True)
+        ap.add_argument('--from', dest='frombranch', help='branch to take commits from', required=True)
+        ap.add_argument('--to', dest='tobranch', help='branch to apply new commits to', required=True)
+        ap.add_argument('--path', dest='path', help='limit to changes in this path (relative to git root)')
+        ap.add_argument('--limit', dest='limit', help='limit to this many log entries in --jdk repo', type=int,
+                        default=-1)
+        ap.add_argument('--html', dest="ishtml", help="print out HTML rather than plain text", action='store_true')
+        ap.add_argument('-o', dest="output", help="print the list of missing commits to this file"
+                                                  " to be used as exclude list later")
+        ap.add_argument('--exclude', dest='exclude', help='exclude commits listed in the given file '
+                                                          '(can use edited -o output file as input here)')
+        ap.add_argument('-v', dest='verbose', help="verbose output", default=False, action='store_true')
+        args = ap.parse_args()
+
+        if not os.path.isdir(args.jbrpath):
+            fatal(f"{args.jbrpath} not a directory")
+
+        if not git_is_available():
+            fatal("can't run git commands; make sure git is in PATH")
+
+        self.frombranch = args.frombranch
+        self.tobranch = args.tobranch
+        self.jbrpath = args.jbrpath
+        self.path = args.path
+        self.limit = args.limit
+        self.exclude = args.exclude
+        self.output = args.output
+        self.ishtml = args.ishtml
+        self.verbose = args.verbose
+
+
+class GitRepo:
+    def __init__(self, rootpath):
+        self.rootpath = rootpath
+
+    def run_git_cmd(self, git_args):
+        args = ["git", "-C", self.rootpath]
+        args.extend(git_args)
+        # print(f"Runnig git cmd '{' '.join(args)}'")
+        p = subprocess.run(args, capture_output=True, text=True)
+        if p.returncode != 0:
+            fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
+        return p.stdout
+
+    def save_git_cmd(self, fname, git_args):
+        args = ["git", "-C", self.rootpath]
+        args.extend(git_args)
+        # print(f"Runnig git cmd '{' '.join(args)}'")
+        with open(fname, "w") as stdout_file:
+            p = subprocess.run(args, stdout=stdout_file)
+            if p.returncode != 0:
+                fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
+
+    def current_branch(self):
+        branch_name = self.run_git_cmd(["branch", "--show-current"]).strip()
+        return branch_name
+
+    def log(self, branch, path=None, limit=None):
+        cmds = ["log", "--no-decorate", branch]
+        if limit:
+            cmds.extend(["-n", str(limit)])
+        if path:
+            cmds.append(path)
+        full_log = self.run_git_cmd(cmds)
+        return full_log
+
+
+class Commit:
+    def __init__(self, lines):
+        self.sha = lines[0].split()[1]
+        self.message = ""
+        self.fullmessage = ""
+        self.bugid = ""
+
+        # Commit message starts after one blank line
+        read_message = False
+        for l in lines:
+            if read_message:
+                self.fullmessage += l.strip() + "\n"
+            if not read_message and l == "":
+                read_message = True
+
+        if len(self.fullmessage) > 0:
+            self.message = first_line(self.fullmessage).strip()
+            t = self.message.split(' ')
+            if len(t) > 1:
+                bugid = t[0]
+                if bugid.startswith("fixup"):
+                    bugid = t[1]
+                bugid = bugid.strip(":")
+                if bugid.startswith("JBR-") or bugid.isnumeric():
+                    self.bugid = bugid
+
+
+class History:
+    def __init__(self, log):
+        log_itr = iter(log.splitlines())
+        self.commits = []
+        self.unique_fullmessages = set()
+        self.duplicates = set()
+        commit_lines = []
+        for line in log_itr:
+            if line.startswith("commit ") and len(commit_lines) > 0:
+                commit = Commit(commit_lines)
+                self.add_commit(commit)
+                commit_lines = []
+            commit_lines.append(line)
+
+        if len(commit_lines) > 0:
+            commit = Commit(commit_lines)
+            self.add_commit(commit)
+
+    def add_commit(self, commit):
+        self.commits.append(commit)
+        if commit.fullmessage in self.unique_fullmessages:
+            self.duplicates.add(commit.fullmessage)
+        else:
+            self.unique_fullmessages.add(commit.fullmessage)
+
+    def appears_more_than_once(self, commit):
+        return commit.fullmessage in self.duplicates
+
+    def contains(self, commit):
+        return commit.fullmessage in self.unique_fullmessages
+
+    def size(self):
+        return len(self.commits)
+
+
+def print_explanation(options, jbr):
+    verbose(options, f"Reading history from '{jbr.rootpath}'")
+    if options.path:
+        verbose(options, f"\t(only under '{options.path}')")
+    if options.limit > 0:
+        verbose(options, f"\t(up to '{options.limit}' commits)")
+    verbose(options, f"Searching for missing fixes in '{options.tobranch}' compared with '{options.frombranch}'")
+
+
+def git_is_available():
+    p = None
+    try:
+        p = subprocess.run(["git", "--help"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    except:
+        pass
+    return p is not None and p.returncode == 0
+
+
+def main():
+    check_python_min_requirements()
+    options = Options()
+    jbr = GitRepo(options.jbrpath)
+    print_explanation(options, jbr)
+
+    commits_to_save = []
+    try:
+        log_from = jbr.log(options.frombranch, options.path, options.limit)
+        log_to = jbr.log(options.tobranch, options.path, options.limit)
+        history_from = History(log_from)
+        history_to = History(log_to)
+
+        verbose(options,
+                f"Read {history_from.size()} commits from '{options.frombranch}', {history_to.size()} from {options.tobranch}")
+
+        exclude_list = []
+        if options.exclude:
+            with open(options.exclude, "r") as exclude_file:
+                l = exclude_file.read().split('\n')
+                exclude_list = list(filter(lambda line: not line.startswith("#"), l))
+
+        warned = set()
+        for c in history_from.commits:
+            if c.message:
+                verbose(options, f"Looking for commit '{c.message}'")
+                if c.message in exclude_list:
+                    verbose(options, "...nope, in exclude list")
+                    continue
+
+                if not history_to.contains(c):
+                    commits_to_save.append(c)
+                else:
+                    if history_from.appears_more_than_once(c) and c.fullmessage not in warned:
+                        # Not sure which of those seemingly identical commits are present in the target branch
+                        error(f"Commit '{c.message}' appears more than once in branch '{options.frombranch}'. ")
+                        warned.add(c.fullmessage)
+    except KeyboardInterrupt:
+        fatal("Interrupted")
+
+    print_out_commits(options, commits_to_save)
+    save_commits_to_file(commits_to_save, options)
+    if errors_count > 0:
+        error(f"{errors_count} error(s) generated to stderr. MANUAL CHECK OF COMMITS IS REQUIRED.")
+
+
+def save_commits_to_file(commits_to_save, options):
+    if len(commits_to_save) > 0 and options.output:
+        print()
+        with open(options.output, "w") as out:
+            for i, c in enumerate(reversed(commits_to_save)):
+                print(f"# {c.sha}", file=out)
+                print(c.message, file=out)
+
+
+def print_out_commits(options, commits_to_save):
+    if options.ishtml:
+        print("<html><body>")
+        print(f"<p><b>Commits on <code>{options.frombranch}</code>"
+              f" missing from <code>{options.tobranch}</code></b></p></h1>")
+    if len(commits_to_save) > 0:
+        for c in sorted(commits_to_save, key=lambda commit: commit.bugid):
+            if options.ishtml:
+                msg = c.message
+                bugurl = ""
+                if c.bugid:
+                    if c.bugid.isnumeric():
+                        bugurl = f"https://bugs.openjdk.org/browse/JDK-{c.bugid}"
+                    elif c.bugid.startswith("JBR-"):
+                        bugurl = f"https://youtrack.jetbrains.com/issue/{c.bugid}"
+
+                if len(bugurl) > 0:
+                    msg = msg.replace(c.bugid, f"<a href='{bugurl}'>{c.bugid}</a>")
+
+                sha = f"<a href='https://jetbrains.team/p/jbre/repositories/jbr/commits?commits={c.sha}'>" \
+                      f"{c.sha[0:8]}</a>"
+                print(f"<li>{msg} ({sha})</li>")
+            else:
+                print(f"{c.message} ({c.sha[0:8]})")
+    if options.ishtml:
+        print("</body></html>")
+
+
+def check_python_min_requirements():
+    if sys.version_info < (3, 6):
+        fatal("Minimum version 3.6 is required to run this script")
+
+
+if __name__ == '__main__':
+    main()

jb/jdkdiff.py

@@ -0,0 +1,230 @@
+#!/usr/bin/env python3
+
+import argparse
+import math
+import os.path
+import sys
+import subprocess
+
+
+def fatal(msg):
+    sys.stderr.write(f"[fatal] {msg}\n")
+    sys.exit(1)
+
+
+def verbose(options, *msg):
+    if options.verbose:
+        sys.stdout.write(f"[verbose] ")
+        sys.stdout.write(*msg)
+        sys.stdout.write('\n')
+
+
+def first_line(str):
+    return "" if not str else str.splitlines()[0]
+
+
+class Options:
+    def __init__(self):
+        ap = argparse.ArgumentParser(description="Show bugfixes differences between JBR and OpenJDK git repos",
+                                     epilog="Example: %(prog)s  --jdk ./jdk11u/ --jbr ./JetBrainsRuntime/ --path src/hotspot --limit 200")
+        ap.add_argument('--jdk', dest='jdkpath', help='path to OpenJDK git repo', required=True)
+        ap.add_argument('--jbr', dest='jbrpath', help='path to JBR git repo', required=True)
+        ap.add_argument('--path', dest='path', help='limit to changes in this path (relative to git root)')
+        ap.add_argument('--limit', dest='limit', help='limit to this many log entries in --jdk repo', type=int, default=-1)
+        ap.add_argument('-o', dest="output_dir", help="save patches to this directory (created if necessary)")
+        ap.add_argument('-v', dest='verbose', help="verbose output", default=False, action='store_true')
+        args = ap.parse_args()
+
+        if not os.path.isdir(args.jdkpath):
+            fatal(f"{args.jdkpath} not a directory")
+
+        if not os.path.isdir(args.jbrpath):
+            fatal(f"{args.jbrpath} not a directory")
+
+        if not git_is_available():
+            fatal("can't run git commands; make sure git is in PATH")
+
+        self.jdkpath = args.jdkpath
+        self.jbrpath = args.jbrpath
+        self.path = args.path
+        self.limit = args.limit
+        self.output_dir = args.output_dir
+        self.verbose = args.verbose
+
+
+class GitRepo:
+    def __init__(self, rootpath):
+        self.rootpath = rootpath
+
+    def run_git_cmd(self, git_args):
+        args = ["git", "-C", self.rootpath]
+        args.extend(git_args)
+        # print(f"Runnig git cmd '{' '.join(args)}'")
+        p = subprocess.run(args, capture_output=True, text=True)
+        if p.returncode != 0:
+            fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
+        return p.stdout
+
+    def save_git_cmd(self, fname, git_args):
+        args = ["git", "-C", self.rootpath]
+        args.extend(git_args)
+        # print(f"Runnig git cmd '{' '.join(args)}'")
+        with open(fname, "w") as stdout_file:
+            p = subprocess.run(args, stdout=stdout_file)
+            if p.returncode != 0:
+                fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
+
+    def current_branch(self):
+        branch_name = self.run_git_cmd(["branch", "--show-current"]).strip()
+        return branch_name
+
+    def log(self, path=None, limit=None):
+        cmds = ["log", "--no-decorate"]
+        if limit:
+            cmds.extend(["-n", str(limit)])
+        if path:
+            cmds.append(path)
+        full_log = self.run_git_cmd(cmds)
+        return full_log
+
+
+class Commit:
+    def __init__(self, lines):
+        self.sha = lines[0].split()[1]
+        self.message = ""
+        self.bugid = None
+
+        # Commit message starts after one blank line
+        read_message = False
+        for l in lines:
+            if read_message:
+                self.message += l + "\n"
+            if not read_message and l == "":
+                read_message = True
+
+        if self.message and self.message != "" and ":" in self.message:
+            maybe_bugid = self.message.split(":")[0].strip()
+            if 10 >= len(maybe_bugid) >= 4:
+                self.bugid = maybe_bugid
+
+
+class History:
+    def __init__(self, log):
+        log_itr = iter(log.splitlines())
+        self.commits = []
+        commit_lines = []
+        for line in log_itr:
+            if line.startswith("commit ") and len(commit_lines) > 0:
+                commit = Commit(commit_lines)
+                self.commits.append(commit)
+                commit_lines = []
+            commit_lines.append(line)
+
+        if len(commit_lines) > 0:
+            commit = Commit(commit_lines)
+            self.commits.append(commit)
+
+    def contains(self, str):
+        return any(str in commit.message for commit in self.commits)
+
+    def size(self):
+        return len(self.commits)
+
+
+def print_explanation(options, jdk, jbr):
+    verbose(options, f"Reading history from '{jdk.rootpath}' on branch '{jdk.current_branch()}'")
+    if options.path:
+        verbose(options, f"\t(only under '{options.path}')")
+    verbose(options, f"Searching for same fixes in '{jbr.rootpath}' on branch '{jbr.current_branch()}'")
+
+
+def git_is_available():
+    p = None
+    try:
+        p = subprocess.run(["git", "--help"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    except:
+        pass
+    return p is not None and p.returncode == 0
+
+
+def main():
+    check_python_min_requirements()
+
+    options = Options()
+
+    jdk = GitRepo(options.jdkpath)
+    jbr = GitRepo(options.jbrpath)
+
+    print_explanation(options, jdk, jbr)
+
+    commits_to_save = []
+    try:
+        jdk_log = jdk.log(options.path, options.limit)
+        jdk_history = History(jdk_log)
+
+        jbr_log = jbr.log(options.path)
+        jbr_history = History(jbr_log)
+
+        verbose(options, f"Read {jdk_history.size()} commits in JDK, {jbr_history.size()} in JBR")
+
+        for c in jdk_history.commits:
+            if c.bugid:
+                verbose(options, f"Looking for bugfix for {c.bugid}")
+                if not jbr_history.contains(c.bugid):
+                    commits_to_save.append(c)
+                    print(f"[note] Fix for {c.bugid} not found in JBR ({jbr.rootpath})")
+                    print(f"    commit {c.sha}")
+                    print(f"    {first_line(c.message).strip()}")
+    except KeyboardInterrupt:
+        fatal("Interrupted")
+
+    if len(commits_to_save) > 0 and options.output_dir:
+        print()
+        if not os.path.exists(options.output_dir):
+            verbose(options, f"Creating output directory {options.output_dir}")
+            os.makedirs(options.output_dir)
+        nzeroes = len(str(len(commits_to_save)))
+        for i, c in enumerate(reversed(commits_to_save)):
+            fname = os.path.join(options.output_dir, f"{str(i).zfill(nzeroes)}-{c.bugid}.patch")
+            print(f"[note] {c.bugid} saved as {fname}")
+            fname = os.path.abspath(fname)
+            jdk.save_git_cmd(fname, ["format-patch", "-1", c.sha, "--stdout"])
+
+        script_fname = os.path.join(options.output_dir, "apply.sh")
+        with open(script_fname, "w") as script_file:
+            print(apply_script_code.format(os.path.abspath(jbr.rootpath), os.path.abspath(options.output_dir)),
+                  file=script_file)
+            print(f"[note] Execute 'bash {script_fname}' to apply patches to {jbr.rootpath}")
+
+
+def check_python_min_requirements():
+    if sys.version_info < (3, 6):
+        fatal("Minimum version 3.6 is required to run this script")
+
+
+apply_script_code = """
+#!/bin/bash
+
+GITROOT={0}
+PATCHROOT={1}
+
+cd $PATCHROOT || exit 1
+PATCHES=$(find $PATCHROOT -name '*.patch' | sort -n)
+
+for P in $PATCHES; do
+    git -C $GITROOT am $P
+    if [ $? != 0 ]; then
+        mv "$P" "$P.failed"
+        echo "[ERROR] Patch $P did not apply cleanly. Try applying it manually."
+        echo "[NOTE]  Execute this script to apply the remaining patches."
+        exit 1
+    else
+        mv "$P" "$P.done"
+    fi
+done
+
+echo "[NOTE] Done applying patches; check $PATCHROOT for .patch and .patch.failed to see if all have been applied."
+"""
+
+if __name__ == '__main__':
+    main()

jb/project/docker/Dockerfile.aarch64

@@ -0,0 +1,46 @@
+# NOTE: This Dockerfile is meant to be used from the mkdocker_aarch64.sh script.
+
+# Pull a concrete version of Linux that does NOT recieve updates after it's
+# been created.  This is so that the image is as stable as possible to make
+# image creation reproducible.
+# NB: this also means there may be no security-related fixes there, need to
+# move the version to the next manually.
+
+# jetbrains/runtime:jbr17env_aarch64
+FROM arm64v8/centos:7
+
+# Install the necessary build tools
+RUN yum -y update; \
+    yum -y install centos-release-scl; \
+    yum -y install devtoolset-10-10.1-0.el7; \
+    yum -y install \
+        alsa-lib-devel-1.1.8-1.el7.aarch64 \
+        autoconf-2.69-11.el7.noarch \
+        automake-1.13.4-3.el7.noarch \
+        bzip2-1.0.6-13.el7.aarch64 \
+        cups-devel-1.6.3-51.el7.aarch64 \
+        file-5.11-37.el7.aarch64 \
+        fontconfig-devel-2.13.0-4.3.el7.aarch64 \
+        freetype-devel-2.8-14.el7_9.1.aarch64 \
+        giflib-devel-4.1.6-9.el7.aarch64 \
+        git-1.8.3.1-24.el7_9.aarch64 \
+        libtool-2.4.2-22.el7_3.aarch64 \
+        libXi-devel-1.7.9-1.el7.aarch64 \
+        libXrandr-devel-1.5.1-2.el7.aarch64 \
+        libXrender-devel-0.9.10-1.el7.aarch64 \
+        libXt-devel-1.1.5-3.el7.aarch64 \
+        libXtst-devel-1.2.3-1.el7.aarch64 \
+        make-3.82-24.el7.aarch64 \
+        rsync-3.1.2-12.el7_9.aarch64 \
+        tar-1.26-35.el7.aarch64 \
+        unzip-6.0-24.el7_9.aarch64 \
+        wayland-devel-1.15.0-1.el7 \
+        zip-3.0-11.el7.aarch64; \
+   yum -y clean all
+
+ENV PATH="/opt/rh/devtoolset-10/root/usr/bin:${PATH}"
+ENV LD_LIBRARY_PATH="/opt/rh/devtoolset-10/root/usr/lib64:/opt/rh/devtoolset-10/root/usr/lib:/opt/rh/devtoolset-10/root/usr/lib64/dyninst:/opt/rh/devtoolset-10/root/usr/lib/dyninst:/opt/rh/devtoolset-10/root/usr/lib64:/opt/rh/devtoolset-10/root/usr/lib"
+ENV PKG_CONFIG_PATH="/opt/rh/devtoolset-10/root/usr/lib64/pkgconfig"
+
+RUN git config --global user.email "teamcity@jetbrains.com" && \
+    git config --global user.name "builduser"

jb/project/docker/Dockerfile.musl_aarch64

@@ -0,0 +1,22 @@
+# NOTE: This Dockerfile is meant to be used from the mkdocker_musl_aarch64.sh script.
+
+# Pull a concrete version of Linux that does NOT recieve updates after it's
+# been created.  This is so that the image is as stable as possible to make
+# image creation reproducible.
+# NB: this also means there may be no security-related fixes there, need to
+# move the version to the next manually.
+FROM arm64v8/alpine:3.12
+
+# Install the necessary build tools
+RUN     apk --no-cache add --update bash grep tar zip bzip2 rsync fontconfig build-base \
+	    git libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev \
+	    libxtst-dev autoconf freetype-dev cups-dev alsa-lib-dev file \
+	    fontconfig fontconfig-dev linux-headers
+
+# Set up boot JDK for building
+COPY boot_jdk_musl_aarch64.tar.gz /jdk17/
+RUN cd /jdk17 && tar --strip-components=1 -xzf boot_jdk_musl_aarch64.tar.gz && rm /jdk17/boot_jdk_musl_aarch64.tar.gz
+ENV BOOT_JDK=/jdk17
+
+RUN git config --global user.email "teamcity@jetbrains.com" && \
+    git config --global user.name "builduser"

jb/project/docker/Dockerfile.musl_x64

@@ -0,0 +1,22 @@
+# NOTE: This Dockerfile is meant to be used from the mkdocker_musl_x64.sh script.
+
+# Pull a concrete version of Linux that does NOT recieve updates after it's
+# been created.  This is so that the image is as stable as possible to make
+# image creation reproducible.
+# NB: this also means there may be no security-related fixes there, need to
+# move the version to the next manually.
+FROM alpine:3.14
+
+# Install the necessary build tools
+RUN     apk --no-cache add --update bash grep tar zip bzip2 rsync fontconfig build-base \
+	    git libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev \
+	    libxtst-dev autoconf freetype-dev cups-dev alsa-lib-dev file \
+	    fontconfig fontconfig-dev linux-headers
+
+# Set up boot JDK for building
+COPY boot_jdk_musl_amd64.tar.gz /jdk17/
+RUN cd /jdk17 && tar --strip-components=1 -xzf boot_jdk_musl_amd64.tar.gz && rm /jdk17/boot_jdk_musl_amd64.tar.gz
+ENV BOOT_JDK=/jdk17
+
+RUN git config --global user.email "teamcity@jetbrains.com" && \
+    git config --global user.name "builduser"

jb/project/docker/Dockerfile.x86

@@ -0,0 +1,55 @@
+# NOTE: This Dockerfile is meant to be used from the mkdocker_x86.sh script.
+
+# Pull a concrete version of Linux that does NOT receive updates after it's
+# been created.  This is so that the image is as stable as possible to make
+# image creation reproducible.
+# NB: this also means there may be no security-related fixes there, need to
+# move the version to the next manually.
+#FROM i386/ubuntu:xenial
+#FROM i386/ubuntu:bionic
+FROM i386/ubuntu:focal
+
+RUN linux32 \
+    apt-get update && apt-get install -y --no-install-recommends apt-utils
+RUN export DEBIAN_FRONTEND=noninteractive \
+    export DEBCONF_NONINTERACTIVE_SEEN=true && \
+    echo 'tzdata tzdata/Areas select Etc' | debconf-set-selections; \
+    echo 'tzdata tzdata/Zones/Etc select UTC' | debconf-set-selections; \
+    linux32 \
+    apt-get -y install \
+        autoconf \
+        build-essential \
+        curl \
+        file \
+        git \
+        libx11-dev \
+        libxext-dev \
+        libxrender-dev \
+        libxrandr-dev \
+        libxtst-dev \
+        libxt-dev \
+        libcups2-dev \
+        libasound2-data \
+#        libpng12-0 \
+        libasound2 \
+        libfreetype6 \
+        libfontconfig1-dev \
+        libasound2-dev \
+        rsync \
+        unzip \
+        zip
+RUN linux32 \
+    apt-get -y install \
+        g++-10 \
+        gcc-10 && \
+    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 && \
+    apt-get clean -qy && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# Set up boot JDK for building
+COPY boot_jdk_x86.tar.gz /jdk17/
+RUN cd /jdk17 && tar --strip-components=1 -xzf boot_jdk_x86.tar.gz && rm /jdk17/boot_jdk_x86.tar.gz
+ENV BOOT_JDK=/jdk17
+
+RUN git config --global user.email "teamcity@jetbrains.com" && \
+    git config --global user.name "builduser"

jb/project/docker/Dockerfile.x86_64

@@ -0,0 +1,36 @@
+# jetbrains/runtime:jbr17env_x86_64
+FROM centos:7
+RUN yum -y install centos-release-scl; \
+    yum -y install devtoolset-10-10.1-0.el7; \
+    yum -y install \
+        alsa-lib-devel-1.1.8-1.el7 \
+        autoconf-2.69-11.el7 \
+        automake-1.13.4-3.el7 \
+        bzip2-1.0.6-13.el7 \
+        cups-devel-1.6.3-51.el7 \
+        file-5.11-37.el7 \
+        fontconfig-devel-2.13.0-4.3.el7 \
+        freetype-devel-2.8-14.el7_9.1 \
+        giflib-devel-4.1.6-9.el7 \
+        git-1.8.3.1-24.el7_9 \
+        libtool-2.4.2-22.el7_3 \
+        libXi-devel-1.7.9-1.el7 \
+        libXrandr-devel-1.5.1-2.el7 \
+        libXrender-devel-0.9.10-1.el7 \
+        libXt-devel-1.1.5-3.el7 \
+        libXtst-devel-1.2.3-1.el7 \
+        make-3.82-24.el7 \
+        tar-1.26-35.el7 \
+        unzip-6.0-24.el7_9 \
+        wayland-devel-1.15.0-1.el7 \
+        wget-1.14-18.el7_6.1 \
+        which-2.20-7.el7 \
+        zip-3.0-11.el7
+
+RUN mkdir .git && \
+    git config user.email "teamcity@jetbrains.com" && \
+    git config user.name "builduser"
+
+ENV LD_LIBRARY_PATH="/opt/rh/devtoolset-10/root/usr/lib64:/opt/rh/devtoolset-10/root/usr/lib:/opt/rh/devtoolset-10/root/usr/lib64/dyninst:/opt/rh/devtoolset-10/root/usr/lib/dyninst:/opt/rh/devtoolset-10/root/usr/lib64:/opt/rh/devtoolset-10/root/usr/lib"
+ENV PATH="/opt/rh/devtoolset-10/root/usr/bin::${PATH}"
+ENV PKG_CONFIG_PATH="/opt/rh/devtoolset-10/root/usr/lib64/pkgconfig"

jb/project/docker/mkdocker_aarch64.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# This script creates a Docker image suitable for building AArch64 variant
+# of the JetBrains Runtime "dev" version.
+
+BOOT_JDK_REMOTE_FILE=zulu17.30.15-ca-jdk17.0.1-linux_aarch64.tar.gz
+BOOT_JDK_SHA=4d9c9116eb0cdd2d7fb220d6d27059f4bf1b7e95cc93d5512bd8ce3791af86c7
+BOOT_JDK_LOCAL_FILE=boot_jdk.tar.gz
+
+if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
+    # Obtain "boot JDK" from outside of the container.
+    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
+else
+    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
+fi
+
+# Verify that what we've downloaded can be trusted.
+sha256sum -c - <<EOF
+$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
+EOF
+
+docker build -t jbrdevenv_arm64v8 -f Dockerfile.aarch64 .
+
+# NB: the resulting container can (and should) be used without the network
+# connection (--network none) during build in order to reduce the chance
+# of build contamination.

jb/project/docker/mkdocker_musl_aarch64.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# This script creates a Docker image suitable for building musl AArch64 variant
+# of the JetBrains Runtime version 17.
+
+BOOT_JDK_REMOTE_FILE=zulu17.32.13-ca-jdk17.0.2-linux_musl_aarch64.tar.gz
+BOOT_JDK_SHA=6b920559abafbe9bdef386a20ecf3a2f318bc1f0d8359eb1f95aee26606bbc70
+BOOT_JDK_LOCAL_FILE=boot_jdk_musl_aarch64.tar.gz
+
+if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
+    # Obtain "boot JDK" from outside of the container.
+    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
+else
+    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
+fi
+
+# Verify that what we've downloaded can be trusted.
+sha256sum -c - <<EOF
+$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
+EOF
+
+docker build -t jbr17buildenv -f Dockerfile.musl_aarch64 .
+
+# NB: the resulting container can (and should) be used without the network
+# connection (--network none) during build in order to reduce the chance
+# of build contamination.

jb/project/docker/mkdocker_musl_x64.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# This script creates a Docker image suitable for building musl-x64 variant
+# of the JetBrains Runtime version 17.
+
+BOOT_JDK_REMOTE_FILE=zulu17.32.13-ca-jdk17.0.2-linux_musl_x64.tar.gz
+BOOT_JDK_SHA=bcc5342011bd9f3643372aadbdfa68d47463ff0d8621668a0bdf2910614d95c6
+BOOT_JDK_LOCAL_FILE=boot_jdk_musl_amd64.tar.gz
+
+if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
+    # Obtain "boot JDK" from outside of the container.
+    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
+else
+    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
+fi
+
+# Verify that what we've downloaded can be trusted.
+sha256sum -c - <<EOF
+$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
+EOF
+
+docker build -t jbr17buildenv -f Dockerfile.musl_x64 .
+
+# NB: the resulting container can (and should) be used without the network
+# connection (--network none) during build in order to reduce the chance
+# of build contamination.

jb/project/docker/mkdocker_x86.sh

@@ -0,0 +1,26 @@
+#!/bin/bash -x
+
+# This script creates a Docker image suitable for building x86 variant
+# of the JetBrains Runtime version 17.
+
+BOOT_JDK_REMOTE_FILE=zulu17.34.19-ca-jdk17.0.3-linux_i686.tar.gz
+BOOT_JDK_SHA=1c35c374ba0001e675d6e80819d5be900c4e141636d5e484992a8c550be14481
+BOOT_JDK_LOCAL_FILE=boot_jdk_x86.tar.gz
+
+if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
+    # Obtain "boot JDK" from outside of the container.
+    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
+else
+    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
+fi
+
+# Verify that what we've downloaded can be trusted.
+sha256sum -c - <<EOF
+$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
+EOF
+
+docker build -t jetbrains/runtime:jbr17env_x86 -f Dockerfile.x86 .
+
+# NB: the resulting container can (and should) be used without the network
+# connection (--network none) during build in order to reduce the chance
+# of build contamination.

jb/project/idea-project-files/jdk-clion/.idea/.name

@@ -0,0 +1 @@
+JetBrainsRuntime

jb/project/idea-project-files/jdk-clion/.idea/vcs.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="IssueNavigationConfiguration">
+    <option name="links">
+      <list>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="(?:^|\s|\p{Punct})([A-Z]+\-\d+)(?=$|\s|\p{Punct})" />
+          <option name="linkRegexp" value="https://youtrack.jetbrains.com/issue/$1" />
+        </IssueNavigationLink>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="(?:^|\s|\p{Punct})(?:JDK-)?(\d{7})(?=$|\s|\p{Punct})" />
+          <option name="linkRegexp" value="https://bugs.openjdk.java.net/browse/JDK-$1" />
+        </IssueNavigationLink>
+      </list>
+    </option>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>

jb/project/idea-project-files/jetbrains.api.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/src/jetbrains.api">
+      <sourceFolder url="file://$MODULE_DIR$/src/jetbrains.api/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jetbrains.api/templates" isTestSource="false" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+  </component>
+</module>
+

jb/project/idea-project-files/modules.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/jdk.iml" filepath="$PROJECT_DIR$/.idea/jdk.iml" />
+      ###MODULE_IMLS###
+      <module fileurl="file://$PROJECT_DIR$/.idea/jetbrains.api.iml" filepath="$PROJECT_DIR$/.idea/jetbrains.api.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/test.iml" filepath="$PROJECT_DIR$/.idea/test.iml" />
+    </modules>
+  </component>
+</project>
+

jb/project/idea-project-files/vcs.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="IssueNavigationConfiguration">
+    <option name="links">
+      <list>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="(?:^|\s|\p{Punct})([A-Z]+\-\d+)(?=$|\s|\p{Punct})" />
+          <option name="linkRegexp" value="https://youtrack.jetbrains.com/issue/$1" />
+        </IssueNavigationLink>
+        <IssueNavigationLink>
+          <option name="issueRegexp" value="(?:^|\s|\p{Punct})(?:JDK-)?(\d{7})(?=$|\s|\p{Punct})" />
+          <option name="linkRegexp" value="https://bugs.openjdk.java.net/browse/JDK-$1" />
+        </IssueNavigationLink>
+      </list>
+    </option>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

jb/project/java-gradle/build.gradle

@@ -0,0 +1,135 @@
+apply plugin: 'java'
+import org.gradle.internal.os.OperatingSystem
+
+repositories {
+    mavenCentral()
+}
+
+def test_jvm = {
+    if (project.hasProperty('jbsdkhome')) {
+        file(jbsdkhome + (OperatingSystem.current().isWindows()?"/bin/java.exe" : "/bin/java")).absolutePath
+    } else {
+        if (OperatingSystem.current().isMacOsX()) {
+            file('../../../build/macosx-x86_64-normal-server-release/images/jdk-bundle/jdk-11.0.4.jdk/Contents/Home/bin/java').absolutePath
+        } else if (OperatingSystem.current().isLinux()) {
+            file('../../../build/linux-x86_64-normal-server-release/images/jdk/bin/java').absolutePath
+        } else {
+            file('../../../build/windows-x86_64-normal-server-release/images/jdk/bin/java.exe').absolutePath
+        }
+    }
+}
+
+dependencies {
+    testCompile('junit:junit:4.12'){
+        exclude group: 'org.hamcrest'
+    }
+    testCompile 'org.hamcrest:hamcrest-library:1.3'
+    testCompile 'net.java.dev.jna:jna:4.4.0'
+    testCompile 'com.twelvemonkeys.imageio:imageio-tiff:3.3.2'
+    testCompile 'org.apache.commons:commons-lang3:3.0'
+}
+
+def jdk_modules = ["java.base", "java.logging", "java.prefs",
+               "java.se.ee", "java.sql", "java.datatransfer",
+               "java.management", "java.rmi", "java.security.jgss",
+               "java.sql.rowset", "java.desktop", "java.management.rmi",
+               "java.scripting", "java.security.sasl", "java.transaction",
+               "java.instrument", "java.naming", "java.se",
+               "java.smartcardio", "java.xml.crypto"]
+
+def jdk_class_dirs = []
+
+jdk_modules.collect(jdk_class_dirs) {
+    new File("../../../src/" + it + "/share/classes")
+}
+
+if (OperatingSystem.current().isMacOsX())
+    jdk_modules.collect(jdk_class_dirs) {
+        "../../../src/" + it + "/macosx/classes"
+    }
+else if (OperatingSystem.current().isLinux()) {
+    jdk_modules.collect(jdk_class_dirs) {
+        "../../../src/" + it + "/solaris/classes"
+    }
+    jdk_modules.collect(jdk_class_dirs) {
+        "../../../src/" + it + "/unix/classes"
+    }
+} else
+    jdk_modules.collect(jdk_class_dirs) {
+        "../../../src/" + it + "/windows/classes"
+    }
+
+sourceSets.main.java.srcDirs = jdk_class_dirs
+
+sourceSets {
+    test {
+        java {
+            srcDir "../../../test/jdk/jbu"
+        }
+    }
+}
+
+test.dependsOn.clear()
+
+test.dependsOn tasks.compileTestJava
+
+test {
+    systemProperty "jb.java2d.metal", "true"
+    systemProperty "testdata", file('../../../test/jdk/jbu/testdata').absolutePath
+
+//  Generate golden images for DroidFontTest and MixedTextTest
+//    systemProperty "gentestdata", ""
+
+//  Enable Java2D logging (https://confluence.jetbrains.com/display/JRE/Java2D+Rendering+Logging)
+//  systemProperty "sun.java2d.trace", "log"
+//  systemProperty "sun.java2d.trace", "log,pimpl"
+
+    outputs.upToDateWhen { false }
+    executable = test_jvm()
+
+//  Enable async/dtrace profiler
+    jvmArgs  "-XX:+PreserveFramePointer"
+//  Enable native J2D logging (only in debug build)
+//  Can be turned on for J2D by adding "#define DEBUG 1" into jdk/src/share/native/sun/java2d/Trace.h
+
+//    environment 'J2D_TRACE_LEVEL', '4'
+}
+
+def buildDir = project.buildscript.sourceFile.parentFile.parentFile.parentFile.parentFile
+
+def make_cmd = "make"
+if (OperatingSystem.current().isWindows()) {
+    def cyg_make_cmd = new File("c:/cygwin64/bin/make.exe")
+    if (cyg_make_cmd.exists()) make_cmd = cyg_make_cmd.absolutePath
+}
+def test_run = false
+task make_images {
+    doLast {
+        if (!test_run) {
+            def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "images")
+            def proc = pb.redirectErrorStream(true).start()
+            proc.inputStream.eachLine { println it }
+            assert proc.waitFor() == 0
+        }
+    }
+}
+
+task make_clean {
+    doLast {
+        def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "clean")
+        def proc = pb.redirectErrorStream(true).start()
+        proc.inputStream.eachLine { println it }
+        assert proc.waitFor() == 0
+    }
+}
+
+task run_test {
+    doLast {
+        test_run = true
+    }
+}
+
+tasks.cleanTest.dependsOn tasks.run_test
+classes.dependsOn.clear()
+classes.dependsOn tasks.make_images
+tasks.cleanClasses.dependsOn tasks.make_clean

jb/project/tools/common/modules.list

@@ -0,0 +1,54 @@
+java.base,
+java.compiler,
+java.datatransfer,
+java.desktop,
+java.instrument,
+java.logging,
+java.management,
+java.management.rmi,
+java.naming,
+java.net.http,
+java.prefs,
+java.rmi,
+java.scripting,
+java.se,
+java.security.jgss,
+java.security.sasl,
+java.smartcardio,
+java.sql,
+java.sql.rowset,
+java.transaction.xa,
+java.xml,
+java.xml.crypto,
+jdk.accessibility,
+jdk.attach,
+jdk.charsets,
+jdk.compiler,
+jdk.crypto.cryptoki,
+jdk.crypto.ec,
+jdk.dynalink,
+jdk.httpserver,
+jdk.internal.ed,
+jdk.internal.le,
+jdk.internal.vm.ci,
+jdk.javadoc,
+jdk.jdi,
+jdk.jdwp.agent,
+jdk.jfr,
+jdk.jsobject,
+jdk.localedata,
+jdk.management,
+jdk.management.agent,
+jdk.management.jfr,
+jdk.naming.dns,
+jdk.naming.rmi,
+jdk.net,
+jdk.sctp,
+jdk.security.auth,
+jdk.security.jgss,
+jdk.unsupported,
+jdk.unsupported.desktop,
+jdk.xml.dom,
+jdk.zipfs,
+jdk.hotspot.agent,
+jdk.jcmd

jb/project/tools/common/scripts/build-jbr-api.sh

@@ -0,0 +1,18 @@
+#!/bin//bash
+
+set -euo pipefail
+
+# $1 - Boot JDK
+# $2 - JBR part of API version
+
+cd "`dirname "$0"`/../../../../.."
+PWD="`pwd`"
+CONF="$PWD/build/jbr-api.conf"
+./configure --with-debug-level=release --with-boot-jdk=$1 || exit $?
+make jbr-api CONF=release MAKEOVERRIDES= "JBR_API_CONF_FILE=$CONF" JBR_API_JBR_VERSION=$2 || exit $?
+. $CONF || exit $?
+echo "##teamcity[buildNumber '$VERSION']"
+cp "$JAR" ./jbr-api-${VERSION}.jar || exit $?
+cp "$SOURCES_JAR" ./jbr-api-${VERSION}-sources.jar || exit $?
+echo "##teamcity[publishArtifacts '$PWD/jbr-api-${VERSION}.jar']"
+echo "##teamcity[publishArtifacts '$PWD/jbr-api-${VERSION}-sources.jar']"

jb/project/tools/common/scripts/common.sh

@@ -0,0 +1,186 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+function check_bundle_type_maketest() {
+  # check whether last char is 't', if so remove it
+  if [ "${bundle_type: -1}" == "t" ] && [ "${bundle_type: -2}" != "ft" ]; then
+    bundle_type="${bundle_type%?}"
+    do_maketest=1
+  else
+    do_maketest=0
+  fi
+}
+
+function getVersionProp() {
+  grep "^${1}" make/conf/version-numbers.conf | cut -d'=' -f2
+}
+
+while getopts ":i?" o; do
+    case "${o}" in
+        i) INC_BUILD=1 ;;
+    esac
+done
+shift $((OPTIND-1))
+
+if [[ $# -lt 2 ]]; then
+  echo "Required at least two arguments: build_number bundle_type"
+  exit 1
+fi
+
+build_number=$1
+bundle_type=$2
+# shellcheck disable=SC2034
+architecture=${3:-x64} # aarch64 or x64
+
+check_bundle_type_maketest
+
+tag_prefix="jdk-"
+VERSION_FEATURE=$(getVersionProp "DEFAULT_VERSION_FEATURE")
+VERSION_INTERIM=$(getVersionProp "DEFAULT_VERSION_INTERIM")
+VERSION_UPDATE=$(getVersionProp "DEFAULT_VERSION_UPDATE")
+VERSION_PATCH=$(getVersionProp "DEFAULT_VERSION_PATCH")
+[[ $VERSION_UPDATE = 0 ]] && JBSDK_VERSION="$VERSION_FEATURE" || JBSDK_VERSION="${VERSION_FEATURE}.${VERSION_INTERIM}.${VERSION_UPDATE}"
+[[ $VERSION_PATCH = 0 ]] || JBSDK_VERSION="${VERSION_FEATURE}.${VERSION_INTERIM}.${VERSION_UPDATE}.${VERSION_PATCH}"
+echo "##teamcity[setParameter name='env.JBSDK_VERSION' value='${JBSDK_VERSION}']"
+OPENJDK_TAG=$(git tag -l | grep "$tag_prefix$JBSDK_VERSION" | grep -v ga | sort -t "-" -k 2 -g | tail -n 1)
+JDK_BUILD_NUMBER=${JDK_BUILD_NUMBER:=$(echo $OPENJDK_TAG | awk -F "-|[+]" '{print $3}')}
+[ -z $JDK_BUILD_NUMBER ] && JDK_BUILD_NUMBER=1
+re='^[0-9]+$'
+if ! [[ $JDK_BUILD_NUMBER =~ $re ]] ; then
+  echo "error: JDK_BUILD_NUMBER Not a number: $JDK_BUILD_NUMBER"
+  JDK_BUILD_NUMBER=1
+fi
+echo "##teamcity[setParameter name='env.JDK_UPDATE_NUMBER' value='${JDK_BUILD_NUMBER}']"
+
+VENDOR_NAME="JetBrains s.r.o."
+VENDOR_VERSION_STRING="JBR-${JBSDK_VERSION}+${JDK_BUILD_NUMBER}-${build_number}"
+[ -z "$bundle_type" ] || VENDOR_VERSION_STRING="${VENDOR_VERSION_STRING}-${bundle_type}"
+
+do_reset_changes=0
+do_reset_dcevm=0
+HEAD_REVISION=0
+
+STATIC_CONF_ARGS=""
+common_conf_props_file="jb/project/tools/common/static_conf_args.txt"
+if [[ -f "$common_conf_props_file" ]]; then
+    STATIC_CONF_ARGS=$(<$common_conf_props_file)
+fi
+OS_NAME=$(uname -s)
+# Enable reproducible builds
+TZ=UTC
+export TZ
+SOURCE_DATE_EPOCH="$(git log -1 --pretty=%ct)"
+export SOURCE_DATE_EPOCH
+
+COPYRIGHT_YEAR=""
+BUILD_TIME=""
+TOUCH_TIME=""
+REPRODUCIBLE_TAR_OPTS=""
+case "$OS_NAME" in
+    Linux)
+        COPYRIGHT_YEAR="$(date --utc --date=@$SOURCE_DATE_EPOCH +%Y)"
+        BUILD_TIME="$(date --utc --date=@$SOURCE_DATE_EPOCH +%F)"
+        REPRODUCIBLE_TAR_OPTS="--mtime=@$SOURCE_DATE_EPOCH --owner=0 --group=0 --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime"
+        ;;
+    CYGWIN*)
+        COPYRIGHT_YEAR="$(date --utc --date=@$SOURCE_DATE_EPOCH +%Y)"
+        BUILD_TIME="$(date --utc --date=@$SOURCE_DATE_EPOCH +%F)"
+        REPRODUCIBLE_TAR_OPTS="--mtime=@$SOURCE_DATE_EPOCH --owner=0 --group=0 --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime"
+        ;;
+    Darwin)
+        COPYRIGHT_YEAR="$(date -u -r $SOURCE_DATE_EPOCH +%Y)"
+        BUILD_TIME="$(date -u -r $SOURCE_DATE_EPOCH +%F)"
+        TOUCH_TIME="$(date -u -r $SOURCE_DATE_EPOCH +%Y%m%d%H%M.%S)"
+        REPRODUCIBLE_TAR_OPTS="--uid 0 --gid 0 --numeric-owner"
+        ;;
+esac
+
+WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS="--with-native-debug-symbols=zipped"
+
+if [ "$bundle_type" == "nomodft" ]; then
+  WITH_BUNDLED_FREETYPE="--with-freetype=bundled"
+else
+  WITH_BUNDLED_FREETYPE=""
+fi
+
+REPRODUCIBLE_BUILD_OPTS="--with-source-date=$SOURCE_DATE_EPOCH
+  --with-hotspot-build-time=$BUILD_TIME
+  --with-copyright-year=$COPYRIGHT_YEAR
+  --disable-absolute-paths-in-output
+  --with-build-user=builduser"
+
+function zip_native_debug_symbols() {
+  image_bundle_path=$(echo $1 | cut -d"/" -f-4)
+  jdk_name=$(echo $1 | cut -d"/" -f5)
+  jbr_diz_name=$2
+
+  [ -d "dizfiles" ] && rm -rf dizfiles
+  mkdir dizfiles
+
+  rsync_target="../../../../dizfiles"
+  [ -z "$jdk_name" ] && rsync_target=$rsync_target"/"$jbr_diz_name
+  (cd $image_bundle_path && find . -name '*.diz' -exec rsync -R {} $rsync_target \;)
+  [ ! -z "$jdk_name" ] && mv dizfiles/$jdk_name dizfiles/$jbr_diz_name
+
+  (cd dizfiles && find $jbr_diz_name -print0 | COPYFILE_DISABLE=1 \
+    tar --no-recursion --null -T - -czf ../"$jbr_diz_name".tar.gz) || do_exit $?
+}
+
+function do_exit() {
+  exit_code=$1
+  [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
+  if [ $do_reset_dcevm -eq 1 ]; then
+    [ ! -z $HEAD_REVISION ] && git reset --hard $HEAD_REVISION
+  fi
+  exit "$exit_code"
+}
+
+function update_jsdk_mods() {
+  __jsdk=$1
+  __jcef_mods=$2
+  __orig_jsdk_mods=$3
+  __updated_jsdk_mods=$4
+  
+  # re-create java.desktop.jmod with updated module-info.class
+  tmp=.java.desktop.$$.tmp
+  mkdir "$tmp" || exit $?
+  "$__jsdk"/bin/jmod extract --dir "$tmp" "$__orig_jsdk_mods"/java.desktop.jmod || exit $?
+  "$__jsdk"/bin/javac \
+      --patch-module java.desktop="$__orig_jsdk_mods"/java.desktop.jmod \
+      --module-path "$__jcef_mods" -d "$tmp"/classes src/java.desktop/share/classes/module-info.java || exit $?
+  "$__jsdk"/bin/jmod \
+      create --class-path "$tmp"/classes --config "$tmp"/conf --header-files "$tmp"/include --legal-notice "$tmp"/legal --libs "$tmp"/lib \
+      java.desktop.jmod || exit $?
+  mv java.desktop.jmod "$__updated_jsdk_mods" || exit $?
+  rm -rf "$tmp"
+  
+  # re-create java.base.jmod with updated hashes
+  tmp=.java.base.$$.tmp
+  mkdir "$tmp" || exit $?
+  hash_modules=$("$__jsdk"/bin/jmod describe "$__orig_jsdk_mods"/java.base.jmod | grep hashes | awk '{print $2}' | tr '\n' '|' | sed s/\|$//) || exit $?
+  "$__jsdk"/bin/jmod extract --dir "$tmp" "$__orig_jsdk_mods"/java.base.jmod || exit $?
+  rm "$__updated_jsdk_mods"/java.base.jmod || exit $? # temp exclude from path
+  "$__jsdk"/bin/jmod \
+      create --module-path "$__updated_jsdk_mods" --hash-modules "$hash_modules" \
+      --class-path "$tmp"/classes --cmds "$tmp"/bin --config "$tmp"/conf --header-files "$tmp"/include --legal-notice "$tmp"/legal --libs "$tmp"/lib \
+      java.base.jmod || exit $?
+  mv java.base.jmod "$__updated_jsdk_mods" || exit $?
+  rm -rf "$tmp"
+}
+
+function get_mods_list() {
+  __mods=$1
+  echo $(ls $__mods) | sed s/\.jmod/,/g | sed s/,$//g | sed s/' '//g
+}
+
+function copy_jmods() {
+  __mods_list=$1
+  __jmods_from=$2
+  __jmods_to=$3
+
+  mkdir -p $__jmods_to
+
+  echo "${__mods_list}," | while read -d, mod; do cp $__jmods_from/$mod.jmod $__jmods_to/; done
+}

jb/project/tools/common/static_conf_args.txt

@@ -0,0 +1 @@
+--with-vendor-vm-bug-url=https://youtrack.jetbrains.com/issues/JBR

jb/project/tools/linux/scripts/mkimages_aarch64.sh

@@ -0,0 +1,169 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+# This script makes test-image along with JDK images when bundle_type is set to "jcef".
+# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+#
+# Environment variables:
+#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
+#               to configure
+#               By default JDK_BUILD_NUMBER is set zero
+#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
+#               By default JCEF binaries should be located in ./jcef_linux_aarch64
+
+source jb/project/tools/common/scripts/common.sh
+
+JCEF_PATH=${JCEF_PATH:=./jcef_linux_aarch64}
+
+function do_configure {
+  sh configure \
+    $WITH_DEBUG_LEVEL \
+    --with-vendor-name="$VENDOR_NAME" \
+    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
+    --with-jvm-features=shenandoahgc \
+    --with-version-pre= \
+    --with-version-build="$JDK_BUILD_NUMBER" \
+    --with-version-opt=b"$build_number" \
+    --with-boot-jdk="$BOOT_JDK" \
+    --enable-cds=yes \
+    $STATIC_CONF_ARGS \
+    $REPRODUCIBLE_BUILD_OPTS \
+    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
+    $WITH_BUNDLED_FREETYPE \
+    || do_exit $?
+}
+
+function is_musl {
+  libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
+  if [ -z $libc ]; then
+    # This is not Musl, return 1 == false
+    return 1
+  fi
+  return 0
+}
+
+function create_image_bundle {
+  __bundle_name=$1
+  __arch_name=$2
+  __modules_path=$3
+  __modules=$4
+
+  libc_type_suffix=''
+  fastdebug_infix=''
+
+  if is_musl; then libc_type_suffix='musl-' ; fi
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}aarch64-${fastdebug_infix}b${build_number}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}aarch64-${fastdebug_infix:-}b${build_number}
+
+  echo Running jlink....
+  [ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
+  $JSDK/bin/jlink \
+    --module-path "$__modules_path" --no-man-pages --compress=2 \
+    --generate-cds-archive --add-modules "$__modules" --output "$IMAGES_DIR"/"$__root_dir"
+
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__root_dir"/release
+  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
+    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
+    mv release "$IMAGES_DIR"/"$__root_dir"/release
+    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
+    cp $IMAGES_DIR/jdk/lib/server/*.jsa "$IMAGES_DIR"/"$__root_dir"/lib/server
+    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
+    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
+  fi
+
+  # jmod does not preserve file permissions (JDK-8173610)
+  [ -f "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper
+
+  echo Creating "$JBR".tar.gz ...
+
+  (cd "$IMAGES_DIR" &&
+    find "$__root_dir" -print0 | LC_ALL=C sort -z | \
+    tar $REPRODUCIBLE_TAR_OPTS \
+      --no-recursion --null -T - -cf "$JBR".tar) || do_exit $?
+  mv "$IMAGES_DIR"/"$JBR".tar ./"$JBR".tar
+  [ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
+  touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
+  gzip "$JBR".tar || do_exit $?
+  rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
+}
+
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=linux-aarch64-server-release
+
+jbr_name_postfix=""
+
+case "$bundle_type" in
+  "jcef")
+    do_reset_changes=1
+    jbr_name_postfix="_${bundle_type}"
+    do_maketest=1
+    ;;
+  "nomod" | "")
+    bundle_type=""
+    ;;
+  "nomodft" | "")
+    jbr_name_postfix="_ft"
+    ;;
+  "fd")
+    do_reset_changes=1
+    jbr_name_postfix="_${bundle_type}"
+    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+    RELEASE_NAME=linux-aarch64-server-fastdebug
+    ;;
+esac
+
+if [ -z "${INC_BUILD:-}" ]; then
+  do_configure || do_exit $?
+  make clean CONF=$RELEASE_NAME || do_exit $?
+fi
+make images CONF=$RELEASE_NAME || do_exit $?
+
+IMAGES_DIR=build/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk
+JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBRSDK_BUNDLE=jbrsdk
+
+echo Fixing permissions
+chmod -R a+r $JSDK
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
+  git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
+  update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
+  cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
+  cat $JCEF_PATH/jcef.version >> $JSDK/release
+fi
+
+# create runtime image bundle
+modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
+create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
+
+# create sdk image bundle
+modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
+fi
+create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
+
+if [ $do_maketest -eq 1 ]; then
+    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-aarch64-b${build_number}
+    echo Creating "$JBRSDK_TEST" ...
+    [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
+    make test-image jbr-api CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
+    cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test"
+    tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
+    [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
+    gzip "$JBRSDK_TEST".tar || do_exit $?
+fi
+
+do_exit 0

jb/project/tools/linux/scripts/mkimages_x64.sh

@@ -0,0 +1,172 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+# This script makes test-image along with JDK images when bundle_type is set to "jcef".
+# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+#
+# Environment variables:
+#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
+#               to configure
+#               By default JDK_BUILD_NUMBER is set zero
+#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
+#               By default JCEF binaries should be located in ./jcef_linux_x64
+
+source jb/project/tools/common/scripts/common.sh
+
+JCEF_PATH=${JCEF_PATH:=./jcef_linux_x64}
+
+function do_configure {
+  sh configure \
+    $WITH_DEBUG_LEVEL \
+    --with-vendor-name="$VENDOR_NAME" \
+    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
+    --with-jvm-features=shenandoahgc \
+    --with-version-pre= \
+    --with-version-build="$JDK_BUILD_NUMBER" \
+    --with-version-opt=b"$build_number" \
+    --with-boot-jdk="$BOOT_JDK" \
+    --enable-cds=yes \
+    $STATIC_CONF_ARGS \
+    $REPRODUCIBLE_BUILD_OPTS \
+    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
+    $WITH_BUNDLED_FREETYPE \
+    || do_exit $?
+}
+
+function is_musl {
+  libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
+  if [ -z $libc ]; then
+    # This is not Musl, return 1 == false
+    return 1
+  fi
+  return 0
+}
+
+function create_image_bundle {
+  __bundle_name=$1
+  __arch_name=$2
+  __modules_path=$3
+  __modules=$4
+
+  libc_type_suffix=''
+  fastdebug_infix=''
+
+  if is_musl; then libc_type_suffix='musl-' ; fi
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x64-${fastdebug_infix}b${build_number}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x64-${fastdebug_infix:-}b${build_number}
+
+  echo Running jlink....
+  [ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
+  $JSDK/bin/jlink \
+    --module-path "$__modules_path" --no-man-pages --compress=2 \
+    --generate-cds-archive --add-modules "$__modules" --output "$IMAGES_DIR"/"$__root_dir"
+
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__root_dir"/release
+  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
+    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
+    mv release "$IMAGES_DIR"/"$__root_dir"/release
+    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
+    cp $IMAGES_DIR/jdk/lib/server/*.jsa "$IMAGES_DIR"/"$__root_dir"/lib/server
+    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
+    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
+  fi
+
+  # jmod does not preserve file permissions (JDK-8173610)
+  [ -f "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper
+
+  echo Creating "$JBR".tar.gz ...
+
+  (cd "$IMAGES_DIR" &&
+    find "$__root_dir" -print0 | LC_ALL=C sort -z | \
+    tar $REPRODUCIBLE_TAR_OPTS \
+      --no-recursion --null -T - -cf "$JBR".tar) || do_exit $?
+  mv "$IMAGES_DIR"/"$JBR".tar ./"$JBR".tar
+  [ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
+  touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
+  gzip "$JBR".tar || do_exit $?
+  rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
+}
+
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=linux-x86_64-server-release
+
+jbr_name_postfix=""
+
+case "$bundle_type" in
+  "jcef")
+    do_reset_changes=1
+    jbr_name_postfix="_${bundle_type}"
+    jbrsdk_name_postfix="_${bundle_type}"
+    do_maketest=1
+    ;;
+  "nomod" | "")
+    bundle_type=""
+    jbrsdk_name_postfix="_${bundle_type}"
+    ;;
+  "nomodft" | "")
+    jbr_name_postfix="_ft"
+    jbrsdk_name_postfix="_ft"
+    ;;
+  "fd")
+    do_reset_changes=1
+    jbr_name_postfix="_${bundle_type}"
+    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+    RELEASE_NAME=linux-x86_64-server-fastdebug
+    ;;
+esac
+
+if [ -z "${INC_BUILD:-}" ]; then
+  do_configure || do_exit $?
+  make clean CONF=$RELEASE_NAME || do_exit $?
+fi
+make images CONF=$RELEASE_NAME || do_exit $?
+
+IMAGES_DIR=build/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk
+JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBRSDK_BUNDLE=jbrsdk
+
+echo Fixing permissions
+chmod -R a+r $JSDK
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
+  git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
+  update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
+  cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
+  cat $JCEF_PATH/jcef.version >> $JSDK/release
+fi
+
+# create runtime image bundle
+modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
+create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
+
+# create sdk image bundle
+modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
+fi
+create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
+
+if [ $do_maketest -eq 1 ]; then
+    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-x64-b${build_number}
+    echo Creating "$JBRSDK_TEST" ...
+    [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
+    make test-image jbr-api CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
+    cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test"
+    tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
+    [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
+    gzip "$JBRSDK_TEST".tar || do_exit $?
+fi
+
+do_exit 0

jb/project/tools/linux/scripts/mkimages_x86.sh

@@ -0,0 +1,145 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+
+source jb/project/tools/common/scripts/common.sh
+
+function do_configure {
+  linux32 bash configure \
+    $WITH_DEBUG_LEVEL \
+    --with-vendor-name="$VENDOR_NAME" \
+    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
+    --with-jvm-features=shenandoahgc \
+    --with-version-pre= \
+    --with-version-build="$JDK_BUILD_NUMBER" \
+    --with-version-opt=b"$build_number" \
+    --with-boot-jdk="$BOOT_JDK" \
+    $STATIC_CONF_ARGS \
+    --enable-cds=yes \
+    $REPRODUCIBLE_BUILD_OPTS \
+    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
+    || do_exit $?
+}
+
+function is_musl {
+  libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
+  if [ -z $libc ]; then
+    # This is not Musl, return 1 == false
+    return 1
+  fi
+  return 0
+}
+
+function create_image_bundle {
+  __bundle_name=$1
+  __arch_name=$2
+  __modules_path=$3
+  __modules=$4
+
+  libc_type_suffix=''
+  fastdebug_infix=''
+
+  if is_musl; then libc_type_suffix='musl-' ; fi
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x86-${fastdebug_infix}b${build_number}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x86-${fastdebug_infix:-}b${build_number}
+
+  echo Running jlink....
+  [ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
+  $JSDK/bin/jlink \
+    --module-path "$__modules_path" --no-man-pages --compress=2 \
+    --generate-cds-archive --add-modules "$__modules" --output "$IMAGES_DIR"/"$__root_dir"
+
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__root_dir"/release
+  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
+    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
+    mv release "$IMAGES_DIR"/"$__root_dir"/release
+    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
+    cp $IMAGES_DIR/jdk/lib/server/*.jsa "$IMAGES_DIR"/"$__root_dir"/lib/server
+    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
+    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
+  fi
+
+  # jmod does not preserve file permissions (JDK-8173610)
+  [ -f "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper
+
+  echo Creating "$JBR".tar.gz ...
+
+  (cd "$IMAGES_DIR" &&
+    find "$__root_dir" -print0 | LC_ALL=C sort -z | \
+    tar $REPRODUCIBLE_TAR_OPTS \
+      --no-recursion --null -T - -cf "$JBR".tar) || do_exit $?
+  mv "$IMAGES_DIR"/"$JBR".tar ./"$JBR".tar
+  [ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
+  touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
+  gzip "$JBR".tar || do_exit $?
+  rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
+}
+
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=linux-x86-server-release
+
+case "$bundle_type" in
+  "jcef")
+    echo "not implemented" && do_exit 1
+    ;;
+  "nomod" | "")
+    bundle_type=""
+    ;;
+  "fd")
+    do_reset_changes=1
+    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+    RELEASE_NAME=linux-x86-server-fastdebug
+    ;;
+esac
+
+if [ -z "${INC_BUILD:-}" ]; then
+  do_configure || do_exit $?
+  make clean CONF=$RELEASE_NAME || do_exit $?
+fi
+make images CONF=$RELEASE_NAME || do_exit $?
+
+IMAGES_DIR=build/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk
+JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBRSDK_BUNDLE=jbrsdk
+
+echo Fixing permissions
+chmod -R a+r $JSDK
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
+  jbr_name_postfix="_${bundle_type}"
+else
+  jbr_name_postfix=""
+fi
+
+# create runtime image bundle
+modules=$(grep -v "jdk.internal.vm" jb/project/tools/common/modules.list | xargs | sed s/" "//g) || do_exit $?
+create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
+
+# create sdk image bundle
+modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
+create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
+
+if [ $do_maketest -eq 1 ]; then
+    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-x86-b${build_number}
+    echo Creating "$JBRSDK_TEST" ...
+    [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
+    make test-image jbr-api CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
+    cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test"
+    tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
+    [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
+    gzip "$JBRSDK_TEST".tar || do_exit $?
+fi
+
+do_exit 0

jb/project/tools/mac/scripts/codesign.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+SCRIPT_DIR="$(cd "$(dirname "$0")" >/dev/null && pwd)"
+
+source "$SCRIPT_DIR/jetsign-common.sh" || exit 1
+
+function isMacOsBinary() {
+  file "$1" | grep -q 'Mach-O'
+}
+
+function isSigned() {
+  codesign --verify "$1" >/dev/null 2>&1 && ! grep -q Signature=adhoc < <(codesign --display --verbose "$1" 2>&1)
+}
+
+# last argument is a path to be signed
+pathToBeSigned="$(pwd)/${*: -1}"
+jetSignArgs=("${@:1:$#-1}")
+if [[ ! -f "$pathToBeSigned" ]]; then
+  echo "$pathToBeSigned is missing or not a file"
+  exit 1
+elif isSigned "$pathToBeSigned" && ! isForced "${jetSignArgs[@]}" ; then
+  echo "Already signed: $pathToBeSigned"
+elif [[ "$JETSIGN_CLIENT" == "null" ]]; then
+  echo "JetSign client is missing, cannot proceed with signing"
+  exit 1
+elif ! isMacOsBinary "$pathToBeSigned" && [[ "$pathToBeSigned" != *.sit ]] && [[ "$pathToBeSigned" != *.tar.gz ]]; then
+  echo "$pathToBeSigned won't be signed, assumed not to be a macOS executable"
+else
+  if isMacOsBinary "$pathToBeSigned" && ! isSigned "$pathToBeSigned" ; then
+    echo "Unsigned macOS binary: $pathToBeSigned"
+  fi
+  workDir=$(dirname "$pathToBeSigned")
+  pathSigned="$workDir/signed/${pathToBeSigned##*/}"
+  jetSignExtensions=$(jetSignExtensions "${jetSignArgs[@]}")
+  contentType=$(jetSignContentType "$pathToBeSigned")
+  (
+    cd "$workDir" || exit 1
+    "$JETSIGN_CLIENT" -log-format text -denoted-content-type "$contentType" -extensions "$jetSignExtensions" "$pathToBeSigned"
+    # SRE-1223 (Codesign removes execute bits in executable files) workaround
+    chmod "$(stat -f %A "$pathToBeSigned")" "$pathSigned"
+    if isMacOsBinary "$pathSigned"; then
+      isSigned "$pathSigned"
+    fi
+    rm "$pathToBeSigned"
+    mv "$pathSigned" "$pathToBeSigned"
+    rm -rf "$workDir/signed"
+  )
+fi

jb/project/tools/mac/scripts/entitlements.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>com.apple.security.cs.allow-jit</key>
+        <true/>
+        <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+        <true/>
+        <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+        <true/>
+        <key>com.apple.security.cs.disable-library-validation</key>
+        <true/>
+        <key>com.apple.security.cs.disable-executable-page-protection</key>
+        <true/>
+    </dict>
+</plist>

jb/project/tools/mac/scripts/jetsign-common.sh

@@ -0,0 +1,63 @@
+#!/bin/bash
+set -euo pipefail
+
+function isForced() {
+  for arg in "$@"; do
+    if [[ "$arg" == --force ]]; then
+      return 0
+    fi
+  done
+  return 1
+}
+
+function jetSignExtensions() {
+  args=("$@")
+  ((lastElementIndex=${#args[@]}-1))
+  for index in "${!args[@]}"; do
+    arg=${args[$index]}
+    case "$arg" in
+    --sign | -s)
+      echo -n 'mac_codesign_identity='
+      continue
+      ;;
+    --entitlements)
+      echo -n 'mac_codesign_entitlements='
+      continue
+      ;;
+    --options=runtime)
+      echo -n 'mac_codesign_options=runtime'
+      ;;
+    --force)
+      echo -n 'mac_codesign_force=true'
+      ;;
+    --timestamp | --verbose | -v)
+      continue
+      ;;
+    *)
+      echo -n "$arg"
+      ;;
+    esac
+    if [[ $index != "$lastElementIndex" ]]; then
+      echo -n ","
+    fi
+  done
+}
+
+# See jetbrains.sign.util.FileUtil.contentType
+function jetSignContentType() {
+  case "${1##*/}" in
+  *.sit)
+    echo -n 'application/x-mac-app-zip'
+    ;;
+  *.tar.gz)
+    echo -n 'application/x-mac-app-targz'
+    ;;
+  *.pkg)
+    echo -n 'application/x-mac-pkg'
+    ;;
+  *)
+    echo -n 'application/x-mac-app-bin'
+    ;;
+  esac
+}
+

jb/project/tools/mac/scripts/mkimages.sh

@@ -0,0 +1,169 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+# This script makes test-image along with JDK images when bundle_type is set to "jcef".
+# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+#
+# Environment variables:
+#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
+#               to configure
+#               By default JDK_BUILD_NUMBER is set zero
+#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
+#               By default JCEF binaries should be located in ./jcef_mac
+
+source jb/project/tools/common/scripts/common.sh
+
+JCEF_PATH=${JCEF_PATH:=./jcef_mac}
+BOOT_JDK=${BOOT_JDK:=$(/usr/libexec/java_home -v 17)}
+
+function do_configure {
+  sh configure \
+    $WITH_DEBUG_LEVEL \
+    --with-vendor-name="$VENDOR_NAME" \
+    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
+    --with-macosx-bundle-name-base=${VENDOR_VERSION_STRING} \
+    --with-macosx-bundle-id-base="com.jetbrains.jbr" \
+    --with-jvm-features=shenandoahgc \
+    --with-version-pre= \
+    --with-version-build="$JDK_BUILD_NUMBER" \
+    --with-version-opt=b"$build_number" \
+    --with-boot-jdk="$BOOT_JDK" \
+    --enable-cds=yes \
+    $STATIC_CONF_ARGS \
+    $REPRODUCIBLE_BUILD_OPTS \
+    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
+    || do_exit $?
+}
+
+function create_image_bundle {
+  __bundle_name=$1
+  __arch_name=$2
+  __modules_path=$3
+  __modules=$4
+
+  fastdebug_infix=''
+
+  tmp=.bundle.$$.tmp
+  mkdir "$tmp" || do_exit $?
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  JBR=${__bundle_name}-${JBSDK_VERSION}-osx-${architecture}-${fastdebug_infix:-}b${build_number}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-osx-${architecture}-${fastdebug_infix:-}b${build_number}
+
+  JRE_CONTENTS=$tmp/$__root_dir/Contents
+  mkdir -p "$JRE_CONTENTS" || do_exit $?
+
+  echo Running jlink...
+  "$JSDK"/bin/jlink \
+    --module-path "$__modules_path" --no-man-pages --compress=2 \
+    --generate-cds-archive --add-modules "$__modules" --output "$JRE_CONTENTS/Home" || do_exit $?
+
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$JRE_CONTENTS/Home/release"
+  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
+    sed 's/JBR/JBRSDK/g' $JRE_CONTENTS/Home/release > release
+    mv release $JRE_CONTENTS/Home/release
+    cp $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home/lib/src.zip $JRE_CONTENTS/Home/lib
+    cp $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home/lib/server/*.jsa $JRE_CONTENTS/Home/lib/server
+    copy_jmods "$__modules" "$__modules_path" "$JRE_CONTENTS"/Home/jmods
+    zip_native_debug_symbols $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk "${JBR}_diz"
+  fi
+
+  if [ "$bundle_type" == "jcef" ]; then
+    cat $JCEF_PATH/jcef.version >> "$JRE_CONTENTS/Home/release"
+  fi
+
+  cp -R "$JSDK"/../MacOS "$JRE_CONTENTS"
+  cp "$JSDK"/../Info.plist "$JRE_CONTENTS"
+
+  [ -n "$bundle_type" ] && (cp -a $JCEF_PATH/Frameworks "$JRE_CONTENTS" || do_exit $?)
+
+  echo Creating "$JBR".tar.gz ...
+  # Normalize timestamp
+  #find "$tmp"/"$__root_dir" -print0 | xargs -0 touch -c -h -t "$TOUCH_TIME"
+
+  (cd "$tmp" &&
+      find "$__root_dir" -print0 | LC_ALL=C sort -z | \
+      COPYFILE_DISABLE=1 tar $REPRODUCIBLE_TAR_OPTS  --no-recursion --null -T - \
+                             -czf "$JBR".tar.gz --exclude='*.dSYM' --exclude='man') || do_exit $?
+  mv "$tmp"/"$JBR".tar.gz  "$JBR".tar.gz
+  rm -rf "$tmp"
+}
+
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+CONF_ARCHITECTURE=x86_64
+if [[ "${architecture}" == *aarch64* ]]; then
+  CONF_ARCHITECTURE=aarch64
+fi
+RELEASE_NAME=macosx-${CONF_ARCHITECTURE}-server-release
+
+case "$bundle_type" in
+  "jcef")
+    do_reset_changes=1
+    do_maketest=1
+    ;;
+  "nomod" | "")
+    bundle_type=""
+    ;;
+  "fd")
+    do_reset_changes=1
+    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+    RELEASE_NAME=macosx-${CONF_ARCHITECTURE}-server-fastdebug
+    JBSDK=macosx-${architecture}-server-release
+    ;;
+esac
+
+if [ -z "${INC_BUILD:-}" ]; then
+  do_configure || do_exit $?
+  make clean CONF=$RELEASE_NAME || do_exit $?
+fi
+make images CONF=$RELEASE_NAME || do_exit $?
+
+IMAGES_DIR=build/$RELEASE_NAME/images
+
+JSDK=$IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home
+JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBRSDK_BUNDLE=jbrsdk
+
+# test/jdk/jb/java/awt/Focus/FullScreenFocusStealing.java test/jdk/java/awt/color/ICC_ColorSpace/MTTransformReplacedProfile.java test/jdk/java/awt/datatransfer/DataFlavor/DataFlavorRemoteTest.java test/jdk/java/awt/Robot/NonEmptyErrorStream.java
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
+  git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
+  update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
+  cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
+
+  jbr_name_postfix="_${bundle_type}"
+else
+  jbr_name_postfix=""
+fi
+
+# create runtime image bundle
+modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
+create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
+
+# create sdk image bundle
+modules=$(cat "$JSDK"/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
+fi
+create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
+
+if [ $do_maketest -eq 1 ]; then
+    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-osx-test-${architecture}-b${build_number}
+    echo Creating "$JBRSDK_TEST" ...
+    [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
+    make test-image jbr-api CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
+    cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test"
+    [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
+    COPYFILE_DISABLE=1 tar -pczf "$JBRSDK_TEST".tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
+fi
+
+do_exit 0

jb/project/tools/mac/scripts/notarize.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+#immediately exit script with an error if a command fails
+set -euo pipefail
+[[ "${SCRIPT_VERBOSE:-}" == "1" ]] && set -x
+
+APP_PATH=$1
+
+if [[ -z "$APP_PATH" ]]; then
+  echo "Usage: $0 AppPath"
+  exit 1
+fi
+if [[ ! -f "$APP_PATH" ]]; then
+  echo "AppName '$APP_PATH' does not exist or not a file"
+  exit 1
+fi
+
+function log() {
+  echo "$(date '+[%H:%M:%S]') $*"
+}
+
+
+# check required parameters
+: "${APPLE_ISSUER_ID}"
+: "${APPLE_KEY_ID}"
+: "${APPLE_PRIVATE_KEY}"
+
+# shellcheck disable=SC2064
+trap "rm -f \"$PWD/tmp_key\"" INT EXIT RETURN
+echo -n "${APPLE_PRIVATE_KEY}" > tmp_key
+
+log "Notarizing $APP_PATH..."
+xcrun notarytool submit --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}" "$APP_PATH" 2>&1 | tee "notarytool.submit.out"
+REQUEST_ID="$(grep -e " id: " "notarytool.submit.out" | grep -oE '([0-9a-f-]{36})'| head -n1)"
+
+xcrun notarytool wait "$REQUEST_ID" --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}" --timeout 6h ||:
+xcrun notarytool log  "$REQUEST_ID" --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}" developer_log.json ||:
+xcrun notarytool info "$REQUEST_ID" --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}"
+
+log "Notarizing finished"

jb/project/tools/mac/scripts/productsign.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+SCRIPT_DIR="$(cd "$(dirname "$0")" >/dev/null && pwd)"
+
+source "$SCRIPT_DIR/jetsign-common.sh" || exit 1
+
+function isSigned() {
+  pkgutil --check-signature "$1" >/dev/null 2>&1 && grep -q "signed by a developer certificate" < <(pkgutil --check-signature "$1" 2>&1)
+}
+
+# second last argument is a path to be signed
+pathToBeSigned="$(pwd)/${*:(-2):1}"
+# last argument is a path to signed file
+pathOut="$(pwd)/${*:(-1)}"
+jetSignArgs=("${@:1:$#-2}")
+if [[ ! -f "$pathToBeSigned" ]]; then
+  echo "$pathToBeSigned is missing or not a file"
+  exit 1
+elif isSigned "$pathToBeSigned" && ! isForced "${jetSignArgs[@]}" ; then
+  echo "Already signed: $pathToBeSigned"
+elif [[ "$JETSIGN_CLIENT" == "null" ]]; then
+  echo "JetSign client is missing, cannot proceed with signing"
+  exit 1
+elif [[ "$pathToBeSigned" != *.pkg ]]; then
+  echo "$pathToBeSigned won't be signed, assumed not to be a macOS package"
+else
+  if ! isSigned "$pathToBeSigned" ; then
+    echo "Unsigned macOS package: $pathToBeSigned"
+  fi
+  workDir=$(dirname "$pathToBeSigned")
+  pathSigned="$workDir/signed/${pathToBeSigned##*/}"
+  jetSignExtensions=$(jetSignExtensions "${jetSignArgs[@]}")
+  contentType=$(jetSignContentType "$pathToBeSigned")
+  (
+    cd "$workDir" || exit 1
+    "$JETSIGN_CLIENT" -log-format text -denoted-content-type "$contentType" -extensions "$jetSignExtensions" "$pathToBeSigned"
+    isSigned "$pathSigned"
+    rm -f "$pathOut"
+    mv "$pathSigned" "$pathOut"
+    rm -rf "$workDir/signed"
+  )
+fi

jb/project/tools/mac/scripts/sign.sh

@@ -0,0 +1,162 @@
+#!/bin/bash
+
+#immediately exit script with an error if a command fails
+set -euo pipefail
+[[ "${SCRIPT_VERBOSE:-}" == "1" ]] && set -x
+
+if [[ $# -lt 5  ]]; then
+  echo "Usage: $0 AppDirectory AppName BundleId CertificateID InstallerCertificateID"
+  exit 1
+fi
+
+APPLICATION_PATH=$1
+PKG_NAME=$2
+BUNDLE_ID=$3
+JB_DEVELOPER_CERT=$4
+JB_INSTALLER_CERT=$5
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" >/dev/null && pwd)"
+
+# Use JetBrains sign utility if it's available
+if [[ "${JETSIGN_CLIENT:=}" == "null" ]] || [[ "$JETSIGN_CLIENT" == "" ]]; then
+  JB_SIGN=false
+  SIGN_UTILITY="codesign"
+  PRODUCTSIGN_UTILITY="productsign"
+else
+  JB_SIGN=true
+  SIGN_UTILITY="$SCRIPT_DIR/codesign.sh"
+  PRODUCTSIGN_UTILITY="$SCRIPT_DIR/productsign.sh"
+fi
+
+if [[ ! -d "$APPLICATION_PATH" ]]; then
+  echo "AppDirectory '$APPLICATION_PATH' does not exist or not a directory"
+  exit 1
+fi
+
+function log() {
+  echo "$(date '+[%H:%M:%S]') $*"
+}
+
+# Cleanup files left from previous sign attempt (if any)
+find "$APPLICATION_PATH" -name '*.cstemp' -exec rm '{}' \;
+
+log "Signing libraries and executables..."
+# -perm +111 searches for executables
+for f in \
+  "Contents/Home/lib" "Contents/MacOS" \
+  "Contents/Home/Frameworks" \
+  "Contents/Frameworks"; do
+  if [ -d "$APPLICATION_PATH/$f" ]; then
+    find "$APPLICATION_PATH/$f" \
+      -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "*.tbd" -o -name "*.node" -o -perm +111 \) \
+      -exec "$SIGN_UTILITY" --timestamp \
+      -v -s "$JB_DEVELOPER_CERT" --options=runtime --force \
+      --entitlements "$SCRIPT_DIR/entitlements.xml" {} \;
+  fi
+done
+
+log "Signing libraries in jars in $APPLICATION_PATH"
+
+# todo: add set -euo pipefail; into the inner sh -c
+# `-e` prevents `grep -q && printf` loginc
+# with `-o pipefail` there's no input for 'while' loop
+find "$APPLICATION_PATH" -name '*.jar' \
+  -exec sh -c "set -u; unzip -l \"\$0\" | grep -q -e '\.dylib\$' -e '\.jnilib\$' -e '\.so\$' -e '\.tbd\$' -e '^jattach\$' && printf \"\$0\0\" " {} \; |
+  while IFS= read -r -d $'\0' file; do
+    log "Processing libraries in $file"
+
+    rm -rf jarfolder jar.jar
+    mkdir jarfolder
+    filename="${file##*/}"
+    log "Filename: $filename"
+    cp "$file" jarfolder && (cd jarfolder && jar xf "$filename" && rm "$filename")
+
+    find jarfolder \
+      -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "*.tbd" -o -name "jattach" \) \
+      -exec "$SIGN_UTILITY" --timestamp \
+      --force \
+      -v -s "$JB_DEVELOPER_CERT" --options=runtime \
+      --entitlements "$SCRIPT_DIR/entitlements.xml" {} \;
+
+    (cd jarfolder; zip -q -r -o -0 ../jar.jar .)
+    mv jar.jar "$file"
+  done
+
+rm -rf jarfolder jar.jar
+
+log "Signing other files..."
+# shellcheck disable=SC2043
+for f in \
+  "Contents/Home/bin"; do
+  if [ -d "$APPLICATION_PATH/$f" ]; then
+    find "$APPLICATION_PATH/$f" \
+      -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "*.tbd" -o -perm +111 \) \
+      -exec "$SIGN_UTILITY" --timestamp \
+      -v -s "$JB_DEVELOPER_CERT" --options=runtime --force \
+      --entitlements "$SCRIPT_DIR/entitlements.xml" {} \;
+  fi
+done
+
+log "Signing whole frameworks..."
+# shellcheck disable=SC2043
+if [ "$JB_SIGN" = true ]; then for f in \
+  "Contents/Frameworks/cef_server.app/Contents/Frameworks" "Contents/Home/Frameworks" "Contents/Frameworks"; do
+  if [ -d "$APPLICATION_PATH/$f" ]; then
+    find "$APPLICATION_PATH/$f" \( -name '*.framework' -o -name '*.app' \) -maxdepth 1 | while read -r line
+      do
+        log "Signing '$line':"
+        tar -pczf tmp-to-sign.tar.gz -C "$(dirname "$line")" "$(basename "$line")"
+        "$SIGN_UTILITY" --timestamp \
+            -v -s "$JB_DEVELOPER_CERT" --options=runtime \
+            --force \
+            --entitlements "$SCRIPT_DIR/entitlements.xml" tmp-to-sign.tar.gz
+        rm -rf "$line"
+        tar -xzf tmp-to-sign.tar.gz --directory "$(dirname "$line")"
+        rm -f tmp-to-sign.tar.gz
+      done
+  fi
+done; fi
+
+log "Checking framework signatures..."
+for f in \
+  "Contents/Home/Frameworks" "Contents/Frameworks"; do
+  if [ -d "$APPLICATION_PATH/$f" ]; then
+    find "$APPLICATION_PATH/$f" -name '*.framework'  -maxdepth 1 | while read -r line
+      do
+        log "Checking '$line':"
+        codesign --verify --deep --strict --verbose=4 "$line"
+      done
+  fi
+done
+
+log "Signing whole app..."
+if [ "$JB_SIGN" = true ]; then
+  tar -pczf tmp-to-sign.tar.gz --exclude='man' -C "$(dirname "$APPLICATION_PATH")" "$(basename "$APPLICATION_PATH")"
+  "$SIGN_UTILITY" --timestamp \
+    -v -s "$JB_DEVELOPER_CERT" --options=runtime \
+    --force \
+    --entitlements "$SCRIPT_DIR/entitlements.xml" tmp-to-sign.tar.gz
+  rm -rf "$APPLICATION_PATH"
+  tar -xzf tmp-to-sign.tar.gz --directory "$(dirname "$APPLICATION_PATH")"
+  rm -f tmp-to-sign.tar.gz
+else
+  "$SIGN_UTILITY" --timestamp \
+    -v -s "$JB_DEVELOPER_CERT" --options=runtime \
+    --force \
+    --entitlements "$SCRIPT_DIR/entitlements.xml" "$APPLICATION_PATH"
+fi
+
+BUILD_NAME="$(basename "$APPLICATION_PATH")"
+
+log "Creating $PKG_NAME..."
+rm -rf "$PKG_NAME"
+
+mkdir -p unsigned
+pkgbuild --identifier $BUNDLE_ID --root $APPLICATION_PATH \
+    --install-location /Library/Java/JavaVirtualMachines/${BUILD_NAME} unsigned/${PKG_NAME}
+log "Signing $PKG_NAME..."
+"$PRODUCTSIGN_UTILITY" --timestamp --sign "$JB_INSTALLER_CERT" unsigned/${PKG_NAME} ${PKG_NAME}
+
+log "Verifying java is not broken"
+find "$APPLICATION_PATH" \
+  -type f -name 'java' -perm +111 -exec {} -version \;

jb/project/tools/mac/scripts/signapp.sh

@@ -0,0 +1,136 @@
+#!/bin/bash
+
+#immediately exit script with an error if a command fails
+set -euo pipefail
+[[ "${SCRIPT_VERBOSE:-}" == "1" ]] && set -x
+
+export COPY_EXTENDED_ATTRIBUTES_DISABLE=true
+export COPYFILE_DISABLE=true
+
+INPUT_FILE=$1
+EXPLODED=$2.exploded
+BACKUP_JMODS=$2.backup
+USERNAME=$3
+PASSWORD=$4
+CODESIGN_STRING=$5
+JB_INSTALLER_CERT=$6
+NOTARIZE=$7
+BUNDLE_ID=$8
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" >/dev/null && pwd)"
+
+function log() {
+  echo "$(date '+[%H:%M:%S]') $*"
+}
+
+log "Deleting $EXPLODED ..."
+if test -d "$EXPLODED"; then
+  find "$EXPLODED" -mindepth 1 -maxdepth 1 -exec chmod -R u+wx '{}' \;
+fi
+rm -rf "$EXPLODED"
+mkdir "$EXPLODED"
+rm -rf "$BACKUP_JMODS"
+mkdir "$BACKUP_JMODS"
+
+log "Unzipping $INPUT_FILE to $EXPLODED ..."
+tar -xzvf "$INPUT_FILE" --directory $EXPLODED
+BUILD_NAME="$(ls "$EXPLODED")"
+#sed -i '' s/BNDL/APPL/ $EXPLODED/$BUILD_NAME/Contents/Info.plist
+rm -f $EXPLODED/$BUILD_NAME/Contents/CodeResources
+rm "$INPUT_FILE"
+if test -d $EXPLODED/$BUILD_NAME/Contents/Home/jmods; then
+  mv $EXPLODED/$BUILD_NAME/Contents/Home/jmods $BACKUP_JMODS
+fi
+
+log "$INPUT_FILE extracted and removed"
+
+APP_NAME=$(basename "$INPUT_FILE" | awk -F".tar" '{ print $1 }')
+PKG_NAME="$APP_NAME.pkg"
+APPLICATION_PATH=$EXPLODED/$(ls $EXPLODED)
+
+find "$APPLICATION_PATH/Contents/Home/bin" \
+  -maxdepth 1 -type f -name '*.jnilib' -print0 |
+  while IFS= read -r -d $'\0' file; do
+    if [ -f "$file" ]; then
+      log "Linking $file"
+      b="$(basename "$file" .jnilib)"
+      ln -sf "$b.jnilib" "$(dirname "$file")/$b.dylib"
+    fi
+  done
+
+find "$APPLICATION_PATH/Contents/" \
+  -maxdepth 1 -type f -name '*.txt' -print0 |
+  while IFS= read -r -d $'\0' file; do
+    if [ -f "$file" ]; then
+      log "Moving $file"
+      mv "$file" "$APPLICATION_PATH/Contents/Resources"
+    fi
+  done
+
+non_plist=$(find "$APPLICATION_PATH/Contents/" -maxdepth 1 -type f -and -not -name 'Info.plist' | wc -l)
+if [[ $non_plist -gt 0 ]]; then
+  log "Only Info.plist file is allowed in Contents directory but found $non_plist file(s):"
+  log "$(find "$APPLICATION_PATH/Contents/" -maxdepth 1 -type f -and -not -name 'Info.plist')"
+  exit 1
+fi
+
+if [[ "${JETSIGN_CLIENT:=}" == "null" ]] || [[ "$JETSIGN_CLIENT" == "" ]]; then
+  log "Unlocking keychain..."
+  # Make sure *.p12 is imported into local KeyChain
+  security unlock-keychain -p "$PASSWORD" "/Users/$USERNAME/Library/Keychains/login.keychain"
+fi
+
+attempt=1
+limit=3
+set +e
+while [[ $attempt -le $limit ]]; do
+  log "Signing (attempt $attempt) $APPLICATION_PATH ..."
+  "$SCRIPT_DIR/sign.sh" "$APPLICATION_PATH" "$PKG_NAME" "$BUNDLE_ID" "$CODESIGN_STRING" "$JB_INSTALLER_CERT"
+  ec=$?
+  if [[ $ec -ne 0 ]]; then
+    ((attempt += 1))
+    if [ $attempt -eq $limit ]; then
+      set -e
+    fi
+    log "Signing failed, wait for 30 sec and try to sign again"
+    sleep 30
+  else
+    log "Signing done"
+    codesign -v "$APPLICATION_PATH" -vvvvv
+    log "Check sign done"
+    spctl -a -v $APPLICATION_PATH
+    ((attempt += limit))
+  fi
+done
+
+set -e
+
+if [ "$NOTARIZE" = "yes" ]; then
+  log "Notarizing..."
+  "$SCRIPT_DIR/notarize.sh" "$PKG_NAME"
+  log "Stapling..."
+  xcrun stapler staple "$APPLICATION_PATH" ||:
+  xcrun stapler staple "$PKG_NAME" ||:
+else
+  log "Notarization disabled"
+  log "Stapling disabled"
+fi
+
+log "Zipping $BUILD_NAME to $INPUT_FILE ..."
+(
+  #cd "$EXPLODED"
+  #ditto -c -k --sequesterRsrc --keepParent "$BUILD_NAME" "../$INPUT_FILE"
+  if test -d $BACKUP_JMODS/jmods; then
+    mv $BACKUP_JMODS/jmods $APPLICATION_PATH/Contents/Home
+  fi
+  if [[ "$APPLICATION_PATH" != "$EXPLODED/$BUILD_NAME" ]]; then
+    mv $APPLICATION_PATH $EXPLODED/$BUILD_NAME
+  else
+    echo "No move, source == destination: $APPLICATION_PATH"
+  fi
+
+  tar -pczvf $INPUT_FILE --exclude='man' -C $EXPLODED $BUILD_NAME
+  log "Finished zipping"
+)
+rm -rf "$EXPLODED"
+log "Done"

jb/project/tools/patches/add_jcef_module.patch

@@ -0,0 +1,30 @@
+diff --git jb/project/tools/common/modules.list jb/project/tools/common/modules.list
+index 522acb7cb43..c40e689d5de 100644
+--- jb/project/tools/common/modules.list
++++ jb/project/tools/common/modules.list
+@@ -51,4 +51,7 @@ jdk.unsupported.desktop,
+ jdk.xml.dom,
+ jdk.zipfs,
+ jdk.hotspot.agent,
+-jdk.jcmd
++jdk.jcmd,
++jcef,
++gluegen.rt,
++jogl.all
+diff --git src/java.desktop/share/classes/module-info.java src/java.desktop/share/classes/module-info.java
+index 897647ee368..781d1809493 100644
+--- src/java.desktop/share/classes/module-info.java
++++ src/java.desktop/share/classes/module-info.java
+@@ -116,7 +116,11 @@ module java.desktop {
+     // see make/GensrcModuleInfo.gmk
+     exports sun.awt to
+         jdk.accessibility,
+-        jdk.unsupported.desktop;
++        jdk.unsupported.desktop,
++        jcef,
++        jogl.all;
++
++    exports java.awt.peer to jcef;
+ 
+     exports java.awt.dnd.peer to jdk.unsupported.desktop;
+     exports sun.awt.dnd to jdk.unsupported.desktop;

jb/project/tools/patches/add_jcef_module_aarch64.patch

@@ -0,0 +1,30 @@
+diff --git jb/project/tools/common/modules.list jb/project/tools/common/modules.list
+index 522acb7..c40e689 100644
+--- jb/project/tools/common/modules.list
++++ jb/project/tools/common/modules.list
+@@ -51,4 +51,7 @@ jdk.unsupported.desktop,
+ jdk.xml.dom,
+ jdk.zipfs,
+ jdk.hotspot.agent,
+-jdk.jcmd
++jdk.jcmd,
++jcef,
++gluegen.rt,
++jogl.all
+diff --git src/java.desktop/share/classes/module-info.java src/java.desktop/share/classes/module-info.java
+index 897647e..781d180 100644
+--- src/java.desktop/share/classes/module-info.java
++++ src/java.desktop/share/classes/module-info.java
+@@ -116,7 +116,11 @@ module java.desktop {
+     // see make/GensrcModuleInfo.gmk
+     exports sun.awt to
+         jdk.accessibility,
+-        jdk.unsupported.desktop;
++        jdk.unsupported.desktop,
++        jcef,
++        jogl.all;
++
++    exports java.awt.peer to jcef;
+
+     exports java.awt.dnd.peer to jdk.unsupported.desktop;
+     exports sun.awt.dnd to jdk.unsupported.desktop;

jb/project/tools/test/check_jbr_size.sh

@@ -0,0 +1,162 @@
+#!/bin/bash
+
+set -euo pipefail
+
+TC_PRINT=0
+# Always print TeamCity service messages if running under TeamCity
+[[ -n "${TEAMCITY_VERSION:-}" ]] && TC_PRINT=1
+
+while getopts ":t" o; do
+    case "${o}" in
+        t) TC_PRINT=1 ;;
+        *);;
+    esac
+done
+shift $((OPTIND-1))
+
+NEWFILEPATH="$1"
+CONFIGID="$2"
+BUILDID="$3"
+TOKEN="$4"
+
+if [ ! -f "$NEWFILEPATH" ]; then
+  echo "File not found: $NEWFILEPATH"
+  exit 1
+fi
+#
+# Get the size of new artifact
+#
+
+unameOut="$(uname -s)"
+case "${unameOut}" in
+    Linux*)
+      NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
+      ;;
+    Darwin*)
+      NEWFILESIZE=$(stat -f%z "$NEWFILEPATH")
+      ;;
+    CYGWIN*)
+      NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
+      ;;
+    MINGW*)
+      NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
+      ;;
+    *)
+      echo "Unknown machine: ${unameOut}"
+      exit 1
+esac
+FILENAME=$(basename "${NEWFILEPATH}")
+
+#
+# Get pattern of artifact name
+# Base filename pattern: <BUNDLE_TYPE>-<JDK_VERSION>-<OS>-<ARCH>-b<BUILD>.tar.gz: jbr_dcevm-17.0.2-osx-x64-b1234.tar.gz
+# BUNDLE_TYPE: jbr, jbrsdk, jbr_dcevm, jbrsdk_jcef etc.
+# OS_ARCH_PATTERN - <os_architecture>: osx-x64, linux-aarch64, linux-musl-x64, windows-x64 etc.
+
+BUNDLE_TYPE=jbrsdk
+OS_ARCH_PATTERN=""
+FILE_EXTENSION=tar.gz
+
+re='(jbr[a-z_]*).*-[0-9_\.]+-(.+)-b[0-9]+(.+)'
+if [[ $FILENAME =~ $re ]]; then
+  BUNDLE_TYPE=${BASH_REMATCH[1]}
+  OS_ARCH_PATTERN=${BASH_REMATCH[2]}
+  FILE_EXTENSION=${BASH_REMATCH[3]}
+else
+  echo "File name $FILENAME does not match regex $re"
+  exit 1
+fi
+
+function test_started_msg() {
+  if [ $TC_PRINT -eq 1 ]; then
+    echo "##teamcity[testStarted name='$1']"
+  fi
+}
+
+function test_failed_msg() {
+  if [ $TC_PRINT -eq 1 ]; then
+    echo "##teamcity[testFailed name='$1' message='$2']"
+  fi
+}
+
+function test_finished_msg() {
+  if [ $TC_PRINT -eq 1 ]; then
+    echo "##teamcity[testFinished name='$1']"
+  fi
+}
+
+test_name="${BUNDLE_TYPE}_${OS_ARCH_PATTERN//\-/_}${FILE_EXTENSION//\./_}"
+test_started_msg "$test_name"
+
+echo "BUNDLE_TYPE: $BUNDLE_TYPE"
+echo "OS_ARCH_PATTERN: $OS_ARCH_PATTERN"
+echo "FILE_EXTENSION: $FILE_EXTENSION"
+echo "Size of $FILENAME is $NEWFILESIZE bytes"
+
+#
+# Get previous successful build ID
+# Example:
+# CONFIGID=IntellijCustomJdk_Jdk17_Master_LinuxX64jcef
+# BUILDID=12345678
+#
+# expected return value
+# id="123".number="567"
+#
+CURL_RESPONSE=$(curl -sSL --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/?locator=buildType:(id:$CONFIGID),status:success,count:1,finishDate:(build:$BUILDID,condition:before)")
+re='id=\"([0-9]+)\".+number=\"([0-9\.]+)\"'
+
+# ID: Previous successful build id
+ID=0
+if [[ $CURL_RESPONSE =~ $re ]]; then
+  ID=${BASH_REMATCH[1]}
+  echo "Previous build ID: $ID"
+  echo "Previous build number: ${BASH_REMATCH[2]}"
+else
+  msg="ERROR: cannot find previous build"
+  echo "$msg"
+  echo "$CURL_RESPONSE"
+  test_failed_msg "$test_name" "$msg"
+  test_finished_msg "$test_name"
+  exit 1
+fi
+
+#
+# Get artifacts from previous successful build
+#
+# expected return value
+# name="jbrsdk_jcef*.tar.gz size="123'
+#
+CURL_RESPONSE=$(curl -sSL --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/$ID?fields=id,number,artifacts(file(name,size))")
+echo "Artifacts of the previous build:"
+echo "$CURL_RESPONSE"
+
+# Find binary size (in response) with reg exp
+re="name=\"(${BUNDLE_TYPE}[^\"]+${OS_ARCH_PATTERN}[^\"]+${FILE_EXTENSION})\" size=\"([0-9]+)\""
+
+if [[ $CURL_RESPONSE =~ $re ]]; then
+  prevFileName=${BASH_REMATCH[1]}
+  echo "Previous artifact name: $prevFileName"
+  prevFileSize=${BASH_REMATCH[2]}
+  echo "Previous artifact size: $prevFileSize"
+
+  ((allowedSize=prevFileSize+prevFileSize/20)) # use 5% threshold
+  echo "Allowed size: $allowedSize"
+  if [[ "$NEWFILESIZE" -gt "$allowedSize" ]]; then
+    msg="ERROR: new size is significantly greater than previous size (need to investigate)"
+    echo "$msg"
+    test_failed_msg "$test_name" "$msg"
+    test_finished_msg "$test_name"
+    exit 1
+  else
+    echo "PASSED"
+    test_finished_msg "$test_name"
+  fi
+else
+  msg="ERROR: cannot find string with size in xml response:"
+  echo "Regex: $re"
+  echo "$msg"
+  echo "$CURL_RESPONSE"
+  test_failed_msg "$test_name" "$msg"
+  test_finished_msg "$test_name"
+  exit 1
+fi

jb/project/tools/test/perfcmp.sh

@@ -0,0 +1,93 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+usage ()
+{
+echo "Usage: perfcmp.sh [options] <test_results_cur> <test_results_ref> <results> <test_prefix> <noHeaders>"
+echo "Options:"
+echo -e " -h, --help\tdisplay this help"
+echo -e " -tc\tprint teacmity statistic"
+echo -e "test_results_cur - the file with  metrics values for the current measuring"
+echo -e "test_results_ref - the file with metrics values for the reference measuring"
+echo -e "results - results of comaprison"
+echo -e "test_prefix - specifys measuring type, makes sense for enabled -tc, by default no prefixes"
+echo -e "noHeaders - by default 1-st line contains headers"
+echo -e ""
+echo -e "test_results_* files content should be in csv format with header and tab separator:"
+echo -e "The 1-st column is the test name"
+echo -e "The 2-st column is the test value"
+echo -e ""
+echo -e "Example:"
+echo -e "Test           Value"
+echo -e "Testname       51.54"
+}
+
+while [ -n "$1" ]
+do
+case "$1" in
+-h | --help) usage
+exit 1 ;;
+-tc) tc=1
+  shift
+  break  ;;
+*) break;;
+esac
+done
+
+if [[ "$#" < "3" ]]; then
+    echo "Error: Invalid arguments"
+    usage
+    exit 1
+fi
+
+curFile=$1
+refFile=$2
+resFile=$3
+testNamePrefix=$4
+noHeaders=$5
+echo $curFile
+echo $refFile
+echo $resFile
+
+curValues=`cat "$curFile" | cut -f 2 | tr -d '\t'`
+if [ -z $noHeaders ]; then
+  curValuesHeader=`echo "$curValues" | head -n +1`_cur
+  header=`cat "$refFile" | head -n +1 | awk -F'\t' -v x=$curValuesHeader '{print "  "$1"\t"$2"_ref\t"x"\tratio"}'`
+  testContent=`paste -d '\t' $refFile <(echo "$curValues") | tail -n +2`
+else
+  testContent=`paste -d '\t' $refFile <(echo "$curValues") | tail -n +1`
+fi
+
+testContent=`echo "$testContent" | tr "," "." | awk -F'\t' '{
+  if ($3>$2+$2*0.1) {
+    print "* "$1"\t"$2"\t"$3"\t"(($2>0)?$3/$2:"-")
+  } else {
+    print "  "$1"\t"$2"\t"$3"\t"(($2>0)?$3/$2:"-")
+  }
+}'`
+if [ -z $noHeaders ]; then
+  echo "$header" > $resFile
+fi
+echo "$testContent" >> $resFile
+cat "$resFile" | tr '\t' ';' | column -t -s ';' | tee $resFile
+
+if [ -z $tc ]; then
+exit 0
+fi
+
+failed=0
+echo "$testContent" 2>&1 | (
+    while read -r s; do
+        testname=`echo "$s" | cut -f 1 | tr -d "[:space:]" |  tr -d "*"`
+        duration=`echo "$s" | cut -f 3`
+        echo "$s" | cut -c1 | grep -c "*" && failed=1
+        echo \#\#teamcity[testStarted name=\'$testNamePrefix$testname\']
+        echo "===>$s"
+        echo \#\#teamcity[buildStatisticValue key=\'$testNamePrefix$testname\' value=\'$duration\']
+        [ $failed -eq 1 ] && echo \#\#teamcity[testFailed name=\'$testNamePrefix$testname\' message=\'$s\']
+        echo \#\#teamcity[testFinished name=\'$testNamePrefix$testname\' duration=\'$duration\']
+        failed=0
+    done
+)

jb/project/tools/windows/scripts/mkimages_aarch64.sh

@@ -0,0 +1,152 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+# This script makes test-image along with JDK images when bundle_type is set to "jcef".
+# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+#
+# Environment variables:
+#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
+#               to configure
+#               By default JDK_BUILD_NUMBER is set zero
+#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
+#               By default JCEF binaries should be located in ./jcef_win_aarch64
+
+if [ -z "$BUILD_JDK" ]; then
+  echo "BUILD_JDK environment variable must be specified and point to a JDK built from the current sources" \
+       " and is able to run on the build system. See OpenJDK documentation for --with-build-jdk for more info."
+  exit 1
+fi
+
+source jb/project/tools/common/scripts/common.sh
+
+WORK_DIR=$(pwd)
+JCEF_PATH=${JCEF_PATH:=$WORK_DIR/jcef_win_aarch64}
+NVDA_PATH=${NVDA_PATH:=$WORK_DIR/nvda_controllerClient}
+
+function do_configure {
+  sh ./configure \
+    --enable-option-checking=fatal \
+    --openjdk-target=aarch64-unknown-cygwin \
+    $WITH_DEBUG_LEVEL \
+    --with-vendor-name="$VENDOR_NAME" \
+    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
+    --with-jvm-features=shenandoahgc \
+    --with-version-pre= \
+    --with-version-build=$JDK_BUILD_NUMBER \
+    --with-version-opt=b${build_number} \
+    --with-toolchain-version=$TOOLCHAIN_VERSION \
+    --with-boot-jdk=$BOOT_JDK \
+    --with-build-jdk=$BUILD_JDK \
+    --with-nvdacontrollerclient=$NVDA_PATH \
+    --disable-ccache \
+    --enable-cds=yes \
+    $STATIC_CONF_ARGS \
+    $REPRODUCIBLE_BUILD_OPTS \
+    || do_exit $?
+}
+
+function create_image_bundle {
+  __bundle_name=$1
+  __arch_name=$2
+  __modules_path=$3
+  __modules=$4
+
+  fastdebug_infix=''
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
+
+  echo Running jlink ...
+  ${BUILD_JDK}/bin/jlink \
+    --module-path $__modules_path --no-man-pages --compress=2 \
+    --add-modules $__modules --output $__root_dir || do_exit $?
+
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__root_dir/release
+  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
+    sed 's/JBR/JBRSDK/g' $__root_dir/release > release
+    mv release $__root_dir/release
+    cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
+    cp $IMAGES_DIR/jdk/bin/server/*.jsa $__root_dir/bin/server
+    for dir in $(ls -d $IMAGES_DIR/jdk/*); do
+      rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
+    done
+    copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
+  fi
+}
+
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=windows-aarch64-server-release
+
+case "$bundle_type" in
+  "jcef")
+    do_reset_changes=0
+    do_maketest=1
+    ;;
+  "nomod" | "")
+    bundle_type=""
+    ;;
+  "fd")
+    do_reset_changes=0
+    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+    RELEASE_NAME=windows-aarch64-server-fastdebug
+    ;;
+esac
+
+if [ -z "${INC_BUILD:-}" ]; then
+  do_configure || do_exit $?
+  if [ $do_maketest -eq 1 ]; then
+    make LOG=info CONF=$RELEASE_NAME clean images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+  else
+    make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
+  fi
+else
+  if [ $do_maketest -eq 1 ]; then
+    make LOG=info CONF=$RELEASE_NAME images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+  else
+    make LOG=info CONF=$RELEASE_NAME images || do_exit $?
+  fi
+fi
+
+IMAGES_DIR=build/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk
+JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBRSDK_BUNDLE=jbrsdk
+
+where cygpath
+if [ $? -eq 0 ]; then
+  JCEF_PATH="$(cygpath -w $JCEF_PATH | sed 's/\\/\//g')"
+fi
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
+  git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
+  update_jsdk_mods "$BUILD_JDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
+  cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not unchanged
+
+  jbr_name_postfix="_${bundle_type}"
+  cat $JCEF_PATH/jcef.version >> $JSDK/release
+else
+  jbr_name_postfix=""
+fi
+
+# create runtime image bundle
+modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
+modules+=",jdk.crypto.mscapi"
+create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
+
+# create sdk image bundle
+modules=$(cat ${JSDK}/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\r//g | sed s/\\n//g) || do_exit $?
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
+fi
+create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
+
+do_exit 0

jb/project/tools/windows/scripts/mkimages_x64.sh

@@ -0,0 +1,143 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+# This script makes test-image along with JDK images when bundle_type is set to "jcef".
+# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+#
+# Environment variables:
+#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
+#               to configure
+#               By default JDK_BUILD_NUMBER is set zero
+#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
+#               By default JCEF binaries should be located in ./jcef_win_x64
+
+source jb/project/tools/common/scripts/common.sh
+
+WORK_DIR=$(pwd)
+JCEF_PATH=${JCEF_PATH:=$WORK_DIR/jcef_win_x64}
+NVDA_PATH=${NVDA_PATH:=$WORK_DIR/nvda_controllerClient}
+
+function do_configure {
+  sh ./configure \
+    $WITH_DEBUG_LEVEL \
+    --with-vendor-name="$VENDOR_NAME" \
+    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
+    --with-jvm-features=shenandoahgc \
+    --with-version-pre= \
+    --with-version-build=$JDK_BUILD_NUMBER \
+    --with-version-opt=b${build_number} \
+    --with-toolchain-version=$TOOLCHAIN_VERSION \
+    --with-boot-jdk=$BOOT_JDK \
+    --with-nvdacontrollerclient=$NVDA_PATH \
+    --disable-ccache \
+    --enable-cds=yes \
+    $STATIC_CONF_ARGS \
+    $REPRODUCIBLE_BUILD_OPTS \
+    || do_exit $?
+}
+
+function create_image_bundle {
+  __bundle_name=$1
+  __arch_name=$2
+  __modules_path=$3
+  __modules=$4
+
+  fastdebug_infix=''
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
+
+  echo Running jlink ...
+  ${JSDK}/bin/jlink \
+    --module-path $__modules_path --no-man-pages --compress=2 \
+    --generate-cds-archive --add-modules $__modules --output $__root_dir || do_exit $?
+
+    grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__root_dir/release
+    if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
+    sed 's/JBR/JBRSDK/g' $__root_dir/release > release
+    mv release $__root_dir/release
+    cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
+    cp $IMAGES_DIR/jdk/bin/server/*.jsa $__root_dir/bin/server
+    for dir in $(ls -d $IMAGES_DIR/jdk/*); do
+      rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
+    done
+    copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
+  fi
+}
+
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=windows-x86_64-server-release
+
+case "$bundle_type" in
+  "jcef")
+    do_reset_changes=0
+    do_maketest=1
+    ;;
+  "nomod" | "")
+    bundle_type=""
+    ;;
+  "fd")
+    do_reset_changes=0
+    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+    RELEASE_NAME=windows-x86_64-server-fastdebug
+    ;;
+esac
+
+if [ -z "${INC_BUILD:-}" ]; then
+  do_configure || do_exit $?
+  if [ $do_maketest -eq 1 ]; then
+    make LOG=info CONF=$RELEASE_NAME clean images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+  else
+    make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
+  fi
+else
+  if [ $do_maketest -eq 1 ]; then
+    make LOG=info CONF=$RELEASE_NAME images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+  else
+    make LOG=info CONF=$RELEASE_NAME images || do_exit $?
+  fi
+fi
+
+IMAGES_DIR=build/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk
+JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBRSDK_BUNDLE=jbrsdk
+
+where cygpath
+if [ $? -eq 0 ]; then
+  JCEF_PATH="$(cygpath -w $JCEF_PATH | sed 's/\\/\//g')"
+fi
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
+  git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
+  update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
+  cp $JCEF_PATH/jmods/* ${JSDK_MODS_DIR} # $JSDK/jmods is not unchanged
+
+  jbr_name_postfix="_${bundle_type}"
+  cat $JCEF_PATH/jcef.version >> $JSDK/release
+else
+  jbr_name_postfix=""
+fi
+
+# create runtime image bundle
+modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
+modules+=",jdk.crypto.mscapi"
+create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
+
+# create sdk image bundle
+modules=$(cat ${JSDK}/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\r//g | sed s/\\n//g)
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
+fi
+create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
+
+do_exit 0

jb/project/tools/windows/scripts/mkimages_x86.sh

@@ -0,0 +1,132 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
+#
+
+source jb/project/tools/common/scripts/common.sh
+
+WORK_DIR=$(pwd)
+NVDA_PATH=${NVDA_PATH:=$WORK_DIR/nvda_controllerClient}
+
+
+function do_configure {
+  sh ./configure \
+    $WITH_DEBUG_LEVEL \
+    --with-vendor-name="$VENDOR_NAME" \
+    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
+    --with-jvm-features=shenandoahgc \
+    --with-version-pre= \
+    --with-version-build=$JDK_BUILD_NUMBER \
+    --with-version-opt=b${build_number} \
+    --with-toolchain-version=$TOOLCHAIN_VERSION \
+    --with-boot-jdk=$BOOT_JDK \
+    --with-nvdacontrollerclient=$NVDA_PATH \
+    --disable-ccache \
+    --enable-cds=yes \
+    $STATIC_CONF_ARGS \
+    $REPRODUCIBLE_BUILD_OPTS \
+    || do_exit $?
+}
+
+function create_image_bundle {
+  __bundle_name=$1
+  __arch_name=$2
+  __modules_path=$3
+  __modules=$4
+
+  fastdebug_infix=''
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
+
+  echo Running jlink ...
+  ${JSDK}/bin/jlink \
+    --module-path $__modules_path --no-man-pages --compress=2 \
+    --generate-cds-archive --add-modules $__modules --output $__root_dir || do_exit $?
+
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__root_dir/release
+  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
+    sed 's/JBR/JBRSDK/g' $__root_dir/release > release
+    mv release $__root_dir/release
+    cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
+    cp $IMAGES_DIR/jdk/bin/server/*.jsa $__root_dir/bin/server
+    for dir in $(ls -d $IMAGES_DIR/jdk/*); do
+      rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
+    done
+    copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
+  fi
+}
+
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=windows-x86_64-server-release
+
+case "$bundle_type" in
+  "jcef")
+    echo "not implemented" && do_exit 1
+    ;;
+  "nomod" | "")
+    bundle_type=""
+    ;;
+  "fd")
+    do_reset_changes=0
+    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+    RELEASE_NAME=windows-x86_64-server-fastdebug
+    ;;
+esac
+
+if [ -z "${INC_BUILD:-}" ]; then
+  do_configure || do_exit $?
+  if [ $do_maketest -eq 1 ]; then
+    make LOG=info CONF=$RELEASE_NAME clean images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+  else
+    make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
+  fi
+else
+  if [ $do_maketest -eq 1 ]; then
+    make LOG=info CONF=$RELEASE_NAME images test-image jbr-api JBR_API_JBR_VERSION=TEST || do_exit $?
+  else
+    make LOG=info CONF=$RELEASE_NAME images || do_exit $?
+  fi
+fi
+
+IMAGES_DIR=build/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk
+JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBRSDK_BUNDLE=jbrsdk
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
+  git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
+  update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
+  cp $JCEF_PATH/jmods/* ${JSDK_MODS_DIR} # $JSDK/jmods is not unchanged
+
+  jbr_name_postfix="_${bundle_type}"
+else
+  jbr_name_postfix=""
+fi
+
+# create runtime image bundle
+modules=$(grep -v "jdk.internal.vm" jb/project/tools/common/modules.list | xargs | sed s/" "//g) || do_exit $?
+modules+=",jdk.crypto.mscapi"
+create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
+
+# create sdk image bundle
+modules=$(cat ${JSDK}/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\r//g | sed s/\\n//g)
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
+fi
+create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
+
+do_exit 0

jb/project/tools/windows/scripts/pack_aarch64.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+# This script packs test-image along with JDK images when bundle_type is set to "jcef".
+# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+#
+
+source jb/project/tools/common/scripts/common.sh
+
+[ "$bundle_type" == "jcef" ] && do_maketest=1
+
+function pack_jbr {
+  __bundle_name=$1
+  __arch_name=$2
+
+  fastdebug_infix=''
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  JBR=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
+
+  echo Creating $JBR.tar.gz ...
+
+  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__root_dir || do_exit $?
+}
+
+[ "$bundle_type" == "nomod" ] && bundle_type=""
+
+JBRSDK_BUNDLE=jbrsdk
+RELEASE_NAME=windows-aarch64-server-release
+IMAGES_DIR=build/$RELEASE_NAME/images
+BASE_DIR=.
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_type" == "fd" ]; then
+  jbr_name_postfix="_${bundle_type}"
+else
+  jbr_name_postfix=""
+fi
+
+pack_jbr jbr${jbr_name_postfix} jbr
+pack_jbr jbrsdk${jbr_name_postfix} jbrsdk
+
+if [ $do_maketest -eq 1 ]; then
+  JBRSDK_TEST=$JBRSDK_BUNDLE-$JBSDK_VERSION-windows-test-aarch64-b$build_number
+  cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test" || do_exit $?
+  echo Creating $JBRSDK_TEST.tar.gz ...
+  /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
+fi

jb/project/tools/windows/scripts/pack_x64.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               jcef - the release bundles with jcef
+#               fd - the fastdebug bundles which also include the jcef module
+#
+# This script packs test-image along with JDK images when bundle_type is set to "jcef".
+# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+#
+
+source jb/project/tools/common/scripts/common.sh
+
+[ "$bundle_type" == "jcef" ] && do_maketest=1
+
+function pack_jbr {
+  __bundle_name=$1
+  __arch_name=$2
+
+  fastdebug_infix=''
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  JBR=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
+
+  echo Creating $JBR.tar.gz ...
+  chmod -R ug+rwx,o+rx ${BASE_DIR}/$__root_dir
+  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__root_dir || do_exit $?
+}
+
+[ "$bundle_type" == "nomod" ] && bundle_type=""
+
+JBRSDK_BUNDLE=jbrsdk
+RELEASE_NAME=windows-x86_64-server-release
+IMAGES_DIR=build/$RELEASE_NAME/images
+BASE_DIR=.
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_type" == "fd" ]; then
+  jbr_name_postfix="_${bundle_type}"
+else
+  jbr_name_postfix=""
+fi
+
+pack_jbr jbr${jbr_name_postfix} jbr
+pack_jbr jbrsdk${jbr_name_postfix} jbrsdk
+
+if [ $do_maketest -eq 1 ]; then
+  JBRSDK_TEST=$JBRSDK_BUNDLE-$JBSDK_VERSION-windows-test-x64-b$build_number
+  cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test" || do_exit $?
+  echo Creating $JBRSDK_TEST.tar.gz ...
+  /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
+fi

jb/project/tools/windows/scripts/pack_x86.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+# The following parameters must be specified:
+#   build_number - specifies the number of JetBrainsRuntime build
+#   bundle_type  - specifies bundle to be built;possible values:
+#               <empty> or nomod - the release bundles without any additional modules (jcef)
+#               fd - the fastdebug bundles which also include the jcef module
+#
+
+source jb/project/tools/common/scripts/common.sh
+
+[ "$bundle_type" == "jcef" ] && echo "not implemented" && do_exit 1
+
+function pack_jbr {
+  __bundle_name=$1
+  __arch_name=$2
+
+  fastdebug_infix=''
+
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  JBR=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
+  __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
+
+  echo Creating $JBR.tar.gz ...
+  chmod -R ug+rwx,o+rx ${BASE_DIR}/$__root_dir
+  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__root_dir || do_exit $?
+}
+
+[ "$bundle_type" == "nomod" ] && bundle_type=""
+
+JBRSDK_BUNDLE=jbrsdk
+RELEASE_NAME=windows-x86_64-server-release
+IMAGES_DIR=build/$RELEASE_NAME/images
+BASE_DIR=.
+
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_type" == "fd" ]; then
+  jbr_name_postfix="_${bundle_type}"
+else
+  jbr_name_postfix=""
+fi
+
+pack_jbr jbr${jbr_name_postfix} jbr
+pack_jbr jbrsdk${jbr_name_postfix} jbrsdk
+
+if [ $do_maketest -eq 1 ]; then
+  JBRSDK_TEST=$JBRSDK_BUNDLE-$JBSDK_VERSION-windows-test-x86-b$build_number
+  cp "build/${RELEASE_NAME}/jbr-api/jbr-api.jar" "${IMAGES_DIR}/test" || do_exit $?
+  echo Creating $JBRSDK_TEST.tar.gz ...
+  /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $BASE_DIR --exclude='test/jdk/demos' test || do_exit $?
+fi

make/Docs.gmk

@@ -642,7 +642,7 @@ ifeq ($(ENABLE_PANDOC), true)
   GLOBAL_SPECS_DEFAULT_CSS_FILE := $(DOCS_OUTPUTDIR)/resources/jdk-default.css
   # Unset the following to suppress the link to the tool guides
   NAV_LINK_GUIDES := --nav-link-guides
-  HEADER_RIGHT_SIDE_INFO := <strong>$(subst &amp;,&,$(JDK_SHORT_NAME))</strong>$(DRAFT_MARKER_STR)
+  HEADER_RIGHT_SIDE_INFO := <strong>$(subst &amp;,&,$(JDK_SHORT_NAME))$(DRAFT_MARKER_STR)</strong>
 
   $(foreach m, $(ALL_MODULES), \
     $(eval SPECS_$m := $(call FindModuleSpecsDirs, $m)) \

make/Global.gmk

@@ -87,9 +87,10 @@ help:
 	$(info $(_)                        # (gensrc, java, copy, libs, launchers, gendata))
 	$(info )
 	$(info Make control variables)
-	$(info $(_) CONF=<selector>        # Select which configuration(s) to build)
-	$(info $(_) CONF=                  # Select all configurations (note, assignment is empty))
-	$(info $(_) CONF_NAME=<string>     # Select the configuration with the name <string>)
+	$(info $(_) CONF=                  # Build all configurations (note, assignment is empty))
+	$(info $(_) CONF=<substring>       # Build the configuration(s) with a name matching)
+	$(info $(_)                        # <substring>)
+	$(info $(_) CONF_NAME=<string>     # Build the configuration with exactly the <string>)
 	$(info $(_) SPEC=<spec file>       # Build the configuration given by the spec file)
 	$(info $(_) LOG=<loglevel>         # Change the log level from warn to <loglevel>)
 	$(info $(_)                        # Available log levels are:)

make/Hsdis.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@ HSDIS_OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/hsdis
 REAL_HSDIS_NAME := hsdis-$(OPENJDK_TARGET_CPU_LEGACY_LIB)$(SHARED_LIBRARY_SUFFIX)
 BUILT_HSDIS_LIB := $(HSDIS_OUTPUT_DIR)/$(REAL_HSDIS_NAME)
 
-HSDIS_LINK_TYPE := C
+HSDIS_TOOLCHAIN := TOOLCHAIN_DEFAULT
 HSDIS_TOOLCHAIN_CFLAGS := $(CFLAGS_JDKLIB)
 HSDIS_TOOLCHAIN_LDFLAGS := $(LDFLAGS_JDKLIB)
 
@@ -59,8 +59,8 @@ endif
 
 ifeq ($(HSDIS_BACKEND), llvm)
   # Use C++ instead of C
-  HSDIS_LINK_TYPE := C++
   HSDIS_TOOLCHAIN_CFLAGS := $(CXXFLAGS_JDKLIB)
+  HSDIS_TOOLCHAIN := TOOLCHAIN_LINK_CXX
 
   ifeq ($(call isTargetOs, linux), true)
     LLVM_OS := pc-linux-gnu
@@ -91,11 +91,14 @@ ifeq ($(HSDIS_BACKEND), binutils)
       endif
     endif
 
-    BUILD_HSDIS_CC := $(MINGW_BASE)-gcc
-    BUILD_HSDIS_LD := $(MINGW_BASE)-ld
-    BUILD_HSDIS_OBJCOPY := $(MINGW_BASE)-objcopy
-    BUILD_HSDIS_SYSROOT_CFLAGS := --sysroot=$(MINGW_SYSROOT)
-    BUILD_HSDIS_SYSROOT_LDFLAGS := --sysroot=$(MINGW_SYSROOT)
+    $(eval $(call DefineNativeToolchain, TOOLCHAIN_MINGW, \
+        CC := $(MINGW_BASE)-gcc, \
+        LD := $(MINGW_BASE)-ld, \
+        OBJCOPY := $(MINGW_BASE)-objcopy, \
+        RC := $(RC), \
+        SYSROOT_CFLAGS := --sysroot=$(MINGW_SYSROOT), \
+        SYSROOT_LDFLAGS := --sysroot=$(MINGW_SYSROOT), \
+    ))
 
     MINGW_SYSROOT_LIB_PATH := $(MINGW_SYSROOT)/mingw/lib
     ifeq ($(wildcard $(MINGW_SYSROOT_LIB_PATH)), )
@@ -119,8 +122,8 @@ ifeq ($(HSDIS_BACKEND), binutils)
 
     TOOLCHAIN_TYPE := gcc
     OPENJDK_TARGET_OS := linux
-    OPENJDK_TARGET_OS_TYPE := unix
     CC_OUT_OPTION := -o$(SPACE)
+    LD_OUT_OPTION := -o$(SPACE)
     GENDEPS_FLAGS := -MMD -MF
     CFLAGS_DEBUG_SYMBOLS := -g
     DISABLED_WARNINGS :=
@@ -128,6 +131,7 @@ ifeq ($(HSDIS_BACKEND), binutils)
     CFLAGS_WARNINGS_ARE_ERRORS := -Werror
     SHARED_LIBRARY_FLAGS := -shared
 
+    HSDIS_TOOLCHAIN := TOOLCHAIN_MINGW
     HSDIS_TOOLCHAIN_CFLAGS :=
     HSDIS_TOOLCHAIN_LDFLAGS := -L$(MINGW_GCC_LIB_PATH) -L$(MINGW_SYSROOT_LIB_PATH)
     MINGW_DLLCRT := $(MINGW_SYSROOT_LIB_PATH)/dllcrt2.o
@@ -140,9 +144,9 @@ endif
 
 $(eval $(call SetupJdkLibrary, BUILD_HSDIS, \
     NAME := hsdis, \
-    LINK_TYPE := $(HSDIS_LINK_TYPE), \
     SRC := $(TOPDIR)/src/utils/hsdis/$(HSDIS_BACKEND), \
     EXTRA_HEADER_DIRS := $(TOPDIR)/src/utils/hsdis, \
+    TOOLCHAIN := $(HSDIS_TOOLCHAIN), \
     OUTPUT_DIR := $(HSDIS_OUTPUT_DIR), \
     OBJECT_DIR := $(HSDIS_OUTPUT_DIR), \
     DISABLED_WARNINGS_gcc := undef format-nonliteral sign-compare, \

make/InitSupport.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -202,14 +202,8 @@ ifeq ($(HAS_SPEC),)
           matching_confs := $$(strip $$(all_confs))
         else
           # Otherwise select those that contain the given CONF string
-          ifeq ($$(patsubst !%,,$$(CONF)),)
-            # A CONF starting with ! means we should negate the search term
-            matching_confs := $$(strip $$(foreach var, $$(all_confs), \
-               $$(if $$(findstring $$(subst !,,$$(CONF)), $$(var)), ,$$(var))))
-          else
-            matching_confs := $$(strip $$(foreach var, $$(all_confs), \
-                $$(if $$(findstring $$(CONF), $$(var)), $$(var))))
-          endif
+          matching_confs := $$(strip $$(foreach var, $$(all_confs), \
+              $$(if $$(findstring $$(CONF), $$(var)), $$(var))))
           ifneq ($$(filter $$(CONF), $$(matching_confs)), )
             # If we found an exact match, use that
             matching_confs := $$(CONF)
@@ -427,9 +421,8 @@ else # $(HAS_SPEC)=true
 
   # Cleanup after a compare build
   define CleanupCompareBuild
-        # If running with a COMPARE_BUILD patch, reverse-apply it, but continue
-        # even if that fails (can happen with removed files).
-	$(if $(COMPARE_BUILD_PATCH), cd $(topdir) && $(PATCH) -R -p1 < $(COMPARE_BUILD_PATCH) || true)
+        # If running with a COMPARE_BUILD patch, reverse-apply it
+	$(if $(COMPARE_BUILD_PATCH), cd $(topdir) && $(PATCH) -R -p1 < $(COMPARE_BUILD_PATCH))
         # Move this build away and restore the original build
 	$(MKDIR) -p $(topdir)/build/compare-build
 	$(MV) $(OUTPUTDIR) $(COMPARE_BUILD_OUTPUTDIR)

make/JBRApi.gmk

@@ -0,0 +1,93 @@
+#
+# Copyright 2000-2023 JetBrains s.r.o.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+
+JBR_API_ROOT_DIR   := $(TOPDIR)/src/jetbrains.api
+JBR_API_TOOLS_DIR  := $(JBR_API_ROOT_DIR)/tools
+JBR_API_SRC_DIR    := $(JBR_API_ROOT_DIR)/src
+JBR_API_OUTPUT_DIR := $(OUTPUTDIR)/jbr-api
+JBR_API_GENSRC_DIR := $(JBR_API_OUTPUT_DIR)/gensrc
+JBR_API_BIN_DIR    := $(JBR_API_OUTPUT_DIR)/bin
+JBR_API_VERSION_PROPERTIES := $(JBR_API_ROOT_DIR)/version.properties
+JBR_API_VERSION_GENSRC     := $(JBR_API_OUTPUT_DIR)/jbr-api.version
+JBR_API_GENSRC_BATCH       := $(JBR_API_VERSION_GENSRC)
+
+JBR_API_SRC_FILES := $(call FindFiles, $(JBR_API_SRC_DIR))
+JBR_API_GENSRC_FILES := $(foreach f, $(call FindFiles, $(JBR_API_SRC_DIR)), \
+    $(JBR_API_GENSRC_DIR)/$(call RelativePath, $f, $(JBR_API_SRC_DIR)))
+
+ifeq ($(JBR_API_JBR_VERSION),)
+  JBR_API_JBR_VERSION := DEVELOPMENT
+  JBR_API_FAIL_ON_HASH_MISMATCH := false
+else
+  .PHONY: $(JBR_API_VERSION_PROPERTIES)
+  JBR_API_FAIL_ON_HASH_MISMATCH := true
+endif
+
+ARCHIVE_BUILD_JBR_API_BIN := $(JBR_API_BIN_DIR)
+$(eval $(call SetupJavaCompilation, BUILD_JBR_API, \
+    SMALL_JAVA := true, \
+    COMPILER := bootjdk, \
+    SRC := $(JBR_API_GENSRC_DIR), \
+    EXTRA_FILES := $(JBR_API_GENSRC_FILES), \
+    BIN := $(JBR_API_BIN_DIR), \
+    JAR := $(JBR_API_OUTPUT_DIR)/jbr-api.jar, \
+))
+
+$(eval $(call SetupJarArchive, BUILD_JBR_API_SOURCES_JAR, \
+    DEPENDENCIES := $(JBR_API_GENSRC_FILES), \
+    SRCS := $(JBR_API_GENSRC_DIR), \
+    JAR := $(JBR_API_OUTPUT_DIR)/jbr-api-sources.jar, \
+    SUFFIXES := .java, \
+    BIN := $(JBR_API_BIN_DIR), \
+))
+
+# Grouped targets may not be supported, so hack dependencies: sources -> version file -> generated sources
+$(JBR_API_VERSION_GENSRC): $(JBR_API_SRC_FILES) $(JBR_API_VERSION_PROPERTIES) $(JBR_API_TOOLS_DIR)/Gensrc.java
+	$(ECHO) Generating sources for JBR API
+	$(JAVA_CMD) $(JAVA_FLAGS_SMALL) "$(JBR_API_TOOLS_DIR)/Gensrc.java" \
+	    "$(TOPDIR)/src" "$(JBR_API_OUTPUT_DIR)" "$(JBR_API_JBR_VERSION)"
+$(JBR_API_GENSRC_FILES): $(JBR_API_VERSION_GENSRC)
+	$(TOUCH) $@
+
+jbr-api-check-version: $(JBR_API_GENSRC_FILES) $(JBR_API_VERSION_PROPERTIES)
+	$(JAVA_CMD) $(JAVA_FLAGS_SMALL) "$(JBR_API_TOOLS_DIR)/CheckVersion.java" \
+	    "$(JBR_API_ROOT_DIR)" "$(JBR_API_GENSRC_DIR)" "$(JBR_API_FAIL_ON_HASH_MISMATCH)"
+
+jbr-api: $(BUILD_JBR_API) $(BUILD_JBR_API_SOURCES_JAR) jbr-api-check-version
+
+.PHONY: jbr-api jbr-api-check-version
+
+ifneq ($(JBR_API_CONF_FILE),)
+  $(JBR_API_CONF_FILE): $(JBR_API_GENSRC_FILES)
+	$(ECHO) "VERSION=`$(CAT) $(JBR_API_VERSION_GENSRC)`" > $(JBR_API_CONF_FILE)
+	$(ECHO) "JAR=$(JBR_API_OUTPUT_DIR)/jbr-api.jar" >> $(JBR_API_CONF_FILE)
+	$(ECHO) "SOURCES_JAR=$(JBR_API_OUTPUT_DIR)/jbr-api-sources.jar" >> $(JBR_API_CONF_FILE)
+  jbr-api: $(JBR_API_CONF_FILE)
+  .PHONY: $(JBR_API_CONF_FILE)
+endif

make/Main.gmk

@@ -969,28 +969,20 @@ else
 
   jdk.jdeps-gendata: java
 
-  # jdk.compiler gendata generates ct.sym, which requires all generated
-  # java source and compiled classes present.
-  jdk.compiler-gendata: $(JAVA_TARGETS)
-
-  # jdk.javadoc gendata generates element-list, which requires all java sources
-  # but not compiled classes.
-  jdk.javadoc-gendata: $(GENSRC_TARGETS)
-
-  # ct.sym and element-list generation also needs the BUILD_JDK. If the
-  # BUILD_JDK was supplied externally, no extra prerequisites are needed.
+  # The ct.sym generation uses all the moduleinfos as input
+  jdk.compiler-gendata: $(GENSRC_MODULEINFO_TARGETS) $(JAVA_TARGETS)
+  # jdk.compiler-gendata needs the BUILD_JDK. If the BUILD_JDK was supplied
+  # externally, no extra prerequisites are needed.
   ifeq ($(CREATE_BUILDJDK), true)
     ifneq ($(CREATING_BUILDJDK), true)
       # When cross compiling and an external BUILD_JDK wasn't supplied, it's
       # produced by the create-buildjdk target.
       jdk.compiler-gendata: create-buildjdk
-      jdk.javadoc-gendata: create-buildjdk
     endif
   else ifeq ($(EXTERNAL_BUILDJDK), false)
     # When not cross compiling, the BUILD_JDK is the interim jdk image, and
     # the javac launcher is needed.
     jdk.compiler-gendata: jdk.compiler-launchers
-    jdk.javadoc-gendata: jdk.compiler-launchers
   endif
 
   # Declare dependencies between jmod targets.
@@ -1468,6 +1460,14 @@ create-main-targets-include:
 	  @$(ECHO) ALL_MAIN_TARGETS := $(sort $(ALL_TARGETS)) > \
 	      $(MAKESUPPORT_OUTPUTDIR)/main-targets.gmk
 
+################################################################################
+# JBR API
+
+$(eval $(call SetupTarget, jbr-api, \
+    MAKEFILE := JBRApi, \
+    TARGET := jbr-api \
+))
+
 ################################################################################
 # Hook to include the corresponding custom file, if present.
 $(eval $(call IncludeCustomExtension, Main-post.gmk))

make/autoconf/basic.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -123,22 +123,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_BUILD_ENV],
       ]
   )
   AC_SUBST(BUILD_ENV)
-
-  if test "x$LOCALE" != x; then
-    # Check if we actually have C.UTF-8; if so, use it
-    if $LOCALE -a | $GREP -q -E "^C\.(utf8|UTF-8)$"; then
-      LOCALE_USED=C.UTF-8
-    else
-      AC_MSG_WARN([C.UTF-8 locale not found, using C locale])
-      LOCALE_USED=C
-    fi
-  else
-    AC_MSG_WARN([locale command not not found, using C locale])
-    LOCALE_USED=C
-  fi
-
-  export LC_ALL=$LOCALE_USED
-  AC_SUBST(LOCALE_USED)
 ])
 
 ###############################################################################

make/autoconf/basic_tools.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
   UTIL_REQUIRE_SPECIAL(SED, [AC_PROG_SED])
 
   # Tools only needed on some platforms
-  UTIL_LOOKUP_PROGS(LOCALE, locale)
   UTIL_LOOKUP_PROGS(PATHTOOL, cygpath wslpath)
   UTIL_LOOKUP_PROGS(CMD, cmd.exe, $PATH:/cygdrive/c/windows/system32:/mnt/c/windows/system32:/c/windows/system32)
 ])

make/autoconf/basic_windows.m4

@@ -89,8 +89,8 @@ AC_DEFUN([BASIC_SETUP_PATHS_WINDOWS],
   WINENV_TEMP_DIR=$($PATHTOOL -u $($CMD /q /c echo %TEMP% 2> /dev/null) | $TR -d '\r\n')
   AC_MSG_RESULT([$WINENV_TEMP_DIR])
 
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
-    # Don't trust the current directory for WSL2, but change to an OK temp dir
+  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl1" || test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
+    # Don't trust the current directory for WSL, but change to an OK temp dir
     cd "$WINENV_TEMP_DIR"
     # Bring along confdefs.h or autoconf gets all confused
     cp "$CONFIGURE_START_DIR/confdefs.h" "$WINENV_TEMP_DIR"
@@ -228,7 +228,7 @@ AC_DEFUN([BASIC_WINDOWS_FINALIZE_FIXPATH],
 # Platform-specific finalization
 AC_DEFUN([BASIC_WINDOWS_FINALIZE],
 [
-  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
+  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl1" || test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
     # Change back from temp dir
     cd $CONFIGURE_START_DIR
   fi

make/autoconf/build-aux/pkg.m4

@@ -25,7 +25,7 @@
 # questions.
 #
 
-#
+# 
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -54,18 +54,18 @@ AC_DEFUN([PKG_PROG_PKG_CONFIG],
 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-        AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 fi
 if test -n "$PKG_CONFIG"; then
-        _pkg_min_version=m4_default([$1], [0.9.0])
-        AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-        if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-                AC_MSG_RESULT([yes])
-        else
-                AC_MSG_RESULT([no])
-                PKG_CONFIG=""
-        fi
-
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+		
 fi[]dnl
 ])# PKG_PROG_PKG_CONFIG
 
@@ -97,7 +97,7 @@ m4_define([_PKG_CONFIG],
  elif test -n "$PKG_CONFIG"; then
     PKG_CHECK_EXISTS([$3],
                      [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-                     [pkg_failed=yes])
+		     [pkg_failed=yes])
  else
     pkg_failed=untried
 fi[]dnl
@@ -143,14 +143,14 @@ See the pkg-config man page for more details.])
 if test $pkg_failed = yes; then
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-        else
-                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
-        # Put the nasty error message in config.log where it belongs
-        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-        ifelse([$4], , [AC_MSG_ERROR(dnl
+	ifelse([$4], , [AC_MSG_ERROR(dnl
 [Package requirements ($2) were not met:
 
 $$1_PKG_ERRORS
@@ -160,10 +160,10 @@ installed software in a non-standard prefix.
 
 _PKG_TEXT
 ])],
-                [AC_MSG_RESULT([no])
+		[AC_MSG_RESULT([no])
                 $4])
 elif test $pkg_failed = untried; then
-        ifelse([$4], , [AC_MSG_FAILURE(dnl
+	ifelse([$4], , [AC_MSG_FAILURE(dnl
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -171,11 +171,11 @@ path to pkg-config.
 _PKG_TEXT
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-                [$4])
+		[$4])
 else
-        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-        $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
         AC_MSG_RESULT([yes])
-        ifelse([$3], , :, [$3])
+	ifelse([$3], , :, [$3])
 fi[]dnl
 ])# PKG_CHECK_MODULES

make/autoconf/buildjdk-spec.gmk.template

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,6 @@ LDCXX := @BUILD_LDCXX@
 AS := @BUILD_AS@
 NM := @BUILD_NM@
 AR := @BUILD_AR@
-LIB := @BUILD_LIB@
 OBJCOPY := @BUILD_OBJCOPY@
 STRIP := @BUILD_STRIP@
 SYSROOT_CFLAGS := @BUILD_SYSROOT_CFLAGS@

make/autoconf/flags-cflags.m4

@@ -40,6 +40,7 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
     SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
     SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
     SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
+    SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
 
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     if test "x$OPENJDK_TARGET_OS" = xmacosx; then
@@ -48,6 +49,7 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
       SET_EXECUTABLE_ORIGIN='-Wl,-rpath,@loader_path$(or [$]1,/.)'
       SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
       SET_SHARED_LIBRARY_NAME='-Wl,-install_name,@rpath/[$]1'
+      SET_SHARED_LIBRARY_MAPFILE='-Wl,-exported_symbols_list,[$]1'
 
     elif test "x$OPENJDK_TARGET_OS" = xaix; then
       # Linking is different on aix
@@ -55,12 +57,14 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
       SET_EXECUTABLE_ORIGIN=""
       SET_SHARED_LIBRARY_ORIGIN=''
       SET_SHARED_LIBRARY_NAME=''
+      SET_SHARED_LIBRARY_MAPFILE=''
 
     else
       # Default works for linux, might work on other platforms as well.
       SHARED_LIBRARY_FLAGS='-shared'
       SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
       SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
+      SET_SHARED_LIBRARY_MAPFILE='-Wl,-version-script=[$]1'
 
       # arm specific settings
       if test "x$OPENJDK_TARGET_CPU" = "xarm"; then
@@ -76,17 +80,20 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
     SET_EXECUTABLE_ORIGIN=""
     SET_SHARED_LIBRARY_ORIGIN=''
     SET_SHARED_LIBRARY_NAME=''
+    SET_SHARED_LIBRARY_MAPFILE=''
 
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     SHARED_LIBRARY_FLAGS="-dll"
     SET_EXECUTABLE_ORIGIN=''
     SET_SHARED_LIBRARY_ORIGIN=''
     SET_SHARED_LIBRARY_NAME=''
+    SET_SHARED_LIBRARY_MAPFILE='-def:[$]1'
   fi
 
   AC_SUBST(SET_EXECUTABLE_ORIGIN)
   AC_SUBST(SET_SHARED_LIBRARY_ORIGIN)
   AC_SUBST(SET_SHARED_LIBRARY_NAME)
+  AC_SUBST(SET_SHARED_LIBRARY_MAPFILE)
   AC_SUBST(SHARED_LIBRARY_FLAGS)
 ])
 
@@ -115,11 +122,6 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
             # Add debug prefix map gcc system include paths, as they cause
             # non-deterministic debug paths depending on gcc path location.
             DEBUG_PREFIX_MAP_GCC_INCLUDE_PATHS
-
-            # Add debug prefix map for OUTPUTDIR to handle the scenario when
-            # it is not located within WORKSPACE_ROOT
-            outputdir_slash="${OUTPUTDIR%/}/"
-            DEBUG_PREFIX_CFLAGS="$DEBUG_PREFIX_CFLAGS -fdebug-prefix-map=${outputdir_slash}="
         ]
       )
     fi
@@ -477,14 +479,13 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
 [
   #### OS DEFINES, these should be independent on toolchain
   if test "x$OPENJDK_TARGET_OS" = xlinux; then
-    CFLAGS_OS_DEF_JVM="-DLINUX -D_FILE_OFFSET_BITS=64"
-    CFLAGS_OS_DEF_JDK="-D_GNU_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
+    CFLAGS_OS_DEF_JVM="-DLINUX"
+    CFLAGS_OS_DEF_JDK="-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
   elif test "x$OPENJDK_TARGET_OS" = xmacosx; then
     CFLAGS_OS_DEF_JVM="-D_ALLBSD_SOURCE -D_DARWIN_C_SOURCE -D_XOPEN_SOURCE"
     CFLAGS_OS_DEF_JDK="-D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
   elif test "x$OPENJDK_TARGET_OS" = xaix; then
-    CFLAGS_OS_DEF_JVM="-DAIX -D_LARGE_FILES"
-    CFLAGS_OS_DEF_JDK="-D_LARGE_FILES"
+    CFLAGS_OS_DEF_JVM="-DAIX"
   elif test "x$OPENJDK_TARGET_OS" = xbsd; then
     CFLAGS_OS_DEF_JDK="-D_ALLBSD_SOURCE"
   elif test "x$OPENJDK_TARGET_OS" = xwindows; then
@@ -542,7 +543,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     ALWAYS_DEFINES_JVM="-D_GNU_SOURCE"
   elif test "x$TOOLCHAIN_TYPE" = xxlc; then
     ALWAYS_DEFINES_JVM="-D_REENTRANT"
-    ALWAYS_DEFINES_JDK="-D_GNU_SOURCE -D_REENTRANT -DSTDC"
+    ALWAYS_DEFINES_JDK="-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     # Access APIs for Windows 8 and above
     # see https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=msvc-170

make/autoconf/flags-ldflags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -93,7 +93,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     BASIC_LDFLAGS_JVM_ONLY="-Wl,-lC_r -bbigtoc"
 
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    BASIC_LDFLAGS="-opt:ref"
+    BASIC_LDFLAGS="-nologo -opt:ref"
     BASIC_LDFLAGS_JDK_ONLY="-incremental:no"
     BASIC_LDFLAGS_JVM_ONLY="-opt:icf,8 -subsystem:windows"
   fi

make/autoconf/flags-other.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,9 @@ AC_DEFUN([FLAGS_SETUP_ARFLAGS],
   # FIXME: figure out if we should select AR flags depending on OS or toolchain.
   if test "x$OPENJDK_TARGET_OS" = xaix; then
     ARFLAGS="-X64"
+  elif test "x$OPENJDK_TARGET_OS" = xwindows; then
+    # lib.exe is used as AR to create static libraries.
+    ARFLAGS="-nologo -NODEFAULTLIB:MSVCRT"
   else
     ARFLAGS=""
   fi
@@ -40,18 +43,6 @@ AC_DEFUN([FLAGS_SETUP_ARFLAGS],
   AC_SUBST(ARFLAGS)
 ])
 
-AC_DEFUN([FLAGS_SETUP_LIBFLAGS],
-[
-  # LIB is used to create static libraries on Windows
-  if test "x$OPENJDK_TARGET_OS" = xwindows; then
-    LIBFLAGS="-nodefaultlib:msvcrt"
-  else
-    LIBFLAGS=""
-  fi
-
-  AC_SUBST(LIBFLAGS)
-])
-
 AC_DEFUN([FLAGS_SETUP_STRIPFLAGS],
 [
   ## Setup strip.

make/autoconf/flags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -364,12 +364,24 @@ AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL],
 
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     CC_OUT_OPTION=-Fo
+    LD_OUT_OPTION=-out:
+    AR_OUT_OPTION=-out:
   else
     # The option used to specify the target .o,.a or .so file.
     # When compiling, how to specify the to be created object file.
     CC_OUT_OPTION='-o$(SPACE)'
+    # When linking, how to specify the output
+    LD_OUT_OPTION='-o$(SPACE)'
+    # When archiving, how to specify the destination static archive.
+    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+      AR_OUT_OPTION='-r -cs$(SPACE)'
+    else
+      AR_OUT_OPTION='-rcs$(SPACE)'
+    fi
   fi
   AC_SUBST(CC_OUT_OPTION)
+  AC_SUBST(LD_OUT_OPTION)
+  AC_SUBST(AR_OUT_OPTION)
 
   # Generate make dependency files
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
@@ -411,7 +423,6 @@ AC_DEFUN([FLAGS_SETUP_FLAGS],
   FLAGS_SETUP_LDFLAGS
 
   FLAGS_SETUP_ARFLAGS
-  FLAGS_SETUP_LIBFLAGS
   FLAGS_SETUP_STRIPFLAGS
   FLAGS_SETUP_RCFLAGS
   FLAGS_SETUP_NMFLAGS

make/autoconf/jdk-options.m4

@@ -234,6 +234,31 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
   fi
   AC_SUBST(HOTSPOT_OVERRIDE_LIBPATH)
 
+  # Should we build the client for the JAWS screen reader?
+  if test "x$OPENJDK_TARGET_OS" = xwindows; then
+    AC_MSG_CHECKING([if JAWS client support is enabled])
+
+    A11Y_JAWS_ANNOUNCING_ENABLED=true
+    AC_ARG_ENABLE(
+      [jaws-client],
+      [AS_HELP_STRING([--disable-jaws-client], [Set to disable to exclude the client for the JAWS screen reader from the build])],
+      [
+        if test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
+          AC_MSG_WARN([--[enable|disable]-jaws-client[=*] flags are ignored for headless builds])
+        elif test "x$enableval" != xyes; then
+          A11Y_JAWS_ANNOUNCING_ENABLED=false
+        fi
+      ]
+    )
+    if test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
+      A11Y_JAWS_ANNOUNCING_ENABLED=false
+    fi
+
+    AC_MSG_RESULT([$A11Y_JAWS_ANNOUNCING_ENABLED])
+  else
+    A11Y_JAWS_ANNOUNCING_ENABLED=false
+  fi
+  AC_SUBST(A11Y_JAWS_ANNOUNCING_ENABLED)
 ])
 
 ###############################################################################

make/autoconf/lib-nvdacontrollerclient.m4

@@ -0,0 +1,121 @@
+#
+# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, JetBrains s.r.o.. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+################################################################################
+# Setup nvdacontrollerclient (The library for communication with
+# NVDA - a screen reader for Microsoft Windows)
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_NVDACONTROLLERCLIENT], [
+  # To enable NVDA, user specifies neither --with-nvdacontrollerclient or
+  # a pair (--with-nvdacontrollerclient-include, --with-nvdacontrollerclient-lib)
+  AC_ARG_WITH(nvdacontrollerclient, [AS_HELP_STRING([--with-nvdacontrollerclient],
+      [specify prefix directory for the NVDA Controller Client library package
+       (expecting headers and libs under PATH/<target-arch>/)])])
+  AC_ARG_WITH(nvdacontrollerclient-include, [AS_HELP_STRING([--with-nvdacontrollerclient-include],
+      [specify directory for the NVDA Controller Client include files])])
+  AC_ARG_WITH(nvdacontrollerclient-lib, [AS_HELP_STRING([--with-nvdacontrollerclient-lib],
+      [specify directory for the NVDA Controller Client library])])
+
+  NVDACONTROLLERCLIENT_FOUND=no
+  NVDACONTROLLERCLIENT_LIB=
+  NVDACONTROLLERCLIENT_DLL=
+  NVDACONTROLLERCLIENT_CFLAGS=
+
+  if test "x${NEEDS_LIB_NVDACONTROLLERCLIENT}" = "xtrue" ; then
+    if (test "x${with_nvdacontrollerclient_include}"  = "x" && test "x${with_nvdacontrollerclient_lib}" != "x") || \
+       (test "x${with_nvdacontrollerclient_include}" != "x" && test "x${with_nvdacontrollerclient_lib}"  = "x") ; then
+      AC_MSG_ERROR([Must specify both or neither of --with-nvdacontrollerclient-include and --with-nvdacontrollerclient-lib])
+    elif (test "x${with_nvdacontrollerclient}" != "x" && test "x${with_nvdacontrollerclient_include}" != "x") ; then
+      AC_MSG_ERROR([Must specify either --with-nvdacontrollerclient or a pair (--with-nvdacontrollerclient-include, --with-nvdacontrollerclient-lib)])
+    fi
+
+    if (test "x${with_nvdacontrollerclient}" != "x") || \
+       (test "x${with_nvdacontrollerclient_include}" != "x" && test "x${with_nvdacontrollerclient_lib}" != "x") ; then
+
+      AC_MSG_CHECKING([for nvdacontrollerclient])
+
+      if test "x${OPENJDK_TARGET_OS}" != "xwindows" ; then
+        AC_MSG_ERROR([--with-nvdacontrollerclient[-*] flags are applicable only to Windows builds])
+      fi
+
+      if test "x${OPENJDK_TARGET_CPU_ARCH}" = "xaarch64" ; then
+        NVDACONTROLLERCLIENT_BIN_BASENAME="nvdaControllerClient32"
+        NVDACONTROLLERCLIENT_ARCHDIR="arm64"
+      elif test "x${OPENJDK_TARGET_CPU_ARCH}" = "xx86" && test "x${OPENJDK_TARGET_CPU_BITS}" = "x64" ; then
+        NVDACONTROLLERCLIENT_BIN_BASENAME="nvdaControllerClient64"
+        NVDACONTROLLERCLIENT_ARCHDIR="x64"
+      elif test "x${OPENJDK_TARGET_CPU_ARCH}" = "xx86" && test "x${OPENJDK_TARGET_CPU_BITS}" = "x32" ; then
+        NVDACONTROLLERCLIENT_BIN_BASENAME="nvdaControllerClient32"
+        NVDACONTROLLERCLIENT_ARCHDIR="x86"
+      else
+        AC_MSG_ERROR([The nvdacontrollerclient library exists only for x86_32, x86_64, AArch64 architectures])
+      fi
+
+      if test "x${with_nvdacontrollerclient}" != "x" ; then
+        # NVDACONTROLLERCLIENT_ARCHDIR is used only here
+        NVDACONTROLLERCLIENT_INC_PATH="${with_nvdacontrollerclient}/${NVDACONTROLLERCLIENT_ARCHDIR}"
+        NVDACONTROLLERCLIENT_BIN_PATH="${with_nvdacontrollerclient}/${NVDACONTROLLERCLIENT_ARCHDIR}"
+      else
+        NVDACONTROLLERCLIENT_INC_PATH="${with_nvdacontrollerclient_include}"
+        NVDACONTROLLERCLIENT_BIN_PATH="${with_nvdacontrollerclient_lib}"
+      fi
+
+      POTENTIAL_NVDACONTROLLERCLIENT_DLL="${NVDACONTROLLERCLIENT_BIN_PATH}/${NVDACONTROLLERCLIENT_BIN_BASENAME}.dll"
+      POTENTIAL_NVDACONTROLLERCLIENT_LIB="${NVDACONTROLLERCLIENT_BIN_PATH}/${NVDACONTROLLERCLIENT_BIN_BASENAME}.lib"
+      POTENTIAL_NVDACONTROLLERCLIENT_EXP="${NVDACONTROLLERCLIENT_BIN_PATH}/${NVDACONTROLLERCLIENT_BIN_BASENAME}.exp"
+
+      if ! test -s "${POTENTIAL_NVDACONTROLLERCLIENT_DLL}" || \
+         ! test -s "${POTENTIAL_NVDACONTROLLERCLIENT_LIB}" || \
+         ! test -s "${POTENTIAL_NVDACONTROLLERCLIENT_EXP}" ; then
+          AC_MSG_ERROR([Could not find ${NVDACONTROLLERCLIENT_BIN_BASENAME}.dll and/or ${NVDACONTROLLERCLIENT_BIN_BASENAME}.lib and/or ${NVDACONTROLLERCLIENT_BIN_BASENAME}.exp inside ${NVDACONTROLLERCLIENT_BIN_PATH}])
+      fi
+      if ! test -s "${NVDACONTROLLERCLIENT_INC_PATH}/nvdaController.h" ; then
+        AC_MSG_ERROR([Could not find the header file nvdaController.h inside ${NVDACONTROLLERCLIENT_INC_PATH}])
+      fi
+
+      NVDACONTROLLERCLIENT_CFLAGS="-I${NVDACONTROLLERCLIENT_INC_PATH}"
+      NVDACONTROLLERCLIENT_DLL="${POTENTIAL_NVDACONTROLLERCLIENT_DLL}"
+      NVDACONTROLLERCLIENT_LIB="${POTENTIAL_NVDACONTROLLERCLIENT_LIB}"
+      NVDACONTROLLERCLIENT_FOUND=yes
+
+      AC_MSG_RESULT([includes at ${NVDACONTROLLERCLIENT_INC_PATH} ; binaries at ${NVDACONTROLLERCLIENT_BIN_PATH}])
+    fi
+  elif test "x${with_nvdacontrollerclient}" != "x" || \
+       test "x${with_nvdacontrollerclient_include}" != "x" || test "x${with_nvdacontrollerclient_lib}" != "x" ; then
+    AC_MSG_WARN([[nvdacontrollerclient is not used, so --with-nvdacontrollerclient[-*] is ignored]])
+  fi
+
+  if test "x${NVDACONTROLLERCLIENT_FOUND}" = "xyes" ; then
+    A11Y_NVDA_ANNOUNCING_ENABLED=true
+  else
+    A11Y_NVDA_ANNOUNCING_ENABLED=false
+  fi
+
+  AC_SUBST(A11Y_NVDA_ANNOUNCING_ENABLED)
+  AC_SUBST(NVDACONTROLLERCLIENT_CFLAGS)
+  AC_SUBST(NVDACONTROLLERCLIENT_DLL)
+  AC_SUBST(NVDACONTROLLERCLIENT_LIB)
+])

make/autoconf/lib-speechd.m4

@@ -0,0 +1,92 @@
+#
+# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, JetBrains s.r.o.. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+################################################################################
+# Setup speechd
+################################################################################
+AC_DEFUN_ONCE([LIB_SETUP_SPEECHD],
+[
+  AC_ARG_WITH(speechd, [AS_HELP_STRING([--with-speechd],
+      [specify prefix directory for the libspeechd package
+      (expecting the headers under PATH/include); required for AccessibleAnnouncer to work])])
+  AC_ARG_WITH(speechd-include, [AS_HELP_STRING([--with-speechd-include],
+      [specify directory for the speechd include files])])
+
+  if test "x$NEEDS_LIB_SPEECHD" = xfalse || test "x${with_speechd}" = xno || \
+      test "x${with_speechd_include}" = xno; then
+    if (test "x${with_speechd}" != x && test "x${with_speechd}" != xno) || \
+        (test "x${with_speechd_include}" != x && test "x${with_speechd_include}" != xno); then
+      AC_MSG_WARN([[speechd not used, so --with-speechd[-*] is ignored]])
+    fi
+    A11Y_SPEECHD_ANNOUNCING_ENABLED=false
+    SPEECHD_CFLAGS=
+    SPEECHD_LIBS=
+  else
+    SPEECHD_FOUND=no
+
+    if test "x${with_speechd}" != x && test "x${with_speechd}" != xyes; then
+      AC_MSG_CHECKING([for speechd header and library])
+      if test -s "${with_speechd}/include/libspeechd.h"; then
+        SPEECHD_CFLAGS="-I${with_speechd}/include"
+        SPEECHD_LIBS="-L${with_speechd}/lib -lspeechd"
+        SPEECHD_FOUND=yes
+        AC_MSG_RESULT([$SPEECHD_FOUND])
+      else
+        AC_MSG_ERROR([Can't find 'include/libspeechd.h' under ${with_speechd} given with the --with-speechd option.])
+      fi
+    fi
+    if test "x${with_speechd_include}" != x; then
+      AC_MSG_CHECKING([for speechd headers])
+      if test -s "${with_speechd_include}/libspeechd.h"; then
+        SPEECHD_CFLAGS="-I${with_speechd_include}"
+        SPEECHD_FOUND=yes
+        AC_MSG_RESULT([$SPEECHD_FOUND])
+      else
+        AC_MSG_ERROR([Can't find 'include/libspeechd.h' under ${with_speechd} given with the --with-speechd-include option.])
+      fi
+    fi
+    if test "x$SPEECHD_FOUND" = xno; then
+      # Are the libspeechd headers installed in the default /usr/include location?
+      AC_CHECK_HEADERS([libspeechd.h],
+          [ SPEECHD_FOUND=yes ],
+          [ SPEECHD_FOUND=no; break ]
+      )
+      if test "x$SPEECHD_FOUND" = xyes; then
+          SPEECHD_CFLAGS=
+          SPEECHD_LIBS="-lspeechd"
+      fi
+    fi
+    if test "x$SPEECHD_FOUND" = xno; then
+      A11Y_SPEECHD_ANNOUNCING_ENABLED=false
+    else
+      A11Y_SPEECHD_ANNOUNCING_ENABLED=true
+    fi
+  fi
+
+  AC_SUBST(A11Y_SPEECHD_ANNOUNCING_ENABLED)
+  AC_SUBST(SPEECHD_CFLAGS)
+  AC_SUBST(SPEECHD_LIBS)
+])

make/autoconf/libraries.m4

@@ -33,7 +33,9 @@ m4_include([lib-freetype.m4])
 m4_include([lib-hsdis.m4])
 m4_include([lib-std.m4])
 m4_include([lib-x11.m4])
-
+m4_include([lib-fontconfig.m4])
+m4_include([lib-speechd.m4])
+m4_include([lib-nvdacontrollerclient.m4])
 m4_include([lib-tests.m4])
 
 ################################################################################
@@ -45,10 +47,16 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
   if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then
     # No X11 support on windows or macosx
     NEEDS_LIB_X11=false
+    NEEDS_LIB_SPEECHD=false
+  elif test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
+    # No X11 support needed when building headless only
+    NEEDS_LIB_X11=false
+    NEEDS_LIB_SPEECHD=false
   else
     # All other instances need X11, even if building headless only, libawt still
     # needs X11 headers.
     NEEDS_LIB_X11=true
+    NEEDS_LIB_SPEECHD=true
   fi
 
   # Check if fontconfig is needed
@@ -87,6 +95,13 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
   else
     NEEDS_LIB_FFI=false
   fi
+
+  # Check if nvdacontrollerclient is needed
+  if test "x$OPENJDK_TARGET_OS" = xwindows && test "x$ENABLE_HEADLESS_ONLY" != xtrue; then
+    NEEDS_LIB_NVDACONTROLLERCLIENT=true
+  else
+    NEEDS_LIB_NVDACONTROLLERCLIENT=false
+  fi
 ])
 
 ################################################################################
@@ -126,7 +141,8 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
   LIB_SETUP_LIBFFI
   LIB_SETUP_MISC_LIBS
   LIB_SETUP_X11
-
+  LIB_SETUP_SPEECHD
+  LIB_SETUP_NVDACONTROLLERCLIENT
   LIB_TESTS_SETUP_GTEST
 
   BASIC_JDKLIB_LIBS=""

make/autoconf/spec.gmk.template

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -56,8 +56,8 @@ COMMA := ,
 # What make to use for main processing, after bootstrapping top-level Makefile.
 MAKE := @MAKE@
 
-# Make sure all shell commands are executed with a proper locale
-export LC_ALL := @LOCALE_USED@
+# Make sure all shell commands are executed with the C locale
+export LC_ALL := C
 
 # Make sure we override any local CLASSPATH variable
 export CLASSPATH := @CLASSPATH@
@@ -468,6 +468,20 @@ UBSAN_LDFLAGS := @UBSAN_LDFLAGS@
 X_CFLAGS := @X_CFLAGS@
 X_LIBS := @X_LIBS@
 
+# Linux speechd a11y announcer
+A11Y_SPEECHD_ANNOUNCING_ENABLED:=@A11Y_SPEECHD_ANNOUNCING_ENABLED@
+SPEECHD_CFLAGS:=@SPEECHD_CFLAGS@
+SPEECHD_LIBS:=@SPEECHD_LIBS@
+
+# Windows NVDA a11y announcer
+A11Y_NVDA_ANNOUNCING_ENABLED:=@A11Y_NVDA_ANNOUNCING_ENABLED@
+NVDACONTROLLERCLIENT_CFLAGS:=@NVDACONTROLLERCLIENT_CFLAGS@
+NVDACONTROLLERCLIENT_DLL:=@NVDACONTROLLERCLIENT_DLL@
+NVDACONTROLLERCLIENT_LIB:=@NVDACONTROLLERCLIENT_LIB@
+
+# Windows the client for the JAWS screen reader
+A11Y_JAWS_ANNOUNCING_ENABLED:=@A11Y_JAWS_ANNOUNCING_ENABLED@
+
 # The lowest required version of macosx
 MACOSX_VERSION_MIN := @MACOSX_VERSION_MIN@
 # The highest allowed version of macosx
@@ -498,6 +512,8 @@ COMPILER_COMMAND_FILE_FLAG := @COMPILER_COMMAND_FILE_FLAG@
 COMPILER_BINDCMD_FILE_FLAG := @COMPILER_BINDCMD_FILE_FLAG@
 
 CC_OUT_OPTION := @CC_OUT_OPTION@
+LD_OUT_OPTION := @LD_OUT_OPTION@
+AR_OUT_OPTION := @AR_OUT_OPTION@
 
 # Flags used for overriding the default opt setting for a C/C++ source file.
 C_O_FLAG_HIGHEST_JVM := @C_O_FLAG_HIGHEST_JVM@
@@ -602,10 +618,10 @@ BUILD_SYSROOT_LDFLAGS := @BUILD_SYSROOT_LDFLAGS@
 
 AS := @AS@
 
+# AR is used to create a static library (is ar in unix, lib.exe in windows)
 AR := @AR@
 ARFLAGS := @ARFLAGS@
-LIB := @LIB@
-LIBFLAGS := @LIBFLAGS@
+
 NM := @NM@
 NMFLAGS := @NMFLAGS@
 STRIP := @STRIP@
@@ -617,6 +633,10 @@ INSTALL_NAME_TOOL := @INSTALL_NAME_TOOL@
 METAL := @METAL@
 METALLIB := @METALLIB@
 
+# Options to linker to specify a mapfile.
+# (Note absence of := assignment, because we do not want to evaluate the macro body here)
+SET_SHARED_LIBRARY_MAPFILE = @SET_SHARED_LIBRARY_MAPFILE@
+
 #
 # Options for generating debug symbols
 COMPILE_WITH_DEBUG_SYMBOLS := @COMPILE_WITH_DEBUG_SYMBOLS@

make/autoconf/toolchain.m4

@@ -732,10 +732,11 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
   AC_SUBST(AS)
 
   #
-  # Setup tools for creating static libraries (AR/LIB)
+  # Setup the archiver (AR)
   #
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(LIB, lib)
+    # The corresponding ar tool is lib.exe (used to create static libraries)
+    UTIL_LOOKUP_TOOLCHAIN_PROGS(AR, lib)
   elif test "x$TOOLCHAIN_TYPE" = xgcc; then
     UTIL_LOOKUP_TOOLCHAIN_PROGS(AR, ar gcc-ar)
   else

make/common/MakeBase.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -152,10 +152,6 @@ define SetupLogging
     endif
   endif
 
-  ifneq ($$(findstring $$(LOG_LEVEL), debug trace),)
-    SHELL := $$(SHELL) -x
-  endif
-
   ifeq ($$(LOG_LEVEL), trace)
     SHELL_NO_RECURSE := $$(SHELL)
     # Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make

make/common/TestFilesCompilation.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -103,7 +103,6 @@ define SetupTestFilesCompilationBody
     $$(eval $$(call SetupNativeCompilation, BUILD_TEST_$$(name), \
         NAME := $$(unprefixed_name), \
         TYPE := $$($1_COMPILATION_TYPE), \
-        LINK_TYPE := $(if $$(filter %.cpp, $$(file)), C++, C), \
         EXTRA_FILES := $$(file) $$($1_EXTRA_FILES), \
         OBJECT_DIR := $$($1_OUTPUT_DIR)/support/$$(name), \
         OUTPUT_DIR := $$($1_OUTPUT_DIR)/$$($1_OUTPUT_SUBDIR), \
@@ -114,6 +113,7 @@ define SetupTestFilesCompilationBody
         DISABLED_WARNINGS_clang := undef format-nonliteral \
             missing-field-initializers sometimes-uninitialized, \
         LIBS := $$($1_LIBS_$$(name)), \
+        TOOLCHAIN := $(if $$(filter %.cpp, $$(file)), TOOLCHAIN_LINK_CXX, TOOLCHAIN_DEFAULT), \
         OPTIMIZATION := $$(if $$($1_OPTIMIZATION_$$(name)),$$($1_OPTIMIZATION_$$(name)),LOW), \
         COPY_DEBUG_SYMBOLS := $$($1_COPY_DEBUG_SYMBOLS), \
         STRIP_SYMBOLS := $$(if $$($1_STRIP_SYMBOLS_$$(name)),$$($1_STRIP_SYMBOLS_$$(name)),false), \

make/common/native/CompileFile.gmk

@@ -1,351 +0,0 @@
-#
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# This file contains functionality related to compiling a single native source
-# file (C, C++ or Objective-C) into an object file. It also harbours related
-# functionality for generating PCH (precompiled headers) and Windows resource
-# files.
-
-################################################################################
-# Creates a recipe that creates a compile_commands.json fragment. Remove any
-# occurrences of FIXPATH programs from the command to show the actual invocation.
-#
-# Param 1: Name of file to create
-# Param 2: Working directory
-# Param 3: Source file
-# Param 4: Compile command
-################################################################################
-define WriteCompileCommandsFragment
-  $(call LogInfo, Creating compile commands fragment for $(notdir $3))
-  $(call MakeDir, $(dir $1))
-  $(call WriteFile,{ \
-      "directory": "$(strip $(call FixPath, $2))"$(COMMA) \
-      "file": "$(strip $(call FixPath, $3))"$(COMMA) \
-      "command": "$(strip $(subst $(DQUOTE),\$(DQUOTE),$(subst \,\\,\
-        $(subst $(FIXPATH),,$(call FixPath, $4)))))" \
-    }$(COMMA), \
-    $1)
-endef
-
-################################################################################
-# Extensions of files handled by this macro.
-NATIVE_SOURCE_EXTENSIONS := %.S %.c %.cpp %.cc %.m %.mm
-
-# Replaces native source extensions with the object file extension in a string.
-# Param 1: the string containing source file names with extensions
-# The surrounding strip is needed to keep additional whitespace out
-define replace_with_obj_extension
-$(strip \
-  $(foreach extension, $(NATIVE_SOURCE_EXTENSIONS), \
-      $(patsubst $(extension),%$(OBJ_SUFFIX), $(filter $(extension), $1))) \
-)
-endef
-
-################################################################################
-# This pattern is used to transform the output of the microsoft CL compiler
-# into a make syntax dependency file (.d)
-WINDOWS_SHOWINCLUDE_SED_PATTERN := \
-    -e '/^Note: including file:/!d' \
-    -e 's|Note: including file: *||' \
-    -e 's|\r||g' \
-    -e 's|\\|/|g' \
-    -e 's|^\([a-zA-Z]\):|$(WINENV_PREFIX)/\1|g' \
-    -e '\|$(TOPDIR)|I !d' \
-    -e 's|$$$$| \\|g' \
-    #
-
-################################################################################
-# This pattern is used to transform a dependency file (.d) to a list
-# of make targets for dependent files (.d.targets)
-DEPENDENCY_TARGET_SED_PATTERN := \
-    -e 's/\#.*//' \
-    -e 's/^[^:]*: *//' \
-    -e 's/ *\\$$$$//' \
-    -e 's/^[	 ]*//' \
-    -e '/^$$$$/ d' \
-    -e 's/$$$$/ :/' \
-    #
-
-################################################################################
-# Create the recipe needed to compile a single native source file.
-#
-# Parameter 1 is the name of the rule, based on the name of the library/
-# program being build and the name of the source code file, e.g.
-# BUILD_LIBFOO_fooMain.cpp.
-#
-# Remaining parameters are named arguments:
-#   FILE - The full path of the source file to compiler
-#   BASE - The name of the rule for the entire binary to build ($1)
-#
-CreateCompiledNativeFile = $(NamedParamsMacroTemplate)
-define CreateCompiledNativeFileBody
-  $1_FILENAME := $$(notdir $$($1_FILE))
-
-  # The target file to be generated.
-  $1_OBJ := $$($$($1_BASE)_OBJECT_DIR)/$$(call replace_with_obj_extension, \
-      $$($1_FILENAME))
-
-  # Generate the corresponding compile_commands.json fragment.
-  $1_OBJ_JSON = $$(MAKESUPPORT_OUTPUTDIR)/compile-commands/$$(subst /,_,$$(subst \
-      $$(OUTPUTDIR)/,,$$($1_OBJ))).json
-  $$($1_BASE)_ALL_OBJS_JSON += $$($1_OBJ_JSON)
-
-  # Only continue if this object file hasn't been processed already. This lets
-  # the first found source file override any other with the same name.
-  ifeq ($$($1_OBJ_PROCESSED), )
-    $1_OBJ_PROCESSED := true
-    # This is the definite source file to use for $1_FILENAME.
-    $1_SRC_FILE := $$($1_FILE)
-
-    $$(eval $$(call SetupCompileFileFlags,$1,$$($1_BASE)))
-
-    ifneq ($$(filter %.c, $$($1_FILENAME)), )
-      # Compile as a C file
-      $1_CFLAGS += $$($1_WARNINGS_FLAGS)
-      $1_FLAGS := $(CFLAGS_CCACHE) $$($1_USE_PCH_FLAGS) $$($1_BASE_CFLAGS) \
-          $$($1_OPT_CFLAGS) $$($1_CFLAGS) -c
-      $1_COMPILER := $$($$($1_BASE)_CC)
-    else ifneq ($$(filter %.m, $$($1_FILENAME)), )
-      # Compile as an Objective-C file
-      $1_CFLAGS += $$($1_WARNINGS_FLAGS)
-      $1_FLAGS := -x objective-c $(CFLAGS_CCACHE) $$($1_USE_PCH_FLAGS) \
-          $$($1_BASE_CFLAGS) $$($1_OPT_CFLAGS) $$($1_CFLAGS) -c
-      $1_COMPILER := $$($$($1_BASE)_CC)
-    else ifneq ($$(filter %.S, $$($1_FILENAME)), )
-      # Compile as preprocessed assembler file
-      $1_FLAGS := $(BASIC_ASFLAGS) $$($1_BASE_ASFLAGS)
-      $1_COMPILER := $(AS)
-
-      # gcc or clang assembly files must contain an appropriate relative .file
-      # path for reproducible builds.
-      ifneq ($(findstring $(TOOLCHAIN_TYPE), gcc clang), )
-        # If no absolute paths allowed, work out relative source file path
-        # for assembly .file substitution, otherwise use full file path
-        ifeq ($(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT), false)
-          $1_REL_ASM_SRC := $$(call RelativePath, $$($1_FILE), $(WORKSPACE_ROOT))
-        else
-          $1_REL_ASM_SRC := $$($1_FILE)
-        endif
-        $1_FLAGS := $$($1_FLAGS) -DASSEMBLY_SRC_FILE='"$$($1_REL_ASM_SRC)"' \
-            -include $(TOPDIR)/make/data/autoheaders/assemblyprefix.h
-      endif
-    else ifneq ($$(filter %.cpp %.cc %.mm, $$($1_FILENAME)), )
-      # Compile as a C++ or Objective-C++ file
-      $1_CXXFLAGS += $$($1_WARNINGS_FLAGS)
-      $1_FLAGS := $(CFLAGS_CCACHE) $$($1_USE_PCH_FLAGS) $$($1_BASE_CXXFLAGS) \
-          $$($1_OPT_CXXFLAGS) $$($1_CXXFLAGS) -c
-      $1_COMPILER := $$($$($1_BASE)_CXX)
-    else
-      $$(error Internal error in NativeCompilation.gmk: no compiler for file $$($1_FILENAME))
-    endif
-
-    # And this is the dependency file for this obj file.
-    $1_DEPS_FILE := $$(patsubst %$(OBJ_SUFFIX),%.d,$$($1_OBJ))
-    # The dependency target file lists all dependencies as empty targets to
-    # avoid make error "No rule to make target" for removed files
-    $1_DEPS_TARGETS_FILE := $$(patsubst %$(OBJ_SUFFIX),%.d.targets,$$($1_OBJ))
-
-    # Only try to load individual dependency information files if the global
-    # file hasn't been loaded (could happen if make was interrupted).
-    ifneq ($$($$($1_BASE)_DEPS_FILE_LOADED), true)
-      # Include previously generated dependency information. (if it exists)
-      -include $$($1_DEPS_FILE)
-      -include $$($1_DEPS_TARGETS_FILE)
-    endif
-
-    ifneq ($$(strip $$($1_CFLAGS) $$($1_CXXFLAGS) $$($1_OPTIMIZATION)), )
-      $1_VARDEPS := $$($1_CFLAGS) $$($1_CXXFLAGS) $$($1_OPTIMIZATION)
-      $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, $$($1_OBJ).vardeps)
-    endif
-
-    $1_OBJ_DEPS := $$($1_SRC_FILE) $$($$($1_BASE)_COMPILE_VARDEPS_FILE) \
-        $$($$($1_BASE)_EXTRA_DEPS) $$($1_VARDEPS_FILE)
-    $1_COMPILE_OPTIONS := $$($1_FLAGS) $(CC_OUT_OPTION)$$($1_OBJ) $$($1_SRC_FILE)
-    # For reproducible builds with gcc and clang ensure random symbol generation is
-    # seeded deterministically
-    ifneq ($(findstring $(TOOLCHAIN_TYPE), gcc clang), )
-      $1_COMPILE_OPTIONS += -frandom-seed="$$($1_FILENAME)"
-    endif
-
-    $$($1_OBJ_JSON): $$($1_OBJ_DEPS)
-	$$(call WriteCompileCommandsFragment, $$@, $$(PWD), $$($1_SRC_FILE), \
-	    $$($1_COMPILER) $$($1_COMPILE_OPTIONS))
-
-    $$($1_OBJ): $$($1_OBJ_DEPS) | $$($$($1_BASE)_BUILD_INFO)
-	$$(call LogInfo, Compiling $$($1_FILENAME) (for $$($$($1_BASE)_BASENAME)))
-	$$(call MakeDir, $$(@D))
-        ifneq ($(TOOLCHAIN_TYPE), microsoft)
-	  $$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
-	      $$($1_COMPILER) $$(GENDEPS_FLAGS) \
-	      $$(addsuffix .tmp, $$($1_DEPS_FILE)) \
-	      $$($1_COMPILE_OPTIONS)))
-          ifneq ($$($1_DEPS_FILE), )
-	    $$(call fix-deps-file, $$($1_DEPS_FILE))
-            # Create a dependency target file from the dependency file.
-            # Solution suggested by:
-            # http://make.mad-scientist.net/papers/advanced-auto-dependency-generation/
-	    $(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_DEPS_FILE) \
-	        > $$($1_DEPS_TARGETS_FILE)
-          endif
-        else
-          # The Visual Studio compiler lacks a feature for generating make
-          # dependencies, but by setting -showIncludes, all included files are
-          # printed. These are filtered out and parsed into make dependences.
-          #
-          # Keep as much as possible on one execution line for best performance
-          # on Windows. No need to save exit code from compilation since
-          # pipefail is always active on Windows.
-          ifeq ($$(filter %.S, $$($1_FILENAME)), )
-	    $$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
-	        $$($1_COMPILER) -showIncludes $$($1_COMPILE_OPTIONS))) \
-	        | $(TR) -d '\r' | $(GREP) -v -e "^Note: including file:" \
-	            -e "^$$($1_FILENAME)$$$$" || test "$$$$?" = "1" ; \
-	    $(ECHO) $$@: \\ > $$($1_DEPS_FILE) ; \
-	    $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_OBJ).log \
-	        | $(SORT) -u >> $$($1_DEPS_FILE) ; \
-	    $(ECHO) >> $$($1_DEPS_FILE) ; \
-	    $(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_DEPS_FILE) > $$($1_DEPS_TARGETS_FILE)
-          else
-            # For assembler calls just create empty dependency lists
-	    $$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
-	        $$($1_COMPILER) $$($1_FLAGS) \
-	        $(CC_OUT_OPTION)$$($1_OBJ) -Ta $$($1_SRC_FILE))) \
-	        | $(TR) -d '\r' | $(GREP) -v -e "Assembling:" || test "$$$$?" = "1" ; \
-	    $(ECHO) > $$($1_DEPS_FILE) ; \
-	    $(ECHO) > $$($1_DEPS_TARGETS_FILE)
-          endif
-        endif
-  endif
-endef
-
-################################################################################
-define CreatePrecompiledHeader
-  ifneq ($$($1_PRECOMPILED_HEADER), )
-    ifeq ($(USE_PRECOMPILED_HEADER), true)
-      ifeq ($(TOOLCHAIN_TYPE), microsoft)
-        $1_PCH_FILE := $$($1_OBJECT_DIR)/$1.pch
-        $1_GENERATED_PCH_SRC := $$($1_OBJECT_DIR)/$1_pch.cpp
-        $1_GENERATED_PCH_OBJ := $$($1_OBJECT_DIR)/$1_pch$(OBJ_SUFFIX)
-
-        $$(eval $$(call CreateCompiledNativeFile, $1_$$(notdir $$($1_GENERATED_PCH_SRC)), \
-            FILE := $$($1_GENERATED_PCH_SRC), \
-            BASE := $1, \
-            EXTRA_CXXFLAGS := -Fp$$($1_PCH_FILE) -Yc$$(notdir $$($1_PRECOMPILED_HEADER)), \
-        ))
-
-        $1_USE_PCH_FLAGS := \
-            -Fp$$($1_PCH_FILE) -Yu$$(notdir $$($1_PRECOMPILED_HEADER))
-
-        $$($1_ALL_OBJS): $$($1_GENERATED_PCH_OBJ)
-
-        # Explicitly add the pch obj file first to ease comparing to old
-        # hotspot build.
-        $1_ALL_OBJS := $$($1_GENERATED_PCH_OBJ) $$($1_ALL_OBJS)
-
-        $$($1_GENERATED_PCH_SRC):
-		$(ECHO) "#include \"$$(notdir $$($1_PRECOMPILED_HEADER))\"" > $$@
-
-      else ifneq ($(findstring $(TOOLCHAIN_TYPE), gcc clang), )
-        ifeq ($(TOOLCHAIN_TYPE), gcc)
-          $1_PCH_FILE := $$($1_OBJECT_DIR)/precompiled/$$(notdir $$($1_PRECOMPILED_HEADER)).gch
-          $1_USE_PCH_FLAGS := -I$$($1_OBJECT_DIR)/precompiled
-        else ifeq ($(TOOLCHAIN_TYPE), clang)
-          $1_PCH_FILE := $$($1_OBJECT_DIR)/precompiled/$$(notdir $$($1_PRECOMPILED_HEADER)).pch
-          $1_USE_PCH_FLAGS := -include-pch $$($1_PCH_FILE)
-        endif
-        $1_PCH_DEPS_FILE := $$($1_PCH_FILE).d
-        $1_PCH_DEPS_TARGETS_FILE := $$($1_PCH_FILE).d.targets
-
-        -include $$($1_PCH_DEPS_FILE)
-        -include $$($1_PCH_DEPS_TARGETS_FILE)
-
-        $1_PCH_COMMAND := $$($1_CC) $$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $$($1_SYSROOT_CFLAGS) \
-            $$($1_OPT_CFLAGS) -x c++-header -c $(GENDEPS_FLAGS) \
-            $$(addsuffix .tmp, $$($1_PCH_DEPS_FILE))
-
-        $$($1_PCH_FILE): $$($1_PRECOMPILED_HEADER) $$($1_COMPILE_VARDEPS_FILE)
-		$$(call LogInfo, Generating precompiled header)
-		$$(call MakeDir, $$(@D))
-		$$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
-		    $$($1_PCH_COMMAND) $$< -o $$@))
-		$$(call fix-deps-file, $$($1_PCH_DEPS_FILE))
-		$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_PCH_DEPS_FILE) \
-		    > $$($1_PCH_DEPS_TARGETS_FILE)
-
-        $$($1_ALL_OBJS): $$($1_PCH_FILE)
-
-        # Generate the corresponding compile_commands.json fragment.
-        $1_PCH_FILE_JSON := $$(MAKESUPPORT_OUTPUTDIR)/compile-commands/$$(subst /,_,$$(subst \
-            $$(OUTPUTDIR)/,,$$($1_PCH_FILE))).json
-        $1_ALL_OBJS_JSON += $$($1_PCH_FILE_JSON)
-
-        $$($1_PCH_FILE_JSON): $$($1_PRECOMPILED_HEADER) $$($1_COMPILE_VARDEPS_FILE)
-		$$(call WriteCompileCommandsFragment, $$@, $$(PWD), $$<, \
-		    $$($1_PCH_COMMAND) $$< -o $$($1_PCH_FILE))
-      endif
-    endif
-  endif
-endef
-
-################################################################################
-define CreateWindowsResourceFile
-  ifneq ($$($1_VERSIONINFO_RESOURCE), )
-    $1_RES := $$($1_OBJECT_DIR)/$$($1_BASENAME).res
-    $1_RES_DEPS_FILE := $$($1_RES).d
-    $1_RES_DEPS_TARGETS_FILE := $$($1_RES).d.targets
-    -include $$($1_RES_DEPS_FILE)
-    -include $$($1_RES_DEPS_TARGETS_FILE)
-
-    $1_RES_VARDEPS := $$($1_RC) $$($1_RCFLAGS)
-    $1_RES_VARDEPS_FILE := $$(call DependOnVariable, $1_RES_VARDEPS, \
-        $$($1_RES).vardeps)
-
-    $$($1_RES): $$($1_VERSIONINFO_RESOURCE) $$($1_RES_VARDEPS_FILE)
-		$$(call LogInfo, Compiling resource $$(notdir $$($1_VERSIONINFO_RESOURCE)) (for $$($1_BASENAME)))
-		$$(call MakeDir, $$(@D) $$($1_OBJECT_DIR))
-		$$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
-		    $$($1_RC) $$($1_RCFLAGS) $$($1_SYSROOT_CFLAGS) $(CC_OUT_OPTION)$$@ \
-		    $$($1_VERSIONINFO_RESOURCE) 2>&1 ))
-                # Windows RC compiler does not support -showIncludes, so we mis-use CL
-                # for this. Filter out RC specific arguments that are unknown to CL.
-                # For some unknown reason, in this case CL actually outputs the show
-                # includes to stderr so need to redirect it to hide the output from the
-                # main log.
-		$$(call ExecuteWithLog, $$($1_RES_DEPS_FILE)$(OBJ_SUFFIX), \
-		    $$($1_CC) $$(filter-out -l%, $$($1_RCFLAGS)) \
-		        $$($1_SYSROOT_CFLAGS) -showIncludes -nologo -TC \
-		        $(CC_OUT_OPTION)$$($1_RES_DEPS_FILE)$(OBJ_SUFFIX) -P -Fi$$($1_RES_DEPS_FILE).pp \
-		        $$($1_VERSIONINFO_RESOURCE)) 2>&1 \
-		    | $(TR) -d '\r' | $(GREP) -v -e "^Note: including file:" \
-		        -e "^$$(notdir $$($1_VERSIONINFO_RESOURCE))$$$$" || test "$$$$?" = "1" ; \
-		$(ECHO) $$($1_RES): \\ > $$($1_RES_DEPS_FILE) ; \
-		$(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_RES_DEPS_FILE)$(OBJ_SUFFIX).log \
-		    >> $$($1_RES_DEPS_FILE) ; \
-		$(ECHO) >> $$($1_RES_DEPS_FILE) ;\
-		$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_RES_DEPS_FILE) \
-		    > $$($1_RES_DEPS_TARGETS_FILE)
-  endif
-endef

make/common/native/DebugSymbols.gmk

@@ -1,118 +0,0 @@
-#
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# This file contains functionality related to native debug symbol handling.
-
-################################################################################
-define CreateDebugSymbols
-  ifneq ($$($1_COPY_DEBUG_SYMBOLS), false)
-    $1_COPY_DEBUG_SYMBOLS := $(COPY_DEBUG_SYMBOLS)
-  endif
-
-  ifneq ($$($1_ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
-    $1_ZIP_EXTERNAL_DEBUG_SYMBOLS := $(ZIP_EXTERNAL_DEBUG_SYMBOLS)
-  endif
-
-  ifeq ($$($1_COPY_DEBUG_SYMBOLS), true)
-    ifneq ($$($1_DEBUG_SYMBOLS), false)
-      $$(call SetIfEmpty, $1_SYMBOLS_DIR, $$($1_OUTPUT_DIR))
-      # Only copy debug symbols for dynamic libraries and programs.
-      ifneq ($$($1_TYPE), STATIC_LIBRARY)
-        # Generate debuginfo files.
-        ifeq ($(call isTargetOs, windows), true)
-          $1_EXTRA_LDFLAGS += -debug "-pdb:$$($1_SYMBOLS_DIR)/$$($1_BASENAME).pdb" \
-              "-map:$$($1_SYMBOLS_DIR)/$$($1_BASENAME).map"
-          ifeq ($(SHIP_DEBUG_SYMBOLS), public)
-            $1_EXTRA_LDFLAGS += "-pdbstripped:$$($1_SYMBOLS_DIR)/$$($1_BASENAME).stripped.pdb"
-          endif
-          $1_DEBUGINFO_FILES := $$($1_SYMBOLS_DIR)/$$($1_BASENAME).pdb \
-              $$($1_SYMBOLS_DIR)/$$($1_BASENAME).map
-
-        else ifeq ($(call isTargetOs, linux), true)
-          $1_DEBUGINFO_FILES := $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).debuginfo
-          # Setup the command line creating debuginfo files, to be run after linking.
-          # It cannot be run separately since it updates the original target file
-          # Creating the debuglink is done in another command rather than all at once
-          # so we can run it after strip is called, since strip can sometimes mangle the
-          # embedded debuglink, which we want to avoid.
-          $1_CREATE_DEBUGINFO_CMDS := \
-              $$($1_OBJCOPY) --only-keep-debug $$($1_TARGET) $$($1_DEBUGINFO_FILES) && \
-              $$(CHMOD) -x $$($1_DEBUGINFO_FILES)
-          $1_CREATE_DEBUGLINK_CMDS := $(CD) $$($1_SYMBOLS_DIR) && \
-              $$($1_OBJCOPY) --add-gnu-debuglink=$$($1_DEBUGINFO_FILES) $$($1_TARGET)
-
-        else ifeq ($(call isTargetOs, aix), true)
-          # AIX does not provide the equivalent of OBJCOPY to extract debug symbols,
-          # so we copy the compiled object with symbols to the .debuginfo file, which
-          # happens prior to the STRIP_CMD on the original target object file.
-          $1_DEBUGINFO_FILES := $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).debuginfo
-          $1_CREATE_DEBUGINFO_CMDS := $(CP) $$($1_TARGET) $$($1_DEBUGINFO_FILES)
-
-        else ifeq ($(call isTargetOs, macosx), true)
-          $1_DEBUGINFO_FILES := \
-              $$($1_SYMBOLS_DIR)/$$($1_BASENAME).dSYM/Contents/Info.plist \
-              $$($1_SYMBOLS_DIR)/$$($1_BASENAME).dSYM/Contents/Resources/DWARF/$$($1_BASENAME)
-          $1_CREATE_DEBUGINFO_CMDS := \
-              $(DSYMUTIL) --out $$($1_SYMBOLS_DIR)/$$($1_BASENAME).dSYM $$($1_TARGET)
-        endif
-
-        # Since the link rule creates more than one file that we want to track,
-        # we have to use some tricks to get make to cooperate. To properly
-        # trigger downstream dependants of $$($1_DEBUGINFO_FILES), we must have
-        # a recipe in the rule below. To avoid rerunning the recipe every time
-        # have it touch the target. If a debuginfo file is deleted by something
-        # external, explicitly delete the TARGET to trigger a rebuild of both.
-        ifneq ($$(wildcard $$($1_DEBUGINFO_FILES)), $$($1_DEBUGINFO_FILES))
-          $$(call LogDebug, Deleting $$($1_BASENAME) because debuginfo files are missing)
-          $$(shell $(RM) $$($1_TARGET))
-        endif
-        $$($1_DEBUGINFO_FILES): $$($1_TARGET)
-		$$(if $$(CORRECT_FUNCTION_IN_RECIPE_EVALUATION), \
-		  $$(if $$(wildcard $$@), , $$(error $$@ was not created for $$<)) \
-		)
-		$(TOUCH) $$@
-
-        $1 += $$($1_DEBUGINFO_FILES)
-
-        ifeq ($$($1_ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
-          ifeq ($(call isTargetOs, windows), true)
-            $1_DEBUGINFO_ZIP := $$($1_SYMBOLS_DIR)/$$($1_BASENAME).diz
-          else
-            $1_DEBUGINFO_ZIP := $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).diz
-          endif
-          $1 += $$($1_DEBUGINFO_ZIP)
-
-          # The dependency on TARGET is needed for debuginfo files
-          # to be rebuilt properly.
-          $$($1_DEBUGINFO_ZIP): $$($1_DEBUGINFO_FILES) $$($1_TARGET)
-		$(CD) $$($1_SYMBOLS_DIR) && \
-		    $(ZIPEXE) -q -r $$@ $$(subst $$($1_SYMBOLS_DIR)/,, $$($1_DEBUGINFO_FILES))
-
-        endif
-       endif # !STATIC_LIBRARY
-    endif # $1_DEBUG_SYMBOLS != false
-  endif # COPY_DEBUG_SYMBOLS
-endef

make/common/native/Flags.gmk

@@ -1,225 +0,0 @@
-#
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# This file contains functionality related to setting up compiler and linker
-# flags, based on various more abstract sources of compilation description,
-# like optimization level.
-
-################################################################################
-# $1 is the prefix of the file to be compiled
-# $2 is the prefix of the library, i.e. $$($1_BASE)
-define SetupCompileFileFlags
-  ifeq ($$($1_OPTIMIZATION), )
-    $1_OPT_CFLAGS := $$($2_OPT_CFLAGS)
-    $1_OPT_CXXFLAGS := $$($2_OPT_CXXFLAGS)
-  else
-    ifeq ($$($1_OPTIMIZATION), NONE)
-      $1_OPT_CFLAGS := $(C_O_FLAG_NONE)
-      $1_OPT_CXXFLAGS := $(CXX_O_FLAG_NONE)
-    else ifeq ($$($1_OPTIMIZATION), LOW)
-      $1_OPT_CFLAGS := $(C_O_FLAG_NORM)
-      $1_OPT_CXXFLAGS := $(CXX_O_FLAG_NORM)
-    else ifeq ($$($1_OPTIMIZATION), HIGH)
-      $1_OPT_CFLAGS := $(C_O_FLAG_HI)
-      $1_OPT_CXXFLAGS := $(CXX_O_FLAG_HI)
-    else ifeq ($$($1_OPTIMIZATION), HIGHEST)
-      $1_OPT_CFLAGS := $(C_O_FLAG_HIGHEST)
-      $1_OPT_CXXFLAGS := $(CXX_O_FLAG_HIGHEST)
-    else ifeq ($$($1_OPTIMIZATION), HIGHEST_JVM)
-      $1_OPT_CFLAGS := $(C_O_FLAG_HIGHEST_JVM)
-      $1_OPT_CXXFLAGS := $(CXX_O_FLAG_HIGHEST_JVM)
-    else ifeq ($$($1_OPTIMIZATION), SIZE)
-      $1_OPT_CFLAGS := $(C_O_FLAG_SIZE)
-      $1_OPT_CXXFLAGS := $(CXX_O_FLAG_SIZE)
-    else
-      $$(error Unknown value for file OPTIMIZATION: $$($1_OPTIMIZATION))
-    endif
-  endif
-
-  ifneq ($$($2_PRECOMPILED_HEADER), )
-    ifeq ($$(filter $$($1_FILENAME), $$($2_PRECOMPILED_HEADER_EXCLUDE)), )
-      $1_USE_PCH_FLAGS := $$($2_USE_PCH_FLAGS)
-    endif
-  endif
-
-  ifneq ($(DISABLE_WARNING_PREFIX), )
-    $1_WARNINGS_FLAGS := $$(addprefix $(DISABLE_WARNING_PREFIX), \
-      $$($2_DISABLED_WARNINGS_$(TOOLCHAIN_TYPE)_$$($1_FILENAME)) \
-      $$($2_DISABLED_WARNINGS_$(TOOLCHAIN_TYPE)_$(OPENJDK_TARGET_OS)_$$($1_FILENAME)))
-  endif
-
-  $1_BASE_CFLAGS :=  $$($2_CFLAGS) $$($2_EXTRA_CFLAGS) \
-      $$($2_SYSROOT_CFLAGS)
-  $1_BASE_CXXFLAGS := $$($2_CXXFLAGS) $$($2_EXTRA_CXXFLAGS) \
-      $$($2_SYSROOT_CFLAGS) $$($1_EXTRA_CXXFLAGS)
-  $1_BASE_ASFLAGS := $$($2_ASFLAGS) $$($2_EXTRA_ASFLAGS)
-endef
-
-################################################################################
-define SetupCompilerFlags
-  # Pickup extra OPENJDK_TARGET_OS_TYPE, OPENJDK_TARGET_OS, TOOLCHAIN_TYPE and
-  # OPENJDK_TARGET_OS plus OPENJDK_TARGET_CPU pair dependent variables for CFLAGS.
-  $1_EXTRA_CFLAGS := $$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS)) \
-      $$($1_CFLAGS_$(TOOLCHAIN_TYPE)) \
-      $$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU))
-
-  ifneq ($(DEBUG_LEVEL), release)
-    # Pickup extra debug dependent variables for CFLAGS
-    $1_EXTRA_CFLAGS += $$($1_CFLAGS_debug)
-    $1_EXTRA_CFLAGS += $$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)_debug)
-    $1_EXTRA_CFLAGS += $$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug)
-    $1_EXTRA_CFLAGS += $$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_debug)
-  else
-    $1_EXTRA_CFLAGS += $$($1_CFLAGS_release)
-    $1_EXTRA_CFLAGS += $$($1_CFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release)
-    $1_EXTRA_CFLAGS += $$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release)
-    $1_EXTRA_CFLAGS += $$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_release)
-  endif
-  ifeq ($(STATIC_LIBS), true)
-    $1_EXTRA_CFLAGS += $$(STATIC_LIBS_CFLAGS)
-  endif
-
-  # Pickup extra OPENJDK_TARGET_OS_TYPE, OPENJDK_TARGET_OS and/or TOOLCHAIN_TYPE
-  # dependent variables for CXXFLAGS.
-  $1_EXTRA_CXXFLAGS := $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)) \
-      $$($1_CXXFLAGS_$(TOOLCHAIN_TYPE))
-
-  ifneq ($(DEBUG_LEVEL), release)
-    # Pickup extra debug dependent variables for CXXFLAGS
-    $1_EXTRA_CXXFLAGS += $$($1_CXXFLAGS_debug)
-    $1_EXTRA_CXXFLAGS += $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_debug)
-    $1_EXTRA_CXXFLAGS += $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_debug)
-  else
-    $1_EXTRA_CXXFLAGS += $$($1_CXXFLAGS_release)
-    $1_EXTRA_CXXFLAGS += $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release)
-    $1_EXTRA_CXXFLAGS += $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
-  endif
-  ifeq ($(STATIC_LIBS), true)
-    $1_EXTRA_CXXFLAGS += $$(STATIC_LIB_CFLAGS)
-  endif
-
-  # If no C++ flags are explicitly set, default to using the C flags.
-  # After that, we can set additional C++ flags that should not interfere
-  # with the mechanism for copying the C flags by default.
-  ifeq ($$($1_CXXFLAGS), )
-    $1_CXXFLAGS := $$($1_CFLAGS)
-  endif
-  ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)), )
-    $1_EXTRA_CXXFLAGS := $$($1_EXTRA_CFLAGS)
-  endif
-
-  $$(call SetIfEmpty, $1_COMPILE_WITH_DEBUG_SYMBOLS, $$(COMPILE_WITH_DEBUG_SYMBOLS))
-
-  ifeq ($(STATIC_LIBS), true)
-    # For release builds where debug symbols are configured to be moved to
-    # separate debuginfo files, disable debug symbols for static libs instead.
-    # We don't currently support this configuration and we don't want symbol
-    # information in release builds unless explicitly asked to provide it.
-    ifeq ($(DEBUG_LEVEL), release)
-      ifeq ($(COPY_DEBUG_SYMBOLS), true)
-        $1_COMPILE_WITH_DEBUG_SYMBOLS := false
-      endif
-    endif
-  endif
-
-  ifeq ($$($1_COMPILE_WITH_DEBUG_SYMBOLS), true)
-    $1_EXTRA_CFLAGS += $$(CFLAGS_DEBUG_SYMBOLS)
-    $1_EXTRA_CXXFLAGS += $$(CFLAGS_DEBUG_SYMBOLS)
-    $1_EXTRA_ASFLAGS += $$(ASFLAGS_DEBUG_SYMBOLS)
-  endif
-
-  # Pass the library name for static JNI library naming
-  ifeq ($$($1_TYPE), STATIC_LIBRARY)
-    $1_EXTRA_CFLAGS += -DLIBRARY_NAME=$$($1_NAME)
-    $1_EXTRA_CXXFLAGS += -DLIBRARY_NAME=$$($1_NAME)
-  endif
-
-  # Pick up disabled warnings, if possible on this platform.
-  ifneq ($(DISABLE_WARNING_PREFIX), )
-    $1_EXTRA_CFLAGS += $$(addprefix $(DISABLE_WARNING_PREFIX), \
-        $$(DISABLED_WARNINGS) \
-        $$(DISABLED_WARNINGS_C) \
-        $$($1_DISABLED_WARNINGS_$(TOOLCHAIN_TYPE)) \
-        $$($1_DISABLED_WARNINGS_C_$(TOOLCHAIN_TYPE)) \
-        $$($1_DISABLED_WARNINGS_$(TOOLCHAIN_TYPE)_$(OPENJDK_TARGET_OS)) \
-        $$($1_DISABLED_WARNINGS_C_$(TOOLCHAIN_TYPE)_$(OPENJDK_TARGET_OS)))
-    $1_EXTRA_CXXFLAGS += $$(addprefix $(DISABLE_WARNING_PREFIX), \
-        $$(DISABLED_WARNINGS) \
-        $$(DISABLED_WARNINGS_CXX) \
-        $$($1_DISABLED_WARNINGS_$(TOOLCHAIN_TYPE)) \
-        $$($1_DISABLED_WARNINGS_CXX_$(TOOLCHAIN_TYPE)) \
-        $$($1_DISABLED_WARNINGS_$(TOOLCHAIN_TYPE)_$(OPENJDK_TARGET_OS)) \
-        $$($1_DISABLED_WARNINGS_CXX_$(TOOLCHAIN_TYPE)_$(OPENJDK_TARGET_OS)))
-  endif
-
-  # Check if warnings should be considered errors.
-  # Pick first binary and toolchain specific, then binary specific, then general setting.
-  ifeq ($$($1_WARNINGS_AS_ERRORS_$(TOOLCHAIN_TYPE)), )
-    ifeq ($$($1_WARNINGS_AS_ERRORS), )
-      $1_WARNINGS_AS_ERRORS_$(TOOLCHAIN_TYPE) := $$(WARNINGS_AS_ERRORS)
-    else
-      $1_WARNINGS_AS_ERRORS_$(TOOLCHAIN_TYPE) := $$($1_WARNINGS_AS_ERRORS)
-    endif
-  endif
-
-  ifeq ($$($1_WARNINGS_AS_ERRORS_$(TOOLCHAIN_TYPE)), true)
-    $1_EXTRA_CFLAGS += $(CFLAGS_WARNINGS_ARE_ERRORS)
-    $1_EXTRA_CXXFLAGS += $(CFLAGS_WARNINGS_ARE_ERRORS)
-  endif
-
-  ifeq (NONE, $$($1_OPTIMIZATION))
-    $1_OPT_CFLAGS := $(C_O_FLAG_NONE)
-    $1_OPT_CXXFLAGS := $(CXX_O_FLAG_NONE)
-  else ifeq (LOW, $$($1_OPTIMIZATION))
-    $1_OPT_CFLAGS := $(C_O_FLAG_NORM)
-    $1_OPT_CXXFLAGS := $(CXX_O_FLAG_NORM)
-  else ifeq (HIGH, $$($1_OPTIMIZATION))
-    $1_OPT_CFLAGS := $(C_O_FLAG_HI)
-    $1_OPT_CXXFLAGS := $(CXX_O_FLAG_HI)
-  else ifeq (HIGHEST, $$($1_OPTIMIZATION))
-    $1_OPT_CFLAGS := $(C_O_FLAG_HIGHEST)
-    $1_OPT_CXXFLAGS := $(CXX_O_FLAG_HIGHEST)
-  else ifeq (HIGHEST_JVM, $$($1_OPTIMIZATION))
-    $1_OPT_CFLAGS := $(C_O_FLAG_HIGHEST_JVM)
-    $1_OPT_CXXFLAGS := $(CXX_O_FLAG_HIGHEST_JVM)
-  else ifeq (SIZE, $$($1_OPTIMIZATION))
-    $1_OPT_CFLAGS := $(C_O_FLAG_SIZE)
-    $1_OPT_CXXFLAGS := $(CXX_O_FLAG_SIZE)
-  else ifneq (, $$($1_OPTIMIZATION))
-    $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
-  endif
-endef
-
-################################################################################
-define SetupLinkerFlags
-  # Pickup extra OPENJDK_TARGET_OS_TYPE, OPENJDK_TARGET_OS and TOOLCHAIN_TYPE
-  # dependent variables for LDFLAGS and LIBS, and additionally the pair dependent
-  # TOOLCHAIN_TYPE plus OPENJDK_TARGET_OS
-  $1_EXTRA_LDFLAGS += $$($1_LDFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS)) \
-      $$($1_LDFLAGS_$(TOOLCHAIN_TYPE)) $$($1_LDFLAGS_$(TOOLCHAIN_TYPE)_$(OPENJDK_TARGET_OS))
-  $1_EXTRA_LIBS += $$($1_LIBS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LIBS_$(OPENJDK_TARGET_OS)) \
-      $$($1_LIBS_$(TOOLCHAIN_TYPE)) $$($1_LIBS_$(TOOLCHAIN_TYPE)_$(OPENJDK_TARGET_OS))
-endef

make/common/native/Link.gmk

@@ -1,182 +0,0 @@
-#
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# This file contains functionality related to linking a native binary;
-# creating either a dynamic library, a static library or an executable.
-
-################################################################################
-# GetEntitlementsFile
-# Find entitlements file for executable when signing on macosx. If no
-# specialized file is found, returns the default file.
-# This macro might be called from custom makefiles.
-# $1 Executable to find entitlements file for.
-ENTITLEMENTS_DIR := $(TOPDIR)/make/data/macosxsigning
-ifeq ($(MACOSX_CODESIGN_MODE), debug)
-  CODESIGN_PLIST_SUFFIX := -debug
-else
-  CODESIGN_PLIST_SUFFIX :=
-endif
-DEFAULT_ENTITLEMENTS_FILE := $(ENTITLEMENTS_DIR)/default$(CODESIGN_PLIST_SUFFIX).plist
-
-GetEntitlementsFile = \
-    $(foreach f, $(ENTITLEMENTS_DIR)/$(strip $(notdir $1))$(CODESIGN_PLIST_SUFFIX).plist, \
-      $(if $(wildcard $f), $f, $(DEFAULT_ENTITLEMENTS_FILE)) \
-    )
-
-################################################################################
-define SetupLinking
-  # Unless specifically set, stripping should only happen if symbols are also
-  # being copied.
-  $$(call SetIfEmpty, $1_STRIP_SYMBOLS, $$($1_COPY_DEBUG_SYMBOLS))
-
-  ifneq ($$($1_STRIP_SYMBOLS), false)
-    # Default to using the global STRIPFLAGS. Allow for overriding with an
-    # empty value
-    $1_STRIPFLAGS ?= $(STRIPFLAGS)
-    $1_STRIP_CMD := $$($1_STRIP) $$($1_STRIPFLAGS) $$($1_TARGET)
-  endif
-endef
-
-################################################################################
-define CreateLinkedResult
-  ifeq ($$($1_TYPE), STATIC_LIBRARY)
-    $$(eval $$(call CreateStaticLibrary,$1))
-  else
-    $$(eval $$(call CreateDynamicLibraryOrExecutable,$1))
-  endif
-endef
-
-################################################################################
-define CreateStaticLibrary
-  # Include partial linking when building the static library with clang on linux
-  ifeq ($(call isTargetOs, linux), true)
-    ifneq ($(findstring $(TOOLCHAIN_TYPE), clang), )
-      $1_ENABLE_PARTIAL_LINKING := true
-    endif
-  endif
-
-  $1_VARDEPS := $$($1_AR) $$(ARFLAGS) $$($1_ARFLAGS) $$($1_LIBS) \
-      $$($1_EXTRA_LIBS)
-  ifeq ($$($1_ENABLE_PARTIAL_LINKING), true)
-    $1_VARDEPS += $$($1_LD) $$($1_SYSROOT_LDFLAGS)
-  endif
-  $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
-      $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
-
-  $1_TARGET_DEPS := $$($1_ALL_OBJS) $$($1_VARDEPS_FILE)
-
-  $1_AR_OBJ_ARG := $$($1_LD_OBJ_ARG)
-  # With clang on linux, partial linking is enabled and 'AR' takes the output
-  # object from the partial linking step.
-  ifeq ($$($1_ENABLE_PARTIAL_LINKING), true)
-    $1_TARGET_RELOCATABLE := $$($1_OBJECT_DIR)/$$($1_PREFIX)$$($1_NAME)_relocatable$(OBJ_SUFFIX)
-    $1_AR_OBJ_ARG := $$($1_TARGET_RELOCATABLE)
-  endif
-
-  $$($1_TARGET): $$($1_TARGET_DEPS)
-        ifneq ($$($1_OBJ_FILE_LIST), )
-          ifeq ($$($1_LINK_OBJS_RELATIVE), true)
-	    $$(eval $$(call ListPathsSafely, $1_ALL_OBJS_RELATIVE, $$($1_OBJ_FILE_LIST)))
-          else
-	    $$(eval $$(call ListPathsSafely, $1_ALL_OBJS, $$($1_OBJ_FILE_LIST)))
-          endif
-        endif
-	$$(call LogInfo, Building static library $$($1_BASENAME))
-	$$(call MakeDir, $$($1_OUTPUT_DIR) $$($1_SYMBOLS_DIR))
-        # Do partial linking.
-        ifeq ($$($1_ENABLE_PARTIAL_LINKING), true)
-	  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_partial_link, \
-	    $(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \
-	      $$($1_LD) $(LDFLAGS_CXX_PARTIAL_LINKING) $$($1_SYSROOT_LDFLAGS) \
-	        -o $$($1_TARGET_RELOCATABLE) \
-	        $$($1_LD_OBJ_ARG))
-        endif
-	$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
-	  $(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \
-	    $$($1_AR) $$(ARFLAGS) $$($1_ARFLAGS) -r -cs $$($1_TARGET) \
-	        $$($1_AR_OBJ_ARG) $$($1_RES))
-        ifeq ($(STATIC_BUILD), true)
-	  $(RM) $$(@D)/$$(basename $$(@F)).symbols; \
-	  $(ECHO) "Getting symbols from nm"; \
-	  $(NM) $(NMFLAGS) -m $$($1_TARGET) | $(GREP)  "__TEXT" | \
-	      $(EGREP) -v "non-external|private extern|__TEXT,__eh_frame" | \
-	      $(SED) -e  's/.* //' > $$(@D)/$$(basename $$(@F)).symbols
-        endif
-endef
-
-################################################################################
-define CreateDynamicLibraryOrExecutable
-  # A shared dynamic library or an executable binary has been specified
-  ifeq ($$($1_TYPE), LIBRARY)
-    # Generating a dynamic library.
-    $1_EXTRA_LDFLAGS += $$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))
-
-    # Create loadmap on AIX. Helps in diagnosing some problems.
-    ifneq ($(COMPILER_BINDCMD_FILE_FLAG), )
-      $1_EXTRA_LDFLAGS += $(COMPILER_BINDCMD_FILE_FLAG)$$($1_OBJECT_DIR)/$$($1_NOSUFFIX).loadmap
-    endif
-  endif
-
-  $1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) \
-      $$($1_EXTRA_LDFLAGS) $$($1_LIBS) $$($1_EXTRA_LIBS) \
-      $$($1_CREATE_DEBUGINFO_CMDS) $$($1_STRIP_CMD) $$($1_CREATE_DEBUGLINK_CMDS)
-  $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
-      $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
-
-  $1_TARGET_DEPS := $$($1_ALL_OBJS) $$($1_VARDEPS_FILE)
-
-  $$($1_TARGET): $$($1_TARGET_DEPS)
-        ifneq ($$($1_OBJ_FILE_LIST), )
-          ifeq ($$($1_LINK_OBJS_RELATIVE), true)
-	    $$(eval $$(call ListPathsSafely, $1_ALL_OBJS_RELATIVE, $$($1_OBJ_FILE_LIST)))
-          else
-	    $$(eval $$(call ListPathsSafely, $1_ALL_OBJS, $$($1_OBJ_FILE_LIST)))
-          endif
-        endif
-	$$(call LogInfo, Linking $$($1_BASENAME))
-	$$(call MakeDir, $$($1_OUTPUT_DIR) $$($1_SYMBOLS_DIR))
-	$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
-	    $$(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \
-	    $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \
-	        $$($1_SYSROOT_LDFLAGS) -o $$($1_TARGET) $$($1_LD_OBJ_ARG) \
-	        $$($1_LIBS) $$($1_EXTRA_LIBS))
-	$$($1_CREATE_DEBUGINFO_CMDS)
-	$$($1_STRIP_CMD)
-	$$($1_CREATE_DEBUGLINK_CMDS)
-        # On macosx, optionally run codesign on every binary.
-        # Remove signature explicitly first to avoid warnings if the linker
-        # added a default adhoc signature.
-        ifeq ($(MACOSX_CODESIGN_MODE), hardened)
-	  $(CODESIGN) --remove-signature $$@
-	  $(CODESIGN) -f -s "$(MACOSX_CODESIGN_IDENTITY)" --timestamp \
-	      --options runtime --entitlements \
-	      $$(call GetEntitlementsFile, $$@) $$@
-        else ifeq ($(MACOSX_CODESIGN_MODE), debug)
-	  $(CODESIGN) --remove-signature $$@
-	  $(CODESIGN) -f -s - --entitlements \
-	      $$(call GetEntitlementsFile, $$@) $$@
-        endif
-endef

make/common/native/LinkMicrosoft.gmk

@@ -1,112 +0,0 @@
-#
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# This file contains functionality related to linking a native binary;
-# creating either a dynamic library, a static library or an executable.
-
-################################################################################
-define CreateLinkedResultMicrosoft
-  ifeq ($$($1_TYPE), STATIC_LIBRARY)
-    $$(eval $$(call CreateStaticLibraryMicrosoft,$1))
-  else
-    $$(eval $$(call CreateDynamicLibraryOrExecutableMicrosoft,$1))
-  endif
-endef
-
-################################################################################
-define CreateStaticLibraryMicrosoft
-  $1_VARDEPS := $$($1_LIB) $$(LIBFLAGS) $$($1_LIBFLAGS) $$($1_LIBS) \
-      $$($1_EXTRA_LIBS)
-  $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
-      $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
-
-  $$($1_TARGET): $$($1_ALL_OBJS) $$($1_RES) $$($1_VARDEPS_FILE)
-        ifneq ($$($1_OBJ_FILE_LIST), )
-	  $$(eval $$(call ListPathsSafely, $1_ALL_OBJS, $$($1_OBJ_FILE_LIST)))
-        endif
-	$$(call LogInfo, Building static library $$($1_BASENAME))
-	$$(call MakeDir, $$($1_OUTPUT_DIR) $$($1_SYMBOLS_DIR))
-	$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
-	    $$($1_LIB) -nologo $$(LIBFLAGS) $$($1_LIBFLAGS) -out:$$($1_TARGET) \
-	        $$($1_LD_OBJ_ARG) $$($1_RES))
-endef
-
-################################################################################
-define CreateDynamicLibraryOrExecutableMicrosoft
-  ifeq ($$($1_EMBED_MANIFEST), true)
-    $1_EXTRA_LDFLAGS += -manifest:embed
-  endif
-
-  $1_IMPORT_LIBRARY := $$($1_OBJECT_DIR)/$$($1_NAME).lib
-  $1_EXTRA_LDFLAGS += "-implib:$$($1_IMPORT_LIBRARY)"
-
-  ifeq ($$($1_TYPE), LIBRARY)
-    # To properly trigger downstream dependants of the import library, just as
-    # for debug files, we must have a recipe in the rule. To avoid rerunning
-    # the recipe every time have it touch the target. If an import library
-    # file is deleted by something external, explicitly delete the target to
-    # trigger a rebuild of both.
-    ifneq ($$(wildcard $$($1_IMPORT_LIBRARY)), $$($1_IMPORT_LIBRARY))
-      $$(call LogDebug, Deleting $$($1_BASENAME) because import library is missing)
-      $$(shell $(RM) $$($1_TARGET))
-    endif
-    $$($1_IMPORT_LIBRARY): $$($1_TARGET)
-	$(TOUCH) $$@
-
-    $1 += $$($1_IMPORT_LIBRARY)
-  endif
-
-  $1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) \
-      $$($1_EXTRA_LDFLAGS) $$($1_LIBS) $$($1_EXTRA_LIBS) $$($1_MT) \
-      $$($1_MANIFEST_VERSION)
-
-  $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
-      $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)
-
-  $1_TARGET_DEPS := $$($1_ALL_OBJS) $$($1_RES) $$($1_MANIFEST) \
-      $$($1_VARDEPS_FILE)
-
-  $$($1_TARGET): $$($1_TARGET_DEPS)
-        ifneq ($$($1_OBJ_FILE_LIST), )
-	  $$(eval $$(call ListPathsSafely, $1_ALL_OBJS, $$($1_OBJ_FILE_LIST)))
-        endif
-	$$(call LogInfo, Linking $$($1_BASENAME))
-	$$(call MakeDir, $$($1_OUTPUT_DIR) $$($1_SYMBOLS_DIR))
-	$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
-	    $$($1_LD) -nologo $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \
-	        $$($1_SYSROOT_LDFLAGS) -out:$$($1_TARGET) $$($1_LD_OBJ_ARG) \
-	        $$($1_RES) $$($1_LIBS) $$($1_EXTRA_LIBS)) \
-	    | $(GREP) -v "^   Creating library .*\.lib and object .*\.exp" || \
-	        test "$$$$?" = "1"
-        ifeq ($(call isBuildOsEnv, windows.wsl2), true)
-	  $$(CHMOD) +x $$($1_TARGET)
-        endif
-        ifneq ($$($1_MANIFEST), )
-	  $$($1_MT) -nologo -manifest $$($1_MANIFEST) \
-	      -identity:"$$($1_NAME).exe, version=$$($1_MANIFEST_VERSION)" \
-	      -outputresource:$$@;#1
-        endif
-endef

make/common/native/Paths.gmk

@@ -1,247 +0,0 @@
-#
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-# This file contains functionality related to handling paths for source files
-# and object files. This is complicated by the fact that we usually, but not
-# always, use absolute instead of relative paths. It is further complicated
-# by the fact that not all tools allow inputting large lists of files as
-# "@-files", which we normally use to avoid hitting command line length limits.
-# Finally this file contains functionality for locating all source code files
-# that should be included in the compilation.
-
-################################################################################
-# When absolute paths are not allowed in the output, and the compiler does not
-# support any options to avoid it, we need to rewrite compile commands to use
-# relative paths. By doing this, the __FILE__ macro will resolve to relative
-# paths. The relevant input paths on the command line are the -I flags and the
-# path to the source file itself.
-#
-# The macro MakeCommandRelative is used to rewrite the command line like this:
-# 'CD $(WORKSPACE_ROOT) && <cmd>'
-# and changes all paths in cmd to be relative to the workspace root. This only
-# works properly if the build dir is inside the workspace root. If it's not,
-# relative paths are still calculated, but depending on the distance between the
-# dirs, paths in the build dir may end up as essentially absolute anyway.
-#
-# The fix-deps-file macro is used to adjust the contents of the generated make
-# dependency files to contain paths compatible with make.
-#
-REWRITE_PATHS_RELATIVE = false
-ifeq ($(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT)-$(FILE_MACRO_CFLAGS), false-)
-  REWRITE_PATHS_RELATIVE = true
-endif
-
-# CCACHE_BASEDIR needs fix-deps-file as makefiles use absolute filenames for
-# object files while CCACHE_BASEDIR will make ccache relativize all paths for
-# its compiler. The compiler then produces relative dependency files.
-# make does not know a relative and absolute filename is the same so it will
-# ignore such dependencies. This only applies when the OUTPUTDIR is inside
-# the WORKSPACE_ROOT.
-ifneq ($(CCACHE), )
-  ifneq ($(filter $(WORKSPACE_ROOT)/%, $(OUTPUTDIR)), )
-    REWRITE_PATHS_RELATIVE = true
-  endif
-endif
-
-ifeq ($(REWRITE_PATHS_RELATIVE), true)
-  # Need to handle -I flags as both '-Ifoo' and '-I foo'.
-  MakeCommandRelative = \
-      $(CD) $(WORKSPACE_ROOT) && \
-      $(foreach o, $1, \
-        $(if $(filter $(WORKSPACE_ROOT)/% $(OUTPUTDIR)/%, $o), \
-          $(call RelativePath, $o, $(WORKSPACE_ROOT)) \
-        , \
-          $(if $(filter -I$(WORKSPACE_ROOT)/%, $o), \
-            -I$(call RelativePath, $(patsubst -I%, %, $o), $(WORKSPACE_ROOT)) \
-          , \
-            $o \
-          ) \
-        ) \
-      )
-
-  # When compiling with relative paths, the deps file may come out with relative
-  # paths, and that path may start with './'. First remove any leading ./, then
-  # add WORKSPACE_ROOT to any line not starting with /, while allowing for
-  # leading spaces. There may also be multiple entries on the same line, so start
-  # with splitting such lines.
-  # Non GNU sed (BSD on macosx) cannot substitute in literal \n using regex.
-  # Instead use a bash escaped literal newline. To avoid having unmatched quotes
-  # ruin the ability for an editor to properly syntax highlight this file, define
-  # that newline sequence as a separate variable and add the closing quote behind
-  # a comment.
-  sed_newline := \'$$'\n''#'
-  define fix-deps-file
-	$(SED) \
-	    -e 's|\([^ ]\) \{1,\}\([^\\:]\)|\1 \\$(sed_newline) \2|g' \
-	    $1.tmp \
-	    | $(SED) \
-	        -e 's|^\([ ]*\)\./|\1|' \
-	        -e '/^[ ]*[^/ ]/s|^\([ ]*\)|\1$(WORKSPACE_ROOT)/|' \
-	        > $1
-  endef
-else
-  # By default the MakeCommandRelative macro does nothing.
-  MakeCommandRelative = $1
-
-  # No adjustment is needed.
-  define fix-deps-file
-	$(MV) $1.tmp $1
-  endef
-endif
-
-################################################################################
-define SetupSourceFiles
-  $$(foreach d, $$($1_SRC), $$(if $$(wildcard $$d), , \
-      $$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
-
-  $1_SRCS_RAW := $$(call FindFiles, $$($1_SRC))
-  # Order src files according to the order of the src dirs
-  $1_SRCS := $$(foreach d, $$($1_SRC), $$(filter $$d%, $$($1_SRCS_RAW)))
-  $1_SRCS := $$(filter $$(NATIVE_SOURCE_EXTENSIONS), $$($1_SRCS))
-  # Extract the C/C++ files.
-  ifneq ($$($1_EXCLUDE_PATTERNS), )
-    # We must not match the exclude pattern against the src root(s).
-    $1_SRCS_WITHOUT_ROOTS := $$($1_SRCS)
-    $$(foreach i, $$($1_SRC), $$(eval $1_SRCS_WITHOUT_ROOTS := $$(patsubst \
-        $$i/%,%, $$($1_SRCS_WITHOUT_ROOTS))))
-    $1_ALL_EXCLUDE_FILES :=  $$(call containing, $$($1_EXCLUDE_PATTERNS), \
-        $$($1_SRCS_WITHOUT_ROOTS))
-  endif
-  ifneq ($$($1_EXCLUDE_FILES), )
-    $1_ALL_EXCLUDE_FILES += $$($1_EXCLUDE_FILES)
-  endif
-  ifneq ($$($1_ALL_EXCLUDE_FILES), )
-    $1_EXCLUDE_FILES_PAT := $$($1_ALL_EXCLUDE_FILES) \
-        $$(foreach i, $$($1_SRC), $$(addprefix $$i/, $$($1_ALL_EXCLUDE_FILES)))
-    $1_EXCLUDE_FILES_PAT := $$(addprefix %, $$($1_EXCLUDE_FILES_PAT))
-    $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES_PAT), $$($1_SRCS))
-  endif
-  ifneq ($$($1_INCLUDE_FILES), )
-    $1_INCLUDE_FILES_PAT := $$(foreach i, $$($1_SRC), $$(addprefix $$i/, $$($1_INCLUDE_FILES)))
-    $1_SRCS := $$(filter $$($1_INCLUDE_FILES_PAT), $$($1_SRCS))
-  endif
-  # Now we have a list of all c/c++ files to compile: $$($1_SRCS)
-
-  # Prepend the source/bin path to the filter expressions. Then do the filtering.
-  ifneq ($$($1_INCLUDES), )
-    $1_SRC_INCLUDES := $$(foreach i, $$($1_SRC), $$(addprefix $$i/, $$(addsuffix /%, $$($1_INCLUDES))))
-    $1_SRCS := $$(filter $$($1_SRC_INCLUDES), $$($1_SRCS))
-  endif
-  ifneq ($$($1_EXCLUDES), )
-    $1_SRC_EXCLUDES := $$(addsuffix /%, $$($1_EXCLUDES))
-    $1_SRC_EXCLUDES += $$(foreach i, $$($1_SRC), $$(addprefix $$i/, $$(addsuffix /%, $$($1_EXCLUDES))))
-    $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES), $$($1_SRCS))
-  endif
-
-  $1_SRCS += $$($1_EXTRA_FILES)
-
-  ifeq ($$($1_SRCS), )
-    $$(error No sources found for $1 when looking inside the dirs $$($1_SRC))
-  endif
-
-  ifeq ($$($1_TYPE), EXECUTABLE)
-    ifeq ($(UBSAN_ENABLED), true)
-      # We need to set the default options for UBSan. This needs to be included in every executable.
-      # Rather than copy and paste code to everything with a main function, we add an additional
-      # source file to every executable that exports __ubsan_default_options.
-      ifneq ($$(filter %.cpp %.cc, $$($1_SRCS)), )
-        $1_SRCS += $(TOPDIR)/make/data/ubsan/ubsan_default_options.cpp
-      else
-        $1_SRCS += $(TOPDIR)/make/data/ubsan/ubsan_default_options.c
-      endif
-    endif
-  endif
-endef
-
-################################################################################
-define SetupOutputFiles
-  # Calculate the expected output from compiling the sources
-  $1_EXPECTED_OBJS_FILENAMES := $$(call replace_with_obj_extension, $$(notdir $$($1_SRCS)))
-  $1_EXPECTED_OBJS := $$(addprefix $$($1_OBJECT_DIR)/, $$($1_EXPECTED_OBJS_FILENAMES))
-  # Sort to remove duplicates and provide a reproducible order on the input files to the linker.
-  $1_ALL_OBJS := $$(sort $$($1_EXPECTED_OBJS) $$($1_EXTRA_OBJECT_FILES))
-  ifeq ($(STATIC_LIBS), true)
-    # Exclude the object files that match with $1_STATIC_LIB_EXCLUDE_OBJS.
-    ifneq ($$($1_STATIC_LIB_EXCLUDE_OBJS), )
-      $1_ALL_OBJS := $$(call not-containing, $$($1_STATIC_LIB_EXCLUDE_OBJS), $$($1_ALL_OBJS))
-    endif
-  endif
-endef
-
-################################################################################
-define RemoveSuperfluousOutputFiles
-  # Are there too many object files on disk? Perhaps because some source file was removed?
-  $1_BINS := $$(wildcard $$($1_OBJECT_DIR)/*$(OBJ_SUFFIX))
-  $1_SUPERFLOUS_OBJS := $$(sort $$(filter-out $$($1_EXPECTED_OBJS), $$($1_BINS)))
-  # Clean out the superfluous object files.
-  ifneq ($$($1_SUPERFLUOUS_OBJS), )
-    $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS))
-  endif
-endef
-
-################################################################################
-define SetupObjectFileList
-  $1_LD_OBJ_ARG := $$($1_ALL_OBJS)
-
-  # If there are many object files, use an @-file...
-  ifneq ($$(word 17, $$($1_ALL_OBJS)), )
-    $1_OBJ_FILE_LIST := $$($1_OBJECT_DIR)/_$1_objectfilenames.txt
-    ifneq ($(COMPILER_COMMAND_FILE_FLAG), )
-      $1_LD_OBJ_ARG := $(COMPILER_COMMAND_FILE_FLAG)$$($1_OBJ_FILE_LIST)
-    else
-      # ...except for toolchains which don't support them.
-      $1_LD_OBJ_ARG := `cat $$($1_OBJ_FILE_LIST)`
-    endif
-
-    # If we are building static library, 'AR' on macosx/aix may not support @-file.
-    ifeq ($$($1_TYPE), STATIC_LIBRARY)
-      ifeq ($(call isTargetOs, macosx aix), true)
-        $1_LD_OBJ_ARG := `cat $$($1_OBJ_FILE_LIST)`
-      endif
-    endif
-  endif
-
-  # Unfortunately the @-file trick does not work reliably when using clang.
-  # Clang does not propagate the @-file parameter to the ld sub process, but
-  # instead puts the full content on the command line. At least the llvm ld
-  # does not even support an @-file.
-  #
-  # When linking a large amount of object files, we risk hitting the limit
-  # of the command line length even on posix systems if the path length of
-  # the output dir is very long due to our use of absolute paths. To
-  # mitigate this, use paths relative to the output dir when linking over
-  # 500 files with clang and the output dir path is deep.
-  ifneq ($$(word 500, $$($1_ALL_OBJS)), )
-    ifeq ($$(TOOLCHAIN_TYPE), clang)
-      # There is no strlen function in make, but checking path depth is a
-      # reasonable approximation.
-      ifneq ($$(word 10, $$(subst /, ,$$(OUTPUTDIR))), )
-        $1_LINK_OBJS_RELATIVE := true
-        $1_ALL_OBJS_RELATIVE := $$(patsubst $$(OUTPUTDIR)/%, %, $$($1_ALL_OBJS))
-      endif
-    endif
-  endif
-endef

make/conf/github-actions.conf

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -36,10 +36,6 @@ MACOS_X64_BOOT_JDK_EXT=tar.gz
 MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_macos-x64_bin.tar.gz
 MACOS_X64_BOOT_JDK_SHA256=af32e84c11009f72f783fdcdc9917efc277893988f097e198e2576875d1e88c1
 
-MACOS_AARCH64_BOOT_JDK_EXT=tar.gz
-MACOS_AARCH64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_macos-aarch64_bin.tar.gz
-MACOS_AARCH64_BOOT_JDK_SHA256=f12e1e0a2dffc847951598f597c8ee60fb0913932f24b2b09c62cfd2f0f4dfb9
-
 WINDOWS_X64_BOOT_JDK_EXT=zip
 WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_windows-x64_bin.zip
 WINDOWS_X64_BOOT_JDK_SHA256=5434faaf029e66e7ce6e75770ca384de476750984a7d2881ef7686894c4b4944

make/conf/jib-profiles.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -441,7 +441,7 @@ var getJibProfilesProfiles = function (input, common, data) {
         "macosx-x64": {
             target_os: "macosx",
             target_cpu: "x64",
-            dependencies: ["devkit", "gtest", "graphviz", "pandoc"],
+            dependencies: ["devkit", "gtest", "pandoc"],
             configure_args: concat(common.configure_args_64bit, "--with-zlib=system",
                 "--with-macosx-version-max=11.00.00",
                 "--enable-compatible-cds-alignment",
@@ -453,7 +453,7 @@ var getJibProfilesProfiles = function (input, common, data) {
         "macosx-aarch64": {
             target_os: "macosx",
             target_cpu: "aarch64",
-            dependencies: ["devkit", "gtest", "graphviz", "pandoc"],
+            dependencies: ["devkit", "gtest", "pandoc"],
             configure_args: concat(common.configure_args_64bit,
                 "--with-macosx-version-max=11.00.00"),
         },
@@ -486,7 +486,7 @@ var getJibProfilesProfiles = function (input, common, data) {
         "linux-aarch64": {
             target_os: "linux",
             target_cpu: "aarch64",
-            dependencies: ["devkit", "gtest", "build_devkit", "graphviz", "pandoc"],
+            dependencies: ["devkit", "gtest", "build_devkit", "pandoc"],
             configure_args: [
                 "--with-zlib=system",
                 "--disable-dtrace",
@@ -1181,6 +1181,12 @@ var getJibProfilesDependencies = function (input, common) {
             revision: (input.build_cpu == "x64" ? "Xcode11.3.1-MacOSX10.15+1.2" : devkit_platform_revisions[devkit_platform])
         },
 
+        cups: {
+            organization: common.organization,
+            ext: "tar.gz",
+            revision: "1.0118+1.0"
+        },
+
         jtreg: {
             server: "jpg",
             product: "jtreg",
@@ -1231,7 +1237,7 @@ var getJibProfilesDependencies = function (input, common) {
         graphviz: {
             organization: common.organization,
             ext: "tar.gz",
-            revision: "9.0.0+1.0",
+            revision: "2.38.0-1+1.1",
             module: "graphviz-" + input.target_platform,
             configure_args: "DOT=" + input.get("graphviz", "install_path") + "/dot",
             environment_path: input.get("graphviz", "install_path")

make/data/hotspot-symbols/symbols-aix

@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+JVM_handle_aix_signal
+numa_error
+numa_warn

make/data/hotspot-symbols/symbols-aix-debug

@@ -0,0 +1,26 @@
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+JVM_AccessVMBooleanFlag
+JVM_AccessVMIntFlag
+JVM_VMBreakPoint

make/data/hotspot-symbols/symbols-linux

@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+JVM_handle_linux_signal
+JVM_IsUseContainerSupport
+numa_error
+numa_warn

make/data/hotspot-symbols/symbols-macosx

@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+JVM_handle_bsd_signal

make/data/hotspot-symbols/symbols-shared

@@ -0,0 +1,35 @@
+#
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+AsyncGetCallTrace
+jio_fprintf
+jio_printf
+jio_snprintf
+jio_vfprintf
+jio_vsnprintf
+JNI_CreateJavaVM
+JNI_GetCreatedJavaVMs
+JNI_GetDefaultJavaVMInitArgs
+JVM_IsForeignLinkerSupported
+JVM_FindClassFromBootLoader
+JVM_InitAgentProperties

make/data/hotspot-symbols/symbols-unix

@@ -0,0 +1,233 @@
+#
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+JVM_ActiveProcessorCount
+JVM_AreNestMates
+JVM_ArrayCopy
+JVM_AssertionStatusDirectives
+JVM_BeforeHalt
+JVM_CallStackWalk
+JVM_Clone
+JVM_ConstantPoolGetClassAt
+JVM_ConstantPoolGetClassAtIfLoaded
+JVM_ConstantPoolGetClassRefIndexAt
+JVM_ConstantPoolGetDoubleAt
+JVM_ConstantPoolGetFieldAt
+JVM_ConstantPoolGetFieldAtIfLoaded
+JVM_ConstantPoolGetFloatAt
+JVM_ConstantPoolGetIntAt
+JVM_ConstantPoolGetLongAt
+JVM_ConstantPoolGetMemberRefInfoAt
+JVM_ConstantPoolGetMethodAt
+JVM_ConstantPoolGetMethodAtIfLoaded
+JVM_ConstantPoolGetNameAndTypeRefIndexAt
+JVM_ConstantPoolGetNameAndTypeRefInfoAt
+JVM_ConstantPoolGetSize
+JVM_ConstantPoolGetStringAt
+JVM_ConstantPoolGetTagAt
+JVM_ConstantPoolGetUTF8At
+JVM_CurrentCarrierThread
+JVM_CurrentThread
+JVM_SetCurrentThread
+JVM_CurrentTimeMillis
+JVM_DefineClass
+JVM_DefineClassWithSource
+JVM_DesiredAssertionStatus
+JVM_DumpAllStacks
+JVM_DumpClassListToFile
+JVM_DumpDynamicArchive
+JVM_DumpThreads
+JVM_ExpandStackFrameInfo
+JVM_FillInStackTrace
+JVM_FindClassFromCaller
+JVM_FindClassFromClass
+JVM_FindLibraryEntry
+JVM_FindLoadedClass
+JVM_FindPrimitiveClass
+JVM_FindSignal
+JVM_FreeMemory
+JVM_GC
+JVM_GetAllThreads
+JVM_GetAndClearReferencePendingList
+JVM_GetArrayElement
+JVM_GetArrayLength
+JVM_GetCallerClass
+JVM_GetClassAccessFlags
+JVM_GetClassAnnotations
+JVM_GetClassConstantPool
+JVM_GetClassContext
+JVM_GetClassCPEntriesCount
+JVM_GetClassCPTypes
+JVM_GetClassDeclaredConstructors
+JVM_GetClassDeclaredFields
+JVM_GetClassDeclaredMethods
+JVM_GetClassFieldsCount
+JVM_GetClassFileVersion
+JVM_GetClassInterfaces
+JVM_GetClassMethodsCount
+JVM_GetClassModifiers
+JVM_GetClassNameUTF
+JVM_GetClassSignature
+JVM_GetClassSigners
+JVM_GetClassTypeAnnotations
+JVM_GetCPClassNameUTF
+JVM_GetCPFieldClassNameUTF
+JVM_GetCPFieldModifiers
+JVM_GetCPFieldNameUTF
+JVM_GetCPFieldSignatureUTF
+JVM_GetCPMethodClassNameUTF
+JVM_GetCPMethodModifiers
+JVM_GetCPMethodNameUTF
+JVM_GetCPMethodSignatureUTF
+JVM_GetDeclaredClasses
+JVM_GetDeclaringClass
+JVM_GetEnclosingMethodInfo
+JVM_GetExtendedNPEMessage
+JVM_GetFieldIxModifiers
+JVM_GetFieldTypeAnnotations
+JVM_GetInheritedAccessControlContext
+JVM_GetManagement
+JVM_GetMethodIxArgsSize
+JVM_GetMethodIxByteCode
+JVM_GetMethodIxByteCodeLength
+JVM_GetMethodIxExceptionIndexes
+JVM_GetMethodIxExceptionsCount
+JVM_GetMethodIxExceptionTableEntry
+JVM_GetMethodIxExceptionTableLength
+JVM_GetMethodIxLocalsCount
+JVM_GetMethodIxMaxStack
+JVM_GetMethodIxModifiers
+JVM_GetMethodIxNameUTF
+JVM_GetMethodIxSignatureUTF
+JVM_GetMethodParameters
+JVM_GetMethodTypeAnnotations
+JVM_GetNanoTimeAdjustment
+JVM_GetNestHost
+JVM_GetNestMembers
+JVM_GetNextThreadIdOffset
+JVM_GetPermittedSubclasses
+JVM_GetPrimitiveArrayElement
+JVM_GetProperties
+JVM_GetProtectionDomain
+JVM_GetRandomSeedForDumping
+JVM_GetRecordComponents
+JVM_GetSimpleBinaryName
+JVM_GetStackAccessControlContext
+JVM_GetSystemPackage
+JVM_GetSystemPackages
+JVM_GetTemporaryDirectory
+JVM_GetVmArguments
+JVM_Halt
+JVM_HasReferencePendingList
+JVM_HoldsLock
+JVM_GetStackTrace
+JVM_IHashCode
+JVM_InitClassName
+JVM_InitStackTraceElement
+JVM_InitStackTraceElementArray
+JVM_InitializeFromArchive
+JVM_InternString
+JVM_Interrupt
+JVM_InvokeMethod
+JVM_IsArrayClass
+JVM_IsCDSDumpingEnabled
+JVM_IsConstructorIx
+JVM_IsDumpingClassList
+JVM_IsFinalizationEnabled
+JVM_IsHiddenClass
+JVM_IsInterface
+JVM_IsPreviewEnabled
+JVM_IsContinuationsSupported
+JVM_IsPrimitiveClass
+JVM_IsRecord
+JVM_IsSameClassPackage
+JVM_IsSharingEnabled
+JVM_IsSupportedJNIVersion
+JVM_IsVMGeneratedMethodIx
+JVM_LatestUserDefinedLoader
+JVM_LoadZipLibrary
+JVM_LoadLibrary
+JVM_LookupDefineClass
+JVM_LookupLambdaProxyClassFromArchive
+JVM_LogLambdaFormInvoker
+JVM_MaxMemory
+JVM_MaxObjectInspectionAge
+JVM_MonitorNotify
+JVM_MonitorNotifyAll
+JVM_MonitorWait
+JVM_MoreStackWalk
+JVM_NanoTime
+JVM_NativePath
+JVM_NewArray
+JVM_NewInstanceFromConstructor
+JVM_NewMultiArray
+JVM_PhantomReferenceRefersTo
+JVM_PrintWarningAtDynamicAgentLoad
+JVM_RaiseSignal
+JVM_RawMonitorCreate
+JVM_RawMonitorDestroy
+JVM_RawMonitorEnter
+JVM_RawMonitorExit
+JVM_ReferenceClear
+JVM_ReferenceRefersTo
+JVM_RegisterContinuationMethods
+JVM_RegisterLambdaProxyClassForArchiving
+JVM_RegisterSignal
+JVM_ReleaseUTF
+JVM_ReportFinalizationComplete
+JVM_SetArrayElement
+JVM_SetClassSigners
+JVM_SetNativeThreadName
+JVM_SetPrimitiveArrayElement
+JVM_SetStackWalkContinuation
+JVM_SetThreadPriority
+JVM_SleepNanos
+JVM_StartThread
+JVM_TotalMemory
+JVM_UnloadLibrary
+JVM_WaitForReferencePendingList
+JVM_Yield
+
+# Module related API's
+JVM_AddModuleExports
+JVM_AddModuleExportsToAll
+JVM_AddModuleExportsToAllUnnamed
+JVM_AddReadsModule
+JVM_DefineArchivedModules
+JVM_DefineModule
+JVM_SetBootLoaderUnnamedModule
+
+# Virtual thread notifications for JVMTI
+JVM_VirtualThreadStart
+JVM_VirtualThreadEnd
+JVM_VirtualThreadMount
+JVM_VirtualThreadUnmount
+JVM_VirtualThreadHideFrames
+JVM_VirtualThreadDisableSuspend
+
+# Scoped values
+JVM_EnsureMaterializedForStackWalk_func
+JVM_FindScopedValueBindings
+JVM_ScopedValueCache
+JVM_SetScopedValueCache
+#