fixup! remove jdk.compiler from modules.list

Reviewed-by: dholmes, pchilanomate, coleenp

.editorconfig

@@ -1,14 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-
-[*.{cpp,hpp,c,h,java,cc,hh,m,mm,S,md,properties,gmk,m4,ac}]
-trim_trailing_whitespace = true
-
-[Makefile]
-trim_trailing_whitespace = true
-
-[src/hotspot/**.{cpp,hpp,h}]
-indent_style = space
-indent_size = 2

.gitattributes

@@ -1,5 +1,4 @@
 *	-text
-*	encoding=utf-8
 *.java	diff=java
 *.c	diff=cpp
 *.h	diff=cpp

.github/README.md

@@ -1,263 +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.2      | [21.0.7-b1038.54](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b1038.54)| 17-Jun-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
-Please contribute your changes through [OpenJDK](https://dev.java/contribute/openjdk/).
-
-## Resources
-* [JetBrains Runtime on GitHub](https://github.com/JetBrains/JetBrainsRuntime).
-* [OpenJDK build instructions](https://openjdk.java.net/groups/build/doc/building.html).
-* [OpenJDK test instructions](https://htmlpreview.github.io/?https://raw.githubusercontent.com/openjdk/jdk/master/doc/building.html#running-tests).
-* [How to develop OpenJDK with CLion](https://blog.jetbrains.com/clion/2020/03/openjdk-with-clion/).

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 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
@@ -42,7 +42,7 @@ runs:
     - name: 'Build'
       id: build
       run: >
-        make -k LOG=info ${{ inputs.make-target }}
+        make LOG=info ${{ inputs.make-target }}
         || bash ./.github/scripts/gen-build-failure-report.sh "$GITHUB_STEP_SUMMARY"
       shell: bash
 

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

@@ -32,16 +32,10 @@ inputs:
   debug-suffix:
     description: 'File name suffix denoting debug level, possibly empty'
     required: false
-  static-suffix:
-    description: 'Static bundle file name suffix'
-    required: false
 outputs:
   jdk-path:
     description: 'Path to the installed JDK bundle'
     value: ${{ steps.path-name.outputs.jdk }}
-  static-jdk-path:
-    description: 'Path to the installed static JDK bundle'
-    value: ${{ steps.path-name.outputs.static_jdk }}
   symbols-path:
     description: 'Path to the installed symbols bundle'
     value: ${{ steps.path-name.outputs.symbols }}
@@ -67,15 +61,6 @@ runs:
         path: bundles
       if: steps.download-bundles.outcome == 'failure'
 
-    - name: 'Download static bundles artifact'
-      id: download-static-bundles
-      uses: actions/download-artifact@v4
-      with:
-        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}
-        path: bundles
-      continue-on-error: true
-      if: ${{ inputs.static-suffix == '-static' }}
-
     - name: 'Unpack bundles'
       run: |
         if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.zip ]]; then
@@ -90,20 +75,6 @@ runs:
           tar -xf bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz -C bundles/jdk
         fi
 
-        if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
-          if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.zip ]]; then
-            echo 'Unpacking static jdk bundle...'
-            mkdir -p bundles/static-jdk
-            unzip -q bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.zip -d bundles/static-jdk
-          fi
-
-          if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.tar.gz ]]; then
-            echo 'Unpacking static jdk bundle...'
-            mkdir -p bundles/static-jdk
-            tar -xf bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.tar.gz -C bundles/static-jdk
-          fi
-        fi
-
         if [[ -e bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz ]]; then
           echo 'Unpacking symbols bundle...'
           mkdir -p bundles/symbols
@@ -135,12 +106,4 @@ runs:
         echo "jdk=$jdk_dir" >> $GITHUB_OUTPUT
         echo "symbols=$symbols_dir" >> $GITHUB_OUTPUT
         echo "tests=$tests_dir" >> $GITHUB_OUTPUT
-
-        if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
-          static_jdk_dir="$GITHUB_WORKSPACE/$(dirname $(find bundles/static-jdk -name bin -type d))"
-          if [[ '${{ runner.os }}' == 'Windows' ]]; then
-            static_jdk_dir="$(cygpath $static_jdk_dir)"
-          fi
-          echo "static_jdk=$static_jdk_dir" >> $GITHUB_OUTPUT
-        fi
       shell: bash

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

@@ -49,6 +49,6 @@ runs:
     - name: 'Export path to where GTest is installed'
       id: path-name
       run: |
-        # Export the absolute path
-        echo "path=`pwd`/gtest" >> $GITHUB_OUTPUT
+        # Export the path
+        echo 'path=gtest' >> $GITHUB_OUTPUT
       shell: bash

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

@@ -49,6 +49,6 @@ runs:
     - name: 'Export path to where JTReg is installed'
       id: path-name
       run: |
-        # Export the absolute path
-        echo "path=`pwd`/jtreg/installed" >> $GITHUB_OUTPUT
+        # Export the path
+        echo 'path=jtreg/installed' >> $GITHUB_OUTPUT
       shell: bash

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

@@ -32,12 +32,6 @@ inputs:
   debug-suffix:
     description: 'File name suffix denoting debug level, possibly empty'
     required: false
-  bundle-suffix:
-    description: 'Bundle name suffix, possibly empty'
-    required: false
-  static-suffix:
-    description: 'Static JDK bundle name suffix, possibly empty'
-    required: false
 
 runs:
   using: composite
@@ -49,8 +43,6 @@ runs:
         # Rename bundles to consistent names
         jdk_bundle_zip="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
         jdk_bundle_tar_gz="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
-        static_jdk_bundle_zip="$(ls build/*/bundles/static-jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
-        static_jdk_bundle_tar_gz="$(ls build/*/bundles/static-jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
         symbols_bundle="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}-symbols.tar.gz 2> /dev/null || true)"
         tests_bundle="$(ls build/*/bundles/jdk-*_bin-tests${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
         static_libs_bundle="$(ls build/*/bundles/jdk-*_bin-static-libs${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
@@ -63,12 +55,6 @@ runs:
         if [[ "$jdk_bundle_tar_gz" != "" ]]; then
           mv "$jdk_bundle_tar_gz" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
         fi
-        if [[ "$static_jdk_bundle_zip" != "" ]]; then
-          mv "$static_jdk_bundle_zip" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.zip"
-        fi
-        if [[ "$static_jdk_bundle_tar_gz" != "" ]]; then
-          mv "$static_jdk_bundle_tar_gz" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}.tar.gz"
-        fi
         if [[ "$symbols_bundle" != "" ]]; then
           mv "$symbols_bundle" "bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
         fi
@@ -79,7 +65,7 @@ runs:
           mv "$static_libs_bundle" "bundles/static-libs-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
         fi
 
-        if [[ "$jdk_bundle_zip$jdk_bundle_tar_gz$static_jdk_bundle_zip$static_jdk_bundle_tar_gz$symbols_bundle$tests_bundle$static_libs_bundle" != "" ]]; then
+        if [[ "$jdk_bundle_zip$jdk_bundle_tar_gz$symbols_bundle$tests_bundle$static_libs_bundle" != "" ]]; then
           echo 'bundles-found=true' >> $GITHUB_OUTPUT
         else
           echo 'bundles-found=false' >> $GITHUB_OUTPUT
@@ -89,7 +75,7 @@ runs:
     - name: 'Upload bundles artifact'
       uses: actions/upload-artifact@v4
       with:
-        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}${{ inputs.bundle-suffix }}
+        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: bundles
         retention-days: 1
       if: steps.bundles.outputs.bundles-found == 'true'

.github/workflows/build-linux.yml

@@ -61,12 +61,6 @@ on:
       make-arguments:
         required: false
         type: string
-      bundle-suffix:
-        required: false
-        type: string
-      static-suffix:
-        required: false
-        type: string
 
 jobs:
   build-linux:
@@ -77,6 +71,10 @@ jobs:
       fail-fast: false
       matrix:
         debug-level: ${{ fromJSON(inputs.debug-levels) }}
+        include:
+          - debug-level: debug
+            flags: --with-debug-level=fastdebug
+            suffix: -debug
 
     steps:
       - name: 'Checkout the JDK source'
@@ -120,7 +118,7 @@ jobs:
         run: >
           bash configure
           --with-conf-name=${{ inputs.platform }}
-          ${{ matrix.debug-level == 'debug' && '--with-debug-level=fastdebug' || '' }}
+          ${{ matrix.flags }}
           --with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
           --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
           --with-jtreg=${{ steps.jtreg.outputs.path }}
@@ -135,15 +133,17 @@ jobs:
       - name: 'Build'
         id: build
         uses: ./.github/actions/do-build
+        env:
+          # Only build static-libs-bundles for release builds.
+          # For debug builds, building static-libs often exceeds disk space.
+          STATIC_LIBS: ${{ matrix.debug-level == 'release' && 'static-libs-bundles' }}
         with:
-          make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
+          make-target: '${{ inputs.make-target }} ${STATIC_LIBS} ${{ inputs.make-arguments }}'
           platform: ${{ inputs.platform }}
-          debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
+          debug-suffix: '${{ matrix.suffix }}'
 
       - name: 'Upload bundles'
         uses: ./.github/actions/upload-bundles
         with:
           platform: ${{ inputs.platform }}
-          debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
-          bundle-suffix: ${{ inputs.bundle-suffix }}
-          static-suffix: ${{ inputs.static-suffix }}
+          debug-suffix: '${{ matrix.suffix }}'

.github/workflows/build-windows.yml

@@ -63,7 +63,7 @@ env:
 jobs:
   build-windows:
     name: build
-    runs-on: windows-2025
+    runs-on: windows-2019
     defaults:
       run:
         shell: bash
@@ -102,7 +102,7 @@ jobs:
         id: toolchain-check
         run: |
           set +e
-          '/c/Program Files/Microsoft Visual Studio/2022/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
+          '/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
           if [ $? -eq 0 ]; then
             echo "Toolchain is already installed"
             echo "toolchain-installed=true" >> $GITHUB_OUTPUT
@@ -115,7 +115,7 @@ jobs:
         run: |
           # Run Visual Studio Installer
           '/c/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe' \
-            modify --quiet --installPath 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise' \
+            modify --quiet --installPath 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise' \
             --add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
         if: steps.toolchain-check.outputs.toolchain-installed != 'true'
 

.github/workflows/main.yml

@@ -30,7 +30,7 @@ on:
     branches-ignore:
       - master
       - pr/*
-      - main
+      - jdk*
   workflow_dispatch:
     inputs:
       platforms:
@@ -225,41 +225,6 @@ jobs:
       make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.prepare.outputs.linux-x64-variants == 'true'
 
-  build-linux-x64-static:
-    name: linux-x64-static
-    needs: prepare
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      make-target: 'static-jdk-bundles'
-      # There are issues with fastdebug static build in GHA due to space limit.
-      # Only do release build for now.
-      debug-levels: '[ "release" ]'
-      gcc-major-version: '10'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-      static-suffix: "-static"
-    if: needs.prepare.outputs.linux-x64 == 'true'
-
-  build-linux-x64-static-libs:
-    name: linux-x64-static-libs
-    needs: prepare
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      make-target: 'static-libs-bundles'
-      # Only build static-libs-bundles for release builds.
-      # For debug builds, building static-libs often exceeds disk space.
-      debug-levels: '[ "release" ]'
-      gcc-major-version: '10'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-      # 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.
-      bundle-suffix: "-static-libs"
-    if: needs.prepare.outputs.linux-x64-variants == 'true'
-
   build-linux-cross-compile:
     name: linux-cross-compile
     needs: prepare
@@ -310,7 +275,7 @@ jobs:
     uses: ./.github/workflows/build-windows.yml
     with:
       platform: windows-x64
-      msvc-toolset-version: '14.44'
+      msvc-toolset-version: '14.29'
       msvc-toolset-architecture: 'x86.x64'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -322,7 +287,7 @@ jobs:
     uses: ./.github/workflows/build-windows.yml
     with:
       platform: windows-aarch64
-      msvc-toolset-version: '14.44'
+      msvc-toolset-version: '14.29'
       msvc-toolset-architecture: 'arm64'
       make-target: 'hotspot'
       extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
@@ -359,19 +324,6 @@ jobs:
       platform: linux-x64
       bootjdk-platform: linux-x64
       runs-on: ubuntu-22.04
-      debug-suffix: -debug
-
-  test-linux-x64-static:
-    name: linux-x64-static
-    needs:
-      - build-linux-x64
-      - build-linux-x64-static
-    uses: ./.github/workflows/test.yml
-    with:
-      platform: linux-x64
-      bootjdk-platform: linux-x64
-      runs-on: ubuntu-22.04
-      static-suffix: "-static"
 
   test-macos-aarch64:
     name: macos-aarch64
@@ -383,7 +335,6 @@ jobs:
       bootjdk-platform: macos-aarch64
       runs-on: macos-14
       xcode-toolset-version: '15.4'
-      debug-suffix: -debug
 
   test-windows-x64:
     name: windows-x64
@@ -393,5 +344,4 @@ jobs:
     with:
       platform: windows-x64
       bootjdk-platform: windows-x64
-      runs-on: windows-2025
-      debug-suffix: -debug
+      runs-on: windows-2019

.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,12 +40,6 @@ on:
       xcode-toolset-version:
         required: false
         type: string
-      debug-suffix:
-        required: false
-        type: string
-      static-suffix:
-        required: false
-        type: string
 
 env:
   # These are needed to make the MSYS2 bash work properly
@@ -92,35 +86,35 @@ jobs:
 
           - test-name: 'hs/tier1 common'
             test-suite: 'test/hotspot/jtreg/:tier1_common'
-            debug-suffix: ${{ inputs.debug-suffix }}
+            debug-suffix: -debug
 
           - test-name: 'hs/tier1 compiler part 1'
             test-suite: 'test/hotspot/jtreg/:tier1_compiler_1'
-            debug-suffix: ${{ inputs.debug-suffix }}
+            debug-suffix: -debug
 
           - test-name: 'hs/tier1 compiler part 2'
             test-suite: 'test/hotspot/jtreg/:tier1_compiler_2'
-            debug-suffix: ${{ inputs.debug-suffix }}
+            debug-suffix: -debug
 
           - test-name: 'hs/tier1 compiler part 3'
             test-suite: 'test/hotspot/jtreg/:tier1_compiler_3'
-            debug-suffix: ${{ inputs.debug-suffix }}
+            debug-suffix: -debug
 
           - test-name: 'hs/tier1 gc'
             test-suite: 'test/hotspot/jtreg/:tier1_gc'
-            debug-suffix: ${{ inputs.debug-suffix }}
+            debug-suffix: -debug
 
           - test-name: 'hs/tier1 runtime'
             test-suite: 'test/hotspot/jtreg/:tier1_runtime'
-            debug-suffix: ${{ inputs.debug-suffix }}
+            debug-suffix: -debug
 
           - test-name: 'hs/tier1 serviceability'
             test-suite: 'test/hotspot/jtreg/:tier1_serviceability'
-            debug-suffix: ${{ inputs.debug-suffix }}
+            debug-suffix: -debug
 
           - test-name: 'lib-test/tier1'
             test-suite: 'test/lib-test/:tier1'
-            debug-suffix: ${{ inputs.debug-suffix }}
+            debug-suffix: -debug
 
     steps:
       - name: 'Checkout the JDK source'
@@ -146,7 +140,6 @@ jobs:
         with:
           platform: ${{ inputs.platform }}
           debug-suffix: ${{ matrix.debug-suffix }}
-          static-suffix: ${{ inputs.static-suffix }}
 
       - name: 'Install dependencies'
         run: |
@@ -167,21 +160,6 @@ jobs:
           else
             echo "value=$PATH" >> $GITHUB_OUTPUT
           fi
-          if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
-            echo "static-hotspot-problemlist-path=`pwd`/test/hotspot/jtreg/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
-            echo "static-jdk-problemlist-path=`pwd`/test/jdk/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
-            echo "static-langtools-problemlist-path=`pwd`/test/langtools/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
-            echo "static-lib-test-problemlist-path=`pwd`/test/lib-test/ProblemList-StaticJdk.txt" >> $GITHUB_OUTPUT
-          fi
-
-      - name: 'Set Extra Options'
-        id: extra-options
-        run: |
-          if [[ '${{ inputs.static-suffix }}' == '-static' ]]; then
-            echo "test-jdk=JDK_UNDER_TEST=${{ steps.bundles.outputs.static-jdk-path }}" >> $GITHUB_OUTPUT
-            echo "compile-jdk=JDK_FOR_COMPILE=${{ steps.bundles.outputs.jdk-path }}" >> $GITHUB_OUTPUT
-            echo "extra-problem-lists=EXTRA_PROBLEM_LISTS=${{ steps.path.outputs.static-hotspot-problemlist-path }}%20${{ steps.path.outputs.static-jdk-problemlist-path }}%20${{ steps.path.outputs.static-langtools-problemlist-path }}%20${{ steps.path.outputs.static-lib-test-problemlist-path }}" >> $GITHUB_OUTPUT
-          fi
 
       - name: 'Run tests'
         id: run-tests
@@ -193,9 +171,7 @@ jobs:
           JDK_IMAGE_DIR=${{ steps.bundles.outputs.jdk-path }}
           SYMBOLS_IMAGE_DIR=${{ steps.bundles.outputs.symbols-path }}
           TEST_IMAGE_DIR=${{ steps.bundles.outputs.tests-path }}
-          ${{ steps.extra-options.outputs.test-jdk }}
-          ${{ steps.extra-options.outputs.compile-jdk }}
-          JTREG='JAVA_OPTIONS=-XX:-CreateCoredumpOnCrash;VERBOSE=fail,error,time;KEYWORDS=!headful;${{ steps.extra-options.outputs.extra-problem-lists }}'
+          JTREG='JAVA_OPTIONS=-XX:-CreateCoredumpOnCrash;VERBOSE=fail,error,time;KEYWORDS=!headful'
           && bash ./.github/scripts/gen-test-summary.sh "$GITHUB_STEP_SUMMARY" "$GITHUB_OUTPUT"
         env:
           PATH: ${{ steps.path.outputs.value }}
@@ -228,7 +204,7 @@ jobs:
             echo '::warning ::Missing test-support directory'
           fi
 
-          artifact_name="results-${{ inputs.platform }}-$(echo ${{ matrix.test-name }}${{ inputs.static-suffix }} | tr '/ ' '__')"
+          artifact_name="results-${{ inputs.platform }}-$(echo ${{ matrix.test-name }} | tr '/ ' '__')"
           echo "artifact-name=$artifact_name" >> $GITHUB_OUTPUT
         if: always()
 

.gitignore

@@ -22,7 +22,3 @@ NashornProfile.txt
 /.cache
 /.gdbinit
 /.lldbinit
-**/core.[0-9]*
-*.rej
-*.orig
-/jbr-api/

.jcheck/conf

@@ -1,7 +1,7 @@
 [general]
-project=jdk-updates
+project=jdk
 jbs=JDK
-version=25.0.1
+version=25
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists,copyright
@@ -36,6 +36,6 @@ pattern=^([124-8][0-9]{6}): (\S.*)$
 dirs=test/jdk|test/langtools|test/lib-test|test/hotspot/jtreg|test/jaxp
 
 [checks "copyright"]
-files=^(?!LICENSE|license\.txt|.*\.bin|.*\.gif|.*\.jpg|.*\.png|.*\.icon|.*\.tiff|.*\.dat|.*\.patch|.*\.wav|.*\.class|.*-header|.*\.jar).*
+files=^(?!LICENSE|license\.txt|.*\.bin|.*\.gif|.*\.jpg|.*\.png|.*\.icon|.*\.tiff|.*\.dat|.*\.patch|.*\.wav|.*\.class|.*-header|.*\.jar|).*
 oracle_locator=.*Copyright \(c\)(.*)Oracle and/or its affiliates\. All rights reserved\.
 oracle_validator=.*Copyright \(c\) (\d{4})(?:, (\d{4}))?, Oracle and/or its affiliates\. All rights reserved\.

CONTRIBUTING.md

@@ -1,3 +1,3 @@
 # Contributing to the JDK
 
-Please see the [OpenJDK Developers' Guide](https://openjdk.org/guide/).
+Please see the [OpenJDK Developers’ Guide](https://openjdk.org/guide/).

Makefile

@@ -59,7 +59,7 @@ ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))),)
 else
   makefile_path := $(lastword $(MAKEFILE_LIST))
 endif
-TOPDIR := $(strip $(patsubst %/, %, $(dir $(makefile_path))))
+topdir := $(strip $(patsubst %/, %, $(dir $(makefile_path))))
 
 # ... and then we can include the real makefile to bootstrap the build
-include $(TOPDIR)/make/PreInit.gmk
+include $(topdir)/make/PreInit.gmk

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,31 +94,31 @@ 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
@@ -158,43 +129,6 @@ 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
@@ -218,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

doc/building.html

@@ -282,34 +282,9 @@ possible, use an SSD. The build process is very disk intensive, and
 having slow disk access will significantly increase build times. If you
 need to use a network share for the source code, see below for
 suggestions on how to keep the build artifacts on a local disk.</p></li>
-<li><p>UTF-8 support is needed to compile the JDK. On Unix systems, this
-typically means that the <code>C.UTF-8</code> or
-<code>en_US.UTF-8</code> locale needs to be available. For Windows
-users, please see the section on <a href="#locale-requirements">Locale
-Requirements</a> below.</p></li>
-<li><p>On Windows, extra care must be taken to have a smooth building
-experience:</p>
-<ul>
-<li><p>Make sure that all relevant paths have short names. Short names
-are used by the build system to create space-free alternative paths.
-Short name creation is enabled per volume. The default setting can be
-checked with the command: <code>fsutil 8dot3name query</code>. If short
-name creation was turned off when a directory was created, it will not
-have a short name. Whether a short name exists can be checked by running
-<code>dir /X</code> in the containing directory (in cmd.exe). If a short
-path is present you should see something like 'ASDF~1' being displayed
-in one of the columns of the ouput. If a directory is missing a short
-name, the safest way to get one is to enable short names for that
-particular volume with
-<code>fsutil 8dot3name set &lt;drive   letter&gt;: 0</code> (note that
-you need to run as administrator for this), and then re-create the
-particular directory. A short name should be generated automatically
-then. Another option is to manually assign a short name to the directory
-using
-<code>fsutil file setShortName &lt;path&gt; &lt;short name&gt;</code>.</p></li>
-<li><p>If using <a href="#cygwin">Cygwin</a>, you must make sure the
-file permissions and attributes between Windows and Cygwin are
-consistent. It is recommended that you follow this procedure:</p>
+<li><p>On Windows, if using <a href="#cygwin">Cygwin</a>, extra care
+must be taken to make sure the environment is consistent. It is
+recommended that you follow this procedure:</p>
 <ul>
 <li><p>Create the directory that is going to contain the top directory
 of the JDK clone by using the <code>mkdir</code> command in the Cygwin
@@ -319,9 +294,6 @@ it's children will inherit those attributes.</p></li>
 <li><p>Do not put the JDK clone in a path under your Cygwin home
 directory. This is especially important if your user name contains
 spaces and/or mixed upper and lower case letters.</p></li>
-</ul>
-<p>Failure to follow these procedures might result in hard-to-debug
-build problems.</p></li>
 <li><p>You need to install a git client. You have two choices, Cygwin
 git or Git for Windows. Unfortunately there are pros and cons with each
 choice.</p>
@@ -339,7 +311,9 @@ It does work well with the Skara CLI tooling, however. To alleviate the
 line ending problems, make sure you set <code>core.autocrlf</code> to
 <code>false</code> (this is asked during installation).</p></li>
 </ul></li>
-</ul></li>
+</ul>
+<p>Failure to follow this procedure might result in hard-to-debug build
+problems.</p></li>
 </ul>
 <h2 id="build-hardware-requirements">Build Hardware Requirements</h2>
 <p>The JDK is a massive project, and require machines ranging from
@@ -402,7 +376,7 @@ to date at the time of writing.</p>
 </tr>
 <tr class="odd">
 <td>macOS</td>
-<td>macOS 14.x</td>
+<td>macOS 13.x (Ventura)</td>
 </tr>
 <tr class="even">
 <td>Windows</td>
@@ -539,8 +513,8 @@ this makes it difficult for a project such as the JDK to keep pace with
 a continuously updated machine running macOS. See the section on <a
 href="#apple-xcode">Apple Xcode</a> on some strategies to deal with
 this.</p>
-<p>It is recommended that you use at least macOS 14 and Xcode 15.4, but
-earlier versions may also work.</p>
+<p>It is recommended that you use at least macOS 13 (Ventura) and Xcode
+14, but earlier versions may also work.</p>
 <p>The standard macOS environment contains the basic tooling needed to
 build, but for external libraries a package manager is recommended. The
 JDK uses <a href="https://brew.sh/">homebrew</a> in the examples, but
@@ -612,15 +586,15 @@ to compile successfully without issues.</p>
 <tbody>
 <tr class="odd">
 <td>Linux</td>
-<td>gcc 14.2.0</td>
+<td>gcc 13.2.0</td>
 </tr>
 <tr class="even">
 <td>macOS</td>
-<td>Apple Xcode 15.4 (using clang 15.0.0)</td>
+<td>Apple Xcode 14.3.1 (using clang 14.0.3)</td>
 </tr>
 <tr class="odd">
 <td>Windows</td>
-<td>Microsoft Visual Studio 2022 version 17.13.2</td>
+<td>Microsoft Visual Studio 2022 version 17.6.5</td>
 </tr>
 </tbody>
 </table>
@@ -630,7 +604,7 @@ standard for C, and C++14 for C++.</p>
 <p>The minimum accepted version of gcc is 10.0. Older versions will not
 be accepted by <code>configure</code>.</p>
 <p>The JDK is currently known to compile successfully with gcc version
-14.2 or newer.</p>
+13.2 or newer.</p>
 <p>In general, any version between these two should be usable.</p>
 <h3 id="clang">clang</h3>
 <p>The minimum accepted version of clang is 13. Older versions will not
@@ -1748,20 +1722,6 @@ packages in the sysroot, configure the build with
 --with-devkit=$DEVKIT \
 --with-sysroot=$SYSROOT</code></pre>
 <p>and run <code>make</code> normally.</p>
