JBR-7859 Wayland: Unexpected focus owner set in a Window

Use -Djbr.java.io.use.nio=false to undo

.editorconfig

@@ -1,7 +0,0 @@
-root = true
-
-[*.{cpp,hpp,c,h,java,cc,hh,m,mm,S,md,properties,gmk,m4,ac}]
-trim_trailing_whitespace = true
-
-[Makefile]
-trim_trailing_whitespace = true

.github/README.md

@@ -24,9 +24,8 @@ can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntim
 
 | IDE Version | Latest JBR                                                                                              | Date Released |
 |-------------|---------------------------------------------------------------------------------------------------------|---------------|
-| 2025.1      | [21.0.6-b895.109](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.6b895.109)| 05-Apr-2025   |
-| 2024.3      | [21.0.6-b631.39](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.6b631.39)  | 10-Feb-2025   |
-| 2024.2      | [21.0.4-b509.30](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.5b509.30)  | 26-Nov-2024   |
+| 2024.3      | [21.0.5-b631.8](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.5b631.8)   | 29-Oct-2024   |
+| 2024.2      | [21.0.4-b509.26](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.4b509.26)  | 08-Oct-2024   |
 | 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
@@ -51,21 +50,6 @@ can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntim
 | 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)
@@ -92,9 +76,6 @@ There are many kinds of JBR bundles available on the [Releases page](https://git
 * **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.
@@ -134,22 +115,16 @@ coverage of all the details.
 > 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:
+Create a container (use the `mkdocker...` variant for your architecture):
 ```
-$ docker pull jetbrains/runtime:oraclelinux8_aarch64
+$ cd jb/project/docker
+$ ./mkdocker_x86_64.sh
+...
+Successfully built 942ea9900054
 ```
-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:
+Run these commands in the new container:
 ```
+$ docker run -v `pwd`../../../../:/JetBrainsRuntime -it 942ea9900054
 # cd /JetBrainsRuntime
 # sh ./configure
 # make images

.github/actions/config/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, 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

.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, 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-bootjdk/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, 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

.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/get-msys2/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

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

@@ -32,9 +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
 
 runs:
   using: composite
@@ -78,7 +75,7 @@ runs:
     - name: 'Upload bundles artifact'
       uses: actions/upload-artifact@v4
       with:
-        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.bundle-suffix }}
+        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
         path: bundles
         retention-days: 1
       if: steps.bundles.outputs.bundles-found == 'true'

.github/scripts/gen-build-failure-report.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2022, 2024, 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

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

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2022, 2024, 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

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

.github/workflows/build-linux.yml

@@ -61,9 +61,6 @@ on:
       make-arguments:
         required: false
         type: string
-      bundle-suffix:
-        required: false
-        type: string
 
 jobs:
   build-linux:
@@ -74,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'
@@ -117,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 }}
@@ -132,14 +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 }}
+          debug-suffix: '${{ matrix.suffix }}'

.github/workflows/main.yml

@@ -37,7 +37,7 @@ on:
       platforms:
         description: 'Platform(s) to execute on (comma separated, e.g. "linux-x64, macos, aarch64")'
         required: true
-        default: 'linux-x64, linux-x64-variants, linux-cross-compile, alpine-linux-x64, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
+        default: 'linux-x64, linux-x86-hs, linux-x64-variants, linux-cross-compile, alpine-linux-x64, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
       configure-arguments:
         description: 'Additional configure arguments'
         required: false
@@ -63,7 +63,9 @@ jobs:
       EXCLUDED_PLATFORMS: 'alpine-linux-x64'
     outputs:
       linux-x64: ${{ steps.include.outputs.linux-x64 }}
-      linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }}
+      linux-x86-hs: ${{ steps.include.outputs.linux-x86-hs }}
+      # additional build options for linux-x64 are disabled
+      # linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }}
       linux-cross-compile: ${{ steps.include.outputs.linux-cross-compile }}
       alpine-linux-x64: ${{ steps.include.outputs.alpine-linux-x64 }}
       macos-x64: ${{ steps.include.outputs.macos-x64 }}
@@ -145,6 +147,7 @@ jobs:
           }
 
           echo "linux-x64=$(check_platform linux-x64 linux x64)" >> $GITHUB_OUTPUT
+          echo "linux-x86-hs=$(check_platform linux-x86-hs 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 "alpine-linux-x64=$(check_platform alpine-linux-x64 alpine-linux x64)" >> $GITHUB_OUTPUT
@@ -169,6 +172,24 @@ jobs:
       make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.prepare.outputs.linux-x64 == 'true'
 
+  build-linux-x86-hs:
+    name: linux-x86-hs
+    needs: prepare
+    uses: ./.github/workflows/build-linux.yml
+    with:
+      platform: linux-x86
+      make-target: 'hotspot'
+      gcc-major-version: '10'
+      gcc-package-suffix: '-multilib'
+      apt-architecture: 'i386'
+      # Some multilib libraries do not have proper inter-dependencies, so we have to
+      # install their dependencies manually.
+      apt-extra-packages: 'libfreetype-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libffi-dev:i386'
+      extra-conf-options: '--with-target-bits=32 --enable-fallback-linker --enable-libffi-bundling'
+      configure-arguments: ${{ github.event.inputs.configure-arguments }}
+      make-arguments: ${{ github.event.inputs.make-arguments }}
+    if: needs.prepare.outputs.linux-x86-hs == 'true'
+
   build-linux-x64-hs-nopch:
     name: linux-x64-hs-nopch
     needs: prepare
@@ -226,43 +247,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-image'
-      # 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 }}
-      # It currently doesn't produce any bundles, but probably will do in
-      # the future.
-      bundle-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
@@ -302,7 +286,7 @@ jobs:
     with:
       platform: macos-aarch64
       runs-on: 'macos-14'
-      xcode-toolset-version: '15.4'
+      xcode-toolset-version: '14.3.1'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.prepare.outputs.macos-aarch64 == 'true'
@@ -363,6 +347,16 @@ jobs:
       bootjdk-platform: linux-x64
       runs-on: ubuntu-22.04
 
+  test-macos-x64:
+    name: macos-x64
+    needs:
+      - build-macos-x64
+    uses: ./.github/workflows/test.yml
+    with:
+      platform: macos-x64
+      bootjdk-platform: macos-x64
+      runs-on: macos-13
+
   test-macos-aarch64:
     name: macos-aarch64
     needs:
@@ -372,7 +366,6 @@ jobs:
       platform: macos-aarch64
       bootjdk-platform: macos-aarch64
       runs-on: macos-14
-      xcode-toolset-version: '15.4'
 
   test-windows-x64:
     name: windows-x64

.github/workflows/test.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -37,9 +37,6 @@ on:
       runs-on:
         required: true
         type: string
-      xcode-toolset-version:
-        required: false
-        type: string
 
 env:
   # These are needed to make the MSYS2 bash work properly
@@ -66,6 +63,7 @@ jobs:
           - 'hs/tier1 compiler part 1'
           - 'hs/tier1 compiler part 2'
           - 'hs/tier1 compiler part 3'
+          - 'hs/tier1 compiler not-xcomp'
           - 'hs/tier1 gc'
           - 'hs/tier1 runtime'
           - 'hs/tier1 serviceability'
@@ -100,6 +98,10 @@ jobs:
             test-suite: 'test/hotspot/jtreg/:tier1_compiler_3'
             debug-suffix: -debug
 
+          - test-name: 'hs/tier1 compiler not-xcomp'
+            test-suite: 'test/hotspot/jtreg/:tier1_compiler_not_xcomp'
+            debug-suffix: -debug
+
           - test-name: 'hs/tier1 gc'
             test-suite: 'test/hotspot/jtreg/:tier1_gc'
             debug-suffix: -debug
@@ -145,7 +147,7 @@ jobs:
         run: |
           # On macOS we need to install some dependencies for testing
           brew install make
-          sudo xcode-select --switch /Applications/Xcode_${{ inputs.xcode-toolset-version }}.app/Contents/Developer
+          sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
           # This will make GNU make available as 'make' and not only as 'gmake'
           echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
         if: runner.os == 'macOS'

.gitignore

@@ -20,7 +20,4 @@ NashornProfile.txt
 /.settings/
 /compile_commands.json
 /.cache
-/.gdbinit
-/.lldbinit
-**/core.[0-9]*
 /jbr-api/

.jcheck/conf

@@ -1,10 +1,10 @@
 [general]
 project=jdk
 jbs=JDK
-version=25
+version=24
 
 [checks]
-error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists,copyright
+error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists
 warning=issuestitle,binary
 
 [repository]
@@ -34,8 +34,3 @@ pattern=^([124-8][0-9]{6}): (\S.*)$
 
 [checks "problemlists"]
 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).*
-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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, 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
@@ -24,9 +24,8 @@
 #
 
 ###
-### This file is just a very small wrapper which will include make/PreInit.gmk,
-### where the real work is done. This wrapper also performs some sanity checks
-### on make that must be done before we can include another file.
+### This file is just a very small wrapper needed to run the real make/Init.gmk.
+### It also performs some sanity checks on make.
 ###
 
 # The shell code below will be executed on /usr/bin/make on Solaris, but not in GNU Make.
@@ -59,7 +58,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
+# ... and then we can include the real makefile
+include $(topdir)/make/Init.gmk

bin/idea.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2009, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 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
@@ -127,8 +127,8 @@ if [ "$VERBOSE" = true ] ; then
   echo "Will generate IDEA project files in \"$IDEA_OUTPUT\" for project \"$TOPLEVEL_DIR\""
 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 -f "$IDEA_MAKE/idea.gmk" -I "$OPENJDK_DIR" idea TOPLEVEL_DIR="$TOPLEVEL_DIR" \
+    MAKEOVERRIDES= IDEA_OUTPUT_PARENT="$IDEA_OUTPUT_PARENT" OUT="$IDEA_OUTPUT/env.cfg" MODULES="$*" $CONF_ARG || exit 1
 cd $SCRIPT_DIR
 
 . $IDEA_OUTPUT/env.cfg

doc/building.html

@@ -329,8 +329,8 @@ GB of free disk space is required.</p>
 <p>Even for 32-bit builds, it is recommended to use a 64-bit build
 machine, and instead create a 32-bit target using
 <code>--with-target-bits=32</code>.</p>
-<p>Note: The 32-bit x86 port is deprecated and may be removed in a
-future release.</p>
+<p>Note: The Windows 32-bit x86 port is deprecated and may be removed in
+a future release.</p>
 <h3 id="building-on-aarch64">Building on aarch64</h3>
 <p>At a minimum, a machine with 8 cores is advisable, as well as 8 GB of
 RAM. (The more cores to use, the more memory you need.) At least 6 GB of
@@ -393,7 +393,8 @@ Build Platforms</a>. From time to time, this is updated by contributors
 to list successes or failures of building on different platforms.</p>
 <h3 id="windows">Windows</h3>
 <p>Windows XP is not a supported platform, but all newer Windows should
-be able to build the JDK.</p>
+be able to build the JDK. (Note: The Windows 32-bit x86 port is
+deprecated and may be removed in a future release.)</p>
 <p>On Windows, it is important that you pay attention to the
 instructions in the <a href="#special-considerations">Special
 Considerations</a>.</p>
@@ -863,12 +864,12 @@ href="https://www.gnu.org/software/bash">GNU Bash</a>. No other shells
 are supported.</p>
 <p>At least version 3.2 of GNU Bash must be used.</p>
 <h3 id="graphviz-and-pandoc">Graphviz and Pandoc</h3>
-<p>In order to build man pages and the full docs (see the
+<p>In order to build the full docs (see the
 <code>--enable-full-docs</code> configure option) <a
-href="https://pandoc.org">Pandoc</a> is required. For full docs also <a
-href="https://www.graphviz.org">Graphviz</a> is required. Any recent
-versions should work. For reference, and subject to change, Oracle
-builds use Graphviz 9.0.0 and Pandoc 2.19.2.</p>
+href="https://www.graphviz.org">Graphviz</a> and <a
+href="https://pandoc.org">Pandoc</a> are required. Any recent versions
+should work. For reference, and subject to change, Oracle builds use
+Graphviz 9.0.0 and Pandoc 2.19.2.</p>
 <h2 id="running-configure">Running Configure</h2>
 <p>To build the JDK, you need a "configuration", which consists of a
 directory where to store the build output, coupled with information

doc/building.md

@@ -134,7 +134,8 @@ space is required.
 Even for 32-bit builds, it is recommended to use a 64-bit build machine, and
 instead create a 32-bit target using `--with-target-bits=32`.
 
-Note: The 32-bit x86 port is deprecated and may be removed in a future release.
+Note: The Windows 32-bit x86 port is deprecated and may be removed in a future
+release.
 
 ### Building on aarch64
 
@@ -190,7 +191,8 @@ on different platforms.
 ### Windows
 
 Windows XP is not a supported platform, but all newer Windows should be able to
-build the JDK.
+build the JDK. (Note: The Windows 32-bit x86 port is deprecated and may be
+removed in a future release.)
 
 On Windows, it is important that you pay attention to the instructions in the
 [Special Considerations](#special-considerations).
@@ -680,9 +682,9 @@ At least version 3.2 of GNU Bash must be used.
 
 ### Graphviz and Pandoc
 
-In order to build man pages and the full docs (see the `--enable-full-docs`
-configure option) [Pandoc](https://pandoc.org) is required. For full docs also
-[Graphviz](https://www.graphviz.org) is required. Any recent versions should
+In order to build the full docs (see the `--enable-full-docs`
+configure option) [Graphviz](https://www.graphviz.org) and
+[Pandoc](https://pandoc.org) are required. Any recent versions should
 work. For reference, and subject to change, Oracle builds use Graphviz
 9.0.0 and Pandoc 2.19.2.
 

doc/hotspot-style.html

@@ -207,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>
-<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>
+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>All .cpp files include precompiled.hpp as the first include
+line.</p></li>
+<li><p>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

@@ -135,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.
@@ -158,22 +146,18 @@ 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.
+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.
 
-* Do not include a .hpp file if the corresponding .inline.hpp file is included.
+* All .cpp files include precompiled.hpp as the first include line.
 
-* 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.
+* precompiled.hpp is just a build time optimization, so don't rely on
+it to resolve include problems.
 
-* 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
 

doc/hotspot-unit-tests.html

@@ -245,7 +245,7 @@ compare C string contents. There are also case-insensitive versions
 <p>All GoogleTest asserts print compared expressions and their values,
 so there is no need to have them in error messages. Asserts print only
 compared values, they do not print any of interim variables, e.g.
-<code>ASSERT_TRUE((val1 == val2 &amp;&amp; isFail(foo(8))) || i == 18)</code>
+<code>ASSERT_TRUE((val1 == val2 &amp;&amp; isFail(foo(8)) || i == 18)</code>
 prints only one value. If you use some complex predicates, please
 consider <code>EXPECT_PRED*</code> or <code>EXPECT_FORMAT_PRED</code>
 assertions family, they check that a predicate returns true/success and

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`.
@@ -172,7 +172,7 @@ Provide informative, but not too verbose error messages.
 All GoogleTest asserts print compared expressions and their values, so
 there is no need to have them in error messages. Asserts print only
 compared values, they do not print any of interim variables, e.g.
-`ASSERT_TRUE((val1 == val2 && isFail(foo(8))) || i == 18)` prints only
+`ASSERT_TRUE((val1 == val2 && isFail(foo(8)) || i == 18)` prints only
 one value. If you use some complex predicates, please consider
 `EXPECT_PRED*` or `EXPECT_FORMAT_PRED` assertions family, they check that
 a predicate returns true/success and print out all parameters values.
@@ -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

jb/project/docker/Dockerfile-jbrTest

@@ -0,0 +1,57 @@
+# NOTE: This Dockerfile is meant to be used from the mkdocker_jbrtest.sh script.
+
+# Pull a concrete version of Linux that does NOT recieve updates after it's
+# been created.  This is so that the image is as stable as possible to make
+# image creation reproducible.
+# NB: this also means there may be no security-related fixes there, need to
+# move the version to the next manually.
+
+ARG ARCH_FROM
+ARG ARCH=i386
+ARG OS_NAME
+ARG OS_VERSION
+
+# jetbrains/runtime:jbrTest_${os_name}${os_version}-$arch
+FROM ${ARCH_FROM}/${OS_NAME}:${OS_VERSION}
+
+COPY jbr-11_0_16-linux-x86-b2043.64.tar.gz /jbr/
+ARG ARCH
+RUN \
+    if [ "$ARCH" = "i386" ]; then \
+      # Set up boot JDK for building
+      cd /jbr && \
+          tar --strip-components=1 -xzf jbr-11_0_16-linux-x86-b2043.64.tar.gz && \
+          rm jbr-11_0_16-linux-x86-b2043.64.tar.gz; \
+      echo Installing packages required for i386 only; \
+      dpkg --add-architecture i386; \
+      apt-get update -y; \
+      apt-get install -y \
+          libc6:i386 \
+          libncurses5 libncurses5:i386 \
+          libstdc++6:i386 \
+          zlib1g:i386; \
+    else \
+      echo Skipping the step installing packages specific for the platform; \
+    fi; \
+    apt-get update -y; \
+    apt-get install -y \
+        binutils:${ARCH} \
+        libcanberra-gtk-module:${ARCH} \
+        libgtk2.0-0:${ARCH} \
+        libxext6:${ARCH} \
+        libxi6:${ARCH} \
+        libxrender-dev:${ARCH} \
+        libxtst6:${ARCH} \
+        libxrandr2:${ARCH} \
+        libfreetype6:${ARCH} \
+        fontconfig:${ARCH} \
+        libnss3:${ARCH} \
+        libatk-bridge2.0-0:${ARCH} \
+        libgbm1:${ARCH} \
+        libxkbcommon0:${ARCH} \
+        libasound2:${ARCH};\
+    apt-get clean all
+
+ENV JAVA_HOME=/jbr
+ENV DISPLAY=:0
+

jb/project/docker/Dockerfile-jbrTest.musl

@@ -0,0 +1,35 @@
+# NOTE: This Dockerfile is meant to be used from the mkdocker_jbrtest.sh script.
+
+# Pull a concrete version of Linux that does NOT recieve updates after it's
+# been created.  This is so that the image is as stable as possible to make
+# image creation reproducible.
+# NB: this also means there may be no security-related fixes there, need to
+# move the version to the next manually.
+
+ARG ARCH_FROM
+ARG ARCH=i386
+ARG OS_NAME
+ARG OS_VERSION
+
+# jetbrains/runtime:jbrTest_${os_name}${os_version}-$arch
+FROM ${ARCH_FROM}/${OS_NAME}:${OS_VERSION}
+#FROM arm64v8/alpine:3.12
+
+ARG ARCH
+RUN \
+    apk --no-cache add --update \
+        binutils=2.34-r2 \
+        libcanberra-gtk2=0.30-r5 \
+        gtk+2.0=2.24.32-r1 \
+        libxext=1.3.4-r0 \
+        libxrender-dev=0.9.10-r3 \
+        libxtst=1.2.3-r3 \
+        freetype=2.10.4-r2 \
+        fontconfig=2.13.1-r2 \
+        font-xfree86-type1=1.0.4-r0
+
+COPY jbrsdk_17.tar.gz /jdk17/
+RUN cd /jdk17 && tar --strip-components=1 -xzf jbrsdk_17.tar.gz && rm /jdk17/jbrsdk_17.tar.gz
+
+ENV JAVA_HOME=/jdk17
+ENV DISPLAY=:0

jb/project/docker/Dockerfile.alpine

@@ -0,0 +1,45 @@
+# NOTE: This Dockerfile is meant to be used from the mkdocker_musl_<arch>.sh script.
+
+# Pull a concrete version of Linux that does NOT recieve updates after it's
+# been created.  This is so that the image is as stable as possible to make
+# image creation reproducible.
+# NB: this also means there may be no security-related fixes there, need to
+# move the version to the next manually.
+FROM alpine:3.14
+
+# Install the necessary build tools
+RUN apk --no-cache add --update \
+      alsa-lib-dev=1.2.5-r2 \
+      autoconf=2.71-r0 \
+      bash=5.1.16-r0 \
+      build-base=0.5-r3 \
+      bzip2=1.0.8-r1 \
+      cups-dev=2.3.3-r3 \
+      file=5.40-r1 \
+      fontconfig=2.13.1-r4 \
+      fontconfig-dev=2.13.1-r4 \
+      freetype-dev=2.10.4-r3 \
+      git=2.32.7-r0 \
+      grep=3.7-r0 \
+      libx11-dev=1.7.3.1-r0 \
+      libxext-dev=1.3.4-r0 \
+      libxrandr-dev=1.5.2-r1 \
+      libxrender-dev=0.9.10-r3 \
+      libxt-dev=1.2.1-r0 \
+      libxtst-dev=1.2.3-r3 \
+      linux-headers=5.10.41-r0 \
+      rsync=3.2.5-r0 \
+      tar=1.34-r1 \
+      wayland-dev=1.19.0-r0 \
+      wayland-protocols=1.21-r0 \
+      zip=3.0-r9 \
+      vulkan-headers=1.2.170-r0 \
+      vulkan-loader-dev=1.2.170-r1 \
+      glslang=8.13.3743-r1
+
+COPY gtk-shell.xml /gtk-shell.xml
+
+RUN git config --global user.email "teamcity@jetbrains.com" && \
+    git config --global user.name "builduser" && \
+    git config --global --add safe.directory '*' && \
+    git config --global http.postBuffer 524288000

jb/project/docker/Dockerfile.oraclelinux

@@ -0,0 +1,66 @@
+# NOTE: This Dockerfile is meant to be used from the mkdocker_<arch>.sh script.
+
+# Pull a concrete version of Linux that does NOT recieve updates after it's
+# been created.  This is so that the image is as stable as possible to make
+# image creation reproducible.
+# NB: this also means there may be no security-related fixes there, need to
+# move the version to the next manually.
+
+FROM oraclelinux:8
+
+# Install the necessary build tools
+RUN yum -y update; \
+    yum -y install gcc-toolset-10-10.1-0.el8; \
+    yum -y install \
+        alsa-lib-devel-1.1.9-4.el8 \
+        autoconf-2.69-29.el8_10.1 \
+        automake-1.16.1-6.el8 \
+        bzip2-libs-1.0.6-26.el8 \
+        cups-devel-2.2.6-60.el8_10 \
+        file-5.33-26.el8 \
+        fontconfig-devel-2.13.1-4.el8 \
+        freetype-devel-2.9.1-9.el8 \
+        gcc-c++-8.5.0-22.0.1.el8_10 \
+        git-2.43.5-1.el8_10 \
+        git-core-2.43.5-1.el8_10 \
+        libtool-2.4.6-25.el8 \
+        libXi-devel-1.7.10-1.el8 \
+        libXrandr-devel-1.5.2-1.el8 \
+        libXrender-devel-0.9.10-7.el8 \
+        libXt-devel-1.1.5-12.el8 \
+        libXtst-devel-1.2.3-7.el8 \
+        make-devel-4.2.1-11.el8 \
+        rsync-3.1.3-19.el8_7.1 \
+        unzip-6.0-46.el8 \
+        wayland-devel-1.21.0-1.el8 \
+        wayland-protocols-devel-1.25-1.el8 \
+        python36-3.6.8-39.module+el8.10.0+90274+07ba55de \
+        cmake-3.26.5-2.el8 \
+        vulkan-headers-1.3.250.1-1.el8 \
+        vulkan-loader-devel-1.3.250.1-1.el8 \
+        vulkan-validation-layers-1.3.250.1-1.el8; \
+    yum -y clean all
+
+COPY gtk-shell.xml /gtk-shell.xml
+
+RUN git config --global user.email "teamcity@jetbrains.com" && \
+    git config --global user.name "builduser" && \
+    git config --global --add safe.directory '*' && \
+    git config --global http.postBuffer 524288000
+
+# Build GLSLC
+RUN git clone https://github.com/google/shaderc --branch v2023.6 \
+  && cd shaderc \
+  && ./utils/git-sync-deps \
+  && mkdir build \
+  && cd build \
+  && cmake \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr/local \
+    -DSHADERC_SKIP_TESTS=ON \
+    -DSHADERC_SKIP_EXAMPLES=ON \
+    -DSHADERC_SKIP_COPYRIGHT_CHECK=ON \
+    -DSPIRV_SKIP_EXECUTABLES=ON \
+    -DENABLE_SPVREMAPPER=OFF \
+    .. \
+  && make install

jb/project/docker/Dockerfile.ubuntu.x86

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

jb/project/docker/mkdocker_aarch64.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+wget https://raw.githubusercontent.com/GNOME/gtk/refs/heads/main/gdk/wayland/protocol/gtk-shell.xml
+# This script creates a Docker image suitable for building AArch64 variant
+
+docker build --platform=linux/aarch64 -t jetbrains/runtime:oraclelinux8_aarch64 -f Dockerfile.oraclelinux .
+
+# NB: the resulting container can (and should) be used without the network
+# connection (--network none) during build in order to reduce the chance
+# of build contamination.

jb/project/docker/mkdocker_jbrtest.sh

@@ -0,0 +1,70 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+machine=$(uname -m)
+
+echo "Building image for "$machine" arch"
+
+case "$machine" in
+  "aarch64" | "arm64v8" | "arm64")
+    arch=arm64
+    arch_from=arm64v8
+    ;;
+  "x86_64" | "amd64")
+    arch=amd64
+    arch_from=amd64
+    ;;
+esac
+
+
+# This script creates Docker images for testing JBR executables
+
+
+function build {
+  local arch=$1
+  local os_name=$2
+  local os_version=$3
+  local arch_from=${4:-$arch}
+
+  echo "Building image for ${os_name} ${os_version} ${arch}"
+  echo "====================================="
+
+  docker build -t jetbrains/runtime:jbrTest_${os_name}${os_version}-$arch \
+      --build-arg ARCH="$arch" \
+      --build-arg ARCH_FROM=$arch_from \
+      --build-arg OS_NAME=${os_name} \
+      --build-arg OS_VERSION="${os_version}" \
+    -f Dockerfile-jbrTest .
+
+  return 0
+}
+
+
+function downloadJBR {
+  JBR_REMOTE_FILE=jbr-11_0_16-linux-x86-b2043.64.tar.gz
+  JBR_SHA=d3e4d488bb8e0edf4fa0832a4ff5b5dcac69e646640ae06afb1b49e419536762
+  JBR_LOCAL_FILE=$JBR_REMOTE_FILE
+
+  if [ ! -f $JBR_LOCAL_FILE ]; then
+      # Obtain "JBR" from outside of the container.
+      curl -o $JBR_LOCAL_FILE https://cache-redirector.jetbrains.com/intellij-jbr/${JBR_REMOTE_FILE} -O
+  else
+      echo "Runtime \"$JBR_LOCAL_FILE\" present, skipping download"
+  fi
+
+  # Verify that what we've downloaded can be trusted.
+  sha256sum -c - <<EOF
+$JBR_SHA *$JBR_LOCAL_FILE
+EOF
+
+  return 0
+}
+
+build $arch "ubuntu" "20.04" ${arch_from}
+if [ "$arch" == "amd64" ]; then
+  downloadJBR
+  build "i386" "ubuntu" "20.04" $arch
+fi
+build $arch "ubuntu" "22.04" ${arch_from}

