8348760: RadioButton is not shown if JRadioButtonMenuItem is rendered with ImageIcon in WindowsLookAndFeel

Reviewed-by: prr, aivanov
Backport-of: e29346dbd6

.github/README.md

@@ -1,265 +0,0 @@
-[![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)
- * [jbr21](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr21) (JDK 21)
-
-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 21
-
-| IDE Version | Latest JBR                                                                                              | Date Released |
-|-------------|---------------------------------------------------------------------------------------------------------|---------------|
-| 2025.3      | [21.0.8-b1163.59](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.8b1163.59)| 14-Oct-2025   |
-| 2025.2      | [21.0.8-b1038.73](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.8b1038.73)| 13-Oct-2025   |
-| 2025.1      | [21.0.7-b895.130](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b895.130)| 15-May-2025   |
-| 2024.3      | [21.0.6-b631.52](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b631.52)  | 15-May-2025   |
-| 2024.2      | [21.0.4-b509.40](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b509.40)  | 15-May-2025   |
-| 2024.1      | [21.0.2-b346.3](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.2b346.3)    | 30-Jan-2024   |
-
-## Releases based on JDK 17
-
-| IDE Version | Latest JBR                                                                                             | Date Released |
-|-------------|--------------------------------------------------------------------------------------------------------|---------------|
-| 2024.2      | [17.0.11-b1312.2](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.11b1312.2)   | 18-Jun-2024|
-| 2024.1      | [17.0.12-b1207.37](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.12b1207.37) | 15-Oct-2024|
-| 2023.3      | [17.0.12-b1087.25](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.12b1087.25) | 02-Sep-2024|
-| 2023.2      | [17.0.12-b1000.54](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.12b1000.54) | 02-Sep-2024|
-| 2023.1      | [17.0.10-b829.27](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-17.0.10b829.27) | 21-Mar-2024  |
-| 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   |
-
-## Release Flavours
-
-There are many kinds of JBR bundles available on the [Releases page](https://github.com/JetBrains/JetBrainsRuntime/releases):
-
-| Flavour       | Description                                                                                                   |
-|---------------|---------------------------------------------------------------------------------------------------------------|
-| JBR           | Contains the Java Runtime Environment (JRE) suitable to _run_ JVM-based programs.                             |
-| JBRSDK        | Contains the Software Developmet Kit (SDK) suitable to _develop_ and _run_ JVM-based programs.                |
-| JBR with JCEF | Contains both JBR and JCEF; this flavour is bundled by default with all IntelliJ IDEs.                        |
-| vanilla       | Contains just JBR.                                                                                            |
-| fastdebug     | The native binaries in this bundle are less optimized and are easier to debug. They also run much slower.     |
-| FreeType      | The bundle includes the freetype library built from sources; normally, the library is provided by the system. |
-| Vulkan        | The bundle includes experimental Vulkan support.                                                              |                                                              |
-| debug symbols | In addition to the usual contents of the bundle the debug information is also included.                       |
-
-## 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.
-* Additional capabilities that are made available to applications through
-  [JBR API](https://github.com/JetBrains/JetBrainsRuntimeApi) services such as, for example, 
-  the ability to wrap a native graphics texture into `java.awt.Image`.
-
-## 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)
-Download an image from [Docker Hub](https://hub.docker.com/repository/docker/jetbrains/runtime/general) related to your architecture:
-```
-$ docker pull jetbrains/runtime:oraclelinux8_aarch64
-```
-or
-```
-$ docker pull jetbrains/runtime:oraclelinux8_x64
-```
-Create and run a new container from the downloaded image
-```
-$ docker run -v $JetBrainsRuntime:/JetBrainsRuntime -it jetbrains/runtime:oraclelinux8_[arch]
-```
-where `$JetBrainsRuntime` is a full path to the directory where the repository was cloned to.
-
-Run these commands in the container:
-```
-# cd /JetBrainsRuntime
-# sh ./configure
-# make images
-```
-
-### 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 libspeechd-dev libwayland-dev \
-       wayland-protocols libxkbcommon-x11-0 libdbus-1-dev
-```
-Get Java 23 (for instance, [Azul Zulu Builds of OpenJDK 23](https://www.azul.com/downloads/?version=java-23&os=linux&package=jdk#zulu)).
-
-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 21 (for instance, [Azul Zulu Builds of OpenJDK 21](https://www.azul.com/downloads/?version=java-21-lts&os=windows&package=jdk#zulu)).
-  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/`.
-
-#### Enable optional NVDA screen reader support
-If you want to add support of a11y announcing via [NVDA screen reader](https://www.nvaccess.org/about-nvda/),
-you will need to bundle the NVDA Controller Client library.
-You can do it with the following steps:
-1. Download the NVDA Controller Client library. You can find the link in its official README [here](https://github.com/nvaccess/nvda/blob/master/extras/controllerClient/readme.md)
-2. Pass the path to the unpacked package to `configure` via an additional flag `--with-nvdacontrollerclient=<path>`.
-   The build system will search the required library files under `<path>/<target-arch>`.
-
-#### Disable optional JAWS screen reader support
-JBR is built with built-in support of JAWS screen reader.
-If you want to disable it, run `configure` with the additional flag `--disable-jaws-client`.
-
-### macOS
-Install the following:
-* Xcode command line developer tools and `autoconf` via [Homebrew](https://brew.sh/).
-* Java 21 (for instance, [Azul Zulu Builds of OpenJDK 21](https://www.azul.com/downloads/?version=java-21-lts&os=macos&package=jdk#zulu)).
-
-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/build-jtreg/action.yml

@@ -65,4 +65,4 @@ runs:
       with:
         name: bundles-jtreg-${{ steps.version.outputs.value }}
         path: jtreg/installed
-        retention-days: 5
+        retention-days: 1

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

@@ -30,15 +30,15 @@ runs:
   using: composite
   steps:
     - name: 'Install MSYS2'
-      id: msys2
-      uses: msys2/setup-msys2@v2.28.0
+      uses: msys2/setup-msys2@v2.22.0
       with:
         install: 'autoconf tar unzip zip make'
         path-type: minimal
-        release: false
+        location: ${{ runner.tool_cache }}/msys2
 
       # We can't run bash until this is completed, so stick with pwsh
     - name: 'Set MSYS2 path'
       run: |
-        echo "${{ steps.msys2.outputs.msys2-location }}/usr/bin" >> $env:GITHUB_PATH
+        # Prepend msys2/msys64/usr/bin to the PATH
+        echo "$env:RUNNER_TOOL_CACHE/msys2/msys64/usr/bin" >> $env:GITHUB_PATH
       shell: pwsh

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

@@ -91,5 +91,5 @@ runs:
       with:
         name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}${{ inputs.bundle-suffix }}
         path: bundles
-        retention-days: 5
+        retention-days: 1
       if: steps.bundles.outputs.bundles-found == 'true'

.github/workflows/build-alpine-linux.yml

@@ -51,10 +51,6 @@ on:
       make-arguments:
         required: false
         type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false
 
 jobs:
   build-linux:
@@ -108,11 +104,9 @@ jobs:
           make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
           platform: ${{ inputs.platform }}
           debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}
 
       - name: 'Upload bundles'
         uses: ./.github/actions/upload-bundles
         with:
           platform: ${{ inputs.platform }}
           debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}

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

@@ -40,10 +40,6 @@ on:
       make-arguments:
         required: false
         type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false
 
 jobs:
   build-cross-compile:
@@ -64,33 +60,33 @@ jobs:
             gnu-arch: aarch64
             debian-arch: arm64
             debian-repository: https://httpredir.debian.org/debian/
-            debian-version: trixie
+            debian-version: bullseye
             tolerate-sysroot-errors: false
           - target-cpu: arm
             gnu-arch: arm
             debian-arch: armhf
             debian-repository: https://httpredir.debian.org/debian/
-            debian-version: trixie
+            debian-version: bullseye
             tolerate-sysroot-errors: false
             gnu-abi: eabihf
           - target-cpu: s390x
             gnu-arch: s390x
             debian-arch: s390x
             debian-repository: https://httpredir.debian.org/debian/
-            debian-version: trixie
+            debian-version: bullseye
             tolerate-sysroot-errors: false
           - target-cpu: ppc64le
             gnu-arch: powerpc64le
             debian-arch: ppc64el
             debian-repository: https://httpredir.debian.org/debian/
-            debian-version: trixie
+            debian-version: bullseye
             tolerate-sysroot-errors: false
           - target-cpu: riscv64
             gnu-arch: riscv64
             debian-arch: riscv64
             debian-repository: https://httpredir.debian.org/debian/
-            debian-version: trixie
-            tolerate-sysroot-errors: false
+            debian-version: sid
+            tolerate-sysroot-errors: true
 
     steps:
       - name: 'Checkout the JDK source'
@@ -193,4 +189,4 @@ jobs:
         with:
           make-target: 'hotspot ${{ inputs.make-arguments }}'
           platform: linux-${{ matrix.target-cpu }}
-        if: ((steps.create-sysroot.outcome == 'success' || steps.get-cached-sysroot.outputs.cache-hit == 'true') && inputs.dry-run == false)
+        if: steps.create-sysroot.outcome == 'success' || steps.get-cached-sysroot.outputs.cache-hit == 'true'

.github/workflows/build-linux.yml

@@ -61,10 +61,6 @@ on:
       make-arguments:
         required: false
         type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false
       bundle-suffix:
         required: false
         type: string
@@ -143,7 +139,6 @@ jobs:
           make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
           platform: ${{ inputs.platform }}
           debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
-        if: ${{ inputs.dry-run == false }}
 
       - name: 'Upload bundles'
         uses: ./.github/actions/upload-bundles
@@ -152,4 +147,3 @@ jobs:
           debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
           bundle-suffix: ${{ inputs.bundle-suffix }}
           static-suffix: ${{ inputs.static-suffix }}
-        if: ${{ inputs.dry-run == false }}

.github/workflows/build-macos.yml

@@ -54,10 +54,6 @@ on:
       make-arguments:
         required: false
         type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false
 
 jobs:
   build-macos:
@@ -122,11 +118,9 @@ jobs:
           make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
           platform: ${{ inputs.platform }}
           debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}
 
       - name: 'Upload bundles'
         uses: ./.github/actions/upload-bundles
         with:
           platform: ${{ inputs.platform }}
           debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}

.github/workflows/build-windows.yml

@@ -54,10 +54,6 @@ on:
       make-arguments:
         required: false
         type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false
 
 env:
   # These are needed to make the MSYS2 bash work properly
@@ -143,7 +139,6 @@ jobs:
           # Set PATH to "", so just GITHUB_PATH is included
           PATH: ''
         shell: env /usr/bin/bash --login -eo pipefail {0}
-        if: ${{ inputs.dry-run == false }}
 
       - name: 'Build'
         id: build
@@ -152,11 +147,9 @@ jobs:
           make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
           platform: ${{ inputs.platform }}
           debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}
 
       - name: 'Upload bundles'
         uses: ./.github/actions/upload-bundles
         with:
           platform: ${{ inputs.platform }}
           debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}

.github/workflows/main.yml

@@ -28,8 +28,9 @@ name: 'OpenJDK GHA Sanity Checks'
 on:
   push:
     branches-ignore:
+      - master
       - pr/*
-      - main
+      - jdk*
   workflow_dispatch:
     inputs:
       platforms:
@@ -42,9 +43,6 @@ on:
       make-arguments:
         description: 'Additional make arguments'
         required: false
-      dry-run:
-        description: 'Dry run: skip actual builds and tests'
-        required: false
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -72,7 +70,6 @@ jobs:
       windows-x64: ${{ steps.include.outputs.windows-x64 }}
       windows-aarch64: ${{ steps.include.outputs.windows-aarch64 }}
       docs: ${{ steps.include.outputs.docs }}
-      dry-run: ${{ steps.include.outputs.dry-run }}
 
     steps:
       - name: 'Checkout the scripts'
@@ -146,35 +143,6 @@ jobs:
             echo 'false'
           }
 
-          function check_dry_run() {
-            if [[ $GITHUB_EVENT_NAME == workflow_dispatch ]]; then
-              # Take the user-specified one.
-              echo '${{ github.event.inputs.dry-run }}'
-              return
-            elif [[ $GITHUB_EVENT_NAME == push ]]; then
-              # Cut out the real branch name
-              BRANCH=${GITHUB_REF##*/}
-
-              # Dry run rebuilds the caches in current branch, so they can be reused
-              # for any child PR branches. Because of this, we want to trigger this
-              # workflow in master branch, so that actual PR branches can use the cache.
-              # This workflow would trigger every time contributors sync their master
-              # branches in their personal forks.
-              if [[ $BRANCH == "master" ]]; then
-                echo 'true'
-                return
-              fi
-
-              # ...same for stabilization branches
-              if [[ $BRANCH =~ "jdk(.*)" ]]; then
-                echo 'true'
-                return
-              fi
-            fi
-
-            echo 'false'
-          }
-
           echo "linux-x64=$(check_platform linux-x64 linux x64)" >> $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
@@ -184,7 +152,6 @@ jobs:
           echo "windows-x64=$(check_platform windows-x64 windows x64)" >> $GITHUB_OUTPUT
           echo "windows-aarch64=$(check_platform windows-aarch64 windows aarch64)" >> $GITHUB_OUTPUT
           echo "docs=$(check_platform docs)" >> $GITHUB_OUTPUT
-          echo "dry-run=$(check_dry_run)" >> $GITHUB_OUTPUT
 
   ###
   ### Build jobs
@@ -199,7 +166,6 @@ jobs:
       gcc-major-version: '10'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.linux-x64 == 'true'
 
   build-linux-x64-hs-nopch:
@@ -214,7 +180,6 @@ jobs:
       extra-conf-options: '--disable-precompiled-headers'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.linux-x64-variants == 'true'
 
   build-linux-x64-hs-zero:
@@ -229,7 +194,6 @@ jobs:
       extra-conf-options: '--with-jvm-variants=zero --disable-precompiled-headers'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.linux-x64-variants == 'true'
 
   build-linux-x64-hs-minimal:
@@ -244,7 +208,6 @@ jobs:
       extra-conf-options: '--with-jvm-variants=minimal --disable-precompiled-headers'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.linux-x64-variants == 'true'
 
   build-linux-x64-hs-optimized:
@@ -260,7 +223,6 @@ jobs:
       extra-conf-options: '--with-debug-level=optimized --disable-precompiled-headers'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.linux-x64-variants == 'true'
 
   build-linux-x64-static:
@@ -276,7 +238,6 @@ jobs:
       gcc-major-version: '10'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
       static-suffix: "-static"
     if: needs.prepare.outputs.linux-x64 == 'true'
 
@@ -293,7 +254,6 @@ jobs:
       gcc-major-version: '10'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
       # Upload static libs bundles separately to avoid interference with normal linux-x64 bundle.
       # This bundle is not used by testing jobs, but downstreams use it to check that
       # dependent projects, e.g. libgraal, builds fine.
@@ -308,7 +268,6 @@ jobs:
       gcc-major-version: '10'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.linux-cross-compile == 'true'
 
   build-alpine-linux-x64:
@@ -319,7 +278,6 @@ jobs:
       platform: alpine-linux-x64
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.alpine-linux-x64 == 'true'
 
   build-macos-x64:
@@ -328,11 +286,10 @@ jobs:
     uses: ./.github/workflows/build-macos.yml
     with:
       platform: macos-x64
-      runs-on: 'macos-15-intel'
-      xcode-toolset-version: '16.4'
+      runs-on: 'macos-13'
+      xcode-toolset-version: '14.3.1'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.macos-x64 == 'true'
 
   build-macos-aarch64:
@@ -341,11 +298,10 @@ jobs:
     uses: ./.github/workflows/build-macos.yml
     with:
       platform: macos-aarch64
-      runs-on: 'macos-15'
-      xcode-toolset-version: '16.4'
+      runs-on: 'macos-14'
+      xcode-toolset-version: '15.4'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.macos-aarch64 == 'true'
 
   build-windows-x64:
@@ -358,7 +314,6 @@ jobs:
       msvc-toolset-architecture: 'x86.x64'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.windows-x64 == 'true'
 
   build-windows-aarch64:
@@ -373,7 +328,6 @@ jobs:
       extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.windows-aarch64 == 'true'
 
   build-docs:
@@ -390,7 +344,6 @@ jobs:
       gcc-major-version: '10'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.docs == 'true'
 
   ###
@@ -400,20 +353,17 @@ jobs:
   test-linux-x64:
     name: linux-x64
     needs:
-      - prepare
       - build-linux-x64
     uses: ./.github/workflows/test.yml
     with:
       platform: linux-x64
       bootjdk-platform: linux-x64
       runs-on: ubuntu-22.04
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
       debug-suffix: -debug
 
   test-linux-x64-static:
     name: linux-x64-static
     needs:
-      - prepare
       - build-linux-x64
       - build-linux-x64-static
     uses: ./.github/workflows/test.yml
@@ -421,32 +371,27 @@ jobs:
       platform: linux-x64
       bootjdk-platform: linux-x64
       runs-on: ubuntu-22.04
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
       static-suffix: "-static"
 
   test-macos-aarch64:
     name: macos-aarch64
     needs:
-      - prepare
       - build-macos-aarch64
     uses: ./.github/workflows/test.yml
     with:
       platform: macos-aarch64
       bootjdk-platform: macos-aarch64
-      runs-on: macos-15
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-      xcode-toolset-version: '16.4'
+      runs-on: macos-14
+      xcode-toolset-version: '15.4'
       debug-suffix: -debug
 
   test-windows-x64:
     name: windows-x64
     needs:
-      - prepare
       - build-windows-x64
     uses: ./.github/workflows/test.yml
     with:
       platform: windows-x64
       bootjdk-platform: windows-x64
       runs-on: windows-2025
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
       debug-suffix: -debug

.github/workflows/pr.yml

@@ -1,270 +0,0 @@
-#
-# 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

@@ -40,10 +40,6 @@ on:
       xcode-toolset-version:
         required: false
         type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false
       debug-suffix:
         required: false
         type: string
@@ -151,7 +147,6 @@ jobs:
           platform: ${{ inputs.platform }}
           debug-suffix: ${{ matrix.debug-suffix }}
           static-suffix: ${{ inputs.static-suffix }}
-        if: ${{ inputs.dry-run == false }}
 
       - name: 'Install dependencies'
         run: |
@@ -204,7 +199,6 @@ jobs:
           && bash ./.github/scripts/gen-test-summary.sh "$GITHUB_STEP_SUMMARY" "$GITHUB_OUTPUT"
         env:
           PATH: ${{ steps.path.outputs.value }}
-        if: ${{ inputs.dry-run == false }}
 
         # This is a separate step, since if the markdown from a step gets bigger than
         # 1024 kB it is skipped, but then the short summary above is still generated

.gitignore

@@ -25,4 +25,3 @@ NashornProfile.txt
 **/core.[0-9]*
 *.rej
 *.orig
-/jbr-api/

.jcheck/conf

@@ -1,7 +1,7 @@
 [general]
 project=jdk
 jbs=JDK
-version=26
+version=25
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists,copyright

README.md

@@ -1,5 +1,3 @@
-[![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,26 +25,7 @@
 # Shell script for generating an IDEA project from a given list of modules
 
 usage() {
-      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.*)"
+      echo "usage: $0 [-h|--help] [-v|--verbose] [-o|--output <path>] [-c|--conf <conf_name>] [modules]+"
       exit 1
 }
 
@@ -52,13 +33,10 @@ 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;
 
-VERBOSE=true
-ABSOLUTE_PATHS=false
+IDEA_OUTPUT=$TOP/.idea
+VERBOSE="false"
 CONF_ARG=
 while [ $# -gt 0 ]
 do
@@ -67,24 +45,14 @@ do
       usage
       ;;
 
-    -q | --quiet )
-      VERBOSE=false
-      ;;
-
-    -a | --absolute-paths )
-      ABSOLUTE_PATHS=true
-      ;;
-
-    -r | --root )
-      TOPLEVEL_DIR="$2"
-      shift
+    -v | --vebose )
+      VERBOSE="true"
       ;;
 
     -o | --output )
-      IDEA_OUTPUT="$2/.idea"
+      IDEA_OUTPUT=$2/.idea
       shift
       ;;
-
     -c | --conf )
       CONF_ARG="CONF_NAME=$2"
       shift
@@ -101,17 +69,20 @@ do
   shift
 done
 
-if [ "x$IDEA_OUTPUT" = "x" ] ; then
-  IDEA_OUTPUT="$TOPLEVEL_DIR/.idea"
+if [ -e $IDEA_OUTPUT ] ; then
+    rm -r $IDEA_OUTPUT
+fi
+mkdir -p $IDEA_OUTPUT || exit 1
+cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
+
+if [ "x$TOPLEVEL_DIR" = "x" ] ; then
+    cd $SCRIPT_DIR/..
+    TOPLEVEL_DIR=`pwd`
+    cd $IDEA_OUTPUT
 fi
 
-mkdir -p $IDEA_OUTPUT || exit 1
-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`
-
-IDEA_MAKE="$OPENJDK_DIR/make/ide/idea/jdk"
+MAKE_DIR="$SCRIPT_DIR/../make"
+IDEA_MAKE="$MAKE_DIR/ide/idea/jdk"
 IDEA_TEMPLATE="$IDEA_MAKE/template"
 
 cp -r "$IDEA_TEMPLATE"/* "$IDEA_OUTPUT"
@@ -123,79 +94,41 @@ if [ -d "$TEMPLATES_OVERRIDE" ] ; then
     done
 fi
 
-if [ "$VERBOSE" = true ] ; then
-  echo "Will generate IDEA project files in \"$IDEA_OUTPUT\" for project \"$TOPLEVEL_DIR\""
+if [ "$VERBOSE" = "true" ] ; then
+  echo "output dir: $IDEA_OUTPUT"
+  echo "idea template dir: $IDEA_TEMPLATE"
 fi
 
-cd $TOP ; make idea-gen-config ALLOW=TOPLEVEL_DIR,IDEA_OUTPUT_PARENT,IDEA_OUTPUT,MODULES TOPLEVEL_DIR="$TOPLEVEL_DIR" \
-    IDEA_OUTPUT_PARENT="$IDEA_OUTPUT_PARENT" IDEA_OUTPUT="$IDEA_OUTPUT" MODULES="$*" $CONF_ARG || exit 1
+cd $TOP ; make idea-gen-config ALLOW=IDEA_OUTPUT,MODULES IDEA_OUTPUT=$IDEA_OUTPUT MODULES="$*" $CONF_ARG || exit 1
 cd $SCRIPT_DIR
 
 . $IDEA_OUTPUT/env.cfg
 
-# 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
+# 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
 fi
 
 if [ "x$MODULE_NAMES" = "x" ] ; then
   echo "FATAL: MODULE_NAMES is empty" >&2; exit 1
 fi
 
-if [ "x$RELATIVE_PROJECT_DIR" = "x" ] ; then
-  echo "FATAL: RELATIVE_PROJECT_DIR is empty" >&2; exit 1
+if [ "x$BOOT_JDK" = "x" ] ; then
+  echo "FATAL: BOOT_JDK is empty" >&2; exit 1
 fi
 
-if [ "x$RELATIVE_BUILD_DIR" = "x" ] ; then
-  echo "FATAL: RELATIVE_BUILD_DIR is empty" >&2; exit 1
+if [ "x$SPEC" = "x" ] ; then
+  echo "FATAL: SPEC is empty" >&2; exit 1
 fi
 
 if [ -d "$TOPLEVEL_DIR/.hg" ] ; then
     VCS_TYPE="hg4idea"
 fi
 
-# Git worktrees use a '.git' file rather than directory, so test both.
-if [ -d "$TOPLEVEL_DIR/.git" -o -f "$TOPLEVEL_DIR/.git" ] ; then
+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
@@ -219,106 +152,116 @@ 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"
-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
+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`"
     if [ "x$JT_HOME" = "x" ]; then
       add_replacement "###JTREG_HOME###" ""
     else