-<h4 id="building-for-windows-aarch64">Building for Windows AArch64</h4>
-<p>The Visual Studio Build Tools can be used for building the JDK
-without a full Visual Studio installation. To set up the Visual Studio
-2022 Build Tools on a Windows AArch64 machine for a native build, launch
-the installer as follows in a Windows command prompt:</p>
-<pre><code>vs_buildtools.exe --quiet --wait --norestart --nocache ^
---installPath &quot;%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools&quot; ^
---add Microsoft.VisualStudio.Component.VC.CoreBuildTools ^
---add Microsoft.VisualStudio.Component.VC.Tools.ARM64 ^
---add Microsoft.VisualStudio.Component.Windows11SDK.22621</code></pre>
-<p>To generate Windows AArch64 builds using Cygwin on a Windows x64
-machine, you must set the proper target platform by adding
-<code>--openjdk-target=aarch64-unknown-cygwin</code> to your configure
-command line.</p>
 <h2 id="build-performance">Build Performance</h2>
 <p>Building the JDK requires a lot of horsepower. Some of the build
 tools can be adjusted to utilize more or less of resources such as

doc/building.md

@@ -83,44 +83,19 @@ on where and how to check out the source code.
   for the source code, see below for suggestions on how to keep the build
   artifacts on a local disk.
 