jb/project/docker/mkdocker_jbrtest_musl.sh

@@ -0,0 +1,76 @@
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+machine=$(uname -m)
+
+echo "Building image for "$machine" arch"
+
+case "$machine" in
+  "aarch64" | "arm64v8" | "arm64")
+    arch=arm64
+    arch_from=arm64v8
+    os_version_alpine="3.12"
+    ;;
+  "x86_64" | "amd64")
+    arch=amd64
+    arch_from=amd64
+    os_version_alpine="3.12"
+    ;;
+esac
+
+
+# This script creates Docker images for testing JBR executables
+
+
+function build {
+  local arch=$1
+  local os_name=$2
+  local os_version=$3
+  local arch_from=${4:-$arch}
+
+  echo "Building image for ${os_name} ${os_version} ${arch}"
+  echo "====================================="
+
+  docker build -t jetbrains/runtime:jbrTest_${os_name}${os_version}-$arch \
+      --build-arg ARCH="$arch" \
+      --build-arg ARCH_FROM=$arch_from \
+      --build-arg OS_NAME=${os_name} \
+      --build-arg OS_VERSION="${os_version}" \
+    -f Dockerfile-jbrTest.musl .
+
+  return 0
+}
+
+
+function downloadJBR {
+  JBR_REMOTE_FILE=$1
+  JBR_SHA=$2
+  JBR_LOCAL_FILE=jbrsdk_17.tar.gz
+
+  if [ ! -f $JBR_REMOTE_FILE ]; then
+      # Obtain "JBR" from outside of the container.
+      wget -nc https://cache-redirector.jetbrains.com/intellij-jbr/${JBR_REMOTE_FILE} -O $JBR_REMOTE_FILE
+  # Verify that what we've downloaded can be trusted.
+#  sha256sum -c - <<EOF
+#$JBR_SHA *$JBR_LOCAL_FILE
+#EOF
+      cp $JBR_REMOTE_FILE $JBR_LOCAL_FILE
+  else
+      echo "Runtime \"$JBR_LOCAL_FILE\" present, skipping download"
+  fi
+
+  return 0
+}
+
+if [ "$arch" == "amd64" ]; then
+  JBR_REMOTE_FILE=jbrsdk-17.0.10-linux-musl-x64-b1087.23.tar.gz
+  JBR_SHA=4424739563c8735e81972a651b6f6851b2c835c6a9d192385b3dc934eecfae86e0a6e853fcea9b2353e71a576c7ff029e5a6836c6d9b7cd98d1c23b42763fd3e
+else
+  JBR_REMOTE_FILE=jbrsdk-17.0.10-linux-musl-aarch64-b1087.23.tar.gz
+  JBR_SHA=936668fd2c7375fa7e728dcf7988eb36f4ea886b95782cd84cb129585c7bec5de5e94072b0c24817b1ec1873b058b6d30c09edf7d1789e031121a7737b687c4f
+fi
+downloadJBR $JBR_REMOTE_FILE $JBR_SHA
+
+build $arch "alpine" ${os_version_alpine} ${arch_from}

jb/project/docker/mkdocker_musl_aarch64.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+wget https://raw.githubusercontent.com/GNOME/gtk/refs/heads/main/gdk/wayland/protocol/gtk-shell.xml
+# This script creates a Docker image suitable for building musl AArch64 variant
+
+docker build --platform=linux/aarch64 -t jetbrains/runtime:alpine14_aarch64 -f Dockerfile.alpine .
+
+# NB: the resulting container can (and should) be used without the network
+# connection (--network none) during build in order to reduce the chance
+# of build contamination.

jb/project/docker/mkdocker_musl_x64.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+wget https://raw.githubusercontent.com/GNOME/gtk/refs/heads/main/gdk/wayland/protocol/gtk-shell.xml
+# This script creates a Docker image suitable for building musl x64 variant
+
+docker build --platform=linux/amd64 -t jetbrains/runtime:alpine14_x64 -f Dockerfile.alpine .
+
+# NB: the resulting container can (and should) be used without the network
+# connection (--network none) during build in order to reduce the chance
+# of build contamination.

jb/project/docker/mkdocker_x64.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+wget https://raw.githubusercontent.com/GNOME/gtk/refs/heads/main/gdk/wayland/protocol/gtk-shell.xml
+# This script creates a Docker image suitable for building x64 variant
+
+docker build --platform=linux/amd64 -t jetbrains/runtime:oraclelinux8_x64 -f Dockerfile.oraclelinux .
+
+# NB: the resulting container can (and should) be used without the network
+# connection (--network none) during build in order to reduce the chance
+# of build contamination.

jb/project/docker/mkdocker_x86.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+# This script creates a Docker image suitable for building x86 variant
+
+docker build --platform=linux/i386 -t jetbrains/runtime:ubuntu2004_x86 -f Dockerfile.ubuntu.x86 .
+
+# NB: the resulting container can (and should) be used without the network
+# connection (--network none) during build in order to reduce the chance
+# of build contamination.

jb/project/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))

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

@@ -25,18 +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
-
-  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" \
@@ -47,7 +35,7 @@ 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 \

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

@@ -32,19 +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
-
-  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" \
@@ -55,7 +42,7 @@ 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 \
     $LINUX_TARGET \
     $DISABLE_WARNINGS_AS_ERRORS \

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

@@ -34,23 +34,7 @@ else
   contentType=$(jetSignContentType "$pathToBeSigned")
   (
     cd "$workDir" || exit 1
-    
-    max_attempts=3
-    attempt=1
-    while [ $attempt -le $max_attempts ]; do
-      if "$JETSIGN_CLIENT" -log-format text -max-wait 1m -denoted-content-type "$contentType" -extensions "$jetSignExtensions" "$pathToBeSigned"; then
-        break
-      else
-        if [ $attempt -eq $max_attempts ]; then
-          echo "Failed to sign after $max_attempts attempts"
-          exit 1
-        fi
-        echo "Attempt $attempt failed, retrying in 5 seconds..."
-        sleep 5
-        ((attempt++))
-      fi
-    done
-
+    "$JETSIGN_CLIENT" -log-format text -denoted-content-type "$contentType" -extensions "$jetSignExtensions" "$pathToBeSigned"
     # SRE-1223 (Codesign removes execute bits in executable files) workaround
     chmod "$(stat -f %A "$pathToBeSigned")" "$pathSigned"
     if isMacOsBinary "$pathSigned"; then

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

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

jb/project/tools/mac/scripts/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 $?
 }
 

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

@@ -43,27 +43,22 @@ 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 \) \
-      -exec sh -c '"$1" --timestamp -v -s "$2" --options=runtime --force --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements.xml" {} \;
+      -exec "$SIGN_UTILITY" --timestamp \
+      -v -s "$JB_DEVELOPER_CERT" --options=runtime --force \
+      --entitlements "$SCRIPT_DIR/entitlements.xml" {} \;
   fi
 done
 
-log "Signing JCEF libraries and executables..."
-if [ -d "$APPLICATION_PATH/Contents/Frameworks" ]; then
-  find "$APPLICATION_PATH/Contents/Frameworks" \
-    -type f \( -name "*.dylib" -o -perm +111 \) \
-    -exec sh -c '"$1" --timestamp -v -s "$2" --options=runtime --force --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements_jcef.xml" {} \;
-fi
-
 log "Signing jmod files"
 JMODS_DIR="$APPLICATION_PATH/Contents/Home/jmods"
-JMOD_EXE="$BOOT_JDK/bin/jmod"
+JMOD_EXE="$APPLICATION_PATH/Contents/Home/bin/jmod"
 if [ -d "$JMODS_DIR" ]; then