-      add_replacement "###JTREG_HOME###" "`$PATHTOOL -am $JT_HOME`"
+      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`"
     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
 
-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\" /> "
+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"
 done
-add_replacement "###MODULE_IMLS###" "$MODULE_IMLS"
-add_replacement "###TEST_MODULE_DEPENDENCIES###" "$TEST_MODULE_DEPENDENCIES"
+
+add_replacement "###SOURCE_ROOTS###" "$SOURCES"
 
 replace_template_dir "$IDEA_OUTPUT"
 
-### Generate module project files
+### Compile the custom Logger
 
-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"
+CLASSES=$IDEA_OUTPUT/classes
 
-### 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"
+if [ "x$ANT_HOME" = "x" ] ; then
+  # try some common locations
+  if [ -f "/usr/share/ant/lib/ant.jar" ] ; then
+    ANT_HOME="/usr/share/ant"
   else
-    echo "$WINENV_ROOT\bin\bash.exe -l -c \"cd %CD:\=/%/ && %*\"" >> "$IDEA_OUTPUT/bash.bat"
+    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
   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 [ "$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
+# 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

bin/unshuffle_list.txt

@@ -0,0 +1,192 @@
+#
+# Copyright (c) 2014, 2020, 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.
+#
+
+src/bsd : jdk/src/bsd
+src/demo : jdk/src/demo
+src/java.activation : jaxws/src/java.activation
+src/java.base : jdk/src/java.base
+src/java.compiler : langtools/src/java.compiler
+src/java.corba : corba/src/java.corba
+src/java.datatransfer : jdk/src/java.datatransfer
+src/java.desktop : jdk/src/java.desktop
+src/java.instrument : jdk/src/java.instrument
+src/java.logging : jdk/src/java.logging
+src/java.management : jdk/src/java.management
+src/java.management.rmi : jdk/src/java.management.rmi
+src/java.naming : jdk/src/java.naming
+src/java.prefs : jdk/src/java.prefs
+src/java.rmi : jdk/src/java.rmi
+src/java.scripting : jdk/src/java.scripting
+src/java.se : jdk/src/java.se
+src/java.security.jgss : jdk/src/java.security.jgss
+src/java.security.sasl : jdk/src/java.security.sasl
+src/java.se.ee : jdk/src/java.se.ee
+src/java.smartcardio : jdk/src/java.smartcardio
+src/java.sql : jdk/src/java.sql
+src/java.sql.rowset : jdk/src/java.sql.rowset
+src/java.transaction : jdk/src/java.transaction
+src/java.xml : jaxp/src/java.xml
+src/java.xml.bind : jaxws/src/java.xml.bind
+src/java.xml.crypto : jdk/src/java.xml.crypto
+src/java.xml.ws : jaxws/src/java.xml.ws
+src/java.xml.ws.annotation : jaxws/src/java.xml.ws.annotation
+src/jdk.accessibility : jdk/src/jdk.accessibility
+src/jdk.aot : hotspot/src/jdk.aot
+src/jdk.attach : jdk/src/jdk.attach
+src/jdk.charsets : jdk/src/jdk.charsets
+src/jdk.compiler : jdk/src/jdk.compiler  langtools/src/jdk.compiler
+src/jdk.crypto.cryptoki : jdk/src/jdk.crypto.cryptoki
+src/jdk.crypto.ec : jdk/src/jdk.crypto.ec
+src/jdk.crypto.mscapi : jdk/src/jdk.crypto.mscapi
+src/jdk.dynalink : nashorn/src/jdk.dynalink
+src/jdk.editpad : jdk/src/jdk.editpad
+src/jdk.hotspot.agent : hotspot/src/jdk.hotspot.agent
+src/jdk.httpserver : jdk/src/jdk.httpserver
+src/jdk.incubator.httpclient : jdk/src/jdk.incubator.httpclient
+src/jdk.internal.ed : jdk/src/jdk.internal.ed
+src/jdk.internal.jvmstat : jdk/src/jdk.internal.jvmstat
+src/jdk.internal.le : jdk/src/jdk.internal.le
+src/jdk.internal.opt : jdk/src/jdk.internal.opt
+src/jdk.internal.vm.ci : hotspot/src/jdk.internal.vm.ci
+src/jdk.internal.vm.compiler : hotspot/src/jdk.internal.vm.compiler
+src/jdk.jartool : jdk/src/jdk.jartool
+src/jdk.javadoc : langtools/src/jdk.javadoc
+src/jdk.jcmd : jdk/src/jdk.jcmd
+src/jdk.jconsole : jdk/src/jdk.jconsole
+src/jdk.jdeps : langtools/src/jdk.jdeps
+src/jdk.jdi : jdk/src/jdk.jdi
+src/jdk.jdwp.agent : jdk/src/jdk.jdwp.agent
+src/jdk.jlink : jdk/src/jdk.jlink
+src/jdk.jshell : langtools/src/jdk.jshell
+src/jdk.jsobject : jdk/src/jdk.jsobject
+src/jdk.jstatd : jdk/src/jdk.jstatd
+src/jdk.localedata : jdk/src/jdk.localedata
+src/jdk.management : jdk/src/jdk.management
+src/jdk.management.agent : jdk/src/jdk.management.agent
+src/jdk.naming.dns : jdk/src/jdk.naming.dns
+src/jdk.naming.rmi : jdk/src/jdk.naming.rmi
+src/jdk.net : jdk/src/jdk.net
+src/jdk.pack : jdk/src/jdk.pack
+src/jdk.scripting.nashorn : nashorn/src/jdk.scripting.nashorn
+src/jdk.scripting.nashorn.shell : nashorn/src/jdk.scripting.nashorn.shell
+src/jdk.sctp : jdk/src/jdk.sctp
+src/jdk.security.auth : jdk/src/jdk.security.auth
+src/jdk.security.jgss : jdk/src/jdk.security.jgss
+src/jdk.unsupported : jdk/src/jdk.unsupported
+src/jdk.xml.bind : jaxws/src/jdk.xml.bind
+src/jdk.xml.dom : jaxp/src/jdk.xml.dom
+src/jdk.xml.ws : jaxws/src/jdk.xml.ws
+src/jdk.zipfs : jdk/src/jdk.zipfs
+src/langtools/sample : langtools/src/sample
+src/linux : jdk/src/linux
+src/sample : jdk/src/sample
+src/hotspot/share : hotspot/src/share/vm
+src/hotspot/cpu/aarch64 : hotspot/src/cpu/aarch64/vm
+src/hotspot/cpu/arm : hotspot/src/cpu/arm/vm
+src/hotspot/cpu/ppc : hotspot/src/cpu/ppc/vm
+src/hotspot/cpu/s390 : hotspot/src/cpu/s390/vm
+src/hotspot/cpu/x86 : hotspot/src/cpu/x86/vm
+src/hotspot/cpu/zero : hotspot/src/cpu/zero/vm
+src/hotspot/os/aix : hotspot/src/os/aix/vm
+src/hotspot/os/bsd : hotspot/src/os/bsd/vm
+src/hotspot/os/linux : hotspot/src/os/linux/vm
+src/hotspot/os/posix/dtrace : hotspot/src/os/posix/dtrace
+src/hotspot/os/posix : hotspot/src/os/posix/vm
+src/hotspot/os/windows : hotspot/src/os/windows/vm
+src/hotspot/os_cpu/aix_ppc : hotspot/src/os_cpu/aix_ppc/vm
+src/hotspot/os_cpu/bsd_x86 : hotspot/src/os_cpu/bsd_x86/vm
+src/hotspot/os_cpu/bsd_zero : hotspot/src/os_cpu/bsd_zero/vm
+src/hotspot/os_cpu/linux_aarch64 : hotspot/src/os_cpu/linux_aarch64/vm
+src/hotspot/os_cpu/linux_arm : hotspot/src/os_cpu/linux_arm/vm
+src/hotspot/os_cpu/linux_ppc : hotspot/src/os_cpu/linux_ppc/vm
+src/hotspot/os_cpu/linux_s390 : hotspot/src/os_cpu/linux_s390/vm
+src/hotspot/os_cpu/linux_x86 : hotspot/src/os_cpu/linux_x86/vm
+src/hotspot/os_cpu/linux_zero : hotspot/src/os_cpu/linux_zero/vm
+src/hotspot/os_cpu/windows_x86 : hotspot/src/os_cpu/windows_x86/vm
+src/hotspot : hotspot/src
+src/utils/IdealGraphVisualizer : hotspot/src/share/tools/IdealGraphVisualizer
+src/utils/LogCompilation : hotspot/src/share/tools/LogCompilation
+src/utils/hsdis : hotspot/src/share/tools/hsdis
+src/utils/reorder : jdk/make/non-build-utils/reorder
+src/utils/src/build : jdk/make/non-build-utils/src/build
+make/BuildNashorn.gmk : nashorn/make/BuildNashorn.gmk
+make/CompileDemos.gmk : jdk/make/CompileDemos.gmk
+make/CompileInterimLangtools.gmk : langtools/make/CompileInterim.gmk
+make/CompileModuleTools.gmk : jdk/make/CompileModuleTools.gmk
+make/CompileToolsHotspot.gmk : hotspot/make/CompileTools.gmk
+make/CompileToolsJdk.gmk : jdk/make/CompileTools.gmk
+make/CopyInterimCLDRConverter.gmk : jdk/make/CopyInterimCLDRConverter.gmk
+make/GenerateModuleSummary.gmk : jdk/make/GenerateModuleSummary.gmk
+make/ModuleTools.gmk : jdk/make/ModuleTools.gmk
+make/ToolsJdk.gmk : jdk/make/Tools.gmk
+make/ToolsLangtools.gmk : langtools/make/Tools.gmk
+make/UnpackSecurity.gmk : jdk/make/UnpackSecurity.gmk
+make/autoconf : common/autoconf
+make/conf : common/conf
+make/copy : jdk/make/copy
+make/copy/Copy-java.corba.gmk : corba/make/copy/Copy-java.corba.gmk
+make/corba : corba/make
+make/data : jdk/make/data
+make/gendata : jdk/make/gendata
+make/gendata/Gendata-jdk.compiler.gmk : langtools/make/gendata/Gendata-jdk.compiler.gmk
+make/gensrc : jdk/make/gensrc
+make/gensrc/Gensrc-java.corba.gmk : corba/make/gensrc/Gensrc-java.corba.gmk
+make/gensrc/Gensrc-jdk.compiler.gmk : langtools/make/gensrc/Gensrc-jdk.compiler.gmk
+make/gensrc/Gensrc-jdk.hotspot.agent.gmk : hotspot/make/gensrc/Gensrc-jdk.hotspot.agent.gmk
+make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk : hotspot/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
+make/gensrc/Gensrc-jdk.javadoc.gmk : langtools/make/gensrc/Gensrc-jdk.javadoc.gmk
+make/gensrc/Gensrc-jdk.jdeps.gmk : langtools/make/gensrc/Gensrc-jdk.jdeps.gmk
+make/gensrc/Gensrc-jdk.jshell.gmk : langtools/make/gensrc/Gensrc-jdk.jshell.gmk
+make/gensrc/GensrcCommonLangtools.gmk : langtools/make/gensrc/GensrcCommon.gmk
+make/hotspot : hotspot/make
+make/jdk : jdk/make
+make/langtools : langtools/make
+make/launcher : jdk/make/launcher
+make/lib : jdk/make/lib
+make/lib/Lib-jdk.hotspot.agent.gmk : hotspot/make/lib/Lib-jdk.hotspot.agent.gmk
+make/mapfiles : jdk/make/mapfiles
+make/mapfiles/libjsig : hotspot/make/mapfiles/libjsig
+make/mapfiles/libjvm_db : hotspot/make/mapfiles/libjvm_db
+make/mapfiles/libjvm_dtrace : hotspot/make/mapfiles/libjvm_dtrace
+make/mapfiles/libsaproc : hotspot/make/mapfiles/libsaproc
+make/nashorn : nashorn/make
+make/nb_native : common/nb_native
+make/scripts/addNotices.sh : jdk/make/scripts/addNotices.sh
+make/scripts/compare.sh : common/bin/compare.sh
+make/scripts/compare_exceptions.sh.incl : common/bin/compare_exceptions.sh.incl
+make/scripts/genExceptions.sh : jdk/make/scripts/genExceptions.sh
+make/scripts/hide_important_warnings_from_javac.sh : common/bin/hide_important_warnings_from_javac.sh
+make/scripts/logger.sh : common/bin/logger.sh
+make/src/native/fixpath.c : common/src/fixpath.c
+make/test/JtregNativeHotspot.gmk : hotspot/make/test/JtregNative.gmk
+make/test/JtregNativeJdk.gmk : jdk/make/test/JtregNative.gmk
+test/jdk : jdk/test
+test/langtools : langtools/test
+test/nashorn : nashorn/test
+test/jaxp : jaxp/test
+test/hotspot/gtest : hotspot/test/native
+test/hotspot/jtreg : hotspot/test
+bin : common/bin
+bin/nashorn : nashorn/bin
+doc : common/doc
+doc/nashorn : nashorn/docs

bin/unshuffle_patch.sh

@@ -0,0 +1,237 @@
+#!/bin/bash
+#
+# Copyright (c) 2014, 2017, 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.
+#
+
+# Script for updating a patch file as per the shuffled/unshuffled source location.
+
+usage() {
+  echo "Usage: $0 [-h|--help] [-v|--verbose] [-to9|-to10] [-r <repo>] <input_patch> <output_patch>"
+  echo "where:"
+  echo "  -to9            create patches appropriate for a JDK 9 source tree"
+  echo "                  When going to 9, the output patches will be suffixed with the"
+  echo "                  repo name"
+  echo "  -to10           create patches appropriate for a JDK 10 source tree"
+  echo "  -r <repo>       specify repo for source patch, set to 'top' for top repo"
+  echo "  <input_patch>   is the input patch file, that needs shuffling/unshuffling"
+  echo "  <output_patch>  is the updated patch file "
+  echo " "
+  exit 1
+}
+
+SCRIPT_DIR=`dirname $0`
+UNSHUFFLE_LIST=$SCRIPT_DIR"/unshuffle_list.txt"
+
+if [ ! -f "$UNSHUFFLE_LIST" ] ; then
+  echo "FATAL: cannot find $UNSHUFFLE_LIST" >&2
+  exit 1
+fi
+
+vflag="false"
+while [ $# -gt 0 ]
+do
+  case $1 in
+    -h | --help )
+      usage
+      ;;
+
+    -v | --verbose )
+      vflag="true"
+      ;;
+
+    -r)
+      repo="$2"
+      shift
+      ;;
+
+    -to9)
+      shuffle_to=9
+      ;;
+
+    -to10)
+      shuffle_to=10
+      ;;
+
+    -*)  # bad option
+      usage
+      ;;
+
+    * )  # non option
+      break
+      ;;
+  esac
+  shift
+done
+
+# Make sure we have the right number of arguments
+if [ ! $# -eq 2 ] ; then
+  echo "ERROR: Invalid number of arguments." >&2
+  usage
+fi
+
+# Check the given repo
+repos="top corba jaxp jaxws jdk langtools nashorn hotspot"
+found="false"
+if [ -n "$repo" ]; then
+  for r in $repos ; do
+    if [ $repo = "$r" ] ; then
+      found="true"
+      break;
+    fi
+  done
+  if [ $found = "false" ] ; then
+    echo "ERROR: Unknown repo: $repo. Should be one of [$repos]." >&2
+    usage
+  fi
+fi
+
+if [ "$shuffle_to" != "9" -a "$shuffle_to" != "10" ]; then
+  echo "ERROR: Must pick either -to9 or -to10"
+  exit 1
+fi
+
+# When going to 10, a repo must be specified for the source patch
+if [ "$shuffle_to" = "10" -a -z "$repo" ]; then
+  echo "ERROR: Must specify src repo for JDK 9 patch"
+  exit 1
+fi
+
+# Check given input/output files
+input="$1"
+if [ "x$input" = "x-" ] ; then
+  input="/dev/stdin"
+fi
+
+if [ ! -f $input -a "x$input" != "x/dev/stdin" ] ; then
+  echo "ERROR: Cannot find input patch file: $input" >&2
+  exit 1
+fi
+
+output="$2"
+if [ "x$output" = "x-" ] ; then
+  output="/dev/stdout"
+fi
+base_output="$output"
+
+if [ "$shuffle_to" = "10" ]; then
+  if [ -f $output -a "x$output" != "x/dev/stdout" ] ; then
+    echo "ERROR: Output patch already exists: $output" >&2
+    exit 1
+  fi
+else
+  for r in $repos; do
+    if [ -f "$output.$r" ]; then
+      echo "ERROR: Output patch already exists: $output.$r" >&2
+      exit 1
+    fi
+  done
+fi
+
+verbose() {
+  if [ ${vflag} = "true" ] ; then
+    echo "$@" >&2
+  fi
+}
+
+unshuffle() {
+  line=$@
+  verbose "Attempting to rewrite: \"$line\""
+
+  # Retrieve the file name
+  path=
+  if echo "$line" | egrep '^diff' > /dev/null ; then
+    if ! echo "$line" | egrep '\-\-git' > /dev/null ; then
+      echo "ERROR: Only git patches supported. Please use 'hg export --git ...'." >&2
+      exit 1
+    fi
+    path="`echo "$line" | sed -e s@'diff --git a/'@@ -e s@' b/.*$'@@`"
+  elif echo "$line" | egrep '^\-\-\-' > /dev/null ; then
+    path="`echo "$line" | sed -e s@'--- a/'@@`"
+  elif echo "$line" | egrep '^\+\+\+' > /dev/null ; then
+    path="`echo "$line" | sed s@'+++ b/'@@`"
+  fi
+  verbose "Extracted path: \"$path\""
+
+  # Find the most specific matches in the shuffle list
+  matches=
+  if [ -n "$repo" -a "$repo" != "top" ]; then
+    matchpath="$repo"/"$path"/x
+  else
+    matchpath="$path"/x
+  fi
+  while [ "$matchpath" != "" ] ; do
+    matchpath="`echo $matchpath | sed s@'\(.*\)/.*$'@'\1'@`"
+
+    if [ "$shuffle_to" =  "10" ] ; then
+      pattern=": $matchpath$"
+    else
+      pattern="^$matchpath :"
+    fi
+    verbose "Attempting to find \"$matchpath\""
+    matches=`egrep "$pattern" "$UNSHUFFLE_LIST"`
+    if ! [ "x${matches}" = "x" ] ; then
+      verbose "Got matches: [$matches]"
+      break;
+    fi
+
+    if ! echo "$matchpath" | egrep '.*/.*' > /dev/null ; then
+      break;
+    fi
+  done
+
+  # Rewrite the line, if we have a match
+  if ! [ "x${matches}" = "x" ] ; then
+    shuffled="${matches%% : *}"
+    unshuffled="${matches#* : }"
+    patch_suffix_9=""
+    for r in $repos; do
+      if [ "$unshuffled" != "${unshuffled#$r}" ]; then
+        unshuffled="${unshuffled#$r\/}"
+        patch_suffix_9=".$r"
+      fi
+    done
+    verbose "shuffled: $shuffled"
+    verbose "unshuffled: $unshuffled"
+    verbose "patch_suffix_9: $patch_suffix_9"
+    if [ "$shuffle_to" =  "10" ] ; then
+      newline="`echo "$line" | sed -e s@"$unshuffled"@"$shuffled"@g`"
+    else
+      newline="`echo "$line" | sed -e s@"$shuffled"@"$unshuffled"@g`"
+      output=$base_output$patch_suffix_9
+      verbose "Writing to $output"
+    fi
+    verbose "Rewriting to \"$newline\""
+    echo "$newline" >> $output
+  else
+    echo "WARNING: no match found for $path"
+    echo "$line" >> $output
+  fi
+}
+
+while IFS= read -r line
+do
+  if echo "$line" | egrep '^diff|^\-\-\-|^\+\+\+' > /dev/null ; then
+    unshuffle "$line"
+  else
+    printf "%s\n" "$line" >> $output
+  fi
+done < "$input"

bin/update_pch.sh

@@ -1,111 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2025, 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.
-
-# The output of this script may require some degree of human curation:
-# - Redundant headers, e.g. both x.hpp, x.inline.hpp are included;
-# - Headers relative to a non-default feature should be protected by an
-#   appropriate 'if' clause to make sure all variants can build without
-#   errors.
-
-source_path="$(dirname ${0})"
-this_script_dir="$(cd -- "${source_path}" > /dev/null && pwd)"
-if test -z "${this_script_dir}"; then
-  echo "Error: Could not determine location of this script"
-  exit 1
-fi
-
-# Work in top directory
-cd $this_script_dir/..
-
-# Time threshold for header compilation, if the time exceeds the
-# threshold the header will be precompiled.
-if [ -z "$MIN_MS" ]; then
-  MIN_MS=100000
-fi
-
-if [ -z "$CLEAN" ]; then
-  CLEAN=true
-elif [ "$CLEAN" != "true" ] && [ "$CLEAN" != "false" ]; then
-  echo "Expected either 'true' or 'false' for CLEAN"
-fi
-
-# CBA_PATH should point to a valid ClangBuildAnalyzer executable.
-# Build steps:
-# git clone --depth 1 git@github.com:aras-p/ClangBuildAnalyzer.git
-# cd ClangBuildAnalyzer
-# make -f projects/make/Makefile
-if [ -z "$CBA_PATH" ]; then
-  CBA_PATH="./ClangBuildAnalyzer/build/ClangBuildAnalyzer"
-fi
-
-set -eux
-
-PRECOMPILED_HPP="src/hotspot/share/precompiled/precompiled.hpp"
-CBA_CONFIG="ClangBuildAnalyzer.ini"
-TIMESTAMP="$(date +%Y%m%d-%H%M)"
-RUN_NAME="pch_update_$TIMESTAMP"
-CBA_OUTPUT="cba_out_$TIMESTAMP"
-
-if [ "$CLEAN" = "true" ]; then
-  trap 'rm -rf "build/'"$RUN_NAME"'" "$CBA_OUTPUT" "$CBA_CONFIG"' EXIT
-fi
-
-sh configure --with-toolchain-type=clang \
-             --with-conf-name="$RUN_NAME" \
-             --disable-precompiled-headers \
-             --with-extra-cxxflags="-ftime-trace" \
-             --with-extra-cflags="-ftime-trace"
-
-make clean CONF_NAME="$RUN_NAME"
-make hotspot CONF_NAME="$RUN_NAME"
-"$CBA_PATH" --all "./build/$RUN_NAME/hotspot/variant-server/libjvm/objs" \
-  "$CBA_OUTPUT"
-
-# Preserve license and comments on top
-cat "$PRECOMPILED_HPP" | awk '/^#include/ {exit} {print}' > "$PRECOMPILED_HPP.tmp"
-
-if [ ! -f "$CBA_CONFIG" ]; then
-cat <<EOF > "$CBA_CONFIG"
-[counts]
-header=100
-headerChain=0
-template=0
-function=0
-fileCodegen=0
-fileParse=0
-
-[misc]
-onlyRootHeaders=true
-EOF
-fi
-
-"$CBA_PATH" --analyze "$CBA_OUTPUT" | \
-  grep " ms: " | \
-  # Keep the headers more expensive than ${1}ms
-  awk -v x="$MIN_MS" '$1 < x { exit } { print $3 }' | \
-  # Filter away non-hotspot headers
-  grep hotspot/share | \
-  awk -F "hotspot/share/" '{ printf "#include \"%s\"\n", $2 }' \
-  >> "$PRECOMPILED_HPP.tmp"
-mv "$PRECOMPILED_HPP.tmp" "$PRECOMPILED_HPP"
-
-java test/hotspot/jtreg/sources/SortIncludes.java --update "$PRECOMPILED_HPP"

doc/building.html

@@ -1451,10 +1451,10 @@ of a cross-compiling toolchain and a sysroot environment which can
 easily be used together with the <code>--with-devkit</code> configure
 option to cross compile the JDK. On Linux/x86_64, the following
 command:</p>
-<pre><code>bash configure --with-devkit=&lt;devkit-path&gt; --openjdk-target=ppc64le-linux-gnu &amp;&amp; make</code></pre>
-<p>will configure and build the JDK for Linux/ppc64le assuming that
-<code>&lt;devkit-path&gt;</code> points to a Linux/x86_64 to
-Linux/ppc64le devkit.</p>
+<pre><code>bash configure --with-devkit=&lt;devkit-path&gt; --openjdk-target=ppc64-linux-gnu &amp;&amp; make</code></pre>
+<p>will configure and build the JDK for Linux/ppc64 assuming that
+<code>&lt;devkit-path&gt;</code> points to a Linux/x86_64 to Linux/ppc64
+devkit.</p>
 <p>Devkits can be created from the <code>make/devkit</code> directory by
 executing:</p>
 <pre><code>make [ TARGETS=&quot;&lt;TARGET_TRIPLET&gt;+&quot; ] [ BASE_OS=&lt;OS&gt; ] [ BASE_OS_VERSION=&lt;VER&gt; ]</code></pre>
@@ -1481,22 +1481,22 @@ following targets are known to work:</p>
 <td>arm-linux-gnueabihf</td>
 </tr>
 <tr class="even">
-<td>ppc64le-linux-gnu</td>
+<td>ppc64-linux-gnu</td>
 </tr>
 <tr class="odd">
-<td>riscv64-linux-gnu</td>
+<td>ppc64le-linux-gnu</td>
 </tr>
 <tr class="even">
 <td>s390x-linux-gnu</td>
 </tr>
 </tbody>
 </table>
-<p><code>BASE_OS</code> must be one of <code>OL</code> for Oracle
-Enterprise Linux or <code>Fedora</code>. If the base OS is
-<code>Fedora</code> the corresponding Fedora release can be specified
-with the help of the <code>BASE_OS_VERSION</code> option. If the build
-is successful, the new devkits can be found in the
-<code>build/devkit/result</code> subdirectory:</p>
+<p><code>BASE_OS</code> must be one of "OEL6" for Oracle Enterprise
+Linux 6 or "Fedora" (if not specified "OEL6" will be the default). If
+the base OS is "Fedora" the corresponding Fedora release can be
+specified with the help of the <code>BASE_OS_VERSION</code> option (with
+"27" as default version). If the build is successful, the new devkits
+can be found in the <code>build/devkit/result</code> subdirectory:</p>
 <pre><code>cd make/devkit
 make TARGETS=&quot;ppc64le-linux-gnu aarch64-linux-gnu&quot; BASE_OS=Fedora BASE_OS_VERSION=21
 ls -1 ../../build/devkit/result/

doc/building.md

@@ -1258,11 +1258,11 @@ toolchain and a sysroot environment which can easily be used together with the
 following command:
 
 ```
-bash configure --with-devkit=<devkit-path> --openjdk-target=ppc64le-linux-gnu && make
+bash configure --with-devkit=<devkit-path> --openjdk-target=ppc64-linux-gnu && make
 ```
 
-will configure and build the JDK for Linux/ppc64le assuming that `<devkit-path>`
-points to a Linux/x86_64 to Linux/ppc64le devkit.
+will configure and build the JDK for Linux/ppc64 assuming that `<devkit-path>`
+points to a Linux/x86_64 to Linux/ppc64 devkit.
 
 Devkits can be created from the `make/devkit` directory by executing:
 
@@ -1281,14 +1281,16 @@ at least the following targets are known to work:
 | x86_64-linux-gnu         |
 | aarch64-linux-gnu        |
 | arm-linux-gnueabihf      |
+| ppc64-linux-gnu          |
 | ppc64le-linux-gnu        |
-| riscv64-linux-gnu        |
 | s390x-linux-gnu          |
 
-`BASE_OS` must be one of `OL` for Oracle Enterprise Linux or `Fedora`. If the
-base OS is `Fedora` the corresponding Fedora release can be specified with the
-help of the `BASE_OS_VERSION` option. If the build is successful, the new
-devkits can be found in the `build/devkit/result` subdirectory:
+`BASE_OS` must be one of "OEL6" for Oracle Enterprise Linux 6 or "Fedora" (if
+not specified "OEL6" will be the default). If the base OS is "Fedora" the
+corresponding Fedora release can be specified with the help of the
+`BASE_OS_VERSION` option (with "27" as default version). If the build is
+successful, the new devkits can be found in the `build/devkit/result`
+subdirectory:
 
 ```
 cd make/devkit

doc/hotspot-style.html

@@ -50,9 +50,6 @@ id="toc-factoring-and-class-design">Factoring and Class Design</a></li>
 <li><a href="#commenting" id="toc-commenting">Commenting</a></li>
 <li><a href="#macros" id="toc-macros">Macros</a></li>
 <li><a href="#whitespace" id="toc-whitespace">Whitespace</a></li>
-<li><a href="#avoid-implicit-conversions-to-bool"
-id="toc-avoid-implicit-conversions-to-bool">Avoid implicit conversions
-to bool</a></li>
 <li><a href="#miscellaneous"
 id="toc-miscellaneous">Miscellaneous</a></li>
 </ul></li>
@@ -75,78 +72,24 @@ Standard Library</a></li>
 Deduction</a></li>
 <li><a href="#expression-sfinae" id="toc-expression-sfinae">Expression
 SFINAE</a></li>
-<li><a href="#trailing-return-type-syntax-for-functions"
-id="toc-trailing-return-type-syntax-for-functions">Trailing return type
-syntax for functions</a></li>
-<li><a href="#non-type-template-parameter-values"
-id="toc-non-type-template-parameter-values">Non-type template parameter
-values</a></li>
 <li><a href="#enum" id="toc-enum">enum</a></li>
 <li><a href="#alignas" id="toc-alignas">alignas</a></li>
 <li><a href="#thread_local" id="toc-thread_local">thread_local</a></li>
 <li><a href="#nullptr" id="toc-nullptr">nullptr</a></li>
 <li><a href="#atomic" id="toc-atomic">&lt;atomic&gt;</a></li>
-<li><a href="#variable-templates-and-inline-variables"
-id="toc-variable-templates-and-inline-variables">Variable Templates and
-Inline Variables</a></li>
-<li><a href="#initializing-variables-with-static-storage-duration"
-id="toc-initializing-variables-with-static-storage-duration">Initializing
-variables with static storage duration</a></li>
 <li><a href="#uniform-initialization"
 id="toc-uniform-initialization">Uniform Initialization</a></li>
-<li><a href="#mandatory-copy-elision"
-id="toc-mandatory-copy-elision">Mandatory Copy Elision</a></li>
 <li><a href="#local-function-objects"
 id="toc-local-function-objects">Local Function Objects</a></li>
 <li><a href="#inheriting-constructors"
 id="toc-inheriting-constructors">Inheriting constructors</a></li>
 <li><a href="#attributes" id="toc-attributes">Attributes</a></li>
-<li><a href="#noexcept" id="toc-noexcept">noexcept</a></li>
-<li><a href="#enhanced-selection-statements"
-id="toc-enhanced-selection-statements">Enhanced selection
-statements</a></li>
-<li><a href="#expression-evaluation-order"
-id="toc-expression-evaluation-order">Expression Evaluation
-Order</a></li>
-<li><a href="#compatibility-with-c11"
-id="toc-compatibility-with-c11">Compatibility with C11</a></li>
 <li><a href="#additional-permitted-features"
 id="toc-additional-permitted-features">Additional Permitted
 Features</a></li>
-</ul></li>
 <li><a href="#excluded-features" id="toc-excluded-features">Excluded
-Features</a>
-<ul>
-<li><a href="#structured-bindings"
-id="toc-structured-bindings">Structured Bindings</a></li>
-<li><a href="#file-system-library" id="toc-file-system-library">File
-System Library</a></li>
-<li><a href="#aggregate-extensions"
-id="toc-aggregate-extensions">Aggregate Extensions</a></li>
-<li><a href="#additional-excluded-features"
-id="toc-additional-excluded-features">Additional Excluded
 Features</a></li>
-</ul></li>
 <li><a href="#undecided-features" id="toc-undecided-features">Undecided
-Features</a>
-<ul>
-<li><a href="#stdoptional"
-id="toc-stdoptional">std::optional&lt;&gt;</a></li>
-<li><a href="#stdbyte" id="toc-stdbyte">std::byte</a></li>
-<li><a href="#string-views" id="toc-string-views">String Views</a></li>
-<li><a href="#substring-and-subsequence-searching"
-id="toc-substring-and-subsequence-searching">Substring and Subsequence
-Searching</a></li>
-<li><a href="#new-and-delete-with-over-aligned-data"
-id="toc-new-and-delete-with-over-aligned-data"><code>new</code> and
-<code>delete</code> with Over-Aligned Data</a></li>
-<li><a href="#stdto_chars-and-stdfrom_chars"
-id="toc-stdto_chars-and-stdfrom_chars"><code>std::to_chars()</code> and
-<code>std::from_chars</code></a></li>
-<li><a href="#stdlaunder"
-id="toc-stdlaunder"><code>std::launder()</code></a></li>
-<li><a href="#additional-undecided-features"
-id="toc-additional-undecided-features">Additional Undecided
 Features</a></li>
 </ul></li>
 </ul>
@@ -262,16 +205,6 @@ lines of code. Name what you must repeat.</p></li>
 attribute, the change should be done with a "setter" accessor matched to
 the simple "getter".</p></li>
 </ul>
-<h4 id="conventions-for-lock-free-code">Conventions for Lock-free
-Code</h4>
-<p>Sometimes variables are accessed concurrently without appropriate
-synchronization context, such as a held mutex or at a safepoint. In such
-cases the variable should be declared <code>volatile</code> and it
-should NOT be accessed as a normal C++ lvalue. Rather, access should be
-performed via functions from <code>Atomic</code>, such as
-<code>Atomic::load</code>, <code>Atomic::store</code>, etc.</p>
-<p>This special formulation makes it more clear to maintainers that the
-variable is accessed concurrently in a lock-free manner.</p>
 <h3 id="source-files">Source Files</h3>
 <ul>
 <li><p>All source files must have a globally unique basename. The build
@@ -471,25 +404,22 @@ adjust new lines horizontally to be consistent with that organization.
 (E.g., trailing backslashes on long macro definitions often
 align.)</p></li>
 </ul>
-<h3 id="avoid-implicit-conversions-to-bool">Avoid implicit conversions
-to bool</h3>
-<ul>
-<li>Use <code>bool</code> for boolean values.</li>
-<li>Do not use ints or pointers as (implicit) booleans with
-<code>&amp;&amp;</code>, <code>||</code>, <code>if</code>,
-<code>while</code>. Instead, compare explicitly, i.e.
-<code>if (x != 0)</code> or <code>if (ptr != nullptr)</code>, etc.</li>
-<li>Do not use non-boolean declarations in <em>condition</em> forms,
-i.e. don't use <code>if (T v = value) { ... }</code>. But see <a
-href="#enhanced-selection-statements">Enhanced selection
-statements</a>.</li>
-</ul>
 <h3 id="miscellaneous">Miscellaneous</h3>
 <ul>
 <li><p>Use the <a href="https://en.cppreference.com/w/cpp/language/raii"
 title="Resource Acquisition Is Initialization">Resource Acquisition Is
 Initialization</a> (RAII) design pattern to manage bracketed critical
 sections. See class <code>ResourceMark</code> for an example.</p></li>