-* UTF-8 support is needed to compile the JDK. On Unix systems, this typically
-  means that the `C.UTF-8` or `en_US.UTF-8` locale needs to be available. For
-  Windows users, please see the section on [Locale
-  Requirements](#locale-requirements) below.
+* On Windows, if using [Cygwin](#cygwin), extra care must be taken to make sure
+  the environment is consistent. It is recommended that you follow this
+  procedure:
 
-* On Windows, extra care must be taken to have a smooth building experience:
+  * Create the directory that is going to contain the top directory of the JDK
+    clone by using the `mkdir` command in the Cygwin bash shell. That is, do
+    *not* create it using Windows Explorer. This will ensure that it will have
+    proper Cygwin attributes, and that it's children will inherit those
+    attributes.
 
-  * Make sure that all relevant paths have short names. Short names are used by
-    the build system to create space-free alternative paths. Short name
-    creation is enabled per volume. The default setting can be checked with the
-    command: `fsutil 8dot3name query`. If short name creation was turned off
-    when a directory was created, it will not have a short name. Whether a
-    short name exists can be checked by running `dir /X` in the containing
-    directory (in cmd.exe). If a short path is present you should see something
-    like 'ASDF~1' being displayed in one of the columns of the ouput. If a
-    directory is missing a short name, the safest way to get one is to enable
-    short names for that particular volume with `fsutil 8dot3name set <drive
-    letter>: 0` (note that you need to run as administrator for this), and then
-    re-create the particular directory. A short name should be generated
-    automatically then. Another option is to manually assign a short name to
-    the directory using `fsutil file setShortName <path> <short name>`.
-
-  * If using [Cygwin](#cygwin), you must make sure the file permissions and
-    attributes between Windows and Cygwin are consistent. It is recommended
-    that you follow this procedure:
-
-    * Create the directory that is going to contain the top directory of the
-      JDK clone by using the `mkdir` command in the Cygwin bash shell. That is,
-      do *not* create it using Windows Explorer. This will ensure that it will
-      have proper Cygwin attributes, and that it's children will inherit those
-      attributes.
-
-    * Do not put the JDK clone in a path under your Cygwin home directory. This
-      is especially important if your user name contains spaces and/or mixed
-      upper and lower case letters.
-
-    Failure to follow these procedures might result in hard-to-debug build
-    problems.
+  * Do not put the JDK clone in a path under your Cygwin home directory. This
+    is especially important if your user name contains spaces and/or mixed
+    upper and lower case letters.
 
   * You need to install a git client. You have two choices, Cygwin git or Git
     for Windows. Unfortunately there are pros and cons with each choice.
@@ -138,6 +113,9 @@ on where and how to check out the source code.
       make sure you set `core.autocrlf` to `false` (this is asked during
       installation).
 
+  Failure to follow this procedure might result in hard-to-debug build
+  problems.
+
 ## Build Hardware Requirements
 
 The JDK is a massive project, and require machines ranging from decent to
@@ -197,7 +175,7 @@ time of writing.
 | ----------------- | ---------------------------------- |
 | Linux/x64         | Oracle Enterprise Linux 6.4 / 8.x  |
 | Linux/aarch64     | Oracle Enterprise Linux 7.6 / 8.x  |
-| macOS             | macOS 14.x                         |
+| macOS             | macOS 13.x (Ventura)               |
 | Windows           | Windows Server 2016                |
 
 The double version numbers for Linux are due to the hybrid model used at
@@ -349,7 +327,7 @@ difficult for a project such as the JDK to keep pace with a continuously
 updated machine running macOS. See the section on [Apple Xcode](#apple-xcode)
 on some strategies to deal with this.
 
-It is recommended that you use at least macOS 14 and Xcode 15.4, but
+It is recommended that you use at least macOS 13 (Ventura) and Xcode 14, but
 earlier versions may also work.
 
 The standard macOS environment contains the basic tooling needed to build, but
@@ -412,11 +390,11 @@ possible to compile the JDK with both older and newer versions, but the closer
 you stay to this list, the more likely you are to compile successfully without
 issues.
 
-| Operating system   | Toolchain version                            |
-| ------------------ | -------------------------------------------- |
-| Linux              | gcc 14.2.0                                   |
-| macOS              | Apple Xcode 15.4 (using clang 15.0.0)       |
-| Windows            | Microsoft Visual Studio 2022 version 17.13.2 |
+| Operating system   | Toolchain version                           |
+| ------------------ | ------------------------------------------- |
+| Linux              | gcc 13.2.0                                  |
+| macOS              | Apple Xcode 14.3.1 (using clang 14.0.3)     |
+| Windows            | Microsoft Visual Studio 2022 version 17.6.5 |
 
 All compilers are expected to be able to handle the C11 language standard for
 C, and C++14 for C++.
@@ -426,7 +404,7 @@ C, and C++14 for C++.
 The minimum accepted version of gcc is 10.0. Older versions will not be accepted
 by `configure`.
 
-The JDK is currently known to compile successfully with gcc version 14.2 or
+The JDK is currently known to compile successfully with gcc version 13.2 or
 newer.
 
 In general, any version between these two should be usable.
@@ -1479,24 +1457,6 @@ sh ./configure --with-jvm-variants=server \
 
 and run `make` normally.
 
-#### Building for Windows AArch64
-The Visual Studio Build Tools can be used for building the JDK without a full
-Visual Studio installation. To set up the Visual Studio 2022 Build Tools on a
-Windows AArch64 machine for a native build, launch the installer as follows
-in a Windows command prompt:
-
-```
-vs_buildtools.exe --quiet --wait --norestart --nocache ^
---installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" ^
---add Microsoft.VisualStudio.Component.VC.CoreBuildTools ^
---add Microsoft.VisualStudio.Component.VC.Tools.ARM64 ^
---add Microsoft.VisualStudio.Component.Windows11SDK.22621
-```
-
-To generate Windows AArch64 builds using Cygwin on a Windows x64 machine,
-you must set the proper target platform by adding
-`--openjdk-target=aarch64-unknown-cygwin` to your configure command line.
-
 ## Build Performance
 
 Building the JDK requires a lot of horsepower. Some of the build tools can be

doc/hotspot-style.html

@@ -32,12 +32,11 @@
 <ul>
 <li><a href="#introduction" id="toc-introduction">Introduction</a>
 <ul>
-<li><a href="#changing-this-document"
-id="toc-changing-this-document">Changing this Document</a></li>
 <li><a href="#why-care-about-style" id="toc-why-care-about-style">Why
 Care About Style?</a></li>
-<li><a href="#counterexamples"
-id="toc-counterexamples">Counterexamples</a></li>
+<li><a href="#counterexamples-and-updates"
+id="toc-counterexamples-and-updates">Counterexamples and
+Updates</a></li>
 </ul></li>
 <li><a href="#structure-and-formatting"
 id="toc-structure-and-formatting">Structure and Formatting</a>
@@ -100,21 +99,6 @@ writing HotSpot code. Following these will help new code fit in with
 existing HotSpot code, making it easier to read and maintain. Failure to
 follow these guidelines may lead to discussion during code reviews, if
 not outright rejection of a change.</p>
-<h3 id="changing-this-document">Changing this Document</h3>
-<p>Proposed changes should be discussed on the <a
-href="mailto:hotspot-dev@openjdk.org">HotSpot Developers</a> mailing
-list. Changes are likely to be cautious and incremental, since HotSpot
-coders have been using these guidelines for years.</p>
-<p>Substantive changes are approved by <a
-href="https://www.rfc-editor.org/rfc/rfc7282.html">rough consensus</a>
-of the <a href="https://openjdk.org/census#hotspot">HotSpot Group</a>
-Members. The Group Lead determines whether consensus has been
-reached.</p>
-<p>Editorial changes (changes that only affect the description of
-HotSpot style, not its substance) do not require the full consensus
-gathering process. The normal HotSpot pull request process may be used
-for editorial changes, with the additional requirement that the
-requisite reviewers are also HotSpot Group Members.</p>
 <h3 id="why-care-about-style">Why Care About Style?</h3>
 <p>Some programmers seem to have lexers and even C preprocessors
 installed directly behind their eyeballs. The rest of us require code
@@ -140,7 +124,7 @@ conforms locally to its own peculiar conventions, it is not worth
 reformatting the whole thing. Also consider separating changes that make
 extensive stylistic updates from those which make functional
 changes.</p>
-<h3 id="counterexamples">Counterexamples</h3>
+<h3 id="counterexamples-and-updates">Counterexamples and Updates</h3>
 <p>Many of the guidelines mentioned here have (sometimes widespread)
 counterexamples in the HotSpot code base. Finding a counterexample is
 not sufficient justification for new code to follow the counterexample
@@ -153,6 +137,20 @@ bring it up for discussion and possible change. The architectural rule,
 of course, is "When in Rome do as the Romans". Sometimes in the suburbs
 of Rome the rules are a little different; these differences can be
 pointed out here.</p>
+<p>Proposed changes should be discussed on the <a
+href="mailto:hotspot-dev@openjdk.org">HotSpot Developers</a> mailing
+list. Changes are likely to be cautious and incremental, since HotSpot
+coders have been using these guidelines for years.</p>
+<p>Substantive changes are approved by <a
+href="https://www.rfc-editor.org/rfc/rfc7282.html">rough consensus</a>
+of the <a href="https://openjdk.org/census#hotspot">HotSpot Group</a>
+Members. The Group Lead determines whether consensus has been
+reached.</p>
+<p>Editorial changes (changes that only affect the description of
+HotSpot style, not its substance) do not require the full consensus
+gathering process. The normal HotSpot pull request process may be used
+for editorial changes, with the additional requirement that the
+requisite reviewers are also HotSpot Group Members.</p>
 <h2 id="structure-and-formatting">Structure and Formatting</h2>
 <h3 id="factoring-and-class-design">Factoring and Class Design</h3>
 <ul>
@@ -209,38 +207,23 @@ the simple "getter".</p></li>
 <ul>
 <li><p>All source files must have a globally unique basename. The build
 system depends on this uniqueness.</p></li>
-<li><p>Keep the include lines within a section alphabetically sorted by
-their lowercase value. If an include must be out of order for
-correctness, suffix with it a comment such as
-<code>// do not reorder</code>. Source code processing tools can also
-use this hint.</p></li>
-<li><p>Put conditional inclusions (<code>#if ...</code>) at the end of
-the section of HotSpot include lines. This also applies to
-macro-expanded includes of platform dependent files.</p></li>
-<li><p>Put system includes in a section after the HotSpot include lines
-with a blank line separating the two sections.</p></li>
 <li><p>Do not put non-trivial function implementations in .hpp files. If
 the implementation depends on other .hpp files, put it in a .cpp or a
 .inline.hpp file.</p></li>
 <li><p>.inline.hpp files should only be included in .cpp or .inline.hpp
 files.</p></li>
 <li><p>All .inline.hpp files should include their corresponding .hpp
-file as the first include line with a blank line separating it from the
-rest of the include lines. Declarations needed by other files should be
-put in the .hpp file, and not in the .inline.hpp file. This rule exists
-to resolve problems with circular dependencies between .inline.hpp
-files.</p></li>
-<li><p>Do not include a .hpp file if the corresponding .inline.hpp file
-is included.</p></li>
-<li><p>Use include guards for .hpp and .inline.hpp files. The name of
-the defined guard should be derived from the full search path of the
-file relative to the hotspot source directory. The guard should be all
-upper case with all paths separators and periods replaced by
-underscores.</p></li>
+file as the first include line. Declarations needed by other files
+should be put in the .hpp file, and not in the .inline.hpp file. This
+rule exists to resolve problems with circular dependencies between
+.inline.hpp files.</p></li>
 <li><p>Some build configurations use precompiled headers to speed up the
 build times. The precompiled headers are included in the precompiled.hpp
 file. Note that precompiled.hpp is just a build time optimization, so
 don't rely on it to resolve include problems.</p></li>
+<li><p>Keep the include lines alphabetically sorted.</p></li>
+<li><p>Put conditional inclusions (<code>#if ...</code>) at the end of
+the include list.</p></li>
 </ul>
 <h3 id="jtreg-tests">JTReg Tests</h3>
 <ul>

doc/hotspot-style.md

@@ -8,24 +8,6 @@ HotSpot code, making it easier to read and maintain.  Failure to
 follow these guidelines may lead to discussion during code reviews, if
 not outright rejection of a change.
 
-### Changing this Document
-
-Proposed changes should be discussed on the
-[HotSpot Developers](mailto:hotspot-dev@openjdk.org) mailing
-list.  Changes are likely to be cautious and incremental, since HotSpot
-coders have been using these guidelines for years.
-
-Substantive changes are approved by
-[rough consensus](https://www.rfc-editor.org/rfc/rfc7282.html) of
-the [HotSpot Group](https://openjdk.org/census#hotspot) Members.
-The Group Lead determines whether consensus has been reached.
-
-Editorial changes (changes that only affect the description of HotSpot
-style, not its substance) do not require the full consensus gathering
-process.  The normal HotSpot pull request process may be used for
-editorial changes, with the additional requirement that the requisite
-reviewers are also HotSpot Group Members.
-
 ### Why Care About Style?
 
 Some programmers seem to have lexers and even C preprocessors
@@ -56,7 +38,7 @@ reformatting the whole thing.  Also consider separating changes that
 make extensive stylistic updates from those which make functional
 changes.
 
-### Counterexamples
+### Counterexamples and Updates
 
 Many of the guidelines mentioned here have (sometimes widespread)
 counterexamples in the HotSpot code base. Finding a counterexample is
@@ -72,6 +54,22 @@ rule, of course, is "When in Rome do as the Romans". Sometimes in the
 suburbs of Rome the rules are a little different; these differences
 can be pointed out here.
 
+Proposed changes should be discussed on the
+[HotSpot Developers](mailto:hotspot-dev@openjdk.org) mailing
+list.  Changes are likely to be cautious and incremental, since HotSpot
+coders have been using these guidelines for years.
+
+Substantive changes are approved by
+[rough consensus](https://www.rfc-editor.org/rfc/rfc7282.html) of
+the [HotSpot Group](https://openjdk.org/census#hotspot) Members.
+The Group Lead determines whether consensus has been reached.
+
+Editorial changes (changes that only affect the description of HotSpot
+style, not its substance) do not require the full consensus gathering
+process.  The normal HotSpot pull request process may be used for
+editorial changes, with the additional requirement that the requisite
+reviewers are also HotSpot Group Members.
+
 ## Structure and Formatting
 
 ### Factoring and Class Design
@@ -137,21 +135,9 @@ change should be done with a "setter" accessor matched to the simple
 
 ### Source Files
 
-* All source files must have a globally unique basename. The build
+* All source files must have a globally unique basename.  The build
 system depends on this uniqueness.
 
-* Keep the include lines within a section alphabetically sorted by their
-lowercase value. If an include must be out of order for correctness,
-suffix with it a comment such as `// do not reorder`. Source code
-processing tools can also use this hint.
-
-* Put conditional inclusions (`#if ...`) at the end of the section of HotSpot
-include lines. This also applies to macro-expanded includes of platform
-dependent files.
-
-* Put system includes in a section after the HotSpot include lines with a blank
-line separating the two sections.
-
 * Do not put non-trivial function implementations in .hpp files. If
 the implementation depends on other .hpp files, put it in a .cpp or
 a .inline.hpp file.
@@ -160,23 +146,19 @@ a .inline.hpp file.
 files.
 
 * All .inline.hpp files should include their corresponding .hpp file as
-the first include line with a blank line separating it from the rest of the
-include lines. Declarations needed by other files should be put in the .hpp
-file, and not in the .inline.hpp file. This rule exists to resolve problems
-with circular dependencies between .inline.hpp files.
-
-* Do not include a .hpp file if the corresponding .inline.hpp file is included.
-
-* Use include guards for .hpp and .inline.hpp files. The name of the defined
-guard should be derived from the full search path of the file relative to the
-hotspot source directory. The guard should be all upper case with all paths
-separators and periods replaced by underscores.
+the first include line. Declarations needed by other files should be put
+in the .hpp file, and not in the .inline.hpp file. This rule exists to
+resolve problems with circular dependencies between .inline.hpp files.
 
 * Some build configurations use precompiled headers to speed up the
 build times. The precompiled headers are included in the precompiled.hpp
 file. Note that precompiled.hpp is just a build time optimization, so
 don't rely on it to resolve include problems.
 
+* Keep the include lines alphabetically sorted.
+
+* Put conditional inclusions (`#if ...`) at the end of the include list.
+
 ### JTReg Tests
 
 * JTReg tests should have meaningful names.

doc/hotspot-unit-tests.html

@@ -189,7 +189,7 @@ wants to find) and design tests using those models.</p>
 <p>Prefer having checks inside test code.</p>
 <p>Not only does having test logic outside, e.g. verification method,
 depending on asserts in product code contradict with several items above
-but also decreases test's readability and stability. It is much easier
+but also decreases test’s readability and stability. It is much easier
 to understand that a test is testing when all testing logic is located
 inside a test or nearby in shared test libraries. As a rule of thumb,
 the closer a check to a test, the better.</p>
@@ -198,7 +198,7 @@ the closer a check to a test, the better.</p>
 <p>Prefer <code>EXPECT</code> over <code>ASSERT</code> if possible.</p>
 <p>This is related to the <a href="#informativeness">informativeness</a>
 property of tests, information for other checks can help to better
-localize a defect's root-cause. One should use <code>ASSERT</code> if it
+localize a defect’s root-cause. One should use <code>ASSERT</code> if it
 is impossible to continue test execution or if it does not make much
 sense. Later in the text, <code>EXPECT</code> forms will be used to
 refer to both <code>ASSERT/EXPECT</code>.</p>
@@ -235,7 +235,7 @@ which checks that the absolute value of the difference between
 <code>eps</code>.</p>
 <h3 id="c-string-comparison">C string comparison</h3>
 <p>Use string special macros for C strings comparisons.</p>
-<p><code>EXPECT_EQ</code> just compares pointers' values, which is
+<p><code>EXPECT_EQ</code> just compares pointers’ values, which is
 hardly what one wants comparing C strings. GoogleTest provides
 <code>EXPECT_STREQ</code> and <code>EXPECT_STRNE</code> macros to
 compare C string contents. There are also case-insensitive versions
@@ -293,7 +293,7 @@ subsystem, etc.</p>
 <p>This naming scheme helps to find tests, filter them and simplifies
 test failure analysis. For example, class <code>Foo</code> - test group
 <code>Foo</code>, compiler logging subsystem - test group
-<code>CompilerLogging</code>, G1 GC - test group <code>G1GC</code>, and
+<code>CompilerLogging</code>, G1 GC — test group <code>G1GC</code>, and
 so forth.</p>
 <h3 id="filename">Filename</h3>
 <p>A test file must have <code>test_</code> prefix and <code>.cpp</code>
@@ -345,7 +345,7 @@ name starts or ends with an underscore are enough to be safe.</p>
 <h3 id="friend-classes">Friend classes</h3>
 <p>All test purpose friends should have either <code>Test</code> or
 <code>Testable</code> suffix.</p>
-<p>It greatly simplifies understanding of friendship's purpose and
+<p>It greatly simplifies understanding of friendship’s purpose and
 allows statically check that private members are not exposed
 unexpectedly. Having <code>FooTest</code> as a friend of
 <code>Foo</code> without any comments will be understood as a necessary
@@ -435,7 +435,7 @@ inapplicable tests.</p>
 <h3 id="flag-restoring">Flag restoring</h3>
 <p>Restore changed flags.</p>
 <p>It is quite common for tests to configure JVM in a certain way
-changing flags' values. GoogleTest provides two ways to set up
+changing flags’ values. GoogleTest provides two ways to set up
 environment before a test and restore it afterward: using either
 constructor and destructor or <code>SetUp</code> and
 <code>TearDown</code> functions. Both ways require to use a test fixture
@@ -444,7 +444,7 @@ class, which sometimes is too wordy. The simpler facilities like
 be used in such cases to restore/set values.</p>
 <p>Caveats:</p>
 <ul>
-<li><p>Changing a flag's value could break the invariants between flags'
+<li><p>Changing a flag’s value could break the invariants between flags'
 values and hence could lead to unexpected/unsupported JVM
 state.</p></li>
 <li><p><code>FLAG_SET_*</code> macros can change more than one flag (in

doc/hotspot-unit-tests.md

@@ -106,7 +106,7 @@ Prefer having checks inside test code.
 
 Not only does having test logic outside, e.g. verification method,
 depending on asserts in product code contradict with several items
-above but also decreases test's readability and stability. It is much
+above but also decreases test’s readability and stability. It is much
 easier to understand that a test is testing when all testing logic is
 located inside a test or nearby in shared test libraries. As a rule of
 thumb, the closer a check to a test, the better.
@@ -119,7 +119,7 @@ Prefer `EXPECT` over `ASSERT` if possible.
 
 This is related to the [informativeness](#informativeness) property of
 tests, information for other checks can help to better localize a
-defect's root-cause. One should use `ASSERT` if it is impossible to
+defect’s root-cause. One should use `ASSERT` if it is impossible to
 continue test execution or if it does not make much sense. Later in
 the text, `EXPECT` forms will be used to refer to both
 `ASSERT/EXPECT`.
@@ -160,7 +160,7 @@ value of the difference between `v1` and `v2` is not greater than `eps`.
 
 Use string special macros for C strings comparisons.
 
-`EXPECT_EQ` just compares pointers' values, which is hardly what one
+`EXPECT_EQ` just compares pointers’ values, which is hardly what one
 wants comparing C strings. GoogleTest provides `EXPECT_STREQ` and
 `EXPECT_STRNE` macros to compare C string contents. There are also
 case-insensitive versions `EXPECT_STRCASEEQ`, `EXPECT_STRCASENE`.
@@ -226,7 +226,7 @@ subsystem, etc.
 
 This naming scheme helps to find tests, filter them and simplifies
 test failure analysis. For example, class `Foo` - test group `Foo`,
-compiler logging subsystem - test group `CompilerLogging`, G1 GC - test
+compiler logging subsystem - test group `CompilerLogging`, G1 GC — test
 group `G1GC`, and so forth.
 
 ### Filename
@@ -287,7 +287,7 @@ Fixture classes should be named after tested classes, subsystems, etc
 
 All test purpose friends should have either `Test` or `Testable` suffix.
 
-It greatly simplifies understanding of friendship's purpose and allows
+It greatly simplifies understanding of friendship’s purpose and allows
 statically check that private members are not exposed unexpectedly.
 Having `FooTest` as a friend of `Foo` without any comments will be
 understood as a necessary evil to get testability.
@@ -397,7 +397,7 @@ and filter out inapplicable tests.
 Restore changed flags.
 
 It is quite common for tests to configure JVM in a certain way
-changing flags' values. GoogleTest provides two ways to set up
+changing flags’ values. GoogleTest provides two ways to set up
 environment before a test and restore it afterward: using either
 constructor and destructor or `SetUp` and `TearDown` functions. Both ways
 require to use a test fixture class, which sometimes is too wordy. The
@@ -406,7 +406,7 @@ be used in such cases to restore/set values.
 
 Caveats:
 
-* Changing a flag's value could break the invariants between flags' values and hence could lead to unexpected/unsupported JVM state.
+* Changing a flag’s value could break the invariants between flags' values and hence could lead to unexpected/unsupported JVM state.
 
 * `FLAG_SET_*` macros can change more than one flag (in order to
 maintain invariants) so it is hard to predict what flags will be

doc/starting-next-release.html

@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
-<head>
-  <meta charset="utf-8" />
-  <meta name="generator" content="pandoc" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-  <title>Explanation of start of release changes</title>
-  <style>
-    code{white-space: pre-wrap;}
-    span.smallcaps{font-variant: small-caps;}
-    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;}
-    /* 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;
-    }
-    .display.math{display: block; text-align: center; margin: 0.5rem auto;}
-  </style>
-  <link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css" />
-  <!--[if lt IE 9]>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
-  <![endif]-->
-</head>
-<body>
-<header id="title-block-header">
-<h1 class="title">Explanation of start of release changes</h1>
-</header>
-<nav id="TOC" role="doc-toc">
-<ul>
-<li><a href="#overview" id="toc-overview">Overview</a></li>
-<li><a href="#details-and-file-updates"
-id="toc-details-and-file-updates">Details and file updates</a>
-<ul>
-<li><a href="#meta-data-files" id="toc-meta-data-files">Meta-data
-files</a></li>
-<li><a href="#src-files" id="toc-src-files"><code>src</code>
-files</a></li>
-<li><a href="#test-files" id="toc-test-files"><code>test</code>
-files</a></li>
-</ul></li>
-</ul>
-</nav>
-<h2 id="overview">Overview</h2>
-<p>The start of release changes, the changes that turn JDK <em>N</em>
-into JDK (<em>N</em>+1), are primarily small updates to various files
-along with new files to store symbol information to allow
-<code>javac --release N ...</code> to run on JDK (<em>N</em>+1).</p>
-<p>The updates include changes to files holding meta-data about the
-release, files under the <code>src</code> directory for API and tooling
-updates, and incidental updates under the <code>test</code>
-directory.</p>
-<h2 id="details-and-file-updates">Details and file updates</h2>
-<p>As a matter of policy, there are a number of semantically distinct
-concepts which get incremented separately at the start of a new
-release:</p>
-<ul>
-<li>Feature value of <code>Runtime.version()</code></li>
-<li>Highest source version modeled by
-<code>javax.lang.model.SourceVersion</code></li>
-<li>Highest class file format major version recognized by the
-platform</li>
-<li>Highest
-<code>-source</code>/<code>-target</code>/<code>--release</code>
-argument recognized by <code>javac</code> and related tools</li>
-</ul>
-<p>The expected file updates are listed below. Additional files may need
-to be updated for a particular release.</p>
-<h3 id="meta-data-files">Meta-data files</h3>
-<ul>
-<li><code>jcheck/conf</code>: update meta-data used by
-<code>jcheck</code> and the Skara tooling</li>
-<li><code>make/conf/version-numbers.conf</code>: update to meta-data
-used in the build</li>
-</ul>
-<h3 id="src-files"><code>src</code> files</h3>
-<ul>
-<li><code>src/hotspot/share/classfile/classFileParser.cpp</code>: add a
-<code>#define</code> for the new version</li>
-<li><code>src/java.base/share/classes/java/lang/classfile/ClassFile.java</code>:
-add a constant for the new class file format version</li>
-<li><code>src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java</code>:
-add an <code>enum</code> constant for the new class file format
-version</li>
-<li><code>src/java.compiler/share/classes/javax/lang/model/SourceVersion.java</code>:
-add an <code>enum</code> constant for the new source version</li>
-<li><code>src/java.compiler/share/classes/javax/lang/model/util/*</code>
-visitors: Update <code>@SupportedSourceVersion</code> annotations to
-latest value. Note this update is done in lieu of introducing another
-set of visitors for each Java SE release.</li>
-<li><code>src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java</code>:
-add an <code>enum</code> constant for the new source version internal to
-<code>javac</code></li>
-<li><code>src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java</code>:
-add an <code>enum</code> constant for the new class file format version
-internal to <code>javac</code></li>
-<li><code>src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java</code>:
-add an <code>enum</code> constant for the new target version internal to
-<code>javac</code></li>
-<li><code>src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java</code>
-update printing processor to support the new source version</li>
-<li>The symbol information for <code>--release</code> is stored as new
-text files in the <code>src/jdk.compiler/share/data/symbols</code>
-directory, one file per module. The README file in that directory
-contains directions on how to create the files.</li>
-</ul>
-<h3 id="test-files"><code>test</code> files</h3>
-<ul>
-<li><code>test/langtools/tools/javac/api/TestGetSourceVersions.java</code>:
-add new <code>SourceVersion</code> constant to test matrix.</li>
-<li><code>test/langtools/tools/javac/classfiles/ClassVersionChecker.java</code>:
-add new enum constant for the new class file version</li>
-<li><code>test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java</code>
-update annotation processor extended by <code>javac</code> tests to
-cover the new source version</li>
-<li><code>test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out</code>
-and
-<code>test/langtools/tools/javac/preview/classReaderTest/Client.preview.out</code>:
-update expected messages for preview errors and warnings</li>
-</ul>
-</body>
-</html>

doc/starting-next-release.md

@@ -1,68 +0,0 @@
-% Explanation of start of release changes
-
-## Overview
-
-The start of release changes, the changes that turn JDK _N_ into JDK
-(_N_+1), are primarily small updates to various files along with new files to
-store symbol information to allow `javac --release N ...` to run on
-JDK (_N_+1).
-
-The updates include changes to files holding meta-data about the
-release, files under the `src` directory for API and tooling updates,
-and incidental updates under the `test` directory.
-
-## Details and file updates
-
-As a matter of policy, there are a number of semantically distinct
-concepts which get incremented separately at the start of a new
-release:
-
-* Feature value of `Runtime.version()`
-* Highest source version modeled by `javax.lang.model.SourceVersion`
-* Highest class file format major version recognized by the platform
-* Highest `-source`/`-target`/`--release` argument recognized by
-  `javac` and related tools
-
-The expected file updates are listed below. Additional files may need
-to be updated for a particular release.
-
-### Meta-data files
-
-* `jcheck/conf`: update meta-data used by `jcheck` and the Skara tooling
-* `make/conf/version-numbers.conf`: update to meta-data used in the build
-
-### `src` files
-
-* `src/hotspot/share/classfile/classFileParser.cpp`: add a `#define`
-  for the new version
-* `src/java.base/share/classes/java/lang/classfile/ClassFile.java`:
-  add a constant for the new class file format version
-* `src/java.base/share/classes/java/lang/reflect/ClassFileFormatVersion.java`:
-   add an `enum` constant for the new class file format version
-* `src/java.compiler/share/classes/javax/lang/model/SourceVersion.java`:
-  add an `enum` constant for the new source version
-* `src/java.compiler/share/classes/javax/lang/model/util/*` visitors: Update
-  `@SupportedSourceVersion` annotations to latest value. Note this update
-  is done in lieu of introducing another set of visitors for each Java
-  SE release.
-* `src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java`:
-   add an `enum` constant for the new source version internal to `javac`
-* `src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java`:
-   add an `enum` constant for the new class file format version internal to `javac`
-* `src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java`:
-   add an `enum` constant for the new target version internal to `javac`
-* `src/jdk.compiler/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java`
-   update printing processor to support the new source version
-* The symbol information for `--release` is stored as new text files in the
-  `src/jdk.compiler/share/data/symbols` directory, one file per
-  module. The README file in that directory contains directions on how
-  to create the files.
-
-### `test` files
-
-* `test/langtools/tools/javac/api/TestGetSourceVersions.java`: add new `SourceVersion` constant to test matrix.
-* `test/langtools/tools/javac/classfiles/ClassVersionChecker.java`: add new enum constant for the new class file version
-* `test/langtools/tools/javac/lib/JavacTestingAbstractProcessor.java`
-   update annotation processor extended by `javac` tests to cover the new source version
-* `test/langtools/tools/javac/preview/classReaderTest/Client.nopreview.out` and `test/langtools/tools/javac/preview/classReaderTest/Client.preview.out`: update expected messages for preview errors and warnings
-

doc/testing.html

@@ -72,11 +72,6 @@ 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>
-<ul>
 <li><a href="#testing-with-alternative-security-providers"
 id="toc-testing-with-alternative-security-providers">Testing with
 alternative security providers</a></li>
@@ -416,13 +411,6 @@ instrumentation
 special target <code>jcov-test</code> instead of <code>test</code>, e.g.
 <code>make jcov-test TEST=jdk_lang</code>. This will make sure the JCov
 image is built, and that JCov reporting is enabled.</p>
-<p>To include JCov coverage for just a subset of all modules, you can
-use the <code>--with-jcov-modules</code> arguments to
-<code>configure</code>, e.g.
-<code>--with-jcov-modules=jdk.compiler,java.desktop</code>.</p>
-<p>For more fine-grained control, you can pass arbitrary filters to JCov
-using <code>--with-jcov-filters</code>, and you can specify a specific
-JDK to instrument using <code>--with-jcov-input-jdk</code>.</p>
 <p>The JCov report is stored in
 <code>build/$BUILD/test-results/jcov-output/report</code>.</p>
 <p>Please note that running with JCov reporting can be very memory
@@ -601,37 +589,6 @@ 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>
-<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>
-<pre><code>$ make test JTREG=&quot;AOT_JDK=onestep&quot; \
-    TEST=open/test/hotspot/jtreg/runtime/invokedynamic</code></pre>
-<p>In this testing mode, we first perform an AOT training run (see
-https://openjdk.org/jeps/483) of a special test program (<a
-href="../test/setup_aot/TestSetupAOT.java">test/setup_aot/TestSetupAOT.java</a>)
-that accesses about 5,0000 classes in the JDK core libraries.
-Optimization artifacts for these classes (such as pre-linked lambda
-expressions, execution profiles, and pre-generated native code) are
-stored into an AOT cache file, which will be used by all the JVMs
-launched by the selected jtreg test cases.</p>
-<p>When the jtreg tests call into the core libraries classes that are in
-the AOT cache, we will be able to test the AOT optimizations that were
-used on those classes.</p>
-<p>Please note that not all existing jtreg test cases can be executed
-with the AOT_JDK mode. See <a
-href="../test/hotspot/jtreg/ProblemList-AotJdk.txt">test/hotspot/jtreg/ProblemList-AotJdk.txt</a>
-and <a
-href="../test/jdk/ProblemList-AotJdk.txt">test/jdk/ProblemList-AotJdk.txt</a>.</p>
-<p>Also, test cases that were written specifically to test AOT, such as
-the tests under <a
-href="../test/hotspot/jtreg/runtime/cds/">test/hotspot/jtreg/runtime/cds</a>,
-cannot be executed with the AOT_JDK mode.</p>
-<p>Valid values for <code>AOT_JDK</code> are <code>onestep</code> and
-<code>twostep</code>. These control how the AOT cache is generated. See
-https://openjdk.org/jeps/514 for details. All other values are
-ignored.</p>
 <h3 id="testing-with-alternative-security-providers">Testing with
 alternative security providers</h3>
 <p>Some security tests use a hardcoded provider for

doc/testing.md

@@ -345,14 +345,6 @@ The simplest way to run tests with JCov coverage report is to use the special
 target `jcov-test` instead of `test`, e.g. `make jcov-test TEST=jdk_lang`. This
 will make sure the JCov image is built, and that JCov reporting is enabled.
 
-To include JCov coverage for just a subset of all modules, you can use the
-`--with-jcov-modules` arguments to `configure`, e.g.
-`--with-jcov-modules=jdk.compiler,java.desktop`.
-
-For more fine-grained control, you can pass arbitrary filters to JCov using
-`--with-jcov-filters`, and you can specify a specific JDK to instrument
-using `--with-jcov-input-jdk`.
-
 The JCov report is stored in `build/$BUILD/test-results/jcov-output/report`.
 
 Please note that running with JCov reporting can be very memory intensive.
@@ -611,43 +603,6 @@ $ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" \
 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:
-
-```
-$ make test JTREG="AOT_JDK=onestep" \
-    TEST=open/test/hotspot/jtreg/runtime/invokedynamic
-```
-
-In this testing mode, we first perform an AOT training run
-(see https://openjdk.org/jeps/483) of a special test program
-([test/setup_aot/TestSetupAOT.java](../test/setup_aot/TestSetupAOT.java))
-that accesses about 5,0000 classes in the JDK core libraries.
-Optimization artifacts for these classes (such as pre-linked
-lambda expressions, execution profiles, and pre-generated native code)
-are stored into an AOT cache file, which will be used by all the JVMs
-launched by the selected jtreg test cases.
-
-When the jtreg tests call into the core libraries classes that are in
-the AOT cache, we will be able to test the AOT optimizations that were
-used on those classes.
-
-Please note that not all existing jtreg test cases can be executed with
-the AOT_JDK mode. See
-[test/hotspot/jtreg/ProblemList-AotJdk.txt](../test/hotspot/jtreg/ProblemList-AotJdk.txt)
-and [test/jdk/ProblemList-AotJdk.txt](../test/jdk/ProblemList-AotJdk.txt).
-
-Also, test cases that were written specifically to test AOT, such as the tests
-under [test/hotspot/jtreg/runtime/cds](../test/hotspot/jtreg/runtime/cds/),
-cannot be executed with the AOT_JDK mode.
-
-Valid values for `AOT_JDK` are `onestep` and `twostep`. These control how
-the AOT cache is generated. See https://openjdk.org/jeps/514 for details.
-All other values are ignored.
-
 ### Testing with alternative security providers
 
 Some security tests use a hardcoded provider for `KeyFactory`, `Cipher`,

jb/project/tools/common/modules.list

@@ -1,5 +1,4 @@
 java.base,
-java.compiler,
 java.datatransfer,
 java.desktop,
 java.instrument,
@@ -23,7 +22,6 @@ java.xml.crypto,
 jdk.accessibility,
 jdk.attach,
 jdk.charsets,
-jdk.compiler,
 jdk.crypto.cryptoki,
 jdk.crypto.ec,
 jdk.dynalink,
@@ -35,6 +33,7 @@ jdk.javadoc,
 jdk.jdi,
 jdk.jdwp.agent,
 jdk.jfr,
+jdk.jsobject,
 jdk.localedata,
 jdk.management,
 jdk.management.agent,

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

@@ -18,12 +18,10 @@ function getVersionProp() {
 }
 
 DISABLE_WARNINGS_AS_ERRORS=""
-CONTINUOUS_INTEGRATION=""
-while getopts ":iwc?" o; do
+while getopts ":iw?" 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))
@@ -40,6 +38,7 @@ architecture=${3:-x64} # aarch64 or x64
 
 check_bundle_type_maketest
 
+tag_prefix="jdk-"
 VERSION_FEATURE=$(getVersionProp "DEFAULT_VERSION_FEATURE")
 VERSION_INTERIM=$(getVersionProp "DEFAULT_VERSION_INTERIM")
 VERSION_UPDATE=$(getVersionProp "DEFAULT_VERSION_UPDATE")
@@ -47,9 +46,8 @@ 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="jbr-"
-OPENJDK_TAG=$(git log --simplify-by-decoration --decorate=short --pretty=short | grep "${tag_prefix}${JBSDK_VERSION}" | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -V -f | tail -n 1 | tr -d ",")
-JDK_BUILD_NUMBER=$(echo $OPENJDK_TAG | awk -F "-|[+]" '{print $3}')
+OPENJDK_TAG=$(git tag -l | grep "$tag_prefix$JBSDK_VERSION" | grep -v ga | sort -t "-" -k 2 -g | tail -n 1)
+JDK_BUILD_NUMBER=${JDK_BUILD_NUMBER:=$(echo $OPENJDK_TAG | awk -F "-|[+]" '{print $3}')}
 [ -z $JDK_BUILD_NUMBER ] && JDK_BUILD_NUMBER=1
 re='^[0-9]+$'
 if ! [[ $JDK_BUILD_NUMBER =~ $re ]] ; then
@@ -132,20 +130,6 @@ function zip_native_debug_symbols() {
     tar --no-recursion --null -T - -czf ../"$jbr_diz_name".tar.gz) || do_exit $?
 }
 
-function zip_native_debug_symbols_win() {
-  image_bundle_path=$(echo $1 | cut -d"/" -f-4)
-  jdk_name=$(echo $1 | cut -d"/" -f5)
-  jbr_pdb_name=$2
-
-  [ -d "$jbr_pdb_name" ] && rm -rf $jbr_pdb_name
-  mkdir $jbr_pdb_name
-
-  rsync_target="../../../../"$jbr_pdb_name
-  (cd $image_bundle_path && find . -name '*' -exec rsync -R {} $rsync_target \;)
-
-  (/usr/bin/zip -r $jbr_pdb_name.zip $jbr_pdb_name) || 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

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

@@ -25,24 +25,6 @@ source jb/project/tools/common/scripts/common.sh
 JCEF_PATH=${JCEF_PATH:=./jcef_linux_aarch64}
 
 function do_configure {
-
-  GTK_SHELL_PATH=/gtk-shell.xml
-  WAYLAND_PROTOCOLS_PATH=/opt/wayland-protocols
-  WITH_WAYLAND_PROTOCOLS=
-
-  if [ -e "$WAYLAND_PROTOCOLS_PATH" ]; then
-    WITH_WAYLAND_PROTOCOLS="--with-wayland-protocols=$WAYLAND_PROTOCOLS_PATH"
-  fi
-
-  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" \
@@ -53,14 +35,13 @@ function do_configure {
     --with-version-opt=b"$build_number" \
     --with-boot-jdk="$BOOT_JDK" \
     --enable-cds=yes \
-    --with-gtk-shell1-protocol=$GTK_SHELL_PATH \
+    --with-gtk-shell1-protocol=/gtk-shell.xml \
     --with-vulkan \
     $DISABLE_WARNINGS_AS_ERRORS \
     $STATIC_CONF_ARGS \
     $REPRODUCIBLE_BUILD_OPTS \
     $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
     $WITH_BUNDLED_FREETYPE \
-    $WITH_WAYLAND_PROTOCOLS \
     || do_exit $?
 }
 
@@ -102,7 +83,7 @@ function create_image_bundle {
     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/symbols "${JBR}_diz"
+    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
   fi
 
   # jmod does not preserve file permissions (JDK-8173610)

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

@@ -32,30 +32,6 @@ function do_configure {
       --build=x86_64-unknown-linux-gnu \
       --openjdk-target=x86_64-unknown-linux-gnu"
   fi
-
-  GTK_SHELL_PATH=/gtk-shell.xml
-  WAYLAND_PROTOCOLS_PATH=/opt/wayland-protocols
-  WITH_WAYLAND_PROTOCOLS=
-
-  if [ -e "$WAYLAND_PROTOCOLS_PATH" ]; then
-    WITH_WAYLAND_PROTOCOLS="--with-wayland-protocols=$WAYLAND_PROTOCOLS_PATH"
-  fi
-
-  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" \
@@ -66,15 +42,14 @@ function do_configure {
     --with-version-opt=b"$build_number" \
     --with-boot-jdk="$BOOT_JDK" \
     --enable-cds=yes \
-    --with-gtk-shell1-protocol=$GTK_SHELL_PATH \
-    $WITH_VULKAN \
+    --with-gtk-shell1-protocol=/gtk-shell.xml \
+    --with-vulkan \
     $LINUX_TARGET \
     $DISABLE_WARNINGS_AS_ERRORS \
     $STATIC_CONF_ARGS \
     $REPRODUCIBLE_BUILD_OPTS \
     $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
     $WITH_BUNDLED_FREETYPE \
-    $WITH_WAYLAND_PROTOCOLS \
     || do_exit $?
 }
 
@@ -122,14 +97,12 @@ function create_image_bundle {
     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/symbols "${JBR}_diz"
+    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
+  [ -f "$IMAGES_DIR"/"$__root_dir"/lib/cef_server ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/cef_server
 
   echo Creating "$JBR".tar.gz ...
 

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

@@ -69,7 +69,7 @@ function create_image_bundle {
     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/symbols "${JBR}_diz"
+    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
   fi
 
   # jmod does not preserve file permissions (JDK-8173610)

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>
-        <true/>
-        <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/mkimages.sh

@@ -24,25 +24,6 @@ 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 \
@@ -61,7 +42,6 @@ function do_configure {
     $STATIC_CONF_ARGS \
     $REPRODUCIBLE_BUILD_OPTS \
     $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
-    $WITH_XCODE_PATH \
     || do_exit $?
 }
 
@@ -96,7 +76,7 @@ function create_image_bundle {
     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/symbols "${JBR}_diz"
+    zip_native_debug_symbols $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk "${JBR}_diz"
   fi
 
   if [ "$bundle_type" == "jcef" ]; then

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

@@ -43,7 +43,9 @@ 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
+  "Contents/Home/lib" "Contents/MacOS" \
+  "Contents/Home/Frameworks" \
+  "Contents/Frameworks"; do
   if [ -d "$APPLICATION_PATH/$f" ]; then
     find "$APPLICATION_PATH/$f" \
       -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "*.tbd" -o -name "*.node" -o -perm +111 \) \
@@ -51,18 +53,11 @@ for f in \
   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"
+JMOD_EXE="$BOOT_JDK/bin/jmod"
 if [ -d "$JMODS_DIR" ]; then
-  log "processing jmods"
+  log "processing jmods"  
 
   for jmod_file in "$JMODS_DIR"/*.jmod; do
     log "Processing $jmod_file"
@@ -181,7 +176,7 @@ 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
+  "Contents/Frameworks/cef_server.app/Contents/Frameworks" "Contents/Home/Frameworks" "Contents/Frameworks"; do
   if [ -d "$APPLICATION_PATH/$f" ]; then
     find "$APPLICATION_PATH/$f" \( -name '*.framework' -o -name '*.app' \) -maxdepth 1 | while read -r line
       do
@@ -190,7 +185,7 @@ if [ "$JB_SIGN" = true ]; then for f in \
         "$SIGN_UTILITY" --timestamp \
             -v -s "$JB_DEVELOPER_CERT" --options=runtime \
             --force \
-            --entitlements "$SCRIPT_DIR/entitlements_jcef.xml" tmp-to-sign.tar.gz || exit 1
+            --entitlements "$SCRIPT_DIR/entitlements.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
@@ -199,14 +194,16 @@ if [ "$JB_SIGN" = true ]; then for f in \
 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
+for f in \
+  "Contents/Home/Frameworks" "Contents/Frameworks"; do
+  if [ -d "$APPLICATION_PATH/$f" ]; then
+    find "$APPLICATION_PATH/$f" -name '*.framework'  -maxdepth 1 | while read -r line
+      do
+        log "Checking '$line':"
+        codesign --verify --deep --strict --verbose=4 "$line"
+      done
+  fi
+done
 
 log "Signing whole app..."
 if [ "$JB_SIGN" = true ]; then

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

@@ -34,7 +34,7 @@ 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
+rm "$INPUT_FILE"
 
 log "$INPUT_FILE extracted and removed"
 
@@ -75,15 +75,17 @@ if [[ "${JETSIGN_CLIENT:=}" == "null" ]] || [[ "$JETSIGN_CLIENT" == "" ]]; then
 fi
 
 attempt=1
-limit=1
-ec=0
+limit=3
 set +e
 while [[ $attempt -le $limit ]]; do
   log "Signing (attempt $attempt) $APPLICATION_PATH ..."
   "$SCRIPT_DIR/sign.sh" "$APPLICATION_PATH" "$PKG_NAME" "$BUNDLE_ID" "$CODESIGN_STRING" "$JB_INSTALLER_CERT"
   ec=$?
-  ((attempt += 1))
   if [[ $ec -ne 0 ]]; then
+    ((attempt += 1))
+    if [ $attempt -eq $limit ]; then
+      set -e
+    fi
     log "Signing failed, wait for 30 sec and try to sign again"
     sleep 30
   else
@@ -91,16 +93,12 @@ while [[ $attempt -le $limit ]]; do
     codesign -v "$APPLICATION_PATH" -vvvvv
     log "Check sign done"
     spctl -a -v $APPLICATION_PATH
+    ((attempt += limit))
   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"

jb/project/tools/perf/run_inc.sh

@@ -1,4 +1,3 @@
-export LC_ALL=C
 ST=1 # sleep between iterations
 
 # number of iterations (jvm spawned)
@@ -31,11 +30,8 @@ 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
@@ -49,9 +45,6 @@ while [ $# -ge 1 ] ; do
     -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
@@ -61,24 +54,6 @@ while [ $# -ge 1 ] ; do
          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

jb/project/tools/perf/run_rp.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-#set -euo pipefail
-#set -x
+set -euo pipefail
+set -x
 
 BASE_DIR=$(dirname "$0")
 source $BASE_DIR/run_inc.sh
@@ -19,11 +19,12 @@ if [ -z "$RENDERPERFTEST" ]; then
   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"
@@ -65,12 +66,13 @@ fi
 
 OPTS=""
 # use time + repeat
-OPTS="$OPTS -t -n=$N  -e$MODE $1"
+OPTS="$OPTS -r=$R -t -e$MODE $1"
 
 echo "OPTS: $OPTS"
 
 echo "Unit: Milliseconds (not FPS), lower is better"
-for i in `seq $R` ; do 
+
+for i in `seq $N` ; do 
   if [ $i -eq 1 ]; then
     echo x
   fi
@@ -80,9 +82,9 @@ for i in `seq $R` ; do
 #  -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 | \
+  -jar $RENDERPERFTEST $OPTS -v 2>&1 | tee render_$1_${mode_param}_$i.log | grep -v "^#" | tail -n 2 | \
   awk '{print $3 }'
   if [ $i -ne $N ]; then
     sleep $ST
   fi
-done | $DATAMASH_CMD | expand -t12 | tee render_$1_${mode_param}.log
+done | $DATAMASH_CMD | expand -t12 > render_$1_${mode_param}.log

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

@@ -46,7 +46,6 @@ function do_configure {
     --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 \
@@ -67,7 +66,7 @@ function create_image_bundle {
   __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
 
   echo Running jlink ...
-  ${BUILD_JDK}/bin/jlink.exe \
+  ${BUILD_JDK}/bin/jlink \
     --module-path $__modules_path --no-man-pages --compress=2 \
     --add-modules $__modules --output $__root_dir || do_exit $?
 
@@ -80,7 +79,6 @@ function create_image_bundle {
       rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
     done
     copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
-    zip_native_debug_symbols_win $IMAGES_DIR/symbols "${__root_dir}_pdb"
   fi
 }
 
@@ -105,11 +103,9 @@ 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 $?
+    make LOG=info CONF=$RELEASE_NAME clean 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 $?
+    make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
   fi
 else
   if [ $do_maketest -eq 1 ]; then
@@ -124,7 +120,8 @@ JSDK=$IMAGES_DIR/jdk
 JSDK_MODS_DIR=$IMAGES_DIR/jmods
 JBRSDK_BUNDLE=jbrsdk
 
-if where.exe cygpath; then
+where cygpath
+if [ $? -eq 0 ]; then
   JCEF_PATH="$(cygpath -w $JCEF_PATH | sed 's/\\/\//g')"
 fi
 

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

@@ -37,7 +37,6 @@ function do_configure {
     --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 \
@@ -60,7 +59,7 @@ function create_image_bundle {
   __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
 
   echo Running jlink ...
-  ${JSDK}/bin/jlink.exe \
+  ${JSDK}/bin/jlink \
     --module-path $__modules_path --no-man-pages --compress=2 \
     $__cds_opt --add-modules $__modules --output $__root_dir || do_exit $?
 
@@ -73,7 +72,6 @@ function create_image_bundle {
       rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
     done
     copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
-    zip_native_debug_symbols_win $IMAGES_DIR/symbols "${__root_dir}_pdb"
   fi
 }
 
@@ -98,11 +96,9 @@ 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 $?
+    make LOG=info CONF=$RELEASE_NAME clean 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 $?
+    make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
   fi
 else
   if [ $do_maketest -eq 1 ]; then
@@ -117,7 +113,8 @@ JSDK=$IMAGES_DIR/jdk
 JSDK_MODS_DIR=$IMAGES_DIR/jmods
 JBRSDK_BUNDLE=jbrsdk
 
-if where.exe cygpath; then
+where cygpath
+if [ $? -eq 0 ]; then
   JCEF_PATH="$(cygpath -w $JCEF_PATH | sed 's/\\/\//g')"
 fi
 

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

@@ -33,7 +33,6 @@ function do_configure {
     --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 \
@@ -56,7 +55,7 @@ function create_image_bundle {
   __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
 
   echo Running jlink ...
-  ${JSDK}/bin/jlink.exe \
+  ${JSDK}/bin/jlink \
     --module-path $__modules_path --no-man-pages --compress=2 \
     $__cds_opt --add-modules $__modules --output $__root_dir || do_exit $?
 
@@ -69,7 +68,6 @@ function create_image_bundle {
       rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
     done
     copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
-    zip_native_debug_symbols_win $IMAGES_DIR/symbols "${__root_dir}_pdb"
   fi
 }
 
@@ -93,10 +91,8 @@ 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 $?
+    make LOG=info CONF=$RELEASE_NAME clean 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

make/Bundles.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 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
@@ -23,9 +23,10 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 include MakeIO.gmk
@@ -42,6 +43,8 @@ ifeq ($(call isBuildOs, windows), true)
   TAR_IGNORE_EXIT_VALUE := || test "$$$$?" = "1"
 endif
 
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Bundles-pre.gmk))
 ################################################################################
 # BUNDLE : Name of bundle to create
 # FILES : Files in BASE_DIRS to add to bundle
@@ -174,11 +177,9 @@ else
   JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR)
   JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER)
   JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)
-  STATIC_JDK_BUNDLE_SUBDIR := static-jdk-$(VERSION_NUMBER)
   ifneq ($(DEBUG_LEVEL), release)
     JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
     JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
-    STATIC_JDK_BUNDLE_SUBDIR := $(STATIC_JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
   endif
   # In certain situations, the JDK_IMAGE_DIR points to an image without the
   # the symbols and demos. If so, the symobls and demos can be found in a
@@ -244,10 +245,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
       )
 
   JDK_SYMBOLS_BUNDLE_FILES := \
-      $(filter-out \
-          %.stripped.pdb, \
-          $(call FindFiles, $(SYMBOLS_IMAGE_DIR)) \
-      )
+      $(call FindFiles, $(SYMBOLS_IMAGE_DIR))
 
   TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_DEMOS_IMAGE_HOMEDIR)/demo/%, \
       $(ALL_JDK_DEMOS_FILES))
@@ -502,20 +500,10 @@ ifneq ($(filter static-libs-graal-bundles, $(MAKECMDGOALS)), )
   STATIC_LIBS_GRAAL_TARGETS += $(BUILD_STATIC_LIBS_GRAAL_BUNDLE)
 endif
 
-#################################################################################
+################################################################################
 
-ifneq ($(filter static-jdk-bundles, $(MAKECMDGOALS)), )
-  STATIC_JDK_BUNDLE_FILES := $(call FindFiles, $(STATIC_JDK_IMAGE_DIR))
-
-  $(eval $(call SetupBundleFile, BUILD_STATIC_JDK_BUNDLE, \
-      BUNDLE_NAME := $(STATIC_JDK_BUNDLE_NAME), \
-      FILES := $(STATIC_JDK_BUNDLE_FILES), \
-      BASE_DIRS := $(STATIC_JDK_IMAGE_DIR), \
-      SUBDIR := $(STATIC_JDK_BUNDLE_SUBDIR), \
-  ))
-
-  STATIC_JDK_TARGETS += $(BUILD_STATIC_JDK_BUNDLE)
-endif
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Bundles.gmk))
 
 ################################################################################
 
@@ -527,13 +515,8 @@ docs-javase-bundles: $(DOCS_JAVASE_TARGETS)
 docs-reference-bundles: $(DOCS_REFERENCE_TARGETS)
 static-libs-bundles: $(STATIC_LIBS_TARGETS)
 static-libs-graal-bundles: $(STATIC_LIBS_GRAAL_TARGETS)
-static-jdk-bundles: $(STATIC_JDK_TARGETS)
 jcov-bundles: $(JCOV_TARGETS)
 
-.PHONY: product-bundles test-bundles \
+.PHONY: all default product-bundles test-bundles \
     docs-jdk-bundles docs-javase-bundles docs-reference-bundles \
-    static-libs-bundles static-libs-graal-bundles static-jdk-bundles jcov-bundles
-
-################################################################################
-
-include MakeFileEnd.gmk
+    static-libs-bundles static-libs-graal-bundles jcov-bundles

make/CompileCommands.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 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
@@ -23,9 +23,10 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 # When FIXPATH is set, let it process the file to make sure all paths are usable
 # by system native tools. The FIXPATH tool assumes arguments preceded by an @
@@ -49,6 +50,6 @@ $(OUTPUTDIR)/compile_commands.json: $(wildcard $(MAKESUPPORT_OUTPUTDIR)/compile-
 
 TARGETS += $(OUTPUTDIR)/compile_commands.json
 
-################################################################################
+all: $(TARGETS)
 
-include MakeFileEnd.gmk
+.PHONY: all

make/CompileDemos.gmk

@@ -23,17 +23,23 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
 ################################################################################
 # Build demos for the JDK into $(SUPPORT_OUTPUTDIR)/demos/image.
 ################################################################################
 
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
 include CopyFiles.gmk
 include JavaCompilation.gmk
 include TextFileProcessing.gmk
 include ZipArchive.gmk
 
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, CompileDemos-pre.gmk))
+
 # Prepare the find cache.
 DEMO_SRC_DIRS += $(TOPDIR)/src/demo
 
@@ -258,8 +264,11 @@ ifneq ($(filter images, $(MAKECMDGOALS)), )
   IMAGES_TARGETS := $(COPY_TO_TEST_IMAGE)
 endif
 
+################################################################################
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, CompileDemos-post.gmk))
+
+all: $(TARGETS)
 images: $(IMAGES_TARGETS)
 
-################################################################################
-
-include MakeFileEnd.gmk
+.PHONY: all

make/CompileInterimLangtools.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -23,9 +23,11 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+# This must be the first rule
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 include JavaCompilation.gmk
@@ -95,16 +97,14 @@ define SetupInterimModule
       SRC := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim \
           $$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$1) \
           $(TOPDIR)/src/$1/share/classes, \
-      EXCLUDES := sun, \
+      EXCLUDES := sun javax/tools/snippet-files, \
       EXCLUDE_FILES := $(TOPDIR)/src/$1/share/classes/module-info.java \
           $(TOPDIR)/src/$1/share/classes/javax/tools/ToolProvider.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/Main.java \
-          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryClassLoader.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryContext.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryModuleFinder.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java \
           Standard.java, \
-      EXCLUDE_PATTERNS := -files, \
       EXTRA_FILES := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim/module-info.java \
           $($1.interim_EXTRA_FILES), \
       COPY := .gif .png .xml .css .svg .js .js.template .txt .woff .woff2 javax.tools.JavaCompilerTool, \
@@ -148,4 +148,5 @@ TARGETS += $(BUILD_JAVAC_SERVER)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+
+all: $(TARGETS)

make/CompileJavaModules.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -23,12 +23,13 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+# This must be the first rule
+default: all
 
-################################################################################
-
-include JavaCompilation.gmk
+include $(SPEC)
+include MakeBase.gmk
 include Modules.gmk
+include JavaCompilation.gmk
 
 ################################################################################
 # If this is an imported module that has prebuilt classes, only compile
@@ -85,15 +86,7 @@ CreateHkTargets = \
 ################################################################################
 # Include module specific build settings
 
-THIS_SNIPPET := modules/$(MODULE)/Java.gmk
-
-ifneq ($(wildcard $(THIS_SNIPPET)), )
-  include MakeSnippetStart.gmk
-
-  include $(THIS_SNIPPET)
-
-  include MakeSnippetEnd.gmk
-endif
+-include Java.gmk
 
 ################################################################################
 # Setup the main compilation
@@ -107,14 +100,12 @@ $(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), \
     DISABLED_WARNINGS := $(DISABLED_WARNINGS_java), \
     EXCLUDES := $(EXCLUDES), \
     EXCLUDE_FILES := $(EXCLUDE_FILES), \
-    EXCLUDE_PATTERNS := -files, \
     KEEP_ALL_TRANSLATIONS := $(KEEP_ALL_TRANSLATIONS), \
     JAVAC_FLAGS := \
         $(DOCLINT) \
@@ -157,4 +148,6 @@ endif
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all

make/CompileModuleTools.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 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
@@ -23,12 +23,14 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
 
 ################################################################################
 
-include JavaCompilation.gmk
-
 TOOLS_CLASSES_DIR := $(BUILDTOOLS_OUTPUTDIR)/tools_jigsaw_classes
 
 # When using an external BUILDJDK, make it possible to shortcut building of
@@ -62,4 +64,4 @@ TARGETS += $(BUILD_JIGSAW_TOOLS)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)

make/CompileToolsHotspot.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 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
@@ -23,12 +23,19 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+# This must be the first rule
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include JavaCompilation.gmk
 
+TARGETS :=
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, hotspot/CompileTools.gmk))
+
 ################################################################################
 # Build tools needed for the JFR source code generation
 
@@ -44,6 +51,7 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_HOTSPOT, \
 
 TARGETS += $(BUILD_TOOLS_HOTSPOT)
 
-################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all

make/CompileToolsJdk.gmk

@@ -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
@@ -23,14 +23,21 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 include JavaCompilation.gmk
 include TextFileProcessing.gmk
 
+################################################################################
+
+$(eval $(call IncludeCustomExtension, CompileTools.gmk))
+
+################################################################################
+
 # Use += to be able to add to this from a custom extension
 BUILD_TOOLS_SRC_DIRS += \
     $(TOPDIR)/make/jdk/src/classes \
@@ -80,7 +87,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 +100,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)
 
 ################################################################################
 
@@ -161,6 +160,4 @@ ifeq ($(ENABLE_PANDOC), true)
   TARGETS += $(PANDOC_HTML_MANPAGE_FILTER_SETUP)
 endif
 
-################################################################################
-
-include MakeFileEnd.gmk
+all: $(TARGETS)

make/CopyImportModules.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -23,12 +23,13 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
-################################################################################
 # This makefile is called for every imported module to copy the non class
 # contents into the exploded jdk image.
-################################################################################
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 
@@ -102,6 +103,4 @@ ifneq ($(CONF_DIR), )
   TARGETS += $(COPY_CONF)
 endif
 
-################################################################################
-
-include MakeFileEnd.gmk
+all: $(TARGETS)

make/CopyInterimTZDB.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 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
@@ -23,12 +23,15 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 
+################################################################################
+
 ### TZDB tool needs files from java.time.zone package
 
 define tzdb_copyfiles
@@ -48,7 +51,3 @@ $(eval $(call SetupCopyFiles, COPY_INTERIM_TZDB, \
 ################################################################################
 
 all: $(COPY_INTERIM_TZDB)
-
-################################################################################
-
-include MakeFileEnd.gmk

make/Coverage.gmk

@@ -22,7 +22,8 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 
-include MakeFileStart.gmk
+include $(SPEC)
+include MakeBase.gmk
 
 ################################################################################
 
@@ -34,33 +35,22 @@ else
   JCOV_INPUT_IMAGE_DIR := $(JDK_IMAGE_DIR)
 endif
 
-JCOV_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/jcov
-
 #moving instrumented jdk image in and out of jcov_temp because of CODETOOLS-7902299
-JCOV_TEMP := $(JCOV_SUPPORT_DIR)/temp
-
-ifneq ($(JCOV_MODULES), )
-  JCOV_MODULES_FILTER := $(foreach m, $(JCOV_MODULES), -include_module $m)
-endif
+JCOV_TEMP := $(SUPPORT_OUTPUTDIR)/jcov_temp
 
 $(JCOV_IMAGE_DIR)/release: $(JCOV_INPUT_IMAGE_DIR)/release
 	$(call LogWarn, Creating instrumented jdk image with JCov)
 	$(call MakeDir, $(JCOV_TEMP) $(IMAGES_OUTPUTDIR))
 	$(RM) -r $(JCOV_IMAGE_DIR) $(JCOV_TEMP)/*
 	$(CP) -r $(JCOV_INPUT_IMAGE_DIR) $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)
-	$(call ExecuteWithLog, $(JCOV_SUPPORT_DIR)/run-jcov, \
-	    $(JAVA) -Xmx3g -jar $(JCOV_HOME)/lib/jcov.jar JREInstr \
+	$(JAVA) -Xmx3g -jar $(JCOV_HOME)/lib/jcov.jar JREInstr \
 	    -t $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)/template.xml \
 	    -rt $(JCOV_HOME)/lib/jcov_network_saver.jar \
 	    -exclude 'java.lang.Object' \
 	    -exclude jdk.test.Main -exclude '**\$Proxy*' \
-	    $(JCOV_MODULES_FILTER) $(JCOV_FILTERS) \
-	    $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR))
+	    $(JCOV_FILTERS) \
+	    $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)
 	$(MV) $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR) $(JCOV_IMAGE_DIR)
 	$(RMDIR) $(JCOV_TEMP)
 
 jcov-image: $(JCOV_IMAGE_DIR)/release
-
-################################################################################
-
-include MakeFileEnd.gmk

make/CreateJmods.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -23,9 +23,10 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 include Execute.gmk
@@ -35,6 +36,8 @@ ifeq ($(MODULE), )
   $(error MODULE must be set when calling CreateJmods.gmk)
 endif
 
+$(eval $(call IncludeCustomExtension, CreateJmods.gmk))
+
 ################################################################################
 
 JMODS_DIR := $(IMAGES_OUTPUTDIR)/jmods
@@ -184,15 +187,7 @@ endif
 ################################################################################
 # Include module specific build settings
 
-THIS_SNIPPET := modules/$(MODULE)/Jmod.gmk
-
-ifneq ($(wildcard $(THIS_SNIPPET)), )
-  include MakeSnippetStart.gmk
-
-  include $(THIS_SNIPPET)
-
-  include MakeSnippetEnd.gmk
-endif
+-include Jmod.gmk
 
 # Set main class
 ifneq ($(JMOD_FLAGS_main_class), )
@@ -271,4 +266,6 @@ TARGETS += $(create_$(JMOD_FILE))
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+################################################################################

make/Docs.gmk

@@ -1,4 +1,4 @@
-# Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
@@ -22,7 +22,26 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
+include CopyFiles.gmk
+include Execute.gmk
+include Modules.gmk
+include ModuleTools.gmk
+include ProcessMarkdown.gmk
+include ToolsJdk.gmk
+include ZipArchive.gmk
+include TextFileProcessing.gmk
+
+# This is needed to properly setup DOCS_MODULES.
+$(eval $(call ReadImportMetaData))
+
+################################################################################
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Docs.gmk))
 
 ################################################################################
 # This file generates all documentation for OpenJDK.
@@ -35,19 +54,7 @@ include MakeFileStart.gmk
 #
 # We will also generate separate, free-standing specifications from either
 # markdown or existing html files.
-################################################################################
-
-include CopyFiles.gmk
-include Execute.gmk
-include Modules.gmk
-include ProcessMarkdown.gmk
-include TextFileProcessing.gmk
-include ZipArchive.gmk
-include $(TOPDIR)/make/ModuleTools.gmk
-include $(TOPDIR)/make/ToolsJdk.gmk
-
-# This is needed to properly setup DOCS_MODULES.
-$(eval $(call ReadImportMetaData))
+#
 
 ################################################################################
 # Javadoc settings
@@ -92,16 +99,20 @@ REFERENCE_TAGS := $(JAVADOC_TAGS)
 JAVADOC_DISABLED_DOCLINT_WARNINGS := missing
 JAVADOC_DISABLED_DOCLINT_PACKAGES := org.w3c.* javax.smartcardio
 
+# Allow overriding on the command line
+# (intentionally sharing name with the javac option)
+JAVA_WARNINGS_ARE_ERRORS ?= -Werror
+
 # The initial set of options for javadoc
 JAVADOC_OPTIONS := -use -keywords -notimestamp \
-    -serialwarn -encoding utf-8 -docencoding utf-8 -breakiterator \
+    -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
     -splitIndex --system none -javafx --expand-requires transitive \
     --override-methods=summary
 
 # The reference options must stay stable to allow for comparisons across the
 # development cycle.
 REFERENCE_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
-    -serialwarn -encoding utf-8 -breakiterator -splitIndex --system none \
+    -encoding ISO-8859-1 -breakiterator -splitIndex --system none \
     -html5 -javafx --expand-requires transitive
 
 # Should we add DRAFT stamps to the generated javadoc?
@@ -260,7 +271,7 @@ define create_overview_file
   $$($1_OVERVIEW): $$($1_OVERVIEW_VARDEPS_FILE)
 	$$(call LogInfo, Creating overview.html for $1)
 	$$(call MakeDir, $$(@D))
-	$$(PRINTF) "%s" '$$($1_OVERVIEW_TEXT)' > $$@
+	$$(PRINTF) > $$@ '$$($1_OVERVIEW_TEXT)'
 endef
 
 ################################################################################
@@ -318,9 +329,7 @@ define SetupApiDocsGenerationBody
   # Ignore the doclint warnings in certain packages
   $1_OPTIONS += -Xdoclint/package:$$(call CommaList, $$(addprefix -, \
       $$(JAVADOC_DISABLED_DOCLINT_PACKAGES)))
-  ifeq ($$(JAVA_WARNINGS_AS_ERRORS), true)
-    $1_OPTIONS += -Werror
-  endif
+  $1_OPTIONS += $$(JAVA_WARNINGS_ARE_ERRORS)
 
   $1_DOC_TITLE := $$($1_LONG_NAME)<br>Version $$(VERSION_SPECIFICATION) API \
       Specification
@@ -540,9 +549,7 @@ $(eval $(call SetupApiDocsGeneration, REFERENCE_API, \
 # Format: space-delimited list of names, including at most one '%' as a
 # wildcard. Spec source files match if their filename or any enclosing folder
 # name matches one of the items in SPEC_FILTER.
-ifeq ($(SPEC_FILTER), )
-  SPEC_FILTER := %
-endif
+SPEC_FILTER := %
 
 ApplySpecFilter = \
     $(strip $(foreach file, $(1), \
@@ -673,7 +680,7 @@ ifeq ($(ENABLE_PANDOC), true)
 
   $(foreach m, $(ALL_MODULES), \
     $(eval MAN_$m := $(call ApplySpecFilter, $(filter %.md, $(call FindFiles, \
-          $(call FindModuleManDirsForDocs, $m))))) \
+          $(call FindModuleManDirs, $m))))) \
     $(if $(MAN_$m), \
       $(eval $(call SetupProcessMarkdown, MAN_TO_HTML_$m, \
         FILES := $(MAN_$m), \
@@ -754,6 +761,10 @@ $(eval $(call SetupZipArchive, BUILD_JAVADOC_ZIP, \
 
 ZIP_TARGETS += $(BUILD_JAVADOC_ZIP)
 
+################################################################################
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Docs-post.gmk))
+
 ################################################################################
 # Bundles all generated specs into a zip archive, skipping javadocs.
 
@@ -795,11 +806,7 @@ all: docs-jdk-api-javadoc docs-jdk-api-graphs docs-javase-api-javadoc \
     docs-reference-api-graphs docs-jdk-specs docs-jdk-index docs-zip \
     docs-specs-zip
 
-.PHONY: docs-jdk-api-javadoc docs-jdk-api-graphs \
+.PHONY: default all docs-jdk-api-javadoc docs-jdk-api-graphs \
     docs-javase-api-javadoc docs-javase-api-graphs \
     docs-reference-api-javadoc docs-reference-api-graphs docs-jdk-specs \
     docs-jdk-index docs-zip docs-specs-zip
-
-################################################################################
-
-include MakeFileEnd.gmk

make/Doctor.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,11 +23,18 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Doctor.gmk))
 
 ################################################################################
+#
 # Help user diagnose possible errors and problems with the build environment.
-################################################################################
+#
 
 prologue:
 	$(ECHO)
@@ -138,8 +145,4 @@ doctor: $(TARGETS)
 
 all: doctor
 
-.PHONY: doctor $(TARGETS)
-
-################################################################################
-
-include MakeFileEnd.gmk
+.PHONY: default all doctor $(TARGETS)

make/ExplodedImageOptimize.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, 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
@@ -23,15 +23,17 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
-################################################################################
 # Runs a tool on the exploded image to improve performance
-################################################################################
 
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
 include Execute.gmk
 include $(TOPDIR)/make/ModuleTools.gmk
 
+################################################################################
+
 ALL_MODULEINFO_CLASSES := $(wildcard $(JDK_OUTPUTDIR)/modules/*/module-info.class)
 
 $(eval $(call SetupExecute, optimize_image, \
@@ -45,4 +47,6 @@ TARGETS := $(optimize_image_TARGET)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all default

make/GenerateFindTests.gmk

@@ -1,38 +0,0 @@
-#
-# 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.  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 MakeFileStart.gmk
-
-################################################################################
-# This makefile is a thin wrapper around FindTests.gmk, just to make FindTest
-# fill the cache.
-################################################################################
-
-GENERATE_FIND_TESTS_FILE := true
-include FindTests.gmk
-
-################################################################################
-
-include MakeFileEnd.gmk

make/GenerateLinkOptData.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 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
@@ -23,12 +23,15 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
 ################################################################################
 # Generate classlist
 ################################################################################
 
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
 include CopyFiles.gmk
 include JavaCompilation.gmk
 
@@ -76,14 +79,10 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \
 	    $(CLASSLIST_FILE_VM_OPTS) \
-	    -Xlog:aot=off \
-	    -Xlog:cds=off \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
-	    build.tools.classlist.HelloClasslist jdk/src/classes/build/tools/classlist/clear.classlist $(LOG_DEBUG)
+	    build.tools.classlist.HelloClasslist $(LOG_DEBUG)
 	$(GREP) -v HelloClasslist $@.raw > $@.interim
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -Xshare:dump \
-	    -Xlog:aot=off \
-	    -Xlog:cds=off \
 	    -XX:SharedClassListFile=$@.interim -XX:SharedArchiveFile=$@.jsa \
 	    -Xmx128M -Xms128M $(LOG_INFO)
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw.2 \
@@ -91,10 +90,8 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	    -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
 	    $(CLASSLIST_FILE_VM_OPTS) \
 	    --module-path $(SUPPORT_OUTPUTDIR)/classlist.jar \
-	    -Xlog:aot=off \
-	    -Xlog:cds=off \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
-	    build.tools.classlist.HelloClasslist jdk/src/classes/build/tools/classlist/clear.classlist \
+	    build.tools.classlist.HelloClasslist \
 	    2> $(LINK_OPT_DIR)/stderr > $(JLI_TRACE_FILE) \
 	    || ( \
 	        exitcode=$$? ; \
@@ -106,8 +103,6 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	$(GREP) -v HelloClasslist $@.raw.2 > $@.raw.3
 	$(GREP) -v @cp $@.raw.3 > $@.raw.4
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java \
-	    -Xlog:aot=off \
-	    -Xlog:cds=off \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
 	    build.tools.classlist.SortClasslist $@.raw.4 > $@
 
@@ -153,4 +148,4 @@ TARGETS += $(COPY_JLI_TRACE)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)

make/GenerateModuleSummary.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2018, 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
@@ -23,11 +23,12 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+# Default target declared first
+default: all
 
-################################################################################
-
-include $(TOPDIR)/make/ModuleTools.gmk
+include $(SPEC)
+include MakeBase.gmk
+include ModuleTools.gmk
 
 GENGRAPHS_DIR := $(IMAGES_OUTPUTDIR)/gengraphs
 SPEC_DOTFILES_DIR := $(GENGRAPHS_DIR)/spec-dotfiles
@@ -49,7 +50,3 @@ $(GENGRAPHS_DIR)/module-summary.html: $(BUILD_JIGSAW_TOOLS) $(GENGRAPHS_DIR)/tec
 	$(TOOL_MODULESUMMARY) -o $@ --module-path $(IMAGES_OUTPUTDIR)/jmods
 
 all: $(GENGRAPHS_DIR)/jdk.dot $(GENGRAPHS_DIR)/module-summary.html $(SPEC_DOTFILES_DIR)/java.se.dot
-
-################################################################################
-
-include MakeFileEnd.gmk

make/Global.gmk

@@ -121,12 +121,12 @@ print-configurations:
 	@true
 
 test-prebuilt:
-	@( cd $(TOPDIR) && \
+	@( cd $(topdir) && \
 	    $(MAKE) --no-print-directory -r -R -I make/common/ -f make/RunTestsPrebuilt.gmk \
 	    test-prebuilt CUSTOM_MAKE_DIR=$(CUSTOM_MAKE_DIR) TEST="$(TEST)" )
 
 test-prebuilt-with-exit-code:
-	@( cd $(TOPDIR) && \
+	@( cd $(topdir) && \
 	    $(MAKE) --no-print-directory -r -R -I make/common/ -f make/RunTestsPrebuilt.gmk \
 	    test-prebuilt-with-exit-code CUSTOM_MAKE_DIR=$(CUSTOM_MAKE_DIR) TEST="$(TEST)" )
 

make/GraalBuilderImage.gmk

@@ -23,15 +23,20 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
-################################################################################
 # This makefile creates a jdk image overlaid with statically linked core
 # libraries.
-################################################################################
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 
+################################################################################
+
+TARGETS :=
+
 $(eval $(call SetupCopyFiles, COPY_JDK_IMG, \
       SRC := $(JDK_IMAGE_DIR)/, \
       DEST := $(GRAAL_BUILDER_IMAGE_DIR)/, \
@@ -49,4 +54,6 @@ TARGETS += $(COPY_STATIC_LIBS)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all

make/Hsdis.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 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
@@ -23,14 +23,17 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JdkNativeCompilation.gmk
 
 ################################################################################
 # This makefile compiles and installs the hsdis library
+#
 ################################################################################
 
-include JdkNativeCompilation.gmk
-
 HSDIS_OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/hsdis
 REAL_HSDIS_NAME := hsdis-$(OPENJDK_TARGET_CPU_LEGACY_LIB)$(SHARED_LIBRARY_SUFFIX)
 BUILT_HSDIS_LIB := $(HSDIS_OUTPUT_DIR)/$(REAL_HSDIS_NAME)
@@ -198,8 +201,8 @@ endif
 
 TARGETS += install
 
-.PHONY: build install
-
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all default build install

make/Images.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -23,9 +23,10 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 include DebugInfoUtils.gmk
@@ -36,6 +37,9 @@ include Utils.gmk
 JDK_TARGETS :=
 JRE_TARGETS :=
 
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Images-pre.gmk))
+
 ################################################################################
 
 # All modules for the current target platform.
@@ -97,10 +101,6 @@ ifeq ($(JLINK_PRODUCE_LINKABLE_RUNTIME), true)
   JLINK_JDK_EXTRA_OPTS += --generate-linkable-runtime
 endif
 
-ifneq ($(JLINK_USER_EXTRA_FLAGS), )
-  JLINK_JDK_EXTRA_OPTS += $(JLINK_USER_EXTRA_FLAGS)
-endif
-
 $(eval $(call SetupExecute, jlink_jdk, \
     WARN := Creating jdk image, \
     DEPS := $(JDK_JMODS) $(BASE_RELEASE_FILE) \
@@ -162,7 +162,7 @@ define CreateCDSArchive
   endif
 
   ifeq ($(DEBUG_CDS_ARCHIVE), true)
-    $1_$2_CDS_DUMP_FLAGS += -Xlog:aot+map*=trace:file=$$(JDK_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE).cdsmap:none:filesize=0
+    $1_$2_CDS_DUMP_FLAGS += -Xlog:cds+map*=trace:file=$$(JDK_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE).cdsmap:none:filesize=0
   endif
 
   $$(eval $$(call SetupExecute, $1_$2_gen_cds_archive_jdk, \
@@ -309,6 +309,12 @@ $(call SetupCopyDebuginfo,SYMBOLS)
 
 ################################################################################
 
+# Include custom post hook here to make it possible to augment the target lists
+# before actual target prerequisites are declared.
+$(eval $(call IncludeCustomExtension, Images-post.gmk))
+
+################################################################################
+
 $(JRE_TARGETS): $(JLINK_JRE_TARGETS)
 $(JDK_TARGETS): $(JLINK_JDK_TARGETS)
 
@@ -318,8 +324,4 @@ symbols: $(SYMBOLS_TARGETS)
 
 all: jdk jre symbols
 
-.PHONY: jdk jre symbols
-
-################################################################################
-
-include MakeFileEnd.gmk
+.PHONY: default all jdk jre symbols

make/Init.gmk

@@ -23,8 +23,6 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
 ################################################################################
 # Init.gmk sits between PreInit.gmk and Main.gmk when bootstrapping the build.
 # It is called from PreInit.gmk, and its main responsibility is to launch
@@ -33,14 +31,28 @@ include MakeFileStart.gmk
 # value of $(MAKE) for all further make calls.
 ################################################################################
 
-# Our helper functions.
-include $(TOPDIR)/make/InitSupport.gmk
-include LogUtils.gmk
+# This must be the first rule
+default:
+.PHONY: default
 
 # Inclusion of this pseudo-target will cause make to execute this file
 # serially, regardless of -j.
 .NOTPARALLEL:
 
+include $(SPEC)
+
+include $(TOPDIR)/make/common/MakeBase.gmk
+
+# Our helper functions.
+include $(TOPDIR)/make/InitSupport.gmk
+include $(TOPDIR)/make/common/LogUtils.gmk
+
+# Force early generation of module-deps.gmk and find-tests.gmk
+GENERATE_MODULE_DEPS_FILE := true
+include $(TOPDIR)/make/common/Modules.gmk
+GENERATE_FIND_TESTS_FILE := true
+include $(TOPDIR)/make/common/FindTests.gmk
+
 # Parse COMPARE_BUILD (for makefile development)
 $(eval $(call ParseCompareBuild))
 
@@ -110,18 +122,7 @@ reconfigure:
 	    CUSTOM_CONFIG_DIR="$(CUSTOM_CONFIG_DIR)" \
 	    $(RECONFIGURE_COMMAND) )
 
-# Create files that are needed to run most targets in Main.gmk
-create-make-helpers:
-	( cd $(TOPDIR) && \
-	    $(MAKE) $(MAKE_ARGS) -j 1 -f make/GenerateFindTests.gmk \
-	    $(USER_MAKE_VARS) )
-	( cd $(TOPDIR) && \
-	    $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
-	    UPDATE_MODULE_DEPS=true NO_RECIPES=true \
-	    create-main-targets-include )
-
-.PHONY: print-modules print-targets print-tests print-configuration \
-    reconfigure create-make-helpers
+.PHONY: print-modules print-targets print-tests print-configuration reconfigure
 
 ##############################################################################
 # The main target. This will delegate all other targets into Main.gmk.
@@ -141,19 +142,16 @@ TARGET_DESCRIPTION := target$(if $(word 2, $(MAIN_TARGETS)),s) \
 # variables are explicitly propagated using $(USER_MAKE_VARS).
 main: MAKEOVERRIDES :=
 
-main: $(INIT_TARGETS) create-make-helpers
+main: $(INIT_TARGETS)
         ifneq ($(SEQUENTIAL_TARGETS)$(PARALLEL_TARGETS), )
 	  $(call RotateLogFiles)
-	  $(ECHO) "Building $(TARGET_DESCRIPTION)" $(BUILD_LOG_PIPE_SIMPLE)
+	  $(PRINTF) "Building $(TARGET_DESCRIPTION)\n" $(BUILD_LOG_PIPE_SIMPLE)
           ifneq ($(SEQUENTIAL_TARGETS), )
             # Don't touch build output dir since we might be cleaning. That
             # means no log pipe.
 	    ( cd $(TOPDIR) && \
 	        $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
 	        $(SEQUENTIAL_TARGETS) )
-            # We might have cleaned away essential files, recreate them.
-	    ( cd $(TOPDIR) && \
-	        $(MAKE) $(MAKE_ARGS) -j 1 -f make/Init.gmk create-make-helpers )
           endif
           ifneq ($(PARALLEL_TARGETS), )
 	    $(call PrepareFailureLogs)
@@ -168,11 +166,10 @@ main: $(INIT_TARGETS) create-make-helpers
 	            -f make/Main.gmk $(USER_MAKE_VARS) \
 	            $(PARALLEL_TARGETS) $(COMPARE_BUILD_MAKE) $(BUILD_LOG_PIPE) || \
 	        ( exitcode=$$? && \
-	        $(ECHO) "" $(BUILD_LOG_PIPE_SIMPLE) && \
-	        $(ECHO) "ERROR: Build failed for $(TARGET_DESCRIPTION) (exit code $$exitcode)" \
+	        $(PRINTF) "\nERROR: Build failed for $(TARGET_DESCRIPTION) (exit code $$exitcode) \n" \
 	            $(BUILD_LOG_PIPE_SIMPLE) && \
 	        cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -j 1 -f make/Init.gmk \
-	            on-failure ; \
+	            HAS_SPEC=true on-failure ; \
 	        exit $$exitcode ) )
 	    $(call CleanupJavacServer)
 	    $(call StopGlobalTimer)
@@ -181,7 +178,7 @@ main: $(INIT_TARGETS) create-make-helpers
 	  if test -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error ; then \
 	    exit 1 ; \
 	  fi
-	  $(ECHO) "Finished building $(TARGET_DESCRIPTION)" $(BUILD_LOG_PIPE_SIMPLE)
+	  $(PRINTF) "Finished building $(TARGET_DESCRIPTION)\n" $(BUILD_LOG_PIPE_SIMPLE)
 	  $(call ReportProfileTimes)
         endif
 
@@ -192,8 +189,7 @@ on-failure:
 	$(call PrintFailureReports)
 	$(call PrintBuildLogFailures)
 	$(call ReportProfileTimes)
-	$(ECHO) "HELP: Run 'make doctor' to diagnose build problems."
-	$(ECHO) ""
+	$(PRINTF) "HELP: Run 'make doctor' to diagnose build problems.\n\n"
         ifneq ($(COMPARE_BUILD), )
 	  $(call CleanupCompareBuild)
         endif
@@ -209,7 +205,3 @@ post-compare-build:
 	$(call CompareBuildDoComparison)
 
 .PHONY: main on-failure pre-compare-build post-compare-build
-
-################################################################################
-
-include MakeFileEnd.gmk

make/InitSupport.gmk

@@ -23,9 +23,6 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
 ################################################################################
 # This file contains helper functions for Init.gmk.
 ################################################################################
@@ -39,6 +36,12 @@ BUILD_LOG_PIPE := > >($(TEE) -a $(BUILD_LOG)) 2> >($(TEE) -a $(BUILD_LOG) >&2) &
 # to stderr.
 BUILD_LOG_PIPE_SIMPLE := | $(TEE) -a $(BUILD_LOG)
 
+ifneq ($(CUSTOM_ROOT), )
+  topdir = $(CUSTOM_ROOT)
+else
+  topdir = $(TOPDIR)
+endif
+
 # Setup the build environment to match the requested specification on
 # level of reproducible builds
 define SetupReproducibleBuild
@@ -61,7 +64,7 @@ endef
 # FAIL can be set to false to have the return value of compare be ignored.
 define ParseCompareBuild
   ifneq ($$(COMPARE_BUILD), )
-    COMPARE_BUILD_OUTPUTDIR := $(WORKSPACE_ROOT)/build/compare-build/$(CONF_NAME)
+    COMPARE_BUILD_OUTPUTDIR := $(topdir)/build/compare-build/$(CONF_NAME)
     COMPARE_BUILD_FAIL := true
 
     ifneq ($$(findstring :, $$(COMPARE_BUILD)), )
@@ -103,14 +106,14 @@ define ParseCompareBuild
       endif
     endif
     ifneq ($$(COMPARE_BUILD_PATCH), )
-      ifneq ($$(wildcard $$(WORKSPACE_ROOT)/$$(COMPARE_BUILD_PATCH)), )
+      ifneq ($$(wildcard $$(topdir)/$$(COMPARE_BUILD_PATCH)), )
         # Assume relative path, if file exists
-        COMPARE_BUILD_PATCH := $$(wildcard $$(WORKSPACE_ROOT)/$$(COMPARE_BUILD_PATCH))
+        COMPARE_BUILD_PATCH := $$(wildcard $$(topdir)/$$(COMPARE_BUILD_PATCH))
       else ifeq ($$(wildcard $$(COMPARE_BUILD_PATCH)), )
         $$(error Patch file $$(COMPARE_BUILD_PATCH) does not exist)
       endif
       ifneq ($$(COMPARE_BUILD_NODRYRUN), true)
-        PATCH_DRY_RUN := $$(shell cd $$(WORKSPACE_ROOT) && $$(PATCH) --dry-run -p1 < $$(COMPARE_BUILD_PATCH) > /dev/null 2>&1 || $$(ECHO) FAILED)
+        PATCH_DRY_RUN := $$(shell cd $$(topdir) && $$(PATCH) --dry-run -p1 < $$(COMPARE_BUILD_PATCH) > /dev/null 2>&1 || $$(ECHO) FAILED)
         ifeq ($$(PATCH_DRY_RUN), FAILED)
           $$(error Patch file $$(COMPARE_BUILD_PATCH) does not apply cleanly)
         endif
@@ -126,11 +129,11 @@ endef
 define PrepareCompareBuild
 	$(ECHO) "Preparing for comparison rebuild"
         # Apply patch, if any
-	$(if $(COMPARE_BUILD_PATCH), cd $(WORKSPACE_ROOT) && $(PATCH) -p1 < $(COMPARE_BUILD_PATCH))
+	$(if $(COMPARE_BUILD_PATCH), cd $(topdir) && $(PATCH) -p1 < $(COMPARE_BUILD_PATCH))
         # Move the first build away temporarily
-	$(RM) -r $(WORKSPACE_ROOT)/build/.compare-build-temp
-	$(MKDIR) -p $(WORKSPACE_ROOT)/build/.compare-build-temp
-	$(MV) $(OUTPUTDIR) $(WORKSPACE_ROOT)/build/.compare-build-temp
+	$(RM) -r $(topdir)/build/.compare-build-temp
+	$(MKDIR) -p $(topdir)/build/.compare-build-temp
+	$(MV) $(OUTPUTDIR) $(topdir)/build/.compare-build-temp
         # Restore an old compare-build, or create a new compare-build directory.
 	if test -d $(COMPARE_BUILD_OUTPUTDIR); then \
 	  $(MV) $(COMPARE_BUILD_OUTPUTDIR) $(OUTPUTDIR); \
@@ -140,19 +143,19 @@ define PrepareCompareBuild
         # Re-run configure with the same arguments (and possibly some additional),
         # must be done after patching.
 	( cd $(CONFIGURE_START_DIR) && PATH="$(ORIGINAL_PATH)" \
-	    $(BASH) $(WORKSPACE_ROOT)/configure $(CONFIGURE_COMMAND_LINE) $(COMPARE_BUILD_CONF))
+	    $(BASH) $(topdir)/configure $(CONFIGURE_COMMAND_LINE) $(COMPARE_BUILD_CONF))
 endef
 
 # Cleanup after a compare build
 define CleanupCompareBuild
         # If running with a COMPARE_BUILD patch, reverse-apply it, but continue
         # even if that fails (can happen with removed files).
-	$(if $(COMPARE_BUILD_PATCH), cd $(WORKSPACE_ROOT) && $(PATCH) -R -p1 < $(COMPARE_BUILD_PATCH) || true)
+	$(if $(COMPARE_BUILD_PATCH), cd $(topdir) && $(PATCH) -R -p1 < $(COMPARE_BUILD_PATCH) || true)
         # Move this build away and restore the original build
-	$(MKDIR) -p $(WORKSPACE_ROOT)/build/compare-build
+	$(MKDIR) -p $(topdir)/build/compare-build
 	$(MV) $(OUTPUTDIR) $(COMPARE_BUILD_OUTPUTDIR)
-	$(MV) $(WORKSPACE_ROOT)/build/.compare-build-temp/$(CONF_NAME) $(OUTPUTDIR)
-	$(RM) -r $(WORKSPACE_ROOT)/build/.compare-build-temp
+	$(MV) $(topdir)/build/.compare-build-temp/$(CONF_NAME) $(OUTPUTDIR)
+	$(RM) -r $(topdir)/build/.compare-build-temp
 endef
 
 # Do the actual comparison of two builds
@@ -173,10 +176,9 @@ define PrintFailureReports
 	  $(RM) $(MAKESUPPORT_OUTPUTDIR)/failure-summary.log ; \
 	  $(if $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*.log), \
 	    ( \
-	      $(ECHO) "" ; \
-	      $(ECHO) "=== Output from failing command(s) repeated here ===" ;  \
+	      $(PRINTF) "\n=== Output from failing command(s) repeated here ===\n" ;  \
 	      $(foreach logfile, $(sort $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*.log)), \
-	          $(ECHO) "* For target $(notdir $(basename $(logfile))):" ; \
+	          $(PRINTF) "* For target $(notdir $(basename $(logfile))):\n" ; \
 	          $(if $(filter all, $(LOG_REPORT)), \
 	            $(GREP) -v -e "^Note: including file:" <  $(logfile) || true ; \
 	          , \
@@ -186,9 +188,8 @@ define PrintFailureReports
 	            fi ; \
 	          ) \
 	      ) \
-	      $(ECHO) "" ; \
-	      $(ECHO) "* All command lines available in $(MAKESUPPORT_OUTPUTDIR)/failure-logs." ; \
-	      $(ECHO) "=== End of repeated output ===" ; \
+	      $(PRINTF) "\n* All command lines available in $(MAKESUPPORT_OUTPUTDIR)/failure-logs.\n" ; \
+	      $(PRINTF) "=== End of repeated output ===\n" ; \
 	    )  >> $(MAKESUPPORT_OUTPUTDIR)/failure-summary.log  \
 	  ) \
 	)
@@ -197,16 +198,13 @@ endef
 define PrintBuildLogFailures
 	$(if $(filter none, $(LOG_REPORT)), , \
 	  if $(GREP) -q "recipe for target .* failed" $(BUILD_LOG) 2> /dev/null; then  \
-	    $(ECHO) "" ; \
-	    $(ECHO) "=== Make failed targets repeated here ===" ; \
+	    $(PRINTF) "\n=== Make failed targets repeated here ===\n" ; \
 	    $(GREP) "recipe for target .* failed" $(BUILD_LOG) ; \
-	    $(ECHO) "=== End of repeated output ===" ; \
-	    $(ECHO) "" ; \
-	    $(ECHO) "HELP: Try searching the build log for the name of the first failed target." ; \
+	    $(PRINTF) "=== End of repeated output ===\n" ; \
+	    $(PRINTF) "\nHELP: Try searching the build log for the name of the first failed target.\n" ; \
 	  else \
-	    $(ECHO) "" ; \
-	    $(ECHO) "No indication of failed target found." ; \
-	    $(ECHO) "HELP: Try searching the build log for '] Error'." ; \
+	    $(PRINTF) "\nNo indication of failed target found.\n" ; \
+	    $(PRINTF) "HELP: Try searching the build log for '] Error'.\n" ; \
 	  fi >> $(MAKESUPPORT_OUTPUTDIR)/failure-summary.log ; \
 	  $(CAT) $(MAKESUPPORT_OUTPUTDIR)/failure-summary.log \
 	)
@@ -267,7 +265,7 @@ endif
 ##############################################################################
 
 # Store the build times in this directory.
-BUILDTIMESDIR := $(OUTPUTDIR)/make-support/build-times
+BUILDTIMESDIR = $(OUTPUTDIR)/make-support/build-times
 
 # Record starting time for build of a sub repository.
 define RecordStartTime
@@ -320,8 +318,3 @@ define ReportProfileTimes
     $(BUILD_LOG_PIPE_SIMPLE)
   )
 endef
-
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk

make/InterimImage.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 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
@@ -23,9 +23,10 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include Execute.gmk
 include Modules.gmk
@@ -57,4 +58,6 @@ TARGETS += $(jlink_interim_image)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all

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/JrtfsJar.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -23,13 +23,14 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
-include JarArchive.gmk
 include JavaCompilation.gmk
+include JarArchive.gmk
 include TextFileProcessing.gmk
 
 # This rule will be depended on due to the MANIFEST line
@@ -77,7 +78,3 @@ $(eval $(call SetupJarArchive, BUILD_JRTFS_JAR, \
 ))
 
 all: $(BUILD_JRTFS_JAR)
-
-################################################################################
-
-include MakeFileEnd.gmk

make/MacBundles.gmk

@@ -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
@@ -23,9 +23,8 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 include TextFileProcessing.gmk
@@ -119,7 +118,3 @@ else # Not macosx
 endif # macosx
 
 .PHONY: jdk-bundle jre-bundle bundles
-
-################################################################################
-
-include MakeFileEnd.gmk

make/Main.gmk

@@ -24,41 +24,44 @@
 #
 
 ################################################################################
-# This is the main makefile containing most actual top level targets.
+# This is the main makefile containing most actual top level targets. It needs
+# to be called with a SPEC file defined.
 ################################################################################
 
-# Declare ALL_TARGETS as an immediate variable. This variable is a list of all
-# valid top level targets. It's used to declare them all as PHONY and to
-# generate the -only targets.
+# Declare default target
+default:
 
-ALL_TARGETS :=
-
-DEFAULT_TARGET := default-target
-
-include MakeFileStart.gmk
-
-################################################################################
-
-include $(TOPDIR)/make/MainSupport.gmk
-
-include FindTests.gmk
-
-ifeq ($(UPDATE_MODULE_DEPS), true)
-  # Update module-deps.gmk if requested. This is read in Modules.gmk.
-  GENERATE_MODULE_DEPS_FILE := true
+ifeq ($(wildcard $(SPEC)), )
+  $(error Main.gmk needs SPEC set to a proper spec.gmk)
 endif
 
-include Modules.gmk
+# Now load the spec
+include $(SPEC)
+
+# Load the vital tools for all the makefiles.
+include $(TOPDIR)/make/common/MakeBase.gmk
+include $(TOPDIR)/make/common/Modules.gmk
+include $(TOPDIR)/make/common/FindTests.gmk
+
+include $(TOPDIR)/make/MainSupport.gmk
 
 # Are we requested to ignore dependencies?
 ifneq ($(findstring -only, $(MAKECMDGOALS)), )
   DEPS := none
 endif
 
+# Declare ALL_TARGETS as an immediate variable. This variable is a list of all
+# valid top level targets. It's used to declare them all as PHONY and to
+# generate the -only targets.
+ALL_TARGETS :=
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Main.gmk))
 
 # All modules for the current target platform.
 ALL_MODULES := $(call FindAllModules)
 
+################################################################################
 ################################################################################
 #
 # Recipes for all targets. Only recipes, dependencies are declared later.
@@ -358,7 +361,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)", \
 ))
 
 ################################################################################
@@ -417,14 +420,12 @@ $(eval $(call SetupTarget, create-source-revision-tracker, \
 ))
 
 BOOTCYCLE_TARGET := product-images
-BOOTCYCLE_SPEC := $(dir $(SPEC))bootcycle-spec.gmk
-
 bootcycle-images:
         ifneq ($(COMPILE_TYPE), cross)
 	  $(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
 	  $(call MakeDir, $(OUTPUTDIR)/bootcycle-build)
 	  +$(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
-	      LOG_PREFIX="[bootcycle] " JOBS= SPEC=$(BOOTCYCLE_SPEC) main
+	      LOG_PREFIX="[bootcycle] " JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
         else
 	  $(call LogWarn, Boot cycle build disabled when cross compiling)
         endif
@@ -761,17 +762,6 @@ $(eval $(call SetupTarget, test-image-lib, \
     DEPS := build-test-lib, \
 ))
 
-$(eval $(call SetupTarget, build-test-setup-aot, \
-    MAKEFILE := test/BuildTestSetupAOT, \
-    DEPS := interim-langtools exploded-image, \
-))
-
-$(eval $(call SetupTarget, test-image-setup-aot, \
-    MAKEFILE := test/BuildTestSetupAOT, \
-    TARGET := images, \
-    DEPS :=  build-test-setup-aot, \
-))
-
 ifeq ($(BUILD_FAILURE_HANDLER), true)
   # Builds the failure handler jtreg extension
   $(eval $(call SetupTarget, build-test-failure-handler, \
@@ -883,12 +873,6 @@ $(eval $(call SetupTarget, static-libs-graal-bundles, \
     DEPS := static-libs-graal-image, \
 ))
 
-$(eval $(call SetupTarget, static-jdk-bundles, \
-    MAKEFILE := Bundles, \
-    TARGET := static-jdk-bundles, \
-    DEPS := static-jdk-image, \
-))
-
 ifeq ($(JCOV_ENABLED), true)
   $(eval $(call SetupTarget, jcov-bundles, \
       MAKEFILE := Bundles, \
@@ -1306,8 +1290,7 @@ all-docs-bundles: docs-jdk-bundles docs-javase-bundles docs-reference-bundles
 # This target builds the test image
 test-image: prepare-test-image test-image-jdk-jtreg-native \
     test-image-demos-jdk test-image-libtest-jtreg-native \
-    test-image-lib test-image-lib-native \
-    test-image-setup-aot
+    test-image-lib test-image-lib-native
 
 ifneq ($(JVM_TEST_IMAGE_TARGETS), )
   # If JVM_TEST_IMAGE_TARGETS is externally defined, use it instead of the
@@ -1335,7 +1318,10 @@ endif
 ################################################################################
 
 # all-images builds all our deliverables as images.
-all-images: product-images static-jdk-image test-image all-docs-images
+all-images: product-images test-image all-docs-images
+ifeq ($(call isTargetOs, linux macosx windows), true)
+  all-images: static-jdk-image
+endif
 
 # all-bundles packages all our deliverables as tar.gz bundles.
 all-bundles: product-bundles test-bundles docs-bundles static-libs-bundles
@@ -1356,7 +1342,7 @@ ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-static-libs \
 # Traditional targets typically run by users.
 # These can be considered aliases for the targets now named by a more
 # "modern" naming scheme.
-default-target: $(DEFAULT_MAKE_TARGET)
+default: $(DEFAULT_MAKE_TARGET)
 jdk: exploded-image
 images: product-images
 docs: docs-image
@@ -1391,6 +1377,7 @@ ALL_TARGETS += $(RUN_TEST_TARGETS) run-test exploded-run-test check \
     test-hotspot-jtreg test-hotspot-jtreg-native test-hotspot-gtest \
     test-jdk-jtreg-native test-docs
 
+################################################################################
 ################################################################################
 #
 # Clean targets
@@ -1501,15 +1488,9 @@ create-main-targets-include:
 	      $(MAKESUPPORT_OUTPUTDIR)/main-targets.gmk
 
 ################################################################################
-# JBR API
-
-$(eval $(call SetupTarget, jbr-api, \
-    MAKEFILE := JBRApi, \
-    TARGET := jbr-api \
-))
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Main-post.gmk))
 
 .PHONY: $(ALL_TARGETS)
 
 FRC: # Force target
-
-include MakeFileEnd.gmk

make/MainSupport.gmk

@@ -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
@@ -23,13 +23,13 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
 ################################################################################
 # This file contains helper functions for Main.gmk.
 ################################################################################
 
+ifndef _MAINSUPPORT_GMK
+_MAINSUPPORT_GMK := 1
+
 # Setup make rules for creating a top-level target.
 # Parameter 1 is the name of the rule. This name is used as variable prefix.
 #
@@ -58,76 +58,76 @@ endef
 
 define CleanDocs
 	@$(PRINTF) "Cleaning docs ..."
-	@$(ECHO) "" $(LOG_DEBUG)
+	@$(PRINTF) "\n" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/docs
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/javadoc
 	$(RM) -r $(IMAGES_OUTPUTDIR)/docs
-	@$(ECHO) " done"
+	@$(PRINTF) " done\n"
 endef
 
 # Cleans the dir given as $1
 define CleanDir
-	@$(PRINTF) "Cleaning %s build artifacts ..." "$(strip $1)"
-	@$(ECHO) "" $(LOG_DEBUG)
+	@$(PRINTF) "Cleaning $(strip $1) build artifacts ..."
+	@$(PRINTF) "\n" $(LOG_DEBUG)
 	($(CD) $(OUTPUTDIR) && $(RM) -r $1)
-	@$(ECHO) " done"
+	@$(PRINTF) " done\n"
 endef
 
 define CleanSupportDir
-	@$(PRINTF) "Cleaning %s build artifacts ..." "$(strip $1)"
-	@$(ECHO) "" $(LOG_DEBUG)
+	@$(PRINTF) "Cleaning $(strip $1) build artifacts ..."
+	@$(PRINTF) "\n" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/$(strip $1)
-	@$(ECHO) " done"
+	@$(PRINTF) " done\n"
 endef
 
 define CleanMakeSupportDir
-	@$(PRINTF) "Cleaning %s make support artifacts ..." "$(strip $1)"
-	@$(ECHO) "" $(LOG_DEBUG)
+	@$(PRINTF) "Cleaning $(strip $1) make support artifacts ..."
+	@$(PRINTF) "\n" $(LOG_DEBUG)
 	$(RM) -r $(MAKESUPPORT_OUTPUTDIR)/$(strip $1)
-	@$(ECHO) " done"
+	@$(PRINTF) " done\n"
 endef
 
 define CleanTest
-	@$(PRINTF) "Cleaning test %s ..." "$(strip $1)"
-	@$(ECHO) "" $(LOG_DEBUG)
+	@$(PRINTF) "Cleaning test $(strip $1) ..."
+	@$(PRINTF) "\n" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/test/$(strip $(subst -,/,$1))
         # Remove as much of the test directory structure as is empty
 	$(RMDIR) -p $(dir $(SUPPORT_OUTPUTDIR)/test/$(strip $(subst -,/,$1))) 2> /dev/null || true
-	@$(ECHO) " done"
+	@$(PRINTF) " done\n"
 endef
 
 define Clean-gensrc
-	@$(PRINTF) "Cleaning gensrc %s..." "$(if $1,for $(strip $1) )"
-	@$(ECHO) "" $(LOG_DEBUG)
+	@$(PRINTF) "Cleaning gensrc $(if $1,for $(strip $1) )..."
+	@$(PRINTF) "\n" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/gensrc/$(strip $1)
-	@$(ECHO) " done"
+	@$(PRINTF) " done\n"
 endef
 
 define Clean-java
-	@$(PRINTF) "Cleaning java %s..." "$(if $1,for $(strip $1) )"
-	@$(ECHO) "" $(LOG_DEBUG)
+	@$(PRINTF) "Cleaning java $(if $1,for $(strip $1) )..."
+	@$(PRINTF) "\n" $(LOG_DEBUG)
 	$(RM) -r $(JDK_OUTPUTDIR)/modules/$(strip $1)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/special_classes/$(strip $1)
-	$(ECHO) " done"
-	$(PRINTF) "Cleaning headers %s..." "$(if $1,for $(strip $1) )"
+	$(PRINTF) " done\n"
+	$(PRINTF) "Cleaning headers $(if $1,for $(strip $1)) ..."
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/headers/$(strip $1)
-	@$(ECHO) " done"
+	@$(PRINTF) " done\n"
 endef
 
 define Clean-native
-	@$(PRINTF) "Cleaning native %s..." "$(if $1,for $(strip $1) )"
-	@$(ECHO) "" $(LOG_DEBUG)
+	@$(PRINTF) "Cleaning native $(if $1,for $(strip $1) )..."
+	@$(PRINTF) "\n" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/native/$(strip $1)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/modules_cmds/$(strip $1)
-	@$(ECHO) " done"
+	@$(PRINTF) " done\n"
 endef
 
 define Clean-include
-	@$(PRINTF) "Cleaning include %s..." "$(if $1,for $(strip $1) )"
-	@$(ECHO) "" $(LOG_DEBUG)
+	@$(PRINTF) "Cleaning include $(if $1,for $(strip $1) )..."
+	@$(PRINTF) "\n" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/modules_include/$(strip $1)
-	@$(ECHO) " done"
+	@$(PRINTF) " done\n"
 endef
 
 define CleanModule
@@ -218,5 +218,4 @@ endef
 
 ################################################################################
 
-endif # include guard
-include MakeIncludeEnd.gmk
+endif # _MAINSUPPORT_GMK

make/ModuleTools.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 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
@@ -23,10 +23,8 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
-################################################################################
+ifndef _MODULE_TOOLS_GMK
+_MODULE_TOOLS_GMK := 1
 
 include JavaCompilation.gmk
 
@@ -51,7 +49,4 @@ TOOL_ADD_PACKAGES_ATTRIBUTE := $(BUILD_JAVA) $(JAVA_FLAGS_SMALL_BUILDJDK) \
     --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
     build.tools.jigsaw.AddPackagesAttribute
 
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk
+endif # _MODULE_TOOLS_GMK

make/ModuleWrapper.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -23,29 +23,27 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
 ################################################################################
 # This makefile is called from Main.gmk, through a macro in MakeHelpers.gmk
 # and wraps calls to makefiles for specific modules and build phases. Having
 # this wrapper reduces the need for boilerplate code. It also provides
 # opportunity for automatic copying of files to an interim exploded runnable
 # image.
-################################################################################
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 
 MODULE_SRC := $(TOPDIR)/src/$(MODULE)
 
-# Define the snippet for MakeSnippetStart/End
-THIS_SNIPPET := modules/$(MODULE)/$(MAKEFILE_PREFIX).gmk
-
-include MakeSnippetStart.gmk
+# All makefiles should add the targets to be built to this variable.
+TARGETS :=
 
 # Include the file being wrapped.
-include $(THIS_SNIPPET)
-
-include MakeSnippetEnd.gmk
+include $(MAKEFILE_PREFIX).gmk
 
 ifeq ($(MAKEFILE_PREFIX), Lib)
   # We need to keep track of what libraries are generated/needed by this
@@ -130,12 +128,8 @@ $(eval $(call SetupCopyFiles, COPY_CONF, \
 ))
 
 ifeq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
-  TARGETS := $(filter $(MAKESUPPORT_OUTPUTDIR)/compile-commands/%, $(TARGETS))
+  all: $(filter $(MAKESUPPORT_OUTPUTDIR)/compile-commands/%, $(TARGETS))
 else
-  TARGETS += $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB) \
+  all: $(TARGETS) $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB) \
       $(COPY_INCLUDE) $(COPY_CMDS) $(COPY_MAN) $(COPY_CONF) $(LINK_LIBS_TO_LIB)
 endif
-
-################################################################################
-
-include MakeFileEnd.gmk

make/PreInit.gmk

@@ -38,20 +38,13 @@ default:
 # serially, regardless of -j.
 .NOTPARALLEL:
 
-IS_PREINIT_ENV := true
-
 # Include our helper functions.
-include $(TOPDIR)/make/PreInitSupport.gmk
-include $(TOPDIR)/make/common/LogUtils.gmk
+include $(topdir)/make/PreInitSupport.gmk
+include $(topdir)/make/common/LogUtils.gmk
 
 # Here are "global" targets, i.e. targets that can be executed without having
 # a configuration. This will define ALL_GLOBAL_TARGETS.
-include $(TOPDIR)/make/Global.gmk
-
-# Targets provided by Init.gmk.
-ALL_INIT_TARGETS := print-modules print-targets print-configuration \
-    print-tests reconfigure pre-compare-build post-compare-build \
-    create-make-helpers
+include $(topdir)/make/Global.gmk
 
 # CALLED_TARGETS is the list of targets that the user provided,
 # or "default" if unspecified.
@@ -80,13 +73,13 @@ ifneq ($(SKIP_SPEC), true)
 
   # Basic checks on environment and command line.
   $(eval $(call CheckControlVariables))
+  $(eval $(call CheckDeprecatedEnvironment))
   $(eval $(call CheckInvalidMakeFlags))
 
   # Check that CONF_CHECK is valid.
   $(eval $(call ParseConfCheckOption))
 
-  # Check that the LOG given is valid, and set LOG_LEVEL, LOG_NOFILE,
-  # MAKE_LOG_VARS and MAKE_LOG_FLAGS.
+  # Check that the LOG given is valid, and set LOG_LEVEL, LOG_NOFILE, MAKE_LOG_VARS and MAKE_LOG_FLAGS.
   $(eval $(call ParseLogLevel))
 
   # After this SPECS contain 1..N spec files (otherwise ParseConfAndSpec fails).
@@ -98,32 +91,35 @@ ifneq ($(SKIP_SPEC), true)
   # This will setup ALL_MAIN_TARGETS.
   $(eval $(call DefineMainTargets, FORCE, $(firstword $(SPECS))))
 
+  # Targets provided by Init.gmk.
+  ALL_INIT_TARGETS := print-modules print-targets print-configuration \
+      print-tests reconfigure pre-compare-build post-compare-build
+
   # Separate called targets depending on type.
   INIT_TARGETS := $(filter $(ALL_INIT_TARGETS), $(CALLED_SPEC_TARGETS))
   MAIN_TARGETS := $(filter $(ALL_MAIN_TARGETS), $(CALLED_SPEC_TARGETS))
   SEQUENTIAL_TARGETS := $(filter dist-clean clean%, $(MAIN_TARGETS))
   PARALLEL_TARGETS := $(filter-out $(SEQUENTIAL_TARGETS), $(MAIN_TARGETS))
 
-  MAKE_INIT_ARGS := $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -I $(TOPDIR)/make/common
-
   # The spec files depend on the autoconf source code. This check makes sure
   # the configuration is up to date after changes to configure.
-  $(SPECS): $(wildcard $(TOPDIR)/make/autoconf/*) \
+  $(SPECS): $(wildcard $(topdir)/make/autoconf/*) \
           $(if $(CUSTOM_CONFIG_DIR), $(wildcard $(CUSTOM_CONFIG_DIR)/*)) \
-          $(addprefix $(TOPDIR)/make/conf/, version-numbers.conf branding.conf) \
+          $(addprefix $(topdir)/make/conf/, version-numbers.conf branding.conf) \
           $(if $(CUSTOM_CONF_DIR), $(wildcard $(addprefix $(CUSTOM_CONF_DIR)/, \
               version-numbers.conf branding.conf)))
       ifeq ($(CONF_CHECK), fail)
-	@echo Error: The configuration is not up to date for \
-	    "'$(lastword $(subst /, , $(dir $@)))'."
-	$(call PrintConfCheckFailed)
-	@exit 2
+	  @echo Error: The configuration is not up to date for \
+	      "'$(lastword $(subst /, , $(dir $@)))'."
+	  $(call PrintConfCheckFailed)
+	  @exit 2
       else ifeq ($(CONF_CHECK), auto)
-	@echo Note: The configuration is not up to date for \
-	    "'$(lastword $(subst /, , $(dir $@)))'."
-	@( cd $(TOPDIR) && \
-	    $(MAKE) $(MAKE_INIT_ARGS) -f $(TOPDIR)/make/Init.gmk SPEC=$@ \
-	    reconfigure )
+	  @echo Note: The configuration is not up to date for \
+	      "'$(lastword $(subst /, , $(dir $@)))'."
+	  @( cd $(topdir) && \
+	      $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -f $(topdir)/make/Init.gmk \
+	      SPEC=$@ HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) \
+	      reconfigure )
       else ifeq ($(CONF_CHECK), ignore)
         # Do nothing
       endif
@@ -143,7 +139,7 @@ ifneq ($(SKIP_SPEC), true)
 	      $(COMMAND_LINE_VARIABLES) $(MAKECMDGOALS))')
       endif
 
-  MAKE_INIT_MAIN_TARGET_ARGS := \
+  MAKE_INIT_WITH_SPEC_ARGUMENTS := ACTUAL_TOPDIR=$(topdir) \
       USER_MAKE_VARS="$(USER_MAKE_VARS)" MAKE_LOG_FLAGS=$(MAKE_LOG_FLAGS) \
       $(MAKE_LOG_VARS) \
       INIT_TARGETS="$(INIT_TARGETS)" \
@@ -159,24 +155,21 @@ ifneq ($(SKIP_SPEC), true)
 	@$(if $(TARGET_DONE), \
 	  true \
 	, \
-	  ( cd $(TOPDIR) && \
+	  ( cd $(topdir) && \
 	  $(foreach spec, $(SPECS), \
-	    $(MAKE) $(MAKE_INIT_ARGS) -j 1 -f $(TOPDIR)/make/Init.gmk \
-	        SPEC=$(spec) TOPDIR_ALT=$(TOPDIR) \
-	        $(MAKE_INIT_MAIN_TARGET_ARGS) main && \
+	    $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -j 1 -f $(topdir)/make/Init.gmk \
+	        SPEC=$(spec) HAS_SPEC=true $(MAKE_INIT_WITH_SPEC_ARGUMENTS) \
+	        main && \
 	    $(if $(and $(COMPARE_BUILD), $(PARALLEL_TARGETS)), \
-	      $(MAKE) $(MAKE_INIT_ARGS) -f $(TOPDIR)/make/Init.gmk \
-	          SPEC=$(spec) TOPDIR_ALT=$(TOPDIR) \
-	          COMPARE_BUILD="$(COMPARE_BUILD)" \
-	          pre-compare-build && \
-	      $(MAKE) $(MAKE_INIT_ARGS) -j 1 -f $(TOPDIR)/make/Init.gmk \
-	          SPEC=$(spec) TOPDIR_ALT=$(TOPDIR) \
-	          COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" \
-	          $(MAKE_INIT_MAIN_TARGET_ARGS) main && \
-	      $(MAKE) $(MAKE_INIT_ARGS) -f $(TOPDIR)/make/Init.gmk \
-	          SPEC=$(spec) TOPDIR_ALT=$(TOPDIR) \
-	          COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" \
-	          post-compare-build && \
+	        $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -f $(topdir)/make/Init.gmk \
+	            SPEC=$(spec) HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) \
+	            COMPARE_BUILD="$(COMPARE_BUILD)" pre-compare-build && \
+	        $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -j 1 -f $(topdir)/make/Init.gmk \
+	            SPEC=$(spec) HAS_SPEC=true $(MAKE_INIT_WITH_SPEC_ARGUMENTS) \
+	            COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" main && \
+	        $(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -f $(topdir)/make/Init.gmk \
+	            SPEC=$(spec) HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) \
+	            COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" post-compare-build && \
 	    ) \
 	  ) true ) \
 	  $(eval TARGET_DONE=true) \
@@ -220,5 +213,3 @@ else # SKIP_SPEC=true
   .PHONY: $(ALL_TARGETS)
 
 endif # $(SKIP_SPEC)!=true
-
-################################################################################

make/PreInitSupport.gmk

@@ -23,20 +23,20 @@
 # questions.
 #
 
-################################################################################
+##############################################################################
 # Helper functions for PreInit.gmk, the initial part of initialization before
 # the SPEC file is loaded. Most of these functions provide parsing and setting
 # up make options from the command-line.
-################################################################################
-
-# Include the corresponding closed file, if present.
-ifneq ($(CUSTOM_MAKE_DIR), )
-  -include $(CUSTOM_MAKE_DIR)/PreInitSupport-pre.gmk
-endif
+##############################################################################
 
 # COMMA is defined in spec.gmk, but that is not included yet
 COMMA := ,
 
+# Include the corresponding closed file, if present.
+ifneq ($(CUSTOM_MAKE_DIR), )
+  -include $(CUSTOM_MAKE_DIR)/InitSupport.gmk
+endif
+
 # Essential control variables that are handled by PreInit.gmk or Init.gmk
 INIT_CONTROL_VARIABLES := LOG CONF CONF_NAME SPEC JOBS CONF_CHECK ALLOW \
     COMPARE_BUILD
@@ -68,13 +68,13 @@ USER_MAKE_VARS := $(subst §,\ , $(filter-out $(addsuffix =%, $(ALL_CONTROL_VARI
 
 # Setup information about available configurations, if any.
 ifneq ($(CUSTOM_ROOT), )
-  build_dir := $(CUSTOM_ROOT)/build
+  build_dir = $(CUSTOM_ROOT)/build
 else
-  build_dir := $(TOPDIR)/build
+  build_dir = $(topdir)/build
 endif
-all_spec_files := $(wildcard $(build_dir)/*/spec.gmk)
+all_spec_files = $(wildcard $(build_dir)/*/spec.gmk)
 # Extract the configuration names from the path
-all_confs := $(patsubst %/spec.gmk, %, $(patsubst $(build_dir)/%, %, $(all_spec_files)))
+all_confs = $(patsubst %/spec.gmk, %, $(patsubst $(build_dir)/%, %, $(all_spec_files)))
 
 # Check for unknown command-line variables
 define CheckControlVariables
@@ -94,11 +94,23 @@ define CheckControlVariables
   endif
 endef
 
+# Check for deprecated ALT_ variables
+define CheckDeprecatedEnvironment
+  defined_alt_variables := $$(filter ALT_%, $$(.VARIABLES))
+  ifneq ($$(defined_alt_variables), )
+    $$(info Warning: You have the following ALT_ variables set:)
+    $$(foreach var, $$(defined_alt_variables), $$(info * $$(var)=$$($$(var))))
+    $$(info ALT_ variables are deprecated, and may result in a failed build.)
+    $$(info Please clean your environment.)
+    $$(info )
+  endif
+endef
+
 # Check for invalid make flags like -j
 define CheckInvalidMakeFlags
   # This is a trick to get this rule to execute before any other rules
   # MAKEFLAGS only indicate -j if read in a recipe (!)
-  $$(TOPDIR)/make/PreInit.gmk: .FORCE
+  $$(topdir)/make/PreInit.gmk: .FORCE
 	$$(if $$(findstring --jobserver, $$(MAKEFLAGS)), \
 	    $$(info Error: 'make -jN' is not supported, use 'make JOBS=N') \
 	    $$(error Cannot continue) \
@@ -150,7 +162,7 @@ define ParseConfAndSpec
       ifneq ($(CUSTOM_ROOT), )
         $$(info Error: No configurations found for $$(CUSTOM_ROOT).)
       else
-        $$(info Error: No configurations found for $$(TOPDIR).)
+        $$(info Error: No configurations found for $$(topdir).)
       endif
       $$(info Please run 'bash configure' to create a configuration.)
       $$(info )
@@ -250,14 +262,13 @@ endef
 # Param 1: FORCE = force generation of main-targets.gmk or LAZY = do not force.
 # Param 2: The SPEC file to use.
 define DefineMainTargets
-  SPEC_FILE := $(strip $2)
 
   # We will start by making sure the main-targets.gmk file is removed, if
   # make has not been restarted. By the -include, we will trigger the
   # rule for generating the file (which is never there since we removed it),
   # thus generating it fresh, and make will restart, incrementing the restart
   # count.
-  main_targets_file := $$(dir $$(SPEC_FILE))make-support/main-targets.gmk
+  main_targets_file := $$(dir $(strip $2))make-support/main-targets.gmk
 
   ifeq ($$(MAKE_RESTARTS), )
     # Only do this if make has not been restarted, and if we do not force it.
@@ -267,13 +278,9 @@ define DefineMainTargets
   endif
 
   $$(main_targets_file):
-	@( cd $$(TOPDIR) && \
-	$$(MAKE) $$(MAKE_LOG_FLAGS) -s -r -R -f $$(TOPDIR)/make/GenerateFindTests.gmk \
-	    -I $$(TOPDIR)/make/common SPEC=$$(SPEC_FILE) TOPDIR_ALT=$$(TOPDIR))
-	@( cd $$(TOPDIR) && \
-	$$(MAKE) $$(MAKE_LOG_FLAGS) -s -r -R -f $$(TOPDIR)/make/Main.gmk \
-	    -I $$(TOPDIR)/make/common SPEC=$$(SPEC_FILE) TOPDIR_ALT=$$(TOPDIR) \
-	    UPDATE_MODULE_DEPS=true NO_RECIPES=true \
+	@( cd $$(topdir) && \
+	$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(topdir)/make/Main.gmk \
+	    -I $$(topdir)/make/common SPEC=$(strip $2) NO_RECIPES=true \
 	    $$(MAKE_LOG_VARS) \
 	    create-main-targets-include )
 
@@ -288,5 +295,3 @@ define PrintConfCheckFailed
 	@echo "This behavior may also be changed using CONF_CHECK=<ignore|auto>."
 	@echo ' '
 endef
-
-################################################################################

make/ReleaseFile.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,12 +23,16 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
 
 ################################################################################
 # This makefile generates the "release" file into the exploded image. Jlink is
 # then responsible for using this as the base for release files in each linked
 # image.
+#
 ################################################################################
 
 BASE_RELEASE_FILE := $(JDK_OUTPUTDIR)/release
@@ -81,4 +85,10 @@ TARGETS += $(BASE_RELEASE_FILE)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+$(eval $(call IncludeCustomExtension, ReleaseFile.gmk))
+
+################################################################################
+
+all: $(TARGETS)
+
+.PHONY: all default

make/RunTests.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 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
@@ -23,10 +23,10 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
-################################################################################
+default: all
 
+include $(SPEC)
+include MakeBase.gmk
 include FindTests.gmk
 
 # We will always run multiple tests serially
@@ -71,10 +71,16 @@ ifeq ($(call isTargetOs, windows), true)
   endif
 endif
 
+################################################################################
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, RunTests.gmk))
 ################################################################################
 
 # This is the JDK that we will test
 JDK_UNDER_TEST := $(JDK_IMAGE_DIR)
+# The JDK used to compile jtreg test code. By default it is the same as
+# JDK_UNDER_TEST.
+JDK_FOR_COMPILE := $(JDK_IMAGE_DIR)
 
 TEST_RESULTS_DIR := $(OUTPUTDIR)/test-results
 TEST_SUPPORT_DIR := $(OUTPUTDIR)/test-support
@@ -105,8 +111,8 @@ ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), )
       #
 endif
 
-GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher$(EXECUTABLE_SUFFIX), %, \
-    $(wildcard $(TEST_IMAGE_DIR)/hotspot/gtest/*/gtestLauncher$(EXECUTABLE_SUFFIX)))
+GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher, %, \
+    $(wildcard $(TEST_IMAGE_DIR)/hotspot/gtest/*/gtestLauncher))
 GTEST_VARIANTS := $(strip $(patsubst $(TEST_IMAGE_DIR)/hotspot/gtest/%, %, \
     $(GTEST_LAUNCHER_DIRS)))
 
@@ -115,7 +121,6 @@ JTREG_COV_OPTIONS :=
 
 ifeq ($(TEST_OPTS_JCOV), true)
   JCOV_OUTPUT_DIR := $(TEST_RESULTS_DIR)/jcov-output
-  JCOV_SUPPORT_DIR := $(TEST_SUPPORT_DIR)/jcov-support
   JCOV_GRABBER_LOG := $(JCOV_OUTPUT_DIR)/grabber.log
   JCOV_RESULT_FILE := $(JCOV_OUTPUT_DIR)/result.xml
   JCOV_REPORT := $(JCOV_OUTPUT_DIR)/report
@@ -528,33 +533,21 @@ define SetupRunGtestTestBody
 	$$(call LogWarn, Test report is stored in $$(strip \
 	    $$(subst $$(TOPDIR)/, , $$($1_TEST_RESULTS_DIR))))
 	$$(if $$(wildcard $$($1_RESULT_FILE)), \
-	  $$(eval $1_RUN := $$(shell $$(AWK) \
-	      '/==========.* tests? from .* test (cases?|suites?) ran/ { print $$$$2 }' \
-	      $$($1_RESULT_FILE))) \
-	  $$(if $$($1_RUN), , $$(eval $1_RUN := 0)) \
+	  $$(eval $1_TOTAL := $$(shell $$(AWK) '/==========.* tests? from .* \
+	      test (cases?|suites?) ran/ { print $$$$2 }' $$($1_RESULT_FILE))) \
+	  $$(if $$($1_TOTAL), , $$(eval $1_TOTAL := 0)) \
 	  $$(eval $1_PASSED := $$(shell $$(AWK) '/\[  PASSED  \] .* tests?./ \
 	      { print $$$$4 }' $$($1_RESULT_FILE))) \
 	  $$(if $$($1_PASSED), , $$(eval $1_PASSED := 0)) \
-	  $$(eval $1_GTEST_DISABLED := $$(shell $$(AWK) '/YOU HAVE .* DISABLED TEST/ \
-	      { print $$$$3 }' $$($1_RESULT_FILE))) \
-	  $$(if $$($1_GTEST_DISABLED), , $$(eval $1_GTEST_DISABLED := 0)) \
-	  $$(eval $1_GTEST_SKIPPED := $$(shell $$(AWK) '/\[  SKIPPED \] .* tests?.*/ \
-	      { print $$$$4 }' $$($1_RESULT_FILE))) \
-	  $$(if $$($1_GTEST_SKIPPED), , $$(eval $1_GTEST_SKIPPED := 0)) \
-	  $$(eval $1_SKIPPED := $$(shell \
-	      $$(EXPR) $$($1_GTEST_DISABLED) + $$($1_GTEST_SKIPPED))) \
 	  $$(eval $1_FAILED := $$(shell $$(AWK) '/\[  FAILED  \] .* tests?, \
 	      listed below/ { print $$$$4 }' $$($1_RESULT_FILE))) \
 	  $$(if $$($1_FAILED), , $$(eval $1_FAILED := 0)) \
 	  $$(eval $1_ERROR := $$(shell \
-	      $$(EXPR) $$($1_RUN) - $$($1_PASSED) - $$($1_FAILED) - $$($1_GTEST_SKIPPED))) \
-	  $$(eval $1_TOTAL := $$(shell \
-	      $$(EXPR) $$($1_RUN) + $$($1_GTEST_DISABLED))) \
+	      $$(EXPR) $$($1_TOTAL) - $$($1_PASSED) - $$($1_FAILED))) \
 	, \
 	  $$(eval $1_PASSED := 0) \
 	  $$(eval $1_FAILED := 0) \
 	  $$(eval $1_ERROR := 1) \
-	  $$(eval $1_SKIPPED := 0) \
 	  $$(eval $1_TOTAL := 1) \
 	)
 
@@ -583,8 +576,6 @@ define SetMicroValue
   else
     ifneq ($3, )
       $1_$2 := $3
-    else
-      $1_$2 :=
     endif
   endif
 endef
@@ -680,7 +671,6 @@ define SetupRunMicroTestBody
 	  $$(eval $1_ERROR := 1) \
 	  $$(eval $1_TOTAL := 1) \
 	)
-	$$(eval $1_SKIPPED := 0)
 
   $1: run-test-$1 parse-test-$1
 
@@ -711,87 +701,63 @@ define SetJtregValue
     else
       ifneq ($3, )
         $1_$2 := $3
-      else
-        $1_$2 :=
       endif
     endif
   endif
 endef
 
-################################################################################
-# Helper function for creating a customized AOT cache for running tests
-################################################################################
 
 # Parameter 1 is the name of the rule.
 #
 # Remaining parameters are named arguments.
-#   TRAINING    The AOT training mode: onestep or twostep
 #   VM_OPTIONS  List of JVM arguments to use when creating AOT cache
 #
 #  After calling this, the following variables are defined
 #   $1_AOT_TARGETS   List of all targets that the test rule will need to depend on
 #   $1_AOT_JDK_CACHE The AOT cache file to be used to run the test with
 #
-SetupAOT = $(NamedParamsMacroTemplate)
-define SetupAOTBody
-  $1_AOT_JDK_OUTPUT_DIR := $$($1_TEST_SUPPORT_DIR)/aot
-  $1_AOT_JDK_CONF := $$($1_AOT_JDK_OUTPUT_DIR)/jdk.aotconf
-  $1_AOT_JDK_CACHE := $$($1_AOT_JDK_OUTPUT_DIR)/jdk.aotcache
-  $1_AOT_JDK_LOG := $$($1_AOT_JDK_OUTPUT_DIR)/TestSetupAOT.log
+SetupAot = $(NamedParamsMacroTemplate)
+define SetupAotBody
+  $1_AOT_JDK_CONF  := $$($1_TEST_SUPPORT_DIR)/aot/jdk.aotconf
+  $1_AOT_JDK_CACHE := $$($1_TEST_SUPPORT_DIR)/aot/jdk.aotcache
 
-  # We execute the training run with the TestSetupAOT class from $(TEST_IMAGE_DIR)/setup_aot/TestSetupAOT.jar
-  # to touch a fair number of classes inside the JDK. Note that we can't specify a classpath,
-  # or else the AOT cache cannot be used with jtreg test cases that use a different value
-  # for their classpaths. Instead, we cd in the $$($1_AOT_JDK_OUTPUT_DIR) directory,
-  # extract the TestSetupAOT.jar there, and run in that directory without specifying a classpath.
-  # The "java" launcher will have an implicit classpath of ".", so it can pick up the TestSetupAOT
-  # class from the JVM's current directory.
-  #
-  # The TestSetupAOT class (or any other classes that are loaded from ".") will be excluded
-  # from the the AOT cache as "." is an unsupported location. As a result, the AOT cache will contain
-  # only classes from the JDK.
+  $1_JAVA_TOOL_OPTS := $$(addprefix -J, $$($1_VM_OPTIONS))
 
   $$($1_AOT_JDK_CACHE): $$(JDK_IMAGE_DIR)/release
-	$$(call MakeDir, $$($1_AOT_JDK_OUTPUT_DIR))
+	$$(call MakeDir, $$($1_TEST_SUPPORT_DIR)/aot)
 
-        ifeq ($$($1_TRAINING), onestep)
+	$(foreach jtool, javac javap jlink jar, \
+	    $(info AOT: Create cache configuration for $(jtool)) \
+	    $$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/aot.$(jtool), ( \
+	        $$(FIXPATH) $(JDK_UNDER_TEST)/bin/$(jtool) $$($1_JAVA_TOOL_OPTS) \
+	                    -J-XX:AOTMode=record -J-XX:AOTConfiguration=$$($1_AOT_JDK_CONF).$(jtool) --help \
+	    ))
+	)
 
-	  $$(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), ( \
-	      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,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) \
-	  ))
+	$$(info AOT: Copy $(JDK_UNDER_TEST)/lib/classlist to $$($1_AOT_JDK_CONF).jdk )
+	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/aot, ( \
+		$$(FIXPATH) $(CP) $(JDK_UNDER_TEST)/lib/classlist $$($1_AOT_JDK_CONF).jdk \
+	))
 
-        else
+	$$(FIXPATH) $$(CAT) $$($1_AOT_JDK_CONF).* > $$($1_AOT_JDK_CONF).temp
+	$$(FIXPATH) $$(CAT) $$($1_AOT_JDK_CONF).temp | $(GREP) -v '#' | $(GREP) -v '@' | $(SORT) | \
+	        $(SED) -e 's/id:.*//g' | uniq \
+		> $$($1_AOT_JDK_CONF)
+	$$(FIXPATH) $$(CAT) $$($1_AOT_JDK_CONF).temp | $(GREP) '@cp' | $(SORT) \
+	        >> $$($1_AOT_JDK_CONF)
 
-	  $$(call LogWarn, AOT: Create cache configuration) \
-	  $$(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,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), ( \
-	      $$(FIXPATH) $(JDK_UNDER_TEST)/bin/java \
-	          $$($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
+	$$(info AOT: Generate AOT cache $$($1_AOT_JDK_CACHE) with flags: $$($1_VM_OPTIONS))
+	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/aot, ( \
+		$$(FIXPATH) $(JDK_UNDER_TEST)/bin/java \
+	        $$($1_VM_OPTIONS) -Xlog:cds,cds+class=debug:file=$$($1_AOT_JDK_CACHE).log \
+		-XX:AOTMode=create -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) -XX:AOTCache=$$($1_AOT_JDK_CACHE) \
+	))
 
   $1_AOT_TARGETS += $$($1_AOT_JDK_CACHE)
 
 endef
 
+
 SetupRunJtregTest = $(NamedParamsMacroTemplate)
 define SetupRunJtregTestBody
   $1_TEST_RESULTS_DIR := $$(TEST_RESULTS_DIR)/$1
@@ -852,7 +818,7 @@ define SetupRunJtregTestBody
   JTREG_RETRY_COUNT ?= 0
   JTREG_REPEAT_COUNT ?= 0
   JTREG_REPORT ?= files
-  JTREG_AOT_JDK ?= none
+  JTREG_AOT_JDK ?= false
 
   ifneq ($$(JTREG_RETRY_COUNT), 0)
     ifneq ($$(JTREG_REPEAT_COUNT), 0)
@@ -862,12 +828,6 @@ define SetupRunJtregTestBody
     endif
   endif
 
-  ifeq ($$(JTREG_RUN_PROBLEM_LISTS), true)
-    JTREG_PROBLEM_LIST_PREFIX := -match:
-  else
-    JTREG_PROBLEM_LIST_PREFIX := -exclude:
-  endif
-
   ifneq ($$(JTREG_TEST_THREAD_FACTORY), )
     $1_JTREG_BASIC_OPTIONS += -testThreadFactoryPath:$$(JTREG_TEST_THREAD_FACTORY_JAR)
     $1_JTREG_BASIC_OPTIONS += -testThreadFactory:$$(JTREG_TEST_THREAD_FACTORY)
@@ -896,7 +856,7 @@ define SetupRunJtregTestBody
   # version of the JDK.
   $1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \
       -verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \
-      -concurrency:$$($1_JTREG_JOBS) \
+      -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR) \
       -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE) \
       -vmoption:-Dtest.boot.jdk="$$(BOOT_JDK)" \
       -vmoption:-Djava.io.tmpdir="$$($1_TEST_TMP_DIR)"
@@ -929,6 +889,12 @@ define SetupRunJtregTestBody
     $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
   endif
 
+  ifeq ($$(JTREG_RUN_PROBLEM_LISTS), true)
+    JTREG_PROBLEM_LIST_PREFIX := -match:
+  else
+    JTREG_PROBLEM_LIST_PREFIX := -exclude:
+  endif
+
   ifneq ($$($1_JTREG_PROBLEM_LIST), )
     $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$($1_JTREG_PROBLEM_LIST))
   endif
@@ -951,11 +917,6 @@ define SetupRunJtregTestBody
     JTREG_AUTO_PROBLEM_LISTS += ProblemList-shenandoah.txt
   endif
 
-  ifneq ($$(findstring --enable-preview, $$(JTREG_ALL_OPTIONS)), )
-    JTREG_AUTO_PROBLEM_LISTS += ProblemList-enable-preview.txt
-  endif
-
-
   ifneq ($$(JTREG_EXTRA_PROBLEM_LISTS), )
     # Accept both absolute paths as well as relative to the current test root.
     $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
@@ -968,11 +929,6 @@ define SetupRunJtregTestBody
     $1_JTREG_BASIC_OPTIONS += -e:JIB_HOME=$$(JIB_HOME)
   endif
 
-  ifneq ($$(JDK_FOR_COMPILE), )
-    # Allow overriding the JDK used for compilation from the command line
-    $1_JTREG_BASIC_OPTIONS += -compilejdk:$$(JDK_FOR_COMPILE)
-  endif
-
   $1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_DIR=$(TEST_IMAGE_DIR)
 
   $1_JTREG_BASIC_OPTIONS += -e:DOCS_JDK_IMAGE_DIR=$$(DOCS_JDK_IMAGE_DIR)
@@ -992,12 +948,13 @@ define SetupRunJtregTestBody
     endif
   endif
 
-  ifneq ($$(filter $$(JTREG_AOT_JDK), onestep twostep), )
-    $$(call LogWarn, Add AOT target for $1)
-    $$(eval $$(call SetupAOT, $1, \
-        TRAINING := $$(JTREG_AOT_JDK), \
-        VM_OPTIONS := $$(JTREG_ALL_OPTIONS) ))
-    $$(call LogWarn, AOT_JDK_CACHE=$$($1_AOT_JDK_CACHE))
+  ifeq ($$(JTREG_AOT_JDK), true)
+    $$(info Add AOT target for $1)
+    $$(eval $$(call SetupAot, $1, VM_OPTIONS := $$(JTREG_ALL_OPTIONS) ))
+
+    $$(info AOT_TARGETS=$$($1_AOT_TARGETS))
+    $$(info AOT_JDK_CACHE=$$($1_AOT_JDK_CACHE))
+
     $1_JTREG_BASIC_OPTIONS += -vmoption:-XX:AOTCache="$$($1_AOT_JDK_CACHE)"
   endif
 
@@ -1015,7 +972,6 @@ define SetupRunJtregTestBody
   endif
 
   JTREG_TIMEOUT_FACTOR ?= $$(JTREG_AUTO_TIMEOUT_FACTOR)
-  $1_JTREG_BASIC_OPTIONS += -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR)
 
   clean-outputdirs-$1:
 	$$(call LogWarn, Clean up dirs for $1)