-  log "processing jmods"  
-
   for jmod_file in "$JMODS_DIR"/*.jmod; do
     log "Processing $jmod_file"
 
@@ -71,16 +66,18 @@ if [ -d "$JMODS_DIR" ]; then
     rm -rf "$TMP_DIR"
     mkdir "$TMP_DIR"
 
-    log "Unzipping $jmod_file"
+    log "Unzipping $jmod_file"    
     $JMOD_EXE extract --dir "$TMP_DIR" "$jmod_file" >/dev/null
+    log "Removing $jmod_file"
+    rm -f "$jmod_file"
 
     log "Signing dylibs in $TMP_DIR"
     find "$TMP_DIR" \
       -type f \( -name "*.dylib" -o -name "*.so"-o -perm +111 -o -name jarsigner -o -name jnativescan -o -name jdeps -o -name jpackageapplauncher -o -name jspawnhelper -o -name jar -o -name javap -o -name jdeprscan -o -name jfr -o -name rmiregistry -o -name java -o -name jhsdb  -o -name jstatd  -o -name jstatd -o -name jpackage -o -name keytool -o -name jmod -o -name jlink -o -name jimage -o -name jstack -o -name jcmd -o -name jps -o -name jmap -o -name jstat -o -name jinfo -o -name jshell -o -name jwebserver -o -name javac -o -name serialver -o -name jrunscript -o -name jdb -o -name jconsole -o -name javadoc \) \
-      -exec sh -c '"$1" --timestamp -v -s "$2" --options=runtime --force --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements.xml" {} \;
+      -exec "$SIGN_UTILITY" --timestamp \
+      -v -s "$JB_DEVELOPER_CERT" --options=runtime --force \
+      --entitlements "$SCRIPT_DIR/entitlements.xml" {} \;
 
-    log "Removing $jmod_file"
-    rm -f "$jmod_file"
     cmd="$JMOD_EXE create --class-path $TMP_DIR/classes"
 
     # Check each directory and add to the command if it exists
@@ -91,8 +88,6 @@ if [ -d "$JMODS_DIR" ]; then
     [ -d "$TMP_DIR/legal" ] && cmd="$cmd --legal-notices $TMP_DIR/legal"
     [ -d "$TMP_DIR/man" ] && cmd="$cmd --man-pages $TMP_DIR/man"
 
-    log "Creating jmod file"
-		log "$cmd"
     # Add the output file
     cmd="$cmd $jmod_file"
 
@@ -102,41 +97,6 @@ if [ -d "$JMODS_DIR" ]; then
     log "Removing $TMP_DIR"
     rm -rf "$TMP_DIR"
   done
-
-  log "Repack java.base.jmod with new hashes of modules"
-  hash_modules=$($JMOD_EXE describe $JMODS_DIR/java.base.jmod | grep hashes | awk '{print $2}' | tr '\n' '|' | sed s/\|$//) || exit $?
-
-  TMP_DIR="$JMODS_DIR/tmp"
-  rm -rf "$TMP_DIR"
-  mkdir "$TMP_DIR"
-
-  jmod_file="$JMODS_DIR/java.base.jmod"
-  log "Unzipping $jmod_file"
-  $JMOD_EXE extract --dir "$TMP_DIR" "$jmod_file" >/dev/null
-
-  log "Removing java.base.jmod"
-  rm -f "$jmod_file"
-
-  cmd="$JMOD_EXE create --class-path $TMP_DIR/classes --hash-modules \"$hash_modules\" --module-path $JMODS_DIR"
-
-  # Check each directory and add to the command if it exists
-  [ -d "$TMP_DIR/bin" ] && cmd="$cmd --cmds $TMP_DIR/bin"
-  [ -d "$TMP_DIR/conf" ] && cmd="$cmd --config $TMP_DIR/conf"
-  [ -d "$TMP_DIR/lib" ] && cmd="$cmd --libs $TMP_DIR/lib"
-  [ -d "$TMP_DIR/include" ] && cmd="$cmd --header-files $TMP_DIR/include"
-  [ -d "$TMP_DIR/legal" ] && cmd="$cmd --legal-notices $TMP_DIR/legal"
-  [ -d "$TMP_DIR/man" ] && cmd="$cmd --man-pages $TMP_DIR/man"
-
-  log "Creating jmod file"
-	log "$cmd"
-  # Add the output file
-  cmd="$cmd $jmod_file"
-
-  # Execute the command
-  eval $cmd
-
-  log "Removing $TMP_DIR"
-  rm -rf "$TMP_DIR"
 else
   echo "Directory '$JMODS_DIR' does not exist. Skipping signing of jmod files."
 fi
@@ -159,7 +119,10 @@ find "$APPLICATION_PATH" -name '*.jar' \
 
     find jarfolder \
       -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "*.tbd" -o -name "jattach" \) \
-      -exec sh -c '"$1" --timestamp --force -v -s "$2" --options=runtime --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements.xml" {} \;
+      -exec "$SIGN_UTILITY" --timestamp \
+      --force \
+      -v -s "$JB_DEVELOPER_CERT" --options=runtime \
+      --entitlements "$SCRIPT_DIR/entitlements.xml" {} \;
 
     (cd jarfolder; zip -q -r -o -0 ../jar.jar .)
     mv jar.jar "$file"
@@ -174,14 +137,16 @@ for f in \
   if [ -d "$APPLICATION_PATH/$f" ]; then
     find "$APPLICATION_PATH/$f" \
       -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "*.tbd" -o -perm +111 \) \
-      -exec sh -c '"$1" --timestamp -v -s "$2" --options=runtime --force --entitlements "$3" "$4" || exit 1' sh "$SIGN_UTILITY" "$JB_DEVELOPER_CERT" "$SCRIPT_DIR/entitlements.xml" {} \;
+      -exec "$SIGN_UTILITY" --timestamp \
+      -v -s "$JB_DEVELOPER_CERT" --options=runtime --force \
+      --entitlements "$SCRIPT_DIR/entitlements.xml" {} \;
   fi
 done
 
 log "Signing whole frameworks..."
 # shellcheck disable=SC2043
 if [ "$JB_SIGN" = true ]; then for f in \
-  "Contents/Frameworks/cef_server.app/Contents/Frameworks" "Contents/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 +155,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
         rm -rf "$line"
         tar -xzf tmp-to-sign.tar.gz --directory "$(dirname "$line")"
         rm -f tmp-to-sign.tar.gz
@@ -199,14 +164,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
@@ -214,7 +181,7 @@ if [ "$JB_SIGN" = true ]; then
   "$SIGN_UTILITY" --timestamp \
     -v -s "$JB_DEVELOPER_CERT" --options=runtime \
     --force \
-    --entitlements "$SCRIPT_DIR/entitlements.xml" tmp-to-sign.tar.gz || exit 1
+    --entitlements "$SCRIPT_DIR/entitlements.xml" tmp-to-sign.tar.gz
   rm -rf "$APPLICATION_PATH"
   tar -xzf tmp-to-sign.tar.gz --directory "$(dirname "$APPLICATION_PATH")"
   rm -f tmp-to-sign.tar.gz
@@ -222,7 +189,7 @@ else
   "$SIGN_UTILITY" --timestamp \
     -v -s "$JB_DEVELOPER_CERT" --options=runtime \
     --force \
-    --entitlements "$SCRIPT_DIR/entitlements.xml" "$APPLICATION_PATH" || exit 1
+    --entitlements "$SCRIPT_DIR/entitlements.xml" "$APPLICATION_PATH"
 fi
 
 BUILD_NAME="$(basename "$APPLICATION_PATH")"

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

@@ -9,6 +9,7 @@ export COPYFILE_DISABLE=true
 
 INPUT_FILE=$1
 EXPLODED=$2.exploded
+BACKUP_JMODS=$2.backup
 USERNAME=$3
 PASSWORD=$4
 CODESIGN_STRING=$5
@@ -28,13 +29,15 @@ if test -d "$EXPLODED"; then
 fi
 rm -rf "$EXPLODED"
 mkdir "$EXPLODED"
+rm -rf "$BACKUP_JMODS"
+mkdir "$BACKUP_JMODS"
 
 log "Unzipping $INPUT_FILE to $EXPLODED ..."
 tar -xzvf "$INPUT_FILE" --directory $EXPLODED
 BUILD_NAME="$(ls "$EXPLODED")"
 #sed -i '' s/BNDL/APPL/ $EXPLODED/$BUILD_NAME/Contents/Info.plist
 rm -f $EXPLODED/$BUILD_NAME/Contents/CodeResources
-mv "$INPUT_FILE" "$INPUT_FILE".origin
+rm "$INPUT_FILE"
 
 log "$INPUT_FILE extracted and removed"
 
@@ -75,15 +78,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 +96,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

@@ -104,11 +104,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

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

@@ -97,11 +97,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

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

@@ -92,10 +92,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
@@ -242,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,6 +502,11 @@ endif
 
 ################################################################################
 
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, Bundles.gmk))
+
+################################################################################
+
 product-bundles: $(PRODUCT_TARGETS)
 legacy-bundles: $(LEGACY_TARGETS)
 test-bundles: $(TEST_TARGETS)
@@ -512,10 +517,6 @@ static-libs-bundles: $(STATIC_LIBS_TARGETS)
 static-libs-graal-bundles: $(STATIC_LIBS_GRAAL_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 jcov-bundles
-
-################################################################################
-
-include MakeFileEnd.gmk

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

@@ -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,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
 
@@ -126,19 +132,12 @@ define SetupBuildDemoBody
         JARMAIN := $$($1_MAIN_CLASS), \
         MANIFEST := $(DEMO_MANIFEST), \
         EXTRA_MANIFEST_ATTR := $$($1_EXTRA_MANIFEST_ATTR), \
+        SRCZIP := $(SUPPORT_OUTPUTDIR)/demos/image/$$($1_DEMO_SUBDIR)/$1/src.zip, \
         EXCLUDE_FILES := $$($1_EXCLUDE_FILES), \
         DISABLED_WARNINGS := $$($1_DISABLED_WARNINGS), \
     ))
 
     $1 += $$(BUILD_DEMO_$1)
-
-    $$(eval $$(call SetupZipArchive, ZIP_SRC_DEMO_$1, \
-        SRC := $$($1_MAIN_SRC) $$($1_EXTRA_SRC_DIR), \
-        ZIP := $(SUPPORT_OUTPUTDIR)/demos/image/$$($1_DEMO_SUBDIR)/$1/src.zip, \
-        EXCLUDE_FILES := $$($1_EXCLUDE_FILES), \
-    ))
-
-    $1 += $$(ZIP_SRC_DEMO_$1)
   endif
 
   # Copy files. Sort is needed to remove duplicates.
@@ -258,8 +257,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
@@ -146,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, 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,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
@@ -156,4 +149,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, 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,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 \
@@ -161,6 +168,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, 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,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, 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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 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
@@ -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
 
 ################################################################################
 
@@ -46,6 +47,7 @@ $(JCOV_IMAGE_DIR)/release: $(JCOV_INPUT_IMAGE_DIR)/release
 	    -t $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)/template.xml \
 	    -rt $(JCOV_HOME)/lib/jcov_network_saver.jar \
 	    -exclude 'java.lang.Object' \
+	    -exclude 'jdk.internal.org.objectweb.**' \
 	    -exclude jdk.test.Main -exclude '**\$Proxy*' \
 	    $(JCOV_FILTERS) \
 	    $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)
@@ -53,7 +55,3 @@ $(JCOV_IMAGE_DIR)/release: $(JCOV_INPUT_IMAGE_DIR)/release
 	$(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
@@ -79,8 +86,6 @@ JAVADOC_TAGS := \
     -tag see \
     -taglet build.tools.taglet.ExtLink \
     -taglet build.tools.taglet.Incubating \
-    -taglet build.tools.taglet.PreviewNote \
-    --preview-note-tag previewNote \
     -tagletpath $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     $(CUSTOM_JAVADOC_TAGS) \
     #
@@ -94,17 +99,23 @@ 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 ISO-8859-1 -docencoding UTF-8 -breakiterator \
+    -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
     -splitIndex --system none -javafx --expand-requires transitive \
-    --override-methods=summary
+    --override-methods=summary \
+    --no-external-specs-page
 
 # 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 ISO-8859-1 -breakiterator -splitIndex --system none \
-    -html5 -javafx --expand-requires transitive
+    -encoding ISO-8859-1 -breakiterator -splitIndex --system none \
+    -html5 -javafx --expand-requires transitive \
+    --no-external-specs-page
 
 # Should we add DRAFT stamps to the generated javadoc?
 ifeq ($(VERSION_IS_GA), true)
@@ -262,7 +273,7 @@ define create_overview_file
   $$($1_OVERVIEW): $$($1_OVERVIEW_VARDEPS_FILE)
 	$$(call LogInfo, Creating overview.html for $1)
 	$$(call MakeDir, $$(@D))
-	$$(ECHO) -n '$$($1_OVERVIEW_TEXT)' > $$@
+	$$(PRINTF) > $$@ '$$($1_OVERVIEW_TEXT)'
 endef
 
 ################################################################################
@@ -320,9 +331,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
@@ -673,7 +682,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 +763,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 +808,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
 
@@ -145,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

@@ -1,5 +1,5 @@
 #
-# 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
@@ -102,13 +102,12 @@ help:
 	$(info $(_)                        # method is 'auto', 'ignore' or 'fail' (default))
 	$(info $(_) TEST="test1 ..."       # Use the given test descriptor(s) for testing, e.g.)
 	$(info $(_)                        # make test TEST="jdk_lang gtest:all")
-	$(info $(_) TEST_DEPS="dependency1 ..." # Specify additional dependencies for running tests, e.g docs-jdk)
+	$(info $(_) TEST_DEPS="dependency1 ..." # Specify additional dependencies for running tests, e.g docs-jdk
 	$(info $(_) JTREG="OPT1=x;OPT2=y"  # Control the JTREG test harness, use 'make test-only JTREG=help' to list)
 	$(info $(_) GTEST="OPT1=x;OPT2=y"  # Control the GTEST test harness, use 'make test-only GTEST=help' to list)
 	$(info $(_) MICRO="OPT1=x;OPT2=y"  # Control the MICRO test harness, use 'make test-only MICRO=help' to list)
 	$(info $(_) TEST_OPTS="OPT1=x;..." # Generic control of all test harnesses)
 	$(info $(_) TEST_VM_OPTS="ARG ..." # Same as setting TEST_OPTS to VM_OPTIONS="ARG ...")
-	$(info $(_) ALLOW="FOO,BAR"        # Do not warn that FOO and BAR are non-control variables)
 	$(info )
 	$(if $(all_confs), $(info Available configurations in $(build_dir):) $(foreach var,$(all_confs),$(info * $(var))), \
 	    $(info No configurations were found in $(build_dir).) $(info Run 'bash configure' to create a configuration.))
@@ -121,12 +120,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,12 +23,12 @@
 # questions.
 #
 
-include MakeFileStart.gmk
+default: all
 
-################################################################################
+include $(SPEC)
+include MakeBase.gmk
 
 include CopyFiles.gmk
-include DebugInfoUtils.gmk
 include Execute.gmk
 include Modules.gmk
 include Utils.gmk
@@ -36,6 +36,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.
@@ -93,14 +96,6 @@ JLINK_DISABLE_WARNINGS := | ( $(GREP) -v -e "WARNING: Using incubator module" ||
 JDK_IMAGE_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jdk
 JRE_IMAGE_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jre
 
-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) \
@@ -137,16 +132,10 @@ CDS_DUMP_FLAGS = -Xmx128M -Xms128M
 # Helper function for creating the CDS archives for the JDK and JRE
 #
 # Param1 - VM variant (e.g., server, client, zero, ...)
-# Param2 - _nocoops, _coh, _nocoops_coh, or empty
+# Param2 - _nocoops, or empty
 define CreateCDSArchive
-  $1_$2_COOPS_OPTION := $(if $(findstring _nocoops, $2),-XX:-UseCompressedOops)
-  # enable and also explicitly disable coh as needed.
-  ifeq ($(call isTargetCpuBits, 64), true)
-    $1_$2_COH_OPTION := -XX:+UnlockExperimentalVMOptions \
-                        $(if $(findstring _coh, $2),-XX:+UseCompactObjectHeaders,-XX:-UseCompactObjectHeaders)
-  endif
-  $1_$2_DUMP_EXTRA_ARG := $$($1_$2_COOPS_OPTION) $$($1_$2_COH_OPTION)
-  $1_$2_DUMP_TYPE      := $(if $(findstring _nocoops, $2),-NOCOOPS,)$(if $(findstring _coh, $2),-COH,)
+  $1_$2_DUMP_EXTRA_ARG := $(if $(filter _nocoops, $2), -XX:-UseCompressedOops, )
+  $1_$2_DUMP_TYPE      := $(if $(filter _nocoops, $2), -NOCOOPS, )
 
   # Only G1 supports dumping the shared heap, so explicitly use G1 if the JVM supports it.
   $1_$2_CDS_DUMP_FLAGS := $(CDS_DUMP_FLAGS) $(if $(filter g1gc, $(JVM_FEATURES_$1)), -XX:+UseG1GC)
@@ -201,14 +190,6 @@ ifeq ($(BUILD_CDS_ARCHIVE), true)
     $(foreach v, $(JVM_VARIANTS), \
       $(eval $(call CreateCDSArchive,$v,_nocoops)) \
     )
-    ifeq ($(BUILD_CDS_ARCHIVE_COH), true)
-      $(foreach v, $(JVM_VARIANTS), \
-        $(eval $(call CreateCDSArchive,$v,_coh)) \
-      )
-      $(foreach v, $(JVM_VARIANTS), \
-        $(eval $(call CreateCDSArchive,$v,_nocoops_coh)) \
-      )
-    endif
   endif
 endif
 
@@ -282,6 +263,27 @@ else
 endif
 CMDS_TARGET_SUBDIR := bin
 
+# Param 1 - dir to find debuginfo files in
+FindDebuginfoFiles = \
+    $(wildcard $(addprefix $1/*, $(DEBUGINFO_SUFFIXES)) \
+        $(addprefix $1/*/*, $(DEBUGINFO_SUFFIXES)) \
+        $(addprefix $1/*/*/*, $(DEBUGINFO_SUFFIXES)))
+
+# Pick the correct debug info files to copy, either zipped or not.
+ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
+  DEBUGINFO_SUFFIXES += .diz
+else
+  DEBUGINFO_SUFFIXES := .debuginfo .pdb .map
+  # On Macosx, if debug symbols have not been zipped, find all files inside *.dSYM
+  # dirs.
+  ifeq ($(call isTargetOs, macosx), true)
+    $(call FillFindCache, \
+        $(SUPPORT_OUTPUTDIR)/modules_libs $(SUPPORT_OUTPUTDIR)/modules_cmds)
+    FindDebuginfoFiles = \
+        $(if $(wildcard $1), $(call containing, .dSYM/, $(call FindFiles, $1)))
+  endif
+endif
+
 # Param 1 - either JDK or JRE
 SetupCopyDebuginfo = \
     $(foreach m, $(ALL_$1_MODULES), \
@@ -309,6 +311,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 +326,4 @@ symbols: $(SYMBOLS_TARGETS)
 
 all: jdk jre symbols
 
-.PHONY: jdk jre symbols
-
-################################################################################
-
-include MakeFileEnd.gmk
+.PHONY: default all jdk jre symbols

make/Init.gmk

@@ -1,5 +1,5 @@
 #
-# 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
@@ -23,82 +23,263 @@
 # 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
-# Main.gmk with the proper make and the proper make arguments.
-# PreMain.gmk has provided us with a proper SPEC. This allows us to use the
-# value of $(MAKE) for all further make calls.
+# This is the bootstrapping part of the build. This file is included from the
+# top level Makefile, and is responsible for launching the Main.gmk file with
+# the proper make and the proper make arguments.
 ################################################################################
 
-# Our helper functions.
-include $(TOPDIR)/make/InitSupport.gmk
-include LogUtils.gmk
-
-# Force early generation of module-deps.gmk
-GENERATE_MODULE_DEPS_FILE := true
-include Modules.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:
 
-# Parse COMPARE_BUILD (for makefile development)
-$(eval $(call ParseCompareBuild))
+ifeq ($(HAS_SPEC), )
+  ##############################################################################
+  # This is the default mode. We have not been recursively called with a SPEC.
+  ##############################################################################
 
-# Setup reproducible build environment
-$(eval $(call SetupReproducibleBuild))
+  # Include our helper functions.
+  include $(topdir)/make/InitSupport.gmk
 
-# If no LOG= was given on command line, but we have a non-standard default
-# value, use that instead and re-parse log level.
-ifeq ($(LOG), )
-  ifneq ($(DEFAULT_LOG), )
-    override LOG := $(DEFAULT_LOG)
-    $(eval $(call ParseLogLevel))
+  # 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
+
+  # CALLED_TARGETS is the list of targets that the user provided,
+  # or "default" if unspecified.
+  CALLED_TARGETS := $(if $(MAKECMDGOALS), $(MAKECMDGOALS), default)
+
+  # Extract non-global targets that require a spec file.
+  CALLED_SPEC_TARGETS := $(filter-out $(ALL_GLOBAL_TARGETS), $(CALLED_TARGETS))
+
+  # If we have only global targets, or if we are called with -qp (assuming an
+  # external part, e.g. bash completion, is trying to understand our targets),
+  # we will skip SPEC location and the sanity checks.
+  ifeq ($(CALLED_SPEC_TARGETS), )
+    ONLY_GLOBAL_TARGETS := true
+  endif
+  ifeq ($(findstring p, $(MAKEFLAGS))$(findstring q, $(MAKEFLAGS)), pq)
+    ONLY_GLOBAL_TARGETS := true
   endif
-endif
 
-ifeq ($(LOG_NOFILE), true)
-  # Disable build log if LOG=[level,]nofile was given
-  override BUILD_LOG_PIPE :=
-  override BUILD_LOG_PIPE_SIMPLE :=
-endif
+  ifeq ($(ONLY_GLOBAL_TARGETS), true)
+    ############################################################################
+    # We have only global targets, or are called with -pq.
+    ############################################################################
 
-ifeq ($(filter dist-clean, $(SEQUENTIAL_TARGETS)), dist-clean)
-  # We can't have a log file if we're about to remove it.
-  override BUILD_LOG_PIPE :=
-  override BUILD_LOG_PIPE_SIMPLE :=
-endif
+    ifeq ($(wildcard $(SPEC)), )
+      # If we have no SPEC provided, we will just make a "best effort" target list.
+      # First try to grab any available pre-existing main-targets.gmk.
+      main_targets_file := $(firstword $(wildcard $(build_dir)/*/make-support/main-targets.gmk))
+      ifneq ($(main_targets_file), )
+        # Extract the SPEC that corresponds to this main-targets.gmk file.
+        SPEC := $(patsubst %/make-support/main-targets.gmk, %/spec.gmk, $(main_targets_file))
+      else
+        # None found, pick an arbitrary SPEC for which to generate a file
+        SPEC := $(firstword $(all_spec_files))
+      endif
+    endif
 
-ifeq ($(OUTPUT_SYNC_SUPPORTED), true)
-  OUTPUT_SYNC_FLAG := -O$(OUTPUT_SYNC)
-endif
+    ifneq ($(wildcard $(SPEC)), )
+      $(eval $(call DefineMainTargets, LAZY, $(SPEC)))
+    else
+      # If we have no configurations we can not provide any main targets.
+      ALL_MAIN_TARGETS :=
+    endif
 
-##############################################################################
-# Init targets. These are handled fully, here and now.
-##############################################################################
+    ALL_TARGETS := $(sort $(ALL_GLOBAL_TARGETS) $(ALL_MAIN_TARGETS) $(ALL_INIT_TARGETS))
 
-print-modules:
+    # Just list all our targets.
+    $(ALL_TARGETS):
+
+    .PHONY: $(ALL_TARGETS)
+
+  else
+    ############################################################################
+    # This is the normal case, we have been called from the command line by the
+    # user and we need to call ourself back with a proper SPEC.
+    # We have at least one non-global target, so we need to find a spec file.
+    ############################################################################
+
+    # 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.
+    $(eval $(call ParseLogLevel))
+
+    # After this SPECS contain 1..N spec files (otherwise ParseConfAndSpec fails).
+    $(eval $(call ParseConfAndSpec))
+
+    # Extract main targets from Main.gmk using the spec(s) provided. In theory,
+    # with multiple specs, we should find the intersection of targets provided
+    # by all specs, but we approximate this by an arbitrary spec from the list.
+    # This will setup ALL_MAIN_TARGETS.
+    $(eval $(call DefineMainTargets, FORCE, $(firstword $(SPECS))))
+
+    # 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))
+
+    # 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/*) \
+            $(if $(CUSTOM_CONFIG_DIR), $(wildcard $(CUSTOM_CONFIG_DIR)/*)) \
+            $(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
+        else ifeq ($(CONF_CHECK), auto)
+	  @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
+
+    # Do not let make delete spec files even if aborted while doing a reconfigure
+    .PRECIOUS: $(SPECS)
+
+    # Unless reconfigure is explicitly called, let all main targets depend on
+    # the spec files to be up to date.
+    ifeq ($(findstring reconfigure, $(INIT_TARGETS)), )
+      $(MAIN_TARGETS): $(SPECS)
+    endif
+
+    make-info:
+        ifneq ($(findstring $(LOG_LEVEL), info debug trace), )
+	  $(info Running make as '$(strip $(MAKE) $(MFLAGS) \
+	      $(COMMAND_LINE_VARIABLES) $(MAKECMDGOALS))')
+        endif
+
+    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)" \
+        SEQUENTIAL_TARGETS="$(SEQUENTIAL_TARGETS)" \
+        PARALLEL_TARGETS="$(PARALLEL_TARGETS)"
+
+    # Now the init and main targets will be called, once for each SPEC. The
+    # recipe will be run once for every target specified, but we only want to
+    # execute the recipe a single time, hence the TARGET_DONE with a dummy
+    # command if true.
+    # The COMPARE_BUILD part implements special support for makefile development.
+    $(ALL_INIT_TARGETS) $(ALL_MAIN_TARGETS): make-info
+	@$(if $(TARGET_DONE), \
+	  true \
+	, \
+	  ( cd $(topdir) && \
+	  $(foreach spec, $(SPECS), \
+	    $(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) $(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) \
+	)
+
+    .PHONY: $(ALL_MAIN_TARGETS) $(ALL_INIT_TARGETS)
+
+  endif # $(ONLY_GLOBAL_TARGETS)!=true
+
+else # HAS_SPEC=true
+
+  ##############################################################################
+  # Now we have a spec. This part provides the "main" target that acts as a
+  # trampoline to call the Main.gmk with the value of $(MAKE) found in the spec
+  # file.
+  ##############################################################################
+
+  include $(SPEC)
+
+  # Our helper functions.
+  include $(TOPDIR)/make/InitSupport.gmk
+
+  # Parse COMPARE_BUILD (for makefile development)
+  $(eval $(call ParseCompareBuild))
+
+  # Setup reproducible build environment
+  $(eval $(call SetupReproducibleBuild))
+
+  # If no LOG= was given on command line, but we have a non-standard default
+  # value, use that instead and re-parse log level.
+  ifeq ($(LOG), )
+    ifneq ($(DEFAULT_LOG), )
+      override LOG := $(DEFAULT_LOG)
+      $(eval $(call ParseLogLevel))
+    endif
+  endif
+
+  ifeq ($(LOG_NOFILE), true)
+    # Disable build log if LOG=[level,]nofile was given
+    override BUILD_LOG_PIPE :=
+    override BUILD_LOG_PIPE_SIMPLE :=
+  endif
+
+  ifeq ($(filter dist-clean, $(SEQUENTIAL_TARGETS)), dist-clean)
+    # We can't have a log file if we're about to remove it.
+    override BUILD_LOG_PIPE :=
+    override BUILD_LOG_PIPE_SIMPLE :=
+  endif
+
+  ifeq ($(OUTPUT_SYNC_SUPPORTED), true)
+    OUTPUT_SYNC_FLAG := -O$(OUTPUT_SYNC)
+  endif
+
+  ##############################################################################
+  # Init targets
+  ##############################################################################
+
+  print-modules:
 	( cd $(TOPDIR) && \
 	    $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
 	    NO_RECIPES=true print-modules )
 
-print-targets:
+  print-targets:
 	( cd $(TOPDIR) && \
 	    $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
 	    NO_RECIPES=true print-targets )
 
-print-tests:
+  print-tests:
 	( cd $(TOPDIR) && \
 	    $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
 	    NO_RECIPES=true print-tests )
 
-print-configuration:
-	$(ECHO) $(CONFIGURE_COMMAND_LINE)
+  print-configuration:
+	  $(ECHO) $(CONFIGURE_COMMAND_LINE)
 
-reconfigure:
+  reconfigure:
         ifneq ($(REAL_CONFIGURE_COMMAND_EXEC_FULL), )
 	  $(ECHO) "Re-running configure using original command line '$(REAL_CONFIGURE_COMMAND_EXEC_SHORT) $(REAL_CONFIGURE_COMMAND_LINE)'"
 	  $(eval RECONFIGURE_COMMAND := $(REAL_CONFIGURE_COMMAND_EXEC_FULL) $(REAL_CONFIGURE_COMMAND_LINE))
@@ -114,30 +295,28 @@ reconfigure:
 	    CUSTOM_CONFIG_DIR="$(CUSTOM_CONFIG_DIR)" \
 	    $(RECONFIGURE_COMMAND) )
 
-.PHONY: print-modules print-targets print-tests print-configuration reconfigure
+  ##############################################################################
+  # The main target, for delegating into Main.gmk
+  ##############################################################################
 
-##############################################################################
-# The main target. This will delegate all other targets into Main.gmk.
-##############################################################################
+  MAIN_TARGETS := $(SEQUENTIAL_TARGETS) $(PARALLEL_TARGETS) $(COMPARE_BUILD_MAKE)
+  # If building the default target, add what they are to the description.
+  DESCRIPTION_TARGETS := $(strip $(MAIN_TARGETS))
+  ifeq ($(DESCRIPTION_TARGETS), default)
+    DESCRIPTION_TARGETS += ($(DEFAULT_MAKE_TARGET))
+  endif
+  TARGET_DESCRIPTION := target$(if $(word 2, $(MAIN_TARGETS)),s) \
+      '$(strip $(DESCRIPTION_TARGETS))' in configuration '$(CONF_NAME)'
 
-MAIN_TARGETS := $(SEQUENTIAL_TARGETS) $(PARALLEL_TARGETS) $(COMPARE_BUILD_MAKE)
-# If building the default target, add what they are to the description.
-DESCRIPTION_TARGETS := $(strip $(MAIN_TARGETS))
-ifeq ($(DESCRIPTION_TARGETS), default)
-  DESCRIPTION_TARGETS += ($(DEFAULT_MAKE_TARGET))
-endif
-TARGET_DESCRIPTION := target$(if $(word 2, $(MAIN_TARGETS)),s) \
-    '$(strip $(DESCRIPTION_TARGETS))' in configuration '$(CONF_NAME)'
+  # MAKEOVERRIDES is automatically set and propagated by Make to sub-Make calls.
+  # We need to clear it of the init-specific variables. The user-specified
+  # variables are explicitly propagated using $(USER_MAKE_VARS).
+  main: MAKEOVERRIDES :=
 
-# MAKEOVERRIDES is automatically set and propagated by Make to sub-Make calls.
-# We need to clear it of the init-specific variables. The user-specified
-# variables are explicitly propagated using $(USER_MAKE_VARS).
-main: MAKEOVERRIDES :=
-
-main: $(INIT_TARGETS)
+  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.
@@ -154,15 +333,14 @@ main: $(INIT_TARGETS)
             # treat it as NOT using jobs at all.
 	    ( cd $(TOPDIR) && \
 	        $(NICE) $(MAKE) $(MAKE_ARGS) $(OUTPUT_SYNC_FLAG) \
-	            $(if $(JOBS), -j $(JOBS)) \
+                    $(if $(JOBS), -j $(JOBS)) \
 	            -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)
@@ -171,35 +349,31 @@ main: $(INIT_TARGETS)
 	  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
 
-on-failure:
+    on-failure:
 	$(call CleanupJavacServer)
 	$(call StopGlobalTimer)
 	$(call ReportBuildTimes)
 	$(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
 
-# Support targets for COMPARE_BUILD, used for makefile development
-pre-compare-build:
+    # Support targets for COMPARE_BUILD, used for makefile development
+    pre-compare-build:
 	$(call WaitForJavacServerFinish)
 	$(call PrepareCompareBuild)
 
-post-compare-build:
+    post-compare-build:
 	$(call WaitForJavacServerFinish)
 	$(call CleanupCompareBuild)
 	$(call CompareBuildDoComparison)
 
-.PHONY: main on-failure pre-compare-build post-compare-build
-
-################################################################################
-
-include MakeFileEnd.gmk
+  .PHONY: print-targets print-modules reconfigure main on-failure
+endif

make/InitSupport.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,114 +23,396 @@
 # questions.
 #
 
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
 ################################################################################
 # This file contains helper functions for Init.gmk.
+# It is divided in two parts, depending on if a SPEC is present or not
+# (HAS_SPEC is true or not).
 ################################################################################
 
-# Define basic logging setup
-BUILD_LOG := $(OUTPUTDIR)/build.log
-BUILD_PROFILE_LOG := $(OUTPUTDIR)/build-profile.log
+ifndef _INITSUPPORT_GMK
+_INITSUPPORT_GMK := 1
 
-BUILD_LOG_PIPE := > >($(TEE) -a $(BUILD_LOG)) 2> >($(TEE) -a $(BUILD_LOG) >&2) && wait
-# Use this for simple echo/printf commands that are never expected to print
-# to stderr.
-BUILD_LOG_PIPE_SIMPLE := | $(TEE) -a $(BUILD_LOG)
+ifeq ($(HAS_SPEC), )
 
-# Setup the build environment to match the requested specification on
-# level of reproducible builds
-define SetupReproducibleBuild
-  ifeq ($$(SOURCE_DATE), updated)
-    # For static values of SOURCE_DATE (not "updated"), these are set in spec.gmk
-    export SOURCE_DATE_EPOCH := $$(shell $$(DATE) +"%s")
-    export SOURCE_DATE_ISO_8601 := $$(call EpochToISO8601, $$(SOURCE_DATE_EPOCH))
+  # 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
-endef
 
-# Parse COMPARE_BUILD into COMPARE_BUILD_*
-# Syntax: COMPARE_BUILD=CONF=<configure options>:PATCH=<patch file>:
-#         MAKE=<make targets>:COMP_OPTS=<compare script options>:
-#         COMP_DIR=<compare script base dir>|<default>:
-#         FAIL=<bool>
-# If neither CONF or PATCH is given, assume <default> means CONF if it
-# begins with "--", otherwise assume it means PATCH.
-# MAKE and COMP_OPTS can only be used with CONF and/or PATCH specified.
-# If any value contains "+", it will be replaced by space.
-# 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_FAIL := true
+  ##############################################################################
+  # Helper functions for the initial part of Init.gmk, before the spec file is
+  # loaded. Most of these functions provide parsing and setting up make options
+  # from the command-line.
+  ##############################################################################
 
-    ifneq ($$(findstring :, $$(COMPARE_BUILD)), )
-      $$(foreach part, $$(subst :, , $$(COMPARE_BUILD)), \
-        $$(if $$(filter PATCH=%, $$(part)), \
-          $$(eval COMPARE_BUILD_PATCH = $$(strip $$(patsubst PATCH=%, %, $$(part)))) \
-        ) \
-        $$(if $$(filter CONF=%, $$(part)), \
-          $$(eval COMPARE_BUILD_CONF = $$(strip $$(subst +, , $$(patsubst CONF=%, %, $$(part))))) \
-        ) \
-        $$(if $$(filter MAKE=%, $$(part)), \
-          $$(eval COMPARE_BUILD_MAKE = $$(strip $$(subst +, , $$(patsubst MAKE=%, %, $$(part))))) \
-        ) \
-        $$(if $$(filter COMP_OPTS=%, $$(part)), \
-          $$(eval COMPARE_BUILD_COMP_OPTS = $$(strip $$(subst +, , $$(patsubst COMP_OPTS=%, %, $$(part))))) \
-        ) \
-        $$(if $$(filter COMP_DIR=%, $$(part)), \
-          $$(eval COMPARE_BUILD_COMP_DIR = $$(strip $$(subst +, , $$(patsubst COMP_DIR=%, %, $$(part))))) \
-        ) \
-        $$(if $$(filter FAIL=%, $$(part)), \
-          $$(eval COMPARE_BUILD_FAIL = $$(strip $$(subst +, , $$(patsubst FAIL=%, %, $$(part))))) \
-        ) \
-        $$(if $$(filter NODRYRUN=%, $$(part)), \
-          $$(eval COMPARE_BUILD_NODRYRUN = $$(strip $$(subst +, , $$(patsubst NODRYRUN=%, %, $$(part))))) \
-        ) \
-      )
-    else
-      # Separate handling for single field case, to allow for spaces in values.
-      ifneq ($$(filter PATCH=%, $$(COMPARE_BUILD)), )
-        COMPARE_BUILD_PATCH = $$(strip $$(patsubst PATCH=%, %, $$(COMPARE_BUILD)))
-      else ifneq ($$(filter CONF=%, $$(COMPARE_BUILD)), )
-        COMPARE_BUILD_CONF = $$(strip $$(subst +, , $$(patsubst CONF=%, %, $$(COMPARE_BUILD))))
-      else ifneq ($$(filter --%, $$(COMPARE_BUILD)), )
-        # Assume CONF if value begins with --
-        COMPARE_BUILD_CONF = $$(strip $$(subst +, , $$(COMPARE_BUILD)))
+  # Make control variables, handled by Init.gmk
+  INIT_CONTROL_VARIABLES += LOG CONF CONF_NAME SPEC JOBS TEST_JOBS CONF_CHECK \
+      COMPARE_BUILD JTREG GTEST MICRO TEST_OPTS TEST_VM_OPTS TEST_DEPS
+
+  # All known make control variables
+  MAKE_CONTROL_VARIABLES := $(INIT_CONTROL_VARIABLES) TEST JDK_FILTER SPEC_FILTER
+
+  # Define a simple reverse function.
+  # Should maybe move to MakeBase.gmk, but we can't include that file now.
+  reverse = \
+      $(if $(strip $(1)), $(call reverse, $(wordlist 2, $(words $(1)), $(1)))) \
+          $(firstword $(1))
+
+  # The variable MAKEOVERRIDES contains variable assignments from the command
+  # line, but in reverse order to what the user entered.
+  # The '§' <=> '\ 'dance is needed to keep values with space in them connected.
+  COMMAND_LINE_VARIABLES := $(subst §,\ , $(call reverse, $(subst \ ,§,$(MAKEOVERRIDES))))
+
+  # A list like FOO="val1" BAR="val2" containing all user-supplied make
+  # variables that we should propagate.
+  # The '§' <=> '\ 'dance is needed to keep values with space in them connected.
+  USER_MAKE_VARS := $(subst §,\ , $(filter-out $(addsuffix =%, $(INIT_CONTROL_VARIABLES)), \
+      $(subst \ ,§,$(MAKEOVERRIDES))))
+
+  # Setup information about available configurations, if any.
+  ifneq ($(CUSTOM_ROOT), )
+    build_dir = $(CUSTOM_ROOT)/build
+  else
+    build_dir = $(topdir)/build
+  endif
+  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)))
+
+  # Check for unknown command-line variables
+  define CheckControlVariables
+    command_line_variables := $$(strip $$(foreach var, \
+        $$(subst \ ,_,$$(MAKEOVERRIDES)), \
+        $$(firstword $$(subst =, , $$(var)))))
+    unknown_command_line_variables := $$(strip \
+        $$(filter-out $$(MAKE_CONTROL_VARIABLES), $$(command_line_variables)))
+    ifneq ($$(unknown_command_line_variables), )
+      $$(info Note: Command line contains non-control variables:)
+      $$(foreach var, $$(unknown_command_line_variables), $$(info * $$(var)=$$($$(var))))
+      $$(info Make sure it is not mistyped, and that you intend to override this variable.)
+      $$(info 'make help' will list known control variables.)
+      $$(info )
+    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/Init.gmk: .FORCE
+	$$(if $$(findstring --jobserver, $$(MAKEFLAGS)), \
+	    $$(info Error: 'make -jN' is not supported, use 'make JOBS=N') \
+	    $$(error Cannot continue) \
+	)
+    .FORCE:
+    .PHONY: .FORCE
+  endef
+
+  # Check that the CONF_CHECK option is valid and set up handling
+  define ParseConfCheckOption
+    ifeq ($$(CONF_CHECK), )
+      # Default behavior is fail
+      CONF_CHECK := fail
+    else ifneq ($$(filter-out auto fail ignore, $$(CONF_CHECK)), )
+      $$(info Error: CONF_CHECK must be one of: auto, fail or ignore.)
+      $$(error Cannot continue)
+    endif
+  endef
+
+  define ParseConfAndSpec
+    ifneq ($$(origin SPEC), undefined)
+      # We have been given a SPEC, check that it works out properly
+      ifneq ($$(origin CONF), undefined)
+        # We also have a CONF argument. We can't have both.
+        $$(info Error: Cannot use CONF=$$(CONF) and SPEC=$$(SPEC) at the same time. Choose one.)
+        $$(error Cannot continue)
+      endif
+      ifneq ($$(origin CONF_NAME), undefined)
+        # We also have a CONF_NAME argument. We can't have both.
+        $$(info Error: Cannot use CONF_NAME=$$(CONF_NAME) and SPEC=$$(SPEC) at the same time. Choose one.)
+        $$(error Cannot continue)
+      endif
+      ifeq ($$(wildcard $$(SPEC)), )
+        $$(info Error: Cannot locate spec.gmk, given by SPEC=$$(SPEC).)
+        $$(error Cannot continue)
+      endif
+      ifeq ($$(filter /%, $$(SPEC)), )
+        # If given with relative path, make it absolute
+        SPECS := $$(CURDIR)/$$(strip $$(SPEC))
       else
-        # Otherwise assume patch file
-        COMPARE_BUILD_PATCH = $$(strip $$(COMPARE_BUILD))
+        SPECS := $$(SPEC)
+      endif
+
+      # For now, unset this SPEC variable.
+      override SPEC :=
+    else
+      # Use spec.gmk files in the build output directory
+      ifeq ($$(all_spec_files), )
+        ifneq ($(CUSTOM_ROOT), )
+          $$(info Error: No configurations found for $$(CUSTOM_ROOT).)
+        else
+          $$(info Error: No configurations found for $$(topdir).)
+        endif
+        $$(info Please run 'bash configure' to create a configuration.)
+        $$(info )
+        $$(error Cannot continue)
+      endif
+
+      ifneq ($$(origin CONF_NAME), undefined)
+        ifneq ($$(origin CONF), undefined)
+          # We also have a CONF argument. We can't have both.
+          $$(info Error: Cannot use CONF=$$(CONF) and CONF_NAME=$$(CONF_NAME) at the same time. Choose one.)
+          $$(error Cannot continue)
+        endif
+        matching_conf := $$(strip $$(filter $$(CONF_NAME), $$(all_confs)))
+        ifeq ($$(matching_conf), )
+          $$(info Error: No configurations found matching CONF_NAME=$$(CONF_NAME).)
+          $$(info Available configurations in $$(build_dir):)
+          $$(foreach var, $$(all_confs), $$(info * $$(var)))
+          $$(error Cannot continue)
+        else ifneq ($$(words $$(matching_conf)), 1)
+          $$(info Error: Matching more than one configuration CONF_NAME=$$(CONF_NAME).)
+          $$(info Available configurations in $$(build_dir):)
+          $$(foreach var, $$(all_confs), $$(info * $$(var)))
+          $$(error Cannot continue)
+        else
+          $$(info Building configuration '$$(matching_conf)' (matching CONF_NAME=$$(CONF_NAME)))
+        endif
+        # Create a SPEC definition. This will contain the path to exactly one spec file.
+        SPECS := $$(build_dir)/$$(matching_conf)/spec.gmk
+      else ifneq ($$(origin CONF), undefined)
+        # User have given a CONF= argument.
+        ifeq ($$(CONF), )
+          # If given CONF=, match all configurations
+          matching_confs := $$(strip $$(all_confs))
+        else
+          # Otherwise select those that contain the given CONF string
+          ifeq ($$(patsubst !%,,$$(CONF)), )
+            # A CONF starting with ! means we should negate the search term
+            matching_confs := $$(strip $$(foreach var, $$(all_confs), \
+                $$(if $$(findstring $$(subst !,,$$(CONF)), $$(var)), ,$$(var))))
+          else
+            matching_confs := $$(strip $$(foreach var, $$(all_confs), \
+                $$(if $$(findstring $$(CONF), $$(var)), $$(var))))
+          endif
+          ifneq ($$(filter $$(CONF), $$(matching_confs)), )
+            # If we found an exact match, use that
+            matching_confs := $$(CONF)
+            # Don't repeat this output on make restarts caused by including
+            # generated files.
+            ifeq ($$(MAKE_RESTARTS), )
+              $$(info Using exact match for CONF=$$(CONF) (other matches are possible))
+            endif
+          endif
+        endif
+        ifeq ($$(matching_confs), )
+          $$(info Error: No configurations found matching CONF=$$(CONF).)
+          $$(info Available configurations in $$(build_dir):)
+          $$(foreach var, $$(all_confs), $$(info * $$(var)))
+          $$(error Cannot continue)
+        else
+          # Don't repeat this output on make restarts caused by including
+          # generated files.
+          ifeq ($$(MAKE_RESTARTS), )
+            ifeq ($$(words $$(matching_confs)), 1)
+              ifneq ($$(findstring $$(LOG_LEVEL), info debug trace), )
+                $$(info Building configuration '$$(matching_confs)' (matching CONF=$$(CONF)))
+              endif
+            else
+              $$(info Building these configurations (matching CONF=$$(CONF)):)
+              $$(foreach var, $$(matching_confs), $$(info * $$(var)))
+            endif
+          endif
+        endif
+
+        # Create a SPEC definition. This will contain the path to one or more spec.gmk files.
+        SPECS := $$(addsuffix /spec.gmk, $$(addprefix $$(build_dir)/, $$(matching_confs)))
+      else
+        # No CONF or SPEC given, check the available configurations
+        ifneq ($$(words $$(all_spec_files)), 1)
+          $$(info Error: No CONF given, but more than one configuration found.)
+          $$(info Available configurations in $$(build_dir):)
+          $$(foreach var, $$(all_confs), $$(info * $$(var)))
+          $$(info Please retry building with CONF=<config pattern> (or SPEC=<spec file>).)
+          $$(info )
+          $$(error Cannot continue)
+        endif
+
+        # We found exactly one configuration, use it
+        SPECS := $$(strip $$(all_spec_files))
       endif
     endif
-    ifneq ($$(COMPARE_BUILD_PATCH), )
-      ifneq ($$(wildcard $$(WORKSPACE_ROOT)/$$(COMPARE_BUILD_PATCH)), )
-        # Assume relative path, if file exists
-        COMPARE_BUILD_PATCH := $$(wildcard $$(WORKSPACE_ROOT)/$$(COMPARE_BUILD_PATCH))
-      else ifeq ($$(wildcard $$(COMPARE_BUILD_PATCH)), )
-        $$(error Patch file $$(COMPARE_BUILD_PATCH) does not exist)
+  endef
+
+  # Extract main targets from Main.gmk using the spec provided in $2.
+  #
+  # Param 1: FORCE = force generation of main-targets.gmk or LAZY = do not force.
+  # Param 2: The SPEC file to use.
+  define DefineMainTargets
+
+    # 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 $(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.
+      ifeq ($(strip $1), FORCE)
+        $$(shell rm -f $$(main_targets_file))
       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)
-        ifeq ($$(PATCH_DRY_RUN), FAILED)
-          $$(error Patch file $$(COMPARE_BUILD_PATCH) does not apply cleanly)
+    endif
+
+    $$(main_targets_file):
+	@( 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 )
+
+    # Now include main-targets.gmk. This will define ALL_MAIN_TARGETS.
+    -include $$(main_targets_file)
+  endef
+
+  define PrintConfCheckFailed
+	@echo ' '
+	@echo "Please rerun configure! Easiest way to do this is by running"
+	@echo "'make reconfigure'."
+	@echo "This behavior may also be changed using CONF_CHECK=<ignore|auto>."
+	@echo ' '
+  endef
+
+else # $(HAS_SPEC)=true
+  ##############################################################################
+  # Helper functions for the 'main' target. These functions assume a single,
+  # proper and existing SPEC is included.
+  ##############################################################################
+
+  include $(TOPDIR)/make/common/MakeBase.gmk
+
+  # Define basic logging setup
+  BUILD_LOG := $(OUTPUTDIR)/build.log
+  BUILD_PROFILE_LOG := $(OUTPUTDIR)/build-profile.log
+
+  BUILD_LOG_PIPE := > >($(TEE) -a $(BUILD_LOG)) 2> >($(TEE) -a $(BUILD_LOG) >&2) && wait
+  # Use this for simple echo/printf commands that are never expected to print
+  # 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
+    ifeq ($$(SOURCE_DATE), updated)
+      # For static values of SOURCE_DATE (not "updated"), these are set in spec.gmk
+      export SOURCE_DATE_EPOCH := $$(shell $$(DATE) +"%s")
+      export SOURCE_DATE_ISO_8601 := $$(call EpochToISO8601, $$(SOURCE_DATE_EPOCH))
+    endif
+  endef
+
+  # Parse COMPARE_BUILD into COMPARE_BUILD_*
+  # Syntax: COMPARE_BUILD=CONF=<configure options>:PATCH=<patch file>:
+  #         MAKE=<make targets>:COMP_OPTS=<compare script options>:
+  #         COMP_DIR=<compare script base dir>|<default>:
+  #         FAIL=<bool>
+  # If neither CONF or PATCH is given, assume <default> means CONF if it
+  # begins with "--", otherwise assume it means PATCH.
+  # MAKE and COMP_OPTS can only be used with CONF and/or PATCH specified.
+  # If any value contains "+", it will be replaced by space.
+  # FAIL can be set to false to have the return value of compare be ignored.
+  define ParseCompareBuild
+    ifneq ($$(COMPARE_BUILD), )
+      COMPARE_BUILD_OUTPUTDIR := $(topdir)/build/compare-build/$(CONF_NAME)
+      COMPARE_BUILD_FAIL := true
+
+      ifneq ($$(findstring :, $$(COMPARE_BUILD)), )
+        $$(foreach part, $$(subst :, , $$(COMPARE_BUILD)), \
+          $$(if $$(filter PATCH=%, $$(part)), \
+            $$(eval COMPARE_BUILD_PATCH = $$(strip $$(patsubst PATCH=%, %, $$(part)))) \
+          ) \
+          $$(if $$(filter CONF=%, $$(part)), \
+            $$(eval COMPARE_BUILD_CONF = $$(strip $$(subst +, , $$(patsubst CONF=%, %, $$(part))))) \
+          ) \
+          $$(if $$(filter MAKE=%, $$(part)), \
+            $$(eval COMPARE_BUILD_MAKE = $$(strip $$(subst +, , $$(patsubst MAKE=%, %, $$(part))))) \
+          ) \
+          $$(if $$(filter COMP_OPTS=%, $$(part)), \
+            $$(eval COMPARE_BUILD_COMP_OPTS = $$(strip $$(subst +, , $$(patsubst COMP_OPTS=%, %, $$(part))))) \
+          ) \
+          $$(if $$(filter COMP_DIR=%, $$(part)), \
+            $$(eval COMPARE_BUILD_COMP_DIR = $$(strip $$(subst +, , $$(patsubst COMP_DIR=%, %, $$(part))))) \
+          ) \
+          $$(if $$(filter FAIL=%, $$(part)), \
+            $$(eval COMPARE_BUILD_FAIL = $$(strip $$(subst +, , $$(patsubst FAIL=%, %, $$(part))))) \
+          ) \
+          $$(if $$(filter NODRYRUN=%, $$(part)), \
+            $$(eval COMPARE_BUILD_NODRYRUN = $$(strip $$(subst +, , $$(patsubst NODRYRUN=%, %, $$(part))))) \
+          ) \
+        )
+      else
+        # Separate handling for single field case, to allow for spaces in values.
+        ifneq ($$(filter PATCH=%, $$(COMPARE_BUILD)), )
+          COMPARE_BUILD_PATCH = $$(strip $$(patsubst PATCH=%, %, $$(COMPARE_BUILD)))
+        else ifneq ($$(filter CONF=%, $$(COMPARE_BUILD)), )
+          COMPARE_BUILD_CONF = $$(strip $$(subst +, , $$(patsubst CONF=%, %, $$(COMPARE_BUILD))))
+        else ifneq ($$(filter --%, $$(COMPARE_BUILD)), )
+          # Assume CONF if value begins with --
+          COMPARE_BUILD_CONF = $$(strip $$(subst +, , $$(COMPARE_BUILD)))
+        else
+          # Otherwise assume patch file
+          COMPARE_BUILD_PATCH = $$(strip $$(COMPARE_BUILD))
         endif
       endif
+      ifneq ($$(COMPARE_BUILD_PATCH), )
+        ifneq ($$(wildcard $$(topdir)/$$(COMPARE_BUILD_PATCH)), )
+          # Assume relative path, if file exists
+          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 $$(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
+        endif
+      endif
+      ifneq ($$(COMPARE_BUILD_FAIL), true)
+        COMPARE_BUILD_IGNORE_RESULT := || true
+      endif
     endif
-    ifneq ($$(COMPARE_BUILD_FAIL), true)
-      COMPARE_BUILD_IGNORE_RESULT := || true
-    endif
-  endif
-endef
+  endef
 
-# Prepare for a comparison rebuild
-define PrepareCompareBuild
+  # Prepare for a comparison rebuild
+  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,23 +422,23 @@ 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))
-endef
+	    $(BASH) $(topdir)/configure $(CONFIGURE_COMMAND_LINE) $(COMPARE_BUILD_CONF))
+  endef
 
-# Cleanup after a compare build
-define CleanupCompareBuild
+  # 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
-endef
+	$(MV) $(topdir)/build/.compare-build-temp/$(CONF_NAME) $(OUTPUTDIR)
+	$(RM) -r $(topdir)/build/.compare-build-temp
+  endef
 
-# Do the actual comparison of two builds
-define CompareBuildDoComparison
+  # Do the actual comparison of two builds
+  define CompareBuildDoComparison
         # Compare first and second build. Ignore any error code from compare.sh.
 	$(ECHO) "Comparing between comparison rebuild (this/new) and baseline (other/old)"
 	$(if $(COMPARE_BUILD_COMP_DIR), \
@@ -166,17 +448,16 @@ define CompareBuildDoComparison
 	  +(cd $(COMPARE_BUILD_OUTPUTDIR) && ./compare.sh --diffs $(COMPARE_BUILD_COMP_OPTS) \
 	      -o $(OUTPUTDIR) $(COMPARE_BUILD_IGNORE_RESULT)) \
 	)
-endef
+  endef
 
-define PrintFailureReports
+  define PrintFailureReports
 	$(if $(filter none, $(LOG_REPORT)), , \
 	  $(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,120 +467,116 @@ 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  \
 	  ) \
 	)
-endef
+  endef
 
-define PrintBuildLogFailures
+  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 \
 	)
-endef
+  endef
 
-define RotateLogFiles
+  define RotateLogFiles
 	$(RM) $(BUILD_LOG).old 2> /dev/null && \
 	$(MV) $(BUILD_LOG) $(BUILD_LOG).old 2> /dev/null || true
 	$(if $(findstring true, $(LOG_PROFILE_TIMES_FILE)), \
 	  $(RM) $(BUILD_PROFILE_LOG).old 2> /dev/null && \
 	  $(MV) $(BUILD_PROFILE_LOG) $(BUILD_PROFILE_LOG).old 2> /dev/null || true \
 	)
-endef
+  endef
 
-# Failure logs are only supported for "parallel" main targets, not the
-# (trivial) sequential make targets (such as clean and reconfigure),
-# since the failure-logs directory creation will conflict with clean.
-# We also make sure the javatmp directory exists, which is needed if a java
-# process (like javac) is using java.io.tmpdir.
-define PrepareFailureLogs
+  # Failure logs are only supported for "parallel" main targets, not the
+  # (trivial) sequential make targets (such as clean and reconfigure),
+  # since the failure-logs directory creation will conflict with clean.
+  # We also make sure the javatmp directory exists, which is needed if a java
+  # process (like javac) is using java.io.tmpdir.
+  define PrepareFailureLogs
 	$(RM) -r $(MAKESUPPORT_OUTPUTDIR)/failure-logs 2> /dev/null && \
 	$(MKDIR) -p $(MAKESUPPORT_OUTPUTDIR)/failure-logs
 	$(MKDIR) -p $(JAVA_TMP_DIR)
 	$(RM) $(MAKESUPPORT_OUTPUTDIR)/exit-with-error 2> /dev/null
-endef
+  endef
 
-# Remove any javac server logs and port files. This
-# prevents a new make run to reuse the previous servers.
-define PrepareJavacServer
+  # Remove any javac server logs and port files. This
+  # prevents a new make run to reuse the previous servers.
+  define PrepareJavacServer
 	$(if $(JAVAC_SERVER_DIR), \
 	  $(RM) -r $(JAVAC_SERVER_DIR) 2> /dev/null && \
 	  $(MKDIR) -p $(JAVAC_SERVER_DIR) \
 	)
-endef
+  endef
 
-define CleanupJavacServer
+  define CleanupJavacServer
 	[ -f $(JAVAC_SERVER_DIR)/server.port ] && $(ECHO) Stopping javac server && \
 	    $(TOUCH) $(JAVAC_SERVER_DIR)/server.port.stop; true
-endef
+  endef
 
-ifeq ($(call isBuildOs, windows), true)
-  # On windows we need to synchronize with the javac server to be able to
-  # move or remove the build output directory. Since we have no proper
-  # synchronization process, wait for a while and hope it helps. This is only
-  # used by build comparisons.
+  ifeq ($(call isBuildOs, windows), true)
+    # On windows we need to synchronize with the javac server to be able to
+    # move or remove the build output directory. Since we have no proper
+    # synchronization process, wait for a while and hope it helps. This is only
+    # used by build comparisons.
     define WaitForJavacServerFinish
 	$(if $(JAVAC_SERVER_DIR), \
 	  sleep 5 \
 	)
-  endef
-else
-  define WaitForJavacServerFinish
-  endef
-endif
+    endef
+  else
+    define WaitForJavacServerFinish
+    endef
+  endif
 
-##############################################################################
-# Functions for timers
-##############################################################################
+  ##############################################################################
+  # Functions for timers
+  ##############################################################################
 
-# Store the build times in this directory.
-BUILDTIMESDIR := $(OUTPUTDIR)/make-support/build-times
+  # Store the build times in this directory.
+  BUILDTIMESDIR = $(OUTPUTDIR)/make-support/build-times
 
-# Record starting time for build of a sub repository.
-define RecordStartTime
+  # Record starting time for build of a sub repository.
+  define RecordStartTime
 	$(DATE) '+%Y %m %d %H %M %S' | $(AWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$(strip $1) && \
 	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$(strip $1)_human_readable
-endef
+  endef
 
-# Record ending time and calculate the difference and store it in a
-# easy to read format. Handles builds that cross midnight. Expects
-# that a build will never take 24 hours or more.
-define RecordEndTime
+  # Record ending time and calculate the difference and store it in a
+  # easy to read format. Handles builds that cross midnight. Expects
+  # that a build will never take 24 hours or more.
+  define RecordEndTime
 	$(DATE) '+%Y %m %d %H %M %S' | $(AWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$(strip $1)
 	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$(strip $1)_human_readable
 	$(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$(strip $1)` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$(strip $1)` $1 | \
 	    $(AWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \
 	    M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \
 	    > $(BUILDTIMESDIR)/build_time_diff_$(strip $1)
-endef
+  endef
 
-define StartGlobalTimer
+  define StartGlobalTimer
 	$(RM) -r $(BUILDTIMESDIR) 2> /dev/null && \
 	$(MKDIR) -p $(BUILDTIMESDIR) && \
 	$(call RecordStartTime,TOTAL)
-endef
+  endef
 
-define StopGlobalTimer
+  define StopGlobalTimer
 	$(call RecordEndTime,TOTAL)
-endef
+  endef
 
-# Find all build_time_* files and print their contents in a list sorted
-# on the name of the sub repository.
-define ReportBuildTimes
+  # Find all build_time_* files and print their contents in a list sorted
+  # on the name of the sub repository.
+  define ReportBuildTimes
 	$(PRINTF) $(LOG_INFO) -- \
 	    "----- Build times -------\nStart %s\nEnd   %s\n%s\n%s\n-------------------------\n" \
 	    "`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
@@ -308,20 +585,119 @@ define ReportBuildTimes
 	    $(XARGS) $(CAT) | $(SORT) -k 2`" \
 	    "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_TOTAL`" \
 	    $(BUILD_LOG_PIPE_SIMPLE)
+  endef
+
+  define ReportProfileTimes
+    $(if $(findstring true, $(LOG_PROFILE_TIMES_LOG)), \
+      [ ! -f $(BUILD_PROFILE_LOG) ] || \
+      { $(ECHO) Begin $(notdir $(BUILD_PROFILE_LOG)) && \
+        $(CAT) $(BUILD_PROFILE_LOG) && \
+        $(ECHO) End $(notdir $(BUILD_PROFILE_LOG)); \
+      } \
+      $(BUILD_LOG_PIPE_SIMPLE)
+    )
+  endef
+
+endif # HAS_SPEC
+
+# Look for a given option in the LOG variable, and if found, set a variable
+# and remove the option from the LOG variable
+# $1: The option to look for
+# $2: The variable to set to "true" if the option is found
+define ParseLogOption
+  ifneq ($$(findstring $1, $$(LOG)), )
+    override $2 := true
+    # First try to remove ",<option>" if it exists, otherwise just remove "<option>"
+    LOG_STRIPPED := $$(subst $1,, $$(subst $$(COMMA)$$(strip $1),, $$(LOG)))
+    # We might have ended up with a leading comma. Remove it. Need override
+    # since LOG is set from the command line.
+    override LOG := $$(strip $$(patsubst $$(COMMA)%, %, $$(LOG_STRIPPED)))
+  endif
 endef
 
-define ReportProfileTimes
-  $(if $(findstring true, $(LOG_PROFILE_TIMES_LOG)), \
-    [ ! -f $(BUILD_PROFILE_LOG) ] || \
-    { $(ECHO) Begin $(notdir $(BUILD_PROFILE_LOG)) && \
-      $(CAT) $(BUILD_PROFILE_LOG) && \
-      $(ECHO) End $(notdir $(BUILD_PROFILE_LOG)); \
-    } \
-    $(BUILD_LOG_PIPE_SIMPLE)
-  )
+# Look for a given option with an assignment in the LOG variable, and if found,
+# set a variable to that value and remove the option from the LOG variable
+# $1: The option to look for
+# $2: The variable to set to the value of the option, if found
+define ParseLogValue
+  ifneq ($$(findstring $1=, $$(LOG)), )
+    # Make words of out comma-separated list and find the one with opt=val
+    value := $$(strip $$(subst $$(strip $1)=,, $$(filter $$(strip $1)=%, $$(subst $$(COMMA), , $$(LOG)))))
+    override $2 := $$(value)
+    # First try to remove ",<option>" if it exists, otherwise just remove "<option>"
+    LOG_STRIPPED := $$(subst $$(strip $1)=$$(value),, \
+        $$(subst $$(COMMA)$$(strip $1)=$$(value),, $$(LOG)))
+    # We might have ended up with a leading comma. Remove it. Need override
+    # since LOG is set from the command line.
+    override LOG := $$(strip $$(patsubst $$(COMMA)%, %, $$(LOG_STRIPPED)))
+  endif
 endef
 
-################################################################################
 
-endif # include guard
-include MakeIncludeEnd.gmk
+define ParseLogLevel
+  # Catch old-style VERBOSE= command lines.
+  ifneq ($$(origin VERBOSE), undefined)
+    $$(info Error: VERBOSE is deprecated. Use LOG=<warn|info|debug|trace> instead.)
+    $$(error Cannot continue)
+  endif
+
+  # Setup logging according to LOG
+
+  # If "nofile" is present, do not log to a file
+  $$(eval $$(call ParseLogOption, nofile, LOG_NOFILE))
+
+  # If "cmdline" is present, print all executes "important" command lines.
+  $$(eval $$(call ParseLogOption, cmdlines, LOG_CMDLINES))
+
+  # If "report" is present, use non-standard reporting options at build failure.
+  $$(eval $$(call ParseLogValue, report, LOG_REPORT))
+  ifneq ($$(LOG_REPORT), )
+    ifeq ($$(filter $$(LOG_REPORT), none all default), )
+      $$(info Error: LOG=report has invalid value: $$(LOG_REPORT).)
+      $$(info Valid values: LOG=report=<none>|<all>|<default>)
+      $$(error Cannot continue)
+    endif
+  endif
+
+  # If "profile-to-log" is present, write shell times in build log
+  $$(eval $$(call ParseLogOption, profile-to-log, LOG_PROFILE_TIMES_LOG))
+
+  # If "profile" is present, write shell times in separate log file
+  # IMPORTANT: $(ParseLogOption profile-to-log) should go first. Otherwise
+  # parsing of 'LOG=debug,profile-to-log,nofile' ends up in the following error:
+  # Error: LOG contains unknown option or log level: debug-to-log.
+  $$(eval $$(call ParseLogOption, profile, LOG_PROFILE_TIMES_FILE))
+
+  # Treat LOG=profile-to-log as if it were LOG=profile,profile-to-log
+  LOG_PROFILE_TIMES_FILE := $$(firstword $$(LOG_PROFILE_TIMES_FILE) $$(LOG_PROFILE_TIMES_LOG))
+
+  override LOG_LEVEL := $$(LOG)
+
+  ifeq ($$(LOG_LEVEL), )
+    # Set LOG to "warn" as default if not set
+    override LOG_LEVEL := warn
+  endif
+
+  ifeq ($$(LOG_LEVEL), warn)
+    override MAKE_LOG_FLAGS := -s
+  else ifeq ($$(LOG_LEVEL), info)
+    override MAKE_LOG_FLAGS := -s
+  else ifeq ($$(LOG_LEVEL), debug)
+    override MAKE_LOG_FLAGS :=
+  else ifeq ($$(LOG_LEVEL), trace)
+    override MAKE_LOG_FLAGS :=
+  else
+    $$(info Error: LOG contains unknown option or log level: $$(LOG).)
+    $$(info LOG can be <level>[,<opt>[...]] where <opt> is nofile | cmdlines | profile | profile-to-log)
+    $$(info and <level> is warn | info | debug | trace)
+    $$(error Cannot continue)
+  endif
+endef
+
+MAKE_LOG_VARS = $(foreach v, \
+    LOG_LEVEL LOG_NOFILE LOG_CMDLINES LOG_REPORT LOG_PROFILE_TIMES_LOG \
+    LOG_PROFILE_TIMES_FILE, \
+    $v=$($v) \
+)
+
+endif # _INITSUPPORT_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/JrtfsJar.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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,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, 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,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

@@ -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
@@ -24,35 +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 :=
+ifeq ($(wildcard $(SPEC)), )
+  $(error Main.gmk needs SPEC set to a proper spec.gmk)
+endif
 
-DEFAULT_TARGET := default-target
+# Now load the spec
+include $(SPEC)
 
-include MakeFileStart.gmk
-
-################################################################################
+# 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
 
-include FindTests.gmk
-include Modules.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.
@@ -347,14 +356,6 @@ $(eval $(call SetupTarget, vscode-project-ccls, \
     DEPS := compile-commands, \
 ))
 
-################################################################################
-# IDEA IntelliJ projects
-
-$(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)", \
-))
-
 ################################################################################
 # Build demos targets
 
@@ -453,18 +454,6 @@ $(eval $(call SetupTarget, symbols-image, \
     TARGET := symbols, \
 ))
 
-$(eval $(call SetupTarget, static-launcher, \
-    MAKEFILE := StaticLibs, \
-    TARGET := static-launcher, \
-    DEPS := hotspot-static-libs static-libs, \
-))
-
-$(eval $(call SetupTarget, static-jdk-image, \
-    MAKEFILE := StaticLibs, \
-    TARGET := static-jdk-image, \
-    DEPS := static-exploded-image jdk-image, \
-))
-
 $(eval $(call SetupTarget, static-libs-image, \
     MAKEFILE := StaticLibsImage, \
     TARGET := static-libs-image, \
@@ -753,17 +742,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, \
@@ -1108,9 +1086,9 @@ else
 
   symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS)
 
-  static-libs-image: hotspot-static-libs static-libs
+  static-libs-image: hotspot-static-libs $(STATIC_LIBS_TARGETS)
 
-  static-libs-graal-image: static-libs
+  static-libs-graal-image: $(STATIC_LIBS_TARGETS)
 
   bootcycle-images: jdk-image
 
@@ -1276,8 +1254,6 @@ ifeq ($(call isTargetOs, macosx), true)
   legacy-images: mac-legacy-jre-bundle
 endif
 
-static-exploded-image: static-launcher exploded-image
-
 # These targets build the various documentation images
 docs-jdk-image: docs-jdk
 docs-javase-image: docs-javase
@@ -1292,8 +1268,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
@@ -1321,7 +1296,7 @@ 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
 
 # all-bundles packages all our deliverables as tar.gz bundles.
 all-bundles: product-bundles test-bundles docs-bundles static-libs-bundles
@@ -1334,7 +1309,7 @@ ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-static-libs \
     create-buildjdk docs-jdk-api docs-javase-api docs-reference-api docs-jdk \
     docs-javase docs-reference docs-javadoc mac-bundles product-images legacy-images \
     docs-image docs-javase-image docs-reference-image all-docs-images \
-    docs-bundles all-docs-bundles test-image all-images static-exploded-image \
+    docs-bundles all-docs-bundles test-image all-images \
     all-bundles
 
 ################################################################################
@@ -1342,7 +1317,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
@@ -1369,14 +1344,11 @@ test-hotspot-jtreg-native: test-hotspot_native_sanity
 test-hotspot-gtest: exploded-test-gtest
 test-jdk-jtreg-native: test-jdk_native_sanity
 
-# Set dependencies for doc tests
-$(eval $(call AddTestDependency, docs_all, docs-jdk))
-test-docs: test-docs_all
-
 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
+    test-jdk-jtreg-native
 
+################################################################################
 ################################################################################
 #
 # Clean targets
@@ -1482,7 +1454,6 @@ print-tests:
 
 create-main-targets-include:
 	  $(call LogInfo, Generating main target list)
-	  $(call MakeDir, $(MAKESUPPORT_OUTPUTDIR))
 	  @$(ECHO) ALL_MAIN_TARGETS := $(sort $(ALL_TARGETS)) > \
 	      $(MAKESUPPORT_OUTPUTDIR)/main-targets.gmk
 
@@ -1494,8 +1465,10 @@ $(eval $(call SetupTarget, jbr-api, \
     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, 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,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.
 #
@@ -57,77 +57,77 @@ define SetupTargetBody
 endef
 
 define CleanDocs
-	@$(ECHO) -n "Cleaning docs ..."
-	@$(ECHO) "" $(LOG_DEBUG)
+	@$(PRINTF) "Cleaning docs ..."
+	@$(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
-	@$(ECHO) -n "Cleaning $(strip $1) build artifacts ..."
-	@$(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
-	@$(ECHO) -n "Cleaning$(strip $1) build artifacts ..."
-	@$(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
-	@$(ECHO) -n "Cleaning $(strip $1) make support artifacts ..."
-	@$(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
-	@$(ECHO) -n "Cleaning test $(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
-	@$(ECHO) -n "Cleaning gensrc $(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
-	@$(ECHO) -n "Cleaning java $(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"
-	$(ECHO) -n "Cleaning headers $(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
-	@$(ECHO) -n "Cleaning native $(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
-	@$(ECHO) -n "Cleaning include $(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
@@ -137,15 +137,6 @@ define CleanModule
   $(call Clean-include, $1)
 endef
 
-define AddTestDependency
-  test-$(strip $1): $2
-
-  exploded-test-$(strip $1): $2
-
-  ifneq ($(filter $(TEST), $1), )
-    TEST_DEPS += $2
-  endif
-endef
 
 ################################################################################
 
@@ -218,5 +209,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, 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,46 +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
-
-ifeq ($(MAKEFILE_PREFIX), Lib)
-  # We need to keep track of what libraries are generated/needed by this
-  # module. This information is required when doing static linking, to know
-  # which static library files to include. The variable $(MODULE)_INCLUDED_LIBS is
-  # added to for each call to SetupJdkLibrary. The file module-included-libs.txt is then
-  # read in StaticLibs.gmk.
-  ifneq ($($(MODULE)_INCLUDED_LIBS), )
-    LIBLIST := $(SUPPORT_OUTPUTDIR)/modules_static-libs/$(MODULE)/module-included-libs.txt
-
-    $(LIBLIST): $(TARGETS)
-	$(call MakeDir, $(@D))
-	$(ECHO) $($(MODULE)_INCLUDED_LIBS) > $@
-
-    TARGETS += $(LIBLIST)
-  endif
-endif
+include $(MAKEFILE_PREFIX).gmk
 
 # Setup copy rules from the modules directories to the jdk image directory.
 ifeq ($(call isTargetOs, windows), true)
@@ -130,12 +111,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

@@ -1,223 +0,0 @@
-#
-# Copyright (c) 2012, 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.
-#
-
-################################################################################
-# This file is the earliest part of the build bootstrap process (not counting
-# Makefile that includes it). Its main responsibility is to figure out what
-# configuration to use and pick up the corresponding SPEC file. It will then
-# call Init.gmk with this SPEC for further bootstrapping.
-################################################################################
-
-# 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:
-
-IS_PREINIT_ENV := true
-
-# Include our helper functions.
-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
-
-# CALLED_TARGETS is the list of targets that the user provided,
-# or "default" if unspecified.
-CALLED_TARGETS := $(if $(MAKECMDGOALS), $(MAKECMDGOALS), default)
-
-# Extract non-global targets that require a spec file.
-CALLED_SPEC_TARGETS := $(filter-out $(ALL_GLOBAL_TARGETS), $(CALLED_TARGETS))
-
-# If we have only global targets, or if we are called with -qp (assuming an
-# external part, e.g. bash completion, is trying to understand our targets),
-# we will skip SPEC location and the sanity checks.
-ifeq ($(CALLED_SPEC_TARGETS), )
-  SKIP_SPEC := true
-endif
-ifeq ($(findstring p, $(MAKEFLAGS))$(findstring q, $(MAKEFLAGS)), pq)
-  SKIP_SPEC := true
-endif
-
-ifneq ($(SKIP_SPEC), true)
-
-  ############################################################################
-  # This is the common case: we have been called from the command line by the
-  # user with a target that should be delegated to Main.gmk, so we need to
-  # figure out a proper SPEC and call Init.gmk with it.
-  ############################################################################
-
-  # Basic checks on environment and command line.
-  $(eval $(call CheckControlVariables))
-  $(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.
-  $(eval $(call ParseLogLevel))
-
-  # After this SPECS contain 1..N spec files (otherwise ParseConfAndSpec fails).
-  $(eval $(call ParseConfAndSpec))
-
-  # Extract main targets from Main.gmk using the spec(s) provided. In theory,
-  # with multiple specs, we should find the intersection of targets provided
-  # by all specs, but we approximate this by an arbitrary spec from the list.
-  # This will setup ALL_MAIN_TARGETS.
-  $(eval $(call DefineMainTargets, FORCE, $(firstword $(SPECS))))
-
-  # 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/*) \
-          $(if $(CUSTOM_CONFIG_DIR), $(wildcard $(CUSTOM_CONFIG_DIR)/*)) \
-          $(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
-      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 )
-      else ifeq ($(CONF_CHECK), ignore)
-        # Do nothing
-      endif
-
-  # Do not let make delete spec files even if aborted while doing a reconfigure
-  .PRECIOUS: $(SPECS)
-
-  # Unless reconfigure is explicitly called, let all main targets depend on
-  # the spec files to be up to date.
-  ifeq ($(findstring reconfigure, $(INIT_TARGETS)), )
-    $(MAIN_TARGETS): $(SPECS)
-  endif
-
-  make-info:
-      ifneq ($(findstring $(LOG_LEVEL), info debug trace), )
-	  $(info Running make as '$(strip $(MAKE) $(MFLAGS) \
-	      $(COMMAND_LINE_VARIABLES) $(MAKECMDGOALS))')
-      endif
-
-  MAKE_INIT_MAIN_TARGET_ARGS := \
-      USER_MAKE_VARS="$(USER_MAKE_VARS)" MAKE_LOG_FLAGS=$(MAKE_LOG_FLAGS) \
-      $(MAKE_LOG_VARS) \
-      INIT_TARGETS="$(INIT_TARGETS)" \
-      SEQUENTIAL_TARGETS="$(SEQUENTIAL_TARGETS)" \
-      PARALLEL_TARGETS="$(PARALLEL_TARGETS)"
-
-  # Now the init and main targets will be called, once for each SPEC. The
-  # recipe will be run once for every target specified, but we only want to
-  # execute the recipe a single time, hence the TARGET_DONE with a dummy
-  # command if true.
-  # The COMPARE_BUILD part implements special support for makefile development.
-  $(ALL_INIT_TARGETS) $(ALL_MAIN_TARGETS): make-info
-	@$(if $(TARGET_DONE), \
-	  true \
-	, \
-	  ( cd $(TOPDIR) && \
-	  $(foreach spec, $(SPECS), \
-	    $(MAKE) $(MAKE_INIT_ARGS) -j 1 -f $(TOPDIR)/make/Init.gmk \
-	        SPEC=$(spec) $(MAKE_INIT_MAIN_TARGET_ARGS) \
-	        main && \
-	    $(if $(and $(COMPARE_BUILD), $(PARALLEL_TARGETS)), \
-	      $(MAKE) $(MAKE_INIT_ARGS) -f $(TOPDIR)/make/Init.gmk \
-	          SPEC=$(spec) \
-	          COMPARE_BUILD="$(COMPARE_BUILD)" \
-	          pre-compare-build && \
-	      $(MAKE) $(MAKE_INIT_ARGS) -j 1 -f $(TOPDIR)/make/Init.gmk \
-	          SPEC=$(spec) $(MAKE_INIT_MAIN_TARGET_ARGS) \
-	          COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" \
-	          main && \
-	      $(MAKE) $(MAKE_INIT_ARGS) -f $(TOPDIR)/make/Init.gmk \
-	          SPEC=$(spec) \
-	          COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" \
-	          post-compare-build && \
-	    ) \
-	  ) true ) \
-	  $(eval TARGET_DONE=true) \
-	)
-
-  .PHONY: $(ALL_MAIN_TARGETS) $(ALL_INIT_TARGETS)
-
-else # SKIP_SPEC=true
-
-  ############################################################################
-  # We have only global targets, or are called with -pq (from command
-  # completion). In this case we might not even have a configuration at all, but
-  # still need to handle the situation gracefully even if there is no SPEC file.
-  ############################################################################
-
-  ifeq ($(wildcard $(SPEC)), )
-    # If we have no SPEC provided, we will just make a "best effort" target list.
-    # First try to grab any available pre-existing main-targets.gmk.
-    main_targets_file := $(firstword $(wildcard $(build_dir)/*/make-support/main-targets.gmk))
-    ifneq ($(main_targets_file), )
-      # Extract the SPEC that corresponds to this main-targets.gmk file.
-      SPEC := $(patsubst %/make-support/main-targets.gmk, %/spec.gmk, $(main_targets_file))
-    else
-      # None found, pick an arbitrary SPEC for which to generate a file
-      SPEC := $(firstword $(all_spec_files))
-    endif
-  endif
-
-  ifneq ($(wildcard $(SPEC)), )
-    $(eval $(call DefineMainTargets, LAZY, $(SPEC)))
-  else
-    # If we have no configurations we can not provide any main targets.
-    ALL_MAIN_TARGETS :=
-  endif
-
-  ALL_TARGETS := $(sort $(ALL_GLOBAL_TARGETS) $(ALL_MAIN_TARGETS) $(ALL_INIT_TARGETS))
-
-  # Just list all our targets.
-  $(ALL_TARGETS):
-
-  .PHONY: $(ALL_TARGETS)
-
-endif # $(SKIP_SPEC)!=true
-
-################################################################################

make/PreInitSupport.gmk

@@ -1,290 +0,0 @@
-#
-# Copyright (c) 2011, 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.
-#
-
-################################################################################
-# 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 := ,
-
-# 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
-
-# All known make control variables; these are handled in other makefiles
-MAKE_CONTROL_VARIABLES += JDK_FILTER SPEC_FILTER \
-    TEST TEST_JOBS JTREG GTEST MICRO TEST_OPTS TEST_VM_OPTS TEST_DEPS
-
-ALL_CONTROL_VARIABLES := $(INIT_CONTROL_VARIABLES) $(MAKE_CONTROL_VARIABLES)
-
-# Define a simple reverse function.
-# Should maybe move to MakeBase.gmk, but we can't include that file now.
-reverse = \
-    $(if $(strip $(1)), $(call reverse, $(wordlist 2, $(words $(1)), $(1)))) \
-        $(firstword $(1))
-
-# The variable MAKEOVERRIDES contains variable assignments from the command
-# line, but in reverse order to what the user entered.
-# The '§' <=> '\ 'dance is needed to keep values with space in them connected.
-COMMAND_LINE_VARIABLES := $(subst §,\ , $(call reverse, $(subst \ ,§,$(MAKEOVERRIDES))))
-
-# A list like FOO="val1" BAR="val2" containing all user-supplied make
-# variables that we should propagate.
-# The '§' <=> '\ 'dance is needed to keep values with space in them connected.
-# This explicit propagation is needed to avoid problems with characters that needs
-# escaping.
-USER_MAKE_VARS := $(subst §,\ , $(filter-out $(addsuffix =%, $(ALL_CONTROL_VARIABLES)), \
-    $(subst \ ,§,$(MAKEOVERRIDES))))
-
-# Setup information about available configurations, if any.
-ifneq ($(CUSTOM_ROOT), )
-  build_dir := $(CUSTOM_ROOT)/build
-else
-  build_dir := $(TOPDIR)/build
-endif
-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)))
-
-# Check for unknown command-line variables
-define CheckControlVariables
-  command_line_variables := $$(strip $$(foreach var, \
-      $$(subst \ ,_,$$(MAKEOVERRIDES)), \
-      $$(firstword $$(subst =, , $$(var)))))
-  allowed_command_line_variables := $$(strip $$(subst $$(COMMA), , $$(ALLOW)))
-  unknown_command_line_variables := $$(strip \
-      $$(filter-out $$(ALL_CONTROL_VARIABLES) $$(allowed_command_line_variables), \
-      $$(command_line_variables)))
-  ifneq ($$(unknown_command_line_variables), )
-    $$(info Note: Command line contains non-control variables:)
-    $$(foreach var, $$(unknown_command_line_variables), $$(info * $$(var)=$$($$(var))))
-    $$(info Make sure it is not mistyped, and that you intend to override this variable.)
-    $$(info 'make help' will list known control variables.)
-    $$(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
-	$$(if $$(findstring --jobserver, $$(MAKEFLAGS)), \
-	    $$(info Error: 'make -jN' is not supported, use 'make JOBS=N') \
-	    $$(error Cannot continue) \
-	)
-  .FORCE:
-  .PHONY: .FORCE
-endef
-
-# Check that the CONF_CHECK option is valid and set up handling
-define ParseConfCheckOption
-  ifeq ($$(CONF_CHECK), )
-    # Default behavior is fail
-    CONF_CHECK := fail
-  else ifneq ($$(filter-out auto fail ignore, $$(CONF_CHECK)), )
-    $$(info Error: CONF_CHECK must be one of: auto, fail or ignore.)
-    $$(error Cannot continue)
-  endif
-endef
-
-define ParseConfAndSpec
-  ifneq ($$(origin SPEC), undefined)
-    # We have been given a SPEC, check that it works out properly
-    ifneq ($$(origin CONF), undefined)
-      # We also have a CONF argument. We can't have both.
-      $$(info Error: Cannot use CONF=$$(CONF) and SPEC=$$(SPEC) at the same time. Choose one.)
-      $$(error Cannot continue)
-    endif
-    ifneq ($$(origin CONF_NAME), undefined)
-      # We also have a CONF_NAME argument. We can't have both.
-      $$(info Error: Cannot use CONF_NAME=$$(CONF_NAME) and SPEC=$$(SPEC) at the same time. Choose one.)
-      $$(error Cannot continue)
-    endif
-    ifeq ($$(wildcard $$(SPEC)), )
-      $$(info Error: Cannot locate spec.gmk, given by SPEC=$$(SPEC).)
-      $$(error Cannot continue)
-    endif
-    ifeq ($$(filter /%, $$(SPEC)), )
-      # If given with relative path, make it absolute
-      SPECS := $$(CURDIR)/$$(strip $$(SPEC))
-    else
-      SPECS := $$(SPEC)
-    endif
-
-    # For now, unset this SPEC variable.
-    override SPEC :=
-  else
-    # Use spec.gmk files in the build output directory
-    ifeq ($$(all_spec_files), )
-      ifneq ($(CUSTOM_ROOT), )
-        $$(info Error: No configurations found for $$(CUSTOM_ROOT).)
-      else
-        $$(info Error: No configurations found for $$(TOPDIR).)
-      endif
-      $$(info Please run 'bash configure' to create a configuration.)
-      $$(info )
-      $$(error Cannot continue)
-    endif
-
-    ifneq ($$(origin CONF_NAME), undefined)
-      ifneq ($$(origin CONF), undefined)
-        # We also have a CONF argument. We can't have both.
-        $$(info Error: Cannot use CONF=$$(CONF) and CONF_NAME=$$(CONF_NAME) at the same time. Choose one.)
-        $$(error Cannot continue)
-      endif
-      matching_conf := $$(strip $$(filter $$(CONF_NAME), $$(all_confs)))
-      ifeq ($$(matching_conf), )
-        $$(info Error: No configurations found matching CONF_NAME=$$(CONF_NAME).)
-        $$(info Available configurations in $$(build_dir):)
-        $$(foreach var, $$(all_confs), $$(info * $$(var)))
-        $$(error Cannot continue)
-      else ifneq ($$(words $$(matching_conf)), 1)
-        $$(info Error: Matching more than one configuration CONF_NAME=$$(CONF_NAME).)
-        $$(info Available configurations in $$(build_dir):)
-        $$(foreach var, $$(all_confs), $$(info * $$(var)))
-        $$(error Cannot continue)
-      else
-        $$(info Building configuration '$$(matching_conf)' (matching CONF_NAME=$$(CONF_NAME)))
-      endif
-      # Create a SPEC definition. This will contain the path to exactly one spec file.
-      SPECS := $$(build_dir)/$$(matching_conf)/spec.gmk
-    else ifneq ($$(origin CONF), undefined)
-      # User have given a CONF= argument.
-      ifeq ($$(CONF), )
-        # If given CONF=, match all configurations
-        matching_confs := $$(strip $$(all_confs))
-      else
-        # Otherwise select those that contain the given CONF string
-        ifeq ($$(patsubst !%,,$$(CONF)), )
-          # A CONF starting with ! means we should negate the search term
-          matching_confs := $$(strip $$(foreach var, $$(all_confs), \
-              $$(if $$(findstring $$(subst !,,$$(CONF)), $$(var)), ,$$(var))))
-        else
-          matching_confs := $$(strip $$(foreach var, $$(all_confs), \
-              $$(if $$(findstring $$(CONF), $$(var)), $$(var))))
-        endif
-        ifneq ($$(filter $$(CONF), $$(matching_confs)), )
-          ifneq ($$(word 2, $$(matching_confs)), )
-            # Don't repeat this output on make restarts caused by including
-            # generated files.
-            ifeq ($$(MAKE_RESTARTS), )
-              $$(info Using exact match for CONF=$$(CONF) (other matches are possible))
-            endif
-          endif
-          # If we found an exact match, use that
-          matching_confs := $$(CONF)
-        endif
-      endif
-      ifeq ($$(matching_confs), )
-        $$(info Error: No configurations found matching CONF=$$(CONF).)
-        $$(info Available configurations in $$(build_dir):)
-        $$(foreach var, $$(all_confs), $$(info * $$(var)))
-        $$(error Cannot continue)
-      else
-        # Don't repeat this output on make restarts caused by including
-        # generated files.
-        ifeq ($$(MAKE_RESTARTS), )
-          ifeq ($$(words $$(matching_confs)), 1)
-            ifneq ($$(findstring $$(LOG_LEVEL), info debug trace), )
-              $$(info Building configuration '$$(matching_confs)' (matching CONF=$$(CONF)))
-            endif
-          else
-            $$(info Building these configurations (matching CONF=$$(CONF)):)
-            $$(foreach var, $$(matching_confs), $$(info * $$(var)))
-          endif
-        endif
-      endif
-
-      # Create a SPEC definition. This will contain the path to one or more spec.gmk files.
-      SPECS := $$(addsuffix /spec.gmk, $$(addprefix $$(build_dir)/, $$(matching_confs)))
-    else
-      # No CONF or SPEC given, check the available configurations
-      ifneq ($$(words $$(all_spec_files)), 1)
-        $$(info Error: No CONF given, but more than one configuration found.)
-        $$(info Available configurations in $$(build_dir):)
-        $$(foreach var, $$(all_confs), $$(info * $$(var)))
-        $$(info Please retry building with CONF=<config pattern> (or SPEC=<spec file>).)
-        $$(info )
-        $$(error Cannot continue)
-      endif
-
-      # We found exactly one configuration, use it
-      SPECS := $$(strip $$(all_spec_files))
-    endif
-  endif
-endef
-
-# Extract main targets from Main.gmk using the spec provided in $2.
-#
-# Param 1: FORCE = force generation of main-targets.gmk or LAZY = do not force.
-# Param 2: The SPEC file to use.
-define DefineMainTargets
-
-  # 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 $(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.
-    ifeq ($(strip $1), FORCE)
-      $$(shell rm -f $$(main_targets_file))
-    endif
-  endif
-
-  $$(main_targets_file):
-	@( cd $$(TOPDIR) && \
-	$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(TOPDIR)/make/GenerateFindTests.gmk \
-	    -I $$(TOPDIR)/make/common SPEC=$(strip $2) )
-	@( 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 )
-
-  # Now include main-targets.gmk. This will define ALL_MAIN_TARGETS.
-  -include $$(main_targets_file)
-endef
-
-define PrintConfCheckFailed
-	@echo ' '
-	@echo "Please rerun configure! Easiest way to do this is by running"
-	@echo "'make reconfigure'."
-	@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
@@ -45,7 +45,7 @@ ifneq ($(TEST_VM_OPTS), )
 endif
 
 $(eval $(call ParseKeywordVariable, TEST_OPTS, \
-    SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR JCOV JCOV_DIFF_CHANGESET AOT_JDK, \
+    SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR JCOV JCOV_DIFF_CHANGESET, \
     STRING_KEYWORDS := VM_OPTIONS JAVA_OPTIONS, \
 ))
 
@@ -71,6 +71,9 @@ 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
@@ -105,8 +108,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)))
 