+<li><p>Avoid implicit conversions to <code>bool</code>.</p>
+<ul>
+<li>Use <code>bool</code> for boolean values.</li>
+<li>Do not use ints or pointers as (implicit) booleans with
+<code>&amp;&amp;</code>, <code>||</code>, <code>if</code>,
+<code>while</code>. Instead, compare explicitly, i.e.
+<code>if (x != 0)</code> or <code>if (ptr != nullptr)</code>, etc.</li>
+<li>Do not use declarations in <em>condition</em> forms, i.e. don't use
+<code>if (T v = value) { ... }</code>.</li>
+</ul></li>
 <li><p>Use functions from globalDefinitions.hpp and related files when
 performing bitwise operations on integers. Do not code directly as C
 operators, unless they are extremely simple. (Examples:
@@ -501,16 +431,16 @@ default case. It is ok to have an empty default with comment.</p></li>
 </ul>
 <h2 id="use-of-c-features">Use of C++ Features</h2>
 <p>HotSpot was originally written in a subset of the C++98/03 language.
-More recently, support for C++17 is provided, though again, HotSpot only
+More recently, support for C++14 is provided, though again, HotSpot only
 uses a subset. (Backports to JDK versions lacking support for more
 recent Standards must of course stick with the original C++98/03
 subset.)</p>
 <p>This section describes that subset. Features from the C++98/03
 language may be used unless explicitly excluded here. Features from
-C++11, C++14, and C++17 may be explicitly permitted or explicitly
-excluded, and discussed accordingly here. There is a third category,
-undecided features, about which HotSpot developers have not yet reached
-a consensus, or perhaps have not discussed at all. Use of these features
+C++11 and C++14 may be explicitly permitted or explicitly excluded, and
+discussed accordingly here. There is a third category, undecided
+features, about which HotSpot developers have not yet reached a
+consensus, or perhaps have not discussed at all. Use of these features
 is also excluded.</p>
 <p>(The use of some features may not be immediately obvious and may slip
 in anyway, since the compiler will accept them. The code review process
@@ -519,9 +449,9 @@ is the main defense against this.)</p>
 provide more extensive discussion or rationale for limitations. Features
 that don't have their own subsection are listed in omnibus feature
 sections for permitted, excluded, and undecided features.</p>
-<p>Lists of new features for C++11, C++14, and C++17, along with links
-to their descriptions, can be found in the online documentation for some
-of the compilers and libraries. The C++17 Standard is the definitive
+<p>Lists of new features for C++11 and C++14, along with links to their
+descriptions, can be found in the online documentation for some of the
+compilers and libraries. The C++14 Standard is the definitive
 description.</p>
 <ul>
 <li><a href="https://gcc.gnu.org/projects/cxx-status.html">C++ Standards
@@ -718,42 +648,12 @@ href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n1984.pdf">n1984</
 For local variables, this can be used to make the code clearer by
 eliminating type information that is obvious or irrelevant. Excessive
 use can make code much harder to understand.</p></li>
-<li><p><code>auto</code> for non-type template parameters (<a
-href="http://wg21.link/p0127r2">p0127r2</a>)<br> <code>auto</code> may
-be used as a placeholder for the type of a non-type template parameter.
-The type is deduced from the value provided in a template
-instantiation.</p></li>
-</ul>
-<p><a name="function-return-type-deduction"></a> * Function return type
-deduction (<a
+<li><p>Function return type deduction (<a
 href="https://isocpp.org/files/papers/N3638.html">n3638</a>)<br> Only
 use if the function body has a very small number of <code>return</code>
-statements, and generally relatively little other code.</p>
-<ul>
-<li>Class template argument deduction (<a
-href="http://wg21.link/n3602">n3602</a>, <a
-href="http://wg21.link/p0091r3">p0091r3</a>)<br> The template arguments
-of a class template may be deduced from the arguments to a constructor.
-This is similar to ordinary function argument deduction, though partial
-deduction with only <em>some</em> template arguments explicitly provided
-is not permitted for class template argument deduction. Deduction guides
-may be used to provide additional control over the deduction. As with
-<code>auto</code> variable declarations, excessive use can make code
-harder to understand, because explicit type information is lacking. But
-it can also remove the need to be explicit about types that are either
-obvious, or that are very hard to write. For example, these allow the
-addition of a scope-guard mechanism with nice syntax; something like
-this</li>
-</ul>
-<pre><code>  ScopeGuard guard{[&amp;]{ ... cleanup code ... }};</code></pre>
-<ul>
+statements, and generally relatively little other code.</p></li>
 <li><p>Also see <a href="#lambdaexpressions">lambda
 expressions</a>.</p></li>
-<li><p><code>decltype(auto)</code> should be avoided, whether for
-variables, for non-type template parameters, or for function return
-types. There are subtle and complex differences between this placeholder
-type and <code>auto</code>. Any use would need very careful
-explanation.</p></li>
 </ul>
 <h3 id="expression-sfinae">Expression SFINAE</h3>
 <p><a href="https://en.cppreference.com/w/cpp/language/sfinae"
@@ -778,53 +678,6 @@ class="uri">https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95468</a><br>
 <a
 href="https://developercommunity.visualstudio.com/content/problem/396562/sizeof-deduced-type-is-sometimes-not-a-constant-ex.html"
 class="uri">https://developercommunity.visualstudio.com/content/problem/396562/sizeof-deduced-type-is-sometimes-not-a-constant-ex.html</a></p>
-<h3 id="trailing-return-type-syntax-for-functions">Trailing return type
-syntax for functions</h3>
-<p>A function's return type may be specified after the parameters and
-qualifiers (<a
-href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2541.htm">n2541</a>).
-In such a declaration the normal return type is <code>auto</code> and
-the return type is indicated by <code>-&gt;</code> followed by the type.
-Although both use <code>auto</code> in the "normal" leading return type
-position, this differs from <a
-href="#function-return-type-deduction">function return type
-deduction</a>, in that the return type is explicit rather than deduced,
-but specified in a trailing position.</p>
-<p>Use of trailing return types is permitted. However, the normal,
-leading position for the return type is preferred. A trailing return
-type should only be used where it provides some benefit. Such benefits
-usually arise because a trailing return type is in a different scope
-than a leading return type.</p>
-<ul>
-<li><p>If the function identifier is a nested name specifier, then the
-trailing return type occurs in the nested scope. This may permit simpler
-naming in the return type because of the different name lookup
-context.</p></li>
-<li><p>The trailing return type is in the scope of the parameters,
-making their types accessible via <code>decltype</code>. For
-example</p></li>
-</ul>
-<pre><code>template&lt;typename T, typename U&gt; auto add(T t, U u) -&gt; decltype(t + u);</code></pre>
-<p>rather than</p>
-<pre><code>template&lt;typename T, typename U&gt; decltype((*(T*)0) + (*(U*)0)) add(T t, U u);</code></pre>
-<ul>
-<li>Complex calculated leading return types may obscure the normal
-syntactic boundaries, making it more difficult for a reader to find the
-function name and parameters. This is particularly common in cases where
-the return type is being used for <a
-href="https://en.cppreference.com/w/cpp/language/sfinae"
-title="Substitution Failure Is Not An Error">SFINAE</a>. A trailing
-return type may be preferable in such situations.</li>
-</ul>
-<h3 id="non-type-template-parameter-values">Non-type template parameter
-values</h3>
-<p>C++17 extended the arguments permitted for non-type template
-parameters (<a href="http://wg21.link/n4268">n4268</a>). The kinds of
-values (the parameter types) aren't changed. However, the values can now
-be the result of arbitrary constant expressions (with a few restrictions
-on the result), rather than a much more limited and restrictive set of
-expressions. In particular, the argument for a pointer or reference type
-parameter can now be the result of a constexpr function.</p>
 <h3 id="enum">enum</h3>
 <p>Where appropriate, <em>scoped-enums</em> should be used. (<a
 href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2347.pdf">n2347</a>)</p>
@@ -938,68 +791,6 @@ differ from what the Java compilers implement.</p>
 "conservative" memory ordering, which may differ from (may be stronger
 than) sequentially consistent. There are algorithms in HotSpot that are
 believed to rely on that ordering.</p>
-<h3 id="variable-templates-and-inline-variables">Variable Templates and
-Inline Variables</h3>
-<p>The use of variable templates (including static data member
-templates) (<a href="https://wg21.link/N3651">N3651</a>) is permitted.
-They provide parameterized variables and constants in a simple and
-direct form, instead of requiring the use of various workarounds.</p>
-<p>Variables with static storage duration and variable templates may be
-declared <code>inline</code> (<a
-href="https://wg21.link/p0386r2">p0386r2</a>), and this usage is
-permitted. This has similar effects as for declaring a function inline:
-it can be defined, identically, in multiple translation units, must be
-defined in every translation unit in which it is <a
-href="https://en.cppreference.com/w/cpp/language/definition"
-title="One Definition Rule">ODR used</a>, and the behavior of the
-program is as if there is exactly one variable.</p>
-<p>Declaring a variable inline allows the complete definition to be in a
-header file, rather than having a declaration in a header and the
-definition in a .cpp file. The guidance on <a
-href="#initializing-variables-with-static-storage-duration">initialization</a>
-of such variables still applies. Inline variables with dynamic
-initializations can make initialization order problems worse. The few
-ordering constraints that exist for non-inline variables don't apply, as
-there isn't a single program-designated translation unit containing the
-definition.</p>
-<p>A <code>constexpr</code> static data member or static data member
-template is implicitly <code>inline</code>. As a consequence, an <a
-href="https://en.cppreference.com/w/cpp/language/definition"
-title="One Definition Rule">ODR use</a> of such a member doesn't require
-a definition in some .cpp file. (This is a change from pre-C++17.
-Beginning with C++17, such a definition is considered a duplicate
-definition, and is deprecated.)</p>
-<p>Declaring a <code>thread_local</code> variable template or
-<code>inline</code> variable is forbidden in HotSpot code. <a
-href="#thread_local">The use of <code>thread_local</code></a> is already
-heavily restricted.</p>
-<h3
-id="initializing-variables-with-static-storage-duration">Initializing
-variables with static storage duration</h3>
-<p>Variables with static storage duration and <em>dynamic
-initialization</em> <a
-href="https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4296.pdf">C++14
-3.6.2</a>). should be avoided, unless an implementation is permitted to
-perform the initialization as a static initialization. The order in
-which dynamic initializations occur is incompletely specified.
-Initialization order problems can be difficult to deal with and lead to
-surprises.</p>
-<p>Variables with static storage duration and non-trivial destructors
-should be avoided. HotSpot doesn't generally try to cleanup on exit, and
-running destructors at exit can lead to problems.</p>
-<p>Some of the approaches used in HotSpot to avoid dynamic
-initialization include:</p>
-<ul>
-<li><p>Use the <code>Deferred&lt;T&gt;</code> class template. Add a call
-to its initialization function at an appropriate place during VM
-initialization. The underlying object is never destroyed.</p></li>
-<li><p>For objects of class type, use a variable whose value is a
-pointer to the class, initialized to <code>nullptr</code>. Provide an
-initialization function that sets the variable to a dynamically
-allocated object. Add a call to that function at an appropriate place
-during VM initialization. Such objects are usually never
-destroyed.</p></li>
-</ul>
 <h3 id="uniform-initialization">Uniform Initialization</h3>
 <p>The use of <em>uniform initialization</em> (<a
 href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2672.htm">n2672</a>),
@@ -1024,45 +815,6 @@ initialization</a></li>
 <p>Although related, the use of <code>std::initializer_list</code>
 remains forbidden, as part of the avoidance of the C++ Standard Library
 in HotSpot code.</p>
-<h3 id="mandatory-copy-elision">Mandatory Copy Elision</h3>
-<p><a href="https://en.wikipedia.org/wiki/Copy_elision">Copy elision</a>
-(or <a
-href="https://cn.cppreference.com/w/cpp/language/copy_elision.html">here</a>)
-is a compiler optimization used to avoid potentially expensive copies in
-certain situations. It is critical to making practical the performance
-of return by value or pass by value. It is also unusual in not following
-the as-if rule for optimizations - copy elision can be applied even if
-doing so bypasses side-effects of copying/moving the object. The C++
-standard explicitly permits this.</p>
-<p>However, because it's an optional optimization, the relevant
-copy/move constructor must be available and accessible, in case the
-compiler chooses to not apply the optimization even in a situation where
-permitted.</p>
-<p>C++17 changed some cases of copy elision so that there is never a
-copy/move in these cases (<a
-href="http://wg21.link/p0135r1">p0135r1</a>). The interesting cases
-involve a function that returns an unnamed temporary object, and
-constructors. In such cases the object being initialized from the
-temporary is always direct initialized, with no copy/move ever involved;
-see <a href="https://en.wikipedia.org/wiki/Copy_elision#RVO"
-title="Return Value Optimization">RVO</a> and more specifically <a
-href="https://cn.cppreference.com/w/cpp/language/copy_elision.html"
-title="Unnamed Return Value Optimization">URVO</a>.</p>
-<p>Since this is now standard behavior it can't be avoided in the
-covered situations. This could change the behavior of code that relied
-on side effects by constructors, but that's both uncommon and was
-already problematic because of the previous optional copy elision. But
-HotSpot code can, and should, explicitly take advantage of this newly
-required behavior where it makes sense to do so.</p>
-<p>For example, it may be beneficial to delay construction of the result
-of a function until the return statement, rather than having a local
-variable that is modified into the desired state and then returned.
-(Though <a href="https://en.wikipedia.org/wiki/Copy_elision#NRVO"
-title="Named Return Value Optimization">NRVO</a> may apply in that
-case.)</p>
-<p>It is also now possible to define a factory function for a class that
-is neither movable nor copyable, if it can be written in a way that
-makes use of this feature.</p>
 <h3 id="local-function-objects">Local Function Objects</h3>
 <ul>
 <li>Local function objects, including lambda expressions, may be
@@ -1135,13 +887,6 @@ href="https://en.wikipedia.org/wiki/Partial_application"
 title="Partial Application">partial application</a>. Again here, lambdas
 are typically much simpler and less verbose than function object
 classes.</p>
-<p>A lambda is a constexpr function if either the parameter declaration
-clause is followed by <code>constexpr</code>, or it satisfies the
-requirements for a constexpr function (<a
-href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0170r1.pdf">p0170r1</a>).
-Thus, using a lambda to package up some computation doesn't incur
-unnecessary overhead or prevent use in a context required to be
-compile-time evaluated (such as an array size).</p>
 <p>Because of these benefits, lambda expressions are permitted in
 HotSpot code, with some restrictions and usage guidance. An anonymous
 lambda is one which is passed directly as an argument. A named lambda is
@@ -1189,18 +934,6 @@ making the captured value unaffected by modifications to the outer
 variable. But this only applies to captured auto variables, not member
 variables, and is inconsistent with referential transparency.</p></li>
 </ul></li>
-<li><p>By-value capture of <code>this</code> (using a capture list like
-<code>[*this]</code> (<a
-href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0018r3.html">p0018r3</a>))
-is also not permitted. One of the motivating use-cases is when the
-lifetime of the lambda exceeds the lifetime of the object for the
-containing member function. That is, we have an upward lambda that is
-capturing <code>this</code> of the enclosing method. But again, that
-use-case doesn't apply if only downward lambdas are used. Another
-use-case is when we simply want the lambda to be operating on a copy of
-<code>this</code> for some reason. This is sufficiently uncommon that it
-can be handled by manual copying, so readers don't need to understand
-this rare syntax.</p></li>
 <li><p>Non-capturing lambdas (with an empty capture list -
 <code>[]</code>) have limited utility. There are cases where no captures
 are required (pure functions, for example), but if the function is small
@@ -1210,15 +943,14 @@ href="https://isocpp.org/files/papers/N3649.html">N3649</a>) are not
 permitted. Capture initializers inherently increase the complexity of
 the capture list, and provide little benefit over an additional in-scope
 local variable.</p></li>
-<li><p>The use of <code>mutable</code> lambda expressions is forbidden
+</ul>
+<p>The use of <code>mutable</code> lambda expressions is forbidden
 because there don't seem to be many, if any, good use-cases for them in
 HotSpot. A lambda expression needs to be mutable in order to modify a
 by-value captured value. But with only downward lambdas, such usage
 seems likely to be rare and complicated. It is better to use a function
 object class in any such cases that arise, rather than requiring all
-HotSpot developers to understand this relatively obscure
-feature.</p></li>
-</ul>
+HotSpot developers to understand this relatively obscure feature.</p>
 <p>While it is possible to directly invoke an anonymous lambda
 expression, that feature should not be used, as such a form can be
 confusing to readers. Instead, name the lambda and call it by name.</p>
@@ -1336,12 +1068,23 @@ href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2540.htm">n2540</
 <p>C++11 provides simple syntax allowing a class to inherit the
 constructors of a base class. Unfortunately there are a number of
 problems with the original specification, and C++17 contains significant
-revisions (<a href="http:/wg21.link/p0136r1" title="p0136r1">p0136r1</a>
-opens with a list of 8 Core Issues). Although those issues have been
-addressed, the benefits from this feature are small compared to the
-complexity. Because of this, HotSpot code must not use inherited
-constructors.</p>
-<p><a href="http://wg21.link/p0195r0">p0195r0</a></p>
+revisions (<a
+href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0136r1.html"
+title="p0136r1">p0136r1</a> opens with a list of 8 Core Issues). Since
+HotSpot doesn't support use of C++17, use of inherited constructors
+could run into those problems. Such uses might also change behavior in a
+future HotSpot update to use C++17 or later, potentially in subtle ways
+that could lead to hard to diagnose problems. Because of this, HotSpot
+code must not use inherited constructors.</p>
+<p>Note that gcc7 provides the <code>-fnew-inheriting-ctors</code>
+option to use the <a
+href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0136r1.html"
+title="p0136r1">p0136r1</a> semantics. This is enabled by default when
+using C++17 or later. It is also enabled by default for
+<code>fabi-version=11</code> (introduced by gcc7) or higher when using
+C++11/14, as the change is considered a Defect Report that applies to
+those versions. Earlier versions of gcc don't have that option, and
+other supported compilers may not have anything similar.</p>
 <h3 id="attributes">Attributes</h3>
 <p>The use of some attributes (<a
 href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2761.pdf">n2761</a>)
@@ -1357,17 +1100,9 @@ those cases HotSpot has a preferred location.</p>
 beginning of the function's declaration, rather than between the
 function name and the parameter list.</li>
 </ul>
-<p><a href="http://wg21.link/p0068r0">p0068r0</a> is the initial
-proposal for the attributes added by C++17.)</p>
 <p>Only the following attributes are permitted:</p>
 <ul>
 <li><code>[[noreturn]]</code></li>
-<li><code>[[nodiscard]]</code> (<a
-href="http://wg21.link/p0189r1">p0189r1</a>)</li>
-<li><code>[[maybe_unused]]</code> (<a
-href="http://wg21.link/p0212r1">p0212r1</a>)</li>
-<li><code>[[fallthrough]]</code> (<a
-href="http://wg21.link/p0188">p0188r1</a>)</li>
 </ul>
 <p>The following attributes are expressly forbidden:</p>
 <ul>
@@ -1375,138 +1110,6 @@ href="http://wg21.link/p0188">p0188r1</a>)</li>
 <code>memory_order_consume</code>.</li>
 <li><code>[[deprecated]]</code> - Not relevant in HotSpot code.</li>
 </ul>
-<p>Direct use of non-standard (and presumably scoped) attributes in
-shared code is also forbidden. Using such would depend on the C++17
-feature that an attribute not recognized by the implementation is
-ignored (<a href="http://wg21.link/p0283r2">p0283r2</a>). If such an
-attribute is needed in shared code, the well-established technique of
-providing an <code>ATTRIBUTE_XXX</code> macro with per-compiler
-definitions (sometimes empty) should be used. Compilers may warn about
-unrecognized attributes (whether by name or by location), in order to
-report typos or misuse. Disabling such warnings globally would not be
-desirable.</p>
-<p>The use of <code>using</code> directives in attribute lists is also
-forbidden. (<a href="http://wg21.link/p0028r0">p0028r0</a>) (<a
-href="http://wg21.link/p0028r4">p0028r4</a>) We don't generally use
-scoped attributes in attribute lists with other attributes. Rather, uses
-of scoped attributes (which are implementation defined) are generally
-hidden behind a portability macro that includes the surrounding
-brackets.</p>
-<h3 id="noexcept">noexcept</h3>
-<p>Use of <code>noexcept</code> exception specifications (<a
-href="http://wg21.link/n3050">n3050</a>) are permitted with restrictions
-described below.</p>
-<ul>
-<li>Only the argument-less form of <code>noexcept</code> exception
-specifications are permitted.</li>
-<li>Allocation functions that may return <code>nullptr</code> to
-indicate allocation failure must be declared <code>noexcept</code>.</li>
-<li>All other uses of <code>noexcept</code> exception specifications are
-forbidden.</li>
-<li><code>noexcept</code> expressions are forbidden.</li>
-<li>Dynamic exception specifications are forbidden.</li>
-</ul>
-<p>HotSpot is built with exceptions disabled, e.g. compile with
-<code>-fno-exceptions</code> (gcc, clang) or no <code>/EH</code> option
-(MSVC++). So why do we need to consider <code>noexcept</code> at all?
-It's because <code>noexcept</code> exception specifications serve two
-distinct purposes.</p>
-<p>The first is to allow the compiler to avoid generating code or data
-in support of exceptions being thrown by a function. But this is
-unnecessary, because exceptions are disabled.</p>
-<p>The second is to allow the compiler and library code to choose
-different algorithms, depending on whether some function may throw
-exceptions. This is only relevant to a certain set of functions.</p>
-<ul>
-<li><p>Some allocation functions (<code>operator new</code> and
-<code>operator new[]</code>) return <code>nullptr</code> to indicate
-allocation failure. If a <code>new</code> expression calls such an
-allocation function, it must check for and handle that possibility.
-Declaring such a function <code>noexcept</code> informs the compiler
-that <code>nullptr</code> is a possible result. If an allocation
-function is not declared <code>noexcept</code> then the compiler may
-elide that checking and handling for a <code>new</code> expression
-calling that function.</p></li>
-<li><p>Certain Standard Library facilities (notably containers) provide
-different guarantees for some operations (and may choose different
-algorithms to implement those operations), depending on whether certain
-functions (constructors, copy/move operations, swap) are nothrow or not.
-They detect this using type traits that test whether a function is
-declared <code>noexcept</code>. This can have a significant performance
-impact if, for example, copying is chosen over a potentially throwing
-move. But this isn't relevant, since HotSpot forbids the use of most
-Standard Library facilities.</p></li>
-</ul>
-<p>HotSpot code can assume no exceptions will ever be thrown, even from
-functions not declared <code>noexcept</code>. So HotSpot code doesn't
-ever need to check, either with conditional exception specifications or
-with <code>noexcept</code> expressions.</p>
-<p>The exception specification is part of the type of a function (<a
-href="http://wg21.link/p0012r1">p0012r1</a>. This likely has little
-impact on HotSpot code, since the use of <code>noexcept</code> is
-expected to be rare.</p>
-<p>Dynamic exception specifications were deprecated in C++11. C++17
-removed all but <code>throw()</code>, with that remaining a deprecated
-equivalent to <code>noexcept</code>.</p>
-<h3 id="enhanced-selection-statements">Enhanced selection
-statements</h3>
-<p>C++17 modified the <em>condition</em> part of <code>if</code> and
-<code>switch</code> statements, permitting an <em>init-statement</em> to
-be included (<a href="http://wg21.link/p0305r1">p0305r1</a>).</p>
-<p>Use of this feature is permitted. (However, complex uses may
-interfere with readability.) Limiting the scope of a variable involved
-in the condition, while also making the value available to the
-statement's body, can improve readability. The alternative method of
-scope-limiting by introducing a nested scope isn't very popular and is
-rarely used.</p>
-<p>This new syntax is in addition to the <em>condition</em> being a
-declaration with a <em>brace-or-equal-initializer</em>. For an
-<code>if</code> statement this new sytax gains that benefit without
-violating the long-standing guidance against using <a
-href="#avoid-implicit-conversions-to-bool">implicit conversions to
-<code>bool</code></a>, which still stands.</p>
-<p>For example, uses of Unified Logging sometimes explicitly check
-whether a <code>LogTarget</code> is enabled. Instead of</p>
-<pre><code>  LogTarget(...) lt;
-  if (lt.is_enabled()) {
-    LogStream log(lt);
-    ... use log ...
-  }
-  ... lt is accessible but probably not needed here ...</code></pre>
-<p>using this feature one could write</p>
-<pre><code>  if (LogTarget(...) lt; lt.is_enabled()) {
-    LogStream log(lt);
-    ... use log ...
-  }</code></pre>
-<p>C++17 also added compile-time <code>if</code> statements (<a
-href="http://wg21.link/p0292r2">p0292r2</a>). Use of
-<code>if constexpr</code> is permitted. This feature can replace and
-(sometimes vastly) simplify many uses of <a
-href="https://en.cppreference.com/w/cpp/language/sfinae"
-title="Substitution Failure Is Not An Error">SFINAE</a>. The same
-declaration and initialization guidance for the <em>condition</em> part
-apply here as for ordinary <code>if</code> statements.</p>
-<h3 id="expression-evaluation-order">Expression Evaluation Order</h3>
-<p>C++17 tightened up the evaluation order for some kinds of
-subexpressions (<a href="http://wg21.link/p0138r2">p0138r2</a>). Note,
-however, that the Alternate Evaluation Order for Function Calls
-alternative in that paper was adopted, rather than the strict left to
-right order of evaluation for function call arguments that was proposed
-in the main body of the paper.</p>
-<p>The primary purpose of this change seems to be to make certain kinds
-of call chaining well defined. That's not a style widely used in
-HotSpot. In general it is better to continue to avoid questions in this
-area by isolating operations with side effects from other statements. In
-particular, continue to avoid modifying a value in an expression where
-it is also used.</p>
-<h3 id="compatibility-with-c11">Compatibility with C11</h3>
-<p>C++17 refers to C11 rather than C99. This means that C11 libraries
-and functions may be used in HotSpot. There may be limitations because
-of differing levels of compatibility among various compilers and
-versions of those compilers.</p>
-<p>Note that the C parts of the JDK have been built with C11 selected
-for some time (<a
-href="https://bugs.openjdk.org/browse/JDK-8292008">JDK-8292008</a>).</p>
 <h3 id="additional-permitted-features">Additional Permitted
 Features</h3>
 <ul>
@@ -1522,10 +1125,8 @@ href="https://isocpp.org/files/papers/n3778.html">n3778</a>)</p></li>
 href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2242.pdf">n2242</a>)
 (<a
 href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2555.pdf">n2555</a>)</p></li>
-<li><p>Static assertions (<a href="http://wg21.link/n1720">n1720</a>)
-(<a href="http://wg21.link/n3928">n3928</a>)<br> Both the original
-(C++11) two-argument form and the new (C++17) single-argument form are
-permitted.</p></li>
+<li><p>Static assertions (<a
+href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2004/n1720.html">n1720</a>)</p></li>
 <li><p><code>decltype</code> (<a
 href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2343.pdf">n2343</a>)
 (<a
@@ -1567,62 +1168,8 @@ href="http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2930.html">n2930<
 href="https://en.cppreference.com/w/cpp/language/range-for">range-for</a>)</p></li>
 <li><p>Unrestricted Unions (<a
 href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2544.pdf">n2544</a>)</p></li>
-<li><p>Preprocessor Condition <code>__has_include</code> (<a
-href="http://wg21.link/p0061r0">p0061r0</a>) (<a
-href="http://wg21.link/p0061r1">p0061r1</a>)</p></li>
-<li><p>Hexadecimal Floating-Point Literals (<a
-href="http://wg21.link/p0245r1">p0245r1</a>)</p></li>
-<li><p>Construction Rules for <code>enum class</code> Values (<a
-href="http://wg21.link/p0138r2">p0138r2</a>)</p></li>
-<li><p>Allow <code>typename</code> in template template parameter (<a
-href="http://wg21.link/n4051">n4051</a>) — template template parameters
-are barely used (if at all) in HotSpot, but there's no reason to
-artificially disallow this syntactic regularization in any such
-uses.</p></li>
 </ul>
-<h2 id="excluded-features">Excluded Features</h2>
-<h3 id="structured-bindings">Structured Bindings</h3>
-<p>The use of structured bindings <a
-href="http://wg21.link/p0217r3">p0217r3</a> is forbidden. Preferred
-approaches for handling functions with multiple return values
-include</p>
-<ul>
-<li><p>Return a named class/struct intended for that purpose, with named
-and typed members/accessors.</p></li>
-<li><p>Return a value along with out parameters (usually pointers,
-sometimes references).</p></li>
-<li><p>Designate a sentinel "failure" value in the normal return value
-type, with some out of band location for additional information. For
-example, this is the model typically used with <code>errno</code>, where
-a function returns a normal result, or -1 to indicate an error, with
-additional error information in <code>errno</code>.</p></li>
-</ul>
-<p>There is a strong preference for names and explicit types, as opposed
-to offsets and implicit types. For example, there are folks who strongly
-dislike that some of the Standard Library functions return
-<code>std::pair</code> because <code>first</code> and
-<code>second</code> members don't carry any useful information.</p>
-<h3 id="file-system-library">File System Library</h3>
-<p>The use of the File System library is forbidden. HotSpot doesn't do
-very much with files, and already has adequate mechanisms for its needs.
-Rewriting in terms of this new library doesn't provide any obviously
-significant benefits. Having a mix of the existing usage and uses of
-this new library would be confusing.</p>
-<p><a href="http://wg21.link/n4100">n4100</a> <a
-href="http://wg21.link/p0218r0">p0218r0</a> <a
-href="http://wg21.link/p0219r1">p0219r1</a> <a
-href="http://wg21.link/p0317r1">p0317r1</a> <a
-href="http://wg21.link/p0392r0">p0392r0</a> <a
-href="http://wg21.link/p0430r2">p0430r2</a> <a
-href="http://wg21.link/p0492r2">p0492r2</a> <a
-href="http://wg21.link/p1164r1">p1164r1</a></p>
-<h3 id="aggregate-extensions">Aggregate Extensions</h3>
-<p>Aggregates with base classes are forbidden. C++17 allows aggregate
-initialization for classes with base classes (<a
-href="https://wg21.link/p0017r1">p0017r1</a>). HotSpot makes very little
-use of aggregate classes, preferring explicit constructors even for very
-simple classes.</p>
-<h3 id="additional-excluded-features">Additional Excluded Features</h3>
+<h3 id="excluded-features">Excluded Features</h3>
 <ul>
 <li><p>New string and character literals</p>
 <ul>
@@ -1651,238 +1198,32 @@ Library names.</p></li>
 href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2179.html">n2179</a>)
 — HotSpot does not permit the use of exceptions, so this feature isn't
 useful.</p></li>
+<li><p>Avoid non-local variables with non-constexpr initialization. In
+particular, avoid variables with types requiring non-trivial
+initialization or destruction. Initialization order problems can be
+difficult to deal with and lead to surprises, as can destruction
+ordering. HotSpot doesn't generally try to cleanup on exit, and running
+destructors at exit can also lead to problems.</p></li>
 <li><p>Avoid most operator overloading, preferring named functions. When
 operator overloading is used, ensure the semantics conform to the normal
 expected behavior of the operation.</p></li>
 <li><p>Avoid most implicit conversion constructors and (implicit or
-explicit) conversion operators. Conversion to <code>bool</code>
-operators aren't needed because of the <a
-href="#avoid-implicit-conversions-to-bool">no implicit boolean</a>
-guideline.)</p></li>
+explicit) conversion operators. (Note that conversion to
+<code>bool</code> isn't needed in HotSpot code because of the "no
+implicit boolean" guideline.)</p></li>
 <li><p>Avoid <code>goto</code> statements.</p></li>
-<li><p>Attributes for namespaces and enumerators (<a
-href="http://wg21.link/n4266">n4266</a> — The only applicable attribute
-is <a href="#attributes"><code>[[deprecated]]</code></a>, which is
-forbidden.</p></li>
-<li><p>Variadic <code>using</code> declarations (<a
-href="http://wg21.link/p0195r2">p0195r2</a>)</p></li>
-<li><p><code>std::variant&lt;&gt;</code> (<a
-href="http://wg21.link/p0088r3">p0088r3</a>) — Even if more of the C++
-Standard Library is permitted, this class will remain forbidded. Invalid
-accesses are indicated by throwing exceptions.</p></li>
-<li><p><code>std::any</code> (<a
-href="http://wg21.link/p0220r1">p0220r1</a>) — Even if more of the C++
-Standard Library is permitted, this class will remain forbidden. It may
-require allocation, and always uses the standard allocator. It requires
-<a href="https://en.wikipedia.org/wiki/Run-time_type_information"
-title="Runtime Type Information">RTTI</a>.</p></li>
-<li><p><code>std::as_const()</code> (<a
-href="http://wg21.link/p0007r1">p0007r1</a>) — If sufficiently useful,
-HotSpot could add such a function. It would likely be added to
-globalDefinitions.hpp, where there are already some similar small
-utilities.</p></li>
-<li><p><code>std::clamp()</code> (<a
-href="http://wg21.link/p002501">p002501</a>) — This function is already
-provided in globalDefinitions.hpp.</p></li>
-<li><p>Parallel STL Algorithms (<a
-href="http://wg21.link/p0024r2">p0024r2</a>) — Even if more of the C++
-Standard Library is permitted, these will remain forbidden. They are
-built on the standard C++ threading mechanisms. HotSpot doesn't use
-those mechanisms, instead providing and using its own.</p></li>
-<li><p>Cache Line Sizes <a href="http://wg21.link/p0154r1">p0154r1</a> —
-HotSpot has its own mechanisms for this, using values like
-<code>DEFAULT_CACHE_LINE_SIZE</code>. The platform-specific
-implementation of the HotSpot mechanisms might use these library
-functions, but there is no reason to move away from the current
-approach. Quoting from <a href="https://www.cppstd17.com"
-title="C++17: The Complete Guide">JOSUTTIS</a>: "... if you know better,
-use specific values, but using these values is better than any assumed
-fixed size for code supporting multiple platforms."</p></li>
-<li><p><code>register</code> storage class removal <a
-href="http://wg21.link/p0001r1">p0001r1</a> — The <code>register</code>
-storage class has been removed. <code>register</code> is still a
-keyword, so still can't be used for normal purposes. Also, this doesn't
-affect the use of <code>register</code> for gcc-style extended asm code;
-that's a different syntactic element with a different meaning.</p></li>
-<li><p>Value of <code>__cplusplus</code> — Testing whether
-<code>__cplusplus</code> is defined or not is permitted, and indeed
-required. But the value should not need to be examined. The value is
-changed with each revision of the Standard. But we build HotSpot and
-(most of) the rest of the JDK with a specifically selected version of
-the Standard. The value of <code>__cplusplus</code> should be known and
-unchanging until we change the project's build configuration again. So
-examining the value shouldn't ever be necessary.</p></li>
-<li><p>Removal of <code>++</code> for <code>bool</code> (<a
-href="http://wg21.link/p0003r1">p0003r1</a>)</p></li>
-<li><p>Removal of trigraphs (<a
-href="http://wg21.link/n4086">n4086</a>)</p></li>
 </ul>
-<h2 id="undecided-features">Undecided Features</h2>
+<h3 id="undecided-features">Undecided Features</h3>
 <p>This list is incomplete; it serves to explicitly call out some
 features that have not yet been discussed.</p>
-<p>Some features are undecided (so implicitly forbidden) because we
-don't expect to use them at all. This might be reconsidered if someone
-finds a good use case.</p>
-<p>Some Standard Library features are undecided (so implicitly
-forbidden) because, while this Style Guide forbids the use of such, they
-may be sufficiently useful that we want to permit them anyway. Doing so
-may require some idiomatic mechanism for addressing things like
-<code>assert</code> incompatibility, incompatibility with HotSpot's
-<code>FORBID_C_FUNCTION</code> mechanism, and the like.</p>
-<h3 id="stdoptional">std::optional&lt;&gt;</h3>
-<p>It is undecided whether to permit the use of
-<code>std::optional&lt;&gt;</code> (<a
-href="http://wg21.link/p0220r1">p0220r1</a>). It may be sufficiently
-useful that it should be permitted despite the usual prohibition against
-using Standard Library facilities. Use of the <code>value()</code>
-member function must be forbidden, as it reports an invalid access by
-throwing an exception.</p>
-<h3 id="stdbyte">std::byte</h3>
-<p>It is undecided whether to permit the use of the
-<code>std::byte</code> type (<a
-href="http://wg21.link/p0298r3">p0298r3</a>). It may be sufficiently
-useful that it should be permitted despite the usual prohibition against
-using Standard Library facilities.</p>
-<p>It has been suggested that changing the HotSpot <code>address</code>
-type to use <code>std::byte</code> has some benefits. That is,
-replace</p>
-<pre><code>typedef u_char*       address;
-typedef const u_char* const_address;</code></pre>
-<pre><code>using address       = std::byte*;
-using const_address = const std::byte*;</code></pre>
-<p>in globalDefinitions.hpp.</p>
-<p>A specific benefit that was mentioned is that it might improve the
-horrible way that gdb handles our current definition of the
-<code>address</code> type.</p>
-<pre><code>#include &lt;cstddef&gt;
-
-typedef unsigned char* address;
-typedef std::byte* address_b;
-
-int main() {
-
-  char* mem;
-
-  address addr = (address)mem;
-  address_b addr_b = (address_b)mem;
-
-  return 0;
-}</code></pre>
-<pre><code>(gdb) p addr
-$1 = (address) 0x7ffff7fe4fa0 &lt;dl_main&gt; &quot;\363\017\036\372Uf\017\357\300H\211\345AWI\211\377AVAUATSH\201\354\210\002&quot;
-(gdb) p addr_b
-$2 = (address_b) 0x7ffff7fe4fa0 &lt;dl_main&gt;</code></pre>
-<p>This needs to be explored. Some folks have said they will do so.</p>
-<h3 id="string-views">String Views</h3>
-<p>It is undecided whether to permit the use of
-<code>std::string_view</code> (<a
-href="http://wg21.link/p0220r1">p0220r1</a>).</p>
-<p>HotSpot doesn't use <code>std::string</code>, but uses
-<code>char*</code> strings a lot. Wrapping such in a
-<code>std::string_view</code> to enable the use of various algorithms
-could be useful. But since HotSpot also doesn't permit use of
-<code>&lt;algorithm&gt;</code> and the like, that only gets the limited
-set of algorithms provided by the view class directly.</p>
-<p>There is also the issue of <code>NUL</code> termination; string views
-are not necessarily <code>NUL</code> terminated. Moreover, if one goes
-to the work of making one that is <code>NUL</code> terminated, that
-terminator is included in the size.</p>
-<p>There are other caveats. Permitting use of string views would require
-discussion of those.</p>
-<h3 id="substring-and-subsequence-searching">Substring and Subsequence
-Searching</h3>
-<p>In addition to simple substring searching, the Standard Library now
-includes Boyer-Moore and Boyer-Moore-Horspool searchers, in case someone
-wants to search really large texts. That seems an unlikely use-case for
-HotSpot. See <a href="http://wg21.link/p0220r1">p0220r1</a>.</p>
-<h3 id="new-and-delete-with-over-aligned-data"><code>new</code> and
-<code>delete</code> with Over-Aligned Data</h3>
-<p>It is undecided whether to permit the use of dynamic allocation of
-overaligned types (<a href="http://wg21.link/n3396">n3396</a>).</p>
-<p>HotSpot currently only has a couple of over-aligned types that are
-dynamically allocated. These are handled manually, not going through
-<code>new</code> expressions, as that couldn't work before C++17.</p>
-<p>One of the ways an over-aligned type might arise is by aligning a
-data member. This might be done to avoid destructive interference for
-concurrent accesses. But HotSpot uses a different approach, using
-explicit padding. Again, this is in part because <code>new</code> and
-<code>delete</code> of overaligned types didn't work. But we might
-prefer to continue this approach.</p>
-<p>We would need to add <code>operator new</code> overloads to
-<code>CHeapObj&lt;&gt;</code> and possibly in other places in order to
-support this. However, it has been suggested that implementing it
-(efficiently) on top of NMT might be difficult. Note that
-<code>posix_memalign</code> / <code>_aligned_malloc</code> don't help
-here, because of NMT's use of malloc headers.</p>
-<p>If we don't support it we may want to add <code>operator new</code>
-overloads that are deleted, to prevent attempted uses.</p>
-<p>Alignment usage in non-HotSpot parts of the OpenJDK:</p>
-<ul>
-<li><p><code>alignas</code> used once in harfbuzz, to align a
-variable.</p></li>
-<li><p>libpipewire has <code>#define SPA_ALIGNED</code> macro using gcc
-<code>aligned</code> attribute, but doesn't use it.</p></li>
-<li><p>libsleef has <code>#define ALIGNED</code> macro using gcc
-<code>aligned</code> attribute. It is not used for class or member
-declarations.</p></li>
-</ul>
-<h3 id="stdto_chars-and-stdfrom_chars"><code>std::to_chars()</code> and
-<code>std::from_chars</code></h3>
-<p>It is undecided whether to permit the use of
-<code>std::to_chars()</code> and <code>std::from_chars()</code> (<a
-href="http://wg21.link/p0067r5">p0067r5</a>).</p>
-<p>These functions provide low-level conversions between character
-sequences and numeric values. This seems like a good candidate for use
-in HotSpot, potentially replacing various clumsy or less performant
-alternatives. There is no memory allocation. Parsing failures are
-indicated via error codes rather than exceptions. Various other nice for
-HotSpot properties.</p>
-<p>Note that the published C++17 Standard puts these in
-<code>&lt;utility&gt;</code>, but a defect report moved them to
-<code>&lt;charconv&gt;</code>. This also needs
-<code>&lt;system_error&gt;</code>.</p>
-<p>This would require upgrading the minimum gcc version to 11.1 for
-floating point conversion support. The minimum Visual Studio version is
-already sufficient. The minimum clang version requirement hasn't been
-determined yet.</p>
-<h3 id="stdlaunder"><code>std::launder()</code></h3>
-<p>It is undecided whether to permit the use of
-<code>std::launder()</code> (<a
-href="http://wg21.link/p0137r1">p0137r1</a>).</p>
-<p>Change to permitted if we discover a place where we need it. Or maybe
-we should just permit it, but hope we don't need it.</p>
-<p>Also, C++20 revised the relevant part of Object Lifetime in a way
-that seems more permissive and with less need of laundering. We don't
-know if implementations of prior versions take advantage of the
-difference.</p>
-<p>See Object Lifetime: C++17 6.8/8, C++20 6.7.3/8</p>
-<h3 id="additional-undecided-features">Additional Undecided
-Features</h3>
 <ul>
+<li><p>Trailing return type syntax for functions (<a
+href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2541.htm">n2541</a>)</p></li>
+<li><p>Variable templates (<a
+href="https://isocpp.org/files/papers/N3651.pdf">n3651</a>)</p></li>
 <li><p>Member initializers and aggregates (<a
 href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3653.html">n3653</a>)</p></li>
 <li><p>Rvalue references and move semantics</p></li>
-<li><p>Shorthand for nested namespaces (<a
-href="http://wg21.link/n4230">n4230</a>) — HotSpot makes very little use
-of namespaces, so this seemingly innocuous feature probably isn't useful
-to us.</p></li>
-<li><p>Direct list initialization with <code>auto</code> (<a
-href="http://wg21.link/n3681">n3681</a>) — This change fixed some issues
-with direct list initialization and <code>auto</code>. But we don't use
-that feature much, if at all. And perhaps shouldn't be using
-it.</p></li>
-<li><p>UTF-8 Character Literals (<a
-href="http://wg21.link/n4267">n4267</a>) — Do we have a use-case for
-this?</p></li>
-<li><p>Fold Expressions (<a href="http://wg21.link/n4295">n4295</a>) —
-Provides a simple way to apply operators to a parameter pack. HotSpot
-doesn't use variadic templates very much. That makes it questionable
-that developers should need to know about this feature. But if someone
-does come up with a good use-case, it's likely that the alternatives are
-significantly worse, because pack manipulation without this can be
-complicated.</p></li>
-<li><p><code>std::invoke&lt;&gt;()</code> (<a
-href="http://wg21.link/n4169">n4169</a>)</p></li>
 </ul>
 </body>
 </html>

doc/hotspot-style.md

@@ -135,17 +135,6 @@ lines of code.  Name what you must repeat.
 change should be done with a "setter" accessor matched to the simple
 "getter".
 
-#### Conventions for Lock-free Code
-
-Sometimes variables are accessed concurrently without appropriate synchronization
-context, such as a held mutex or at a safepoint. In such cases the variable should
-be declared `volatile` and it should NOT be accessed as a normal C++ lvalue. Rather,
-access should be performed via functions from `Atomic`, such as `Atomic::load`,
-`Atomic::store`, etc.
-
-This special formulation makes it more clear to maintainers that the variable is
-accessed concurrently in a lock-free manner.
-
 ### Source Files
 
 * All source files must have a globally unique basename. The build
@@ -377,22 +366,20 @@ adjust new lines horizontally to be consistent with that
 organization. (E.g., trailing backslashes on long macro definitions
 often align.)
 
-### Avoid implicit conversions to bool
-
-* Use `bool` for boolean values.
-* Do not use ints or pointers as (implicit) booleans with `&&`, `||`,
-`if`, `while`. Instead, compare explicitly, i.e. `if (x != 0)` or
-`if (ptr != nullptr)`, etc.
-* Do not use non-boolean declarations in _condition_ forms, i.e. don't use
-`if (T v = value) { ... }`. But see
-[Enhanced selection statements](#enhanced-selection-statements).
-
 ### Miscellaneous
 
 * Use the [Resource Acquisition Is Initialization][RAII] (RAII)
 design pattern to manage bracketed critical
 sections. See class `ResourceMark` for an example.
 
+* Avoid implicit conversions to `bool`.
+    * Use `bool` for boolean values.
+    * Do not use ints or pointers as (implicit) booleans with `&&`, `||`,
+      `if`, `while`. Instead, compare explicitly, i.e. `if (x != 0)` or
+      `if (ptr != nullptr)`, etc.
+    * Do not use declarations in _condition_ forms, i.e. don't use
+      `if (T v = value) { ... }`.
+
 * Use functions from globalDefinitions.hpp and related files when
 performing bitwise
 operations on integers. Do not code directly as C operators, unless
@@ -404,17 +391,18 @@ they are extremely simple. (Examples: `align_up`, `is_power_of_2`,
 * Always enumerate all cases in a switch statement or provide a default
 case. It is ok to have an empty default with comment.
 
+
 ## Use of C++ Features
 
 HotSpot was originally written in a subset of the C++98/03 language.
-More recently, support for C++17 is provided, though again,
+More recently, support for C++14 is provided, though again,
 HotSpot only uses a subset.  (Backports to JDK versions lacking
 support for more recent Standards must of course stick with the
 original C++98/03 subset.)
 
 This section describes that subset.  Features from the C++98/03
 language may be used unless explicitly excluded here.  Features from
-C++11, C++14, and C++17 may be explicitly permitted or explicitly excluded,
+C++11 and C++14 may be explicitly permitted or explicitly excluded,
 and discussed accordingly here.  There is a third category, undecided
 features, about which HotSpot developers have not yet reached a
 consensus, or perhaps have not discussed at all.  Use of these
@@ -429,9 +417,9 @@ more extensive discussion or rationale for limitations.  Features that
 don't have their own subsection are listed in omnibus feature sections
 for permitted, excluded, and undecided features.
 
-Lists of new features for C++11, C++14, and C++17, along with links to their
+Lists of new features for C++11 and C++14, along with links to their
 descriptions, can be found in the online documentation for some of the
-compilers and libraries.  The C++17 Standard is the definitive
+compilers and libraries.  The C++14 Standard is the definitive
 description.
 
 * [C++ Standards Support in GCC](https://gcc.gnu.org/projects/cxx-status.html)
@@ -636,41 +624,13 @@ For local variables, this can be used to make the code clearer by
 eliminating type information that is obvious or irrelevant.  Excessive
 use can make code much harder to understand.
 
-* `auto` for non-type template parameters
-([p0127r2](http://wg21.link/p0127r2))<br>
-`auto` may be used as a placeholder for the type of a non-type template
-parameter. The type is deduced from the value provided in a template
-instantiation.
-
-<a name="function-return-type-deduction"></a>
 * Function return type deduction
 ([n3638](https://isocpp.org/files/papers/N3638.html))<br>
 Only use if the function body has a very small number of `return`
 statements, and generally relatively little other code.
 
-* Class template argument deduction
-([n3602](http://wg21.link/n3602), [p0091r3](http://wg21.link/p0091r3))<br>
-The template arguments of a class template may be deduced from the arguments
-to a constructor. This is similar to ordinary function argument deduction,
-though partial deduction with only _some_ template arguments explicitly
-provided is not permitted for class template argument deduction. Deduction
-guides may be used to provide additional control over the deduction. As with
-`auto` variable declarations, excessive use can make code harder to
-understand, because explicit type information is lacking. But it can also
-remove the need to be explicit about types that are either obvious, or that
-are very hard to write. For example, these allow the addition of a scope-guard
-mechanism with nice syntax; something like this
-```
-  ScopeGuard guard{[&]{ ... cleanup code ... }};
-```
-
 * Also see [lambda expressions](#lambdaexpressions).
 
-* `decltype(auto)` should be avoided, whether for variables, for non-type
-template parameters, or for function return types. There are subtle and
-complex differences between this placeholder type and `auto`. Any use would
-need very careful explanation.
-
 ### Expression SFINAE
 
 [Substitution Failure Is Not An Error][SFINAE] (SFINAE)
@@ -692,52 +652,6 @@ Here are a few closely related example bugs:<br>
 <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95468><br>
 <https://developercommunity.visualstudio.com/content/problem/396562/sizeof-deduced-type-is-sometimes-not-a-constant-ex.html>
 
-### Trailing return type syntax for functions
-
-A function's return type may be specified after the parameters and qualifiers
-([n2541](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2541.htm)).
-In such a declaration the normal return type is `auto` and the return type is
-indicated by `->` followed by the type.  Although both use `auto` in the
-"normal" leading return type position, this differs from
-[function return type deduction](#function-return-type-deduction),
-in that the return type is explicit rather than deduced, but specified in a
-trailing position.
-
-Use of trailing return types is permitted.  However, the normal, leading
-position for the return type is preferred. A trailing return type should only
-be used where it provides some benefit. Such benefits usually arise because a
-trailing return type is in a different scope than a leading return type.
-
-* If the function identifier is a nested name specifier, then the trailing
-return type occurs in the nested scope. This may permit simpler naming in the
-return type because of the different name lookup context.
-
-* The trailing return type is in the scope of the parameters, making their
-types accessible via `decltype`. For example
-```
-template<typename T, typename U> auto add(T t, U u) -> decltype(t + u);
-```
-rather than
-```
-template<typename T, typename U> decltype((*(T*)0) + (*(U*)0)) add(T t, U u);
-```
-
-* Complex calculated leading return types may obscure the normal syntactic
-boundaries, making it more difficult for a reader to find the function name and
-parameters. This is particularly common in cases where the return type is
-being used for [SFINAE]. A trailing return type may be preferable in such
-situations.
-
-### Non-type template parameter values
-
-C++17 extended the arguments permitted for non-type template parameters
-([n4268](http://wg21.link/n4268)). The kinds of values (the parameter types)
-aren't changed.  However, the values can now be the result of arbitrary
-constant expressions (with a few restrictions on the result), rather than a
-much more limited and restrictive set of expressions. In particular, the
-argument for a pointer or reference type parameter can now be the result of a
-constexpr function.
-
 ### enum
 
 Where appropriate, _scoped-enums_ should be used.
@@ -856,65 +770,6 @@ ordering, which may differ from (may be stronger than) sequentially
 consistent.  There are algorithms in HotSpot that are believed to rely
 on that ordering.
 
-### Variable Templates and Inline Variables
-
-The use of variable templates (including static data member templates)
-([N3651](https://wg21.link/N3651)) is permitted. They provide parameterized
-variables and constants in a simple and direct form, instead of requiring the
-use of various workarounds.
-
-Variables with static storage duration and variable templates may be declared
-`inline` ([p0386r2](https://wg21.link/p0386r2)), and this usage is
-permitted. This has similar effects as for declaring a function inline: it can
-be defined, identically, in multiple translation units, must be defined in
-every translation unit in which it is [ODR used][ODR], and the behavior of the
-program is as if there is exactly one variable.
-
-Declaring a variable inline allows the complete definition to be in a header
-file, rather than having a declaration in a header and the definition in a
-.cpp file. The guidance on
-[initialization](#initializing-variables-with-static-storage-duration) of such
-variables still applies. Inline variables with dynamic initializations can
-make initialization order problems worse. The few ordering constraints
-that exist for non-inline variables don't apply, as there isn't a single
-program-designated translation unit containing the definition.
-
-A `constexpr` static data member or static data member template
-is implicitly `inline`. As a consequence, an
-[ODR use][ODR] of such a member doesn't require a definition in some .cpp
-file. (This is a change from pre-C++17. Beginning with C++17, such a
-definition is considered a duplicate definition, and is deprecated.)
-
-Declaring a `thread_local` variable template or `inline` variable is forbidden
-in HotSpot code.  [The use of `thread_local`](#thread_local) is already
-heavily restricted.
-
-### Initializing variables with static storage duration
-
-Variables with static storage duration and _dynamic initialization_
-[C++14 3.6.2](https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4296.pdf)).
-should be avoided, unless an implementation is permitted to perform the
-initialization as a static initialization. The order in which dynamic
-initializations occur is incompletely specified.  Initialization order
-problems can be difficult to deal with and lead to surprises.
-
-Variables with static storage duration and non-trivial destructors should be
-avoided. HotSpot doesn't generally try to cleanup on exit, and running
-destructors at exit can lead to problems.
-
-Some of the approaches used in HotSpot to avoid dynamic initialization
-include:
-
-* Use the `Deferred<T>` class template. Add a call to its initialization
-function at an appropriate place during VM initialization. The underlying
-object is never destroyed.
-
-* For objects of class type, use a variable whose value is a pointer to the
-class, initialized to `nullptr`. Provide an initialization function that sets
-the variable to a dynamically allocated object. Add a call to that function at
-an appropriate place during VM initialization. Such objects are usually never
-destroyed.
-
 ### Uniform Initialization
 
 The use of _uniform initialization_
@@ -932,53 +787,6 @@ Some relevant sections from cppreference.com:
 Although related, the use of `std::initializer_list` remains forbidden, as
 part of the avoidance of the C++ Standard Library in HotSpot code.
 
-### Mandatory Copy Elision
-
-[Copy elision](https://en.wikipedia.org/wiki/Copy_elision)
-(or [here](https://cn.cppreference.com/w/cpp/language/copy_elision.html))
-is a compiler optimization used to avoid potentially expensive copies in
-certain situations. It is critical to making practical the performance of
-return by value or pass by value. It is also unusual in not following the
-as-if rule for optimizations - copy elision can be applied even if doing so
-bypasses side-effects of copying/moving the object. The C++ standard
-explicitly permits this.
-
-However, because it's an optional optimization, the relevant copy/move
-constructor must be available and accessible, in case the compiler chooses to
-not apply the optimization even in a situation where permitted.
-
-C++17 changed some cases of copy elision so that there is never a copy/move in
-these cases ([p0135r1](http://wg21.link/p0135r1)). The interesting cases
-involve a function that returns an unnamed temporary object, and constructors.
-In such cases the object being initialized from the temporary is always direct
-initialized, with no copy/move ever involved; see [RVO] and more specifically
-[URVO].
-
-Since this is now standard behavior it can't be avoided in the covered
-situations. This could change the behavior of code that relied on side effects
-by constructors, but that's both uncommon and was already problematic because
-of the previous optional copy elision. But HotSpot code can, and should,
-explicitly take advantage of this newly required behavior where it makes sense
-to do so.
-
-For example, it may be beneficial to delay construction of the result of a
-function until the return statement, rather than having a local variable that
-is modified into the desired state and then returned. (Though [NRVO] may apply
-in that case.)
-
-It is also now possible to define a factory function for a class that is
-neither movable nor copyable, if it can be written in a way that makes use of
-this feature.
-
-[RVO]: https://en.wikipedia.org/wiki/Copy_elision#RVO
-  "Return Value Optimization"
-
-[NRVO]: https://en.wikipedia.org/wiki/Copy_elision#NRVO
-  "Named Return Value Optimization"
-
-[URVO]: https://cn.cppreference.com/w/cpp/language/copy_elision.html
-  "Unnamed Return Value Optimization"
-
 ### Local Function Objects
 
 * Local function objects, including lambda expressions, may be used.
@@ -1047,12 +855,6 @@ Another use for local functions is [partial application][PARTIALAPP].  Again
 here, lambdas are typically much simpler and less verbose than function
 object classes.
 
-A lambda is a constexpr function if either the parameter declaration clause is
-followed by `constexpr`, or it satisfies the requirements for a constexpr
-function ([p0170r1]). Thus, using a lambda to package up some computation
-doesn't incur unnecessary overhead or prevent use in a context required to be
-compile-time evaluated (such as an array size).
-
 Because of these benefits, lambda expressions are permitted in HotSpot code,
 with some restrictions and usage guidance.  An anonymous lambda is one which
 is passed directly as an argument.  A named lambda is the value of a
@@ -1104,17 +906,6 @@ the most part they don't apply to HotSpot code, given other usage restrictions.
     applies to captured auto variables, not member variables, and is
     inconsistent with referential transparency.
 
-* By-value capture of `this` (using a capture list like `[*this]` ([p0018r3]))
-is also not permitted. One of the motivating use-cases is when the lifetime of
-the lambda exceeds the lifetime of the object for the containing member
-function. That is, we have an upward lambda that is capturing `this` of the
-enclosing method. But again, that use-case doesn't apply if only downward
-lambdas are used.
-  Another use-case is when we simply want the lambda to be operating on a copy
-of `this` for some reason. This is sufficiently uncommon that it can be
-handled by manual copying, so readers don't need to understand this rare
-syntax.
-
 * Non-capturing lambdas (with an empty capture list - `[]`) have limited
 utility.  There are cases where no captures are required (pure functions,
 for example), but if the function is small and simple then that's obvious
@@ -1124,7 +915,7 @@ anyway.
 Capture initializers inherently increase the complexity of the capture list,
 and provide little benefit over an additional in-scope local variable.
 
-* The use of `mutable` lambda expressions is forbidden because there don't
+The use of `mutable` lambda expressions is forbidden because there don't
 seem to be many, if any, good use-cases for them in HotSpot.  A lambda
 expression needs to be mutable in order to modify a by-value captured value.
 But with only downward lambdas, such usage seems likely to be rare and
@@ -1271,12 +1062,21 @@ Do not use _inheriting constructors_
 C++11 provides simple syntax allowing a class to inherit the constructors of a
 base class.  Unfortunately there are a number of problems with the original
 specification, and C++17 contains significant revisions ([p0136r1] opens with
-a list of 8 Core Issues). Although those issues have been addressed, the
-benefits from this feature are small compared to the complexity. Because of
-this, HotSpot code must not use inherited constructors.
+a list of 8 Core Issues).  Since HotSpot doesn't support use of C++17, use of
+inherited constructors could run into those problems. Such uses might also
+change behavior in a future HotSpot update to use C++17 or later, potentially
+in subtle ways that could lead to hard to diagnose problems.  Because of this,
+HotSpot code must not use inherited constructors.
 
-[p0136r1]: http:/wg21.link/p0136r1 "p0136r1"
-[p0195r0](http://wg21.link/p0195r0)
+Note that gcc7 provides the `-fnew-inheriting-ctors` option to use the
+[p0136r1] semantics.  This is enabled by default when using C++17 or later.
+It is also enabled by default for `fabi-version=11` (introduced by gcc7) or
+higher when using C++11/14, as the change is considered a Defect Report that
+applies to those versions.  Earlier versions of gcc don't have that option,
+and other supported compilers may not have anything similar.
+
+[p0136r1]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0136r1.html
+  "p0136r1"
 
 ### Attributes
 
@@ -1295,160 +1095,15 @@ preferred location.
 function's declaration, rather than between the function name and the parameter
 list.
 
-[p0068r0](http://wg21.link/p0068r0) is the initial proposal for the attributes
-added by C++17.)
-
 Only the following attributes are permitted:
 
 * `[[noreturn]]`
-* `[[nodiscard]]` ([p0189r1](http://wg21.link/p0189r1))
-* `[[maybe_unused]]` ([p0212r1](http://wg21.link/p0212r1))
-* `[[fallthrough]]` ([p0188r1](http://wg21.link/p0188))
 
 The following attributes are expressly forbidden:
 
 * `[[carries_dependency]]` - Related to `memory_order_consume`.
 * `[[deprecated]]` - Not relevant in HotSpot code.
 
-Direct use of non-standard (and presumably scoped) attributes in shared code
-is also forbidden. Using such would depend on the C++17 feature that an
-attribute not recognized by the implementation is ignored
-([p0283r2](http://wg21.link/p0283r2)). If such an attribute is needed in
-shared code, the well-established technique of providing an `ATTRIBUTE_XXX`
-macro with per-compiler definitions (sometimes empty) should be
-used. Compilers may warn about unrecognized attributes (whether by name or by
-location), in order to report typos or misuse. Disabling such warnings
-globally would not be desirable.
-
-The use of `using` directives in attribute lists is also forbidden.
-([p0028r0](http://wg21.link/p0028r0))
-([p0028r4](http://wg21.link/p0028r4))
-We don't generally use scoped attributes in attribute lists with other
-attributes. Rather, uses of scoped attributes (which are implementation
-defined) are generally hidden behind a portability macro that includes the
-surrounding brackets.
-
-### noexcept
-
-Use of `noexcept` exception specifications
-([n3050](http://wg21.link/n3050))
-are permitted with restrictions described below.
-
-* Only the argument-less form of `noexcept` exception specifications are
-permitted.
-* Allocation functions that may return `nullptr` to indicate allocation
-failure must be declared `noexcept`.
-* All other uses of `noexcept` exception specifications are forbidden.
-* `noexcept` expressions are forbidden.
-* Dynamic exception specifications are forbidden.
-
-HotSpot is built with exceptions disabled, e.g. compile with `-fno-exceptions`
-(gcc, clang) or no `/EH` option (MSVC++). So why do we need to consider
-`noexcept` at all? It's because `noexcept` exception specifications serve two
-distinct purposes.
-
-The first is to allow the compiler to avoid generating code or data in support
-of exceptions being thrown by a function. But this is unnecessary, because
-exceptions are disabled.
-
-The second is to allow the compiler and library code to choose different
-algorithms, depending on whether some function may throw exceptions. This is
-only relevant to a certain set of functions.
-
-* Some allocation functions (`operator new` and `operator new[]`) return
-`nullptr` to indicate allocation failure. If a `new` expression calls such an
-allocation function, it must check for and handle that possibility. Declaring
-such a function `noexcept` informs the compiler that `nullptr` is a possible
-result. If an allocation function is not declared `noexcept` then the compiler
-may elide that checking and handling for a `new` expression calling that
-function.
-
-* Certain Standard Library facilities (notably containers) provide different
-guarantees for some operations (and may choose different algorithms to
-implement those operations), depending on whether certain functions
-(constructors, copy/move operations, swap) are nothrow or not. They detect
-this using type traits that test whether a function is declared `noexcept`.
-This can have a significant performance impact if, for example, copying is
-chosen over a potentially throwing move. But this isn't relevant, since
-HotSpot forbids the use of most Standard Library facilities.
-
-HotSpot code can assume no exceptions will ever be thrown, even from functions
-not declared `noexcept`. So HotSpot code doesn't ever need to check, either
-with conditional exception specifications or with `noexcept` expressions.
-
-The exception specification is part of the type of a function
-([p0012r1](http://wg21.link/p0012r1). This likely has little impact on HotSpot
-code, since the use of `noexcept` is expected to be rare.
-
-Dynamic exception specifications were deprecated in C++11. C++17 removed all
-but `throw()`, with that remaining a deprecated equivalent to `noexcept`.
-
-### Enhanced selection statements
-
-C++17 modified the _condition_ part of `if` and `switch` statements, permitting
-an _init-statement_ to be included
-([p0305r1](http://wg21.link/p0305r1)).
-
-Use of this feature is permitted. (However, complex uses may interfere with
-readability.) Limiting the scope of a variable involved in the condition,
-while also making the value available to the statement's body, can improve
-readability. The alternative method of scope-limiting by introducing a nested
-scope isn't very popular and is rarely used.
-
-This new syntax is in addition to the _condition_ being a declaration with a
-_brace-or-equal-initializer_. For an `if` statement this new sytax gains that
-benefit without violating the long-standing guidance against using
-[implicit conversions to `bool`](#avoid-implicit-conversions-to-bool),
-which still stands.
-
-For example, uses of Unified Logging sometimes explicitly check whether a
-`LogTarget` is enabled.  Instead of
-```
-  LogTarget(...) lt;
-  if (lt.is_enabled()) {
-    LogStream log(lt);
-    ... use log ...
-  }
-  ... lt is accessible but probably not needed here ...
-```
-using this feature one could write
-```
-  if (LogTarget(...) lt; lt.is_enabled()) {
-    LogStream log(lt);
-    ... use log ...
-  }
-```
-
-C++17 also added compile-time `if` statements
-([p0292r2](http://wg21.link/p0292r2)). Use of `if constexpr` is
-permitted. This feature can replace and (sometimes vastly) simplify many uses
-of [SFINAE]. The same declaration and initialization guidance for the
-_condition_ part apply here as for ordinary `if` statements.
-
-### Expression Evaluation Order
-
-C++17 tightened up the evaluation order for some kinds of subexpressions
-([p0138r2](http://wg21.link/p0138r2)). Note, however, that the Alternate
-Evaluation Order for Function Calls alternative in that paper was adopted,
-rather than the strict left to right order of evaluation for function call
-arguments that was proposed in the main body of the paper.
-
-The primary purpose of this change seems to be to make certain kinds of call
-chaining well defined. That's not a style widely used in HotSpot. In general
-it is better to continue to avoid questions in this area by isolating
-operations with side effects from other statements. In particular, continue to
-avoid modifying a value in an expression where it is also used.
-
-### Compatibility with C11
-
-C++17 refers to C11 rather than C99. This means that C11 libraries and
-functions may be used in HotSpot. There may be limitations because of
-differing levels of compatibility among various compilers and versions of
-those compilers.
-
-Note that the C parts of the JDK have been built with C11 selected for some
-time ([JDK-8292008](https://bugs.openjdk.org/browse/JDK-8292008)).
-
 ### Additional Permitted Features
 
 * `alignof`
@@ -1466,10 +1121,7 @@ time ([JDK-8292008](https://bugs.openjdk.org/browse/JDK-8292008)).
 ([n2555](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2555.pdf))
 
 * Static assertions
-([n1720](http://wg21.link/n1720))
-([n3928](http://wg21.link/n3928))<br>
-Both the original (C++11) two-argument form and the new (C++17)
-single-argument form are permitted.
+([n1720](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2004/n1720.html))
 
 * `decltype`
 ([n2343](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2343.pdf))
@@ -1516,72 +1168,7 @@ single-argument form are permitted.
 * Unrestricted Unions
 ([n2544](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2544.pdf))
 
-* Preprocessor Condition `__has_include`
-([p0061r0](http://wg21.link/p0061r0))
-([p0061r1](http://wg21.link/p0061r1))
-
-* Hexadecimal Floating-Point Literals
-([p0245r1](http://wg21.link/p0245r1))
-
-* Construction Rules for `enum class` Values
-([p0138r2](http://wg21.link/p0138r2))
-
-* Allow `typename` in template template parameter
-([n4051](http://wg21.link/n4051)) &mdash; template template parameters are
-barely used (if at all) in HotSpot, but there's no reason to artificially
-disallow this syntactic regularization in any such uses.
-
-## Excluded Features
-
-### Structured Bindings
-
-The use of structured bindings [p0217r3](http://wg21.link/p0217r3) is
-forbidden.  Preferred approaches for handling functions with multiple return
-values include
-
-* Return a named class/struct intended for that purpose, with named and typed
-members/accessors.
-
-* Return a value along with out parameters (usually pointers, sometimes
-references).
-
-* Designate a sentinel "failure" value in the normal return value type, with
-some out of band location for additional information.  For example, this is
-the model typically used with `errno`, where a function returns a normal
-result, or -1 to indicate an error, with additional error information in
-`errno`.
-
-There is a strong preference for names and explicit types, as opposed to
-offsets and implicit types. For example, there are folks who strongly dislike
-that some of the Standard Library functions return `std::pair` because `first`
-and `second` members don't carry any useful information.
-
-### File System Library
-
-The use of the File System library is forbidden. HotSpot doesn't do very much
-with files, and already has adequate mechanisms for its needs. Rewriting in
-terms of this new library doesn't provide any obviously significant
-benefits. Having a mix of the existing usage and uses of this new library
-would be confusing.
-
-[n4100](http://wg21.link/n4100)
-[p0218r0](http://wg21.link/p0218r0)
-[p0219r1](http://wg21.link/p0219r1)
-[p0317r1](http://wg21.link/p0317r1)
-[p0392r0](http://wg21.link/p0392r0)
-[p0430r2](http://wg21.link/p0430r2)
-[p0492r2](http://wg21.link/p0492r2)
-[p1164r1](http://wg21.link/p1164r1)
-
-### Aggregate Extensions
-
-Aggregates with base classes are forbidden. C++17 allows aggregate
-initialization for classes with base classes
-([p0017r1](https://wg21.link/p0017r1)). HotSpot makes very little use of
-aggregate classes, preferring explicit constructors even for very simple
-classes.
-
-### Additional Excluded Features
+### Excluded Features
 
 * New string and character literals
     * New character types
@@ -1612,279 +1199,39 @@ namespace std;` to avoid needing to qualify Standard Library names.
 ([n2179](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2179.html)) &mdash;
 HotSpot does not permit the use of exceptions, so this feature isn't useful.
 
+* Avoid non-local variables with non-constexpr initialization.
+In particular, avoid variables with types requiring non-trivial
+initialization or destruction.  Initialization order problems can be
+difficult to deal with and lead to surprises, as can destruction
+ordering.  HotSpot doesn't generally try to cleanup on exit, and
+running destructors at exit can also lead to problems.
+
 * Avoid most operator overloading, preferring named functions.  When
 operator overloading is used, ensure the semantics conform to the
 normal expected behavior of the operation.
 
 * Avoid most implicit conversion constructors and (implicit or explicit)
-conversion operators.  Conversion to `bool` operators aren't needed
-because of the
-[no implicit boolean](#avoid-implicit-conversions-to-bool)
-guideline.)
+conversion operators.  (Note that conversion to `bool` isn't needed
+in HotSpot code because of the "no implicit boolean" guideline.)
 
 * Avoid `goto` statements.
 
-* Attributes for namespaces and enumerators
-([n4266](http://wg21.link/n4266) &mdash;
-The only applicable attribute is [`[[deprecated]]`](#attributes), which is
-forbidden.
-
-* Variadic `using` declarations
-([p0195r2](http://wg21.link/p0195r2))
-
-* `std::variant<>`
-([p0088r3](http://wg21.link/p0088r3)) &mdash;
-Even if more of the C++ Standard Library is permitted, this class will remain
-forbidded. Invalid accesses are indicated by throwing exceptions.
-
-* `std::any`
-([p0220r1](http://wg21.link/p0220r1)) &mdash;
-Even if more of the C++ Standard Library is permitted, this class will remain
-forbidden. It may require allocation, and always uses the standard
-allocator. It requires [RTTI].
-
-* `std::as_const()`
-([p0007r1](http://wg21.link/p0007r1)) &mdash;
-If sufficiently useful, HotSpot could add such a function. It would likely be
-added to globalDefinitions.hpp, where there are already some similar small
-utilities.
-
-* `std::clamp()`
-([p002501](http://wg21.link/p002501)) &mdash;
-This function is already provided in globalDefinitions.hpp.
-
-* Parallel STL Algorithms
-([p0024r2](http://wg21.link/p0024r2)) &mdash;
-Even if more of the C++ Standard Library is permitted, these will remain
-forbidden. They are built on the standard C++ threading mechanisms. HotSpot
-doesn't use those mechanisms, instead providing and using its own.
-
-* Cache Line Sizes
-[p0154r1](http://wg21.link/p0154r1) &mdash;
-HotSpot has its own mechanisms for this, using values like
-`DEFAULT_CACHE_LINE_SIZE`. The platform-specific implementation of the HotSpot
-mechanisms might use these library functions, but there is no reason to move
-away from the current approach. Quoting from [JOSUTTIS]: "... if you know better,
-use specific values, but using these values is better than any assumed fixed
-size for code supporting multiple platforms."
-
-* `register` storage class removal
-[p0001r1](http://wg21.link/p0001r1) &mdash;
-The `register` storage class has been removed. `register` is still a keyword,
-so still can't be used for normal purposes. Also, this doesn't affect the use
-of `register` for gcc-style extended asm code; that's a different syntactic
-element with a different meaning.
-
-* Value of `__cplusplus` &mdash;
-Testing whether `__cplusplus` is defined or not is permitted, and indeed
-required. But the value should not need to be examined. The value is changed
-with each revision of the Standard. But we build HotSpot and (most of) the
-rest of the JDK with a specifically selected version of the Standard. The
-value of `__cplusplus` should be known and unchanging until we change the
-project's build configuration again. So examining the value shouldn't ever be
-necessary.
-
-* Removal of `++` for `bool`
-([p0003r1](http://wg21.link/p0003r1))
-
-* Removal of trigraphs
-([n4086](http://wg21.link/n4086))
-
-## Undecided Features
+### Undecided Features
 
 This list is incomplete; it serves to explicitly call out some
 features that have not yet been discussed.
 
-Some features are undecided (so implicitly forbidden) because we don't expect
-to use them at all. This might be reconsidered if someone finds a good use
-case.
+* Trailing return type syntax for functions
+([n2541](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2541.htm))
 
-Some Standard Library features are undecided (so implicitly forbidden)
-because, while this Style Guide forbids the use of such, they may be
-sufficiently useful that we want to permit them anyway. Doing so may require
-some idiomatic mechanism for addressing things like `assert` incompatibility,
-incompatibility with HotSpot's `FORBID_C_FUNCTION` mechanism, and the like.
-
-### std::optional<>
-
-It is undecided whether to permit the use of `std::optional<>`
-([p0220r1](http://wg21.link/p0220r1)). It may be sufficiently useful that it
-should be permitted despite the usual prohibition against using Standard
-Library facilities. Use of the `value()` member function must be forbidden, as
-it reports an invalid access by throwing an exception.
-
-### std::byte
-
-It is undecided whether to permit the use of the `std::byte` type
-([p0298r3](http://wg21.link/p0298r3)). It may be sufficiently useful that it
-should be permitted despite the usual prohibition against using Standard
-Library facilities.
-
-It has been suggested that changing the HotSpot `address` type to use
-`std::byte` has some benefits. That is, replace
-```
-typedef u_char*       address;
-typedef const u_char* const_address;
-```
-```
-using address       = std::byte*;
-using const_address = const std::byte*;
-```
-in globalDefinitions.hpp.
-
-A specific benefit that was mentioned is that it might improve the horrible
-way that gdb handles our current definition of the `address` type.
-```
-#include <cstddef>
-
-typedef unsigned char* address;
-typedef std::byte* address_b;
-
-int main() {
-
-  char* mem;
-
-  address addr = (address)mem;
-  address_b addr_b = (address_b)mem;
-
-  return 0;
-}
-```
-
-```
-(gdb) p addr
-$1 = (address) 0x7ffff7fe4fa0 <dl_main> "\363\017\036\372Uf\017\357\300H\211\345AWI\211\377AVAUATSH\201\354\210\002"
-(gdb) p addr_b
-$2 = (address_b) 0x7ffff7fe4fa0 <dl_main>
-```
-
-This needs to be explored. Some folks have said they will do so.
-
-### String Views
-
-It is undecided whether to permit the use of `std::string_view`
-([p0220r1](http://wg21.link/p0220r1)).
-
-HotSpot doesn't use `std::string`, but uses `char*` strings a lot. Wrapping
-such in a `std::string_view` to enable the use of various algorithms could be
-useful. But since HotSpot also doesn't permit use of `<algorithm>` and the
-like, that only gets the limited set of algorithms provided by the view class
-directly.
-
-There is also the issue of `NUL` termination; string views are not necessarily
-`NUL` terminated. Moreover, if one goes to the work of making one that is
-`NUL` terminated, that terminator is included in the size.
-
-There are other caveats. Permitting use of string views would require
-discussion of those.
-
-### Substring and Subsequence Searching
-
-In addition to simple substring searching, the Standard Library now includes
-Boyer-Moore and Boyer-Moore-Horspool searchers, in case someone wants to
-search really large texts. That seems an unlikely use-case for HotSpot.  See
-[p0220r1](http://wg21.link/p0220r1).
-
-### `new` and `delete` with Over-Aligned Data
-
-It is undecided whether to permit the use of dynamic allocation of overaligned
-types ([n3396](http://wg21.link/n3396)).
-
-HotSpot currently only has a couple of over-aligned types that are dynamically
-allocated. These are handled manually, not going through `new` expressions, as
-that couldn't work before C++17.
-
-One of the ways an over-aligned type might arise is by aligning a data member.
-This might be done to avoid destructive interference for concurrent accesses.
-But HotSpot uses a different approach, using explicit padding. Again, this is
-in part because `new` and `delete` of overaligned types didn't work. But we
-might prefer to continue this approach.
-
-We would need to add `operator new` overloads to `CHeapObj<>` and possibly in
-other places in order to support this. However, it has been suggested that
-implementing it (efficiently) on top of NMT might be difficult. Note that
-`posix_memalign` / `_aligned_malloc` don't help here, because of NMT's use of
-malloc headers.
-
-If we don't support it we may want to add `operator new` overloads that are
-deleted, to prevent attempted uses.
-
-Alignment usage in non-HotSpot parts of the OpenJDK:
-
-* `alignas` used once in harfbuzz, to align a variable.
-
-* libpipewire has `#define SPA_ALIGNED` macro using gcc `aligned` attribute,
-but doesn't use it.
-
-* libsleef has `#define ALIGNED` macro using gcc `aligned` attribute. It is
-not used for class or member declarations.
-
-### `std::to_chars()` and `std::from_chars`
-
-It is undecided whether to permit the use of `std::to_chars()` and
-`std::from_chars()` ([p0067r5](http://wg21.link/p0067r5)).
-
-These functions provide low-level conversions between character sequences and
-numeric values. This seems like a good candidate for use in HotSpot,
-potentially replacing various clumsy or less performant alternatives. There is
-no memory allocation. Parsing failures are indicated via error codes rather
-than exceptions. Various other nice for HotSpot properties.
-
-Note that the published C++17 Standard puts these in `<utility>`, but a defect
-report moved them to `<charconv>`. This also needs `<system_error>`.
-
-This would require upgrading the minimum gcc version to 11.1 for floating
-point conversion support. The minimum Visual Studio version is already
-sufficient.  The minimum clang version requirement hasn't been determined yet.
-
-### `std::launder()`
-
-It is undecided whether to permit the use of `std::launder()`
-([p0137r1](http://wg21.link/p0137r1)).
-
-Change to permitted if we discover a place where we need it. Or maybe we
-should just permit it, but hope we don't need it.
-
-Also, C++20 revised the relevant part of Object Lifetime in a way that seems
-more permissive and with less need of laundering. We don't know if
-implementations of prior versions take advantage of the difference.
-
-See Object Lifetime: C++17 6.8/8, C++20 6.7.3/8
-
-### Additional Undecided Features
+* Variable templates
+([n3651](https://isocpp.org/files/papers/N3651.pdf))
 
 * Member initializers and aggregates
 ([n3653](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3653.html))
 
 * Rvalue references and move semantics
 
-* Shorthand for nested namespaces
-([n4230](http://wg21.link/n4230)) &mdash;
-HotSpot makes very little use of namespaces, so this seemingly innocuous
-feature probably isn't useful to us.
-
-* Direct list initialization with `auto`
-([n3681](http://wg21.link/n3681)) &mdash;
-This change fixed some issues with direct list initialization and `auto`. But
-we don't use that feature much, if at all. And perhaps shouldn't be using it.
-
-* UTF-8 Character Literals
-([n4267](http://wg21.link/n4267)) &mdash;
-Do we have a use-case for this?
-
-* Fold Expressions
-([n4295](http://wg21.link/n4295)) &mdash;
-Provides a simple way to apply operators to a parameter pack. HotSpot doesn't
-use variadic templates very much. That makes it questionable that developers
-should need to know about this feature.  But if someone does come up with a
-good use-case, it's likely that the alternatives are significantly worse,
-because pack manipulation without this can be complicated.
-
-* `std::invoke<>()`
-([n4169](http://wg21.link/n4169))
-
-
-
 [ADL]: https://en.cppreference.com/w/cpp/language/adl
   "Argument Dependent Lookup"
 
@@ -1902,6 +1249,3 @@ because pack manipulation without this can be complicated.
 
 [PARTIALAPP]: https://en.wikipedia.org/wiki/Partial_application
   "Partial Application"
-
-[JOSUTTIS]: https://www.cppstd17.com
-  "C++17: The Complete Guide"

doc/starting-next-release.html

@@ -11,8 +11,11 @@
     div.columns{display: flex; gap: min(4vw, 1.5em);}
     div.column{flex: auto; overflow-x: auto;}
     div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
-    ul.task-list{list-style: none;}
+    /* The extra [class] is a hack that increases specificity enough to
+       override a similar rule in reveal.js */
+    ul.task-list[class]{list-style: none;}
     ul.task-list li input[type="checkbox"] {
+      font-size: inherit;
       width: 0.8em;
       margin: 0 0.8em 0.2em -1.6em;
       vertical-align: middle;

doc/testing.html

@@ -72,9 +72,11 @@ id="toc-notes-for-specific-tests">Notes for Specific Tests</a>
 <li><a href="#non-us-locale" id="toc-non-us-locale">Non-US
 locale</a></li>
 <li><a href="#pkcs11-tests" id="toc-pkcs11-tests">PKCS11 Tests</a></li>
+</ul></li>
 <li><a href="#testing-ahead-of-time-optimizations"
-id="toc-testing-ahead-of-time-optimizations">Testing Ahead-of-time
-Optimizations</a></li>
+id="toc-testing-ahead-of-time-optimizations">### Testing Ahead-of-time
+Optimizations</a>
+<ul>
 <li><a href="#testing-with-alternative-security-providers"
 id="toc-testing-with-alternative-security-providers">Testing with
 alternative security providers</a></li>
@@ -398,8 +400,7 @@ TEST_OPTS keywords.</p>
 <h4 id="jobs">JOBS</h4>
 <p>Currently only applies to JTReg.</p>
 <h4 id="timeout_factor">TIMEOUT_FACTOR</h4>
-<p>Currently only applies to <a href="#timeout_factor-1">JTReg
--timeoutFactor</a>.</p>
+<p>Currently only applies to JTReg.</p>
 <h4 id="java_options">JAVA_OPTIONS</h4>
 <p>Applies to JTReg, GTest and Micro.</p>
 <h4 id="vm_options">VM_OPTIONS</h4>
@@ -434,9 +435,6 @@ the diff between the specified revision and the repository tip.</p>
 <p>The report is stored in
 <code>build/$BUILD/test-results/jcov-output/diff_coverage_report</code>
 file.</p>
-<h4 id="aot_jdk">AOT_JDK</h4>
-<p>See <a href="#testing-ahead-of-time-optimizations">Testing
-Ahead-of-time optimizations</a>.</p>
 <h3 id="jtreg-keywords">JTReg keywords</h3>
 <h4 id="jobs-1">JOBS</h4>
 <p>The test concurrency (<code>-concurrency</code>).</p>
@@ -445,12 +443,8 @@ otherwise it defaults to JOBS, except for Hotspot, where the default is
 <em>number of CPU cores/2</em>, but never more than <em>memory size in
 GB/2</em>.</p>
 <h4 id="timeout_factor-1">TIMEOUT_FACTOR</h4>
-<p>The <code>TIMEOUT_FACTOR</code> is forwarded to JTReg framework
-itself (<code>-timeoutFactor</code>). Also, some test cases that
-programmatically wait a certain amount of time will apply this factor.
-If we run in forced compilation mode (<code>-Xcomp</code>), the build
-system will automatically adjust this factor to compensate for less
-performance. Defaults to 1.</p>
+<p>The timeout factor (<code>-timeoutFactor</code>).</p>
+<p>Defaults to 4.</p>
 <h4 id="failure_handler_timeout">FAILURE_HANDLER_TIMEOUT</h4>
 <p>Sets the argument <code>-timeoutHandlerTimeout</code> for JTReg. The
 default value is 0. This is only valid if the failure handler is
@@ -463,12 +457,6 @@ class, named Virtual, is currently part of the JDK build in the
 <code>test/jtreg_test_thread_factory/</code> directory. This class gets
 compiled during the test image build. The implementation of the Virtual
 class creates a new virtual thread for executing each test class.</p>
-<h4 id="jvmti_stress_agent">JVMTI_STRESS_AGENT</h4>
-<p>Executes JTReg tests with JVM TI stress agent. The stress agent is
-the part of test library and located in
-<code>test/lib/jdk/test/lib/jvmti/libJvmtiStressAgent.cpp</code>. The
-value of this argument is set as JVM TI agent options. This mode uses
-ProblemList-jvmti-stress-agent.txt as an additional exclude list.</p>
 <h4 id="test_mode">TEST_MODE</h4>
 <p>The test mode (<code>agentvm</code> or <code>othervm</code>).</p>
 <p>Defaults to <code>agentvm</code>.</p>
@@ -568,12 +556,6 @@ each fork. Same as specifying <code>-wi &lt;num&gt;</code>.</p>
 same values as <code>-rff</code>, i.e., <code>text</code>,
 <code>csv</code>, <code>scsv</code>, <code>json</code>, or
 <code>latex</code>.</p>
-<h4 id="test_jdk">TEST_JDK</h4>
-<p>The path to the JDK that will be used to run the benchmarks.</p>
-<p>Defaults to <code>build/&lt;CONF-NAME&gt;/jdk</code>.</p>
-<h4 id="benchmarks_jar">BENCHMARKS_JAR</h4>
-<p>The path to the JAR containing the benchmarks.</p>
-<p>Defaults to <code>test/micro/benchmarks.jar</code>.</p>
 <h4 id="vm_options-2">VM_OPTIONS</h4>
 <p>Additional VM arguments to provide to forked off VMs. Same as
 <code>-jvmArgs &lt;args&gt;</code></p>
@@ -619,8 +601,8 @@ element of the appropriate <code>@Artifact</code> class. (See
     JTREG=&quot;JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs&quot;</code></pre>
 <p>For more notes about the PKCS11 tests, please refer to
 test/jdk/sun/security/pkcs11/README.</p>
-<h3 id="testing-ahead-of-time-optimizations">Testing Ahead-of-time
-Optimizations</h3>
+<h2 id="testing-ahead-of-time-optimizations">### Testing Ahead-of-time
+Optimizations</h2>
 <p>One way to improve test coverage of ahead-of-time (AOT) optimizations
 in the JDK is to run existing jtreg test cases in a special "AOT_JDK"
 mode. Example:</p>

doc/testing.md

@@ -324,7 +324,7 @@ Currently only applies to JTReg.
 
 #### TIMEOUT_FACTOR
 
-Currently only applies to [JTReg -timeoutFactor](#timeout_factor-1).
+Currently only applies to JTReg.
 
 #### JAVA_OPTIONS
 
@@ -367,10 +367,6 @@ between the specified revision and the repository tip.
 The report is stored in
 `build/$BUILD/test-results/jcov-output/diff_coverage_report` file.
 
-#### AOT_JDK
-
-See [Testing Ahead-of-time optimizations](#testing-ahead-of-time-optimizations).
-
 ### JTReg keywords
 
 #### JOBS
@@ -383,11 +379,9 @@ never more than *memory size in GB/2*.
 
 #### TIMEOUT_FACTOR
 
-The `TIMEOUT_FACTOR` is forwarded to JTReg framework itself
-(`-timeoutFactor`). Also, some test cases that programmatically wait a
-certain amount of time will apply this factor. If we run in forced
-compilation mode (`-Xcomp`), the build system will automatically
-adjust this factor to compensate for less performance. Defaults to 1.
+The timeout factor (`-timeoutFactor`).
+
+Defaults to 4.
 
 #### FAILURE_HANDLER_TIMEOUT
 
@@ -403,13 +397,6 @@ the `test/jtreg_test_thread_factory/` directory. This class gets compiled
 during the test image build. The implementation of the Virtual class creates a
 new virtual thread for executing each test class.
 
-#### JVMTI_STRESS_AGENT
-
-Executes JTReg tests with JVM TI stress agent. The stress agent is the part of
-test library and located in `test/lib/jdk/test/lib/jvmti/libJvmtiStressAgent.cpp`.
-The value of this argument is set as JVM TI agent options.
-This mode uses ProblemList-jvmti-stress-agent.txt as an additional exclude list.
-
 #### TEST_MODE
 
 The test mode (`agentvm` or `othervm`).
@@ -558,18 +545,6 @@ Amount of time to spend in each warmup iteration. Same as specifying `-w
 Specify to have the test run save a log of the values. Accepts the same values
 as `-rff`, i.e., `text`, `csv`, `scsv`, `json`, or `latex`.
 
-#### TEST_JDK
-
-The path to the JDK that will be used to run the benchmarks.
-
-Defaults to `build/<CONF-NAME>/jdk`.
-
-#### BENCHMARKS_JAR
-
-The path to the JAR containing the benchmarks.
-
-Defaults to `test/micro/benchmarks.jar`.
-
 #### VM_OPTIONS
 
 Additional VM arguments to provide to forked off VMs. Same as `-jvmArgs <args>`
@@ -637,7 +612,7 @@ For more notes about the PKCS11 tests, please refer to
 test/jdk/sun/security/pkcs11/README.
 
 ### Testing Ahead-of-time Optimizations
-
+-------------------------------------------------------------------------------
 One way to improve test coverage of ahead-of-time (AOT) optimizations in
 the JDK is to run existing jtreg test cases in a special "AOT_JDK" mode.
 Example:

jb/branchdiff.py

@@ -1,274 +0,0 @@
-#!/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/generate-wakefield.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-if [[ -z "$1" ]]; then
-	SCANNER=wayland-scanner
-else
-	SCANNER="$1"
-fi
-
-set -ex
-
-"$SCANNER" client-header src/java.desktop/share/native/libwakefield/protocol/wakefield.xml src/java.desktop/unix/native/libawt_wlawt/wakefield-client-protocol.h
-"$SCANNER" private-code src/java.desktop/share/native/libwakefield/protocol/wakefield.xml src/java.desktop/unix/native/libawt_wlawt/wakefield-client-protocol.c

jb/jbr-api.version

@@ -1 +0,0 @@
-1.0.2

jb/jdkdiff.py

@@ -1,230 +0,0 @@
-#!/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/idea-project-files/jdk-clion/.idea/.name

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

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

@@ -1,20 +0,0 @@
-<?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/modules.xml

@@ -1,11 +0,0 @@
-<?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/test.iml" filepath="$PROJECT_DIR$/.idea/test.iml" />
-    </modules>
-  </component>
-</project>
-

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

@@ -1,20 +0,0 @@
-<?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

@@ -1,135 +0,0 @@
-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

@@ -1,53 +0,0 @@
-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.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/common.sh

@@ -1,190 +0,0 @@
-#!/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
-}
-
-DISABLE_WARNINGS_AS_ERRORS=""
-CONTINUOUS_INTEGRATION=""
-while getopts ":iwc?" o; do
-    case "${o}" in
-        i) INC_BUILD=1 ;;
-        w) DISABLE_WARNINGS_AS_ERRORS="--disable-warnings-as-errors" ;;
-        c) CONTINUOUS_INTEGRATION=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
-
-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}']"
-tag_prefix="jdk-"
-OPENJDK_TAG=$(git tag -l | grep "$tag_prefix$JBSDK_VERSION" | grep -v ga | sort -t "-" -k 2 -V -f | tail -n 1)
-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

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

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

@@ -1,185 +0,0 @@
-#!/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 {
-
-  GTK_SHELL_PATH=/gtk-shell.xml
-
-  if [ ! -e $GTK_SHELL_PATH ]; then
-    echo $GTK_SHELL_PATH" does not exist"
-    GTK_SHELL_PATH=`pwd`/gtk-shell.xml
-    if [ ! -e $GTK_SHELL_PATH ]; then
-      echo $GTK_SHELL_PATH" does not exist"
-      curl -O https://raw.githubusercontent.com/GNOME/gtk/refs/heads/main/gdk/wayland/protocol/gtk-shell.xml
-    fi
-  fi
-
-  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 \
-    --with-gtk-shell1-protocol=$GTK_SHELL_PATH \
-    --with-vulkan \
-    $DISABLE_WARNINGS_AS_ERRORS \
-    $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=''
-  __cds_opt=''
-
-  if is_musl; then libc_type_suffix='musl-' ; fi
-  __cds_opt="--generate-cds-archive"
-
-  [ "$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 \
-    $__cds_opt --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
-    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
-  [ -f "$IMAGES_DIR"/"$__root_dir"/lib/cef_server ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/cef_server
-
-  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" ]; 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" == "$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 CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
-    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

@@ -1,210 +0,0 @@
-#!/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 {
-  if is_musl; then
-    LINUX_TARGET=""
-  else
-    LINUX_TARGET="\
-      --build=x86_64-unknown-linux-gnu \
-      --openjdk-target=x86_64-unknown-linux-gnu"
-  fi
-
-  GTK_SHELL_PATH=/gtk-shell.xml
-
-  if [ ! -e $GTK_SHELL_PATH ]; then
-    echo $GTK_SHELL_PATH" does not exist"
-    GTK_SHELL_PATH=`pwd`/gtk-shell.xml
-    if [ ! -e $GTK_SHELL_PATH ]; then
-      echo $GTK_SHELL_PATH" does not exist"
-      curl -O https://raw.githubusercontent.com/GNOME/gtk/refs/heads/main/gdk/wayland/protocol/gtk-shell.xml
-    fi
-  fi
-
-  if [ -n "${JCEF_BUILD_LEGACY:-}" ]; then
-    WITH_VULKAN=""
-  else
-    WITH_VULKAN="--with-vulkan"
-  fi
-
-  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 \
-    --with-gtk-shell1-protocol=$GTK_SHELL_PATH \
-    $WITH_VULKAN \
-    $LINUX_TARGET \
-    $DISABLE_WARNINGS_AS_ERRORS \
-    $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=''
-  __cds_opt=''
-
-  if is_musl; then
-    libc_type_suffix='musl-'
-  else
-    LINUX_TARGET="\
-      --build=x86_64-unknown-linux-gnu \
-      --openjdk-target=x86_64-unknown-linux-gnu"
-  fi
-  __cds_opt="--generate-cds-archive"
-
-  [ "$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 \
-    $__cds_opt --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
-    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
-  if [ ! -n "${JCEF_BUILD_LEGACY:-}" ]; then
-    [ -f "$IMAGES_DIR"/"$__root_dir"/lib/cef_server ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/cef_server
-  fi
-
-  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" ]; 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" == "$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 CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
-    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

@@ -1,146 +0,0 @@
-#!/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 \
-    $DISABLE_WARNINGS_AS_ERRORS \
-    $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=''
-  __cds_opt=''
-
-  if is_musl; then libc_type_suffix='musl-' ; fi
-  __cds_opt="--generate-cds-archive"
-
-  [ "$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 \
-    $__cds_opt --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
-    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 CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
-    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

@@ -1,63 +0,0 @@
-#!/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
-    
-    max_attempts=3
-    attempt=1
-    while [ $attempt -le $max_attempts ]; do
-      if "$JETSIGN_CLIENT" -log-format text -max-wait 1m -denoted-content-type "$contentType" -extensions "$jetSignExtensions" "$pathToBeSigned"; then
-        break
-      else
-        if [ $attempt -eq $max_attempts ]; then
-          echo "Failed to sign after $max_attempts attempts"
-          exit 1
-        fi
-        echo "Attempt $attempt failed, retrying in 5 seconds..."
-        sleep 5
-        ((attempt++))
-      fi
-    done
-
-    # 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

@@ -1,16 +0,0 @@
-<?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/entitlements_jcef.xml

@@ -1,16 +0,0 @@
-<?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>
-        <false/>
-        <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-        <false/>
-        <key>com.apple.security.cs.allow-dyld-environment-variables</key>
-        <false/>
-        <key>com.apple.security.cs.disable-library-validation</key>
-        <false/>
-        <key>com.apple.security.cs.disable-executable-page-protection</key>
-        <false/>
-    </dict>
-</plist>

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

@@ -1,63 +0,0 @@
-#!/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

@@ -1,192 +0,0 @@
-#!/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)}
-XCODE_PATH=${XCODE_PATH:-}
-if [ -d "$XCODE_PATH" ]; then
-  WITH_XCODE_PATH="--with-xcode-path=$XCODE_PATH"
-else
-  if [ -z "${CONTINUOUS_INTEGRATION:-}" ]; then
-    WITH_XCODE_PATH=""
-    if [ -n "${XCODE_PATH}" ]; then
-      echo "XCode not found in the directory: ${XCODE_PATH}"
-      echo "default XCode will be used"
-    fi
-  else
-    if [ -z "${XCODE_PATH}" ]; then
-      echo "specify XCode via setting XCODE_PATH"
-    else
-      echo "XCode not found in the directory: ${XCODE_PATH}"
-    fi
-    do_exit 1
-  fi
-fi
-
-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 \
-    $DISABLE_WARNINGS_AS_ERRORS \
-    $STATIC_CONF_ARGS \
-    $REPRODUCIBLE_BUILD_OPTS \
-    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
-    $WITH_XCODE_PATH \
-    || do_exit $?
-}
-
-function create_image_bundle {
-  __bundle_name=$1
-  __arch_name=$2
-  __modules_path=$3
-  __modules=$4
-
-  fastdebug_infix=''
-  __cds_opt=''
-  __cds_opt="--generate-cds-archive"
-
-  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 \
-    $__cds_opt --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
-    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
-  if [ "$bundle_type" == "jcef" ]; 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
-  fi
-
-  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" == "$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 CONF=$RELEASE_NAME JBR_API_JBR_VERSION=TEST || do_exit $?
-    [ -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

@@ -1,63 +0,0 @@
-#!/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 --wait| tee "notarytool.submit.out"
-REQUEST_ID="$(grep -e " id: " "notarytool.submit.out" | grep -oE '([0-9a-f-]{36})'| head -n1)"
-
-waitOutput=$(xcrun notarytool wait "$REQUEST_ID" --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}" --timeout 6h)
-if [ $? -ne 0 ]; then
-  log "Notarizing failed (wait command)"
-  echo "$waitOutput"
-  exit 1
-else
-  echo "$waitOutput"
-fi
-
-logOutout=$(xcrun notarytool log  "$REQUEST_ID" --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}" developer_log.json)
-if [ $? -ne 0 ]; then
-  log "Notarizing failed (log command)"
-  echo "$logOutout"
-  exit 1
-else
-  echo "$logOutout"
-fi
-
-infoOUtput=$(xcrun notarytool info "$REQUEST_ID" --key tmp_key --key-id "${APPLE_KEY_ID}" --issuer "${APPLE_ISSUER_ID}")
-if [ $? -ne 0 ]; then
-  log "Notarizing failed (info command)"
-  echo "$infoOUtput"
-  exit 1
-else
-  echo "$infoOUtput"
-fi
-
-log "Notarizing finished"

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

@@ -1,41 +0,0 @@
-#!/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

@@ -1,241 +0,0 @@
-#!/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"; 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 sh -c '"$1" --timestamp -v -s "$2" --options=runtime --force --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements.xml" {} \;
-  fi
-done
-
-log "Signing JCEF libraries and executables..."
-if [ -d "$APPLICATION_PATH/Contents/Frameworks" ]; then
-  find "$APPLICATION_PATH/Contents/Frameworks" \
-    -type f \( -name "*.dylib" -o -perm +111 \) \
-    -exec sh -c '"$1" --timestamp -v -s "$2" --options=runtime --force --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements_jcef.xml" {} \;
-fi
-
-log "Signing jmod files"
-JMODS_DIR="$APPLICATION_PATH/Contents/Home/jmods"
-JMOD_EXE="$APPLICATION_PATH/Contents/Home/bin/jmod"
-if [ -d "$JMODS_DIR" ]; then
-  log "processing jmods"
-
-  for jmod_file in "$JMODS_DIR"/*.jmod; do
-    log "Processing $jmod_file"
-
-    TMP_DIR="$JMODS_DIR/tmp"
-    rm -rf "$TMP_DIR"
-    mkdir "$TMP_DIR"
-
-    log "Unzipping $jmod_file"
-    $JMOD_EXE extract --dir "$TMP_DIR" "$jmod_file" >/dev/null
-
-    log "Signing dylibs in $TMP_DIR"
-    find "$TMP_DIR" \
-      -type f \( -name "*.dylib" -o -name "*.so"-o -perm +111 -o -name jarsigner -o -name jnativescan -o -name jdeps -o -name jpackageapplauncher -o -name jspawnhelper -o -name jar -o -name javap -o -name jdeprscan -o -name jfr -o -name rmiregistry -o -name java -o -name jhsdb  -o -name jstatd  -o -name jstatd -o -name jpackage -o -name keytool -o -name jmod -o -name jlink -o -name jimage -o -name jstack -o -name jcmd -o -name jps -o -name jmap -o -name jstat -o -name jinfo -o -name jshell -o -name jwebserver -o -name javac -o -name serialver -o -name jrunscript -o -name jdb -o -name jconsole -o -name javadoc \) \
-      -exec sh -c '"$1" --timestamp -v -s "$2" --options=runtime --force --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements.xml" {} \;
-
-    log "Removing $jmod_file"
-    rm -f "$jmod_file"
-    cmd="$JMOD_EXE create --class-path $TMP_DIR/classes"
-
-    # Check each directory and add to the command if it exists
-    [ -d "$TMP_DIR/bin" ] && cmd="$cmd --cmds $TMP_DIR/bin"
-    [ -d "$TMP_DIR/conf" ] && cmd="$cmd --config $TMP_DIR/conf"
-    [ -d "$TMP_DIR/lib" ] && cmd="$cmd --libs $TMP_DIR/lib"
-    [ -d "$TMP_DIR/include" ] && cmd="$cmd --header-files $TMP_DIR/include"
-    [ -d "$TMP_DIR/legal" ] && cmd="$cmd --legal-notices $TMP_DIR/legal"
-    [ -d "$TMP_DIR/man" ] && cmd="$cmd --man-pages $TMP_DIR/man"
-
-    log "Creating jmod file"
-		log "$cmd"
-    # Add the output file
-    cmd="$cmd $jmod_file"
-
-    # Execute the command
-    eval $cmd
-
-    log "Removing $TMP_DIR"
-    rm -rf "$TMP_DIR"
-  done
-
-  log "Repack java.base.jmod with new hashes of modules"
-  hash_modules=$($JMOD_EXE describe $JMODS_DIR/java.base.jmod | grep hashes | awk '{print $2}' | tr '\n' '|' | sed s/\|$//) || exit $?
-
-  TMP_DIR="$JMODS_DIR/tmp"
-  rm -rf "$TMP_DIR"
-  mkdir "$TMP_DIR"
-
-  jmod_file="$JMODS_DIR/java.base.jmod"
-  log "Unzipping $jmod_file"
-  $JMOD_EXE extract --dir "$TMP_DIR" "$jmod_file" >/dev/null
-
-  log "Removing java.base.jmod"
-  rm -f "$jmod_file"
-
-  cmd="$JMOD_EXE create --class-path $TMP_DIR/classes --hash-modules \"$hash_modules\" --module-path $JMODS_DIR"
-
-  # Check each directory and add to the command if it exists
-  [ -d "$TMP_DIR/bin" ] && cmd="$cmd --cmds $TMP_DIR/bin"
-  [ -d "$TMP_DIR/conf" ] && cmd="$cmd --config $TMP_DIR/conf"
-  [ -d "$TMP_DIR/lib" ] && cmd="$cmd --libs $TMP_DIR/lib"
-  [ -d "$TMP_DIR/include" ] && cmd="$cmd --header-files $TMP_DIR/include"
-  [ -d "$TMP_DIR/legal" ] && cmd="$cmd --legal-notices $TMP_DIR/legal"
-  [ -d "$TMP_DIR/man" ] && cmd="$cmd --man-pages $TMP_DIR/man"
-
-  log "Creating jmod file"
-	log "$cmd"
-  # Add the output file
-  cmd="$cmd $jmod_file"
-
-  # Execute the command
-  eval $cmd
-
-  log "Removing $TMP_DIR"
-  rm -rf "$TMP_DIR"
-else
-  echo "Directory '$JMODS_DIR' does not exist. Skipping signing of jmod files."
-fi
-
-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 sh -c '"$1" --timestamp --force -v -s "$2" --options=runtime --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$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 sh -c '"$1" --timestamp -v -s "$2" --options=runtime --force --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$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/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_jcef.xml" tmp-to-sign.tar.gz || exit 1
-        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..."
-
-if [ -d "$APPLICATION_PATH/Contents/Frameworks" ]; then
-  find "$APPLICATION_PATH/Contents/Frameworks" -name '*.framework'  -maxdepth 1 | while read -r line
-    do
-      log "Checking '$line':"
-      codesign --verify --deep --strict --verbose=4 "$line"
-    done
-fi
-
-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 || exit 1
-  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" || exit 1
-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

@@ -1,155 +0,0 @@
-#!/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
-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"
-
-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
-mv "$INPUT_FILE" "$INPUT_FILE".origin
-
-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=1
-ec=0
-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=$?
-  ((attempt += 1))
-  if [[ $ec -ne 0 ]]; then
-    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
-  fi
-done
-
-set -e
-
-if [[ $ec -ne 0 ]]; then
-  log "Signing failed, restore original input file"
-  mv "$INPUT_FILE".origin "$INPUT_FILE"
-fi
-
-if [ "$NOTARIZE" = "yes" ]; then
-  log "Notarizing..."
-  "$SCRIPT_DIR/notarize.sh" "$PKG_NAME"
-
-  log "Stapling..."
-  appStaplerOutput=$(xcrun stapler staple "$APPLICATION_PATH")
-  if [ $? -ne 0 ]; then
-    log "Stapling application failed"
-    echo "$appStaplerOutput"
-    exit 1
-  else
-    echo "$appStaplerOutput"
-  fi
-
-  log "Stapling package..."
-  pkgStaplerOutput=$(xcrun stapler staple "$PKG_NAME")
-  if [ $? -ne 0 ]; then
-    log "Stapling package failed"
-    echo "$pkgStaplerOutput"
-    exit 1
-  else
-    echo "$pkgStaplerOutput"
-  fi
-
-  # Verify stapling
-  log "Verifying stapling..."
-  if ! stapler validate "$APPLICATION_PATH"; then
-    log "Stapling verification failed for application"
-    exit 1
-  fi
-  if ! stapler validate "$PKG_NAME"; then
-    log "Stapling verification failed for package"
-    exit 1
-  fi
-else
-  log "Notarization disabled"
-  log "Stapling disabled"
-fi
-
-log "Zipping $BUILD_NAME to $INPUT_FILE ..."
-(
-  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

@@ -1,30 +0,0 @@
-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

@@ -1,30 +0,0 @@
-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/perf/j2dbopts_poly250-AA-rand_col.txt

@@ -1,267 +0,0 @@
-prog.verbose=disabled
-prog.printresults=enabled
-global.env.outputwidth=640
-global.env.outputheight=480
-global.env.runcount=5
-global.env.repcount=0
-global.env.testtime=2500
-global.results.workunits=units
-global.results.timeunits=sec
-global.results.ratio=unitspersec
-global.dest.offscreen=disabled
-global.dest.frame.defaultframe=enabled
-global.dest.frame.transframe=disabled
-global.dest.frame.shapedframe=disabled
-global.dest.frame.shapedtransframe=disabled
-global.dest.compatimg.compatimg=disabled
-global.dest.compatimg.opqcompatimg=disabled
-global.dest.compatimg.bmcompatimg=disabled
-global.dest.compatimg.transcompatimg=disabled
-global.dest.volimg.volimg=disabled
-global.dest.volimg.opqvolimg=disabled
-global.dest.volimg.bmvolimg=disabled
-global.dest.volimg.transvolimg=disabled
-global.dest.bufimg.IntXrgb=disabled
-global.dest.bufimg.IntArgb=disabled
-global.dest.bufimg.IntArgbPre=disabled
-global.dest.bufimg.3ByteBgr=disabled
-global.dest.bufimg.ByteIndexed=disabled
-global.dest.bufimg.ByteGray=disabled
-global.dest.bufimg.4ByteAbgr=disabled
-global.dest.bufimg.4ByteAbgrPre=disabled
-global.dest.bufimg.custom=disabled
-graphics.opts.anim=2
-graphics.opts.sizes=250
-graphics.opts.alpharule=SrcOver
-graphics.opts.transform=ident
-graphics.opts.extraalpha=Off
-graphics.opts.xormode=Off
-graphics.opts.clip=Off
-graphics.opts.renderhint=Default
-graphics.render.opts.paint=random
-graphics.render.opts.alphacolor=Off
-graphics.render.opts.antialias=On
-graphics.render.opts.stroke=width1
-graphics.render.tests.drawLine=disabled
-graphics.render.tests.drawLineHoriz=disabled
-graphics.render.tests.drawLineVert=disabled
-graphics.render.tests.fillRect=disabled
-graphics.render.tests.drawRect=disabled
-graphics.render.tests.fillOval=disabled
-graphics.render.tests.drawOval=disabled
-graphics.render.tests.fillPoly=disabled
-graphics.render.tests.drawPoly=enabled
-graphics.render.tests.shape.fillCubic=disabled
-graphics.render.tests.shape.drawCubic=disabled
-graphics.render.tests.shape.fillEllipse2D=disabled
-graphics.render.tests.shape.drawEllipse2D=disabled
-graphics.imaging.src.offscr.opaque=disabled
-graphics.imaging.src.offscr.bitmask=disabled
-graphics.imaging.src.offscr.translucent=disabled
-graphics.imaging.src.opqcompatimg.opaque=disabled
-graphics.imaging.src.opqcompatimg.bitmask=disabled
-graphics.imaging.src.opqcompatimg.translucent=disabled
-graphics.imaging.src.bmcompatimg.opaque=disabled
-graphics.imaging.src.bmcompatimg.bitmask=disabled
-graphics.imaging.src.bmcompatimg.translucent=disabled
-graphics.imaging.src.transcompatimg.opaque=disabled
-graphics.imaging.src.transcompatimg.bitmask=disabled
-graphics.imaging.src.transcompatimg.translucent=disabled
-graphics.imaging.src.opqvolimg.opaque=disabled
-graphics.imaging.src.opqvolimg.bitmask=disabled
-graphics.imaging.src.opqvolimg.translucent=disabled
-graphics.imaging.src.bmvolimg.opaque=disabled
-graphics.imaging.src.bmvolimg.bitmask=disabled
-graphics.imaging.src.bmvolimg.translucent=disabled
-graphics.imaging.src.transvolimg.opaque=disabled
-graphics.imaging.src.transvolimg.bitmask=disabled
-graphics.imaging.src.transvolimg.translucent=disabled
-graphics.imaging.src.bufimg.IntXrgb.opaque=disabled
-graphics.imaging.src.bufimg.IntXrgb.bitmask=disabled
-graphics.imaging.src.bufimg.IntXrgb.translucent=disabled
-graphics.imaging.src.bufimg.IntArgb.opaque=disabled
-graphics.imaging.src.bufimg.IntArgb.bitmask=disabled
-graphics.imaging.src.bufimg.IntArgb.translucent=disabled
-graphics.imaging.src.bufimg.IntArgbPre.opaque=disabled
-graphics.imaging.src.bufimg.IntArgbPre.bitmask=disabled
-graphics.imaging.src.bufimg.IntArgbPre.translucent=disabled
-graphics.imaging.src.bufimg.ByteGray.opaque=disabled
-graphics.imaging.src.bufimg.ByteGray.bitmask=disabled
-graphics.imaging.src.bufimg.ByteGray.translucent=disabled
-graphics.imaging.src.bufimg.3ByteBgr.opaque=disabled
-graphics.imaging.src.bufimg.3ByteBgr.bitmask=disabled
-graphics.imaging.src.bufimg.3ByteBgr.translucent=disabled
-graphics.imaging.src.bufimg.4ByteAbgr.opaque=disabled
-graphics.imaging.src.bufimg.4ByteAbgr.bitmask=disabled
-graphics.imaging.src.bufimg.4ByteAbgr.translucent=disabled
-graphics.imaging.src.bufimg.4ByteAbgrPre.opaque=disabled
-graphics.imaging.src.bufimg.4ByteAbgrPre.bitmask=disabled
-graphics.imaging.src.bufimg.4ByteAbgrPre.translucent=disabled
-graphics.imaging.src.bufimg.ByteIndexedBm.opaque=disabled
-graphics.imaging.src.bufimg.ByteIndexedBm.bitmask=disabled
-graphics.imaging.src.bufimg.ByteIndexedBm.translucent=disabled
-graphics.imaging.src.bufimg.unmanagedIntXrgb.opaque=disabled
-graphics.imaging.src.bufimg.unmanagedIntXrgb.bitmask=disabled
-graphics.imaging.src.bufimg.unmanagedIntXrgb.translucent=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgb.opaque=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgb.bitmask=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgb.translucent=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgbPre.opaque=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgbPre.bitmask=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgbPre.translucent=disabled
-graphics.imaging.src.bufimg.unmanaged3ByteBgr.opaque=disabled
-graphics.imaging.src.bufimg.unmanaged3ByteBgr.bitmask=disabled
-graphics.imaging.src.bufimg.unmanaged3ByteBgr.translucent=disabled
-graphics.imaging.benchmarks.opts.interpolation=Nearest neighbor
-graphics.imaging.benchmarks.opts.touchsrc=Off
-graphics.imaging.benchmarks.tests.drawimage=disabled
-graphics.imaging.benchmarks.tests.drawimagebg=disabled
-graphics.imaging.benchmarks.tests.drawimagescaleup=disabled
-graphics.imaging.benchmarks.tests.drawimagescaledown=disabled
-graphics.imaging.benchmarks.tests.drawimagescalesplit=disabled
-graphics.imaging.benchmarks.tests.drawimagetxform=disabled
-graphics.imaging.imageops.opts.op=convolve3x3zero
-graphics.imaging.imageops.tests.graphics2d.drawimageop=disabled
-graphics.imaging.imageops.tests.bufimgop.filternull=disabled
-graphics.imaging.imageops.tests.bufimgop.filtercached=disabled
-graphics.imaging.imageops.tests.rasterop.filternull=disabled
-graphics.imaging.imageops.tests.rasterop.filtercached=disabled
-graphics.misc.copytests.copyAreaVert=disabled
-graphics.misc.copytests.copyAreaHoriz=disabled
-graphics.misc.copytests.copyAreaDiag=disabled
-pixel.opts.renderto=Off
-pixel.opts.renderfrom=Off
-pixel.src.1BitBinary=disabled
-pixel.src.2BitBinary=disabled
-pixel.src.4BitBinary=disabled
-pixel.src.ByteIndexed=disabled
-pixel.src.ByteGray=disabled
-pixel.src.Short555=disabled
-pixel.src.Short565=disabled
-pixel.src.ShortGray=disabled
-pixel.src.3ByteBgr=disabled
-pixel.src.4ByteAbgr=disabled
-pixel.src.IntXrgb=disabled
-pixel.src.IntXbgr=disabled
-pixel.src.IntArgb=disabled
-pixel.bimgtests.getrgb=disabled
-pixel.bimgtests.setrgb=disabled
-pixel.rastests.getdataelem=disabled
-pixel.rastests.setdataelem=disabled
-pixel.rastests.getpixel=disabled
-pixel.rastests.setpixel=disabled
-pixel.dbtests.getelem=disabled
-pixel.dbtests.setelem=disabled
-text.opts.data.tlength=16
-text.opts.data.tscript=english
-text.opts.font.fname=serif,physical
-text.opts.font.fstyle=0
-text.opts.font.fsize=13.0
-text.opts.font.ftx=Identity
-text.opts.graphics.textaa=Off
-text.opts.graphics.tfm=Off
-text.opts.graphics.gaa=Off
-text.opts.graphics.gtx=Identity
-text.opts.advopts.gvstyle=0
-text.opts.advopts.tlruns=1
-text.opts.advopts.maptype=FONT
-text.Rendering.tests.drawString=disabled
-text.Rendering.tests.drawChars=disabled
-text.Rendering.tests.drawBytes=disabled
-text.Rendering.tests.drawGlyphVectors=disabled
-text.Rendering.tests.drawTextLayout=disabled
-text.Measuring.tests.stringWidth=disabled
-text.Measuring.tests.stringBounds=disabled
-text.Measuring.tests.charsWidth=disabled
-text.Measuring.tests.charsBounds=disabled
-text.Measuring.tests.fontcandisplay=disabled
-text.Measuring.tests.gvWidth=disabled
-text.Measuring.tests.gvLogicalBounds=disabled
-text.Measuring.tests.gvVisualBounds=disabled
-text.Measuring.tests.gvPixelBounds=disabled
-text.Measuring.tests.gvOutline=disabled
-text.Measuring.tests.gvGlyphLogicalBounds=disabled
-text.Measuring.tests.gvGlyphVisualBounds=disabled
-text.Measuring.tests.gvGlyphPixelBounds=disabled
-text.Measuring.tests.gvGlyphOutline=disabled
-text.Measuring.tests.gvGlyphTransform=disabled
-text.Measuring.tests.gvGlyphMetrics=disabled
-text.Measuring.tests.tlAdvance=disabled
-text.Measuring.tests.tlAscent=disabled
-text.Measuring.tests.tlBounds=disabled
-text.Measuring.tests.tlGetCaretInfo=disabled
-text.Measuring.tests.tlGetNextHit=disabled
-text.Measuring.tests.tlGetCaretShape=disabled
-text.Measuring.tests.tlGetLogicalHighlightShape=disabled
-text.Measuring.tests.tlHitTest=disabled
-text.Measuring.tests.tlOutline=disabled
-text.construction.tests.gvfromfontstring=disabled
-text.construction.tests.gvfromfontchars=disabled
-text.construction.tests.gvfromfontci=disabled
-text.construction.tests.gvfromfontglyphs=disabled
-text.construction.tests.gvfromfontlayout=disabled
-text.construction.tests.tlfromfont=disabled
-text.construction.tests.tlfrommap=disabled
-imageio.opts.size=250
-imageio.opts.content=photo
-imageio.input.opts.general.source.file=disabled
-imageio.input.opts.general.source.url=disabled
-imageio.input.opts.general.source.byteArray=disabled
-imageio.input.opts.imageio.useCache=Off
-imageio.input.image.toolkit.opts.format=
-imageio.input.image.toolkit.tests.createImage=disabled
-imageio.input.image.imageio.opts.format=
-imageio.input.image.imageio.tests.imageioRead=disabled
-imageio.input.image.imageio.reader.opts.seekForwardOnly=On
-imageio.input.image.imageio.reader.opts.ignoreMetadata=On
-imageio.input.image.imageio.reader.opts.installListener=Off
-imageio.input.image.imageio.reader.tests.read=disabled
-imageio.input.image.imageio.reader.tests.getImageMetadata=disabled
-imageio.input.stream.tests.construct=disabled
-imageio.input.stream.tests.read=disabled
-imageio.input.stream.tests.readByteArray=disabled
-imageio.input.stream.tests.readFullyByteArray=disabled
-imageio.input.stream.tests.readBit=disabled
-imageio.input.stream.tests.readByte=disabled
-imageio.input.stream.tests.readUnsignedByte=disabled
-imageio.input.stream.tests.readShort=disabled
-imageio.input.stream.tests.readUnsignedShort=disabled
-imageio.input.stream.tests.readInt=disabled
-imageio.input.stream.tests.readUnsignedInt=disabled
-imageio.input.stream.tests.readFloat=disabled
-imageio.input.stream.tests.readLong=disabled
-imageio.input.stream.tests.readDouble=disabled
-imageio.input.stream.tests.skipBytes=disabled
-imageio.output.opts.general.dest.file=disabled
-imageio.output.opts.general.dest.byteArray=disabled
-imageio.output.opts.imageio.useCache=Off
-imageio.output.image.imageio.opts.format=
-imageio.output.image.imageio.tests.imageioWrite=disabled
-imageio.output.image.imageio.writer.opts.installListener=Off
-imageio.output.image.imageio.writer.tests.write=disabled
-imageio.output.stream.tests.construct=disabled
-imageio.output.stream.tests.write=disabled
-imageio.output.stream.tests.writeByteArray=disabled
-imageio.output.stream.tests.writeBit=disabled
-imageio.output.stream.tests.writeByte=disabled
-imageio.output.stream.tests.writeShort=disabled
-imageio.output.stream.tests.writeInt=disabled
-imageio.output.stream.tests.writeFloat=disabled
-imageio.output.stream.tests.writeLong=disabled
-imageio.output.stream.tests.writeDouble=disabled
-cmm.opts.profiles=1001
-cmm.colorconv.data.fromRGB=disabled
-cmm.colorconv.data.toRGB=disabled
-cmm.colorconv.data.fromCIEXYZ=disabled
-cmm.colorconv.data.toCIEXYZ=disabled
-cmm.colorconv.ccop.ccopOptions.size=250
-cmm.colorconv.ccop.ccopOptions.content=photo
-cmm.colorconv.ccop.ccopOptions.srcType=INT_RGB
-cmm.colorconv.ccop.ccopOptions.dstType=INT_RGB
-cmm.colorconv.ccop.op_img=disabled
-cmm.colorconv.ccop.op_rst=disabled
-cmm.colorconv.ccop.op_draw=disabled
-cmm.colorconv.embed.embedOptions.Images=512x512
-cmm.colorconv.embed.embd_img_read=disabled
-cmm.profiles.getHeader=disabled
-cmm.profiles.getNumComponents=disabled

jb/project/tools/perf/j2dbopts_poly250-rand_col.txt

@@ -1,267 +0,0 @@
-prog.verbose=disabled
-prog.printresults=enabled
-global.env.outputwidth=640
-global.env.outputheight=480
-global.env.runcount=5
-global.env.repcount=0
-global.env.testtime=2500
-global.results.workunits=units
-global.results.timeunits=sec
-global.results.ratio=unitspersec
-global.dest.offscreen=disabled
-global.dest.frame.defaultframe=enabled
-global.dest.frame.transframe=disabled
-global.dest.frame.shapedframe=disabled
-global.dest.frame.shapedtransframe=disabled
-global.dest.compatimg.compatimg=disabled
-global.dest.compatimg.opqcompatimg=disabled
-global.dest.compatimg.bmcompatimg=disabled
-global.dest.compatimg.transcompatimg=disabled
-global.dest.volimg.volimg=disabled
-global.dest.volimg.opqvolimg=disabled
-global.dest.volimg.bmvolimg=disabled
-global.dest.volimg.transvolimg=disabled
-global.dest.bufimg.IntXrgb=disabled
-global.dest.bufimg.IntArgb=disabled
-global.dest.bufimg.IntArgbPre=disabled
-global.dest.bufimg.3ByteBgr=disabled
-global.dest.bufimg.ByteIndexed=disabled
-global.dest.bufimg.ByteGray=disabled
-global.dest.bufimg.4ByteAbgr=disabled
-global.dest.bufimg.4ByteAbgrPre=disabled
-global.dest.bufimg.custom=disabled
-graphics.opts.anim=2
-graphics.opts.sizes=250
-graphics.opts.alpharule=SrcOver
-graphics.opts.transform=ident
-graphics.opts.extraalpha=Off
-graphics.opts.xormode=Off
-graphics.opts.clip=Off
-graphics.opts.renderhint=Default
-graphics.render.opts.paint=random
-graphics.render.opts.alphacolor=Off
-graphics.render.opts.antialias=Off
-graphics.render.opts.stroke=width1
-graphics.render.tests.drawLine=disabled
-graphics.render.tests.drawLineHoriz=disabled
-graphics.render.tests.drawLineVert=disabled
-graphics.render.tests.fillRect=disabled
-graphics.render.tests.drawRect=disabled
-graphics.render.tests.fillOval=disabled
-graphics.render.tests.drawOval=disabled
-graphics.render.tests.fillPoly=disabled
-graphics.render.tests.drawPoly=enabled
-graphics.render.tests.shape.fillCubic=disabled
-graphics.render.tests.shape.drawCubic=disabled
-graphics.render.tests.shape.fillEllipse2D=disabled
-graphics.render.tests.shape.drawEllipse2D=disabled
-graphics.imaging.src.offscr.opaque=disabled
-graphics.imaging.src.offscr.bitmask=disabled
-graphics.imaging.src.offscr.translucent=disabled
-graphics.imaging.src.opqcompatimg.opaque=disabled
-graphics.imaging.src.opqcompatimg.bitmask=disabled
-graphics.imaging.src.opqcompatimg.translucent=disabled
-graphics.imaging.src.bmcompatimg.opaque=disabled
-graphics.imaging.src.bmcompatimg.bitmask=disabled
-graphics.imaging.src.bmcompatimg.translucent=disabled
-graphics.imaging.src.transcompatimg.opaque=disabled
-graphics.imaging.src.transcompatimg.bitmask=disabled
-graphics.imaging.src.transcompatimg.translucent=disabled
-graphics.imaging.src.opqvolimg.opaque=disabled
-graphics.imaging.src.opqvolimg.bitmask=disabled
-graphics.imaging.src.opqvolimg.translucent=disabled
-graphics.imaging.src.bmvolimg.opaque=disabled
-graphics.imaging.src.bmvolimg.bitmask=disabled
-graphics.imaging.src.bmvolimg.translucent=disabled
-graphics.imaging.src.transvolimg.opaque=disabled
-graphics.imaging.src.transvolimg.bitmask=disabled
-graphics.imaging.src.transvolimg.translucent=disabled
-graphics.imaging.src.bufimg.IntXrgb.opaque=disabled
-graphics.imaging.src.bufimg.IntXrgb.bitmask=disabled
-graphics.imaging.src.bufimg.IntXrgb.translucent=disabled
-graphics.imaging.src.bufimg.IntArgb.opaque=disabled
-graphics.imaging.src.bufimg.IntArgb.bitmask=disabled
-graphics.imaging.src.bufimg.IntArgb.translucent=disabled
-graphics.imaging.src.bufimg.IntArgbPre.opaque=disabled
-graphics.imaging.src.bufimg.IntArgbPre.bitmask=disabled
-graphics.imaging.src.bufimg.IntArgbPre.translucent=disabled
-graphics.imaging.src.bufimg.ByteGray.opaque=disabled
-graphics.imaging.src.bufimg.ByteGray.bitmask=disabled
-graphics.imaging.src.bufimg.ByteGray.translucent=disabled
-graphics.imaging.src.bufimg.3ByteBgr.opaque=disabled
-graphics.imaging.src.bufimg.3ByteBgr.bitmask=disabled
-graphics.imaging.src.bufimg.3ByteBgr.translucent=disabled
-graphics.imaging.src.bufimg.4ByteAbgr.opaque=disabled
-graphics.imaging.src.bufimg.4ByteAbgr.bitmask=disabled
-graphics.imaging.src.bufimg.4ByteAbgr.translucent=disabled
-graphics.imaging.src.bufimg.4ByteAbgrPre.opaque=disabled
-graphics.imaging.src.bufimg.4ByteAbgrPre.bitmask=disabled
-graphics.imaging.src.bufimg.4ByteAbgrPre.translucent=disabled
-graphics.imaging.src.bufimg.ByteIndexedBm.opaque=disabled
-graphics.imaging.src.bufimg.ByteIndexedBm.bitmask=disabled
-graphics.imaging.src.bufimg.ByteIndexedBm.translucent=disabled
-graphics.imaging.src.bufimg.unmanagedIntXrgb.opaque=disabled
-graphics.imaging.src.bufimg.unmanagedIntXrgb.bitmask=disabled
-graphics.imaging.src.bufimg.unmanagedIntXrgb.translucent=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgb.opaque=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgb.bitmask=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgb.translucent=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgbPre.opaque=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgbPre.bitmask=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgbPre.translucent=disabled
-graphics.imaging.src.bufimg.unmanaged3ByteBgr.opaque=disabled
-graphics.imaging.src.bufimg.unmanaged3ByteBgr.bitmask=disabled
-graphics.imaging.src.bufimg.unmanaged3ByteBgr.translucent=disabled
-graphics.imaging.benchmarks.opts.interpolation=Nearest neighbor
-graphics.imaging.benchmarks.opts.touchsrc=Off
-graphics.imaging.benchmarks.tests.drawimage=disabled
-graphics.imaging.benchmarks.tests.drawimagebg=disabled
-graphics.imaging.benchmarks.tests.drawimagescaleup=disabled
-graphics.imaging.benchmarks.tests.drawimagescaledown=disabled
-graphics.imaging.benchmarks.tests.drawimagescalesplit=disabled
-graphics.imaging.benchmarks.tests.drawimagetxform=disabled
-graphics.imaging.imageops.opts.op=convolve3x3zero
-graphics.imaging.imageops.tests.graphics2d.drawimageop=disabled
-graphics.imaging.imageops.tests.bufimgop.filternull=disabled
-graphics.imaging.imageops.tests.bufimgop.filtercached=disabled
-graphics.imaging.imageops.tests.rasterop.filternull=disabled
-graphics.imaging.imageops.tests.rasterop.filtercached=disabled
-graphics.misc.copytests.copyAreaVert=disabled
-graphics.misc.copytests.copyAreaHoriz=disabled
-graphics.misc.copytests.copyAreaDiag=disabled
-pixel.opts.renderto=Off
-pixel.opts.renderfrom=Off
-pixel.src.1BitBinary=disabled
-pixel.src.2BitBinary=disabled
-pixel.src.4BitBinary=disabled
-pixel.src.ByteIndexed=disabled
-pixel.src.ByteGray=disabled
-pixel.src.Short555=disabled
-pixel.src.Short565=disabled
-pixel.src.ShortGray=disabled
-pixel.src.3ByteBgr=disabled
-pixel.src.4ByteAbgr=disabled
-pixel.src.IntXrgb=disabled
-pixel.src.IntXbgr=disabled
-pixel.src.IntArgb=disabled
-pixel.bimgtests.getrgb=disabled
-pixel.bimgtests.setrgb=disabled
-pixel.rastests.getdataelem=disabled
-pixel.rastests.setdataelem=disabled
-pixel.rastests.getpixel=disabled
-pixel.rastests.setpixel=disabled
-pixel.dbtests.getelem=disabled
-pixel.dbtests.setelem=disabled
-text.opts.data.tlength=16
-text.opts.data.tscript=english
-text.opts.font.fname=serif,physical
-text.opts.font.fstyle=0
-text.opts.font.fsize=13.0
-text.opts.font.ftx=Identity
-text.opts.graphics.textaa=Off
-text.opts.graphics.tfm=Off
-text.opts.graphics.gaa=Off
-text.opts.graphics.gtx=Identity
-text.opts.advopts.gvstyle=0
-text.opts.advopts.tlruns=1
-text.opts.advopts.maptype=FONT
-text.Rendering.tests.drawString=disabled
-text.Rendering.tests.drawChars=disabled
-text.Rendering.tests.drawBytes=disabled
-text.Rendering.tests.drawGlyphVectors=disabled
-text.Rendering.tests.drawTextLayout=disabled
-text.Measuring.tests.stringWidth=disabled
-text.Measuring.tests.stringBounds=disabled
-text.Measuring.tests.charsWidth=disabled
-text.Measuring.tests.charsBounds=disabled
-text.Measuring.tests.fontcandisplay=disabled
-text.Measuring.tests.gvWidth=disabled
-text.Measuring.tests.gvLogicalBounds=disabled
-text.Measuring.tests.gvVisualBounds=disabled
-text.Measuring.tests.gvPixelBounds=disabled
-text.Measuring.tests.gvOutline=disabled
-text.Measuring.tests.gvGlyphLogicalBounds=disabled
-text.Measuring.tests.gvGlyphVisualBounds=disabled
-text.Measuring.tests.gvGlyphPixelBounds=disabled
-text.Measuring.tests.gvGlyphOutline=disabled
-text.Measuring.tests.gvGlyphTransform=disabled
-text.Measuring.tests.gvGlyphMetrics=disabled
-text.Measuring.tests.tlAdvance=disabled
-text.Measuring.tests.tlAscent=disabled
-text.Measuring.tests.tlBounds=disabled
-text.Measuring.tests.tlGetCaretInfo=disabled
-text.Measuring.tests.tlGetNextHit=disabled
-text.Measuring.tests.tlGetCaretShape=disabled
-text.Measuring.tests.tlGetLogicalHighlightShape=disabled
-text.Measuring.tests.tlHitTest=disabled
-text.Measuring.tests.tlOutline=disabled
-text.construction.tests.gvfromfontstring=disabled
-text.construction.tests.gvfromfontchars=disabled
-text.construction.tests.gvfromfontci=disabled
-text.construction.tests.gvfromfontglyphs=disabled
-text.construction.tests.gvfromfontlayout=disabled
-text.construction.tests.tlfromfont=disabled
-text.construction.tests.tlfrommap=disabled
-imageio.opts.size=250
-imageio.opts.content=photo
-imageio.input.opts.general.source.file=disabled
-imageio.input.opts.general.source.url=disabled
-imageio.input.opts.general.source.byteArray=disabled
-imageio.input.opts.imageio.useCache=Off
-imageio.input.image.toolkit.opts.format=
-imageio.input.image.toolkit.tests.createImage=disabled
-imageio.input.image.imageio.opts.format=
-imageio.input.image.imageio.tests.imageioRead=disabled
-imageio.input.image.imageio.reader.opts.seekForwardOnly=On
-imageio.input.image.imageio.reader.opts.ignoreMetadata=On
-imageio.input.image.imageio.reader.opts.installListener=Off
-imageio.input.image.imageio.reader.tests.read=disabled
-imageio.input.image.imageio.reader.tests.getImageMetadata=disabled
-imageio.input.stream.tests.construct=disabled
-imageio.input.stream.tests.read=disabled
-imageio.input.stream.tests.readByteArray=disabled
-imageio.input.stream.tests.readFullyByteArray=disabled
-imageio.input.stream.tests.readBit=disabled
-imageio.input.stream.tests.readByte=disabled
-imageio.input.stream.tests.readUnsignedByte=disabled
-imageio.input.stream.tests.readShort=disabled
-imageio.input.stream.tests.readUnsignedShort=disabled
-imageio.input.stream.tests.readInt=disabled
-imageio.input.stream.tests.readUnsignedInt=disabled
-imageio.input.stream.tests.readFloat=disabled
-imageio.input.stream.tests.readLong=disabled
-imageio.input.stream.tests.readDouble=disabled
-imageio.input.stream.tests.skipBytes=disabled
-imageio.output.opts.general.dest.file=disabled
-imageio.output.opts.general.dest.byteArray=disabled
-imageio.output.opts.imageio.useCache=Off
-imageio.output.image.imageio.opts.format=
-imageio.output.image.imageio.tests.imageioWrite=disabled
-imageio.output.image.imageio.writer.opts.installListener=Off
-imageio.output.image.imageio.writer.tests.write=disabled
-imageio.output.stream.tests.construct=disabled
-imageio.output.stream.tests.write=disabled
-imageio.output.stream.tests.writeByteArray=disabled
-imageio.output.stream.tests.writeBit=disabled
-imageio.output.stream.tests.writeByte=disabled
-imageio.output.stream.tests.writeShort=disabled
-imageio.output.stream.tests.writeInt=disabled
-imageio.output.stream.tests.writeFloat=disabled
-imageio.output.stream.tests.writeLong=disabled
-imageio.output.stream.tests.writeDouble=disabled
-cmm.opts.profiles=1001
-cmm.colorconv.data.fromRGB=disabled
-cmm.colorconv.data.toRGB=disabled
-cmm.colorconv.data.fromCIEXYZ=disabled
-cmm.colorconv.data.toCIEXYZ=disabled
-cmm.colorconv.ccop.ccopOptions.size=250
-cmm.colorconv.ccop.ccopOptions.content=photo
-cmm.colorconv.ccop.ccopOptions.srcType=INT_RGB
-cmm.colorconv.ccop.ccopOptions.dstType=INT_RGB
-cmm.colorconv.ccop.op_img=disabled
-cmm.colorconv.ccop.op_rst=disabled
-cmm.colorconv.ccop.op_draw=disabled
-cmm.colorconv.embed.embedOptions.Images=512x512
-cmm.colorconv.embed.embd_img_read=disabled
-cmm.profiles.getHeader=disabled
-cmm.profiles.getNumComponents=disabled

jb/project/tools/perf/j2dbopts_poly250.txt

@@ -1,267 +0,0 @@
-prog.verbose=disabled
-prog.printresults=enabled
-global.env.outputwidth=640
-global.env.outputheight=480
-global.env.runcount=5
-global.env.repcount=0
-global.env.testtime=2500
-global.results.workunits=units
-global.results.timeunits=sec
-global.results.ratio=unitspersec
-global.dest.offscreen=disabled
-global.dest.frame.defaultframe=enabled
-global.dest.frame.transframe=disabled
-global.dest.frame.shapedframe=disabled
-global.dest.frame.shapedtransframe=disabled
-global.dest.compatimg.compatimg=disabled
-global.dest.compatimg.opqcompatimg=disabled
-global.dest.compatimg.bmcompatimg=disabled
-global.dest.compatimg.transcompatimg=disabled
-global.dest.volimg.volimg=disabled
-global.dest.volimg.opqvolimg=disabled
-global.dest.volimg.bmvolimg=disabled
-global.dest.volimg.transvolimg=disabled
-global.dest.bufimg.IntXrgb=disabled
-global.dest.bufimg.IntArgb=disabled
-global.dest.bufimg.IntArgbPre=disabled
-global.dest.bufimg.3ByteBgr=disabled
-global.dest.bufimg.ByteIndexed=disabled
-global.dest.bufimg.ByteGray=disabled
-global.dest.bufimg.4ByteAbgr=disabled
-global.dest.bufimg.4ByteAbgrPre=disabled
-global.dest.bufimg.custom=disabled
-graphics.opts.anim=2
-graphics.opts.sizes=250
-graphics.opts.alpharule=SrcOver
-graphics.opts.transform=ident
-graphics.opts.extraalpha=Off
-graphics.opts.xormode=Off
-graphics.opts.clip=Off
-graphics.opts.renderhint=Default
-graphics.render.opts.paint=single
-graphics.render.opts.alphacolor=Off
-graphics.render.opts.antialias=Off
-graphics.render.opts.stroke=width1
-graphics.render.tests.drawLine=disabled
-graphics.render.tests.drawLineHoriz=disabled
-graphics.render.tests.drawLineVert=disabled
-graphics.render.tests.fillRect=disabled
-graphics.render.tests.drawRect=disabled
-graphics.render.tests.fillOval=disabled
-graphics.render.tests.drawOval=disabled
-graphics.render.tests.fillPoly=disabled
-graphics.render.tests.drawPoly=enabled
-graphics.render.tests.shape.fillCubic=disabled
-graphics.render.tests.shape.drawCubic=disabled
-graphics.render.tests.shape.fillEllipse2D=disabled
-graphics.render.tests.shape.drawEllipse2D=disabled
-graphics.imaging.src.offscr.opaque=disabled
-graphics.imaging.src.offscr.bitmask=disabled
-graphics.imaging.src.offscr.translucent=disabled
-graphics.imaging.src.opqcompatimg.opaque=disabled
-graphics.imaging.src.opqcompatimg.bitmask=disabled
-graphics.imaging.src.opqcompatimg.translucent=disabled
-graphics.imaging.src.bmcompatimg.opaque=disabled
-graphics.imaging.src.bmcompatimg.bitmask=disabled
-graphics.imaging.src.bmcompatimg.translucent=disabled
-graphics.imaging.src.transcompatimg.opaque=disabled
-graphics.imaging.src.transcompatimg.bitmask=disabled
-graphics.imaging.src.transcompatimg.translucent=disabled
-graphics.imaging.src.opqvolimg.opaque=disabled
-graphics.imaging.src.opqvolimg.bitmask=disabled
-graphics.imaging.src.opqvolimg.translucent=disabled
-graphics.imaging.src.bmvolimg.opaque=disabled
-graphics.imaging.src.bmvolimg.bitmask=disabled
-graphics.imaging.src.bmvolimg.translucent=disabled
-graphics.imaging.src.transvolimg.opaque=disabled
-graphics.imaging.src.transvolimg.bitmask=disabled
-graphics.imaging.src.transvolimg.translucent=disabled
-graphics.imaging.src.bufimg.IntXrgb.opaque=disabled
-graphics.imaging.src.bufimg.IntXrgb.bitmask=disabled
-graphics.imaging.src.bufimg.IntXrgb.translucent=disabled
-graphics.imaging.src.bufimg.IntArgb.opaque=disabled
-graphics.imaging.src.bufimg.IntArgb.bitmask=disabled
-graphics.imaging.src.bufimg.IntArgb.translucent=disabled
-graphics.imaging.src.bufimg.IntArgbPre.opaque=disabled
-graphics.imaging.src.bufimg.IntArgbPre.bitmask=disabled
-graphics.imaging.src.bufimg.IntArgbPre.translucent=disabled
-graphics.imaging.src.bufimg.ByteGray.opaque=disabled
-graphics.imaging.src.bufimg.ByteGray.bitmask=disabled
-graphics.imaging.src.bufimg.ByteGray.translucent=disabled
-graphics.imaging.src.bufimg.3ByteBgr.opaque=disabled
-graphics.imaging.src.bufimg.3ByteBgr.bitmask=disabled
-graphics.imaging.src.bufimg.3ByteBgr.translucent=disabled
-graphics.imaging.src.bufimg.4ByteAbgr.opaque=disabled
-graphics.imaging.src.bufimg.4ByteAbgr.bitmask=disabled
-graphics.imaging.src.bufimg.4ByteAbgr.translucent=disabled
-graphics.imaging.src.bufimg.4ByteAbgrPre.opaque=disabled
-graphics.imaging.src.bufimg.4ByteAbgrPre.bitmask=disabled
-graphics.imaging.src.bufimg.4ByteAbgrPre.translucent=disabled
-graphics.imaging.src.bufimg.ByteIndexedBm.opaque=disabled
-graphics.imaging.src.bufimg.ByteIndexedBm.bitmask=disabled
-graphics.imaging.src.bufimg.ByteIndexedBm.translucent=disabled
-graphics.imaging.src.bufimg.unmanagedIntXrgb.opaque=disabled
-graphics.imaging.src.bufimg.unmanagedIntXrgb.bitmask=disabled
-graphics.imaging.src.bufimg.unmanagedIntXrgb.translucent=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgb.opaque=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgb.bitmask=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgb.translucent=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgbPre.opaque=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgbPre.bitmask=disabled
-graphics.imaging.src.bufimg.unmanagedIntArgbPre.translucent=disabled
-graphics.imaging.src.bufimg.unmanaged3ByteBgr.opaque=disabled
-graphics.imaging.src.bufimg.unmanaged3ByteBgr.bitmask=disabled
-graphics.imaging.src.bufimg.unmanaged3ByteBgr.translucent=disabled
-graphics.imaging.benchmarks.opts.interpolation=Nearest neighbor
-graphics.imaging.benchmarks.opts.touchsrc=Off
-graphics.imaging.benchmarks.tests.drawimage=disabled
-graphics.imaging.benchmarks.tests.drawimagebg=disabled
-graphics.imaging.benchmarks.tests.drawimagescaleup=disabled
-graphics.imaging.benchmarks.tests.drawimagescaledown=disabled
-graphics.imaging.benchmarks.tests.drawimagescalesplit=disabled
-graphics.imaging.benchmarks.tests.drawimagetxform=disabled
-graphics.imaging.imageops.opts.op=convolve3x3zero
-graphics.imaging.imageops.tests.graphics2d.drawimageop=disabled
-graphics.imaging.imageops.tests.bufimgop.filternull=disabled
-graphics.imaging.imageops.tests.bufimgop.filtercached=disabled
-graphics.imaging.imageops.tests.rasterop.filternull=disabled
-graphics.imaging.imageops.tests.rasterop.filtercached=disabled
-graphics.misc.copytests.copyAreaVert=disabled
-graphics.misc.copytests.copyAreaHoriz=disabled
-graphics.misc.copytests.copyAreaDiag=disabled
-pixel.opts.renderto=Off
-pixel.opts.renderfrom=Off
-pixel.src.1BitBinary=disabled
-pixel.src.2BitBinary=disabled
-pixel.src.4BitBinary=disabled
-pixel.src.ByteIndexed=disabled
-pixel.src.ByteGray=disabled
-pixel.src.Short555=disabled
-pixel.src.Short565=disabled
-pixel.src.ShortGray=disabled
-pixel.src.3ByteBgr=disabled
-pixel.src.4ByteAbgr=disabled
-pixel.src.IntXrgb=disabled
-pixel.src.IntXbgr=disabled
-pixel.src.IntArgb=disabled
-pixel.bimgtests.getrgb=disabled
-pixel.bimgtests.setrgb=disabled
-pixel.rastests.getdataelem=disabled
-pixel.rastests.setdataelem=disabled
-pixel.rastests.getpixel=disabled
-pixel.rastests.setpixel=disabled
-pixel.dbtests.getelem=disabled
-pixel.dbtests.setelem=disabled
-text.opts.data.tlength=16
-text.opts.data.tscript=english
-text.opts.font.fname=serif,physical
-text.opts.font.fstyle=0
-text.opts.font.fsize=13.0
-text.opts.font.ftx=Identity
-text.opts.graphics.textaa=Off
-text.opts.graphics.tfm=Off
-text.opts.graphics.gaa=Off
-text.opts.graphics.gtx=Identity
-text.opts.advopts.gvstyle=0
-text.opts.advopts.tlruns=1
-text.opts.advopts.maptype=FONT
-text.Rendering.tests.drawString=disabled
-text.Rendering.tests.drawChars=disabled
-text.Rendering.tests.drawBytes=disabled
-text.Rendering.tests.drawGlyphVectors=disabled
-text.Rendering.tests.drawTextLayout=disabled
-text.Measuring.tests.stringWidth=disabled
-text.Measuring.tests.stringBounds=disabled
-text.Measuring.tests.charsWidth=disabled
-text.Measuring.tests.charsBounds=disabled
-text.Measuring.tests.fontcandisplay=disabled
-text.Measuring.tests.gvWidth=disabled
-text.Measuring.tests.gvLogicalBounds=disabled
-text.Measuring.tests.gvVisualBounds=disabled
-text.Measuring.tests.gvPixelBounds=disabled
-text.Measuring.tests.gvOutline=disabled
-text.Measuring.tests.gvGlyphLogicalBounds=disabled
-text.Measuring.tests.gvGlyphVisualBounds=disabled
-text.Measuring.tests.gvGlyphPixelBounds=disabled
-text.Measuring.tests.gvGlyphOutline=disabled
-text.Measuring.tests.gvGlyphTransform=disabled
-text.Measuring.tests.gvGlyphMetrics=disabled
-text.Measuring.tests.tlAdvance=disabled
-text.Measuring.tests.tlAscent=disabled
-text.Measuring.tests.tlBounds=disabled
-text.Measuring.tests.tlGetCaretInfo=disabled
-text.Measuring.tests.tlGetNextHit=disabled
-text.Measuring.tests.tlGetCaretShape=disabled
-text.Measuring.tests.tlGetLogicalHighlightShape=disabled
-text.Measuring.tests.tlHitTest=disabled
-text.Measuring.tests.tlOutline=disabled
-text.construction.tests.gvfromfontstring=disabled
-text.construction.tests.gvfromfontchars=disabled
-text.construction.tests.gvfromfontci=disabled
-text.construction.tests.gvfromfontglyphs=disabled
-text.construction.tests.gvfromfontlayout=disabled
-text.construction.tests.tlfromfont=disabled
-text.construction.tests.tlfrommap=disabled
-imageio.opts.size=250
-imageio.opts.content=photo
-imageio.input.opts.general.source.file=disabled
-imageio.input.opts.general.source.url=disabled
-imageio.input.opts.general.source.byteArray=disabled
-imageio.input.opts.imageio.useCache=Off
-imageio.input.image.toolkit.opts.format=
-imageio.input.image.toolkit.tests.createImage=disabled
-imageio.input.image.imageio.opts.format=
-imageio.input.image.imageio.tests.imageioRead=disabled
-imageio.input.image.imageio.reader.opts.seekForwardOnly=On
-imageio.input.image.imageio.reader.opts.ignoreMetadata=On
-imageio.input.image.imageio.reader.opts.installListener=Off
-imageio.input.image.imageio.reader.tests.read=disabled
-imageio.input.image.imageio.reader.tests.getImageMetadata=disabled
-imageio.input.stream.tests.construct=disabled
-imageio.input.stream.tests.read=disabled
-imageio.input.stream.tests.readByteArray=disabled
-imageio.input.stream.tests.readFullyByteArray=disabled
-imageio.input.stream.tests.readBit=disabled
-imageio.input.stream.tests.readByte=disabled
-imageio.input.stream.tests.readUnsignedByte=disabled
-imageio.input.stream.tests.readShort=disabled
-imageio.input.stream.tests.readUnsignedShort=disabled
-imageio.input.stream.tests.readInt=disabled
-imageio.input.stream.tests.readUnsignedInt=disabled
-imageio.input.stream.tests.readFloat=disabled
-imageio.input.stream.tests.readLong=disabled
-imageio.input.stream.tests.readDouble=disabled
-imageio.input.stream.tests.skipBytes=disabled
-imageio.output.opts.general.dest.file=disabled
-imageio.output.opts.general.dest.byteArray=disabled
-imageio.output.opts.imageio.useCache=Off
-imageio.output.image.imageio.opts.format=
-imageio.output.image.imageio.tests.imageioWrite=disabled
-imageio.output.image.imageio.writer.opts.installListener=Off
-imageio.output.image.imageio.writer.tests.write=disabled
-imageio.output.stream.tests.construct=disabled
-imageio.output.stream.tests.write=disabled
-imageio.output.stream.tests.writeByteArray=disabled
-imageio.output.stream.tests.writeBit=disabled
-imageio.output.stream.tests.writeByte=disabled
-imageio.output.stream.tests.writeShort=disabled
-imageio.output.stream.tests.writeInt=disabled
-imageio.output.stream.tests.writeFloat=disabled
-imageio.output.stream.tests.writeLong=disabled
-imageio.output.stream.tests.writeDouble=disabled
-cmm.opts.profiles=1001
-cmm.colorconv.data.fromRGB=disabled
-cmm.colorconv.data.toRGB=disabled
-cmm.colorconv.data.fromCIEXYZ=disabled
-cmm.colorconv.data.toCIEXYZ=disabled
-cmm.colorconv.ccop.ccopOptions.size=250
-cmm.colorconv.ccop.ccopOptions.content=photo
-cmm.colorconv.ccop.ccopOptions.srcType=INT_RGB
-cmm.colorconv.ccop.ccopOptions.dstType=INT_RGB
-cmm.colorconv.ccop.op_img=disabled
-cmm.colorconv.ccop.op_rst=disabled
-cmm.colorconv.ccop.op_draw=disabled
-cmm.colorconv.embed.embedOptions.Images=512x512
-cmm.colorconv.embed.embd_img_read=disabled
-cmm.profiles.getHeader=disabled
-cmm.profiles.getNumComponents=disabled

jb/project/tools/perf/run_dc.sh

@@ -1,49 +0,0 @@
-#!/bin/bash
-
-#set -euo pipefail
-set -x
-
-BASE_DIR=$(dirname "$0")
-source $BASE_DIR/run_inc.sh
-
-if [ -z "$DACAPOTEST_DIR" ]; then
-  DACAPOTEST_DIR="./"
-fi
-
-DACAPOTEST=${DACAPOTEST:='dacapo-9.12-bach.jar'}
-if [ -z "$DACAPOTEST" ]; then
-  if [ ! -f "$DACAPOTEST_DIR/$DACAPOTEST" ]; then
-    echo "ERR### cannot find $DACAPOTEST_DIR/$DACAPOTEST"
-    exit 2
-  fi
-fi
-
-
-TRACE=false
-
-if [[ ($# -eq 1 && "$1" == "-help") ]] ; then
-  echo "Usage: run_dc.sh [rendering_options]"
-  echo "$RENDER_OPS_DOC"
-  exit 3
-fi
-
-OPTS=""
-# use time + repeat
-OPTS="$OPTS -no-validation $1"
-
-echo "OPTS: $OPTS"
-
-echo "Unit: Milliseconds (not FPS), lower is better"
-
-for i in `seq $N` ; do 
-  if [ $i -eq 1 ]; then
-    echo x
-  fi
-
-  $JAVA \
-  -jar $DACAPOTEST $OPTS 2>&1 | tee dacapo_$1$MODE_$i.log | grep "PASSED" | awk '{print $7 }'
-
-  if [ $i -ne $N ]; then
-    sleep $ST
-  fi
-done | $DATAMASH_CMD | expand -t12 > dacapo_$1.log

jb/project/tools/perf/run_inc.sh

@@ -1,127 +0,0 @@
-export LC_ALL=C
-ST=1 # sleep between iterations
-
-# number of iterations (jvm spawned)
-N=5
-# number of repeats (within jvm)
-R=3
-
-type datamash 2>&1 > /dev/null ; ec=$?
-if [ $ec -ne 0 ] ; then
-  echo "Missing datamash utility"
-  exit 1
-fi
-
-DATAMASH_CMD="datamash --format=%.2f -H count x min x q1 x median x q3 x max x mad x"
-
-J2D_OPTS=""
-OS=""
-case "$OSTYPE" in
-  linux*)  echo "Linux" 
-      ;;	  
-  darwin*)  echo "OSX" 
-      ;; 
-  *)        echo "unknown: $OSTYPE" 
-      exit 1
-      ;;
-esac
-
-read -r -d '' RENDER_OPS_DOC << EOM
-rendering_options:
-  -opengl # OpenGL pipeline (windows, linux, macOS)
-  -metal  # Metal pipeline (macOS)
-  -vulkan # Vulkan pipeline (WLToolkit)
-  -accelsd # Vulkan full acceleration (WLToolkit, Vulkan)
-  -tk tk_name # AWT toolkit (linux: WLToolkit|XToolkit)
-  -scale # UI scale
-  -N num # Number of iterations (JVM runs)
-  -R num # Number of repeats in the test
-EOM
-
-while [ $# -ge 1 ] ; do
-  case "$1" in
-    -opengl) J2D_OPTS=$J2D_OPTS" -Dsun.java2d.opengl=true"
-      shift
-        ;;
-    -metal) J2D_OPTS=$J2D_OPTS" -Dsun.java2d.metal=true"
-      shift
-        ;;
-    -vulkan) J2D_OPTS=$J2D_OPTS" -Dsun.java2d.vulkan=true"    
-      shift  
-        ;;
-    -accelsd) J2D_OPTS=$J2D_OPTS" -Dsun.java2d.vulkan.accelsd=true"
-      shift
-        ;;
-    -tk) shift
-      if [ $# -ge 1 ] ; then
-        J2D_OPTS=$J2D_OPTS" -Dawt.toolkit.name="$1
-         shift
-      else
-         echo "Invalid parameters for -tk option. Use: -tk tkname"
-         exit 1
-      fi
-      ;;
-    -N) shift
-      if [ $# -ge 1 ] ; then
-         N=$1  
-         shift
-      else
-         echo "Invalid parameters for -N option. Use: -N <number>"
-         exit 1
-      fi
-      ;;
-    -R) shift
-      if [ $# -ge 1 ] ; then
-         R=$1  
-         shift
-      else
-         echo "Invalid parameters for -R option. Use: -R <number>"
-         exit 1
-      fi
-      ;;
-    -scale) shift
-      if [ $# -ge 1 ] ; then
-        J2D_OPTS=$J2D_OPTS" -Dsun.java2d.uiScale="$1
-         shift
-      else
-         echo "Invalid parameters for -scale option. Use: -scale scale"
-         exit 1
-      fi
-      ;;
-    -dSync) shift   
-      if [ $# -ge 1 ] ; then
-        J2D_OPTS=$J2D_OPTS" -Dsun.java2d.metal.displaySync="$1
-         shift
-      else
-         echo "Invalid parameters for -dSync option. Use: -dSync [true|false]"
-         exit 1
-      fi
-        ;;
-    -jdk) shift
-      if [ $# -ge 1 ] ; then
-         JAVA=$1/bin/java
-         shift
-      else
-         echo "Invalid parameters for -jdk option"
-         exit 1
-      fi
-        ;;
-      *) break
-        ;;
-  esac
-done    
-if [ -z "$JAVA" ] ; then
-    BUILD_DIR=`find $BASE_DIR/../../../../build -name '*-release' -type d | head -n 1`
-    JAVA=`find $BUILD_DIR/images/jdk -name java -type f | head -n 1`
-fi
-
-JAVA_HOME=`dirname $JAVA`/../
-"$JAVA" -version
-
-LANG=C
-
-WS_ROOT=$BASE_DIR/../../../..
-
-echo "N: $N"
-echo "R: $R"  
-echo "J2D_OPTS: $J2D_OPTS"

jb/project/tools/perf/run_j2b.sh

@@ -1,53 +0,0 @@
-#!/bin/bash
-
-BASE_DIR=$(dirname "$0")
-source $BASE_DIR/run_inc.sh
-
-J2DBENCH_DIR=$WS_ROOT/src/demo/share/java2d/J2DBench
-
-if [ -z "$J2DBENCH" ]; then
-  if [ ! -f "$J2DBENCH_DIR/dist/J2DBench.jar" ]; then
-    PATH=$JAVA_HOME/bin:$PATH make -C $J2DBENCH_DIR
-  fi
-  if [ ! -f "$J2DBENCH_DIR/dist/J2DBench.jar" ]; then
-    echo "Cannot build J2DBench. You may use J2DBench env variable instead pointing to the J2DBench.jar."
-    exit 1
-  fi
-  J2DBENCH=$J2DBENCH_DIR/dist/J2DBench.jar
-fi
-
-if [ $# -ne 1 ] ; then
-  echo "Usage: run_j2b.sh [rendering_options] bench_name"
-  echo 
-  echo "bench_name: poly250 poly250-rand_col poly250-AA-rand_col"
-  echo ""            
-  echo "$RENDER_OPS_DOC"
-  exit 2
-fi 
-
-if [ ! -f "$BASE_DIR/j2dbopts_$1.txt" ]; then
-  echo "Unknown test: $1"
-  exit 1
-fi
- 
-
-
-OPTS="j2dbopts_$1.txt"
-#OPTS=j2dbopts_poly250.txt
-#OPTS=j2dbopts_poly250-rand_col.txt
-#OPTS=j2dbopts_poly250-AA-rand_col.txt
-
-echo "OPTS: $OPTS"
-
-for i in `seq $N`; do 
-  if [ $i -eq 1 ]; then
-    echo x
-  fi
-  echo `$JAVA $J2D_OPTS -jar $J2DBENCH \
-  -batch -loadopts $BASE_DIR/$OPTS -saveres pl.res \
-  -title pl -desc pl | awk '/averaged/{print $3}' | head -n1`
-
-  if [ $i -ne $N ]; then
-    sleep $ST
-  fi
-done | $DATAMASH_CMD | expand -t12

jb/project/tools/perf/run_rp.sh

@@ -1,88 +0,0 @@
-#!/bin/bash
-
-#set -euo pipefail
-#set -x
-
-BASE_DIR=$(dirname "$0")
-source $BASE_DIR/run_inc.sh
-
-RENDERPERFTEST_DIR=$WS_ROOT/test/jdk/performance/client/RenderPerfTest
-RENDERPERFTEST=""
-if [ -z "$RENDERPERFTEST" ]; then
-  if [ ! -f "$RENDERPERFTEST_DIR/dist/RenderPerfTest.jar" ]; then
-    PATH=$JAVA_HOME/bin:$PATH make -C $RENDERPERFTEST_DIR
-  fi
-  if [ ! -f "$RENDERPERFTEST_DIR/dist/RenderPerfTest.jar" ]; then
-    echo "Cannot build RenderPerfTest. You may use RENDERPERFTEST env variable instead pointing to the RenderPerfTest.jar."
-    exit 1
-  fi
-  RENDERPERFTEST=$RENDERPERFTEST_DIR/dist/RenderPerfTest.jar
-fi
-
-TRACE=false
-
-# removes leading hyphen
-mode_param="${1/-}"
-MODE="Robot"
-while [ $# -ge 1 ] ; do
-  case "$1" in
-    -onscreen) MODE="Robot"
-      shift
-        ;;
-    -volatile) MODE="Volatile"
-      shift
-        ;;
-    -buffer) MODE="Buffer"
-      shift
-        ;;
-      *) break
-        ;;
-  esac
-done    
-
-if [[ ($# -eq 1 && "$1" == "-help") || ($# -eq 0)  ]] ; then
-  echo "Usage: run_rp.sh [rp_rendering_mode] [rendering_options] bench_name"
-  echo 
-  echo "bench_name: ArgbSurfaceBlitImage ArgbSwBlitImage BgrSurfaceBlitImage BgrSwBlitImage"
-  echo "            Image ImageAA Image_XOR VolImage VolImageAA"
-  echo "            ClipFlatBox ClipFlatBoxAA ClipFlatOval ClipFlatOvalAA"
-  echo "            FlatBox FlatBoxAA FlatOval FlatOvalAA FlatOval_XOR FlatQuad FlatQuadAA"
-  echo "            RotatedBox RotatedBoxAA RotatedBox_XOR RotatedOval RotatedOvalAA" 
-  echo "            WiredBox WiredBoxAA WiredBubbles WiredBubblesAA WiredQuad WiredQuadAA"
-  echo "            Lines LinesAA Lines_XOR"
-  echo "            TextGray TextLCD TextLCD_XOR TextNoAA TextNoAA_XOR"
-  echo "            LargeTextGray LargeTextLCD LargeTextNoAA WhiteTextGray WhiteTextLCD WhiteTextNoAA"
-  echo "            LinGrad3RotatedOval LinGrad3RotatedOvalAA LinGradRotatedOval LinGradRotatedOvalAA"
-  echo "            RadGrad3RotatedOval RadGrad3RotatedOvalAA" 
-  echo ""            
-  echo "rp_rendering_mode: "
-  echo "            -onscreen : rendering to the window and check it using Robot" 
-  echo "            -volatile : rendering to volatile image (default)" 
-  echo "            -buffer   : rendering to buffered image" 
-  echo "$RENDER_OPS_DOC"
-  exit 2
-fi
-
-OPTS=""
-# use time + repeat
-OPTS="$OPTS -t -n=$N  -e$MODE $1"
-
-echo "OPTS: $OPTS"
-
-echo "Unit: Milliseconds (not FPS), lower is better"
-for i in `seq $R` ; do 
-  if [ $i -eq 1 ]; then
-    echo x
-  fi
-
-#  echo "[debug] " + "test run"
-#  $JAVA $J2D_OPTS -DTRACE=$TRACE \
-#  -jar $RENDERPERFTEST $OPTS 2>&1 | awk '/'$1'/{print $3 }' | tee test_run.log
-
-  $JAVA $J2D_OPTS -DTRACE=$TRACE \
-  -jar $RENDERPERFTEST $OPTS -v 2>&1 | tee render_$1_${mode_param}_$i.log | grep -v "^#" | tail -n 1 | \
-  awk '{print $3 }'
-  if [ $i -ne $N ]; then
-    sleep $ST
-  fi
-done | $DATAMASH_CMD | expand -t12 | tee render_$1_${mode_param}.log

jb/project/tools/perf/run_sm.sh

@@ -1,39 +0,0 @@
-#!/bin/bash
-
-BASE_DIR=$(dirname "$0")
-source $BASE_DIR/run_inc.sh
-
-SWINGMARK_DIR=$WS_ROOT/test/jdk/performance/client/SwingMark
-
-if [ -z "$SWINGMARK" ]; then
-  if [ ! -f "$SWINGMARK_DIR/dist/SwingMark.jar" ]; then
-    PATH=$JAVA_HOME/bin:$PATH make -C $SWINGMARK_DIR
-  fi
-  if [ ! -f "$SWINGMARK_DIR/dist/SwingMark.jar" ]; then
-    echo "Cannot build SwingMark. You may use SWINGMARK env variable instead pointing to the SwingMark.jar."
-    exit 1
-  fi
-  SWINGMARK=$SWINGMARK_DIR/dist/SwingMark.jar
-fi
-
-if [ $# -eq 1 -a "$1" == "--help" ] ; then
-  shift	
-  echo "Usage: run_sm [rendering_options]"
-  echo ""            
-  echo "$RENDER_OPS_DOC"
-  exit 0
-fi 
-
-for i in `seq $N` ; do 
-  if [ $i -eq 1 ]; then
-    echo x
-  fi
- 
-  # SwingMark gives 1 global 'Score: <value>'
-  echo `$JAVA $J2D_OPTS -jar $BASE_DIR/../../../../test/jdk/performance/client/SwingMark/dist/SwingMark.jar \
-  -r $R -q -lf javax.swing.plaf.metal.MetalLookAndFeel | awk '/Score/{print $2}'`
-
-  if [ $i -ne $N ]; then
-    sleep $ST
-  fi
-done | $DATAMASH_CMD | expand -t12

jb/project/tools/test/check_jbr_size.sh

@@ -1,162 +0,0 @@
-#!/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

@@ -1,93 +0,0 @@
-#!/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

@@ -1,155 +0,0 @@
-#!/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 \
-    $DISABLE_WARNINGS_AS_ERRORS \
-    $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
-    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 || do_exit $?
-    make LOG=info CONF=$RELEASE_NAME images test-image JBR_API_JBR_VERSION=TEST || do_exit $?
-  else
-    make LOG=info CONF=$RELEASE_NAME clean || do_exit $?
-    make LOG=info CONF=$RELEASE_NAME images || do_exit $?
-  fi
-else
-  if [ $do_maketest -eq 1 ]; then
-    make LOG=info CONF=$RELEASE_NAME images test-image 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
-  if [ "$bundle_type" == "jcef" ]; 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
-    cat $JCEF_PATH/jcef.version >> $JSDK/release
-  fi
-  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 $?
-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" == "$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

@@ -1,148 +0,0 @@
-#!/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 \
-    $DISABLE_WARNINGS_AS_ERRORS \
-    $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=''
-  __cds_opt=''
-  __cds_opt="--generate-cds-archive"
-
-  [ "$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 \
-    $__cds_opt --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
-    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 || do_exit $?
-    make LOG=info CONF=$RELEASE_NAME images test-image JBR_API_JBR_VERSION=TEST || do_exit $?
-  else
-    make LOG=info CONF=$RELEASE_NAME clean || do_exit $?
-    make LOG=info CONF=$RELEASE_NAME images || do_exit $?
-  fi
-else
-  if [ $do_maketest -eq 1 ]; then
-    make LOG=info CONF=$RELEASE_NAME images test-image 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
-  if [ "$bundle_type" == "jcef" ]; 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
-    cat $JCEF_PATH/jcef.version >> $JSDK/release
-  fi
-  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 $?
-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" == "$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

@@ -1,138 +0,0 @@
-#!/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 \
-    $DISABLE_WARNINGS_AS_ERRORS \
-    $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=''
-  __cds_opt=''
-  __cds_opt="--generate-cds-archive"
-
-  [ "$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 \
-    $__cds_opt --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
-    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 || do_exit $?
-    make LOG=info CONF=$RELEASE_NAME images test-image JBR_API_JBR_VERSION=TEST || do_exit $?
-  else
-    make LOG=info CONF=$RELEASE_NAME clean || do_exit $?
-    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_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
-  if [ "$bundle_type" == "jcef" ]; 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
-  fi
-
-  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

@@ -1,59 +0,0 @@
-#!/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 ...
-  chmod -R ug+rwx,o+rx ${BASE_DIR}/$__root_dir
-  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__root_dir || do_exit $?
-
-  echo Creating $JBR.zip ...
-  /usr/bin/zip -r $JBR.zip $__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
-  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

@@ -1,59 +0,0 @@
-#!/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 $?
-
-  echo Creating $JBR.zip ...
-  /usr/bin/zip -r $JBR.zip $__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
-  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

@@ -1,55 +0,0 @@
-#!/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 $?
-
-  echo Creating $JBR.zip ...
-  /usr/bin/zip -r $JBR.zip $__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
-  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/Bundles.gmk

@@ -301,7 +301,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
 	$(call LogWarn, Signing $(JDK_BUNDLE_NAME))
 	$(CODESIGN) -s "$(MACOSX_CODESIGN_IDENTITY)" \
 	    --timestamp --options runtime --deep --force \
-	    $(JDK_MACOSX_BUNDLE_DIR_SIGNED)/$(JDK_MACOSX_BUNDLE_TOP_SUBDIR) $(LOG_DEBUG)
+	    $(JDK_MACOSX_BUNDLE_DIR_SIGNED)/$(JDK_MACOSX_BUNDLE_TOP_DIR) $(LOG_DEBUG)
 	$(TOUCH) $@
 
     $(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \
@@ -330,7 +330,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
 	$(call LogWarn, Signing $(JRE_BUNDLE_NAME))
 	$(CODESIGN) -s "$(MACOSX_CODESIGN_IDENTITY)" \
 	    --timestamp --options runtime --deep --force \
-	    $(JRE_MACOSX_BUNDLE_DIR_SIGNED)/$(JRE_MACOSX_BUNDLE_TOP_SUBDIR) $(LOG_DEBUG)
+	    $(JRE_MACOSX_BUNDLE_DIR_SIGNED)/$(JRE_MACOSX_BUNDLE_TOP_DIR) $(LOG_DEBUG)
 	$(TOUCH) $@
 
     $(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \

make/CompileJavaModules.gmk

@@ -85,7 +85,7 @@ CreateHkTargets = \
 ################################################################################
 # Include module specific build settings
 
-THIS_SNIPPET := $(call GetModuleSnippetName, Java)
+THIS_SNIPPET := modules/$(MODULE)/Java.gmk
 
 ifneq ($(wildcard $(THIS_SNIPPET)), )
   include MakeSnippetStart.gmk
@@ -107,7 +107,6 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
     BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \
     HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
     CREATE_API_DIGEST := true, \
-    PROCESS_JBR_API := true, \
     CLEAN := $(CLEAN), \
     CLEAN_FILES := $(CLEAN_FILES), \
     COPY := $(COPY), \
@@ -116,7 +115,6 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
     EXCLUDE_FILES := $(EXCLUDE_FILES), \
     EXCLUDE_PATTERNS := -files, \
     KEEP_ALL_TRANSLATIONS := $(KEEP_ALL_TRANSLATIONS), \
-    TARGET_RELEASE := $(TARGET_RELEASE), \
     JAVAC_FLAGS := \
         $(DOCLINT) \
         $(JAVAC_FLAGS) \

make/CompileToolsJdk.gmk

@@ -80,7 +80,7 @@ $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \
     TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
     SRC := $(TOPDIR)/make/jdk/src/classes, \
     INCLUDES := build/tools/depend, \
-    BIN := $(BUILDTOOLS_OUTPUTDIR)/plugins, \
+    BIN := $(BUILDTOOLS_OUTPUTDIR)/depend, \
     DISABLED_WARNINGS := options, \
     JAVAC_FLAGS := \
         --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
@@ -93,21 +93,13 @@ $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \
         --add-exports jdk.internal.opt/jdk.internal.opt=jdk.javadoc.interim, \
 ))
 
-$(eval $(call SetupJavaCompilation, COMPILE_JBR_API_PLUGIN, \
-    TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
-    SRC := $(TOPDIR)/make/jdk/src/classes, \
-    INCLUDES := build/tools/jbrapi, \
-    BIN := $(BUILDTOOLS_OUTPUTDIR)/plugins, \
-))
+DEPEND_SERVICE_PROVIDER := $(BUILDTOOLS_OUTPUTDIR)/depend/META-INF/services/com.sun.source.util.Plugin
 
-PLUGINS_SERVICE_PROVIDER := $(BUILDTOOLS_OUTPUTDIR)/plugins/META-INF/services/com.sun.source.util.Plugin
-
-$(PLUGINS_SERVICE_PROVIDER):
-	$(call MakeDir, $(BUILDTOOLS_OUTPUTDIR)/plugins/META-INF/services)
+$(DEPEND_SERVICE_PROVIDER):
+	$(call MakeDir, $(BUILDTOOLS_OUTPUTDIR)/depend/META-INF/services)
 	$(ECHO) build.tools.depend.Depend > $@
-	$(ECHO) build.tools.jbrapi.JBRApiPlugin >> $@
 
-TARGETS += $(COMPILE_DEPEND) $(COMPILE_JBR_API_PLUGIN) $(PLUGINS_SERVICE_PROVIDER)
+TARGETS += $(COMPILE_DEPEND) $(DEPEND_SERVICE_PROVIDER)
 
 ################################################################################
 

make/CreateJmods.gmk

@@ -184,7 +184,7 @@ endif
 ################################################################################
 # Include module specific build settings
 
-THIS_SNIPPET := $(call GetModuleSnippetName, Jmod)
+THIS_SNIPPET := modules/$(MODULE)/Jmod.gmk
 
 ifneq ($(wildcard $(THIS_SNIPPET)), )
   include MakeSnippetStart.gmk
@@ -257,7 +257,6 @@ $(eval $(call SetupExecute, create_$(JMOD_FILE), \
     WARN := Creating $(INTERIM_MSG)$(JMOD_FILE), \
     DEPS := $(DEPS), \
     OUTPUT_FILE := $(JMODS_DIR)/$(JMOD_FILE), \
-    WORKING_DIR := $(WORKSPACE_ROOT), \
     SUPPORT_DIR := $(JMODS_SUPPORT_DIR), \
     PRE_COMMAND := $(RM) $(JMODS_DIR)/$(JMOD_FILE) $(JMODS_SUPPORT_DIR)/$(JMOD_FILE), \
     COMMAND := $(JMOD) $(JMOD_SMALL_FLAGS) create --module-version $(VERSION_SHORT) \

make/Docs.gmk

@@ -236,8 +236,8 @@ define create_overview_file
       #
   ifneq ($$($1_GROUPS), )
     $1_OVERVIEW_TEXT += \
-      <p>This document has \
-      $$(subst 2,two,$$(subst 3,three,$$(words $$($1_GROUPS)))) major sections:</p> \
+      <p>This document is divided into \
+      $$(subst 2,two,$$(subst 3,three,$$(words $$($1_GROUPS)))) sections:</p> \
       <blockquote><dl> \
       #
     $1_OVERVIEW_TEXT += $$(foreach g, $$($1_GROUPS), \
@@ -246,10 +246,7 @@ define create_overview_file
     )
     $1_OVERVIEW_TEXT += \
         </dl></blockquote> \
-    <p><a href="../specs/index.html">Related documents</a> specify the Java \
-    programming language, the Java Virtual Machine, various protocols and file \
-    formats pertaining to the Java platform, and tools included in the JDK.</p> \
-    #
+        #
   endif
   $1_OVERVIEW_TEXT += \
       </body></html> \

make/Hsdis.gmk

@@ -114,6 +114,7 @@ ifeq ($(HSDIS_BACKEND), binutils)
     TOOLCHAIN_TYPE := gcc
     OPENJDK_TARGET_OS := linux
     OPENJDK_TARGET_OS_TYPE := unix
+    CC_OUT_OPTION := -o$(SPACE)
     GENDEPS_FLAGS := -MMD -MF
     CFLAGS_DEBUG_SYMBOLS := -g
     DISABLED_WARNINGS :=

make/Images.gmk

@@ -270,7 +270,6 @@ endif
 # Since debug symbols are not included in the jmod files, they need to be copied
 # in manually after generating the images.
 
-# These variables are read by SetupCopyDebuginfo
 ALL_JDK_MODULES := $(JDK_MODULES)
 ALL_JRE_MODULES := $(sort $(JRE_MODULES), $(foreach m, $(JRE_MODULES), \
     $(call FindTransitiveDepsForModule, $m)))

make/JBRApi.gmk

@@ -1,74 +0,0 @@
-#
-# 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 Utils.gmk
-
-JBR_API_ORIGIN := https://github.com/JetBrains/JetBrainsRuntimeApi.git
-JBR_API_DIR    := $(TOPDIR)/jbr-api
-
-ARTIFACT_NAME := jbr-api-SNAPSHOT
-ifeq ($(call isBuildOsEnv, windows.cygwin windows.msys2), true)
-    HOME    := $$USERPROFILE
-    M2_REPO := $(shell $(PATHTOOL) $(HOME))/.m2/repository
-else ifeq ($(call isBuildOsEnv, windows.wsl1 windows.wsl2), true)
-    HOME    := `cmd.exe /C "echo %USERPROFILE%" 2> /dev/null`
-    M2_REPO := $(shell $(PATHTOOL) $(HOME))/.m2/repository
-else
-    M2_REPO := $(HOME)/.m2/repository
-endif
-M2_ARTIFACT := $(M2_REPO)/org/jetbrains/runtime/jbr-api/SNAPSHOT
-M2_POM_CONTENT := \
-    <?xml version="1.0" encoding="UTF-8"?> \
-    <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" \
-        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> \
-      <modelVersion>4.0.0</modelVersion> \
-      <groupId>org.jetbrains.runtime</groupId> \
-      <artifactId>jbr-api</artifactId> \
-      <version>SNAPSHOT</version> \
-    </project> \
-
-jbr-api:
-	if [ -d "$(JBR_API_DIR)" ]; then \
-	    $(GIT) -C "$(JBR_API_DIR)" fetch; \
-	    $(GIT) -C "$(JBR_API_DIR)" merge-base --is-ancestor origin/main HEAD || \
-	        $(ECHO) "!!! Current JBR API revision is outdated, update the branch in $(JBR_API_DIR) !!!"; \
-	else \
-	    $(ECHO) "JBR API directory does not exist. Initializing..."; \
-	    $(GIT) clone "$(JBR_API_ORIGIN)" "$(JBR_API_DIR)" --config core.autocrlf=false; \
-	fi
-	$(BASH) "$(JBR_API_DIR)/tools/build.sh" dev "$(BOOT_JDK)"
-	if [ -d "$(M2_REPO)" ]; then \
-	    $(MKDIR) -p $(M2_ARTIFACT); \
-	    $(ECHO) '$(M2_POM_CONTENT)' > $(M2_ARTIFACT)/$(ARTIFACT_NAME).pom; \
-	    $(CP) "$(JBR_API_DIR)/out/$(ARTIFACT_NAME).jar" "$(M2_ARTIFACT)"; \
-	    $(ECHO) "Installed into local Maven repository as org.jetbrains.runtime:jbr-api:SNAPSHOT"; \
-	    cd "$(M2_ARTIFACT)" && sha256sum --binary "$(ARTIFACT_NAME).jar"; \
-	else \
-	    $(ECHO) "No Maven repository found at $(M2_REPO) - skipping local installation"; \
-	fi
-
-.PHONY: jbr-api

make/Main.gmk

@@ -358,7 +358,7 @@ $(eval $(call SetupTarget, vscode-project-ccls, \
 
 $(eval $(call SetupTarget, idea-gen-config, \
     MAKEFILE := ide/idea/jdk/IdeaGenConfig, \
-    ARGS := IDEA_OUTPUT="$(IDEA_OUTPUT)" MODULES="$(MODULES)" TOPLEVEL_DIR="$(TOPLEVEL_DIR)" IDEA_OUTPUT_PARENT="$(IDEA_OUTPUT_PARENT)", \
+    ARGS := IDEA_OUTPUT="$(IDEA_OUTPUT)" MODULES="$(MODULES)", \
 ))
 
 ################################################################################
@@ -1014,7 +1014,7 @@ else
   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 java.base-launchers
+    jdk.compiler-gendata: jdk.compiler-launchers
     jdk.javadoc-gendata: jdk.compiler-launchers
   endif
 
@@ -1407,7 +1407,7 @@ CLEAN_SUPPORT_DIRS += demos
 CLEAN_SUPPORT_DIR_TARGETS := $(addprefix clean-, $(CLEAN_SUPPORT_DIRS))
 CLEAN_TESTS += hotspot-jtreg-native jdk-jtreg-native lib
 CLEAN_TEST_TARGETS += $(addprefix clean-test-, $(CLEAN_TESTS))
-CLEAN_PHASES += gensrc java native include
+CLEAN_PHASES := gensrc java native include
 CLEAN_PHASE_TARGETS := $(addprefix clean-, $(CLEAN_PHASES))
 CLEAN_MODULE_TARGETS := $(addprefix clean-, $(ALL_MODULES))
 # Construct targets of the form clean-$module-$phase
@@ -1500,14 +1500,6 @@ 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 \
-))
-
 .PHONY: $(ALL_TARGETS)
 
 FRC: # Force target

make/MainSupport.gmk

@@ -149,7 +149,7 @@ endef
 
 ################################################################################
 
-PHASE_MAKEDIRS += $(TOPDIR)/make
+PHASE_MAKEDIRS := $(TOPDIR)/make
 
 # Helper macro for DeclareRecipesForPhase
 # Declare a recipe for calling the module and phase specific makefile.

make/ModuleWrapper.gmk

@@ -34,23 +34,18 @@ include MakeFileStart.gmk
 ################################################################################
 
 include CopyFiles.gmk
-include Modules.gmk
 
 MODULE_SRC := $(TOPDIR)/src/$(MODULE)
 
-################################################################################
-# Include module specific build settings
+# Define the snippet for MakeSnippetStart/End
+THIS_SNIPPET := modules/$(MODULE)/$(MAKEFILE_PREFIX).gmk
 
-THIS_SNIPPET := $(call GetModuleSnippetName, $(MAKEFILE_PREFIX))
+include MakeSnippetStart.gmk
 
-ifneq ($(wildcard $(THIS_SNIPPET)), )
-  include MakeSnippetStart.gmk
+# Include the file being wrapped.
+include $(THIS_SNIPPET)
 
-  # Include the file being wrapped.
-  include $(THIS_SNIPPET)
-
-  include MakeSnippetEnd.gmk
-endif
+include MakeSnippetEnd.gmk
 
 ifeq ($(MAKEFILE_PREFIX), Lib)
   # We need to keep track of what libraries are generated/needed by this

make/RunTests.gmk

@@ -204,9 +204,8 @@ $(eval $(call SetTestOpt,AOT_JDK,JTREG))
 
 $(eval $(call ParseKeywordVariable, JTREG, \
     SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
-        TEST_MODE ASSERT VERBOSE RETAIN TEST_THREAD_FACTORY JVMTI_STRESS_AGENT \
-        MAX_MEM RUN_PROBLEM_LISTS RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT \
-        AOT_JDK $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
+        TEST_MODE ASSERT VERBOSE RETAIN TEST_THREAD_FACTORY MAX_MEM RUN_PROBLEM_LISTS \
+        RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT AOT_JDK $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
     STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
         EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \
         $(CUSTOM_JTREG_STRING_KEYWORDS), \
@@ -509,7 +508,7 @@ define SetupRunGtestTestBody
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
-	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, \
+	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, ( \
 	    $$(CD) $$($1_TEST_SUPPORT_DIR) && \
 	    $$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/$$($1_VARIANT)/gtestLauncher \
 	        -jdk $(JDK_UNDER_TEST) $$($1_GTEST_FILTER) \
@@ -520,7 +519,7 @@ define SetupRunGtestTestBody
 	        > >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) \
 	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
-	)
+	))
 
   $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt
 
@@ -644,7 +643,7 @@ define SetupRunMicroTestBody
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
-	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/micro, \
+	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/micro, ( \
 	    $$(CD) $$(TEST_IMAGE_DIR) && \
 	    $$(FIXPATH) $$($1_MICRO_TEST_JDK)/bin/java $$($1_MICRO_JAVA_OPTIONS) \
 	        -jar $$($1_MICRO_BENCHMARKS_JAR) \
@@ -655,7 +654,7 @@ define SetupRunMicroTestBody
 	        > >($(TEE) $$($1_TEST_RESULTS_DIR)/micro.txt) \
 	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
-	)
+	))
 
   $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/micro.txt
 
@@ -758,34 +757,34 @@ define SetupAOTBody
         ifeq ($$($1_TRAINING), onestep)
 
 	  $$(call LogWarn, AOT: Create AOT cache $$($1_AOT_JDK_CACHE) in one step with flags: $$($1_VM_OPTIONS)) \
-	  $$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), \
+	  $$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), ( \
 	      cd $$($1_AOT_JDK_OUTPUT_DIR); \
 	      $(JAR) --extract --file $(TEST_IMAGE_DIR)/setup_aot/TestSetupAOT.jar; \
 	      $$(FIXPATH) $(JDK_UNDER_TEST)/bin/java $$($1_VM_OPTIONS) \
-	          -Xlog:class+load$$(COMMA)aot$$(COMMA)aot+class=debug:file=$$($1_AOT_JDK_CACHE).log  -Xlog:cds*=error -Xlog:aot*=error  \
+	          -Xlog:class+load,aot,aot+class=debug:file=$$($1_AOT_JDK_CACHE).log  -Xlog:cds*=error -Xlog:aot*=error  \
 	          -XX:AOTMode=record -XX:AOTCacheOutput=$$($1_AOT_JDK_CACHE) \
 	          TestSetupAOT $$($1_AOT_JDK_OUTPUT_DIR) > $$($1_AOT_JDK_LOG) \
-	  )
+	  ))
 
         else
 
 	  $$(call LogWarn, AOT: Create cache configuration) \
-	  $$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), \
+	  $$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), ( \
 	      cd $$($1_AOT_JDK_OUTPUT_DIR); \
 	      $(JAR) --extract --file $(TEST_IMAGE_DIR)/setup_aot/TestSetupAOT.jar; \
 	      $$(FIXPATH) $(JDK_UNDER_TEST)/bin/java $$($1_VM_OPTIONS) \
-	          -Xlog:class+load$$(COMMA)aot$$(COMMA)aot+class=debug:file=$$($1_AOT_JDK_CONF).log  -Xlog:cds*=error -Xlog:aot*=error \
+	          -Xlog:class+load,aot,aot+class=debug:file=$$($1_AOT_JDK_CONF).log  -Xlog:cds*=error -Xlog:aot*=error \
 	          -XX:AOTMode=record -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) \
 	          TestSetupAOT $$($1_AOT_JDK_OUTPUT_DIR) > $$($1_AOT_JDK_LOG) \
-	  )
+	  ))
 
 	  $$(call LogWarn, AOT: Generate AOT cache $$($1_AOT_JDK_CACHE) with flags: $$($1_VM_OPTIONS))
-	  $$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), \
+	  $$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), ( \
 	      $$(FIXPATH) $(JDK_UNDER_TEST)/bin/java \
-	          $$($1_VM_OPTIONS) -Xlog:aot$$(COMMA)aot+class=debug:file=$$($1_AOT_JDK_CACHE).log -Xlog:cds*=error -Xlog:aot*=error \
+	          $$($1_VM_OPTIONS) -Xlog:aot,aot+class=debug:file=$$($1_AOT_JDK_CACHE).log -Xlog:cds*=error -Xlog:aot*=error \
 	          -XX:ExtraSharedClassListFile=$(JDK_UNDER_TEST)/lib/classlist \
 	          -XX:AOTMode=create -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) -XX:AOTCache=$$($1_AOT_JDK_CACHE) \
-	  )
+	  ))
 
         endif
 
@@ -877,15 +876,6 @@ define SetupRunJtregTestBody
     ))
   endif
 
-  ifneq ($$(JTREG_JVMTI_STRESS_AGENT), )
-    AGENT := $$(LIBRARY_PREFIX)JvmtiStressAgent$$(SHARED_LIBRARY_SUFFIX)=$$(JTREG_JVMTI_STRESS_AGENT)
-    $1_JTREG_BASIC_OPTIONS += -javaoption:'-agentpath:$(TEST_IMAGE_DIR)/hotspot/jtreg/native/$$(AGENT)'
-    $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
-	    $$(addprefix $$($1_TEST_ROOT)/, ProblemList-jvmti-stress-agent.txt) \
-        ))
-  endif
-
-
   ifneq ($$(JTREG_LAUNCHER_OPTIONS), )
     $1_JTREG_LAUNCHER_OPTIONS += $$(JTREG_LAUNCHER_OPTIONS)
   endif
@@ -946,8 +936,7 @@ define SetupRunJtregTestBody
   JTREG_ALL_OPTIONS := $$(JTREG_JAVA_OPTIONS) $$(JTREG_VM_OPTIONS)
 
   JTREG_AUTO_PROBLEM_LISTS :=
-  # Please reach consensus before changing this. It was not easy changing it to a `1`.
-  JTREG_AUTO_TIMEOUT_FACTOR := 1
+  JTREG_AUTO_TIMEOUT_FACTOR := 4
 
   ifneq ($$(findstring -Xcomp, $$(JTREG_ALL_OPTIONS)), )
     JTREG_AUTO_PROBLEM_LISTS += ProblemList-Xcomp.txt
@@ -1085,9 +1074,9 @@ define SetupRunJtregTestBody
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR) \
 	    $$($1_TEST_TMP_DIR))
-	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, \
+	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, ( \
             $$(COV_ENVIRONMENT) $$($1_COMMAND_LINE) \
-	)
+	))
 
   $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/text/stats.txt
 
@@ -1204,12 +1193,12 @@ define SetupRunSpecialTestBody
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
-	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/test-execution, \
+	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/test-execution, ( \
 	    $$($1_TEST_COMMAND_LINE) \
 	        > >($(TEE) $$($1_TEST_RESULTS_DIR)/test-output.txt) \
 	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
-	)
+	))
 
   # We can not parse the various "special" tests.
   parse-test-$1: run-test-$1
@@ -1254,7 +1243,7 @@ UseSpecialTestHandler = \
 # Now process each test to run and setup a proper make rule
 $(foreach test, $(TESTS_TO_RUN), \
   $(eval TEST_ID := $(shell $(ECHO) $(strip $(test)) | \
-      $(TR) -cs '[a-z][A-Z][0-9]\n' '_')) \
+      $(TR) -cs '[a-z][A-Z][0-9]\n' '[_*1000]')) \
   $(eval ALL_TEST_IDS += $(TEST_ID)) \
   $(if $(call UseCustomTestHandler, $(test)), \
     $(eval $(call SetupRunCustomTest, $(TEST_ID), \
@@ -1334,9 +1323,9 @@ run-test-report: post-run-test
 	    TEST TOTAL PASS FAIL ERROR SKIP " "
 	$(foreach test, $(TESTS_TO_RUN), \
 	  $(eval TEST_ID := $(shell $(ECHO) $(strip $(test)) | \
-	      $(TR) -cs '[a-z][A-Z][0-9]\n' '_')) \
+	      $(TR) -cs '[a-z][A-Z][0-9]\n' '[_*1000]')) \
 	    $(ECHO) >> $(TEST_LAST_IDS) $(TEST_ID) $(NEWLINE) \
-	  $(eval NAME_PATTERN := $(shell $(ECHO) $(test) | $(TR) -c '\n' '_')) \
+	  $(eval NAME_PATTERN := $(shell $(ECHO) $(test) | $(TR) -c '\n' '[_*1000]')) \
 	  $(if $(filter __________________________________________________%, $(NAME_PATTERN)), \
 	    $(eval TEST_NAME := ) \
 	    $(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s\n" "  " "$(test)"  $(NEWLINE) \

make/RunTestsPrebuiltSpec.gmk

@@ -176,19 +176,3 @@ ULIMIT := ulimit
 ifeq ($(OPENJDK_BUILD_OS), windows)
   PATHTOOL := cygpath
 endif
-
-# These settings are needed to run testing with jvmti agent
-ifeq ($(OPENJDK_BUILD_OS), linux)
-  LIBRARY_PREFIX := lib
-  SHARED_LIBRARY_SUFFIX := .so
-endif
-
-ifeq ($(OPENJDK_BUILD_OS), windows)
-  LIBRARY_PREFIX :=
-  SHARED_LIBRARY_SUFFIX := .dll
-endif
-
-ifeq ($(OPENJDK_BUILD_OS), macosx)
-  LIBRARY_PREFIX := lib
-  SHARED_LIBRARY_SUFFIX := .dylib
-endif

make/StaticLibs.gmk

@@ -111,14 +111,11 @@ else ifeq ($(call isTargetOs, aix), true)
       INFO := Generating export list for $(notdir $(lib)), \
       DEPS :=  $(lib), \
       OUTPUT_FILE := $(lib).exp, \
-      COMMAND := $(AR) $(ARFLAGS) -w $(lib) | $(GREP) -v '^\.' | $(AWK) '{print $$1}' | $(SORT) -u > $(lib).exp, \
+      COMMAND := ( $(AR) $(ARFLAGS) -w $(lib) | $(GREP) -v '^\.' | $(AWK) '{print $$1}' | $(SORT) -u > $(lib).exp ), \
     )) \
     $(eval STATIC_LIB_EXPORT_FILES += $(lib).exp) \
   )
   STATIC_LIBS := -Wl,-bexpfull $(STATIC_LIB_FILES) $(addprefix -Wl$(COMMA)-bE:, $(STATIC_LIB_EXPORT_FILES))
-  ifeq ($(DEBUG_LEVEL), slowdebug)
-    STATIC_LIBS += -Wl,-bbigtoc
-  endif
 else
   $(error Unsupported platform)
 endif

make/ToolsJdk.gmk

@@ -78,9 +78,6 @@ TOOL_GENERATECACERTS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_class
 TOOL_GENERATEEXTRAPROPERTIES = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.generateextraproperties.GenerateExtraProperties
 
-TOOL_GENERATECASEFOLDING = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
-    build.tools.generatecharacter.CaseFolding
-
 TOOL_MAKEZIPREPRODUCIBLE = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.makezipreproducible.MakeZipReproducible
 
@@ -130,9 +127,6 @@ TOOL_PUBLICSUFFIXLIST = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_clas
 TOOL_FIXUPPANDOC = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.fixuppandoc.Main
 
-TOOL_VARHANDLEGUARDMETHODGENERATOR = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
-    build.tools.methodhandle.VarHandleGuardMethodGenerator
-
 ################################################################################
 
 # Executable javascript filter for man page generation using pandoc.

make/ToolsLangtools.gmk

@@ -36,7 +36,7 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_LANGTOOLS, \
     COMPILER := bootjdk, \
     TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
     SRC := $(TOPDIR)/make/langtools/tools, \
-    INCLUDES := compileproperties flagsgenerator propertiesparser, \
+    INCLUDES := compileproperties propertiesparser, \
     COPY := .properties, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/langtools_tools_classes, \
 ))

make/UpdateSleefSource.gmk

@@ -81,8 +81,8 @@ SLEEF_CMAKE_FILE := toolchains/$(OPENJDK_TARGET_CPU)-$(SLEEF_TOOLCHAIN_TYPE).cma
 $(eval $(call SetupExecute, sleef_native_config, \
     INFO := Configuring native sleef build, \
     OUTPUT_DIR := $(SLEEF_NATIVE_BUILD_DIR), \
-    WORKING_DIR := $(SLEEF_SOURCE_DIR), \
-    COMMAND := $(CMAKE) -S . -B $(SLEEF_NATIVE_BUILD_DIR), \
+    COMMAND := cd $(SLEEF_SOURCE_DIR) && $(CMAKE) -S . -B \
+        $(SLEEF_NATIVE_BUILD_DIR), \
 ))
 
 TARGETS := $(sleef_native_config)
@@ -91,8 +91,8 @@ $(eval $(call SetupExecute, sleef_native_build, \
     INFO := Building native sleef, \
     DEPS := $(sleef_native_config), \
     OUTPUT_DIR := $(SLEEF_NATIVE_BUILD_DIR), \
-    WORKING_DIR := $(SLEEF_SOURCE_DIR), \
-    COMMAND := $(CMAKE) --build $(SLEEF_NATIVE_BUILD_DIR) -j, \
+    COMMAND := cd $(SLEEF_SOURCE_DIR) && $(CMAKE) --build \
+        $(SLEEF_NATIVE_BUILD_DIR) -j, \
 ))
 
 TARGETS := $(sleef_native_build)
@@ -101,8 +101,8 @@ $(eval $(call SetupExecute, sleef_cross_config, \
     INFO := Configuring cross-compiling sleef build, \
     DEPS := $(sleef_native_build), \
     OUTPUT_DIR := $(SLEEF_CROSS_BUILD_DIR), \
-    WORKING_DIR := $(SLEEF_SOURCE_DIR), \
-    COMMAND := $(CMAKE) -S . -B $(SLEEF_CROSS_BUILD_DIR) \
+    COMMAND := cd $(SLEEF_SOURCE_DIR) && $(CMAKE) -S . -B \
+        $(SLEEF_CROSS_BUILD_DIR) \
         -DCMAKE_C_COMPILER=$(CC) \
         -DCMAKE_TOOLCHAIN_FILE=$(SLEEF_CMAKE_FILE) \
         -DNATIVE_BUILD_DIR=$(SLEEF_NATIVE_BUILD_DIR) \
@@ -116,8 +116,8 @@ $(eval $(call SetupExecute, sleef_cross_build, \
     INFO := Building cross-compiling sleef, \
     DEPS := $(sleef_cross_config), \
     OUTPUT_DIR := $(SLEEF_NATIVE_BUILD_DIR), \
-    WORKING_DIR := $(SLEEF_SOURCE_DIR), \
-    COMMAND := $(CMAKE) --build $(SLEEF_CROSS_BUILD_DIR) -j, \
+    COMMAND := cd $(SLEEF_SOURCE_DIR) && $(CMAKE) --build \
+        $(SLEEF_CROSS_BUILD_DIR) -j, \
 ))
 
 TARGETS := $(sleef_cross_build)

make/autoconf/basic.m4

@@ -210,8 +210,17 @@ AC_DEFUN([BASIC_SETUP_XCODE_SYSROOT],
     if test $? -ne 0; then
       AC_MSG_ERROR([The xcodebuild tool in the devkit reports an error: $XCODEBUILD_OUTPUT])
     fi
+  elif test "x$TOOLCHAIN_PATH" != x; then
+    UTIL_LOOKUP_PROGS(XCODEBUILD, xcodebuild, $TOOLCHAIN_PATH)
+    if test "x$XCODEBUILD" != x; then
+      XCODEBUILD_OUTPUT=`"$XCODEBUILD" -version 2>&1`
+      if test $? -ne 0; then
+        AC_MSG_WARN([Ignoring the located xcodebuild tool $XCODEBUILD due to an error: $XCODEBUILD_OUTPUT])
+        XCODEBUILD=
+      fi
+    fi
   else
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(XCODEBUILD, xcodebuild)
+    UTIL_LOOKUP_PROGS(XCODEBUILD, xcodebuild)
     if test "x$XCODEBUILD" != x; then
       XCODEBUILD_OUTPUT=`"$XCODEBUILD" -version 2>&1`
       if test $? -ne 0; then
@@ -339,11 +348,21 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
 
   # You can force the sysroot if the sysroot encoded into the compiler tools
   # is not correct.
+  AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root],
+      [alias for --with-sysroot for backwards compatibility])],
+      [SYSROOT=$with_sys_root]
+  )
+
   AC_ARG_WITH(sysroot, [AS_HELP_STRING([--with-sysroot],
       [use this directory as sysroot])],
       [SYSROOT=$with_sysroot]
   )
 
+  AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir],
+      [alias for --with-toolchain-path for backwards compatibility])],
+      [UTIL_PREPEND_TO_PATH([TOOLCHAIN_PATH],$with_tools_dir)]
+  )
+
   AC_ARG_WITH([toolchain-path], [AS_HELP_STRING([--with-toolchain-path],
       [prepend these directories when searching for toolchain binaries (compilers etc)])],
       [UTIL_PREPEND_TO_PATH([TOOLCHAIN_PATH],$with_toolchain_path)]
@@ -352,9 +371,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
   AC_ARG_WITH([xcode-path], [AS_HELP_STRING([--with-xcode-path],
       [set up toolchain on Mac OS using a path to an Xcode installation])])
 
-  UTIL_DEPRECATED_ARG_WITH(sys-root)
-  UTIL_DEPRECATED_ARG_WITH(tools-dir)
-
   if test "x$with_xcode_path" != x; then
     if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then
       UTIL_PREPEND_TO_PATH([TOOLCHAIN_PATH],

make/autoconf/basic_tools.m4

@@ -207,14 +207,29 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE],
   UTIL_SETUP_TOOL(MAKE,
   [
     # Try our hardest to locate a correct version of GNU make
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(CHECK_GMAKE, gmake)
+    UTIL_LOOKUP_PROGS(CHECK_GMAKE, gmake)
     BASIC_CHECK_MAKE_VERSION("$CHECK_GMAKE", [gmake in PATH])
 
     if test "x$FOUND_MAKE" = x; then
-      UTIL_LOOKUP_TOOLCHAIN_PROGS(CHECK_MAKE, make)
+      UTIL_LOOKUP_PROGS(CHECK_MAKE, make)
       BASIC_CHECK_MAKE_VERSION("$CHECK_MAKE", [make in PATH])
     fi
 
+    if test "x$FOUND_MAKE" = x; then
+      if test "x$TOOLCHAIN_PATH" != x; then
+        # We have a toolchain path, check that as well before giving up.
+        OLD_PATH=$PATH
+        PATH=$TOOLCHAIN_PATH:$PATH
+        UTIL_LOOKUP_PROGS(CHECK_TOOLSDIR_GMAKE, gmake)
+        BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_GMAKE", [gmake in tools-dir])
+        if test "x$FOUND_MAKE" = x; then
+          UTIL_LOOKUP_PROGS(CHECK_TOOLSDIR_MAKE, make)
+          BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_MAKE", [make in tools-dir])
+        fi
+        PATH=$OLD_PATH
+      fi
+    fi
+
     if test "x$FOUND_MAKE" = x; then
       AC_MSG_ERROR([Cannot find GNU make $MAKE_REQUIRED_VERSION or newer! Please put it in the path, or add e.g. MAKE=/opt/gmake3.81/make as argument to configure.])
     fi
@@ -363,7 +378,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
 
   # Check if it's a GNU date compatible version
   AC_MSG_CHECKING([if date is a GNU compatible version])
-  check_date=`$DATE --version 2>&1 | $GREP "GNU\|BusyBox\|uutils"`
+  check_date=`$DATE --version 2>&1 | $GREP "GNU\|BusyBox"`
   if test "x$check_date" != x; then
     AC_MSG_RESULT([yes])
     IS_GNU_DATE=yes

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.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
+  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
     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.wsl1" || test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
+  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl2"; then
     # Change back from temp dir
     cd $CONFIGURE_START_DIR
   fi

make/autoconf/boot-jdk.m4

@@ -395,9 +395,11 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
 
   # When compiling code to be executed by the Boot JDK, force compatibility with the
   # oldest supported bootjdk.
-  OLDEST_BOOT_JDK_VERSION=`$ECHO $DEFAULT_ACCEPTABLE_BOOT_VERSIONS \
+  OLDEST_BOOT_JDK=`$ECHO $DEFAULT_ACCEPTABLE_BOOT_VERSIONS \
       | $TR " " "\n" | $SORT -n | $HEAD -n1`
-  AC_SUBST(OLDEST_BOOT_JDK_VERSION)
+  # -Xlint:-options is added to avoid "warning: [options] system modules path not set in conjunction with -source"
+  BOOT_JDK_SOURCETARGET="-source $OLDEST_BOOT_JDK -target $OLDEST_BOOT_JDK -Xlint:-options"
+  AC_SUBST(BOOT_JDK_SOURCETARGET)
 
   # Check if the boot jdk is 32 or 64 bit
   if $JAVA -version 2>&1 | $GREP -q "64-Bit"; then
@@ -408,6 +410,27 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
   AC_MSG_CHECKING([if Boot JDK is 32 or 64 bits])
   AC_MSG_RESULT([$BOOT_JDK_BITS])
 
+  # Try to enable CDS
+  AC_MSG_CHECKING([for local Boot JDK Class Data Sharing (CDS)])
+  BOOT_JDK_CDS_ARCHIVE=$CONFIGURESUPPORT_OUTPUTDIR/classes.jsa
+  UTIL_ADD_JVM_ARG_IF_OK([-XX:+UnlockDiagnosticVMOptions -XX:-VerifySharedSpaces -XX:SharedArchiveFile=$BOOT_JDK_CDS_ARCHIVE],boot_jdk_cds_args,[$JAVA])
+
+  if test "x$boot_jdk_cds_args" != x; then
+    # Try creating a CDS archive
+    $JAVA $boot_jdk_cds_args -Xshare:dump > /dev/null 2>&1
+    if test $? -eq 0; then
+      BOOTJDK_USE_LOCAL_CDS=true
+      AC_MSG_RESULT([yes, created])
+    else
+      # Generation failed, don't use CDS.
+      BOOTJDK_USE_LOCAL_CDS=false
+      AC_MSG_RESULT([no, creation failed])
+    fi
+  else
+    BOOTJDK_USE_LOCAL_CDS=false
+    AC_MSG_RESULT([no, -XX:SharedArchiveFile not supported])
+  fi
+
   BOOTJDK_SETUP_CLASSPATH
 ])
 
@@ -423,8 +446,13 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
   # Force en-US environment
   UTIL_ADD_JVM_ARG_IF_OK([-Duser.language=en -Duser.country=US],boot_jdk_jvmargs,[$JAVA])
 
-  UTIL_ADD_JVM_ARG_IF_OK([-Xlog:all=off:stdout],boot_jdk_jvmargs,[$JAVA])
-  UTIL_ADD_JVM_ARG_IF_OK([-Xlog:all=warning:stderr],boot_jdk_jvmargs,[$JAVA])
+  if test "x$BOOTJDK_USE_LOCAL_CDS" = xtrue; then
+    # Use our own CDS archive
+    UTIL_ADD_JVM_ARG_IF_OK([$boot_jdk_cds_args -Xshare:auto],boot_jdk_jvmargs,[$JAVA])
+  else
+    # Otherwise optimistically use the system-wide one, if one is present
+    UTIL_ADD_JVM_ARG_IF_OK([-Xshare:auto],boot_jdk_jvmargs,[$JAVA])
+  fi
 
   # Finally append user provided options to allow them to override.
   UTIL_ADD_JVM_ARG_IF_OK([$USER_BOOT_JDK_OPTIONS],boot_jdk_jvmargs,[$JAVA])
@@ -571,9 +599,10 @@ AC_DEFUN([BOOTJDK_SETUP_BUILD_JDK],
   AC_ARG_WITH(build-jdk, [AS_HELP_STRING([--with-build-jdk],
       [path to JDK of same version as is being built@<:@the newly built JDK@:>@])])
 
-  EXTERNAL_BUILDJDK_PATH=""
+  CREATE_BUILDJDK=false
+  EXTERNAL_BUILDJDK=false
+  BUILD_JDK_FOUND="no"
   if test "x$with_build_jdk" != "x"; then
-    BUILD_JDK_FOUND=no
     BOOTJDK_CHECK_BUILD_JDK([
       if test "x$with_build_jdk" != x; then
         BUILD_JDK=$with_build_jdk
@@ -581,15 +610,40 @@ AC_DEFUN([BOOTJDK_SETUP_BUILD_JDK],
         AC_MSG_NOTICE([Found potential Build JDK using configure arguments])
       fi
     ])
-    if test "x$BUILD_JDK_FOUND" != "xyes"; then
+    EXTERNAL_BUILDJDK=true
+  else
+    if test "x$COMPILE_TYPE" = "xcross"; then
+      BUILD_JDK="\$(BUILDJDK_OUTPUTDIR)/jdk"
+      BUILD_JDK_FOUND=yes
+      CREATE_BUILDJDK=true
       AC_MSG_CHECKING([for Build JDK])
-      AC_MSG_RESULT([no])
-      AC_MSG_ERROR([Could not find a suitable Build JDK])
+      AC_MSG_RESULT([yes, will build it for the host platform])
+    else
+      BUILD_JDK="\$(JDK_OUTPUTDIR)"
+      BUILD_JDK_FOUND=yes
+      AC_MSG_CHECKING([for Build JDK])
+      AC_MSG_RESULT([yes, will use output dir])
     fi
-    EXTERNAL_BUILDJDK_PATH="$BUILD_JDK"
   fi
 
-  AC_SUBST(EXTERNAL_BUILDJDK_PATH)
+  # Since these tools do not yet exist, we cannot use UTIL_FIXUP_EXECUTABLE to
+  # detect the need of fixpath
+  JMOD="$BUILD_JDK/bin/jmod"
+  UTIL_ADD_FIXPATH(JMOD)
+  JLINK="$BUILD_JDK/bin/jlink"
+  UTIL_ADD_FIXPATH(JLINK)
+  AC_SUBST(JMOD)
+  AC_SUBST(JLINK)
+
+  if test "x$BUILD_JDK_FOUND" != "xyes"; then
+    AC_MSG_CHECKING([for Build JDK])
+    AC_MSG_RESULT([no])
+    AC_MSG_ERROR([Could not find a suitable Build JDK])
+  fi
+
+  AC_SUBST(CREATE_BUILDJDK)
+  AC_SUBST(BUILD_JDK)
+  AC_SUBST(EXTERNAL_BUILDJDK)
 ])
 
 # The docs-reference JDK is used to run javadoc for the docs-reference targets.

make/autoconf/bootcycle-spec.gmk.template

@@ -44,3 +44,7 @@ JAVAC_CMD := $(FIXPATH) $(BOOT_JDK)/bin/javac
 JAR_CMD := $(FIXPATH) $(BOOT_JDK)/bin/jar
 # The bootcycle JVM arguments may differ from the original boot jdk.
 JAVA_FLAGS_BIG := @BOOTCYCLE_JVM_ARGS_BIG@
+# Any CDS settings generated for the bootjdk are invalid in the bootcycle build.
+# By filtering out those JVM args, the bootcycle JVM will use its default
+# settings for CDS.
+JAVA_FLAGS := $(filter-out -XX:SharedArchiveFile% -Xshare%, $(JAVA_FLAGS))

make/autoconf/build-performance.m4

@@ -162,7 +162,12 @@ AC_DEFUN([BPERF_SETUP_CCACHE],
   # Check if ccache is available
   CCACHE_AVAILABLE=true
 
-  UTIL_LOOKUP_TOOLCHAIN_PROGS(CCACHE, ccache)
+  OLD_PATH="$PATH"
+  if test "x$TOOLCHAIN_PATH" != x; then
+    PATH=$TOOLCHAIN_PATH:$PATH
+  fi
+  UTIL_LOOKUP_PROGS(CCACHE, ccache)
+  PATH="$OLD_PATH"
 
   AC_MSG_CHECKING([if ccache is available])
   if test "x$TOOLCHAIN_TYPE" != "xgcc" && test "x$TOOLCHAIN_TYPE" != "xclang"; then

make/autoconf/compare.sh.template

@@ -110,4 +110,4 @@ $MV $OUTPUTDIR/compare.log $OUTPUTDIR/compare.log.old 2> /dev/null
 
 export SCRIPT_DIR="$( cd "$( dirname "$0" )" > /dev/null && pwd )"
 
-$BASH $TOPDIR/make/scripts/compare-logger.sh $OUTPUTDIR/compare.log $BASH "$REAL_COMPARE_SCRIPT" "$@"
+$BASH $TOPDIR/make/scripts/logger.sh $OUTPUTDIR/compare.log $BASH "$REAL_COMPARE_SCRIPT" "$@"

make/autoconf/configure.ac

@@ -221,9 +221,6 @@ JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER
 # LeakSanitizer
 JDKOPT_SETUP_LEAK_SANITIZER
 
-# Setup static analyzer
-JDKOPT_SETUP_STATIC_ANALYZER
-
 # Fallback linker
 # This needs to go before 'LIB_DETERMINE_DEPENDENCIES'
 JDKOPT_SETUP_FALLBACK_LINKER

make/autoconf/flags-cflags.m4

@@ -37,25 +37,56 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
     # Default works for linux, might work on other platforms as well.
     SHARED_LIBRARY_FLAGS='-shared'
+    # --disable-new-dtags forces use of RPATH instead of RUNPATH for rpaths.
+    # This protects internal library dependencies within the JDK from being
+    # overridden using LD_LIBRARY_PATH. See JDK-8326891 for more information.
+    SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1 -Wl,--disable-new-dtags'
+    SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
+    SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
 
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     if test "x$OPENJDK_TARGET_OS" = xmacosx; then
       # Linking is different on MacOSX
       SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0"
+      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'
 
     elif test "x$OPENJDK_TARGET_OS" = xaix; then
       # Linking is different on aix
       SHARED_LIBRARY_FLAGS="-shared -Wl,-bM:SRE -Wl,-bnoentry"
+      SET_EXECUTABLE_ORIGIN=""
+      SET_SHARED_LIBRARY_ORIGIN=''
+      SET_SHARED_LIBRARY_NAME=''
 
     else
       # Default works for linux, might work on other platforms as well.
       SHARED_LIBRARY_FLAGS='-shared'
+      SET_EXECUTABLE_ORIGIN='-Wl,-rpath,\$$ORIGIN[$]1'
+      if test "x$OPENJDK_TARGET_OS" = xlinux; then
+        SET_EXECUTABLE_ORIGIN="$SET_EXECUTABLE_ORIGIN -Wl,--disable-new-dtags"
+      fi
+      SET_SHARED_LIBRARY_NAME='-Wl,-soname=[$]1'
+
+      # arm specific settings
+      if test "x$OPENJDK_TARGET_CPU" = "xarm"; then
+        # '-Wl,-z,origin' isn't used on arm.
+        SET_SHARED_LIBRARY_ORIGIN='-Wl,-rpath,\$$$$ORIGIN[$]1'
+      else
+        SET_SHARED_LIBRARY_ORIGIN="-Wl,-z,origin $SET_EXECUTABLE_ORIGIN"
+      fi
     fi
 
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     SHARED_LIBRARY_FLAGS="-dll"
+    SET_EXECUTABLE_ORIGIN=''
+    SET_SHARED_LIBRARY_ORIGIN=''
+    SET_SHARED_LIBRARY_NAME=''
   fi
 
+  AC_SUBST(SET_EXECUTABLE_ORIGIN)
+  AC_SUBST(SET_SHARED_LIBRARY_ORIGIN)
+  AC_SUBST(SET_SHARED_LIBRARY_NAME)
   AC_SUBST(SHARED_LIBRARY_FLAGS)
 ])
 
@@ -566,11 +597,11 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
 
   # CXXFLAGS C++ language level for all of JDK, including Hotspot.
   if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-    LANGSTD_CXXFLAGS="-std=c++17"
+    LANGSTD_CXXFLAGS="-std=c++14"
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    LANGSTD_CXXFLAGS="-std:c++17"
+    LANGSTD_CXXFLAGS="-std:c++14"
   else
-    AC_MSG_ERROR([Cannot enable C++17 for this toolchain])
+    AC_MSG_ERROR([Cannot enable C++14 for this toolchain])
   fi
   TOOLCHAIN_CFLAGS_JDK_CXXONLY="$TOOLCHAIN_CFLAGS_JDK_CXXONLY $LANGSTD_CXXFLAGS"
   TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM $LANGSTD_CXXFLAGS"
@@ -705,15 +736,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
         $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -mminimal-toc"
       elif test "x$FLAGS_CPU" = xppc64le; then
         # Little endian machine uses ELFv2 ABI.
-        # Use Power8 for target cpu, this is the first CPU to support PPC64 LE with ELFv2 ABI.
-        # Use Power10 for tuning target, this is supported by gcc >= 10
-        POWER_TUNE_VERSION="-mtune=power10"
-        FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${POWER_TUNE_VERSION}],
-          IF_FALSE: [
-              POWER_TUNE_VERSION="-mtune=power8"
-          ]
-        )
-        $1_CFLAGS_CPU="-mcpu=power8 ${POWER_TUNE_VERSION}"
+        # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
+        $1_CFLAGS_CPU="-mcpu=power8 -mtune=power10"
         $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2"
       fi
     elif test "x$FLAGS_CPU" = xs390x; then
@@ -903,6 +927,37 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
         IF_FALSE: [$2FDLIBM_CFLAGS=""])
   fi
   AC_SUBST($2FDLIBM_CFLAGS)
+
+  # Check whether the compiler supports the Arm C Language Extensions (ACLE)
+  # for SVE. Set SVE_CFLAGS to -march=armv8-a+sve if it does.
+  # ACLE and this flag are required to build the aarch64 SVE related functions in
+  # libvectormath. Apple Silicon does not support SVE; use macOS as a proxy for
+  # that check.
+  if test "x$OPENJDK_TARGET_CPU" = "xaarch64" && test "x$OPENJDK_TARGET_CPU" = "xlinux"; then
+    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+      AC_LANG_PUSH(C)
+      OLD_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -march=armv8-a+sve"
+      AC_MSG_CHECKING([if Arm SVE ACLE is supported])
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <arm_sve.h>],
+          [
+            svint32_t r = svdup_n_s32(1);
+            return 0;
+          ])],
+          [
+            AC_MSG_RESULT([yes])
+            $2SVE_CFLAGS="-march=armv8-a+sve"
+          ],
+          [
+            AC_MSG_RESULT([no])
+            $2SVE_CFLAGS=""
+          ]
+      )
+      CFLAGS="$OLD_CFLAGS"
+      AC_LANG_POP(C)
+    fi
+  fi
+  AC_SUBST($2SVE_CFLAGS)
 ])
 
 AC_DEFUN_ONCE([FLAGS_SETUP_BRANCH_PROTECTION],

make/autoconf/flags-ldflags.m4

@@ -74,12 +74,12 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
       # Clang needs the lld linker to work correctly
       BASIC_LDFLAGS="-fuse-ld=lld -Wl,--exclude-libs,ALL"
       if test "x$CXX_IS_USER_SUPPLIED" = xfalse && test "x$CC_IS_USER_SUPPLIED" = xfalse; then
-        UTIL_REQUIRE_TOOLCHAIN_PROGS(LLD, lld)
+        UTIL_REQUIRE_PROGS(LLD, lld, $TOOLCHAIN_PATH:$PATH)
       fi
     fi
     if test "x$OPENJDK_TARGET_OS" = xaix; then
       BASIC_LDFLAGS="-Wl,-b64 -Wl,-brtl -Wl,-bnorwexec -Wl,-blibpath:/usr/lib:lib -Wl,-bnoexpall \
-        -Wl,-bernotok -Wl,-bcdtors:mbr::s -Wl,-bdatapsize:64k -Wl,-btextpsize:64k -Wl,-bstackpsize:64k"
+        -Wl,-bernotok -Wl,-bdatapsize:64k -Wl,-btextpsize:64k -Wl,-bstackpsize:64k"
       BASIC_LDFLAGS_JVM_ONLY="$BASIC_LDFLAGS_JVM_ONLY -Wl,-lC_r -Wl,-bbigtoc"
     fi
 
@@ -98,7 +98,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
 
   # Setup OS-dependent LDFLAGS
   if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$TOOLCHAIN_TYPE" = xclang; then
-    # FIXME: We should really generalize SetSharedLibraryOrigin instead.
+    # FIXME: We should really generalize SET_SHARED_LIBRARY_ORIGIN instead.
     OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.."
     OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN -Wl,-reproducible"
   fi

make/autoconf/flags-other.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# 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
@@ -107,62 +107,6 @@ AC_DEFUN([FLAGS_SETUP_NMFLAGS],
   AC_SUBST(NMFLAGS)
 ])
 
-# Check whether the compiler supports the Arm C Language Extensions (ACLE)
-# for SVE. Set SVE_CFLAGS to -march=armv8-a+sve if it does.
-# ACLE and this flag are required to build the aarch64 SVE related functions
-# in libvectormath.
-AC_DEFUN([FLAGS_SETUP_SVE],
-[
-  AARCH64_SVE_AVAILABLE=false
-  # Apple Silicon does not support SVE; use macOS as a proxy for that check.
-  if test "x$OPENJDK_TARGET_CPU" = "xaarch64" && test "x$OPENJDK_TARGET_OS" = "xlinux"; then
-    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-      # check the compiler and binutils support sve or not
-      AC_MSG_CHECKING([if Arm SVE ACLE is supported])
-      AC_LANG_PUSH([C])
-      saved_cflags="$CFLAGS"
-      CFLAGS="$CFLAGS -march=armv8-a+sve $CFLAGS_WARNINGS_ARE_ERRORS ARG_ARGUMENT"
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-        [
-          #include <arm_sve.h>
-          svfloat64_t a() {}
-        ],
-        [
-          svint32_t r = svdup_n_s32(1)
-        ])],
-        [
-          AARCH64_SVE_AVAILABLE=true
-        ]
-      )
-      CFLAGS="$saved_cflags"
-      AC_LANG_POP([C])
-      AC_MSG_RESULT([$AARCH64_SVE_AVAILABLE])
-    fi
-  fi
-
-  UTIL_ARG_ENABLE(NAME: aarch64-sve, DEFAULT: auto,
-    RESULT: AARCH64_SVE_ENABLED,
-    DESC: [Use SVE when compiling libsleef],
-    AVAILABLE: $AARCH64_SVE_AVAILABLE)
-  SVE_CFLAGS=""
-  if test "x$AARCH64_SVE_ENABLED" = xtrue; then
-    SVE_CFLAGS="-march=armv8-a+sve"
-    # Switching the initialization mode with gcc from 'pattern' to 'zero'
-    # avoids the use of unsupported `__builtin_clear_padding` for variable
-    # length aggregates
-    if test "x$DEBUG_LEVEL" != xrelease && test "x$TOOLCHAIN_TYPE" = xgcc ; then
-      AC_MSG_CHECKING([Switching the initialization mode with gcc from pattern to zero])
-      INIT_ZERO_FLAG="-ftrivial-auto-var-init=zero"
-      FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$INIT_ZERO_FLAG],
-        IF_TRUE: [
-          SVE_CFLAGS="${SVE_CFLAGS} $INIT_ZERO_FLAG"
-        ]
-      )
-    fi
-  fi
-  AC_SUBST(SVE_CFLAGS)
-])
-
 ################################################################################
 # platform independent
 AC_DEFUN([FLAGS_SETUP_ASFLAGS],
@@ -171,11 +115,7 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS],
     # Force preprocessor to run, just to make sure
     BASIC_ASFLAGS="-x assembler-with-cpp"
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-      BASIC_ASFLAGS="-nologo"
-    else
-      BASIC_ASFLAGS="-nologo -c"
-    fi
+    BASIC_ASFLAGS="-nologo -c"
   fi
   AC_SUBST(BASIC_ASFLAGS)
 

make/autoconf/flags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# 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
@@ -319,11 +319,13 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
 AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL],
 [
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    if test "x$OPENJDK_TARGET_CPU" != xaarch64; then
-      AS_NON_ASM_EXTENSION_OPTION=-Ta
-    fi
+    CC_OUT_OPTION=-Fo
+  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)'
   fi
-  AC_SUBST(AS_NON_ASM_EXTENSION_OPTION)
+  AC_SUBST(CC_OUT_OPTION)
 
   # Generate make dependency files
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
@@ -368,7 +370,6 @@ AC_DEFUN([FLAGS_SETUP_FLAGS],
   FLAGS_SETUP_RCFLAGS
   FLAGS_SETUP_NMFLAGS
 
-  FLAGS_SETUP_SVE
   FLAGS_SETUP_ASFLAGS
   FLAGS_SETUP_ASFLAGS_CPU_DEP([TARGET])
   FLAGS_SETUP_ASFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])

make/autoconf/jdk-options.m4

@@ -244,31 +244,6 @@ 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)
 ])
 
 ################################################################################
@@ -504,31 +479,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_ADDRESS_SANITIZER],
   AC_SUBST(ASAN_ENABLED)
 ])
 
-################################################################################
-#
-# Static analyzer
-#
-AC_DEFUN_ONCE([JDKOPT_SETUP_STATIC_ANALYZER],
-[
-  UTIL_ARG_ENABLE(NAME: static-analyzer, DEFAULT: false, RESULT: STATIC_ANALYZER_ENABLED,
-      DESC: [enable the GCC static analyzer],
-      CHECK_AVAILABLE: [
-        AC_MSG_CHECKING([if static analyzer is available])
-        if test "x$TOOLCHAIN_TYPE" = "xgcc"; then
-          AC_MSG_RESULT([yes])
-        else
-          AC_MSG_RESULT([no])
-          AVAILABLE=false
-        fi
-      ],
-      IF_ENABLED: [
-        STATIC_ANALYZER_CFLAGS="-fanalyzer -Wno-analyzer-fd-leak"
-        CFLAGS_JDKLIB="$CFLAGS_JDKLIB $STATIC_ANALYZER_CFLAGS"
-        CFLAGS_JDKEXE="$CFLAGS_JDKEXE $STATIC_ANALYZER_CFLAGS"
-      ])
-  AC_SUBST(STATIC_ANALYZER_ENABLED)
-])
-
 ################################################################################
 #
 # LeakSanitizer
@@ -590,14 +540,9 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER],
   # with an additional define LLVM_SYMBOLIZER, which we set here.
   # To calculate the correct llvm_symbolizer path we can use the location of the compiler, because
   # their relation is fixed.
-  # In the ubsan case we have to link every binary with the C++-compiler as linker, because inherently
-  # the C-Compiler and the C++-compiler used as linker provide a different set of ubsan exports.
-  # Linking an executable with the C-compiler and one of its shared libraries with the C++-compiler
-  # leeds to unresolved symbols.
   if test "x$TOOLCHAIN_TYPE" = "xclang" && test "x$OPENJDK_TARGET_OS" = "xaix"; then
-    UBSAN_CFLAGS="$UBSAN_CFLAGS -DLLVM_SYMBOLIZER=$(dirname $(dirname $CC))/tools/ibm-llvm-symbolizer"
-    UBSAN_LDFLAGS="$UBSAN_LDFLAGS -Wl,-bbigtoc"
-    LD="$LDCXX"
+      UBSAN_CFLAGS="$UBSAN_CFLAGS -fno-sanitize=function,vptr -DLLVM_SYMBOLIZER=$(dirname $(dirname $CC))/tools/ibm-llvm-symbolizer"
+      UBSAN_LDFLAGS="$UBSAN_LDFLAGS -fno-sanitize=function,vptr -Wl,-bbigtoc"
   fi
   UTIL_ARG_ENABLE(NAME: ubsan, DEFAULT: false, RESULT: UBSAN_ENABLED,
       DESC: [enable UndefinedBehaviorSanitizer],

make/autoconf/jvm-features.m4

@@ -513,10 +513,6 @@ AC_DEFUN([JVM_FEATURES_VERIFY],
 [
   variant=$1
 
-  if JVM_FEATURES_IS_ACTIVE(jfr) && ! JVM_FEATURES_IS_ACTIVE(services); then
-    AC_MSG_ERROR([Specified JVM feature 'jfr' requires feature 'services' for variant '$variant'])
-  fi
-
   if JVM_FEATURES_IS_ACTIVE(jvmci) && ! (JVM_FEATURES_IS_ACTIVE(compiler1) || \
       JVM_FEATURES_IS_ACTIVE(compiler2)); then
     AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1' for variant '$variant'])