@@ -1026,6 +982,7 @@ define SetupRunJtregTestBody
       $$(JTREG_JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
           -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \
           $$($1_JTREG_BASIC_OPTIONS) \
+          -compilejdk:$$(JDK_FOR_COMPILE) \
           -testjdk:$$(JDK_UNDER_TEST) \
           -dir:$$(JTREG_TOPDIR) \
           -reportDir:$$($1_TEST_RESULTS_DIR) \
@@ -1044,8 +1001,7 @@ define SetupRunJtregTestBody
     $1_COMMAND_LINE := \
         for i in {0..$$(JTREG_RETRY_COUNT)}; do \
           if [ "$$$$i" != 0 ]; then \
-            $$(ECHO) ""; \
-            $$(ECHO) "Retrying Jtreg run. Attempt: $$$$i"; \
+            $$(PRINTF) "\nRetrying Jtreg run. Attempt: $$$$i\n"; \
           fi; \
           $$($1_COMMAND_LINE); \
           if [ "`$$(CAT) $$($1_EXITCODE)`" = "0" ]; then \
@@ -1058,12 +1014,10 @@ define SetupRunJtregTestBody
   ifneq ($$(JTREG_REPEAT_COUNT), 0)
     $1_COMMAND_LINE := \
         for i in {1..$$(JTREG_REPEAT_COUNT)}; do \
-          $$(ECHO) ""; \
-          $$(ECHO) "Repeating Jtreg run: $$$$i out of $$(JTREG_REPEAT_COUNT)"; \
+          $$(PRINTF) "\nRepeating Jtreg run: $$$$i out of $$(JTREG_REPEAT_COUNT)\n"; \
           $$($1_COMMAND_LINE); \
           if [ "`$$(CAT) $$($1_EXITCODE)`" != "0" ]; then \
-            $$(ECHO) ""; \
-            $$(ECHO) "Failures detected, no more repeats."; \
+            $$(PRINTF) "\nFailures detected, no more repeats.\n"; \
             break; \
           fi; \
         done
@@ -1084,64 +1038,23 @@ define SetupRunJtregTestBody
 	$$(call LogWarn, Finished running test '$$($1_TEST)')
 	$$(call LogWarn, Test report is stored in $$(strip \
 	    $$(subst $$(TOPDIR)/, , $$($1_TEST_RESULTS_DIR))))
-
-	# Read jtreg documentation to learn on the test stats categories:
-	# https://github.com/openjdk/jtreg/blob/master/src/share/doc/javatest/regtest/faq.md#what-do-all-those-numbers-in-the-test-results-line-mean
-	# In jtreg, "skipped:" category accounts for tests that threw jtreg.SkippedException at runtime.
-	# At the same time these tests contribute to "passed:" tests.
-	# In here we don't want that and so we substract number of "skipped:" from "passed:".
-
 	$$(if $$(wildcard $$($1_RESULT_FILE)), \
-	  $$(eval $1_PASSED_AND_RUNTIME_SKIPPED := $$(shell $$(AWK) '{ gsub(/[,;]/, ""); \
+	  $$(eval $1_PASSED := $$(shell $$(AWK) '{ gsub(/[,;]/, ""); \
 	      for (i=1; i<=NF; i++) { if ($$$$i == "passed:") \
 	      print $$$$(i+1) } }' $$($1_RESULT_FILE))) \
-	  $$(if $$($1_PASSED_AND_RUNTIME_SKIPPED), , $$(eval $1_PASSED_AND_RUNTIME_SKIPPED := 0)) \
+	  $$(if $$($1_PASSED), , $$(eval $1_PASSED := 0)) \
 	  $$(eval $1_FAILED := $$(shell $$(AWK) '{gsub(/[,;]/, ""); \
 	      for (i=1; i<=NF; i++) { if ($$$$i == "failed:") \
 	      print $$$$(i+1) } }' $$($1_RESULT_FILE))) \
 	  $$(if $$($1_FAILED), , $$(eval $1_FAILED := 0)) \
-	  $$(eval $1_RUNTIME_SKIPPED := $$(shell $$(AWK) '{gsub(/[,;]/, ""); \
-	      for (i=1; i<=NF; i++) { if ($$$$i == "skipped:") \
-	      print $$$$(i+1) } }' $$($1_RESULT_FILE))) \
-	  $$(if $$($1_RUNTIME_SKIPPED), , $$(eval $1_RUNTIME_SKIPPED := 0)) \
-	  $$(eval $1_SKIPPED := $$(shell \
-	      $$(AWK) \
-	        'BEGIN { \
-	          overall_skipped = 0; \
-	          patterns[1] = "skipped"; \
-	          patterns[2] = "excluded"; \
-	          patterns[3] = "not in match-list"; \
-	          patterns[4] = "did not match keywords"; \
-	          patterns[5] = "did not meet module requirements"; \
-	          patterns[6] = "did not meet platform requirements"; \
-	          patterns[7] = "did not match prior status"; \
-	          patterns[8] = "did not meet time-limit requirements"; \
-	        } { \
-	          split($$$$0, arr, ";"); \
-	          for (item in arr) { \
-	            for (p in patterns) { \
-	              if (match(arr[item], patterns[p] ": [0-9]+")) { \
-	                overall_skipped += substr(arr[item], RSTART + length(patterns[p]) + 2, RLENGTH); \
-	              } \
-	            } \
-	          } \
-	          print overall_skipped; \
-	        }' \
-	        $$($1_RESULT_FILE) \
-	  )) \
 	  $$(eval $1_ERROR := $$(shell $$(AWK) '{gsub(/[,;]/, ""); \
 	      for (i=1; i<=NF; i++) { if ($$$$i == "error:") \
 	      print $$$$(i+1) } }' $$($1_RESULT_FILE))) \
 	  $$(if $$($1_ERROR), , $$(eval $1_ERROR := 0)) \
-	  \
-	  $$(eval $1_PASSED := $$(shell \
-	      $$(EXPR) $$($1_PASSED_AND_RUNTIME_SKIPPED) - $$($1_RUNTIME_SKIPPED))) \
 	  $$(eval $1_TOTAL := $$(shell \
-	      $$(EXPR) $$($1_PASSED) + $$($1_FAILED) + $$($1_ERROR) + $$($1_SKIPPED))) \
+	      $$(EXPR) $$($1_PASSED) + $$($1_FAILED) + $$($1_ERROR))) \
 	, \
-	  $$(eval $1_PASSED_AND_RUNTIME_SKIPPED := 0) \
-	  $$(eval $1_RUNTIME_SKIPPED := 0) \
-	  $$(eval $1_SKIPPED := 0) \
+	  $$(eval $1_PASSED := 0) \
 	  $$(eval $1_FAILED := 0) \
 	  $$(eval $1_ERROR := 1) \
 	  $$(eval $1_TOTAL := 1) \
@@ -1200,6 +1113,8 @@ define SetupRunSpecialTestBody
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	))
 
+  $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt
+
   # We can not parse the various "special" tests.
   parse-test-$1: run-test-$1
 	$$(call LogWarn, Finished running test '$$($1_TEST)')
@@ -1209,7 +1124,6 @@ define SetupRunSpecialTestBody
 	$$(eval $1_PASSED := $$(shell \
 	  if [ `$(CAT) $$($1_EXITCODE)` = "0" ]; then $(ECHO) 1; else $(ECHO) 0; fi \
 	))
-	$$(eval $1_SKIPPED := 0)
 	$$(eval $1_FAILED := $$(shell \
 	  if [ `$(CAT) $$($1_EXITCODE)` = "0" ]; then $(ECHO) 0; else $(ECHO) 1; fi \
 	))
@@ -1319,8 +1233,8 @@ run-test-report: post-run-test
 	$(ECHO) >> $(TEST_SUMMARY) ==============================
 	$(ECHO) >> $(TEST_SUMMARY) Test summary
 	$(ECHO) >> $(TEST_SUMMARY) ==============================
-	$(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5s %5s %5s %5s %5s %2s\n" "  " \
-	    TEST TOTAL PASS FAIL ERROR SKIP " "
+	$(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5s %5s %5s %5s %2s\n" "  " \
+	    TEST TOTAL PASS FAIL ERROR " "
 	$(foreach test, $(TESTS_TO_RUN), \
 	  $(eval TEST_ID := $(shell $(ECHO) $(strip $(test)) | \
 	      $(TR) -cs '[a-z][A-Z][0-9]\n' '[_*1000]')) \
@@ -1332,15 +1246,15 @@ run-test-report: post-run-test
 	  , \
 	    $(eval TEST_NAME := $(test)) \
 	  ) \
-	  $(if $(filter-out 0, $($(TEST_ID)_FAILED) $($(TEST_ID)_ERROR)), \
-	    $(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5d %5d %5d %5d %5d %2s\n" \
-	         ">>" "$(TEST_NAME)" $($(TEST_ID)_TOTAL) $($(TEST_ID)_PASSED) \
-	        $($(TEST_ID)_FAILED) $($(TEST_ID)_ERROR) $($(TEST_ID)_SKIPPED) "<<" $(NEWLINE) \
-	    $(eval TEST_FAILURE := true) \
-	  , \
-	    $(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5d %5d %5d %5d %5d %2s\n" \
+	  $(if $(filter $($(TEST_ID)_PASSED), $($(TEST_ID)_TOTAL)), \
+	    $(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5d %5d %5d %5d %2s\n" \
 	        "  " "$(TEST_NAME)" $($(TEST_ID)_TOTAL) $($(TEST_ID)_PASSED) \
-	        $($(TEST_ID)_FAILED) $($(TEST_ID)_ERROR) $($(TEST_ID)_SKIPPED) "  " $(NEWLINE) \
+	        $($(TEST_ID)_FAILED) $($(TEST_ID)_ERROR) "  " $(NEWLINE) \
+	  , \
+	    $(PRINTF) >> $(TEST_SUMMARY) "%2s %-49s %5d %5d %5d %5d %2s\n" \
+	         ">>" "$(TEST_NAME)" $($(TEST_ID)_TOTAL) $($(TEST_ID)_PASSED) \
+	        $($(TEST_ID)_FAILED) $($(TEST_ID)_ERROR) "<<" $(NEWLINE) \
+	    $(eval TEST_FAILURE := true) \
 	  ) \
 	)
 	$(ECHO) >> $(TEST_SUMMARY) ==============================
@@ -1366,14 +1280,12 @@ TARGETS += run-all-tests pre-run-test post-run-test run-test-report run-test
 
 ifeq ($(TEST_OPTS_JCOV), true)
 
-  JCOV_VM_OPTS := -Xmx4g -Djdk.xml.totalEntitySizeLimit=0 -Djdk.xml.maxGeneralEntitySizeLimit=0
-
   jcov-do-start-grabber:
 	$(call MakeDir, $(JCOV_OUTPUT_DIR))
 	if $(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -status 1>/dev/null 2>&1 ; then \
 	  $(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -stop -stoptimeout 3600 ; \
 	fi
-	$(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar Grabber -v -t \
+	$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar Grabber -v -t \
 	    $(JCOV_IMAGE_DIR)/template.xml -o $(JCOV_RESULT_FILE) \
 	    1>$(JCOV_GRABBER_LOG) 2>&1 &
 
@@ -1386,10 +1298,6 @@ ifeq ($(TEST_OPTS_JCOV), true)
 	$(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -stop -stoptimeout 3600
 
   JCOV_REPORT_TITLE := JDK code coverage report<br/>
-  ifneq ($(JCOV_MODULES), )
-    JCOV_MODULES_FILTER := $(foreach m, $(JCOV_MODULES), -include_module $m)
-    JCOV_REPORT_TITLE += Included modules: $(JCOV_MODULES)<br>
-  endif
   ifneq ($(JCOV_FILTERS), )
     JCOV_REPORT_TITLE += Code filters: $(JCOV_FILTERS)<br>
   endif
@@ -1397,12 +1305,11 @@ ifeq ($(TEST_OPTS_JCOV), true)
 
   jcov-gen-report: jcov-stop-grabber
 	$(call LogWarn, Generating JCov report ...)
-	$(call ExecuteWithLog, $(JCOV_SUPPORT_DIR)/run-jcov-repgen, \
-	    $(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \
+	$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \
 	    `$(ECHO) $(TOPDIR)/src/*/share/classes/ | $(TR) ' ' ':'` -fmt html \
-	    $(JCOV_MODULES_FILTER) $(JCOV_FILTERS) \
+	    $(JCOV_FILTERS) \
 	    -mainReportTitle "$(JCOV_REPORT_TITLE)" \
-	    -o $(JCOV_REPORT) $(JCOV_RESULT_FILE))
+	    -o $(JCOV_REPORT) $(JCOV_RESULT_FILE)
 
   TARGETS += jcov-do-start-grabber jcov-start-grabber jcov-stop-grabber \
       jcov-gen-report
@@ -1422,7 +1329,7 @@ ifeq ($(TEST_OPTS_JCOV), true)
     jcov-gen-diffcoverage: jcov-stop-grabber
 	$(call LogWarn, Generating diff coverage with changeset $(TEST_OPTS_JCOV_DIFF_CHANGESET) ... )
 	$(DIFF_COMMAND)
-	$(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar \
+	$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar \
 	  DiffCoverage -replaceDiff "src/.*/classes/:" -all \
 	    $(JCOV_RESULT_FILE) $(JCOV_SOURCE_DIFF) > \
 	    $(JCOV_DIFF_COVERAGE_REPORT)
@@ -1450,8 +1357,4 @@ endif
 
 all: run-test
 
-.PHONY: $(TARGETS)
-
-################################################################################
-
-include MakeFileEnd.gmk
+.PHONY: default all $(TARGETS)

make/RunTestsPrebuilt.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 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
@@ -27,8 +27,6 @@
 # Initial bootstrapping, copied and stripped down from Makefile and PreInit.gmk.
 ################################################################################
 
-IS_PREINIT_ENV := true
-
 # In Cygwin, the MAKE variable gets prepended with the current directory if the
 # make executable is called using a Windows mixed path (c:/cygwin/bin/make.exe).
 ifneq ($(findstring :, $(MAKE)), )
@@ -59,7 +57,7 @@ TOPDIR := $(strip $(patsubst %/make/, %, $(dir $(makefile_path))))
 define SetupVariable
   ifeq ($$($1), )
     ifeq ($2, )
-      $$(info Error: Prebuilt variable $1 is missing, needed for test-prebuilt)
+      $$(info Error: Prebuilt variable $1 is missing, needed for run-tests-prebuilt)
       $$(error Cannot continue.)
     else ifeq ($2, OPTIONAL)
       ifneq ($$(findstring $$(LOG), info debug trace), )
@@ -137,9 +135,11 @@ $(eval $(call SetupVariable,JIB_JAR,OPTIONAL))
 # can include the prebuilt spec file ourselves, without an ephemeral spec
 # wrapper. This is required so we can include MakeBase which is needed for
 # CreateNewSpec.
+HAS_SPEC :=
 include $(TOPDIR)/make/PreInitSupport.gmk
 include $(TOPDIR)/make/common/LogUtils.gmk
 
+$(eval $(call CheckDeprecatedEnvironment))
 $(eval $(call CheckInvalidMakeFlags))
 $(eval $(call ParseLogLevel))
 
@@ -217,9 +217,9 @@ else ifeq ($(OPENJDK_TARGET_OS), macosx)
 else ifeq ($(OPENJDK_TARGET_OS), windows)
   NUM_CORES := $(NUMBER_OF_PROCESSORS)
   MEMORY_SIZE := $(shell \
-      $(EXPR) `powershell -Command \
-          "(Get-CimInstance Win32_ComputerSystem).TotalPhysicalMemory" \
-          | $(SED) 's/\\r//g' ` / 1024 / 1024 \
+      $(EXPR) `wmic computersystem get totalphysicalmemory -value \
+          | $(GREP) = | $(SED) 's/\\r//g' \
+          | $(CUT) -d "=" -f 2-` / 1024 / 1024 \
   )
 endif
 ifeq ($(NUM_CORES), )
@@ -246,7 +246,7 @@ endif
 # Now we can include additional custom support.
 # This might define CUSTOM_NEW_SPEC_LINE
 ifneq ($(CUSTOM_MAKE_DIR), )
-  include $(CUSTOM_MAKE_DIR)/RunTestsPrebuilt-pre.gmk
+  include $(CUSTOM_MAKE_DIR)/RunTestsPrebuilt.gmk
 endif
 
 NEW_SPEC := $(OUTPUTDIR)/run-test-spec.gmk
@@ -296,10 +296,14 @@ test-prebuilt:
         # is unfortunately not available at this point.
 	$(call MakeDir, $(MAKESUPPORT_OUTPUTDIR)/failure-logs)
 	@$(RM) -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error
-        # We need to fill the FindTest cache before entering RunTests.gmk.
-	@cd $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) SPEC=$(SPEC) \
-	    -f GenerateFindTests.gmk
-	@cd $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
+        # The lazy initialization of the cache file in FindTests.gmk does not
+        # always work with RunTests.gmk. To guarantee that the jtreg test groups
+        # are always found and parsed, call FindTests.gmk stand alone once
+        # before calling RunTests.gmk.
+	@cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -f make/common/FindTests.gmk \
+	    SPEC=$(SPEC) FINDTESTS_STAND_ALONE=true \
+	    GENERATE_FIND_TESTS_FILE=true
+	@cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -f make/RunTests.gmk run-test \
 	    TEST="$(TEST)"
 
 test-prebuilt-with-exit-code: test-prebuilt

make/SourceRevision.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 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
@@ -23,7 +23,10 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+include $(SPEC)
+include MakeBase.gmk
+
+$(eval $(call IncludeCustomExtension, SourceRevision-pre.gmk))
 
 ################################################################################
 # Keep track of what source revision is used to create the build, by creating
@@ -35,7 +38,6 @@ include MakeFileStart.gmk
 # bundle. As a part of creating this source bundle, the current SCM revisions of
 # all repos will be stored in a file in the top dir, which is then used when
 # creating the tracker file.
-################################################################################
 
 STORED_SOURCE_REVISION := $(TOPDIR)/.src-rev
 
@@ -55,7 +57,7 @@ ifneq ($(and $(GIT), $(wildcard $(TOPDIR)/.git)), )
   SCM_DIR := .git
   ID_COMMAND := $(PRINTF) "git:%s%s\n" \
       "$$($(GIT) log -n1 --format=%H | cut -c1-12)" \
-      "$$(if test -n "$$($(GIT) status --porcelain)"; then $(PRINTF) '+'; fi)"
+      "$$(if test -n "$$($(GIT) status --porcelain)"; then printf '+'; fi)"
 endif
 
 ifeq ($(USE_SCM), true)
@@ -154,6 +156,10 @@ endif
 
 ################################################################################
 
+$(eval $(call IncludeCustomExtension, SourceRevision-post.gmk))
+
+################################################################################
+
 store-source-revision: $(STORE_SOURCE_REVISION_TARGET)
 
 create-source-revision-tracker: $(CREATE_SOURCE_REVISION_TRACKER_TARGET)
@@ -161,7 +167,3 @@ create-source-revision-tracker: $(CREATE_SOURCE_REVISION_TRACKER_TARGET)
 FRC: # Force target
 
 .PHONY: store-source-revision create-source-revision-tracker
-
-################################################################################
-
-include MakeFileEnd.gmk

make/StaticLibs.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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
@@ -23,15 +23,15 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 include DebugInfoUtils.gmk
 include Modules.gmk
 include modules/LauncherCommon.gmk
-include Execute.gmk
 
 ################################################################################
 #
@@ -69,10 +69,6 @@ else ifeq ($(call isTargetOs, windows), true)
   BROKEN_STATIC_LIBS += sspi_bridge
   # dt_shmem define jdwpTransport_OnLoad which conflict with dt_socket
   BROKEN_STATIC_LIBS += dt_shmem
-else ifeq ($(call isTargetOs, aix), true)
-  # libsplashscreen has a name conflict with libawt in the function
-  # BitmapToYXBandedRectangles, so we exclude it for now.
-  BROKEN_STATIC_LIBS += splashscreen
 endif
 
 $(foreach module, $(STATIC_LIB_MODULES), \
@@ -104,18 +100,6 @@ else ifeq ($(call isTargetOs, linux), true)
   STATIC_LIBS := -Wl,--export-dynamic -Wl,--whole-archive $(STATIC_LIB_FILES) -Wl,--no-whole-archive
 else ifeq ($(call isTargetOs, windows), true)
   STATIC_LIBS := $(addprefix -wholearchive:, $(STATIC_LIB_FILES))
-else ifeq ($(call isTargetOs, aix), true)
-  # on AIX we have to generate export files for all static libs, because we have no whole-archive linker flag
-  $(foreach lib, $(STATIC_LIB_FILES), \
-    $(eval $(call SetupExecute, generate_export_list_$(notdir $(lib)), \
-      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 ), \
-    )) \
-    $(eval STATIC_LIB_EXPORT_FILES += $(lib).exp) \
-  )
-  STATIC_LIBS := -Wl,-bexpfull $(STATIC_LIB_FILES) $(addprefix -Wl$(COMMA)-bE:, $(STATIC_LIB_EXPORT_FILES))
 else
   $(error Unsupported platform)
 endif
@@ -135,9 +119,6 @@ $(eval $(call SetupBuildLauncher, java, \
 ))
 
 $(java): $(STATIC_LIB_FILES)
-ifeq ($(call isTargetOs, aix), true)
-  $(java): $(STATIC_LIB_EXPORT_FILES)
-endif
 
 TARGETS += $(java)
 
@@ -204,8 +185,6 @@ static-jdk-image: $(copy-from-jdk-image) $(copy-static-launcher) $(copy-static-l
 
 TARGETS += static-jdk-image
 
-.PHONY: static-launcher static-jdk-image
+all: $(TARGETS)
 
-################################################################################
-
-include MakeFileEnd.gmk
+.PHONY: all static-launcher static-jdk-image

make/StaticLibsImage.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 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
@@ -23,12 +23,13 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
-################################################################################
 # This makefile creates an image of the optional static versions of certain JDK
 # libraries.
-################################################################################
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
 include Modules.gmk
@@ -37,6 +38,8 @@ ALL_MODULES = $(call FindAllModules)
 
 ################################################################################
 
+TARGETS :=
+
 ifneq ($(filter static-libs-image, $(MAKECMDGOALS)), )
   IMAGE_DEST_DIR = $(STATIC_LIBS_IMAGE_DIR)/lib
 else ifneq ($(filter static-libs-graal-image, $(MAKECMDGOALS)), )
@@ -69,9 +72,11 @@ ifneq ($(filter static-libs-image, $(MAKECMDGOALS)), )
   )
 endif
 
+################################################################################
+
 static-libs-image: $(HOTSPOT_VARIANT_STATIC_LIBS_TARGETS) $(STATIC_LIBS_TARGETS)
 static-libs-graal-image: $(STATIC_LIBS_TARGETS)
 
-################################################################################
+all: $(TARGETS)
 
-include MakeFileEnd.gmk
+.PHONY: all

make/TestImage.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 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
@@ -23,7 +23,13 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, TestImage-pre.gmk))
 
 ################################################################################
 
@@ -48,8 +54,4 @@ TARGETS += $(BUILD_INFO_PROPERTIES) $(README)
 prepare-test-image: $(TARGETS)
 all: prepare-test-image
 
-.PHONY: prepare-test-image
-
-################################################################################
-
-include MakeFileEnd.gmk
+.PHONY: default all prepare-test-image

make/ToolsHotspot.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 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
@@ -23,10 +23,8 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
-################################################################################
+ifndef _TOOLS_HOTSPOT_GMK
+_TOOLS_HOTSPOT_GMK := 1
 
 include JavaCompilation.gmk
 
@@ -46,5 +44,4 @@ TOOL_JFR_GEN := $(JAVA_SMALL) -cp $(HOTSPOT_TOOLS_OUTPUTDIR) \
 
 ################################################################################
 
-endif # include guard
-include MakeIncludeEnd.gmk
+endif # _TOOLS_HOTSPOT_GMK

make/ToolsJdk.gmk

@@ -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
@@ -23,13 +23,14 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
-################################################################################
+ifndef _TOOLS_GMK
+_TOOLS_GMK := 1
 
 include JavaCompilation.gmk
 
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Tools.gmk))
+
 ################################################################################
 # To avoid reevaluating the compilation setup for the tools each time this file
 # is included, the actual compilation is handled by CompileTools.gmk. The
@@ -136,5 +137,7 @@ PANDOC_HTML_MANPAGE_FILTER := $(BUILDTOOLS_OUTPUTDIR)/manpages/pandoc-html-manpa
 
 ################################################################################
 
-endif # include guard
-include MakeIncludeEnd.gmk
+# Hook to include the corresponding custom post file, if present.
+$(eval $(call IncludeCustomExtension, ToolsJdk-post.gmk))
+
+endif # _TOOLS_GMK

make/ToolsLangtools.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# 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
@@ -23,10 +23,11 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
-################################################################################
+# This must be the first rule
+default: all
 
+include $(SPEC)
+include MakeBase.gmk
 include JavaCompilation.gmk
 
 ################################################################################
@@ -42,7 +43,3 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_LANGTOOLS, \
 ))
 
 all: $(BUILD_TOOLS_LANGTOOLS)
-
-################################################################################
-
-include MakeFileEnd.gmk

make/UpdateBuildDocs.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, 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
@@ -23,14 +23,17 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include ProcessMarkdown.gmk
 
 ################################################################################
 # This makefile updates the generated build html documentation.
+#
 ################################################################################
 
-include ProcessMarkdown.gmk
-
 ifeq ($(ENABLE_PANDOC), false)
   $(info No pandoc executable was detected by configure)
   $(error Cannot continue)
@@ -52,4 +55,10 @@ TARGETS += $(md_docs)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+$(eval $(call IncludeCustomExtension, UpdateBuildDocs.gmk))
+
+################################################################################
+
+all: $(TARGETS)
+
+.PHONY: all default

make/UpdateSleefSource.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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
@@ -23,7 +23,15 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+################################################################################
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
+include CopyFiles.gmk
+include Execute.gmk
 
 ################################################################################
 # This file is responsible for updating the generated sleef source code files
@@ -32,9 +40,6 @@ include MakeFileStart.gmk
 # updated from upstream.
 ################################################################################
 
-include CopyFiles.gmk
-include Execute.gmk
-
 ifneq ($(COMPILE_TYPE), cross)
   $(error Only cross-compilation of libsleef is currently supported)
 endif
@@ -143,4 +148,6 @@ TARGETS := $(copy_generated_sleef_source)
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all default

make/UpdateX11Wrappers.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
@@ -23,7 +23,15 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+################################################################################
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include Execute.gmk
+include JdkNativeCompilation.gmk
+include ToolsJdk.gmk
 
 ################################################################################
 # This file is responsible for extracting the x11 native struct offsets to
@@ -35,10 +43,6 @@ include MakeFileStart.gmk
 # GensrcX11Wrappers.gmk to generate the Java code during the build.
 ################################################################################
 
-include Execute.gmk
-include JdkNativeCompilation.gmk
-include $(TOPDIR)/make/ToolsJdk.gmk
-
 ifeq ($(COMPILE_TYPE), cross)
   $(error It is not possible to update the x11wrappers when cross-compiling)
 endif
@@ -104,4 +108,6 @@ TARGETS += $(run_wrappergen) wrapper-information
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: all default

make/ZipSecurity.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -23,10 +23,10 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
-################################################################################
+default: all
 
+include $(SPEC)
+include MakeBase.gmk
 include ZipArchive.gmk
 
 ################################################################################
@@ -100,4 +100,6 @@ endif
 
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: default all

make/ZipSource.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -23,16 +23,19 @@
 # questions.
 #
 
-include MakeFileStart.gmk
-
-################################################################################
+default: all
 
+include $(SPEC)
+include MakeBase.gmk
 include Modules.gmk
 include ZipArchive.gmk
 
 SRC_ZIP_WORK_DIR := $(SUPPORT_OUTPUTDIR)/src
 $(if $(filter $(TOPDIR)/%, $(SUPPORT_OUTPUTDIR)), $(eval SRC_ZIP_BASE := $(TOPDIR)), $(eval SRC_ZIP_BASE := $(SUPPORT_OUTPUTDIR)))
 
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, ZipSource.gmk))
+
 ################################################################################
 # Create the directory structure for src.zip using symlinks.
 # <module>/<package>/<file>.java
@@ -92,8 +95,8 @@ zip: $(SRC_ZIP_SRCS)
 
 TARGETS += zip
 
-.PHONY: zip
-
 ################################################################################
 
-include MakeFileEnd.gmk
+all: $(TARGETS)
+
+.PHONY: default all zip

make/autoconf/basic.m4

@@ -75,11 +75,10 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
     AC_MSG_NOTICE([Rewriting ORIGINAL_PATH to $REWRITTEN_PATH])
   fi
 
-  if test "x$OPENJDK_TARGET_CPU" = xx86 && test "x$with_jvm_variants" != xzero; then
-    AC_MSG_ERROR([32-bit x86 builds are not supported])
-  fi
-
   if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+    if test "x$OPENJDK_TARGET_CPU_BITS" = "x32"; then
+      AC_MSG_ERROR([32-bit Windows builds are not supported])
+    fi
     BASIC_SETUP_PATHS_WINDOWS
   fi
 
@@ -134,33 +133,17 @@ AC_DEFUN_ONCE([BASIC_SETUP_BUILD_ENV],
   )
   AC_SUBST(BUILD_ENV)
 
-  AC_MSG_CHECKING([for locale to use])
   if test "x$LOCALE" != x; then
     # Check if we actually have C.UTF-8; if so, use it
     if $LOCALE -a | $GREP -q -E "^C\.(utf8|UTF-8)$"; then
       LOCALE_USED=C.UTF-8
-      AC_MSG_RESULT([C.UTF-8 (recommended)])
-    elif $LOCALE -a | $GREP -q -E "^en_US\.(utf8|UTF-8)$"; then
-      LOCALE_USED=en_US.UTF-8
-      AC_MSG_RESULT([en_US.UTF-8 (acceptable fallback)])
     else
-      # As a fallback, check if users locale is UTF-8. USER_LOCALE was saved
-      # by the wrapper configure script before autconf messed up LC_ALL.
-      if $ECHO $USER_LOCALE | $GREP -q -E "\.(utf8|UTF-8)$"; then
-        LOCALE_USED=$USER_LOCALE
-        AC_MSG_RESULT([$USER_LOCALE (untested fallback)])
-        AC_MSG_WARN([Could not find C.UTF-8 or en_US.UTF-8 locale. This is not supported, and the build might fail unexpectedly.])
-      else
-        AC_MSG_RESULT([no UTF-8 locale found])
-        AC_MSG_WARN([No UTF-8 locale found. This is not supported. Proceeding with the C locale, but the build might fail unexpectedly.])
-        LOCALE_USED=C
-      fi
-      AC_MSG_NOTICE([The recommended locale is C.UTF-8, but en_US.UTF-8 is also accepted.])
+      AC_MSG_WARN([C.UTF-8 locale not found, using C locale])
+      LOCALE_USED=C
     fi
   else
-    LOCALE_USED=C.UTF-8
-    AC_MSG_RESULT([C.UTF-8 (default)])
-    AC_MSG_WARN([locale command not not found, using C.UTF-8 locale])
+    AC_MSG_WARN([locale command not not found, using C locale])
+    LOCALE_USED=C
   fi
 
   export LC_ALL=$LOCALE_USED
@@ -415,21 +398,11 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
       [ CONF_NAME=${with_conf_name} ])
 
   # Test from where we are running configure, in or outside of src root.
-  if test "x$OPENJDK_BUILD_OS" = xwindows || test "x$OPENJDK_BUILD_OS" = "xmacosx"; then
-    # These systems have case insensitive paths, so convert them to lower case.
-    [ cmp_configure_start_dir=`$ECHO $CONFIGURE_START_DIR | $TR '[:upper:]' '[:lower:]'` ]
-    [ cmp_topdir=`$ECHO $TOPDIR | $TR '[:upper:]' '[:lower:]'` ]
-    [ cmp_custom_root=`$ECHO $CUSTOM_ROOT | $TR '[:upper:]' '[:lower:]'` ]
-  else
-    cmp_configure_start_dir="$CONFIGURE_START_DIR"
-    cmp_topdir="$TOPDIR"
-    cmp_custom_root="$CUSTOM_ROOT"
-  fi
   AC_MSG_CHECKING([where to store configuration])
-  if test "x$cmp_configure_start_dir" = "x$cmp_topdir" \
-      || test "x$cmp_configure_start_dir" = "x$cmp_custom_root" \
-      || test "x$cmp_configure_start_dir" = "x$cmp_topdir/make/autoconf" \
-      || test "x$cmp_configure_start_dir" = "x$cmp_topdir/make" ; then
+  if test "x$CONFIGURE_START_DIR" = "x$TOPDIR" \
+      || test "x$CONFIGURE_START_DIR" = "x$CUSTOM_ROOT" \
+      || test "x$CONFIGURE_START_DIR" = "x$TOPDIR/make/autoconf" \
+      || test "x$CONFIGURE_START_DIR" = "x$TOPDIR/make" ; then
     # We are running configure from the src root.
     # Create a default ./build/target-variant-debuglevel output root.
     if test "x${CONF_NAME}" = x; then
@@ -450,12 +423,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
     # If configuration is situated in normal build directory, just use the build
     # directory name as configuration name, otherwise use the complete path.
     if test "x${CONF_NAME}" = x; then
-      [ if [[ "$cmp_configure_start_dir" =~ ^${cmp_topdir}/build/[^/]+$ ||
-          "$cmp_configure_start_dir" =~ ^${cmp_custom_root}/build/[^/]+$ ]]; then ]
-          CONF_NAME="${CONFIGURE_START_DIR##*/}"
-      else
-          CONF_NAME="$CONFIGURE_START_DIR"
-      fi
+      CONF_NAME=`$ECHO $CONFIGURE_START_DIR | $SED -e "s!^${TOPDIR}/build/!!"`
     fi
     OUTPUTDIR="$CONFIGURE_START_DIR"
     AC_MSG_RESULT([in current directory])
@@ -581,6 +549,9 @@ AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES],
 
   BASIC_CHECK_SRC_PERMS
 
+  # Check if the user has any old-style ALT_ variables set.
+  FOUND_ALT_VARIABLES=`env | grep ^ALT_`
+
   # Before generating output files, test if they exist. If they do, this is a reconfigure.
   # Since we can't properly handle the dependencies for this, warn the user about the situation
   if test -e $OUTPUTDIR/spec.gmk; then
@@ -653,4 +624,10 @@ AC_DEFUN_ONCE([BASIC_POST_CONFIG_OUTPUT],
 
   # Make the compare script executable
   $CHMOD +x $OUTPUTDIR/compare.sh
+
+  # Copy the linker wrapper script for clang on AIX and make it executable
+  if test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
+    $CP -f "$TOPDIR/make/scripts/aix/ld.sh" "$OUTPUTDIR/ld.sh"
+    $CHMOD +x "$OUTPUTDIR/ld.sh"
+  fi
 ])

make/autoconf/basic_tools.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
@@ -57,7 +57,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
   UTIL_LOOKUP_PROGS(LOCALE, locale)
   UTIL_LOOKUP_PROGS(PATHTOOL, cygpath wslpath)
   UTIL_LOOKUP_PROGS(CMD, cmd.exe, $PATH:/cygdrive/c/windows/system32:/mnt/c/windows/system32:/c/windows/system32)
-  UTIL_LOOKUP_PROGS(LSB_RELEASE, lsb_release)
 ])
 
 ################################################################################