@@ -199,12 +202,11 @@ $(eval $(call SetTestOpt,JOBS,JTREG))
 $(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG))
 $(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG))
 $(eval $(call SetTestOpt,REPORT,JTREG))
-$(eval $(call SetTestOpt,AOT_JDK,JTREG))
 
 $(eval $(call ParseKeywordVariable, JTREG, \
     SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
         TEST_MODE ASSERT VERBOSE RETAIN TEST_THREAD_FACTORY MAX_MEM RUN_PROBLEM_LISTS \
-        RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT AOT_JDK $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
+        RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
     STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
         EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \
         $(CUSTOM_JTREG_STRING_KEYWORDS), \
@@ -527,34 +529,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_SKIPPED := $$(shell $$(AWK) \
-	      '/YOU HAVE [0-9]+ DISABLED TEST/ { \
-	          if (match($$$$0, /[0-9]+/, arr)) { \
-	            print arr[0]; \
-	            found=1; \
-	          } \
-	       } \
-	       END { if (!found) print 0; }' \
-	      $$($1_RESULT_FILE))) \
 	  $$(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))) \
-	  $$(eval $1_TOTAL := $$(shell \
-	      $$(EXPR) $$($1_RUN) + $$($1_SKIPPED))) \
+	      $$(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) \
 	)
 