@@ -107,6 +106,9 @@ AC_DEFUN_ONCE([BASIC_SETUP_TOOLS],
   UTIL_LOOKUP_PROGS(READLINK, greadlink readlink)
   UTIL_LOOKUP_PROGS(WHOAMI, whoami)
 
+  # Tools only needed on some platforms
+  UTIL_LOOKUP_PROGS(LSB_RELEASE, lsb_release)
+
   # For compare.sh only
   UTIL_LOOKUP_PROGS(CMP, cmp)
   UTIL_LOOKUP_PROGS(UNIQ, uniq)
@@ -468,15 +470,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_PANDOC],
     AC_MSG_CHECKING([if the pandoc smart extension needs to be disabled for markdown])
     if $PANDOC --list-extensions | $GREP -q '+smart'; then
       AC_MSG_RESULT([yes])
-      PANDOC_MARKDOWN_FLAG="$PANDOC_MARKDOWN_FLAG-smart"
-    else
-      AC_MSG_RESULT([no])
-    fi
-
-    AC_MSG_CHECKING([if the pandoc tex_math_dollars extension needs to be disabled for markdown])
-    if $PANDOC --list-extensions | $GREP -q '+tex_math_dollars'; then
-      AC_MSG_RESULT([yes])
-      PANDOC_MARKDOWN_FLAG="$PANDOC_MARKDOWN_FLAG-tex_math_dollars"
+      PANDOC_MARKDOWN_FLAG="markdown-smart"
     else
       AC_MSG_RESULT([no])
     fi

make/autoconf/basic_windows.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -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"
@@ -159,7 +159,7 @@ AC_DEFUN([BASIC_SETUP_PATHS_WINDOWS],
   else
     WINENV_PREFIX_ARG="$WINENV_PREFIX"
   fi
-  FIXPATH_ARGS="-e $PATHTOOL -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT//\\/\\\\}  -t $WINENV_TEMP_DIR -c $CMD"
+  FIXPATH_ARGS="-e $PATHTOOL -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT//\\/\\\\}  -t $WINENV_TEMP_DIR -c $CMD -q"
   FIXPATH_BASE="$BASH $FIXPATH_DIR/fixpath.sh $FIXPATH_ARGS"
   FIXPATH="$FIXPATH_BASE exec"
 
@@ -215,7 +215,7 @@ AC_DEFUN([BASIC_WINDOWS_FINALIZE_FIXPATH],
   if test "x$OPENJDK_BUILD_OS" = xwindows; then
     FIXPATH_CMDLINE=". $TOPDIR/make/scripts/fixpath.sh -e $PATHTOOL \
         -p $WINENV_PREFIX_ARG -r ${WINENV_ROOT//\\/\\\\}  -t $WINENV_TEMP_DIR \
-        -c $CMD"
+        -c $CMD -q"
     $ECHO >  $OUTPUTDIR/fixpath '#!/bin/bash'
     $ECHO >> $OUTPUTDIR/fixpath export PATH='"[$]PATH:'$PATH'"'
     $ECHO >> $OUTPUTDIR/fixpath $FIXPATH_CMDLINE '"[$]@"'
@@ -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

@@ -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
@@ -180,13 +180,11 @@ AC_DEFUN([BOOTJDK_CHECK_JAVA_HOME],
 # Test: Is there a java or javac in the PATH, which is a symlink to the JDK?
 AC_DEFUN([BOOTJDK_CHECK_JAVA_IN_PATH_IS_SYMLINK],
 [
-  UTIL_LOOKUP_PROGS(JAVAC_CHECK, javac)
-  UTIL_GET_EXECUTABLE(JAVAC_CHECK) # Will setup JAVAC_CHECK_EXECUTABLE
-  UTIL_LOOKUP_PROGS(JAVA_CHECK, java)
-  UTIL_GET_EXECUTABLE(JAVA_CHECK) # Will setup JAVA_CHECK_EXECUTABLE
-  BINARY="$JAVAC_CHECK_EXECUTABLE"
-  if test "x$JAVAC_CHECK_EXECUTABLE" = x; then
-    BINARY="$JAVA_CHECK_EXECUTABLE"
+  UTIL_LOOKUP_PROGS(JAVAC_CHECK, javac, , NOFIXPATH)
+  UTIL_LOOKUP_PROGS(JAVA_CHECK, java, , NOFIXPATH)
+  BINARY="$JAVAC_CHECK"
+  if test "x$JAVAC_CHECK" = x; then
+    BINARY="$JAVA_CHECK"
   fi
   if test "x$BINARY" != x; then
     # So there is a java(c) binary, it might be part of a JDK.

make/autoconf/build-aux/config.guess

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -53,10 +53,10 @@ if [ "x$OUT" = x ]; then
   fi
 fi
 
-# Test and fix cygwin/msys CPUs
-echo $OUT | grep -e "-pc-cygwin" > /dev/null 2> /dev/null
+# Test and fix cygwin on x86_64
+echo $OUT | grep 86-pc-cygwin > /dev/null 2> /dev/null
 if test $? != 0; then
-  echo $OUT | grep -e "-pc-mingw" > /dev/null 2> /dev/null
+  echo $OUT | grep 86-pc-mingw > /dev/null 2> /dev/null
 fi
 if test $? = 0; then
   case `echo $PROCESSOR_IDENTIFIER | cut -f1 -d' '` in
@@ -64,10 +64,6 @@ if test $? = 0; then
       REAL_CPU=x86_64
       OUT=$REAL_CPU`echo $OUT | sed -e 's/[^-]*//'`
       ;;
-    ARMv8)
-      REAL_CPU=aarch64
-      OUT=$REAL_CPU`echo $OUT | sed -e 's/[^-]*//'`
-      ;;
   esac
 fi
 

make/autoconf/build-performance.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
@@ -75,8 +75,7 @@ AC_DEFUN([BPERF_CHECK_MEMORY_SIZE],
     FOUND_MEM=yes
   elif test "x$OPENJDK_BUILD_OS" = xwindows; then
     # Windows, but without cygwin
-    MEMORY_SIZE=`powershell -Command \
-        "(Get-CimInstance Win32_ComputerSystem).TotalPhysicalMemory" | $SED 's/\\r//g' `
+    MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-`
     MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
     FOUND_MEM=yes
   fi

make/autoconf/configure

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -49,9 +49,7 @@ fi
 export CONFIG_SHELL=$BASH
 export _as_can_reexec=no
 
-# Save user's current locale, but make sure all future shell commands are
-# executed with the C locale
-export USER_LOCALE=$LC_ALL
+# Make sure all shell commands are executed with the C locale
 export LC_ALL=C
 
 if test "x$CUSTOM_CONFIG_DIR" != x; then
@@ -366,7 +364,7 @@ EOT
 
     # Print additional help, e.g. a list of toolchains and JVM features.
     # This must be done by the autoconf script.
-    ( CONFIGURE_PRINT_ADDITIONAL_HELP=true . $generated_script PRINTF=printf ECHO=echo )
+    ( CONFIGURE_PRINT_ADDITIONAL_HELP=true . $generated_script PRINTF=printf )
 
     cat <<EOT