@@ -678,7 +667,6 @@ define SetupRunMicroTestBody
 	  $$(eval $1_ERROR := 1) \
 	  $$(eval $1_TOTAL := 1) \
 	)
-	$$(eval $1_SKIPPED := 0)
 
   $1: run-test-$1 parse-test-$1
 
@@ -714,63 +702,6 @@ define SetJtregValue
   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.
-#   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
-
-  # 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_AOT_JDK_CACHE): $$(JDK_IMAGE_DIR)/release
-	$$(call MakeDir, $$($1_AOT_JDK_OUTPUT_DIR))
-
-	$$(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,cds,cds+class=debug:file=$$($1_AOT_JDK_CONF).log  -Xlog:cds*=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:cds,cds+class=debug:file=$$($1_AOT_JDK_CACHE).log -Xlog:cds*=error \
-	        -XX:ExtraSharedClassListFile=$(JDK_UNDER_TEST)/lib/classlist \
-	        -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
@@ -831,7 +762,6 @@ define SetupRunJtregTestBody
   JTREG_RETRY_COUNT ?= 0
   JTREG_REPEAT_COUNT ?= 0
   JTREG_REPORT ?= files
-  JTREG_AOT_JDK ?= false
 
   ifneq ($$(JTREG_RETRY_COUNT), 0)
     ifneq ($$(JTREG_REPEAT_COUNT), 0)
@@ -942,11 +872,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)
@@ -966,16 +891,6 @@ define SetupRunJtregTestBody
     endif
   endif
 
-  ifeq ($$(JTREG_AOT_JDK), true)
-    $$(call LogWarn, Add AOT target for $1)
-    $$(eval $$(call SetupAOT, $1, VM_OPTIONS := $$(JTREG_ALL_OPTIONS) ))
-
-    $$(call LogWarn, AOT_JDK_CACHE=$$($1_AOT_JDK_CACHE))
-
-    $1_JTREG_BASIC_OPTIONS += -vmoption:-XX:AOTCache="$$($1_AOT_JDK_CACHE)"
-  endif
-
-
   $$(eval $$(call SetupRunJtregTestCustom, $1))
 
   # SetupRunJtregTestCustom might also adjust JTREG_AUTO_ variables
@@ -991,7 +906,6 @@ define SetupRunJtregTestBody
   JTREG_TIMEOUT_FACTOR ?= $$(JTREG_AUTO_TIMEOUT_FACTOR)
 
   clean-outputdirs-$1:
-	$$(call LogWarn, Clean up dirs for $1)
 	$$(RM) -r $$($1_TEST_SUPPORT_DIR)
 	$$(RM) -r $$($1_TEST_RESULTS_DIR)
 
@@ -1017,8 +931,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 \
@@ -1031,18 +944,16 @@ 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
   endif
 
-  run-test-$1: clean-outputdirs-$1 pre-run-test $$($1_AOT_TARGETS)
+  run-test-$1: pre-run-test clean-outputdirs-$1
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR) \
@@ -1057,64 +968,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) \
@@ -1173,6 +1043,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)')
@@ -1182,7 +1054,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 \
 	))
@@ -1292,8 +1163,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]')) \
@@ -1305,15 +1176,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) ==============================
@@ -1416,8 +1287,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, 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
@@ -24,11 +24,9 @@
 #
 
 ################################################################################
-# Initial bootstrapping, copied and stripped down from Makefile and PreInit.gmk.
+# Initial bootstrapping, copied and stripped down from Makefile and Init.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,10 @@ $(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.
-include $(TOPDIR)/make/PreInitSupport.gmk
-include $(TOPDIR)/make/common/LogUtils.gmk
+HAS_SPEC :=
+include $(TOPDIR)/make/InitSupport.gmk
 
+$(eval $(call CheckDeprecatedEnvironment))
 $(eval $(call CheckInvalidMakeFlags))
 $(eval $(call ParseLogLevel))
 
@@ -246,7 +245,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 +295,13 @@ 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
+	@cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -f make/RunTests.gmk run-test \
 	    TEST="$(TEST)"
 
 test-prebuilt-with-exit-code: test-prebuilt

make/RunTestsPrebuiltSpec.gmk

@@ -63,7 +63,7 @@ TEST_JOBS ?= 0
 
 # Use hard-coded values for java flags (one size, fits all!)
 JAVA_FLAGS := -Duser.language=en -Duser.country=US
-JAVA_FLAGS_BIG := -Xms64M -Xmx2048M
+JAVA_FLAGS_BIG := -Xms64M -Xmx1600M
 JAVA_FLAGS_SMALL := -XX:+UseSerialGC -Xms32M -Xmx512M -XX:TieredStopAtLevel=1
 BUILDJDK_JAVA_FLAGS_SMALL := -Xms32M -Xmx512M -XX:TieredStopAtLevel=1
 BUILD_JAVA_FLAGS := $(JAVA_FLAGS_BIG)

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,211 +0,0 @@
-#
-# Copyright (c) 2024, 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
-
-################################################################################
-
-include CopyFiles.gmk
-include DebugInfoUtils.gmk
-include Modules.gmk
-include modules/LauncherCommon.gmk
-include Execute.gmk
-
-################################################################################
-#
-# Create the static java launcher
-#
-################################################################################
-
-STATIC_JDK_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/static-jdk
-STATIC_LAUNCHER_OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/static-native/launcher
-HOTSPOT_STATIC_LIB_PATH := $(HOTSPOT_OUTPUTDIR)/*/libjvm/objs/static
-
-ifneq ($(word 2, $(wildcard $(HOTSPOT_STATIC_LIB_PATH))), )
-  $(error Cannot perform static linking when building more than one JVM library)
-endif
-
-# Find all modules with static libraries
-STATIC_LIB_MODULES := $(patsubst $(SUPPORT_OUTPUTDIR)/modules_static-libs/%, \
-    %, $(wildcard $(SUPPORT_OUTPUTDIR)/modules_static-libs/*))
-
-# Filter out known broken libraries. This is a temporary measure until
-# proper support for these libraries can be provided.
-ifeq ($(call isTargetOs, linux), true)
-  # libsplashscreen has a name conflict with libawt in the function
-  # BitmapToYXBandedRectangles, so we exclude it for now.
-  BROKEN_STATIC_LIBS += splashscreen
-else ifeq ($(call isTargetOs, macosx), true)
-  # libosxsecurity has a name conflict with libosxapp in the function
-  # JavaStringToNSString, so we exclude it for now.
-  BROKEN_STATIC_LIBS += osxsecurity
-else ifeq ($(call isTargetOs, windows), true)
-  # libsplashscreen has a name conflict with libawt in the function
-  # BitmapToYXBandedRectangles, so we exclude it for now.
-  BROKEN_STATIC_LIBS += splashscreen
-  # libsspi_bridge has name conflicts with sunmscapi
-  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), \
-    $(eval LIBS_$(module) := $(filter-out $(BROKEN_STATIC_LIBS), $(shell cat \
-    $(SUPPORT_OUTPUTDIR)/modules_static-libs/$(module)/module-included-libs.txt))) \
-)
-
-STATIC_LIB_FILES := $(foreach module, $(STATIC_LIB_MODULES), \
-    $(foreach lib, $(LIBS_$(module)), \
-    $(SUPPORT_OUTPUTDIR)/native/$(module)/lib$(lib)/static/$(LIBRARY_PREFIX)$(lib)$(STATIC_LIBRARY_SUFFIX)))
-
-# Add Hotspot
-STATIC_LIB_FILES += $(wildcard $(HOTSPOT_STATIC_LIB_PATH)/$(LIBRARY_PREFIX)jvm$(STATIC_LIBRARY_SUFFIX))
-
-# Figure out what external libraries are required to link these static JDK
-# libraries.
-LIB_FLAGS_FILES := $(addsuffix .lib-flags.txt, $(STATIC_LIB_FILES))
-
-# Gather the lib flags from all individual libraries. There are many duplicates,
-# so sort and just keep unique instances. On macOS, a common pattern is
-# "-framework FooFramework", so we must make sure we keep the two words together.
-EXTERNAL_LIBS := $(strip $(shell $(CAT) $(LIB_FLAGS_FILES) | \
-    $(SED) -e 's/-framework /-framework_/g' | $(TR) ' ' '\n' | $(SORT) -u | \
-    $(SED) -e 's/-framework_/-framework /g'))
-
-ifeq ($(call isTargetOs, macosx), true)
-  STATIC_LIBS := $(addprefix -force_load$(SPACE), $(STATIC_LIB_FILES))
-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
-
-$(eval $(call SetupBuildLauncher, java, \
-    ENABLE_ARG_FILES := true, \
-    EXPAND_CLASSPATH_WILDCARDS := true, \
-    EXTRA_RCFLAGS := $(JAVA_RCFLAGS), \
-    VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
-    OPTIMIZATION := HIGH, \
-    STATIC_LAUNCHER := true, \
-    LDFLAGS := $(LDFLAGS_STATIC_JDK), \
-    LIBS := $(STATIC_LIBS) $(EXTERNAL_LIBS), \
-    LINK_TYPE := C++, \
-    OUTPUT_DIR := $(STATIC_LAUNCHER_OUTPUT_DIR), \
-    OBJECT_DIR := $(STATIC_LAUNCHER_OUTPUT_DIR), \
-))
-
-$(java): $(STATIC_LIB_FILES)
-ifeq ($(call isTargetOs, aix), true)
-  $(java): $(STATIC_LIB_EXPORT_FILES)
-endif
-
-TARGETS += $(java)
-
-JAVA_LAUNCHER := $(BUILD_LAUNCHER_java_TARGET)
-
-static-launcher: $(java)
-
-################################################################################
-#
-# Create the static-jdk image with the statically built java launcher
-#
-################################################################################
-
-# Until we get proper support in jlink for generating an image with static
-# builds, we need to create the image ourselves. We base it on a normal
-# dynamically linked JDK image.
-
-# All these files/dirs should be copied as-is
-JDK_IMAGE_COPY_FILES := $(addprefix $(JDK_IMAGE_DIR)/, conf demo include jmods \
-    legal man/man1/java.1 release README)
-
-# We need to copy some files from lib, but not the dynamic libraries themselves
-ALL_LIB_FILES := $(call FindFiles, $(JDK_IMAGE_DIR)/lib)
-
-# Remove all dynamic libraries from the list
-JDK_IMAGE_COPY_LIB_FILES := $(filter-out %$(SHARED_LIBRARY_SUFFIX), $(ALL_LIB_FILES))
-# Remove all debug files from the list
-ifeq ($(call isTargetOs, macosx), true)
-  JDK_IMAGE_COPY_LIB_FILES := $(call not-containing, .dSYM, $(JDK_IMAGE_COPY_LIB_FILES))
-else
-  JDK_IMAGE_COPY_LIB_FILES := $(filter-out %.debuginfo %.pdb %.map, $(JDK_IMAGE_COPY_LIB_FILES))
-endif
-
-static-jdk-info:
-	$(call LogWarn, Creating static-jdk image)
-
-$(eval $(call SetupCopyFiles, copy-from-jdk-image, \
-    SRC := $(JDK_IMAGE_DIR), \
-    DEST := $(STATIC_JDK_IMAGE_DIR), \
-    FILES := $(call FindFiles, $(JDK_IMAGE_COPY_FILES)) \
-        $(JDK_IMAGE_COPY_LIB_FILES), \
-))
-
-TARGETS += $(copy-from-jdk-image)
-
-$(copy-from-jdk-image): | static-jdk-info
-
-$(eval $(call SetupCopyFiles, copy-static-launcher, \
-    FILES := $(JAVA_LAUNCHER), \
-    DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
-))
-
-TARGETS += $(copy-static-launcher)
-
-$(eval $(call SetupCopyFiles, copy-static-launcher-debuginfo, \
-    SRC := $(STATIC_LAUNCHER_OUTPUT_DIR), \
-    DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
-    FILES := $(call FindDebuginfoFiles, $(STATIC_LAUNCHER_OUTPUT_DIR)), \
-))
-
-TARGETS += $(copy-static-launcher-debuginfo)
-
-static-jdk-image: $(copy-from-jdk-image) $(copy-static-launcher) $(copy-static-launcher-debuginfo)
-
-TARGETS += static-jdk-image
-
-.PHONY: static-launcher static-jdk-image
-
-################################################################################
-
-include MakeFileEnd.gmk

make/StaticLibsImage.gmk

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