Converted vulkan code to C++

This is enough to make J2Ddemo and StylePad work

.gitattributes

@@ -1,10 +1 @@
 *	-text
-*.java	diff=java
-*.c	diff=cpp
-*.h	diff=cpp
-*.cpp	diff=cpp
-*.hpp	diff=cpp
-*.md	diff=markdown
-*.sh	diff=bash
-*.html	diff=html
-*.css	diff=css

.github/actions/config/action.yml

@@ -42,5 +42,5 @@ runs:
       run: |
         # Extract value from configuration file
         value="$(grep -h ${{ inputs.var }}= make/conf/github-actions.conf | cut -d '=' -f 2-)"
-        echo "value=$value" >> $GITHUB_OUTPUT
+        echo "::set-output name=value::$value"
       shell: bash

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

@@ -61,7 +61,7 @@ runs:
               $build_dir/make-support/failure-summary.log \
               $build_dir/make-support/failure-logs/* \
               failure-logs/ 2> /dev/null || true
-          echo 'failure=true' >> $GITHUB_OUTPUT
+          echo '::set-output name=failure::true'
         fi
       shell: bash
 

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, 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:
       run: |
         # Convert platform name to upper case
         platform_prefix="$(echo ${{ inputs.platform }} | tr [a-z-] [A-Z_])"
-        echo "value=$platform_prefix" >> $GITHUB_OUTPUT
+        echo "::set-output name=value::$platform_prefix"
       shell: bash
 
     - name: 'Get URL configuration'
@@ -104,6 +104,6 @@ runs:
     - name: 'Export path to where BootJDK is installed'
       id: path-name
       run: |
-        # Export the absolute path
-        echo "path=`pwd`/bootjdk/jdk" >> $GITHUB_OUTPUT
+        # Export the path
+        echo '::set-output name=path::bootjdk/jdk'
       shell: bash

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

@@ -103,7 +103,7 @@ runs:
           tests_dir="$(cygpath $tests_dir)"
         fi
 
-        echo "jdk=$jdk_dir" >> $GITHUB_OUTPUT
-        echo "symbols=$symbols_dir" >> $GITHUB_OUTPUT
-        echo "tests=$tests_dir" >> $GITHUB_OUTPUT
+        echo "::set-output name=jdk::$jdk_dir"
+        echo "::set-output name=symbols::$symbols_dir"
+        echo "::set-output name=tests::$tests_dir"
       shell: bash

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, 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
@@ -40,15 +40,15 @@ runs:
         var: GTEST_VERSION
 
     - name: 'Checkout GTest source'
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         repository: google/googletest
-        ref: 'v${{ steps.version.outputs.value }}'
+        ref: 'release-${{ steps.version.outputs.value }}'
         path: gtest
 
     - name: 'Export path to where GTest is installed'
       id: path-name
       run: |
         # Export the path
-        echo 'path=gtest' >> $GITHUB_OUTPUT
+        echo '::set-output name=path::gtest'
       shell: bash

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023, 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
@@ -47,7 +47,7 @@ runs:
         key: jtreg-${{ steps.version.outputs.value }}
 
     - name: 'Checkout the JTReg source'
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         repository: openjdk/jtreg
         ref: jtreg-${{ steps.version.outputs.value }}
@@ -57,7 +57,7 @@ runs:
     - name: 'Build JTReg'
       run: |
         # Build JTReg and move files to the proper locations
-        bash make/build.sh --jdk "$JAVA_HOME_17_X64"
+        bash make/build.sh --jdk "$JAVA_HOME_11_X64"
         mkdir ../installed
         mv build/images/jtreg/* ../installed
       working-directory: jtreg/src
@@ -68,5 +68,5 @@ runs:
       id: path-name
       run: |
         # Export the path
-        echo 'path=jtreg/installed' >> $GITHUB_OUTPUT
+        echo '::set-output name=path::jtreg/installed'
       shell: bash

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, 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
@@ -30,16 +30,15 @@ runs:
   using: composite
   steps:
     - name: 'Install MSYS2'
-      # use a specific release of msys2/setup-msys2 to prevent jtreg build failures on newer release
-      uses: msys2/setup-msys2@7efe20baefed56359985e327d329042cde2434ff
+      uses: msys2/setup-msys2@v2
       with:
         install: 'autoconf tar unzip zip make'
         path-type: minimal
-        location: ${{ runner.tool_cache }}/msys2
+        location: msys2
 
       # We can't run bash until this is completed, so stick with pwsh
     - name: 'Set MSYS2 path'
       run: |
         # Prepend msys2/msys64/usr/bin to the PATH
-        echo "$env:RUNNER_TOOL_CACHE/msys2/msys64/usr/bin" >> $env:GITHUB_PATH
+        echo "$env:GITHUB_WORKSPACE/msys2/msys64/usr/bin" >> $env:GITHUB_PATH
       shell: pwsh

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

@@ -62,9 +62,9 @@ runs:
         fi
 
         if [[ "$jdk_bundle_zip$jdk_bundle_tar_gz$symbols_bundle$tests_bundle" != "" ]]; then
-          echo 'bundles-found=true' >> $GITHUB_OUTPUT
+          echo '::set-output name=bundles-found::true'
         else
-          echo 'bundles-found=false' >> $GITHUB_OUTPUT
+          echo '::set-output name=bundles-found::false'
         fi
       shell: bash
 

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

@@ -25,7 +25,6 @@
 #
 
 GITHUB_STEP_SUMMARY="$1"
-GITHUB_OUTPUT="$2"
 
 test_suite_name=$(cat build/run-test-prebuilt/test-support/test-last-ids.txt)
 results_dir=build/run-test-prebuilt/test-results/$test_suite_name/text
@@ -42,12 +41,12 @@ error_count=$(echo $errors | wc -w || true)
 
 if [[ "$failures" = "" && "$errors" = "" ]]; then
   # We know something went wrong, but not what
-  echo 'error-message=Unspecified test suite failure. Please see log for job for details.' >> $GITHUB_OUTPUT
+  echo '::set-output name=error-message::Unspecified test suite failure. Please see log for job for details.'
   exit 0
 fi
 
-echo 'failure=true' >> $GITHUB_OUTPUT
-echo "error-message=Test run reported $failure_count test failure(s) and $error_count error(s). See summary for details." >> $GITHUB_OUTPUT
+echo '::set-output name=failure::true'
+echo "::set-output name=error-message::Test run reported $failure_count test failure(s) and $error_count error(s). See summary for details."
 
 echo '### :boom: Test failures summary' >> $GITHUB_STEP_SUMMARY
 

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, 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
@@ -31,15 +31,15 @@ on:
       gcc-major-version:
         required: true
         type: string
+      apt-gcc-version:
+        required: true
+        type: string
+      apt-gcc-cross-version:
+        required: true
+        type: string
       extra-conf-options:
         required: false
         type: string
-      configure-arguments:
-        required: false
-        type: string
-      make-arguments:
-        required: false
-        type: string
 
 jobs:
   build-cross-compile:
@@ -80,12 +80,13 @@ jobs:
           - target-cpu: riscv64
             gnu-arch: riscv64
             debian-arch: riscv64
-            debian-repository: https://httpredir.debian.org/debian/
+            debian-repository: https://deb.debian.org/debian-ports
+            debian-keyring: /usr/share/keyrings/debian-ports-archive-keyring.gpg
             debian-version: sid
 
     steps:
       - name: 'Checkout the JDK source'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: 'Get the BootJDK'
         id: bootjdk
@@ -100,10 +101,6 @@ jobs:
         with:
           platform: linux-x64
 
-      - name: 'Get GTest'
-        id: gtest
-        uses: ./.github/actions/get-gtest
-
         # Upgrading apt to solve libc6 installation bugs, see JDK-8260460.
       - name: 'Install toolchain and dependencies'
         run: |
@@ -111,11 +108,12 @@ jobs:
           sudo apt-get update
           sudo apt-get install --only-upgrade apt
           sudo apt-get install \
-              gcc-${{ inputs.gcc-major-version }} \
-              g++-${{ inputs.gcc-major-version }} \
-              gcc-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}} \
-              g++-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}} \
-              libxrandr-dev libxtst-dev libcups2-dev libasound2-dev
+              gcc-${{ inputs.gcc-major-version }}=${{ inputs.apt-gcc-version }} \
+              g++-${{ inputs.gcc-major-version }}=${{ inputs.apt-gcc-version }} \
+              gcc-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}=${{ inputs.apt-gcc-cross-version }} \
+              g++-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}=${{ inputs.apt-gcc-cross-version }} \
+              libxrandr-dev libxtst-dev libcups2-dev libasound2-dev \
+              debian-ports-archive-keyring
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }}
 
       - name: 'Check cache for sysroot'
@@ -134,9 +132,9 @@ jobs:
           sudo debootstrap
           --arch=${{ matrix.debian-arch }}
           --verbose
-          --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype-dev,libpng-dev
+          --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev
           --resolve-deps
-          --variant=minbase
+          $(test -n "${{ matrix.debian-keyring }}" && echo "--keyring=${{ matrix.debian-keyring }}")
           ${{ matrix.debian-version }}
           sysroot
           ${{ matrix.debian-repository }}
@@ -149,8 +147,7 @@ jobs:
           sudo chown ${USER} -R sysroot
           rm -rf sysroot/{dev,proc,run,sys,var}
           rm -rf sysroot/usr/{sbin,bin,share}
-          rm -rf sysroot/usr/lib/{apt,gcc,udev,systemd}
-          rm -rf sysroot/usr/libexec/gcc
+          rm -rf sysroot/usr/lib/{apt,udev,systemd}
         if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
 
       - name: 'Configure'
@@ -159,7 +156,6 @@ jobs:
           --with-conf-name=linux-${{ matrix.target-cpu }}
           --with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
           --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
-          --with-gtest=${{ steps.gtest.outputs.path }}
           --with-zlib=system
           --enable-debug
           --disable-precompiled-headers
@@ -169,7 +165,7 @@ jobs:
           --with-jmod-compress=zip-1
           CC=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-gcc-${{ inputs.gcc-major-version }}
           CXX=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-g++-${{ inputs.gcc-major-version }}
-          ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
+          ${{ inputs.extra-conf-options }} || (
           echo "Dumping config.log:" &&
           cat config.log &&
           exit 1)
@@ -178,5 +174,5 @@ jobs:
         id: build
         uses: ./.github/actions/do-build
         with:
-          make-target: 'hotspot ${{ inputs.make-arguments }}'
+          make-target: 'hotspot'
           platform: linux-${{ matrix.target-cpu }}

.github/workflows/build-linux.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, 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
@@ -49,18 +49,15 @@ on:
         required: false
         type: string
         default: ''
+      apt-gcc-version:
+        required: true
+        type: string
       apt-architecture:
         required: false
         type: string
       apt-extra-packages:
         required: false
         type: string
-      configure-arguments:
-        required: false
-        type: string
-      make-arguments:
-        required: false
-        type: string
 
 jobs:
   build-linux:
@@ -78,7 +75,7 @@ jobs:
 
     steps:
       - name: 'Checkout the JDK source'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: 'Get the BootJDK'
         id: bootjdk
@@ -99,7 +96,7 @@ jobs:
         run: |
           # Set a proper suffix for packages if using a different architecture
           if [[ '${{ inputs.apt-architecture }}' != '' ]]; then
-            echo 'suffix=:${{ inputs.apt-architecture }}' >> $GITHUB_OUTPUT
+            echo '::set-output name=suffix:::${{ inputs.apt-architecture }}'
           fi
 
       # Upgrading apt to solve libc6 installation bugs, see JDK-8260460.
@@ -111,7 +108,7 @@ jobs:
           fi
           sudo apt-get update
           sudo apt-get install --only-upgrade apt
-          sudo apt-get install gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} libxrandr-dev${{ steps.arch.outputs.suffix }} libxtst-dev${{ steps.arch.outputs.suffix }} libcups2-dev${{ steps.arch.outputs.suffix }} libasound2-dev${{ steps.arch.outputs.suffix }} ${{ inputs.apt-extra-packages }}
+          sudo apt-get install gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }}=${{ inputs.apt-gcc-version }} g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }}=${{ inputs.apt-gcc-version }} libxrandr-dev${{ steps.arch.outputs.suffix }} libxtst-dev${{ steps.arch.outputs.suffix }} libcups2-dev${{ steps.arch.outputs.suffix }} libasound2-dev${{ steps.arch.outputs.suffix }} ${{ inputs.apt-extra-packages }}
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }}
 
       - name: 'Configure'
@@ -123,9 +120,10 @@ jobs:
           --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
           --with-jtreg=${{ steps.jtreg.outputs.path }}
           --with-gtest=${{ steps.gtest.outputs.path }}
+          --enable-jtreg-failure-handler
           --with-zlib=system
           --with-jmod-compress=zip-1
-          ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
+          ${{ inputs.extra-conf-options }} || (
           echo "Dumping config.log:" &&
           cat config.log &&
           exit 1)
@@ -134,7 +132,7 @@ jobs:
         id: build
         uses: ./.github/actions/do-build
         with:
-          make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
+          make-target: '${{ inputs.make-target }}'
           platform: ${{ inputs.platform }}
           debug-suffix: '${{ matrix.suffix }}'
 

.github/workflows/build-macos.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, 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
@@ -45,17 +45,11 @@ on:
       xcode-toolset-version:
         required: true
         type: string
-      configure-arguments:
-        required: false
-        type: string
-      make-arguments:
-        required: false
-        type: string
 
 jobs:
   build-macos:
     name: build
-    runs-on: macos-13
+    runs-on: macos-11
 
     strategy:
       fail-fast: false
@@ -68,7 +62,7 @@ jobs:
 
     steps:
       - name: 'Checkout the JDK source'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: 'Get the BootJDK'
         id: bootjdk
@@ -101,9 +95,10 @@ jobs:
           --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
           --with-jtreg=${{ steps.jtreg.outputs.path }}
           --with-gtest=${{ steps.gtest.outputs.path }}
+          --enable-jtreg-failure-handler
           --with-zlib=system
           --with-jmod-compress=zip-1
-          ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
+          ${{ inputs.extra-conf-options }} || (
           echo "Dumping config.log:" &&
           cat config.log &&
           exit 1)
@@ -112,7 +107,7 @@ jobs:
         id: build
         uses: ./.github/actions/do-build
         with:
-          make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
+          make-target: '${{ inputs.make-target }}'
           platform: ${{ inputs.platform }}
           debug-suffix: '${{ matrix.suffix }}'
 

.github/workflows/build-windows.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, 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
@@ -48,12 +48,6 @@ on:
       msvc-toolset-architecture:
         required: true
         type: string
-      configure-arguments:
-        required: false
-        type: string
-      make-arguments:
-        required: false
-        type: string
 
 env:
   # These are needed to make the MSYS2 bash work properly
@@ -79,7 +73,7 @@ jobs:
 
     steps:
       - name: 'Checkout the JDK source'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: 'Get MSYS2'
         uses: ./.github/actions/get-msys2
@@ -98,26 +92,12 @@ jobs:
         id: gtest
         uses: ./.github/actions/get-gtest
 
-      - name: 'Check toolchain installed'
-        id: toolchain-check
-        run: |
-          set +e
-          '/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
-          if [ $? -eq 0 ]; then
-            echo "Toolchain is already installed"
-            echo "toolchain-installed=true" >> $GITHUB_OUTPUT
-          else
-            echo "Toolchain is not yet installed"
-            echo "toolchain-installed=false" >> $GITHUB_OUTPUT
-          fi
-
       - name: 'Install toolchain and dependencies'
         run: |
           # Run Visual Studio Installer
           '/c/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe' \
-            modify --quiet --installPath 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise' \
+            modify --quiet --installPath 'C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise' \
             --add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
-        if: steps.toolchain-check.outputs.toolchain-installed != 'true'
 
       - name: 'Configure'
         run: >
@@ -128,9 +108,10 @@ jobs:
           --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
           --with-jtreg=${{ steps.jtreg.outputs.path }}
           --with-gtest=${{ steps.gtest.outputs.path }}
+          --enable-jtreg-failure-handler
           --with-msvc-toolset-version=${{ inputs.msvc-toolset-version }}
           --with-jmod-compress=zip-1
-          ${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
+          ${{ inputs.extra-conf-options }} || (
           echo "Dumping config.log:" &&
           cat config.log &&
           exit 1)
@@ -138,13 +119,12 @@ jobs:
           # We need a minimal PATH on Windows
           # Set PATH to "", so just GITHUB_PATH is included
           PATH: ''
-        shell: env /usr/bin/bash --login -eo pipefail {0}
 
       - name: 'Build'
         id: build
         uses: ./.github/actions/do-build
         with:
-          make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
+          make-target: '${{ inputs.make-target }}'
           platform: ${{ inputs.platform }}
           debug-suffix: '${{ matrix.suffix }}'
 

.github/workflows/main.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, 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
@@ -30,19 +30,12 @@ on:
     branches-ignore:
       - master
       - pr/*
-      - jdk*
   workflow_dispatch:
     inputs:
       platforms:
         description: 'Platform(s) to execute on (comma separated, e.g. "linux-x64, macos, aarch64")'
         required: true
-        default: 'linux-x64, linux-x86, linux-x64-variants, linux-cross-compile, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
-      configure-arguments:
-        description: 'Additional configure arguments'
-        required: false
-      make-arguments:
-        description: 'Additional make arguments'
-        required: false
+        default: 'linux-x64, linux-x86, linux-x64-variants, linux-cross-compile, macos-x64, macos-aarch64, windows-x64, windows-aarch64'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -66,7 +59,6 @@ jobs:
       macos-aarch64: ${{ steps.include.outputs.macos-aarch64 }}
       windows-x64: ${{ steps.include.outputs.windows-x64 }}
       windows-aarch64: ${{ steps.include.outputs.windows-aarch64 }}
-      docs: ${{ steps.include.outputs.docs }}
 
     steps:
         # This function must be inlined in main.yml, or we'd be forced to checkout the repo
@@ -79,17 +71,19 @@ jobs:
           # 'false' otherwise.
           # arg $1: platform name or names to look for
           function check_platform() {
+            if [[ '${{ !secrets.JDK_SUBMIT_FILTER || startsWith(github.ref, 'refs/heads/submit/') }}' == 'false' ]]; then
+              # If JDK_SUBMIT_FILTER is set, and this is not a "submit/" branch, don't run anything
+              echo 'false'
+              return
+            fi
+
             if [[ $GITHUB_EVENT_NAME == workflow_dispatch ]]; then
               input='${{ github.event.inputs.platforms }}'
             elif [[ $GITHUB_EVENT_NAME == push ]]; then
-              if [[ '${{ !secrets.JDK_SUBMIT_FILTER || startsWith(github.ref, 'refs/heads/submit/') }}' == 'false' ]]; then
-                # If JDK_SUBMIT_FILTER is set, and this is not a "submit/" branch, don't run anything
-                >&2 echo 'JDK_SUBMIT_FILTER is set and not a "submit/" branch'
-                echo 'false'
-                return
-              else
-                input='${{ secrets.JDK_SUBMIT_PLATFORMS }}'
-              fi
+              input='${{ secrets.JDK_SUBMIT_PLATFORMS }}'
+            else
+              echo 'Internal error in GHA'
+              exit 1
             fi
 
             normalized_input="$(echo ,$input, | tr -d ' ')"
@@ -110,15 +104,14 @@ jobs:
             echo 'false'
           }
 
-          echo "linux-x64=$(check_platform linux-x64 linux x64)" >> $GITHUB_OUTPUT
-          echo "linux-x86=$(check_platform linux-x86 linux x86)" >> $GITHUB_OUTPUT
-          echo "linux-x64-variants=$(check_platform linux-x64-variants variants)" >> $GITHUB_OUTPUT
-          echo "linux-cross-compile=$(check_platform linux-cross-compile cross-compile)" >> $GITHUB_OUTPUT
-          echo "macos-x64=$(check_platform macos-x64 macos x64)" >> $GITHUB_OUTPUT
-          echo "macos-aarch64=$(check_platform macos-aarch64 macos aarch64)" >> $GITHUB_OUTPUT
-          echo "windows-x64=$(check_platform windows-x64 windows x64)" >> $GITHUB_OUTPUT
-          echo "windows-aarch64=$(check_platform windows-aarch64 windows aarch64)" >> $GITHUB_OUTPUT
-          echo "docs=$(check_platform docs)" >> $GITHUB_OUTPUT
+          echo "::set-output name=linux-x64::$(check_platform linux-x64 linux x64)"
+          echo "::set-output name=linux-x86::$(check_platform linux-x86 linux x86)"
+          echo "::set-output name=linux-x64-variants::$(check_platform linux-x64-variants variants)"
+          echo "::set-output name=linux-cross-compile::$(check_platform linux-cross-compile cross-compile)"
+          echo "::set-output name=macos-x64::$(check_platform macos-x64 macos x64)"
+          echo "::set-output name=macos-aarch64::$(check_platform macos-aarch64 macos aarch64)"
+          echo "::set-output name=windows-x64::$(check_platform windows-x64 windows x64)"
+          echo "::set-output name=windows-aarch64::$(check_platform windows-aarch64 windows aarch64)"
 
   ###
   ### Build jobs
@@ -131,8 +124,7 @@ jobs:
     with:
       platform: linux-x64
       gcc-major-version: '10'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
+      apt-gcc-version: '10.3.0-15ubuntu1'
     # The linux-x64 jdk bundle is used as buildjdk for the cross-compile job
     if: needs.select.outputs.linux-x64 == 'true' || needs.select.outputs.linux-cross-compile == 'true'
 
@@ -144,13 +136,12 @@ jobs:
       platform: linux-x86
       gcc-major-version: '10'
       gcc-package-suffix: '-multilib'
+      apt-gcc-version: '10.3.0-15ubuntu1'
       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 libc6-i386 libgcc-s1:i386 libstdc++6: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 }}
+      apt-extra-packages: 'libfreetype6-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386'
+      extra-conf-options: '--with-target-bits=32'
     if: needs.select.outputs.linux-x86 == 'true'
 
   build-linux-x64-hs-nopch:
@@ -162,9 +153,8 @@ jobs:
       make-target: 'hotspot'
       debug-levels: '[ "debug" ]'
       gcc-major-version: '10'
+      apt-gcc-version: '10.3.0-15ubuntu1'
       extra-conf-options: '--disable-precompiled-headers'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.select.outputs.linux-x64-variants == 'true'
 
   build-linux-x64-hs-zero:
@@ -176,9 +166,8 @@ jobs:
       make-target: 'hotspot'
       debug-levels: '[ "debug" ]'
       gcc-major-version: '10'
+      apt-gcc-version: '10.3.0-15ubuntu1'
       extra-conf-options: '--with-jvm-variants=zero --disable-precompiled-headers'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.select.outputs.linux-x64-variants == 'true'
 
   build-linux-x64-hs-minimal:
@@ -190,9 +179,8 @@ jobs:
       make-target: 'hotspot'
       debug-levels: '[ "debug" ]'
       gcc-major-version: '10'
+      apt-gcc-version: '10.3.0-15ubuntu1'
       extra-conf-options: '--with-jvm-variants=minimal --disable-precompiled-headers'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.select.outputs.linux-x64-variants == 'true'
 
   build-linux-x64-hs-optimized:
@@ -205,9 +193,8 @@ jobs:
       # Technically this is not the "debug" level, but we can't inject a new matrix state for just this job
       debug-levels: '[ "debug" ]'
       gcc-major-version: '10'
+      apt-gcc-version: '10.3.0-15ubuntu1'
       extra-conf-options: '--with-debug-level=optimized --disable-precompiled-headers'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.select.outputs.linux-x64-variants == 'true'
 
   build-linux-cross-compile:
@@ -218,8 +205,8 @@ jobs:
     uses: ./.github/workflows/build-cross-compile.yml
     with:
       gcc-major-version: '10'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
+      apt-gcc-version: '10.3.0-15ubuntu1'
+      apt-gcc-cross-version: '10.3.0-8ubuntu1cross1'
     if: needs.select.outputs.linux-cross-compile == 'true'
 
   build-macos-x64:
@@ -228,9 +215,7 @@ jobs:
     uses: ./.github/workflows/build-macos.yml
     with:
       platform: macos-x64
-      xcode-toolset-version: '14.3.1'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
+      xcode-toolset-version: '11.7'
     if: needs.select.outputs.macos-x64 == 'true'
 
   build-macos-aarch64:
@@ -239,10 +224,8 @@ jobs:
     uses: ./.github/workflows/build-macos.yml
     with:
       platform: macos-aarch64
-      xcode-toolset-version: '14.3.1'
+      xcode-toolset-version: '12.4'
       extra-conf-options: '--openjdk-target=aarch64-apple-darwin'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.select.outputs.macos-aarch64 == 'true'
 
   build-windows-x64:
@@ -253,8 +236,6 @@ jobs:
       platform: windows-x64
       msvc-toolset-version: '14.29'
       msvc-toolset-architecture: 'x86.x64'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.select.outputs.windows-x64 == 'true'
 
   build-windows-aarch64:
@@ -267,26 +248,8 @@ jobs:
       msvc-toolset-architecture: 'arm64'
       make-target: 'hotspot'
       extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.select.outputs.windows-aarch64 == 'true'
 
-  build-docs:
-    name: docs
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      debug-levels: '[ "debug" ]'
-      make-target: 'docs-jdk-bundles'
-      # Make sure we never try to make full docs, since that would require a
-      # build JDK, and we do not need the additional testing of the graphs.
-      extra-conf-options: '--disable-full-docs'
-      gcc-major-version: '10'
-      configure-arguments: ${{ github.event.inputs.configure-arguments }}
-      make-arguments: ${{ github.event.inputs.make-arguments }}
-    if: needs.select.outputs.docs == 'true'
-
   ###
   ### Test jobs
   ###
@@ -319,7 +282,7 @@ jobs:
     with:
       platform: macos-x64
       bootjdk-platform: macos-x64
-      runs-on: macos-13
+      runs-on: macos-11
 
   test-windows-x64:
     name: windows-x64

.github/workflows/test.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, 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
@@ -60,13 +60,10 @@ jobs:
           - 'jdk/tier1 part 3'
           - 'langtools/tier1'
           - 'hs/tier1 common'
-          - 'hs/tier1 compiler part 1'
-          - 'hs/tier1 compiler part 2'
-          - 'hs/tier1 compiler part 3'
+          - 'hs/tier1 compiler'
           - 'hs/tier1 gc'
           - 'hs/tier1 runtime'
           - 'hs/tier1 serviceability'
-          - 'lib-test/tier1'
 
         include:
           - test-name: 'jdk/tier1 part 1'
@@ -85,16 +82,8 @@ jobs:
             test-suite: 'test/hotspot/jtreg/:tier1_common'
             debug-suffix: -debug
 
-          - test-name: 'hs/tier1 compiler part 1'
-            test-suite: 'test/hotspot/jtreg/:tier1_compiler_1'
-            debug-suffix: -debug
-
-          - test-name: 'hs/tier1 compiler part 2'
-            test-suite: 'test/hotspot/jtreg/:tier1_compiler_2 test/hotspot/jtreg/:tier1_compiler_not_xcomp'
-            debug-suffix: -debug
-
-          - test-name: 'hs/tier1 compiler part 3'
-            test-suite: 'test/hotspot/jtreg/:tier1_compiler_3'
+          - test-name: 'hs/tier1 compiler'
+            test-suite: 'test/hotspot/jtreg/:tier1_compiler'
             debug-suffix: -debug
 
           - test-name: 'hs/tier1 gc'
@@ -109,13 +98,9 @@ jobs:
             test-suite: 'test/hotspot/jtreg/:tier1_serviceability'
             debug-suffix: -debug
 
-          - test-name: 'lib-test/tier1'
-            test-suite: 'test/lib-test/:tier1'
-            debug-suffix: -debug
-
     steps:
       - name: 'Checkout the JDK source'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: 'Get MSYS2'
         uses: ./.github/actions/get-msys2
@@ -142,7 +127,7 @@ jobs:
         run: |
           # On macOS we need to install some dependencies for testing
           brew install make
-          sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
+          sudo xcode-select --switch /Applications/Xcode_11.7.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'
@@ -153,9 +138,9 @@ jobs:
           # We need a minimal PATH on Windows
           # Set PATH to "", so just GITHUB_PATH is included
           if [[ '${{ runner.os }}' == 'Windows' ]]; then
-            echo "value=" >> $GITHUB_OUTPUT
+            echo "::set-output name=value::"
           else
-            echo "value=$PATH" >> $GITHUB_OUTPUT
+            echo "::set-output name=value::$PATH"
           fi
 
       - name: 'Run tests'
@@ -169,7 +154,7 @@ jobs:
           SYMBOLS_IMAGE_DIR=${{ steps.bundles.outputs.symbols-path }}
           TEST_IMAGE_DIR=${{ steps.bundles.outputs.tests-path }}
           JTREG='JAVA_OPTIONS=-XX:-CreateCoredumpOnCrash;VERBOSE=fail,error,time;KEYWORDS=!headful'
-          && bash ./.github/scripts/gen-test-summary.sh "$GITHUB_STEP_SUMMARY" "$GITHUB_OUTPUT"
+          && bash ./.github/scripts/gen-test-summary.sh "$GITHUB_STEP_SUMMARY"
         env:
           PATH: ${{ steps.path.outputs.value }}
 
@@ -202,7 +187,7 @@ jobs:
           fi
 
           artifact_name="results-${{ inputs.platform }}-$(echo ${{ matrix.test-name }} | tr '/ ' '__')"
-          echo "artifact-name=$artifact_name" >> $GITHUB_OUTPUT
+          echo "::set-output name=artifact-name::$artifact_name"
         if: always()
 
       - name: 'Upload test results'

.gitignore

@@ -18,8 +18,3 @@ NashornProfile.txt
 /src/utils/LogCompilation/target/
 /.project/
 /.settings/
-/.project
-/.classpath
-/.cproject
-/compile_commands.json
-/.cache

.jcheck/conf

@@ -1,7 +1,7 @@
 [general]
 project=jdk
 jbs=JDK
-version=23
+version=20
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists
@@ -15,7 +15,7 @@ version=0
 domain=openjdk.org
 
 [checks "whitespace"]
-files=.*\.cpp|.*\.hpp|.*\.c|.*\.h|.*\.java|.*\.cc|.*\.hh|.*\.m|.*\.mm|.*\.md|.*\.gmk|.*\.m4|.*\.ac|Makefile
+files=.*\.cpp|.*\.hpp|.*\.c|.*\.h|.*\.java|.*\.cc|.*\.hh|.*\.m|.*\.mm|.*\.gmk|.*\.m4|.*\.ac|Makefile
 ignore-tabs=.*\.gmk|Makefile
 
 [checks "merge"]

ASSEMBLY_EXCEPTION

@@ -2,8 +2,8 @@
 OPENJDK ASSEMBLY EXCEPTION
 
 The OpenJDK source code made available by Oracle America, Inc. (Oracle) at
-openjdk.org ("OpenJDK Code") is distributed under the terms of the GNU
-General Public License <https://www.gnu.org/copyleft/gpl.html> version 2
+openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU
+General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
 only ("GPL2"), with the following clarification and special exception.
 
     Linking this OpenJDK Code statically or dynamically with other code
@@ -12,7 +12,7 @@ only ("GPL2"), with the following clarification and special exception.
 
     As a special exception, Oracle gives you permission to link this
     OpenJDK Code with certain code licensed by Oracle as indicated at
-    https://openjdk.org/legal/exception-modules-2007-05-08.html
+    http://openjdk.java.net/legal/exception-modules-2007-05-08.html
     ("Designated Exception Modules") to produce an executable,
     regardless of the license terms of the Designated Exception Modules,
     and to copy and distribute the resulting executable under GPL2,

CONTRIBUTING.md

@@ -1,3 +1,3 @@
 # Contributing to the JDK
 
-Please see the [OpenJDK Developers’ Guide](https://openjdk.org/guide/).
+Please see <https://openjdk.java.net/contribute/> for how to contribute.

README.md

@@ -1,5 +1,58 @@
 # Welcome to the JDK!
 
+## Wakefield
+This is a temporary section created to host information on the
+[Wakefield](https://wiki.openjdk.java.net/display/wakefield) project.
+
+### Building
+There are two addition `configure` arguments:
+```
+  --with-wayland          specify prefix directory for the wayland package
+                          (expecting the headers under PATH/include)
+  --with-wayland-include  specify directory for the wayland include files
+```
+As usual, there should be no need to specify those explicitly unless you're doing
+something tricky.
+However, a variant of `libwayland-dev` needs to be installed on the build system.
+
+### Running
+Make sure your system is configured such that `libwayland` can find the socket to connect to;
+usually this means that the environment variable `WAYLAND_DISPLAY` is set to something
+sensible. Then add this argument to `java`
+```
+-Dawt.toolkit.name=WLToolkit
+```
+
+### Testing
+Testing that involves `Robot` is done inside a [Weston](https://gitlab.freedesktop.org/wayland/weston/)
+instance with a special module loaded called `libwakefield`
+that provides the necessary functionality. The Wayland-specific tests are therefore executed with a dedicated test driver
+`test/jdk/java/awt/wakefield/WakefieldTestDriver.java`. The driver also provides an easy
+way to run the test in several configurations with a different size and even number
+of "outputs" (monitors).
+
+To run the Wayland-specific tests, perform these steps:
+* Install Weston version 9 (earlier versions are known NOT to work).
+* Obtain `libwakefield.so` either by building from source (available under
+`src/java.desktop/share/native/libwakefield` and not integrated into the rest of the
+build infrastructure; see `README.md` there)
+or by fetching the latest pre-built `x64` binary
+```
+wget https://github.com/mkartashev/wakefield/raw/main/libwakefield.so
+```
+* Set `LIBWAKEFIELD` environment variable to the full path to `libwakefield.so`
+```
+export LIBWAKEFIELD=/tmp/wakefield-testing/libwakefield.so
+```
+* Run `jtreg` like so
+```
+jtreg -e:XDG_RUNTIME_DIR -e:LIBWAKEFIELD -testjdk:... test/jdk/java/awt/wakefield/
+```
+
+This was verified to work in `Ubuntu 21.10`.
+This does NOT work in `Ubuntu 21.04` or `Fedora 34`.
+
+## Generic Info (not Wakefield-specific)
 For build instructions please see the
 [online documentation](https://openjdk.org/groups/build/doc/building.html),
 or either of these files:
@@ -7,6 +60,5 @@ or either of these files:
 - [doc/building.html](doc/building.html) (html version)
 - [doc/building.md](doc/building.md) (markdown version)
 
-See <https://openjdk.org/> for more information about the OpenJDK
-Community and the JDK and see <https://bugs.openjdk.org> for JDK issue
-tracking.
+See <https://openjdk.org/> for more information about
+the OpenJDK Community and the JDK.

bin/idea.sh

@@ -193,7 +193,17 @@ for root in $MODULE_ROOTS; do
       root=`wslpath -am $root`
     fi
 
-    SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
+    VM_CI="jdk.internal.vm.ci/share/classes"
+    VM_COMPILER="src/jdk.internal.vm.compiler/share/classes"
+    if test "${root#*$VM_CI}" != "$root" || test "${root#*$VM_COMPILER}" != "$root"; then
+        for subdir in "$root"/*; do
+            if [ -d "$subdir" ]; then
+                SOURCES=$SOURCES" $SOURCE_PREFIX""$subdir"/src"$SOURCE_POSTFIX"
+            fi
+        done
+    else
+        SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
+    fi
 done
 
 add_replacement "###SOURCE_ROOTS###" "$SOURCES"
@@ -264,4 +274,4 @@ $BOOT_JDK/bin/$JAVAC -d $JAVAC_CLASSES -sourcepath $JAVAC_SOURCE_PATH -cp $JAVAC
 
 if [ "x$WSL_DISTRO_NAME" != "x" ]; then
   rm -rf $ANT_TEMP
-fi
+fi

bin/jib.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -128,15 +128,6 @@ install_jib() {
             exit 1
         fi
     fi
-    # Want to check the filetype using file, to see if we got served a HTML error page.
-    # This is sensitive to the filename containing a specific string, but good enough.
-    file "${installed_jib_script}.gz" | grep "gzip compressed data" > /dev/null
-    if [ $? -ne 0 ]; then 
-        echo "Warning: ${installed_jib_script}.gz is not a gzip file."
-        echo "If you are behind a proxy you may need to configure exceptions using no_proxy."
-        echo "The download URL was: ${jib_url}"
-        exit 1
-    fi
     echo "Extracting JIB bootstrap script"
     rm -f "${installed_jib_script}"
     gunzip "${installed_jib_script}.gz"
@@ -144,28 +135,6 @@ install_jib() {
     echo "${data_string}" > "${install_data}"
 }
 
-# Returns a shell-escaped version of the argument given.
-shell_quote() {
-  if [[ -n "$1" ]]; then
-    # Uses only shell-safe characters?  No quoting needed.
-    # '=' is a zsh meta-character, but only in word-initial position.
-    if echo "$1" | grep '^[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\.:,%/+=_-]\{1,\}$' > /dev/null \
-        && ! echo "$1" | grep '^=' > /dev/null; then
-      quoted="$1"
-    else
-      if echo "$1" | grep "[\'!]" > /dev/null; then
-        # csh does history expansion within single quotes, but not
-        # when backslash-escaped!
-        local quoted_quote="'\\''" quoted_exclam="'\\!'"
-        word="${1//\'/${quoted_quote}}"
-        word="${1//\!/${quoted_exclam}}"
-      fi
-      quoted="'$1'"
-    fi
-    echo "$quoted"
-  fi
-}
-
 # Main body starts here
 
 setup_url
@@ -182,16 +151,4 @@ if [ -z "${JIB_SRC_DIR}" ]; then
     export JIB_SRC_DIR="${mydir}/../"
 fi
 
-
-# Save the original command line
-conf_quoted_arguments=()
-for conf_option; do
-  conf_quoted_arguments=("${conf_quoted_arguments[@]}" "$(shell_quote "$conf_option")")
-done
-export REAL_CONFIGURE_COMMAND_LINE="${conf_quoted_arguments[@]}"
-
-myfulldir="$(cd "${mydir}" > /dev/null && pwd)"
-export REAL_CONFIGURE_COMMAND_EXEC_FULL="$BASH $myfulldir/$myname"
-export REAL_CONFIGURE_COMMAND_EXEC_SHORT="$myname"
-
 ${installed_jib_script} "$@"

configure

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, 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
@@ -26,14 +26,10 @@
 # make sure that is called using bash.
 
 # Get an absolute path to this script, since that determines the top-level directory.
-source_path="$(dirname ${0})"
-this_script_dir="$(cd -- "${source_path}" > /dev/null && pwd)"
-if test -z "${this_script_dir}"; then
-  echo "Error: Could not determine location of configure script"
-  exit 1
-fi
+this_script_dir=`dirname $0`
+this_script_dir=`cd $this_script_dir > /dev/null && pwd`
 
 # Delegate to wrapper, forcing wrapper to believe $0 is this script by using -c.
 # This trick is needed to get autoconf to co-operate properly.
 # The ${-:+-$-} construction passes on bash options.
-bash ${-:+-$-} -c ". \"${this_script_dir}/make/autoconf/configure\"" "${this_script_dir}/configure" CHECKME "${this_script_dir}" "$@"
+bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"

doc/hotspot-style.md

@@ -572,12 +572,8 @@ There are a few exceptions to this rule.
 
 * `#include <new>` to use placement `new`, `std::nothrow`, and `std::nothrow_t`.
 * `#include <limits>` to use `std::numeric_limits`.
-* `#include <type_traits>` with some restrictions, listed below.
-* `#include <cstddef>` to use `std::nullptr_t` and `std::max_align_t`.
-
-Certain restrictions apply to the declarations provided by `<type_traits>`.
-
-* The `alignof` operator should be used rather than `std::alignment_of<>`.
+* `#include <type_traits>`.
+* `#include <cstddef>` to use `std::nullptr_t`.
 
 TODO: Rather than directly \#including (permitted) Standard Library
 headers, use a convention of \#including wrapper headers (in some
@@ -655,51 +651,6 @@ constant members.  Compilers having such bugs are no longer supported.
 Except where an enum is semantically appropriate, new code should use
 integral constants.
 
-### alignas
-
-_Alignment-specifiers_ (`alignas`
-[n2341](https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2341.pdf))
-are permitted, with restrictions.
-
-_Alignment-specifiers_ are permitted when the requested alignment is a
-_fundamental alignment_ (not greater than `alignof(std::max_align_t)`
-[C++14 3.11/2](https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4296.pdf)).
-
-_Alignment-specifiers_ with an _extended alignment_ (greater than
-`alignof(std::max_align_t)`
-[C++14 3.11/3](https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4296.pdf))
-may only be used to align variables with static or automatic storage duration
-([C++14 3.7.1, 3.7.3](https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4296.pdf)).
-As a consequence, _over-aligned types_ are forbidden; this may change if
-HotSpot updates to using C++17 or later
-([p0035r4](https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0035r4.html)).
-
-Large _extended alignments_ should be avoided, particularly for stack
-allocated objects. What is a large value may depend on the platform and
-configuration. There may also be hard limits for some platforms.
-
-An _alignment-specifier_ must always be applied to a definition
-([C++14 10.6.2/6](https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4296.pdf)).
-(C++ allows an _alignment-specifier_ to optionally also be applied to a
-declaration, so long as the definition has equivalent alignment. There isn't
-any known benefit from duplicating the alignment in a non-definition
-declaration, so such duplication should be avoided in HotSpot code.)
-
-Enumerations are forbidden from having _alignment-specifiers_. Aligned
-enumerations were originally permitted but insufficiently specified, and were
-later (C++20) removed
-([CWG 2354](https://cplusplus.github.io/CWG/issues/2354.html)).
-Permitting such usage in HotSpot now would just cause problems in the future.
-
-_Alignment-specifiers_ are forbidden in `typedef` and _alias-declarations_.
-This may work or may have worked in some versions of some compilers, but was
-later (C++14) explicitly disallowed
-([CWG 1437](https://cplusplus.github.io/CWG/issues/1437.html)).
-
-The HotSpot macro `ATTRIBUTE_ALIGNED` provides similar capabilities for
-platforms that define it. This macro predates the use by HotSpot of C++
-versions providing `alignas`. New code should use `alignas`.
-
 ### thread_local
 
 Avoid use of `thread_local`
@@ -1058,37 +1009,8 @@ and other supported compilers may not have anything similar.
 [p0136r1]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0136r1.html
   "p0136r1"
 
-### Attributes
-
-The use of some attributes
-([n2761](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2761.pdf))
-(listed below) is permitted.  (Note that some of the attributes defined in
-that paper didn't make it into the final specification.)
-
-Attributes are syntactically permitted in a broad set of locations, but
-specific attributes are only permitted in a subset of those locations.  In
-some cases an attribute that appertains to a given element may be placed in
-any of several locations with the same meaning.  In those cases HotSpot has a
-preferred location.
-
-* An attribute that appertains to a function is placed at the beginning of the
-function's declaration, rather than between the function name and the parameter
-list.
-
-Only the following attributes are permitted:
-
-* `[[noreturn]]`
-
-The following attributes are expressly forbidden:
-
-* `[[carries_dependency]]` - Related to `memory_order_consume`.
-* `[[deprecated]]` - Not relevant in HotSpot code.
-
 ### Additional Permitted Features
 
-* `alignof`
-([n2341](https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2341.pdf))
-
 * `constexpr`
 ([n2235](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2235.pdf))
 ([n3652](https://isocpp.org/files/papers/N3652.html))
@@ -1186,6 +1108,10 @@ difficult to deal with and lead to surprises, as can destruction
 ordering.  HotSpot doesn't generally try to cleanup on exit, and
 running destructors at exit can also lead to problems.
 
+* `[[deprecated]]` attribute
+([n3760](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3760.html)) &mdash;
+Not relevant in HotSpot code.
+
 * Avoid most operator overloading, preferring named functions.  When
 operator overloading is used, ensure the semantics conform to the
 normal expected behavior of the operation.
@@ -1210,6 +1136,9 @@ features that have not yet been discussed.
 * Member initializers and aggregates
 ([n3653](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3653.html))
 
+* `[[noreturn]]` attribute
+([n2761](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2761.pdf))
+
 * Rvalue references and move semantics
 
 [ADL]: https://en.cppreference.com/w/cpp/language/adl

doc/hotspot-unit-tests.html

@@ -5,19 +5,11 @@
   <meta name="generator" content="pandoc" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
   <title>Native/Unit Test Development Guidelines</title>
-  <style>
-    code{white-space: pre-wrap;}
-    span.smallcaps{font-variant: small-caps;}
-    div.columns{display: flex; gap: min(4vw, 1.5em);}
-    div.column{flex: auto; overflow-x: auto;}
-    div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
-    ul.task-list{list-style: none;}
-    ul.task-list li input[type="checkbox"] {
-      width: 0.8em;
-      margin: 0 0.8em 0.2em -1.6em;
-      vertical-align: middle;
-    }
-    .display.math{display: block; text-align: center; margin: 0.5rem auto;}
+  <style type="text/css">
+      code{white-space: pre-wrap;}
+      span.smallcaps{font-variant: small-caps;}
+      span.underline{text-decoration: underline;}
+      div.column{display: inline-block; vertical-align: top; width: 50%;}
   </style>
   <link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css" />
   <!--[if lt IE 9]>
@@ -28,442 +20,174 @@
 <header id="title-block-header">
 <h1 class="title">Native/Unit Test Development Guidelines</h1>
 </header>
-<nav id="TOC" role="doc-toc">
+<nav id="TOC">
 <ul>
-<li><a href="#good-test-properties" id="toc-good-test-properties">Good
-test properties</a>
-<ul>
-<li><a href="#lightness" id="toc-lightness">Lightness</a></li>
-<li><a href="#isolation" id="toc-isolation">Isolation</a></li>
-<li><a href="#atomicity-and-self-containment"
-id="toc-atomicity-and-self-containment">Atomicity and
-self-containment</a></li>
-<li><a href="#repeatability"
-id="toc-repeatability">Repeatability</a></li>
-<li><a href="#informativeness"
-id="toc-informativeness">Informativeness</a></li>
-<li><a href="#testing-instead-of-visiting"
-id="toc-testing-instead-of-visiting">Testing instead of
-visiting</a></li>
-<li><a href="#nearness" id="toc-nearness">Nearness</a></li>
+<li><a href="#good-test-properties">Good test properties</a><ul>
+<li><a href="#lightness">Lightness</a></li>
+<li><a href="#isolation">Isolation</a></li>
+<li><a href="#atomicity-and-self-containment">Atomicity and self-containment</a></li>
+<li><a href="#repeatability">Repeatability</a></li>
+<li><a href="#informativeness">Informativeness</a></li>
+<li><a href="#testing-instead-of-visiting">Testing instead of visiting</a></li>
+<li><a href="#nearness">Nearness</a></li>
 </ul></li>
-<li><a href="#asserts" id="toc-asserts">Asserts</a>
-<ul>
-<li><a href="#several-checks" id="toc-several-checks">Several
-checks</a></li>
-<li><a href="#first-parameter-is-expected-value"
-id="toc-first-parameter-is-expected-value">First parameter is expected
-value</a></li>
-<li><a href="#floating-point-comparison"
-id="toc-floating-point-comparison">Floating-point comparison</a></li>
-<li><a href="#c-string-comparison" id="toc-c-string-comparison">C string
-comparison</a></li>
-<li><a href="#error-messages" id="toc-error-messages">Error
-messages</a></li>
-<li><a href="#uncluttered-output"
-id="toc-uncluttered-output">Uncluttered output</a></li>
-<li><a href="#failures-propagation"
-id="toc-failures-propagation">Failures propagation</a></li>
+<li><a href="#asserts">Asserts</a><ul>
+<li><a href="#several-checks">Several checks</a></li>
+<li><a href="#first-parameter-is-expected-value">First parameter is expected value</a></li>
+<li><a href="#floating-point-comparison">Floating-point comparison</a></li>
+<li><a href="#c-string-comparison">C string comparison</a></li>
+<li><a href="#error-messages">Error messages</a></li>
+<li><a href="#uncluttered-output">Uncluttered output</a></li>
+<li><a href="#failures-propagation">Failures propagation</a></li>
 </ul></li>
-<li><a href="#naming-and-grouping" id="toc-naming-and-grouping">Naming
-and Grouping</a>
-<ul>
-<li><a href="#test-group-names" id="toc-test-group-names">Test group
-names</a></li>
-<li><a href="#filename" id="toc-filename">Filename</a></li>
-<li><a href="#file-location" id="toc-file-location">File
-location</a></li>
-<li><a href="#test-names" id="toc-test-names">Test names</a></li>
-<li><a href="#fixture-classes" id="toc-fixture-classes">Fixture
-classes</a></li>
-<li><a href="#friend-classes" id="toc-friend-classes">Friend
-classes</a></li>
-<li><a href="#oscpu-specific-tests" id="toc-oscpu-specific-tests">OS/CPU
-specific tests</a></li>
+<li><a href="#naming-and-grouping">Naming and Grouping</a><ul>
+<li><a href="#test-group-names">Test group names</a></li>
+<li><a href="#filename">Filename</a></li>
+<li><a href="#file-location">File location</a></li>
+<li><a href="#test-names">Test names</a></li>
+<li><a href="#fixture-classes">Fixture classes</a></li>
+<li><a href="#friend-classes">Friend classes</a></li>
+<li><a href="#oscpu-specific-tests">OS/CPU specific tests</a></li>
 </ul></li>
-<li><a href="#miscellaneous" id="toc-miscellaneous">Miscellaneous</a>
-<ul>
-<li><a href="#hotspot-style" id="toc-hotspot-style">Hotspot
-style</a></li>
-<li><a href="#codetest-metrics" id="toc-codetest-metrics">Code/test
-metrics</a></li>
-<li><a href="#access-to-non-public-members"
-id="toc-access-to-non-public-members">Access to non-public
-members</a></li>
-<li><a href="#death-tests" id="toc-death-tests">Death tests</a></li>
-<li><a href="#external-flags" id="toc-external-flags">External
-flags</a></li>
-<li><a href="#test-specific-flags"
-id="toc-test-specific-flags">Test-specific flags</a></li>
-<li><a href="#flag-restoring" id="toc-flag-restoring">Flag
-restoring</a></li>
-<li><a href="#googletest-documentation"
-id="toc-googletest-documentation">GoogleTest documentation</a></li>
+<li><a href="#miscellaneous">Miscellaneous</a><ul>
+<li><a href="#hotspot-style">Hotspot style</a></li>
+<li><a href="#codetest-metrics">Code/test metrics</a></li>
+<li><a href="#access-to-non-public-members">Access to non-public members</a></li>
+<li><a href="#death-tests">Death tests</a></li>
+<li><a href="#external-flags">External flags</a></li>
+<li><a href="#test-specific-flags">Test-specific flags</a></li>
+<li><a href="#flag-restoring">Flag restoring</a></li>
+<li><a href="#googletest-documentation">GoogleTest documentation</a></li>
 </ul></li>
-<li><a href="#todo" id="toc-todo">TODO</a></li>
+<li><a href="#todo">TODO</a></li>
 </ul>
 </nav>
-<p>The purpose of these guidelines is to establish a shared vision on
-what kind of native tests and how we want to develop them for Hotspot
-using GoogleTest. Hence these guidelines include style items as well as
-test approach items.</p>
-<p>First section of this document describes properties of good tests
-which are common for almost all types of test regardless of language,
-framework, etc. Further sections provide recommendations to achieve
-those properties and other HotSpot and/or GoogleTest specific
-guidelines.</p>
+<p>The purpose of these guidelines is to establish a shared vision on what kind of native tests and how we want to develop them for Hotspot using GoogleTest. Hence these guidelines include style items as well as test approach items.</p>
+<p>First section of this document describes properties of good tests which are common for almost all types of test regardless of language, framework, etc. Further sections provide recommendations to achieve those properties and other HotSpot and/or GoogleTest specific guidelines.</p>
 <h2 id="good-test-properties">Good test properties</h2>
 <h3 id="lightness">Lightness</h3>
 <p>Use the most lightweight type of tests.</p>
-<p>In Hotspot, there are 3 different types of tests regarding their
-dependency on a JVM, each next level is slower than previous</p>
+<p>In Hotspot, there are 3 different types of tests regarding their dependency on a JVM, each next level is slower than previous</p>
 <ul>
 <li><p><code>TEST</code> : a test does not depend on a JVM</p></li>
-<li><p><code>TEST_VM</code> : a test does depend on an initialized JVM,
-but are supposed not to break a JVM, i.e. leave it in a workable
-state.</p></li>
-<li><p><code>TEST_OTHER_VM</code> : a test depends on a JVM and requires
-a freshly initialized JVM or leaves a JVM in non-workable state</p></li>
+<li><p><code>TEST_VM</code> : a test does depend on an initialized JVM, but are supposed not to break a JVM, i.e. leave it in a workable state.</p></li>
+<li><p><code>TEST_OTHER_VM</code> : a test depends on a JVM and requires a freshly initialized JVM or leaves a JVM in non-workable state</p></li>
 </ul>
 <h3 id="isolation">Isolation</h3>
-<p>Tests have to be isolated: not to have visible side-effects,
-influences on other tests results.</p>
-<p>Results of one test should not depend on test execution order, other
-tests, otherwise it is becoming almost impossible to find out why a test
-failed. Due to hotspot-specific, it is not so easy to get a full
-isolation, e.g. we share an initialized JVM between all
-<code>TEST_VM</code> tests, so if your test changes JVM's state too
-drastically and does not change it back, you had better consider
-<code>TEST_OTHER_VM</code>.</p>
-<h3 id="atomicity-and-self-containment">Atomicity and
-self-containment</h3>
-<p>Tests should be <em>atomic</em> and <em>self-contained</em> at the
-same time.</p>
-<p>One test should check a particular part of a class, subsystem,
-functionality, etc. Then it is quite easy to determine what parts of a
-product are broken basing on test failures. On the other hand, a test
-should test that part more-or-less entirely, because when one sees a
-test <code>FooTest::bar</code>, they assume all aspects of bar from
-<code>Foo</code> are tested.</p>
-<p>However, it is impossible to cover all aspects even of a method, not
-to mention a subsystem. In such cases, it is recommended to have several
-tests, one for each aspect of a thing under test. For example one test
-to tests how <code>Foo::bar</code> works if an argument is
-<code>null</code>, another test to test how it works if an argument is
-acceptable but <code>Foo</code> is not in the right state to accept it
-and so on. This helps not only to make tests atomic, self-contained but
-also makes test name self-descriptive (discussed in more details in <a
-href="#test-names">Test names</a>).</p>
+<p>Tests have to be isolated: not to have visible side-effects, influences on other tests results.</p>
+<p>Results of one test should not depend on test execution order, other tests, otherwise it is becoming almost impossible to find out why a test failed. Due to hotspot-specific, it is not so easy to get a full isolation, e.g. we share an initialized JVM between all <code>TEST_VM</code> tests, so if your test changes JVM's state too drastically and does not change it back, you had better consider <code>TEST_OTHER_VM</code>.</p>
+<h3 id="atomicity-and-self-containment">Atomicity and self-containment</h3>
+<p>Tests should be <em>atomic</em> and <em>self-contained</em> at the same time.</p>
+<p>One test should check a particular part of a class, subsystem, functionality, etc. Then it is quite easy to determine what parts of a product are broken basing on test failures. On the other hand, a test should test that part more-or-less entirely, because when one sees a test <code>FooTest::bar</code>, they assume all aspects of bar from <code>Foo</code> are tested.</p>
+<p>However, it is impossible to cover all aspects even of a method, not to mention a subsystem. In such cases, it is recommended to have several tests, one for each aspect of a thing under test. For example one test to tests how <code>Foo::bar</code> works if an argument is <code>null</code>, another test to test how it works if an argument is acceptable but <code>Foo</code> is not in the right state to accept it and so on. This helps not only to make tests atomic, self-contained but also makes test name self-descriptive (discussed in more details in <a href="#test-names">Test names</a>).</p>
 <h3 id="repeatability">Repeatability</h3>
 <p>Tests have to be repeatable.</p>
-<p>Reproducibility is very crucial for a test. No one likes sporadic
-test failures, they are hard to investigate, fix and verify a fix.</p>
-<p>In some cases, it is quite hard to write a 100% repeatable test,
-since besides a test there can be other moving parts, e.g. in case of
-<code>TEST_VM</code> there are several concurrently running threads.
-Despite this, we should try to make a test as reproducible as
-possible.</p>
+<p>Reproducibility is very crucial for a test. No one likes sporadic test failures, they are hard to investigate, fix and verify a fix.</p>
+<p>In some cases, it is quite hard to write a 100% repeatable test, since besides a test there can be other moving parts, e.g. in case of <code>TEST_VM</code> there are several concurrently running threads. Despite this, we should try to make a test as reproducible as possible.</p>
 <h3 id="informativeness">Informativeness</h3>
-<p>In case of a failure, a test should be as <em>informative</em> as
-possible.</p>
-<p>Having more information about a test failure than just compared
-values can be very useful for failure troubleshooting, it can reduce or
-even completely eliminate debugging hours. This is even more important
-in case of not 100% reproducible failures.</p>
-<p>Achieving this property, one can easily make a test too verbose, so
-it will be really hard to find useful information in the ocean of
-useless information. Hence they should not only think about how to
-provide <a href="#error-messages">good information</a>, but also <a
-href="#uncluttered-output">when to do it</a>.</p>
+<p>In case of a failure, a test should be as <em>informative</em> as possible.</p>
+<p>Having more information about a test failure than just compared values can be very useful for failure troubleshooting, it can reduce or even completely eliminate debugging hours. This is even more important in case of not 100% reproducible failures.</p>
+<p>Achieving this property, one can easily make a test too verbose, so it will be really hard to find useful information in the ocean of useless information. Hence they should not only think about how to provide <a href="#error-messages">good information</a>, but also <a href="#uncluttered-output">when to do it</a>.</p>
 <h3 id="testing-instead-of-visiting">Testing instead of visiting</h3>
 <p>Tests should <em>test</em>.</p>
-<p>It is not enough just to "visit" some code, a test should check that
-code does that it has to do, compare return values with expected values,
-check that desired side effects are done, and undesired are not, and so
-on. In other words, a test should contain at least one GoogleTest
-assertion and do not rely on JVM asserts.</p>
-<p>Generally speaking to write a good test, one should create a model of
-the system under tests, a model of possible bugs (or bugs which one
-wants to find) and design tests using those models.</p>
+<p>It is not enough just to &quot;visit&quot; some code, a test should check that code does that it has to do, compare return values with expected values, check that desired side effects are done, and undesired are not, and so on. In other words, a test should contain at least one GoogleTest assertion and do not rely on JVM asserts.</p>
+<p>Generally speaking to write a good test, one should create a model of the system under tests, a model of possible bugs (or bugs which one wants to find) and design tests using those models.</p>
 <h3 id="nearness">Nearness</h3>
 <p>Prefer having checks inside test code.</p>
-<p>Not only does having test logic outside, e.g. verification method,
-depending on asserts in product code contradict with several items above
-but also decreases test’s readability and stability. It is much easier
-to understand that a test is testing when all testing logic is located
-inside a test or nearby in shared test libraries. As a rule of thumb,
-the closer a check to a test, the better.</p>
+<p>Not only does having test logic outside, e.g. verification method, depending on asserts in product code contradict with several items above but also decreases test’s readability and stability. It is much easier to understand that a test is testing when all testing logic is located inside a test or nearby in shared test libraries. As a rule of thumb, the closer a check to a test, the better.</p>
 <h2 id="asserts">Asserts</h2>
 <h3 id="several-checks">Several checks</h3>
 <p>Prefer <code>EXPECT</code> over <code>ASSERT</code> if possible.</p>
-<p>This is related to the <a href="#informativeness">informativeness</a>
-property of tests, information for other checks can help to better
-localize a defect’s root-cause. One should use <code>ASSERT</code> if it
-is impossible to continue test execution or if it does not make much
-sense. Later in the text, <code>EXPECT</code> forms will be used to
-refer to both <code>ASSERT/EXPECT</code>.</p>
-<p>When it is possible to make several different checks, but impossible
-to continue test execution if at least one check fails, you can use
-<code>::testing::Test::HasNonfatalFailure()</code> function. The
-recommended way to express that is
-<code>ASSERT_FALSE(::testing::Test::HasNonfatalFailure())</code>.
-Besides making it clear why a test is aborted, it also allows you to
-provide more information about a failure.</p>
-<h3 id="first-parameter-is-expected-value">First parameter is expected
-value</h3>
-<p>In all equality assertions, expected values should be passed as the
-first parameter.</p>
-<p>This convention is adopted by GoogleTest, and there is a slight
-difference in how GoogleTest treats parameters, the most important one
-is <code>null</code> detection. Due to different reasons,
-<code>null</code> detection is enabled only for the first parameter,
-that is to said <code>EXPECT_EQ(NULL, object)</code> checks that object
-is <code>null</code>, while <code>EXPECT_EQ(object, NULL)</code> checks
-that object equals to <code>NULL</code>, GoogleTest is very strict
-regarding types of compared values so the latter will generates a
-compile-time error.</p>
+<p>This is related to the <a href="#informativeness">informativeness</a> property of tests, information for other checks can help to better localize a defect’s root-cause. One should use <code>ASSERT</code> if it is impossible to continue test execution or if it does not make much sense. Later in the text, <code>EXPECT</code> forms will be used to refer to both <code>ASSERT/EXPECT</code>.</p>
+<p>When it is possible to make several different checks, but impossible to continue test execution if at least one check fails, you can use <code>::testing::Test::HasNonfatalFailure()</code> function. The recommended way to express that is <code>ASSERT_FALSE(::testing::Test::HasNonfatalFailure())</code>. Besides making it clear why a test is aborted, it also allows you to provide more information about a failure.</p>
+<h3 id="first-parameter-is-expected-value">First parameter is expected value</h3>
+<p>In all equality assertions, expected values should be passed as the first parameter.</p>
+<p>This convention is adopted by GoogleTest, and there is a slight difference in how GoogleTest treats parameters, the most important one is <code>null</code> detection. Due to different reasons, <code>null</code> detection is enabled only for the first parameter, that is to said <code>EXPECT_EQ(NULL, object)</code> checks that object is <code>null</code>, while <code>EXPECT_EQ(object, NULL)</code> checks that object equals to <code>NULL</code>, GoogleTest is very strict regarding types of compared values so the latter will generates a compile-time error.</p>
 <h3 id="floating-point-comparison">Floating-point comparison</h3>
-<p>Use floating-point special macros to compare
-<code>float/double</code> values.</p>
-<p>Because of floating-point number representations and round-off
-errors, regular equality comparison will not return true in most cases.
-There are special <code>EXPECT_FLOAT_EQ/EXPECT_DOUBLE_EQ</code>
-assertions which check that the distance between compared values is not
-more than 4 ULPs, there is also <code>EXPECT_NEAR(v1, v2, eps)</code>
-which checks that the absolute value of the difference between
-<code>v1</code> and <code>v2</code> is not greater than
-<code>eps</code>.</p>
+<p>Use floating-point special macros to compare <code>float/double</code> values.</p>
+<p>Because of floating-point number representations and round-off errors, regular equality comparison will not return true in most cases. There are special <code>EXPECT_FLOAT_EQ/EXPECT_DOUBLE_EQ</code> assertions which check that the distance between compared values is not more than 4 ULPs, there is also <code>EXPECT_NEAR(v1, v2, eps)</code> which checks that the absolute value of the difference between <code>v1</code> and <code>v2</code> is not greater than <code>eps</code>.</p>
 <h3 id="c-string-comparison">C string comparison</h3>
 <p>Use string special macros for C strings comparisons.</p>
-<p><code>EXPECT_EQ</code> just compares pointers’ values, which is
-hardly what one wants comparing C strings. GoogleTest provides
-<code>EXPECT_STREQ</code> and <code>EXPECT_STRNE</code> macros to
-compare C string contents. There are also case-insensitive versions
-<code>EXPECT_STRCASEEQ</code>, <code>EXPECT_STRCASENE</code>.</p>
+<p><code>EXPECT_EQ</code> just compares pointers’ values, which is hardly what one wants comparing C strings. GoogleTest provides <code>EXPECT_STREQ</code> and <code>EXPECT_STRNE</code> macros to compare C string contents. There are also case-insensitive versions <code>EXPECT_STRCASEEQ</code>, <code>EXPECT_STRCASENE</code>.</p>
 <h3 id="error-messages">Error messages</h3>
 <p>Provide informative, but not too verbose error messages.</p>
-<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>
-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
-print out all parameters values.</p>
-<p>However in some cases, default information is not enough, a commonly
-used example is an assert inside a loop, GoogleTest will not print
-iteration values (unless it is an assert's parameter). Other
-demonstrative examples are printing error code and a corresponding error
-message; printing internal states which might have an impact on results.
-One should add this information to assert message using
-<code>&lt;&lt;</code> operator.</p>
+<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> 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 print out all parameters values.</p>
+<p>However in some cases, default information is not enough, a commonly used example is an assert inside a loop, GoogleTest will not print iteration values (unless it is an assert's parameter). Other demonstrative examples are printing error code and a corresponding error message; printing internal states which might have an impact on results. One should add this information to assert message using <code>&lt;&lt;</code> operator.</p>
 <h3 id="uncluttered-output">Uncluttered output</h3>
 <p>Print information only if it is needed.</p>
-<p>Too verbose tests which print all information even if they pass are
-very bad practice. They just pollute output, so it becomes harder to
-find useful information. In order not print information till it is
-really needed, one should consider saving it to a temporary buffer and
-pass to an assert. <a
-href="https://git.openjdk.org/jdk/blob/master/test/hotspot/gtest/gc/shared/test_memset_with_concurrent_readers.cpp"
-class="uri">https://git.openjdk.org/jdk/blob/master/test/hotspot/gtest/gc/shared/test_memset_with_concurrent_readers.cpp</a>
-has a good example how to do that.</p>
+<p>Too verbose tests which print all information even if they pass are very bad practice. They just pollute output, so it becomes harder to find useful information. In order not print information till it is really needed, one should consider saving it to a temporary buffer and pass to an assert. <a href="https://hg.openjdk.java.net/jdk/jdk/file/tip/test/hotspot/gtest/gc/shared/test_memset_with_concurrent_readers.cpp" class="uri">https://hg.openjdk.java.net/jdk/jdk/file/tip/test/hotspot/gtest/gc/shared/test_memset_with_concurrent_readers.cpp</a> has a good example how to do that.</p>
 <h3 id="failures-propagation">Failures propagation</h3>
-<p>Wrap a subroutine call into <code>EXPECT_NO_FATAL_FAILURE</code>
-macro to propagate failures.</p>
-<p><code>ASSERT</code> and <code>FAIL</code> abort only the current
-function, so if you have them in a subroutine, a test will not be
-aborted after the subroutine even if <code>ASSERT</code> or
-<code>FAIL</code> fails. You should call such subroutines in
-<code>ASSERT_NO_FATAL_FAILURE</code> macro to propagate fatal failures
-and abort a test. <code>(EXPECT|ASSERT)_NO_FATAL_FAILURE</code> can also
-be used to provide more information.</p>
-<p>Due to obvious reasons, there are no
-<code>(EXPECT|ASSERT)_NO_NONFATAL_FAILURE</code> macros. However, if you
-need to check if a subroutine generated a nonfatal failure (failed an
-<code>EXPECT</code>), you can use
-<code>::testing::Test::HasNonfatalFailure</code> function, or
-<code>::testing::Test::HasFailure</code> function to check if a
-subroutine generated any failures, see <a href="#several-checks">Several
-checks</a>.</p>
+<p>Wrap a subroutine call into <code>EXPECT_NO_FATAL_FAILURE</code> macro to propagate failures.</p>
+<p><code>ASSERT</code> and <code>FAIL</code> abort only the current function, so if you have them in a subroutine, a test will not be aborted after the subroutine even if <code>ASSERT</code> or <code>FAIL</code> fails. You should call such subroutines in <code>ASSERT_NO_FATAL_FAILURE</code> macro to propagate fatal failures and abort a test. <code>(EXPECT|ASSERT)_NO_FATAL_FAILURE</code> can also be used to provide more information.</p>
+<p>Due to obvious reasons, there are no <code>(EXPECT|ASSERT)_NO_NONFATAL_FAILURE</code> macros. However, if you need to check if a subroutine generated a nonfatal failure (failed an <code>EXPECT</code>), you can use <code>::testing::Test::HasNonfatalFailure</code> function, or <code>::testing::Test::HasFailure</code> function to check if a subroutine generated any failures, see <a href="#several-checks">Several checks</a>.</p>
 <h2 id="naming-and-grouping">Naming and Grouping</h2>
 <h3 id="test-group-names">Test group names</h3>
-<p>Test group names should be in CamelCase, start and end with a letter.
-A test group should be named after tested class, functionality,
-subsystem, etc.</p>
-<p>This naming scheme helps to find tests, filter them and simplifies
-test failure analysis. For example, class <code>Foo</code> - test group
-<code>Foo</code>, compiler logging subsystem - test group
-<code>CompilerLogging</code>, G1 GC — test group <code>G1GC</code>, and
-so forth.</p>
+<p>Test group names should be in CamelCase, start and end with a letter. A test group should be named after tested class, functionality, subsystem, etc.</p>
+<p>This naming scheme helps to find tests, filter them and simplifies test failure analysis. For example, class <code>Foo</code> - test group <code>Foo</code>, compiler logging subsystem - test group <code>CompilerLogging</code>, G1 GC — test group <code>G1GC</code>, and so forth.</p>
 <h3 id="filename">Filename</h3>
-<p>A test file must have <code>test_</code> prefix and <code>.cpp</code>
-suffix.</p>
-<p>Both are actually requirements from the current build system to
-recognize your tests.</p>
+<p>A test file must have <code>test_</code> prefix and <code>.cpp</code> suffix.</p>
+<p>Both are actually requirements from the current build system to recognize your tests.</p>
 <h3 id="file-location">File location</h3>
-<p>Test file location should reflect a location of the tested part of
-the product.</p>
+<p>Test file location should reflect a location of the tested part of the product.</p>
 <ul>
-<li><p>All unit tests for a class from <code>foo/bar/baz.cpp</code>
-should be placed <code>foo/bar/test_baz.cpp</code> in
-<code>hotspot/test/native/</code> directory. Having all tests for a
-class in one file is a common practice for unit tests, it helps to see
-all existing tests at once, share functions and/or resources without
-losing encapsulation.</p></li>
-<li><p>For tests which test more than one class, directory hierarchy
-should be the same as product hierarchy, and file name should reflect
-the name of the tested subsystem/functionality. For example, if a
-sub-system under tests belongs to <code>gc/g1</code>, tests should be
-placed in <code>gc/g1</code> directory.</p></li>
+<li><p>All unit tests for a class from <code>foo/bar/baz.cpp</code> should be placed <code>foo/bar/test_baz.cpp</code> in <code>hotspot/test/native/</code> directory. Having all tests for a class in one file is a common practice for unit tests, it helps to see all existing tests at once, share functions and/or resources without losing encapsulation.</p></li>
+<li><p>For tests which test more than one class, directory hierarchy should be the same as product hierarchy, and file name should reflect the name of the tested subsystem/functionality. For example, if a sub-system under tests belongs to <code>gc/g1</code>, tests should be placed in <code>gc/g1</code> directory.</p></li>
 </ul>
-<p>Please note that framework prepends directory name to a test group
-name. For example, if <code>TEST(foo, check_this)</code> and
-<code>TEST(bar, check_that)</code> are defined in
-<code>hotspot/test/native/gc/shared/test_foo.cpp</code> file, they will
-be reported as <code>gc/shared/foo::check_this</code> and
-<code>gc/shared/bar::check_that</code>.</p>
+<p>Please note that framework prepends directory name to a test group name. For example, if <code>TEST(foo, check_this)</code> and <code>TEST(bar, check_that)</code> are defined in <code>hotspot/test/native/gc/shared/test_foo.cpp</code> file, they will be reported as <code>gc/shared/foo::check_this</code> and <code>gc/shared/bar::check_that</code>.</p>
 <h3 id="test-names">Test names</h3>
-<p>Test names should be in small_snake_case, start and end with a
-letter. A test name should reflect that a test checks.</p>
-<p>Such naming makes tests self-descriptive and helps a lot during the
-whole test life cycle. It is easy to do test planning, test inventory,
-to see what things are not tested, to review tests, to analyze test
-failures, to evolve a test, etc. For example
-<code>foo_return_0_if_name_is_null</code> is better than
-<code>foo_sanity</code> or <code>foo_basic</code> or just
-<code>foo</code>,
-<code>humongous_objects_can_not_be_moved_by_young_gc</code> is better
-than <code>ho_young_gc</code>.</p>
-<p>Actually using underscore is against GoogleTest project convention,
-because it can lead to illegal identifiers, however, this is too strict.
-Restricting usage of underscore for test names only and prohibiting test
-name starts or ends with an underscore are enough to be safe.</p>
+<p>Test names should be in small_snake_case, start and end with a letter. A test name should reflect that a test checks.</p>
+<p>Such naming makes tests self-descriptive and helps a lot during the whole test life cycle. It is easy to do test planning, test inventory, to see what things are not tested, to review tests, to analyze test failures, to evolve a test, etc. For example <code>foo_return_0_if_name_is_null</code> is better than <code>foo_sanity</code> or <code>foo_basic</code> or just <code>foo</code>, <code>humongous_objects_can_not_be_moved_by_young_gc</code> is better than <code>ho_young_gc</code>.</p>
+<p>Actually using underscore is against GoogleTest project convention, because it can lead to illegal identifiers, however, this is too strict. Restricting usage of underscore for test names only and prohibiting test name starts or ends with an underscore are enough to be safe.</p>
 <h3 id="fixture-classes">Fixture classes</h3>
-<p>Fixture classes should be named after tested classes, subsystems, etc
-(follow <a href="#test-group-names">Test group names rule</a>) and have
-<code>Test</code> suffix to prevent class name conflicts.</p>
+<p>Fixture classes should be named after tested classes, subsystems, etc (follow <a href="#test-group-names">Test group names rule</a>) and have <code>Test</code> suffix to prevent class name conflicts.</p>
 <h3 id="friend-classes">Friend classes</h3>
-<p>All test purpose friends should have either <code>Test</code> or
-<code>Testable</code> suffix.</p>
-<p>It greatly simplifies understanding of friendship’s purpose and
-allows statically check that private members are not exposed
-unexpectedly. Having <code>FooTest</code> as a friend of
-<code>Foo</code> without any comments will be understood as a necessary
-evil to get testability.</p>
+<p>All test purpose friends should have either <code>Test</code> or <code>Testable</code> suffix.</p>
+<p>It greatly simplifies understanding of friendship’s purpose and allows statically check that private members are not exposed unexpectedly. Having <code>FooTest</code> as a friend of <code>Foo</code> without any comments will be understood as a necessary evil to get testability.</p>
 <h3 id="oscpu-specific-tests">OS/CPU specific tests</h3>
-<p>Guard OS/CPU specific tests by <code>#ifdef</code> and have OS/CPU
-name in filename.</p>
-<p>For the time being, we do not support separate directories for OS,
-CPU, OS-CPU specific tests, in case we will have lots of such tests, we
-will change directory layout and build system to support that in the
-same way it is done in hotspot.</p>
+<p>Guard OS/CPU specific tests by <code>#ifdef</code> and have OS/CPU name in filename.</p>
+<p>For the time being, we do not support separate directories for OS, CPU, OS-CPU specific tests, in case we will have lots of such tests, we will change directory layout and build system to support that in the same way it is done in hotspot.</p>
 <h2 id="miscellaneous">Miscellaneous</h2>
 <h3 id="hotspot-style">Hotspot style</h3>
 <p>Abide the norms and rules accepted in Hotspot style guide.</p>
-<p>Tests are a part of Hotspot, so everything (if applicable) we use for
-Hotspot, should be used for tests as well. Those guidelines cover
-test-specific things.</p>
+<p>Tests are a part of Hotspot, so everything (if applicable) we use for Hotspot, should be used for tests as well. Those guidelines cover test-specific things.</p>
 <h3 id="codetest-metrics">Code/test metrics</h3>
-<p>Coverage information and other code/test metrics are quite useful to
-decide what tests should be written, what tests should be improved and
-what can be removed.</p>
-<p>For unit tests, widely used and well-known coverage metric is branch
-coverage, which provides good quality of tests with relatively easy test
-development process. For other levels of testing, branch coverage is not
-as good, and one should consider others metrics, e.g. transaction flow
-coverage, data flow coverage.</p>
+<p>Coverage information and other code/test metrics are quite useful to decide what tests should be written, what tests should be improved and what can be removed.</p>
+<p>For unit tests, widely used and well-known coverage metric is branch coverage, which provides good quality of tests with relatively easy test development process. For other levels of testing, branch coverage is not as good, and one should consider others metrics, e.g. transaction flow coverage, data flow coverage.</p>
 <h3 id="access-to-non-public-members">Access to non-public members</h3>
 <p>Use explicit friend class to get access to non-public members.</p>
-<p>We do not use GoogleTest macro to declare friendship relation,
-because, from our point of view, it is less clear than an explicit
-declaration.</p>
-<p>Declaring a test fixture class as a friend class of a tested test is
-the easiest and the clearest way to get access. However, it has some
-disadvantages, here is some of them:</p>
+<p>We do not use GoogleTest macro to declare friendship relation, because, from our point of view, it is less clear than an explicit declaration.</p>
+<p>Declaring a test fixture class as a friend class of a tested test is the easiest and the clearest way to get access. However, it has some disadvantages, here is some of them:</p>
 <ul>
 <li>Each test has to be declared as a friend</li>
 <li>Subclasses do not inheritance friendship relation</li>
 </ul>
-<p>In other words, it is harder to share code between tests. Hence if
-you want to share code or expect it to be useful in other tests, you
-should consider making members in a tested class protected and introduce
-a shared test-only class which expose those members via public
-functions, or even making members publicly accessible right away in a
-product class. If it is not an option to change members visibility, one
-can create a friend class which exposes members.</p>
+<p>In other words, it is harder to share code between tests. Hence if you want to share code or expect it to be useful in other tests, you should consider making members in a tested class protected and introduce a shared test-only class which expose those members via public functions, or even making members publicly accessible right away in a product class. If it is not an option to change members visibility, one can create a friend class which exposes members.</p>
 <h3 id="death-tests">Death tests</h3>
-<p>You can not use death tests inside <code>TEST_OTHER_VM</code> and
-<code>TEST_VM_ASSERT*</code>.</p>
-<p>We tried to make Hotspot-GoogleTest integration as transparent as
-possible, however, due to the current implementation of
-<code>TEST_OTHER_VM</code> and <code>TEST_VM_ASSERT*</code> tests, you
-cannot use death test functionality in them. These tests are implemented
-as GoogleTest death tests, and GoogleTest does not allow to have a death
-test inside another death test.</p>
+<p>You can not use death tests inside <code>TEST_OTHER_VM</code> and <code>TEST_VM_ASSERT*</code>.</p>
+<p>We tried to make Hotspot-GoogleTest integration as transparent as possible, however, due to the current implementation of <code>TEST_OTHER_VM</code> and <code>TEST_VM_ASSERT*</code> tests, you cannot use death test functionality in them. These tests are implemented as GoogleTest death tests, and GoogleTest does not allow to have a death test inside another death test.</p>
 <h3 id="external-flags">External flags</h3>
 <p>Passing external flags to a tested JVM is not supported.</p>
-<p>The rationality of such design decision is to simplify both tests and
-a test framework and to avoid failures related to incompatible flags
-combination till there is a good solution for that. However there are
-cases when one wants to test a JVM with specific flags combination,
-<code>_JAVA_OPTIONS</code> environment variable can be used to do that.
-Flags from <code>_JAVA_OPTIONS</code> will be used in
-<code>TEST_VM</code>, <code>TEST_OTHER_VM</code> and
-<code>TEST_VM_ASSERT*</code> tests.</p>
+<p>The rationality of such design decision is to simplify both tests and a test framework and to avoid failures related to incompatible flags combination till there is a good solution for that. However there are cases when one wants to test a JVM with specific flags combination, <code>_JAVA_OPTIONS</code> environment variable can be used to do that. Flags from <code>_JAVA_OPTIONS</code> will be used in <code>TEST_VM</code>, <code>TEST_OTHER_VM</code> and <code>TEST_VM_ASSERT*</code> tests.</p>
 <h3 id="test-specific-flags">Test-specific flags</h3>
-<p>Passing flags to a tested JVM in <code>TEST_OTHER_VM</code> and
-<code>TEST_VM_ASSERT*</code> should be possible, but is not implemented
-yet.</p>
-<p>Facility to pass test-specific flags is needed for system, regression
-or other types of tests which require a fully initialized JVM in some
-particular configuration, e.g. with Serial GC selected. There is no
-support for such tests now, however, there is a plan to add that in
-upcoming releases.</p>
-<p>For now, if a test depends on flags values, it should have
-<code>if (!&lt;flag&gt;) { return }</code> guards in the very beginning
-and <code>@requires</code> comment similar to jtreg
-<code>@requires</code> directive right before test macros. <a
-href="https://git.openjdk.org/jdk/blob/master/test/hotspot/gtest/gc/g1/test_g1IHOPControl.cpp"
-class="uri">https://git.openjdk.org/jdk/blob/master/test/hotspot/gtest/gc/g1/test_g1IHOPControl.cpp</a>
-ha an example of this temporary workaround. It is important to follow
-that pattern as it allows us to easily find all such tests and update
-them as soon as there is an implementation of flag passing facility.</p>
-<p>In long-term, we expect jtreg to support GoogleTest tests as first
-class citizens, that is to say, jtreg will parse <span class="citation"
-data-cites="requires">@requires</span> comments and filter out
-inapplicable tests.</p>
+<p>Passing flags to a tested JVM in <code>TEST_OTHER_VM</code> and <code>TEST_VM_ASSERT*</code> should be possible, but is not implemented yet.</p>
+<p>Facility to pass test-specific flags is needed for system, regression or other types of tests which require a fully initialized JVM in some particular configuration, e.g. with Serial GC selected. There is no support for such tests now, however, there is a plan to add that in upcoming releases.</p>
+<p>For now, if a test depends on flags values, it should have <code>if (!&lt;flag&gt;) { return }</code> guards in the very beginning and <code>@requires</code> comment similar to jtreg <code>@requires</code> directive right before test macros. <a href="https://hg.openjdk.java.net/jdk/jdk/file/tip/test/hotspot/gtest/gc/g1/test_g1IHOPControl.cpp" class="uri">https://hg.openjdk.java.net/jdk/jdk/file/tip/test/hotspot/gtest/gc/g1/test_g1IHOPControl.cpp</a> ha an example of this temporary workaround. It is important to follow that pattern as it allows us to easily find all such tests and update them as soon as there is an implementation of flag passing facility.</p>
+<p>In long-term, we expect jtreg to support GoogleTest tests as first class citizens, that is to say, jtreg will parse <span class="citation" data-cites="requires">@requires</span> comments and filter out inapplicable tests.</p>
 <h3 id="flag-restoring">Flag restoring</h3>
 <p>Restore changed flags.</p>
-<p>It is quite common for tests to configure JVM in a certain way
-changing flags’ values. GoogleTest provides two ways to set up
-environment before a test and restore it afterward: using either
-constructor and destructor or <code>SetUp</code> and
-<code>TearDown</code> functions. Both ways require to use a test fixture
-class, which sometimes is too wordy. The simpler facilities like
-<code>FLAG_GUARD</code> macro or <code>*FlagSetting</code> classes could
-be used in such cases to restore/set values.</p>
+<p>It is quite common for tests to configure JVM in a certain way changing flags’ values. GoogleTest provides two ways to set up environment before a test and restore it afterward: using either constructor and destructor or <code>SetUp</code> and <code>TearDown</code> functions. Both ways require to use a test fixture class, which sometimes is too wordy. The simpler facilities like <code>FLAG_GUARD</code> macro or <code>*FlagSetting</code> classes could be used in such cases to restore/set values.</p>
 <p>Caveats:</p>
 <ul>
-<li><p>Changing a flag’s value could break the invariants between flags'
-values and hence could lead to unexpected/unsupported JVM
-state.</p></li>
-<li><p><code>FLAG_SET_*</code> macros can change more than one flag (in
-order to maintain invariants) so it is hard to predict what flags will
-be changed and it makes restoring all changed flags a nontrivial task.
-Thus in case one uses <code>FLAG_SET_*</code> macros, they should use
-<code>TEST_OTHER_VM</code> test type.</p></li>
+<li><p>Changing a flag’s value could break the invariants between flags' values and hence could lead to unexpected/unsupported JVM state.</p></li>
+<li><p><code>FLAG_SET_*</code> macros can change more than one flag (in order to maintain invariants) so it is hard to predict what flags will be changed and it makes restoring all changed flags a nontrivial task. Thus in case one uses <code>FLAG_SET_*</code> macros, they should use <code>TEST_OTHER_VM</code> test type.</p></li>
 </ul>
 <h3 id="googletest-documentation">GoogleTest documentation</h3>
-<p>In case you have any questions regarding GoogleTest itself, its
-asserts, test declaration macros, other macros, etc, please consult its
-documentation.</p>
+<p>In case you have any questions regarding GoogleTest itself, its asserts, test declaration macros, other macros, etc, please consult its documentation.</p>
 <h2 id="todo">TODO</h2>
-<p>Although this document provides guidelines on the most important
-parts of test development using GTest, it still misses a few items:</p>
+<p>Although this document provides guidelines on the most important parts of test development using GTest, it still misses a few items:</p>
 <ul>
-<li><p>Examples, esp for <a href="#access-to-non-public-members">access
-to non-public members</a></p></li>
-<li><p>test types: purpose, drawbacks, limitation</p>
+<li><p>Examples, esp for <a href="#access-to-non-public-members">access to non-public members</a></p></li>
+<li>test types: purpose, drawbacks, limitation
 <ul>
 <li><code>TEST_VM</code></li>
 <li><code>TEST_VM_F</code></li>
@@ -471,7 +195,7 @@ to non-public members</a></p></li>
 <li><code>TEST_VM_ASSERT</code></li>
 <li><code>TEST_VM_ASSERT_MSG</code></li>
 </ul></li>
-<li><p>Miscellaneous</p>
+<li>Miscellaneous
 <ul>
 <li>Test libraries
 <ul>
@@ -484,8 +208,7 @@ to non-public members</a></p></li>
 <li>how to run tests in random order</li>
 <li>how to run only specific tests</li>
 <li>how to run each test separately</li>
-<li>check that a test can find bugs it is supposed to by introducing
-them</li>
+<li>check that a test can find bugs it is supposed to by introducing them</li>
 </ul></li>
 <li>mocks/stubs/dependency injection</li>
 <li>setUp/tearDown

doc/hotspot-unit-tests.md

@@ -100,7 +100,7 @@ Generally speaking to write a good test, one should create a model of
 the system under tests, a model of possible bugs (or bugs which one
 wants to find) and design tests using those models.
 
-### Nearness
+### Nearness 
 
 Prefer having checks inside test code.
 
@@ -156,7 +156,7 @@ that the distance between compared values is not more than 4 ULPs,
 there is also `EXPECT_NEAR(v1, v2, eps)` which checks that the absolute
 value of the difference between `v1` and `v2` is not greater than `eps`.
 
-### C string comparison
+### C string comparison 
 
 Use string special macros for C strings comparisons.
 
@@ -194,7 +194,7 @@ very bad practice. They just pollute output, so it becomes harder to
 find useful information. In order not print information till it is
 really needed, one should consider saving it to a temporary buffer and
 pass to an assert.
-<https://git.openjdk.org/jdk/blob/master/test/hotspot/gtest/gc/shared/test_memset_with_concurrent_readers.cpp>
+<https://hg.openjdk.java.net/jdk/jdk/file/tip/test/hotspot/gtest/gc/shared/test_memset_with_concurrent_readers.cpp>
 has a good example how to do that.
 
 ### Failures propagation
@@ -229,7 +229,7 @@ test failure analysis. For example, class `Foo` - test group `Foo`,
 compiler logging subsystem - test group `CompilerLogging`, G1 GC — test
 group `G1GC`, and so forth.
 
-### Filename
+### Filename 
 
 A test file must have `test_` prefix and `.cpp` suffix.
 
@@ -283,7 +283,7 @@ Fixture classes should be named after tested classes, subsystems, etc
 (follow [Test group names rule](#test-group-names)) and have
 `Test` suffix to prevent class name conflicts.
 
-### Friend classes
+### Friend classes 
 
 All test purpose friends should have either `Test` or `Testable` suffix.
 
@@ -303,7 +303,7 @@ the same way it is done in hotspot.
 
 ## Miscellaneous
 
-### Hotspot style
+### Hotspot style 
 
 Abide the norms and rules accepted in Hotspot style guide.
 
@@ -383,7 +383,7 @@ upcoming releases.
 For now, if a test depends on flags values, it should have `if
 (!<flag>) { return }` guards in the very beginning and `@requires`
 comment similar to jtreg `@requires` directive right before test macros.
-<https://git.openjdk.org/jdk/blob/master/test/hotspot/gtest/gc/g1/test_g1IHOPControl.cpp>
+<https://hg.openjdk.java.net/jdk/jdk/file/tip/test/hotspot/gtest/gc/g1/test_g1IHOPControl.cpp>
 ha an example of this temporary workaround.  It is important to follow
 that pattern as it allows us to easily find all such tests and update
 them as soon as there is an implementation of flag passing facility.
@@ -392,7 +392,7 @@ In long-term, we expect jtreg to support GoogleTest tests as first
 class citizens, that is to say, jtreg will parse @requires comments
 and filter out inapplicable tests.
 
-### Flag restoring
+### Flag restoring 
 
 Restore changed flags.
 
@@ -404,7 +404,7 @@ require to use a test fixture class, which sometimes is too wordy. The
 simpler facilities like `FLAG_GUARD` macro or `*FlagSetting` classes could
 be used in such cases to restore/set values.
 
-Caveats:
+Caveats: 
 
 * Changing a flag’s value could break the invariants between flags' values and hence could lead to unexpected/unsupported JVM state.
 

doc/ide.html

@@ -5,19 +5,11 @@
   <meta name="generator" content="pandoc" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
   <title>IDE support in the JDK</title>
-  <style>
-    code{white-space: pre-wrap;}
-    span.smallcaps{font-variant: small-caps;}
-    div.columns{display: flex; gap: min(4vw, 1.5em);}
-    div.column{flex: auto; overflow-x: auto;}
-    div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
-    ul.task-list{list-style: none;}
-    ul.task-list li input[type="checkbox"] {
-      width: 0.8em;
-      margin: 0 0.8em 0.2em -1.6em;
-      vertical-align: middle;
-    }
-    .display.math{display: block; text-align: center; margin: 0.5rem auto;}
+  <style type="text/css">
+      code{white-space: pre-wrap;}
+      span.smallcaps{font-variant: small-caps;}
+      span.underline{text-decoration: underline;}
+      div.column{display: inline-block; vertical-align: top; width: 50%;}
   </style>
   <link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css" />
   <!--[if lt IE 9]>
@@ -28,144 +20,41 @@
 <header id="title-block-header">
 <h1 class="title">IDE support in the JDK</h1>
 </header>
-<nav id="TOC" role="doc-toc">
+<nav id="TOC">
 <ul>
-<li><a href="#introduction" id="toc-introduction">Introduction</a>
-<ul>
-<li><a href="#ide-support-for-native-code"
-id="toc-ide-support-for-native-code">IDE support for native
-code</a></li>
-<li><a href="#ide-support-for-java-code"
-id="toc-ide-support-for-java-code">IDE support for Java code</a></li>
+<li><a href="#introduction">Introduction</a><ul>
+<li><a href="#ide-support-for-native-code">IDE support for native code</a></li>
+<li><a href="#ide-support-for-java-code">IDE support for Java code</a></li>
 </ul></li>
 </ul>
 </nav>
 <h2 id="introduction">Introduction</h2>
-<p>When you are familiar with building and testing the JDK, you may want
-to configure an IDE to work with the source code. The instructions
-differ a bit depending on whether you are interested in working with the
-native (C/C++) or the Java code.</p>
+<p>When you are familiar with building and testing the JDK, you may want to configure an IDE to work with the source code. The instructions differ a bit depending on whether you are interested in working with the native (C/C++) or the Java code.</p>
 <h3 id="ide-support-for-native-code">IDE support for native code</h3>
-<p>There are a few ways to generate IDE configuration for the native
-sources, depending on which IDE to use.</p>
+<p>There are a few ways to generate IDE configuration for the native sources, depending on which IDE to use.</p>
 <h4 id="visual-studio-code">Visual Studio Code</h4>
-<p>The make system can generate a <a
-href="https://code.visualstudio.com">Visual Studio Code</a> workspace
-that has C/C++ source indexing configured correctly, as well as launcher
-targets for tests and the Java launcher. After configuring, a workspace
-for the configuration can be generated using:</p>
+<p>The make system can generate a <a href="https://code.visualstudio.com">Visual Studio Code</a> workspace that has C/C++ source indexing configured correctly, as well as launcher targets for tests and the Java launcher. After configuring, a workspace for the configuration can be generated using:</p>
 <pre class="shell"><code>make vscode-project</code></pre>
-<p>This creates a file called <code>jdk.code-workspace</code> in the
-build output folder. The full location will be printed after the
-workspace has been generated. To use it, choose
-<code>File -&gt; Open Workspace...</code> in Visual Studio Code.</p>
+<p>This creates a file called <code>jdk.code-workspace</code> in the build output folder. The full location will be printed after the workspace has been generated. To use it, choose <code>File -&gt; Open Workspace...</code> in Visual Studio Code.</p>
 <h5 id="alternative-indexers">Alternative indexers</h5>
-<p>The main <code>vscode-project</code> target configures the default
-C++ support in Visual Studio Code. There are also other source indexers
-that can be installed, that may provide additional features. It's
-currently possible to generate configuration for two such indexers, <a
-href="https://clang.llvm.org/extra/clangd/">clangd</a> and <a
-href="https://github.com/Andersbakken/rtags">rtags</a>. These can be
-configured by appending the name of the indexer to the make target, such
-as:</p>
+<p>The main <code>vscode-project</code> target configures the default C++ support in Visual Studio Code. There are also other source indexers that can be installed, that may provide additional features. It's currently possible to generate configuration for two such indexers, <a href="https://clang.llvm.org/extra/clangd/">clangd</a> and <a href="https://github.com/Andersbakken/rtags">rtags</a>. These can be configured by appending the name of the indexer to the make target, such as:</p>
 <pre class="shell"><code>make vscode-project-clangd</code></pre>
-<p>Additional instructions for configuring the given indexer will be
-displayed after the workspace has been generated.</p>
+<p>Additional instructions for configuring the given indexer will be displayed after the workspace has been generated.</p>
 <h4 id="visual-studio">Visual Studio</h4>
-<p>The make system can generate a Visual Studio project for the Hotspot
-native source. After configuring, the project is generated using:</p>
+<p>The make system can generate a Visual Studio project for the Hotspot native source. After configuring, the project is generated using:</p>
 <pre class="shell"><code>make hotspot-ide-project</code></pre>
-<p>This creates a file named <code>jvm.vcxproj</code> in
-<code>ide\hotspot-visualstudio</code> subfolder of the build output
-folder. The file can be opened in Visual Studio via
-<code>File -&gt; Open -&gt; Project/Solution</code>.</p>
-<h4 id="eclipse-cdt">Eclipse CDT</h4>
-<p>The make system can generate an Eclipse CDT Workspace that enables
-Eclipse indexing for the C and C++ sources throughout the entire
-codebase, as well as registering all common make targets to be runnable
-from the Eclipse explorer. This can be done after configuring by
-running:</p>
-<pre><code>make eclipse-native-env</code></pre>
-<p>After this is run, simply open and import the workspace in Eclipse
-through
-<code>File -&gt; Import -&gt; Projects from Folder or Archive</code> and
-at <code>Import source</code> click on the directory
-<code>ide\eclipse</code>, which can be found in the build output
-folder.</p>
-<p>If this doesn't work, you can also try
-<code>File -&gt; Import -&gt; Existing Projects into Workspace</code>
-instead.</p>
-<p>Setting up an Eclipse Workspace is relatively lightweight compared to
-other supported IDEs, but requires that your CDT installation has Cross
-GCC support enabled at the moment, even if you aren't cross compiling.
-The Visual C++ compiler is, at present, not supported as an indexer.</p>
-<p>If desired, you can instead request make to only include indexing
-support for just the Java Virtual Machine instead of the entire native
-codebase, by running:</p>
-<pre><code>make eclipse-hotspot-env</code></pre>
-<p>If you think your particular Eclipse installation can handle the
-strain, the make system also supports generating a combined Java and
-C/C++ Workspace for Eclipse which can then conveniently switch between
-Java and C/C++ natures during development by running:</p>
-<pre><code>make eclipse-mixed-env</code></pre>
-<p>Do note that this generates all features that come with both Java and
-C/C++ natures.</p>
-<p>By default, the Eclipse Workspace is located in the ide subdirectory
-in the build output. To share the JDK's source directory with the
-Eclipse Workspace, you can instead run:</p>
-<pre><code>make eclipse-shared-&lt;ENV&gt;-env</code></pre>
-<p>Eclipse support in the JDK is relatively new, so do keep in mind that
-not everything may work at the moment. As such, the resulting Workspace
-also has compilation database parsing support enabled, so you can pass
-Eclipse the compile commands file (see below) if all else fails.</p>
+<p>This creates a file named <code>jvm.vcxproj</code> in <code>ide\hotspot-visualstudio</code> subfolder of the build output folder. The file can be opened in Visual Studio via <code>File -&gt; Open -&gt; Project/Solution</code>.</p>
 <h4 id="compilation-database">Compilation Database</h4>
-<p>The make system can generate generic native code indexing support in
-the form of a <a
-href="https://clang.llvm.org/docs/JSONCompilationDatabase.html">Compilation
-Database</a> that can be used by many different IDEs and source code
-indexers.</p>
+<p>The make system can generate generic native code indexing support in the form of a <a href="https://clang.llvm.org/docs/JSONCompilationDatabase.html">Compilation Database</a> that can be used by many different IDEs and source code indexers.</p>
 <pre class="shell"><code>make compile-commands</code></pre>
-<p>It's also possible to generate the Compilation Database for the
-HotSpot source code only, which is a bit faster as it includes less
-information.</p>
+<p>It's also possible to generate the Compilation Database for the HotSpot source code only, which is a bit faster as it includes less information.</p>
 <pre class="shell"><code>make compile-commands-hotspot</code></pre>
 <h3 id="ide-support-for-java-code">IDE support for Java code</h3>
 <h4 id="intellij-idea">IntelliJ IDEA</h4>
-<p>The JDK project has a script that can be used for indexing the
-project with IntelliJ. After configuring and building the JDK, an
-IntelliJ workspace can be generated by running the following command in
-the top-level folder of the cloned repository:</p>
+<p>The JDK project has a script that can be used for indexing the project with IntelliJ. After configuring and building the JDK, an IntelliJ workspace can be generated by running the following command in the top-level folder of the cloned repository:</p>
 <pre class="shell"><code>bash bin/idea.sh</code></pre>
-<p>To use it, choose <code>File -&gt; Open...</code> in IntelliJ and
-select the folder where you ran the above script.</p>
-<p>Next, configure the project SDK in IntelliJ. Open
-<code>File -&gt; Project Structure -&gt; Project</code> and select
-<code>build/&lt;config&gt;/images/jdk</code> as the SDK to use.</p>
-<p>In order to run the tests from the IDE, you can use the JTReg plugin.
-Instructions for building and using the plugin can be found <a
-href="https://github.com/openjdk/jtreg/tree/master/plugins/idea">here</a>.</p>
-<h4 id="eclipse">Eclipse</h4>
-<p>Eclipse JDT is a widely used Java IDE and has been for a very long
-time, being a popular choice alongside IntelliJ IDEA for Java
-development. Likewise, the JDK now includes support for developing its
-Java sources with Eclipse, which can be achieved by setting up a Java
-Workspace by running:</p>
-<pre><code>make eclipse-java-env</code></pre>
-<p>After the workspace has been generated you can import it in the same
-way as you would with Eclipse CDT:</p>
-<p>Follow
-<code>File -&gt; Import -&gt; Projects from Folder or Archive</code> and
-select the <code>ide\eclipse</code> directory in the build output folder
-to import the newly created Java Workspace.</p>
-<p>If doing so results in an error, you can also import the JDK via
-<code>File -&gt; Import -&gt; Existing Projects into Workspace</code> as
-a last resort.</p>
-<p>Alternatively, if you want a Java Workspace inside the JDK's source
-directory, you can instead run:</p>
-<pre><code>make eclipse-shared-java-env</code></pre>
-<p>As mentioned above for Eclipse CDT, you can create a combined Java
-and C/C++ Workspace which can conveniently switch between Java and C/C++
-natures during development by running:</p>
-<pre><code>make eclipse-mixed-env</code></pre>
+<p>To use it, choose <code>File -&gt; Open...</code> in IntelliJ and select the folder where you ran the above script.</p>
+<p>Next, configure the project SDK in IntelliJ. Open <code>File -&gt; Project Structure -&gt; Project</code> and select <code>build/&lt;config&gt;/images/jdk</code> as the SDK to use.</p>
+<p>In order to run the tests from the IDE, you can use the JTReg plugin. Instructions for building and using the plugin can be found <a href="https://github.com/openjdk/jtreg/tree/master/plugins/idea">here</a>.</p>
 </body>
 </html>

doc/ide.md

@@ -56,63 +56,6 @@ This creates a file named `jvm.vcxproj` in `ide\hotspot-visualstudio`
 subfolder of the build output folder. The file can be opened in Visual Studio
 via `File -> Open -> Project/Solution`.
 
-#### Eclipse CDT
-
-The make system can generate an Eclipse CDT Workspace that enables Eclipse
-indexing for the C and C++ sources throughout the entire codebase, as well as
-registering all common make targets to be runnable from the Eclipse explorer.
-This can be done after configuring by running:
-
-```
-make eclipse-native-env
-```
-
-After this is run, simply open and import the workspace in Eclipse through
-`File -> Import -> Projects from Folder or Archive` and at
-`Import source` click on the directory `ide\eclipse`, which can be
-found in the build output folder.
-
-If this doesn't work, you can also try
-`File -> Import -> Existing Projects into Workspace`
-instead.
-
-Setting up an Eclipse Workspace is relatively lightweight compared to other
-supported IDEs, but requires that your CDT installation has Cross GCC support
-enabled at the moment, even if you aren't cross compiling. The Visual C++
-compiler is, at present, not supported as an indexer.
-
-If desired, you can instead request make to only include indexing support for
-just the Java Virtual Machine instead of the entire native codebase, by running:
-
-```
-make eclipse-hotspot-env
-```
-
-If you think your particular Eclipse installation can handle the strain, the
-make system also supports generating a combined Java and C/C++ Workspace for
-Eclipse which can then conveniently switch between Java and C/C++ natures
-during development by running:
-
-```
-make eclipse-mixed-env
-```
-
-Do note that this generates all features that come with both Java and C/C++
-natures.
-
-By default, the Eclipse Workspace is located in the ide subdirectory in the
-build output. To share the JDK's source directory with the Eclipse Workspace,
-you can instead run:
-
-```
-make eclipse-shared-<ENV>-env
-```
-
-Eclipse support in the JDK is relatively new, so do keep in mind that not
-everything may work at the moment. As such, the resulting Workspace also
-has compilation database parsing support enabled, so you can pass Eclipse
-the compile commands file (see below) if all else fails.
-
 #### Compilation Database
 
 The make system can generate generic native code indexing support in the form of
@@ -153,40 +96,3 @@ as the SDK to use.
 In order to run the tests from the IDE, you can use the JTReg plugin.
 Instructions for building and using the plugin can be found
 [here](https://github.com/openjdk/jtreg/tree/master/plugins/idea).
-
-#### Eclipse
-
-Eclipse JDT is a widely used Java IDE and has been for a very long time, being
-a popular choice alongside IntelliJ IDEA for Java development. Likewise, the
-JDK now includes support for developing its Java sources with Eclipse, which
-can be achieved by setting up a Java Workspace by running:
-
-```
-make eclipse-java-env
-```
-
-After the workspace has been generated you can import it in the same way as
-you would with Eclipse CDT:
-
-Follow `File -> Import -> Projects from Folder or Archive` and select the
-`ide\eclipse` directory in the build output folder to import the newly created
-Java Workspace.
-
-If doing so results in an error, you can also import the JDK via
-`File -> Import -> Existing Projects into Workspace`
-as a last resort.
-
-Alternatively, if you want a Java Workspace inside the JDK's source directory,
-you can instead run:
-
-```
-make eclipse-shared-java-env
-```
-
-As mentioned above for Eclipse CDT, you can create a combined Java and C/C++
-Workspace which can conveniently switch between Java and C/C++ natures during
-development by running:
-
-```
-make eclipse-mixed-env
-```

doc/testing.html

@@ -5,99 +5,54 @@
   <meta name="generator" content="pandoc" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
   <title>Testing the JDK</title>
-  <style>
-    code{white-space: pre-wrap;}
-    span.smallcaps{font-variant: small-caps;}
-    div.columns{display: flex; gap: min(4vw, 1.5em);}
-    div.column{flex: auto; overflow-x: auto;}
-    div.hanging-indent{margin-left: 1.5em; text-indent: -1.5em;}
-    ul.task-list{list-style: none;}
-    ul.task-list li input[type="checkbox"] {
-      width: 0.8em;
-      margin: 0 0.8em 0.2em -1.6em;
-      vertical-align: middle;
-    }
-    .display.math{display: block; text-align: center; margin: 0.5rem auto;}
+  <style type="text/css">
+      code{white-space: pre-wrap;}
+      span.smallcaps{font-variant: small-caps;}
+      span.underline{text-decoration: underline;}
+      div.column{display: inline-block; vertical-align: top; width: 50%;}
   </style>
   <link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css" />
-  <style type="text/css">pre, code, tt { color: #1d6ae5; }</style>
   <!--[if lt IE 9]>
     <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
   <![endif]-->
+  <style type="text/css">pre, code, tt { color: #1d6ae5; }</style>
 </head>
 <body>
 <header id="title-block-header">
 <h1 class="title">Testing the JDK</h1>
 </header>
-<nav id="TOC" role="doc-toc">
+<nav id="TOC">
 <ul>
-<li><a href="#overview" id="toc-overview">Overview</a></li>
-<li><a href="#running-tests-locally-with-make-test"
-id="toc-running-tests-locally-with-make-test">Running tests locally with
-<code>make test</code></a>
-<ul>
-<li><a href="#configuration"
-id="toc-configuration">Configuration</a></li>
+<li><a href="#using-make-test-the-run-test-framework">Using &quot;make test&quot; (the run-test framework)</a><ul>
+<li><a href="#configuration">Configuration</a></li>
 </ul></li>
-<li><a href="#test-selection" id="toc-test-selection">Test selection</a>
-<ul>
-<li><a href="#common-test-groups" id="toc-common-test-groups">Common
-Test Groups</a></li>
-<li><a href="#jtreg" id="toc-jtreg">JTReg</a></li>
-<li><a href="#gtest" id="toc-gtest">Gtest</a></li>
-<li><a href="#microbenchmarks"
-id="toc-microbenchmarks">Microbenchmarks</a></li>
-<li><a href="#special-tests" id="toc-special-tests">Special
-tests</a></li>
+<li><a href="#test-selection">Test selection</a><ul>
+<li><a href="#common-test-groups">Common Test Groups</a></li>
+<li><a href="#jtreg">JTReg</a></li>
+<li><a href="#gtest">Gtest</a></li>
+<li><a href="#microbenchmarks">Microbenchmarks</a></li>
+<li><a href="#special-tests">Special tests</a></li>
 </ul></li>
-<li><a href="#test-results-and-summary"
-id="toc-test-results-and-summary">Test results and summary</a></li>
-<li><a href="#test-suite-control" id="toc-test-suite-control">Test suite
-control</a>
-<ul>
-<li><a href="#general-keywords-test_opts"
-id="toc-general-keywords-test_opts">General keywords
-(TEST_OPTS)</a></li>
-<li><a href="#jtreg-keywords" id="toc-jtreg-keywords">JTReg
-keywords</a></li>
-<li><a href="#gtest-keywords" id="toc-gtest-keywords">Gtest
-keywords</a></li>
-<li><a href="#microbenchmark-keywords"
-id="toc-microbenchmark-keywords">Microbenchmark keywords</a></li>
+<li><a href="#test-results-and-summary">Test results and summary</a></li>
+<li><a href="#test-suite-control">Test suite control</a><ul>
+<li><a href="#general-keywords-test_opts">General keywords (TEST_OPTS)</a></li>
+<li><a href="#jtreg-keywords">JTReg keywords</a></li>
+<li><a href="#gtest-keywords">Gtest keywords</a></li>
+<li><a href="#microbenchmark-keywords">Microbenchmark keywords</a></li>
 </ul></li>
-<li><a href="#notes-for-specific-tests"
-id="toc-notes-for-specific-tests">Notes for Specific Tests</a>
-<ul>
-<li><a href="#docker-tests" id="toc-docker-tests">Docker Tests</a></li>
-<li><a href="#non-us-locale" id="toc-non-us-locale">Non-US
-locale</a></li>
-<li><a href="#pkcs11-tests" id="toc-pkcs11-tests">PKCS11 Tests</a></li>
-<li><a href="#client-ui-tests" id="toc-client-ui-tests">Client UI
-Tests</a></li>
+<li><a href="#notes-for-specific-tests">Notes for Specific Tests</a><ul>
+<li><a href="#docker-tests">Docker Tests</a></li>
+<li><a href="#non-us-locale">Non-US locale</a></li>
+<li><a href="#pkcs11-tests">PKCS11 Tests</a></li>
+<li><a href="#client-ui-tests">Client UI Tests</a></li>
 </ul></li>
-<li><a href="#editing-this-document"
-id="toc-editing-this-document">Editing this document</a></li>
+<li><a href="#editing-this-document">Editing this document</a></li>
 </ul>
 </nav>
-<h2 id="overview">Overview</h2>
-<p>The bulk of JDK tests use <a
-href="https://openjdk.org/jtreg/">jtreg</a>, a regression test framework
-and test runner built for the JDK's specific needs. Other test
-frameworks are also used. The different test frameworks can be executed
-directly, but there is also a set of make targets intended to simplify
-the interface, and figure out how to run your tests for you.</p>
-<h2 id="running-tests-locally-with-make-test">Running tests locally with
-<code>make test</code></h2>
-<p>This is the easiest way to get started. Assuming you've built the JDK
-locally, execute:</p>
-<pre><code>$ make test</code></pre>
-<p>This will run a default set of tests against the JDK, and present you
-with the results. <code>make test</code> is part of a family of
-test-related make targets which simplify running tests, because they
-invoke the various test frameworks for you. The "make test framework" is
-simple to start with, but more complex ad-hoc combination of tests is
-also possible. You can always invoke the test frameworks directly if you
-want even more control.</p>
+<h2 id="using-make-test-the-run-test-framework">Using &quot;make test&quot; (the run-test framework)</h2>
+<p>This new way of running tests is developer-centric. It assumes that you have built a JDK locally and want to test it. Running common test targets is simple, and more complex ad-hoc combination of tests is possible. The user interface is forgiving, and clearly report errors it cannot resolve.</p>
+<p>The main target <code>test</code> uses the jdk-image as the tested product. There is also an alternate target <code>exploded-test</code> that uses the exploded image instead. Not all tests will run successfully on the exploded image, but using this target can greatly improve rebuild times for certain workflows.</p>
+<p>Previously, <code>make test</code> was used to invoke an old system for running tests, and <code>make run-test</code> was used for the new test framework. For backward compatibility with scripts and muscle memory, <code>run-test</code> (and variants like <code>exploded-run-test</code> or <code>run-test-tier1</code>) are kept as aliases.</p>
 <p>Some example command-lines:</p>
 <pre><code>$ make test-tier1
 $ make test-jdk_lang JTREG=&quot;JOBS=8&quot;
@@ -107,223 +62,51 @@ $ make test TEST=&quot;hotspot:hotspot_gc&quot; JTREG=&quot;JOBS=1;TIMEOUT_FACTO
 $ make test TEST=&quot;jtreg:test/hotspot:hotspot_gc test/hotspot/jtreg/native_sanity/JniVersion.java&quot;
 $ make test TEST=&quot;micro:java.lang.reflect&quot; MICRO=&quot;FORK=1;WARMUP_ITER=2&quot;
 $ make exploded-test TEST=tier2</code></pre>
-<p>"tier1" and "tier2" refer to tiered testing, see further down. "TEST"
-is a test selection argument which the make test framework will use to
-try to find the tests you want. It iterates over the available test
-frameworks, and if the test isn't present in one, it tries the next one.
-The main target <code>test</code> uses the jdk-image as the tested
-product. There is also an alternate target <code>exploded-test</code>
-that uses the exploded image instead. Not all tests will run
-successfully on the exploded image, but using this target can greatly
-improve rebuild times for certain workflows.</p>
-<p>Previously, <code>make test</code> was used to invoke an old system
-for running tests, and <code>make run-test</code> was used for the new
-test framework. For backward compatibility with scripts and muscle
-memory, <code>run-test</code> and variants like
-<code>exploded-run-test</code> or <code>run-test-tier1</code> are kept
-as aliases.</p>
 <h3 id="configuration">Configuration</h3>
-<p>To be able to run JTReg tests, <code>configure</code> needs to know
-where to find the JTReg test framework. If it is not picked up
-automatically by configure, use the
-<code>--with-jtreg=&lt;path to jtreg home&gt;</code> option to point to
-the JTReg framework. Note that this option should point to the JTReg
-home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc.
-(An alternative is to set the <code>JT_HOME</code> environment variable
-to point to the JTReg home before running <code>configure</code>.)</p>
-<p>To be able to run microbenchmarks, <code>configure</code> needs to
-know where to find the JMH dependency. Use
-<code>--with-jmh=&lt;path to JMH jars&gt;</code> to point to a directory
-containing the core JMH and transitive dependencies. The recommended
-dependencies can be retrieved by running
-<code>sh make/devkit/createJMHBundle.sh</code>, after which
-<code>--with-jmh=build/jmh/jars</code> should work.</p>
-<p>When tests fail or timeout, jtreg runs its failure handler to capture
-necessary data from the system where the test was run. This data can
-then be used to analyze the test failures. Collecting this data involves
-running various commands (which are listed in files residing in
-<code>test/failure_handler/src/share/conf</code>) and some of these
-commands use <code>sudo</code>. If the system's <code>sudoers</code>
-file isn't configured to allow running these commands, then it can
-result in password being prompted during the failure handler execution.
-Typically, when running locally, collecting this additional data isn't
-always necessary. To disable running the failure handler, use
-<code>--enable-jtreg-failure-handler=no</code> when running
-<code>configure</code>. If, however, you want to let the failure handler
-to run and don't want to be prompted for sudo password, then you can
-configure your <code>sudoers</code> file appropriately. Please read the
-necessary documentation of your operating system to see how to do that;
-here we only show one possible way of doing that - edit the
-<code>/etc/sudoers.d/sudoers</code> file to include the following
-line:</p>
+<p>To be able to run JTReg tests, <code>configure</code> needs to know where to find the JTReg test framework. If it is not picked up automatically by configure, use the <code>--with-jtreg=&lt;path to jtreg home&gt;</code> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc. (An alternative is to set the <code>JT_HOME</code> environment variable to point to the JTReg home before running <code>configure</code>.)</p>
+<p>To be able to run microbenchmarks, <code>configure</code> needs to know where to find the JMH dependency. Use <code>--with-jmh=&lt;path to JMH jars&gt;</code> to point to a directory containing the core JMH and transitive dependencies. The recommended dependencies can be retrieved by running <code>sh make/devkit/createJMHBundle.sh</code>, after which <code>--with-jmh=build/jmh/jars</code> should work.</p>
+<p>When tests fail or timeout, jtreg runs its failure handler to capture necessary data from the system where the test was run. This data can then be used to analyze the test failures. Collecting this data involves running various commands (which are listed in files residing in <code>test/failure_handler/src/share/conf</code>) and some of these commands use <code>sudo</code>. If the system's <code>sudoers</code> file isn't configured to allow running these commands, then it can result in password being prompted during the failure handler execution. Typically, when running locally, collecting this additional data isn't always necessary. To disable running the failure handler, use <code>--enable-jtreg-failure-handler=no</code> when running <code>configure</code>. If, however, you want to let the failure handler to run and don't want to be prompted for sudo password, then you can configure your <code>sudoers</code> file appropriately. Please read the necessary documentation of your operating system to see how to do that; here we only show one possible way of doing that - edit the <code>/etc/sudoers.d/sudoers</code> file to include the following line:</p>
 <pre><code>johndoe ALL=(ALL) NOPASSWD: /sbin/dmesg</code></pre>
-<p>This line configures <code>sudo</code> to <em>not</em> prompt for
-password for the <code>/sbin/dmesg</code> command (this is one of the
-commands that is listed in the files at
-<code>test/failure_handler/src/share/conf</code>), for the user
-<code>johndoe</code>. Here <code>johndoe</code> is the user account
-under which the jtreg tests are run. Replace the username with a
-relevant user account of your system.</p>
+<p>This line configures <code>sudo</code> to <em>not</em> prompt for password for the <code>/sbin/dmesg</code> command (this is one of the commands that is listed in the files at <code>test/failure_handler/src/share/conf</code>), for the user <code>johndoe</code>. Here <code>johndoe</code> is the user account under which the jtreg tests are run. Replace the username with a relevant user account of your system.</p>
 <h2 id="test-selection">Test selection</h2>
-<p>All functionality is available using the <code>test</code> make
-target. In this use case, the test or tests to be executed is controlled
-using the <code>TEST</code> variable. To speed up subsequent test runs
-with no source code changes, <code>test-only</code> can be used instead,
-which do not depend on the source and test image build.</p>
-<p>For some common top-level tests, direct make targets have been
-generated. This includes all JTReg test groups, the hotspot gtest, and
-custom tests (if present). This means that <code>make test-tier1</code>
-is equivalent to <code>make test TEST="tier1"</code>, but the latter is
-more tab-completion friendly. For more complex test runs, the
-<code>test TEST="x"</code> solution needs to be used.</p>
-<p>The test specifications given in <code>TEST</code> is parsed into
-fully qualified test descriptors, which clearly and unambigously show
-which tests will be run. As an example, <code>:tier1</code> will expand
-to
-<code>jtreg:$(TOPDIR)/test/hotspot/jtreg:tier1 jtreg:$(TOPDIR)/test/jdk:tier1 jtreg:$(TOPDIR)/test/langtools:tier1 jtreg:$(TOPDIR)/test/nashorn:tier1 jtreg:$(TOPDIR)/test/jaxp:tier1</code>.
-You can always submit a list of fully qualified test descriptors in the
-<code>TEST</code> variable if you want to shortcut the parser.</p>
+<p>All functionality is available using the <code>test</code> make target. In this use case, the test or tests to be executed is controlled using the <code>TEST</code> variable. To speed up subsequent test runs with no source code changes, <code>test-only</code> can be used instead, which do not depend on the source and test image build.</p>
+<p>For some common top-level tests, direct make targets have been generated. This includes all JTReg test groups, the hotspot gtest, and custom tests (if present). This means that <code>make test-tier1</code> is equivalent to <code>make test TEST=&quot;tier1&quot;</code>, but the latter is more tab-completion friendly. For more complex test runs, the <code>test TEST=&quot;x&quot;</code> solution needs to be used.</p>
+<p>The test specifications given in <code>TEST</code> is parsed into fully qualified test descriptors, which clearly and unambigously show which tests will be run. As an example, <code>:tier1</code> will expand to <code>jtreg:$(TOPDIR)/test/hotspot/jtreg:tier1 jtreg:$(TOPDIR)/test/jdk:tier1 jtreg:$(TOPDIR)/test/langtools:tier1 jtreg:$(TOPDIR)/test/nashorn:tier1 jtreg:$(TOPDIR)/test/jaxp:tier1</code>. You can always submit a list of fully qualified test descriptors in the <code>TEST</code> variable if you want to shortcut the parser.</p>
 <h3 id="common-test-groups">Common Test Groups</h3>
-<p>Ideally, all tests are run for every change but this may not be
-practical due to the limited testing resources, the scope of the change,
-etc.</p>
-<p>The source tree currently defines a few common test groups in the
-relevant <code>TEST.groups</code> files. There are test groups that
-cover a specific component, for example <code>hotspot_gc</code>. It is a
-good idea to look into <code>TEST.groups</code> files to get a sense
-what tests are relevant to a particular JDK component.</p>
-<p>Component-specific tests may miss some unintended consequences of a
-change, so other tests should also be run. Again, it might be
-impractical to run all tests, and therefore <em>tiered</em> test groups
-exist. Tiered test groups are not component-specific, but rather cover
-the significant parts of the entire JDK.</p>
-<p>Multiple tiers allow balancing test coverage and testing costs. Lower
-test tiers are supposed to contain the simpler, quicker and more stable
-tests. Higher tiers are supposed to contain progressively more thorough,
-slower, and sometimes less stable tests, or the tests that require
-special configuration.</p>
-<p>Contributors are expected to run the tests for the areas that are
-changed, and the first N tiers they can afford to run, but at least
-tier1.</p>
+<p>Ideally, all tests are run for every change but this may not be practical due to the limited testing resources, the scope of the change, etc.</p>
+<p>The source tree currently defines a few common test groups in the relevant <code>TEST.groups</code> files. There are test groups that cover a specific component, for example <code>hotspot_gc</code>. It is a good idea to look into <code>TEST.groups</code> files to get a sense what tests are relevant to a particular JDK component.</p>
+<p>Component-specific tests may miss some unintended consequences of a change, so other tests should also be run. Again, it might be impractical to run all tests, and therefore <em>tiered</em> test groups exist. Tiered test groups are not component-specific, but rather cover the significant parts of the entire JDK.</p>
+<p>Multiple tiers allow balancing test coverage and testing costs. Lower test tiers are supposed to contain the simpler, quicker and more stable tests. Higher tiers are supposed to contain progressively more thorough, slower, and sometimes less stable tests, or the tests that require special configuration.</p>
+<p>Contributors are expected to run the tests for the areas that are changed, and the first N tiers they can afford to run, but at least tier1.</p>
 <p>A brief description of the tiered test groups:</p>
 <ul>
-<li><p><code>tier1</code>: This is the most fundamental test tier.
-Roughly speaking, a failure of a test in this tier has the potential to
-indicate a problem that would affect many Java programs. Tests in
-<code>tier1</code> include tests of HotSpot, core APIs in the
-<code>java.base</code> module, and the <code>javac</code> compiler.
-Multiple developers run these tests every day. Because of the widespread
-use, the tests in <code>tier1</code> are carefully selected and
-optimized to run fast, and to run in the most stable manner. As a
-guideline, nearly all individual tests in <code>tier1</code> are
-expected to run to completion in ten seconds or less when run on common
-configurations used for development. Long-running tests, even of core
-functionality, should occur in higher tiers or be covered in other kinds
-of testing. The test failures in <code>tier1</code> are usually followed
-up on quickly, either with fixes, or adding relevant tests to problem
-list. GitHub Actions workflows, if enabled, run <code>tier1</code>
-tests.</p></li>
-<li><p><code>tier2</code>: This test group covers even more ground.
-These contain, among other things, tests that either run for too long to
-be at <code>tier1</code>, or may require special configuration, or tests
-that are less stable, or cover the broader range of non-core JVM and JDK
-features/components(for example, XML).</p></li>
-<li><p><code>tier3</code>: This test group includes more stressful
-tests, the tests for corner cases not covered by previous tiers, plus
-the tests that require GUIs. As such, this suite should either be run
-with low concurrency (<code>TEST_JOBS=1</code>), or without headful
-tests(<code>JTREG_KEYWORDS=\!headful</code>), or both.</p></li>
-<li><p><code>tier4</code>: This test group includes every other test not
-covered by previous tiers. It includes, for example,
-<code>vmTestbase</code> suites for Hotspot, which run for many hours
-even on large machines. It also runs GUI tests, so the same
-<code>TEST_JOBS</code> and <code>JTREG_KEYWORDS</code> caveats
-apply.</p></li>
+<li><p><code>tier1</code>: This is the lowest test tier. Multiple developers run these tests every day. Because of the widespread use, the tests in <code>tier1</code> are carefully selected and optimized to run fast, and to run in the most stable manner. The test failures in <code>tier1</code> are usually followed up on quickly, either with fixes, or adding relevant tests to problem list. GitHub Actions workflows, if enabled, run <code>tier1</code> tests.</p></li>
+<li><p><code>tier2</code>: This test group covers even more ground. These contain, among other things, tests that either run for too long to be at <code>tier1</code>, or may require special configuration, or tests that are less stable, or cover the broader range of non-core JVM and JDK features/components (for example, XML).</p></li>
+<li><p><code>tier3</code>: This test group includes more stressful tests, the tests for corner cases not covered by previous tiers, plus the tests that require GUIs. As such, this suite should either be run with low concurrency (<code>TEST_JOBS=1</code>), or without headful tests (<code>JTREG_KEYWORDS=\!headful</code>), or both.</p></li>
+<li><p><code>tier4</code>: This test group includes every other test not covered by previous tiers. It includes, for example, <code>vmTestbase</code> suites for Hotspot, which run for many hours even on large machines. It also runs GUI tests, so the same <code>TEST_JOBS</code> and <code>JTREG_KEYWORDS</code> caveats apply.</p></li>
 </ul>
 <h3 id="jtreg">JTReg</h3>
-<p>JTReg tests can be selected either by picking a JTReg test group, or
-a selection of files or directories containing JTReg tests.
-Documentation can be found at <a
-href="https://openjdk.org/jtreg/">https://openjdk.org/jtreg/</a>, note
-especially the extensive <a
-href="https://openjdk.org/jtreg/faq.html">FAQ</a>.</p>
-<p>JTReg test groups can be specified either without a test root, e.g.
-<code>:tier1</code> (or <code>tier1</code>, the initial colon is
-optional), or with, e.g. <code>hotspot:tier1</code>,
-<code>test/jdk:jdk_util</code> or
-<code>$(TOPDIR)/test/hotspot/jtreg:hotspot_all</code>. The test root can
-be specified either as an absolute path, or a path relative to the JDK
-top directory, or the <code>test</code> directory. For simplicity, the
-hotspot JTReg test root, which really is <code>hotspot/jtreg</code> can
-be abbreviated as just <code>hotspot</code>.</p>
-<p>When specified without a test root, all matching groups from all test
-roots will be added. Otherwise, only the group from the specified test
-root will be added.</p>
-<p>Individual JTReg tests or directories containing JTReg tests can also
-be specified, like
-<code>test/hotspot/jtreg/native_sanity/JniVersion.java</code> or
-<code>hotspot/jtreg/native_sanity</code>. Just like for test root
-selection, you can either specify an absolute path (which can even point
-to JTReg tests outside the source tree), or a path relative to either
-the JDK top directory or the <code>test</code> directory.
-<code>hotspot</code> can be used as an alias for
-<code>hotspot/jtreg</code> here as well.</p>
-<p>As long as the test groups or test paths can be uniquely resolved,
-you do not need to enter the <code>jtreg:</code> prefix. If this is not
-possible, or if you want to use a fully qualified test descriptor, add
-<code>jtreg:</code>, e.g.
-<code>jtreg:test/hotspot/jtreg/native_sanity</code>.</p>
+<p>JTReg tests can be selected either by picking a JTReg test group, or a selection of files or directories containing JTReg tests. Documentation can be found at <a href="https://openjdk.org/jtreg/">https://openjdk.org/jtreg/</a>, note especially the extensive <a href="https://openjdk.org/jtreg/faq.html">FAQ</a>.</p>
+<p>JTReg test groups can be specified either without a test root, e.g. <code>:tier1</code> (or <code>tier1</code>, the initial colon is optional), or with, e.g. <code>hotspot:tier1</code>, <code>test/jdk:jdk_util</code> or <code>$(TOPDIR)/test/hotspot/jtreg:hotspot_all</code>. The test root can be specified either as an absolute path, or a path relative to the JDK top directory, or the <code>test</code> directory. For simplicity, the hotspot JTReg test root, which really is <code>hotspot/jtreg</code> can be abbreviated as just <code>hotspot</code>.</p>
+<p>When specified without a test root, all matching groups from all test roots will be added. Otherwise, only the group from the specified test root will be added.</p>
+<p>Individual JTReg tests or directories containing JTReg tests can also be specified, like <code>test/hotspot/jtreg/native_sanity/JniVersion.java</code> or <code>hotspot/jtreg/native_sanity</code>. Just like for test root selection, you can either specify an absolute path (which can even point to JTReg tests outside the source tree), or a path relative to either the JDK top directory or the <code>test</code> directory. <code>hotspot</code> can be used as an alias for <code>hotspot/jtreg</code> here as well.</p>
+<p>As long as the test groups or test paths can be uniquely resolved, you do not need to enter the <code>jtreg:</code> prefix. If this is not possible, or if you want to use a fully qualified test descriptor, add <code>jtreg:</code>, e.g. <code>jtreg:test/hotspot/jtreg/native_sanity</code>.</p>
 <h3 id="gtest">Gtest</h3>
-<p><strong>Note:</strong> To be able to run the Gtest suite, you need to
-configure your build to be able to find a proper version of the gtest
-source. For details, see the section <a
-href="building.html#running-tests">"Running Tests" in the build
-documentation</a>.</p>
-<p>Since the Hotspot Gtest suite is so quick, the default is to run all
-tests. This is specified by just <code>gtest</code>, or as a fully
-qualified test descriptor <code>gtest:all</code>.</p>
-<p>If you want, you can single out an individual test or a group of
-tests, for instance <code>gtest:LogDecorations</code> or
-<code>gtest:LogDecorations.level_test_vm</code>. This can be
-particularly useful if you want to run a shaky test repeatedly.</p>
-<p>For Gtest, there is a separate test suite for each JVM variant. The
-JVM variant is defined by adding <code>/&lt;variant&gt;</code> to the
-test descriptor, e.g. <code>gtest:Log/client</code>. If you specify no
-variant, gtest will run once for each JVM variant present (e.g. server,
-client). So if you only have the server JVM present, then
-<code>gtest:all</code> will be equivalent to
-<code>gtest:all/server</code>.</p>
+<p>Since the Hotspot Gtest suite is so quick, the default is to run all tests. This is specified by just <code>gtest</code>, or as a fully qualified test descriptor <code>gtest:all</code>.</p>
+<p>If you want, you can single out an individual test or a group of tests, for instance <code>gtest:LogDecorations</code> or <code>gtest:LogDecorations.level_test_vm</code>. This can be particularly useful if you want to run a shaky test repeatedly.</p>
+<p>For Gtest, there is a separate test suite for each JVM variant. The JVM variant is defined by adding <code>/&lt;variant&gt;</code> to the test descriptor, e.g. <code>gtest:Log/client</code>. If you specify no variant, gtest will run once for each JVM variant present (e.g. server, client). So if you only have the server JVM present, then <code>gtest:all</code> will be equivalent to <code>gtest:all/server</code>.</p>
 <h3 id="microbenchmarks">Microbenchmarks</h3>
-<p>Which microbenchmarks to run is selected using a regular expression
-following the <code>micro:</code> test descriptor, e.g.,
-<code>micro:java.lang.reflect</code>. This delegates the test selection
-to JMH, meaning package name, class name and even benchmark method names
-can be used to select tests.</p>
-<p>Using special characters like <code>|</code> in the regular
-expression is possible, but needs to be escaped multiple times:
-<code>micro:ArrayCopy\\\\\|reflect</code>.</p>
+<p>Which microbenchmarks to run is selected using a regular expression following the <code>micro:</code> test descriptor, e.g., <code>micro:java.lang.reflect</code>. This delegates the test selection to JMH, meaning package name, class name and even benchmark method names can be used to select tests.</p>
+<p>Using special characters like <code>|</code> in the regular expression is possible, but needs to be escaped multiple times: <code>micro:ArrayCopy\\\\\|reflect</code>.</p>
 <h3 id="special-tests">Special tests</h3>
-<p>A handful of odd tests that are not covered by any other testing
-framework are accessible using the <code>special:</code> test
-descriptor. Currently, this includes <code>failure-handler</code> and
-<code>make</code>.</p>
+<p>A handful of odd tests that are not covered by any other testing framework are accessible using the <code>special:</code> test descriptor. Currently, this includes <code>failure-handler</code> and <code>make</code>.</p>
 <ul>
-<li><p>Failure handler testing is run using
-<code>special:failure-handler</code> or just
-<code>failure-handler</code> as test descriptor.</p></li>
-<li><p>Tests for the build system, including both makefiles and related
-functionality, is run using <code>special:make</code> or just
-<code>make</code> as test descriptor. This is equivalent to
-<code>special:make:all</code>.</p>
-<p>A specific make test can be run by supplying it as argument, e.g.
-<code>special:make:idea</code>. As a special syntax, this can also be
-expressed as <code>make-idea</code>, which allows for command lines as
-<code>make test-make-idea</code>.</p></li>
+<li><p>Failure handler testing is run using <code>special:failure-handler</code> or just <code>failure-handler</code> as test descriptor.</p></li>
+<li><p>Tests for the build system, including both makefiles and related functionality, is run using <code>special:make</code> or just <code>make</code> as test descriptor. This is equivalent to <code>special:make:all</code>.</p>
+<p>A specific make test can be run by supplying it as argument, e.g. <code>special:make:idea</code>. As a special syntax, this can also be expressed as <code>make-idea</code>, which allows for command lines as <code>make test-make-idea</code>.</p></li>
 </ul>
 <h2 id="test-results-and-summary">Test results and summary</h2>
-<p>At the end of the test run, a summary of all tests run will be
-presented. This will have a consistent look, regardless of what test
-suites were used. This is a sample summary:</p>
+<p>At the end of the test run, a summary of all tests run will be presented. This will have a consistent look, regardless of what test suites were used. This is a sample summary:</p>
 <pre><code>==============================
 Test summary
 ==============================
@@ -333,61 +116,20 @@ Test summary
    jtreg:nashorn/test:tier1                        133   133     0     0
 ==============================
 TEST FAILURE</code></pre>
-<p>Tests where the number of TOTAL tests does not equal the number of
-PASSed tests will be considered a test failure. These are marked with
-the <code>&gt;&gt; ... &lt;&lt;</code> marker for easy
-identification.</p>
-<p>The classification of non-passed tests differs a bit between test
-suites. In the summary, ERROR is used as a catch-all for tests that
-neither passed nor are classified as failed by the framework. This might
-indicate test framework error, timeout or other problems.</p>
-<p>In case of test failures, <code>make test</code> will exit with a
-non-zero exit value.</p>
-<p>All tests have their result stored in
-<code>build/$BUILD/test-results/$TEST_ID</code>, where TEST_ID is a
-path-safe conversion from the fully qualified test descriptor, e.g. for
-<code>jtreg:jdk/test:tier1</code> the TEST_ID is
-<code>jtreg_jdk_test_tier1</code>. This path is also printed in the log
-at the end of the test run.</p>
-<p>Additional work data is stored in
-<code>build/$BUILD/test-support/$TEST_ID</code>. For some frameworks,
-this directory might contain information that is useful in determining
-the cause of a failed test.</p>
+<p>Tests where the number of TOTAL tests does not equal the number of PASSed tests will be considered a test failure. These are marked with the <code>&gt;&gt; ... &lt;&lt;</code> marker for easy identification.</p>
+<p>The classification of non-passed tests differs a bit between test suites. In the summary, ERROR is used as a catch-all for tests that neither passed nor are classified as failed by the framework. This might indicate test framework error, timeout or other problems.</p>
+<p>In case of test failures, <code>make test</code> will exit with a non-zero exit value.</p>
+<p>All tests have their result stored in <code>build/$BUILD/test-results/$TEST_ID</code>, where TEST_ID is a path-safe conversion from the fully qualified test descriptor, e.g. for <code>jtreg:jdk/test:tier1</code> the TEST_ID is <code>jtreg_jdk_test_tier1</code>. This path is also printed in the log at the end of the test run.</p>
+<p>Additional work data is stored in <code>build/$BUILD/test-support/$TEST_ID</code>. For some frameworks, this directory might contain information that is useful in determining the cause of a failed test.</p>
 <h2 id="test-suite-control">Test suite control</h2>
-<p>It is possible to control various aspects of the test suites using
-make control variables.</p>
-<p>These variables use a keyword=value approach to allow multiple values
-to be set. So, for instance,
-<code>JTREG="JOBS=1;TIMEOUT_FACTOR=8"</code> will set the JTReg
-concurrency level to 1 and the timeout factor to 8. This is equivalent
-to setting <code>JTREG_JOBS=1 JTREG_TIMEOUT_FACTOR=8</code>, but using
-the keyword format means that the <code>JTREG</code> variable is parsed
-and verified for correctness, so <code>JTREG="TMIEOUT_FACTOR=8"</code>
-would give an error, while <code>JTREG_TMIEOUT_FACTOR=8</code> would
-just pass unnoticed.</p>
-<p>To separate multiple keyword=value pairs, use <code>;</code>
-(semicolon). Since the shell normally eats <code>;</code>, the
-recommended usage is to write the assignment inside qoutes, e.g.
-<code>JTREG="...;..."</code>. This will also make sure spaces are
-preserved, as in
-<code>JTREG="JAVA_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"</code>.</p>
-<p>(Other ways are possible, e.g. using backslash:
-<code>JTREG=JOBS=1\;TIMEOUT_FACTOR=8</code>. Also, as a special
-technique, the string <code>%20</code> will be replaced with space for
-certain options, e.g.
-<code>JTREG=JAVA_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug</code>.
-This can be useful if you have layers of scripts and have trouble
-getting proper quoting of command line arguments through.)</p>
-<p>As far as possible, the names of the keywords have been standardized
-between test suites.</p>
+<p>It is possible to control various aspects of the test suites using make control variables.</p>
+<p>These variables use a keyword=value approach to allow multiple values to be set. So, for instance, <code>JTREG=&quot;JOBS=1;TIMEOUT_FACTOR=8&quot;</code> will set the JTReg concurrency level to 1 and the timeout factor to 8. This is equivalent to setting <code>JTREG_JOBS=1 JTREG_TIMEOUT_FACTOR=8</code>, but using the keyword format means that the <code>JTREG</code> variable is parsed and verified for correctness, so <code>JTREG=&quot;TMIEOUT_FACTOR=8&quot;</code> would give an error, while <code>JTREG_TMIEOUT_FACTOR=8</code> would just pass unnoticed.</p>
+<p>To separate multiple keyword=value pairs, use <code>;</code> (semicolon). Since the shell normally eats <code>;</code>, the recommended usage is to write the assignment inside qoutes, e.g. <code>JTREG=&quot;...;...&quot;</code>. This will also make sure spaces are preserved, as in <code>JTREG=&quot;JAVA_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;</code>.</p>
+<p>(Other ways are possible, e.g. using backslash: <code>JTREG=JOBS=1\;TIMEOUT_FACTOR=8</code>. Also, as a special technique, the string <code>%20</code> will be replaced with space for certain options, e.g. <code>JTREG=JAVA_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug</code>. This can be useful if you have layers of scripts and have trouble getting proper quoting of command line arguments through.)</p>
+<p>As far as possible, the names of the keywords have been standardized between test suites.</p>
 <h3 id="general-keywords-test_opts">General keywords (TEST_OPTS)</h3>
-<p>Some keywords are valid across different test suites. If you want to
-run tests from multiple test suites, or just don't want to care which
-test suite specific control variable to use, then you can use the
-general TEST_OPTS control variable.</p>
-<p>There are also some keywords that applies globally to the test runner
-system, not to any specific test suites. These are also available as
-TEST_OPTS keywords.</p>
+<p>Some keywords are valid across different test suites. If you want to run tests from multiple test suites, or just don't want to care which test suite specific control variable to use, then you can use the general TEST_OPTS control variable.</p>
+<p>There are also some keywords that applies globally to the test runner system, not to any specific test suites. These are also available as TEST_OPTS keywords.</p>
 <h4 id="jobs">JOBS</h4>
 <p>Currently only applies to JTReg.</p>
 <h4 id="timeout_factor">TIMEOUT_FACTOR</h4>
@@ -399,57 +141,28 @@ TEST_OPTS keywords.</p>
 <h4 id="aot_modules">AOT_MODULES</h4>
 <p>Applies to JTReg and GTest.</p>
 <h4 id="jcov">JCOV</h4>
-<p>This keywords applies globally to the test runner system. If set to
-<code>true</code>, it enables JCov coverage reporting for all tests run.
-To be useful, the JDK under test must be run with a JDK built with JCov
-instrumentation
-(<code>configure --with-jcov=&lt;path to directory containing lib/jcov.jar&gt;</code>,
-<code>make jcov-image</code>).</p>
-<p>The simplest way to run tests with JCov coverage report is to use the
-special target <code>jcov-test</code> instead of <code>test</code>, e.g.
-<code>make jcov-test TEST=jdk_lang</code>. This will make sure the JCov
-image is built, and that JCov reporting is enabled.</p>
-<p>The JCov report is stored in
-<code>build/$BUILD/test-results/jcov-output/report</code>.</p>
-<p>Please note that running with JCov reporting can be very memory
-intensive.</p>
+<p>This keywords applies globally to the test runner system. If set to <code>true</code>, it enables JCov coverage reporting for all tests run. To be useful, the JDK under test must be run with a JDK built with JCov instrumentation (<code>configure --with-jcov=&lt;path to directory containing lib/jcov.jar&gt;</code>, <code>make jcov-image</code>).</p>
+<p>The simplest way to run tests with JCov coverage report is to use the special target <code>jcov-test</code> instead of <code>test</code>, e.g. <code>make jcov-test TEST=jdk_lang</code>. This will make sure the JCov image is built, and that JCov reporting is enabled.</p>
+<p>The JCov report is stored in <code>build/$BUILD/test-results/jcov-output/report</code>.</p>
+<p>Please note that running with JCov reporting can be very memory intensive.</p>
 <h4 id="jcov_diff_changeset">JCOV_DIFF_CHANGESET</h4>
-<p>While collecting code coverage with JCov, it is also possible to find
-coverage for only recently changed code. JCOV_DIFF_CHANGESET specifies a
-source revision. A textual report will be generated showing coverage of
-the diff between the specified revision and the repository tip.</p>
-<p>The report is stored in
-<code>build/$BUILD/test-results/jcov-output/diff_coverage_report</code>
-file.</p>
+<p>While collecting code coverage with JCov, it is also possible to find coverage for only recently changed code. JCOV_DIFF_CHANGESET specifies a source revision. A textual report will be generated showing coverage of the diff between the specified revision and the repository tip.</p>
+<p>The report is stored in <code>build/$BUILD/test-results/jcov-output/diff_coverage_report</code> file.</p>
 <h3 id="jtreg-keywords">JTReg keywords</h3>
 <h4 id="jobs-1">JOBS</h4>
 <p>The test concurrency (<code>-concurrency</code>).</p>
-<p>Defaults to TEST_JOBS (if set by <code>--with-test-jobs=</code>),
-otherwise it defaults to JOBS, except for Hotspot, where the default is
-<em>number of CPU cores/2</em>, but never more than <em>memory size in
-GB/2</em>.</p>
+<p>Defaults to TEST_JOBS (if set by <code>--with-test-jobs=</code>), otherwise it defaults to JOBS, except for Hotspot, where the default is <em>number of CPU cores/2</em>, but never more than <em>memory size in GB/2</em>.</p>
 <h4 id="timeout_factor-1">TIMEOUT_FACTOR</h4>
 <p>The timeout factor (<code>-timeoutFactor</code>).</p>
 <p>Defaults to 4.</p>
 <h4 id="failure_handler_timeout">FAILURE_HANDLER_TIMEOUT</h4>
-<p>Sets the argument <code>-timeoutHandlerTimeout</code> for JTReg. The
-default value is 0. This is only valid if the failure handler is
-built.</p>
-<h4 id="jtreg_test_thread_factory">JTREG_TEST_THREAD_FACTORY</h4>
-<p>Sets the <code>-testThreadFactory</code> for JTReg. It should be the
-fully qualified classname of a class which implements
-<code>java.util.concurrent.ThreadFactory</code>. One such implementation
-class, named Virtual, is currently part of the JDK build in the
-<code>test/jtreg_test_thread_factory/</code> directory. This class gets
-compiled during the test image build. The implementation of the Virtual
-class creates a new virtual thread for executing each test class.</p>
+<p>Sets the argument <code>-timeoutHandlerTimeout</code> for JTReg. The default value is 0. This is only valid if the failure handler is built.</p>
 <h4 id="test_mode">TEST_MODE</h4>
 <p>The test mode (<code>agentvm</code> or <code>othervm</code>).</p>
 <p>Defaults to <code>agentvm</code>.</p>
 <h4 id="assert">ASSERT</h4>
 <p>Enable asserts (<code>-ea -esa</code>, or none).</p>
-<p>Set to <code>true</code> or <code>false</code>. If true, adds
-<code>-ea -esa</code>. Defaults to true, except for hotspot.</p>
+<p>Set to <code>true</code> or <code>false</code>. If true, adds <code>-ea -esa</code>. Defaults to true, except for hotspot.</p>
 <h4 id="verbose">VERBOSE</h4>
 <p>The verbosity level (<code>-verbose</code>).</p>
 <p>Defaults to <code>fail,error,summary</code>.</p>
@@ -457,203 +170,92 @@ class creates a new virtual thread for executing each test class.</p>
 <p>What test data to retain (<code>-retain</code>).</p>
 <p>Defaults to <code>fail,error</code>.</p>
 <h4 id="max_mem">MAX_MEM</h4>
-<p>Limit memory consumption (<code>-Xmx</code> and
-<code>-vmoption:-Xmx</code>, or none).</p>
-<p>Limit memory consumption for JTReg test framework and VM under test.
-Set to 0 to disable the limits.</p>
-<p>Defaults to 512m, except for hotspot, where it defaults to 0 (no
-limit).</p>
+<p>Limit memory consumption (<code>-Xmx</code> and <code>-vmoption:-Xmx</code>, or none).</p>
+<p>Limit memory consumption for JTReg test framework and VM under test. Set to 0 to disable the limits.</p>
+<p>Defaults to 512m, except for hotspot, where it defaults to 0 (no limit).</p>
 <h4 id="max_output">MAX_OUTPUT</h4>
-<p>Set the property <code>javatest.maxOutputSize</code> for the
-launcher, to change the default JTReg log limit.</p>
+<p>Set the property <code>javatest.maxOutputSize</code> for the launcher, to change the default JTReg log limit.</p>
 <h4 id="keywords">KEYWORDS</h4>
-<p>JTReg keywords sent to JTReg using <code>-k</code>. Please be careful
-in making sure that spaces and special characters (like <code>!</code>)
-are properly quoted. To avoid some issues, the special value
-<code>%20</code> can be used instead of space.</p>
+<p>JTReg keywords sent to JTReg using <code>-k</code>. Please be careful in making sure that spaces and special characters (like <code>!</code>) are properly quoted. To avoid some issues, the special value <code>%20</code> can be used instead of space.</p>
 <h4 id="extra_problem_lists">EXTRA_PROBLEM_LISTS</h4>
-<p>Use additional problem lists file or files, in addition to the
-default ProblemList.txt located at the JTReg test roots.</p>
-<p>If multiple file names are specified, they should be separated by
-space (or, to help avoid quoting issues, the special value
-<code>%20</code>).</p>
-<p>The file names should be either absolute, or relative to the JTReg
-test root of the tests to be run.</p>
+<p>Use additional problem lists file or files, in addition to the default ProblemList.txt located at the JTReg test roots.</p>
+<p>If multiple file names are specified, they should be separated by space (or, to help avoid quoting issues, the special value <code>%20</code>).</p>
+<p>The file names should be either absolute, or relative to the JTReg test root of the tests to be run.</p>
 <h4 id="run_problem_lists">RUN_PROBLEM_LISTS</h4>
 <p>Use the problem lists to select tests instead of excluding them.</p>
-<p>Set to <code>true</code> or <code>false</code>. If <code>true</code>,
-JTReg will use <code>-match:</code> option, otherwise
-<code>-exclude:</code> will be used. Default is <code>false</code>.</p>
+<p>Set to <code>true</code> or <code>false</code>. If <code>true</code>, JTReg will use <code>-match:</code> option, otherwise <code>-exclude:</code> will be used. Default is <code>false</code>.</p>
 <h4 id="options">OPTIONS</h4>
 <p>Additional options to the JTReg test framework.</p>
-<p>Use <code>JTREG="OPTIONS=--help all"</code> to see all available
-JTReg options.</p>
+<p>Use <code>JTREG=&quot;OPTIONS=--help all&quot;</code> to see all available JTReg options.</p>
 <h4 id="java_options-1">JAVA_OPTIONS</h4>
-<p>Additional Java options for running test classes (sent to JTReg as
-<code>-javaoption</code>).</p>
+<p>Additional Java options for running test classes (sent to JTReg as <code>-javaoption</code>).</p>
 <h4 id="vm_options-1">VM_OPTIONS</h4>
-<p>Additional Java options to be used when compiling and running classes
-(sent to JTReg as <code>-vmoption</code>).</p>
-<p>This option is only needed in special circumstances. To pass Java
-options to your test classes, use <code>JAVA_OPTIONS</code>.</p>
+<p>Additional Java options to be used when compiling and running classes (sent to JTReg as <code>-vmoption</code>).</p>
+<p>This option is only needed in special circumstances. To pass Java options to your test classes, use <code>JAVA_OPTIONS</code>.</p>
 <h4 id="launcher_options">LAUNCHER_OPTIONS</h4>
-<p>Additional Java options that are sent to the java launcher that
-starts the JTReg harness.</p>
+<p>Additional Java options that are sent to the java launcher that starts the JTReg harness.</p>
 <h4 id="aot_modules-1">AOT_MODULES</h4>
-<p>Generate AOT modules before testing for the specified module, or set
-of modules. If multiple modules are specified, they should be separated
-by space (or, to help avoid quoting issues, the special value
-<code>%20</code>).</p>
+<p>Generate AOT modules before testing for the specified module, or set of modules. If multiple modules are specified, they should be separated by space (or, to help avoid quoting issues, the special value <code>%20</code>).</p>
 <h4 id="retry_count">RETRY_COUNT</h4>
-<p>Retry failed tests up to a set number of times, until they pass. This
-allows to pass the tests with intermittent failures. Defaults to 0.</p>
+<p>Retry failed tests up to a set number of times, until they pass. This allows to pass the tests with intermittent failures. Defaults to 0.</p>
 <h4 id="repeat_count">REPEAT_COUNT</h4>
-<p>Repeat the tests up to a set number of times, stopping at first
-failure. This helps to reproduce intermittent test failures. Defaults to
-0.</p>
-<h4 id="report">REPORT</h4>
-<p>Use this report style when reporting test results (sent to JTReg as
-<code>-report</code>). Defaults to <code>files</code>.</p>
+<p>Repeat the tests up to a set number of times, stopping at first failure. This helps to reproduce intermittent test failures. Defaults to 0.</p>
 <h3 id="gtest-keywords">Gtest keywords</h3>
 <h4 id="repeat">REPEAT</h4>
-<p>The number of times to repeat the tests
-(<code>--gtest_repeat</code>).</p>
-<p>Default is 1. Set to -1 to repeat indefinitely. This can be
-especially useful combined with
-<code>OPTIONS=--gtest_break_on_failure</code> to reproduce an
-intermittent problem.</p>
+<p>The number of times to repeat the tests (<code>--gtest_repeat</code>).</p>
+<p>Default is 1. Set to -1 to repeat indefinitely. This can be especially useful combined with <code>OPTIONS=--gtest_break_on_failure</code> to reproduce an intermittent problem.</p>
 <h4 id="options-1">OPTIONS</h4>
 <p>Additional options to the Gtest test framework.</p>
-<p>Use <code>GTEST="OPTIONS=--help"</code> to see all available Gtest
-options.</p>
+<p>Use <code>GTEST=&quot;OPTIONS=--help&quot;</code> to see all available Gtest options.</p>
 <h4 id="aot_modules-2">AOT_MODULES</h4>
-<p>Generate AOT modules before testing for the specified module, or set
-of modules. If multiple modules are specified, they should be separated
-by space (or, to help avoid quoting issues, the special value
-<code>%20</code>).</p>
+<p>Generate AOT modules before testing for the specified module, or set of modules. If multiple modules are specified, they should be separated by space (or, to help avoid quoting issues, the special value <code>%20</code>).</p>
 <h3 id="microbenchmark-keywords">Microbenchmark keywords</h3>
 <h4 id="fork">FORK</h4>
-<p>Override the number of benchmark forks to spawn. Same as specifying
-<code>-f &lt;num&gt;</code>.</p>
+<p>Override the number of benchmark forks to spawn. Same as specifying <code>-f &lt;num&gt;</code>.</p>
 <h4 id="iter">ITER</h4>
-<p>Number of measurement iterations per fork. Same as specifying
-<code>-i &lt;num&gt;</code>.</p>
+<p>Number of measurement iterations per fork. Same as specifying <code>-i &lt;num&gt;</code>.</p>
 <h4 id="time">TIME</h4>
-<p>Amount of time to spend in each measurement iteration, in seconds.
-Same as specifying <code>-r &lt;num&gt;</code></p>
+<p>Amount of time to spend in each measurement iteration, in seconds. Same as specifying <code>-r &lt;num&gt;</code></p>
 <h4 id="warmup_iter">WARMUP_ITER</h4>
-<p>Number of warmup iterations to run before the measurement phase in
-each fork. Same as specifying <code>-wi &lt;num&gt;</code>.</p>
+<p>Number of warmup iterations to run before the measurement phase in each fork. Same as specifying <code>-wi &lt;num&gt;</code>.</p>
 <h4 id="warmup_time">WARMUP_TIME</h4>
-<p>Amount of time to spend in each warmup iteration. Same as specifying
-<code>-w &lt;num&gt;</code>.</p>
+<p>Amount of time to spend in each warmup iteration. Same as specifying <code>-w &lt;num&gt;</code>.</p>
 <h4 id="results_format">RESULTS_FORMAT</h4>
-<p>Specify to have the test run save a log of the values. Accepts the
-same values as <code>-rff</code>, i.e., <code>text</code>,
-<code>csv</code>, <code>scsv</code>, <code>json</code>, or
-<code>latex</code>.</p>
+<p>Specify to have the test run save a log of the values. Accepts the same values as <code>-rff</code>, i.e., <code>text</code>, <code>csv</code>, <code>scsv</code>, <code>json</code>, or <code>latex</code>.</p>
 <h4 id="vm_options-2">VM_OPTIONS</h4>
-<p>Additional VM arguments to provide to forked off VMs. Same as
-<code>-jvmArgs &lt;args&gt;</code></p>
+<p>Additional VM arguments to provide to forked off VMs. Same as <code>-jvmArgs &lt;args&gt;</code></p>
 <h4 id="options-2">OPTIONS</h4>
 <p>Additional arguments to send to JMH.</p>
 <h2 id="notes-for-specific-tests">Notes for Specific Tests</h2>
 <h3 id="docker-tests">Docker Tests</h3>
-<p>Docker tests with default parameters may fail on systems with glibc
-versions not compatible with the one used in the default docker image
-(e.g., Oracle Linux 7.6 for x86). For example, they pass on Ubuntu 16.04
-but fail on Ubuntu 18.04 if run like this on x86:</p>
+<p>Docker tests with default parameters may fail on systems with glibc versions not compatible with the one used in the default docker image (e.g., Oracle Linux 7.6 for x86). For example, they pass on Ubuntu 16.04 but fail on Ubuntu 18.04 if run like this on x86:</p>
 <pre><code>$ make test TEST=&quot;jtreg:test/hotspot/jtreg/containers/docker&quot;</code></pre>
-<p>To run these tests correctly, additional parameters for the correct
-docker image are required on Ubuntu 18.04 by using
-<code>JAVA_OPTIONS</code>.</p>
+<p>To run these tests correctly, additional parameters for the correct docker image are required on Ubuntu 18.04 by using <code>JAVA_OPTIONS</code>.</p>
 <pre><code>$ make test TEST=&quot;jtreg:test/hotspot/jtreg/containers/docker&quot; \
     JTREG=&quot;JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu
     -Djdk.test.docker.image.version=latest&quot;</code></pre>
 <h3 id="non-us-locale">Non-US locale</h3>
-<p>If your locale is non-US, some tests are likely to fail. To work
-around this you can set the locale to US. On Unix platforms simply
-setting <code>LANG="en_US"</code> in the environment before running
-tests should work. On Windows or MacOS, setting
-<code>JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US"</code>
-helps for most, but not all test cases.</p>
+<p>If your locale is non-US, some tests are likely to fail. To work around this you can set the locale to US. On Unix platforms simply setting <code>LANG=&quot;en_US&quot;</code> in the environment before running tests should work. On Windows or MacOS, setting <code>JTREG=&quot;VM_OPTIONS=-Duser.language=en -Duser.country=US&quot;</code> helps for most, but not all test cases.</p>
 <p>For example:</p>
 <pre><code>$ export LANG=&quot;en_US&quot; &amp;&amp; make test TEST=...
 $ make test JTREG=&quot;VM_OPTIONS=-Duser.language=en -Duser.country=US&quot; TEST=...</code></pre>
 <h3 id="pkcs11-tests">PKCS11 Tests</h3>
-<p>It is highly recommended to use the latest NSS version when running
-PKCS11 tests. Improper NSS version may lead to unexpected failures which
-are hard to diagnose. For example,
-sun/security/pkcs11/Secmod/AddTrustedCert.java may fail on Ubuntu 18.04
-with the default NSS version in the system. To run these tests
-correctly, the system property
-<code>jdk.test.lib.artifacts.&lt;NAME&gt;</code> is required on Ubuntu
-18.04 to specify the alternative NSS lib directory. The
-<code>&lt;NAME&gt;</code> component should be replaced with the name
-element of the appropriate <code>@Artifact</code> class. (See
-<code>test/jdk/sun/security/pkcs11/PKCS11Test.java</code>)</p>
+<p>It is highly recommended to use the latest NSS version when running PKCS11 tests. Improper NSS version may lead to unexpected failures which are hard to diagnose. For example, sun/security/pkcs11/Secmod/AddTrustedCert.java may fail on Ubuntu 18.04 with the default NSS version in the system. To run these tests correctly, the system property <code>test.nss.lib.paths</code> is required on Ubuntu 18.04 to specify the alternative NSS lib directories.</p>
 <p>For example:</p>
 <pre><code>$ make test TEST=&quot;jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java&quot; \
-    JTREG=&quot;JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs&quot;</code></pre>
-<p>For more notes about the PKCS11 tests, please refer to
-test/jdk/sun/security/pkcs11/README.</p>
+    JTREG=&quot;JAVA_OPTIONS=-Dtest.nss.lib.paths=/path/to/your/latest/NSS-libs&quot;</code></pre>
+<p>For more notes about the PKCS11 tests, please refer to test/jdk/sun/security/pkcs11/README.</p>
 <h3 id="client-ui-tests">Client UI Tests</h3>
-<h4 id="system-key-shortcuts">System key shortcuts</h4>
-<p>Some Client UI tests use key sequences which may be reserved by the
-operating system. Usually that causes the test failure. So it is highly
-recommended to disable system key shortcuts prior testing. The steps to
-access and disable system key shortcuts for various platforms are
-provided below.</p>
-<h5 id="macos">macOS</h5>
-<p>Choose Apple menu; System Preferences, click Keyboard, then click
-Shortcuts; select or deselect desired shortcut.</p>
-<p>For example,
-test/jdk/javax/swing/TooltipManager/JMenuItemToolTipKeyBindingsTest/JMenuItemToolTipKeyBindingsTest.java
-fails on MacOS because it uses <code>CTRL + F1</code> key sequence to
-show or hide tooltip message but the key combination is reserved by the
-operating system. To run the test correctly the default global key
-shortcut should be disabled using the steps described above, and then
-deselect "Turn keyboard access on or off" option which is responsible
-for <code>CTRL + F1</code> combination.</p>
-<h5 id="linux">Linux</h5>
-<p>Open the Activities overview and start typing Settings; Choose
-Settings, click Devices, then click Keyboard; set or override desired
-shortcut.</p>
-<h5 id="windows">Windows</h5>
-<p>Type <code>gpedit</code> in the Search and then click Edit group
-policy; navigate to User Configuration -&gt; Administrative Templates
--&gt; Windows Components -&gt; File Explorer; in the right-side pane
-look for "Turn off Windows key hotkeys" and double click on it; enable
-or disable hotkeys.</p>
+<p>Some Client UI tests use key sequences which may be reserved by the operating system. Usually that causes the test failure. So it is highly recommended to disable system key shortcuts prior testing. The steps to access and disable system key shortcuts for various platforms are provided below.</p>
+<h4 id="macos">MacOS</h4>
+<p>Choose Apple menu; System Preferences, click Keyboard, then click Shortcuts; select or deselect desired shortcut.</p>
+<p>For example, test/jdk/javax/swing/TooltipManager/JMenuItemToolTipKeyBindingsTest/JMenuItemToolTipKeyBindingsTest.java fails on MacOS because it uses <code>CTRL + F1</code> key sequence to show or hide tooltip message but the key combination is reserved by the operating system. To run the test correctly the default global key shortcut should be disabled using the steps described above, and then deselect &quot;Turn keyboard access on or off&quot; option which is responsible for <code>CTRL + F1</code> combination.</p>
+<h4 id="linux">Linux</h4>
+<p>Open the Activities overview and start typing Settings; Choose Settings, click Devices, then click Keyboard; set or override desired shortcut.</p>
+<h4 id="windows">Windows</h4>
+<p>Type <code>gpedit</code> in the Search and then click Edit group policy; navigate to User Configuration -&gt; Administrative Templates -&gt; Windows Components -&gt; File Explorer; in the right-side pane look for &quot;Turn off Windows key hotkeys&quot; and double click on it; enable or disable hotkeys.</p>
 <p>Note: restart is required to make the settings take effect.</p>
-<h4 id="robot-api">Robot API</h4>
-<p>Most automated Client UI tests use <code>Robot</code> API to control
-the UI. Usually, the default operating system settings need to be
-adjusted for Robot to work correctly. The detailed steps how to access
-and update these settings for different platforms are provided
-below.</p>
-<h5 id="macos-1">macOS</h5>
-<p><code>Robot</code> is not permitted to control your Mac by default
-since macOS 10.15. To allow it, choose Apple menu -&gt; System Settings,
-click Privacy &amp; Security; then click Accessibility and ensure the
-following apps are allowed to control your computer: <em>Java</em> and
-<em>Terminal</em>. If the tests are run from an IDE, the IDE should be
-granted this permission too.</p>
-<h5 id="windows-1">Windows</h5>
-<p>On Windows if Cygwin terminal is used to run the tests, there is a
-delay in focus transfer. Usually it causes automated UI test failure. To
-disable the delay, type <code>regedit</code> in the Search and then
-select Registry Editor; navigate to the following key:
-<code>HKEY_CURRENT_USER\Control Panel\Desktop</code>; make sure the
-<code>ForegroundLockTimeout</code> value is set to 0.</p>
-<p>Additional information about Client UI tests configuration for
-various operating systems can be obtained at <a
-href="https://wiki.openjdk.org/display/ClientLibs/Automated+client+GUI+testing+system+set+up+requirements">Automated
-client GUI testing system set up requirements</a></p>
 <h2 id="editing-this-document">Editing this document</h2>
-<p>If you want to contribute changes to this document, edit
-<code>doc/testing.md</code> and then run
-<code>make update-build-docs</code> to generate the same changes in
-<code>doc/testing.html</code>.</p>
+<p>If you want to contribute changes to this document, edit <code>doc/testing.md</code> and then run <code>make update-build-docs</code> to generate the same changes in <code>doc/testing.html</code>.</p>
 </body>
 </html>

doc/testing.md

@@ -1,26 +1,21 @@
 % Testing the JDK
 
-## Overview
+## Using "make test" (the run-test framework)
 
-The bulk of JDK tests use [jtreg](https://openjdk.org/jtreg/), a regression
-test framework and test runner built for the JDK's specific needs. Other test
-frameworks are also used. The different test frameworks can be executed
-directly, but there is also a set of make targets intended to simplify the
-interface, and figure out how to run your tests for you.
+This new way of running tests is developer-centric. It assumes that you have
+built a JDK locally and want to test it. Running common test targets is simple,
+and more complex ad-hoc combination of tests is possible. The user interface is
+forgiving, and clearly report errors it cannot resolve.
 
-## Running tests locally with `make test`
+The main target `test` uses the jdk-image as the tested product. There is
+also an alternate target `exploded-test` that uses the exploded image
+instead. Not all tests will run successfully on the exploded image, but using
+this target can greatly improve rebuild times for certain workflows.
 
-This is the easiest way to get started. Assuming you've built the JDK locally,
-execute:
-
-    $ make test
-
-This will run a default set of tests against the JDK, and present you with the
-results. `make test` is part of a family of test-related make targets which
-simplify running tests, because they invoke the various test frameworks for
-you. The "make test framework" is simple to start with, but more complex ad-hoc
-combination of tests is also possible. You can always invoke the test
-frameworks directly if you want even more control.
+Previously, `make test` was used to invoke an old system for running tests, and
+`make run-test` was used for the new test framework. For backward compatibility
+with scripts and muscle memory, `run-test` (and variants like
+`exploded-run-test` or `run-test-tier1`) are kept as aliases.
 
 Some example command-lines:
 
@@ -33,20 +28,6 @@ Some example command-lines:
     $ make test TEST="micro:java.lang.reflect" MICRO="FORK=1;WARMUP_ITER=2"
     $ make exploded-test TEST=tier2
 
-"tier1" and "tier2" refer to tiered testing, see further down. "TEST" is a test
- selection argument which the make test framework will use to try to find the
- tests you want. It iterates over the available test frameworks, and if the
- test isn't present in one, it tries the next one. The main target `test` uses
- the jdk-image as the tested product. There is also an alternate target
- `exploded-test` that uses the exploded image instead. Not all tests will run
- successfully on the exploded image, but using this target can greatly improve
- rebuild times for certain workflows.
-
-Previously, `make test` was used to invoke an old system for running tests, and
-`make run-test` was used for the new test framework. For backward compatibility
-with scripts and muscle memory, `run-test` and variants like
-`exploded-run-test` or `run-test-tier1` are kept as aliases.
-
 ### Configuration
 
 To be able to run JTReg tests, `configure` needs to know where to find the
@@ -64,27 +45,26 @@ after which `--with-jmh=build/jmh/jars` should work.
 
 When tests fail or timeout, jtreg runs its failure handler to capture necessary
 data from the system where the test was run. This data can then be used to
-analyze the test failures. Collecting this data involves running various
-commands (which are listed in files residing in
-`test/failure_handler/src/share/conf`) and some of these commands use `sudo`.
-If the system's `sudoers` file isn't configured to allow running these
-commands, then it can result in password being prompted during the failure
-handler execution. Typically, when running locally, collecting this additional
-data isn't always necessary. To disable running the failure handler, use
-`--enable-jtreg-failure-handler=no` when running `configure`. If, however, you
-want to let the failure handler to run and don't want to be prompted for sudo
-password, then you can configure your `sudoers` file appropriately. Please read
-the necessary documentation of your operating system to see how to do that;
-here we only show one possible way of doing that - edit the
-`/etc/sudoers.d/sudoers` file to include the following line:
+analyze the test failures. Collecting this data involves running various commands
+(which are listed in files residing in `test/failure_handler/src/share/conf`)
+and some of these commands use `sudo`. If the system's `sudoers` file isn't
+configured to allow running these commands, then it can result in password being
+prompted during the failure handler execution. Typically, when running locally,
+collecting this additional data isn't always necessary. To disable running the
+failure handler, use `--enable-jtreg-failure-handler=no` when running `configure`.
+If, however, you want to let the failure handler to run and don't want to be
+prompted for sudo password, then you can configure your `sudoers` file
+appropriately. Please read the necessary documentation of your operating system
+to see how to do that; here we only show one possible way of doing that - edit
+the `/etc/sudoers.d/sudoers` file to include the following line:
 
 ```
 johndoe ALL=(ALL) NOPASSWD: /sbin/dmesg
 ```
 
 This line configures `sudo` to _not_ prompt for password for the `/sbin/dmesg`
-command (this is one of the commands that is listed in the files at
-`test/failure_handler/src/share/conf`), for the user `johndoe`. Here `johndoe`
+command (this is one of the commands that is listed in the files
+at `test/failure_handler/src/share/conf`), for the user `johndoe`. Here `johndoe`
 is the user account under which the jtreg tests are run. Replace the username
 with a relevant user account of your system.
 
@@ -111,71 +91,64 @@ if you want to shortcut the parser.
 
 ### Common Test Groups
 
-Ideally, all tests are run for every change but this may not be practical due
-to the limited testing resources, the scope of the change, etc.
+Ideally, all tests are run for every change but this may not be practical due to the limited
+testing resources, the scope of the change, etc.
 
-The source tree currently defines a few common test groups in the relevant
-`TEST.groups` files. There are test groups that cover a specific component, for
-example `hotspot_gc`. It is a good idea to look into `TEST.groups` files to get
-a sense what tests are relevant to a particular JDK component.
+The source tree currently defines a few common test groups in the relevant `TEST.groups`
+files. There are test groups that cover a specific component, for example `hotspot_gc`.
+It is a good idea to look into `TEST.groups` files to get a sense what tests are relevant
+to a particular JDK component.
 
-Component-specific tests may miss some unintended consequences of a change, so
-other tests should also be run. Again, it might be impractical to run all
-tests, and therefore _tiered_ test groups exist. Tiered test groups are not
-component-specific, but rather cover the significant parts of the entire JDK.
+Component-specific tests may miss some unintended consequences of a change, so other
+tests should also be run. Again, it might be impractical to run all tests, and therefore
+_tiered_ test groups exist. Tiered test groups are not component-specific, but rather cover
+the significant parts of the entire JDK.
 
-Multiple tiers allow balancing test coverage and testing costs. Lower test
-tiers are supposed to contain the simpler, quicker and more stable tests.
-Higher tiers are supposed to contain progressively more thorough, slower, and
-sometimes less stable tests, or the tests that require special configuration.
+Multiple tiers allow balancing test coverage and testing costs. Lower test tiers are supposed to
+contain the simpler, quicker and more stable tests. Higher tiers are supposed to contain
+progressively more thorough, slower, and sometimes less stable tests, or the tests that require
+special configuration.
 
-Contributors are expected to run the tests for the areas that are changed, and
-the first N tiers they can afford to run, but at least tier1.
+Contributors are expected to run the tests for the areas that are changed, and the first N tiers
+they can afford to run, but at least tier1.
 
 A brief description of the tiered test groups:
 
-- `tier1`: This is the most fundamental test tier. Roughly speaking, a failure
-  of a test in this tier has the potential to indicate a problem that would
-  affect many Java programs. Tests in `tier1` include tests of HotSpot, core
-  APIs in the `java.base` module, and the `javac` compiler. Multiple developers
-  run these tests every day. Because of the widespread use, the tests in
-  `tier1` are carefully selected and optimized to run fast, and to run in the
-  most stable manner. As a guideline, nearly all individual tests in `tier1`
-  are expected to run to completion in ten seconds or less when run on common
-  configurations used for development. Long-running tests, even of core
-  functionality, should occur in higher tiers or be covered in other kinds of
-  testing. The test failures in `tier1` are usually followed up on quickly,
-  either with fixes, or adding relevant tests to problem list. GitHub Actions
-  workflows, if enabled, run `tier1` tests.
+- `tier1`: This is the lowest test tier. Multiple developers run these tests every day.
+Because of the widespread use, the tests in `tier1` are carefully selected and optimized to run
+fast, and to run in the most stable manner. The test failures in `tier1` are usually followed up
+on quickly, either with fixes, or adding relevant tests to problem list. GitHub Actions workflows,
+if enabled, run `tier1` tests.
 
-- `tier2`: This test group covers even more ground. These contain, among other
-  things, tests that either run for too long to be at `tier1`, or may require
-  special configuration, or tests that are less stable, or cover the broader
-  range of non-core JVM and JDK features/components(for example, XML).
+- `tier2`: This test group covers even more ground. These contain, among other things,
+tests that either run for too long to be at `tier1`, or may require special configuration,
+or tests that are less stable, or cover the broader range of non-core JVM and JDK features/components
+(for example, XML).
 
-- `tier3`: This test group includes more stressful tests, the tests for corner
-  cases not covered by previous tiers, plus the tests that require GUIs. As
-  such, this suite should either be run with low concurrency (`TEST_JOBS=1`),
-  or without headful tests(`JTREG_KEYWORDS=\!headful`), or both.
+- `tier3`: This test group includes more stressful tests, the tests for corner cases
+not covered by previous tiers, plus the tests that require GUIs. As such, this suite
+should either be run with low concurrency (`TEST_JOBS=1`), or without headful tests
+(`JTREG_KEYWORDS=\!headful`), or both.
 
-- `tier4`: This test group includes every other test not covered by previous
-  tiers. It includes, for example, `vmTestbase` suites for Hotspot, which run
-  for many hours even on large machines. It also runs GUI tests, so the same
-  `TEST_JOBS` and `JTREG_KEYWORDS` caveats apply.
+- `tier4`: This test group includes every other test not covered by previous tiers. It includes,
+for example, `vmTestbase` suites for Hotspot, which run for many hours even on large
+machines. It also runs GUI tests, so the same `TEST_JOBS` and `JTREG_KEYWORDS` caveats
+apply.
 
 ### JTReg
 
-JTReg tests can be selected either by picking a JTReg test group, or a
-selection of files or directories containing JTReg tests. Documentation can be
-found at [https://openjdk.org/jtreg/](https://openjdk.org/jtreg/), note
-especially the extensive [FAQ](https://openjdk.org/jtreg/faq.html).
+JTReg tests can be selected either by picking a JTReg test group, or a selection
+of files or directories containing JTReg tests. Documentation can be found at 
+[https://openjdk.org/jtreg/](https://openjdk.org/jtreg/), note especially the
+extensive [FAQ](https://openjdk.org/jtreg/faq.html).
 
 JTReg test groups can be specified either without a test root, e.g. `:tier1`
 (or `tier1`, the initial colon is optional), or with, e.g. `hotspot:tier1`,
 `test/jdk:jdk_util` or `$(TOPDIR)/test/hotspot/jtreg:hotspot_all`. The test
-root can be specified either as an absolute path, or a path relative to the JDK
-top directory, or the `test` directory. For simplicity, the hotspot JTReg test
-root, which really is `hotspot/jtreg` can be abbreviated as just `hotspot`.
+root can be specified either as an absolute path, or a path relative to the
+JDK top directory, or the `test` directory. For simplicity, the hotspot
+JTReg test root, which really is `hotspot/jtreg` can be abbreviated as
+just `hotspot`.
 
 When specified without a test root, all matching groups from all test roots
 will be added. Otherwise, only the group from the specified test root will be
@@ -196,11 +169,6 @@ use a fully qualified test descriptor, add `jtreg:`, e.g.
 
 ### Gtest
 
-**Note:** To be able to run the Gtest suite, you need to configure your build
-to be able to find a proper version of the gtest source. For details, see the
-section ["Running Tests" in the build
-documentation](building.html#running-tests).
-
 Since the Hotspot Gtest suite is so quick, the default is to run all tests.
 This is specified by just `gtest`, or as a fully qualified test descriptor
 `gtest:all`.
@@ -217,10 +185,10 @@ present, then `gtest:all` will be equivalent to `gtest:all/server`.
 
 ### Microbenchmarks
 
-Which microbenchmarks to run is selected using a regular expression following
-the `micro:` test descriptor, e.g., `micro:java.lang.reflect`. This delegates
-the test selection to JMH, meaning package name, class name and even benchmark
-method names can be used to select tests.
+Which microbenchmarks to run is selected using a regular expression
+following the `micro:` test descriptor, e.g., `micro:java.lang.reflect`. This
+delegates the test selection to JMH, meaning package name, class name and even
+benchmark method names can be used to select tests.
 
 Using special characters like `|` in the regular expression is possible, but
 needs to be escaped multiple times: `micro:ArrayCopy\\\\\|reflect`.
@@ -297,12 +265,11 @@ normally eats `;`, the recommended usage is to write the assignment inside
 qoutes, e.g. `JTREG="...;..."`. This will also make sure spaces are preserved,
 as in `JTREG="JAVA_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"`.
 
-(Other ways are possible, e.g. using backslash:
-`JTREG=JOBS=1\;TIMEOUT_FACTOR=8`. Also, as a special technique, the string
-`%20` will be replaced with space for certain options, e.g.
-`JTREG=JAVA_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug`. This can be useful if
-you have layers of scripts and have trouble getting proper quoting of command
-line arguments through.)
+(Other ways are possible, e.g. using backslash: `JTREG=JOBS=1\;TIMEOUT_FACTOR=8`.
+Also, as a special technique, the string `%20` will be replaced with space for
+certain options, e.g. `JTREG=JAVA_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug`.
+This can be useful if you have layers of scripts and have trouble getting
+proper quoting of command line arguments through.)
 
 As far as possible, the names of the keywords have been standardized between
 test suites.
@@ -315,8 +282,7 @@ control variable to use, then you can use the general TEST_OPTS control
 variable.
 
 There are also some keywords that applies globally to the test runner system,
-not to any specific test suites. These are also available as TEST_OPTS
-keywords.
+not to any specific test suites. These are also available as TEST_OPTS keywords.
 
 #### JOBS
 
@@ -370,8 +336,8 @@ The report is stored in
 The test concurrency (`-concurrency`).
 
 Defaults to TEST_JOBS (if set by `--with-test-jobs=`), otherwise it defaults to
-JOBS, except for Hotspot, where the default is *number of CPU cores/2*, but
-never more than *memory size in GB/2*.
+JOBS, except for Hotspot, where the default is *number of CPU cores/2*,
+but never more than *memory size in GB/2*.
 
 #### TIMEOUT_FACTOR
 
@@ -384,15 +350,6 @@ Defaults to 4.
 Sets the argument `-timeoutHandlerTimeout` for JTReg. The default value is 0.
 This is only valid if the failure handler is built.
 
-#### JTREG_TEST_THREAD_FACTORY
-
-Sets the `-testThreadFactory` for JTReg. It should be the fully qualified
-classname of a class which implements `java.util.concurrent.ThreadFactory`. One
-such implementation class, named Virtual, is currently part of the JDK build in
-the `test/jtreg_test_thread_factory/` directory. This class gets compiled
-during the test image build. The implementation of the Virtual class creates a
-new virtual thread for executing each test class.
-
 #### TEST_MODE
 
 The test mode (`agentvm` or `othervm`).
@@ -453,8 +410,9 @@ the tests to be run.
 
 Use the problem lists to select tests instead of excluding them.
 
-Set to `true` or `false`. If `true`, JTReg will use `-match:` option, otherwise
-`-exclude:` will be used. Default is `false`.
+Set to `true` or `false`.
+If `true`, JTReg will use `-match:` option, otherwise `-exclude:` will be used.
+Default is `false`.
 
 #### OPTIONS
 
@@ -488,18 +446,15 @@ modules. If multiple modules are specified, they should be separated by space
 
 #### RETRY_COUNT
 
-Retry failed tests up to a set number of times, until they pass. This allows to
-pass the tests with intermittent failures. Defaults to 0.
+Retry failed tests up to a set number of times, until they pass.
+This allows to pass the tests with intermittent failures.
+Defaults to 0.
 
 #### REPEAT_COUNT
 
-Repeat the tests up to a set number of times, stopping at first failure. This
-helps to reproduce intermittent test failures. Defaults to 0.
-
-#### REPORT
-
-Use this report style when reporting test results (sent to JTReg as `-report`).
-Defaults to `files`.
+Repeat the tests up to a set number of times, stopping at first failure.
+This helps to reproduce intermittent test failures.
+Defaults to 0.
 
 ### Gtest keywords
 
@@ -545,8 +500,7 @@ Same as specifying `-wi <num>`.
 
 #### WARMUP_TIME
 
-Amount of time to spend in each warmup iteration. Same as specifying `-w
-<num>`.
+Amount of time to spend in each warmup iteration. Same as specifying `-w <num>`.
 
 #### RESULTS_FORMAT
 
@@ -587,9 +541,9 @@ $ make test TEST="jtreg:test/hotspot/jtreg/containers/docker" \
 
 If your locale is non-US, some tests are likely to fail. To work around this
 you can set the locale to US. On Unix platforms simply setting `LANG="en_US"`
-in the environment before running tests should work. On Windows or MacOS,
-setting `JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US"` helps for
-most, but not all test cases.
+in the environment before running tests should work. On Windows or MacOS, setting
+`JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US"` helps for most, but
+not all test cases.
 
 For example:
 
@@ -604,16 +558,14 @@ It is highly recommended to use the latest NSS version when running PKCS11
 tests. Improper NSS version may lead to unexpected failures which are hard to
 diagnose. For example, sun/security/pkcs11/Secmod/AddTrustedCert.java may fail
 on Ubuntu 18.04 with the default NSS version in the system. To run these tests
-correctly, the system property `jdk.test.lib.artifacts.<NAME>` is required on
-Ubuntu 18.04 to specify the alternative NSS lib directory. The `<NAME>`
-component should be replaced with the name element of the appropriate
-`@Artifact` class. (See `test/jdk/sun/security/pkcs11/PKCS11Test.java`)
+correctly, the system property `test.nss.lib.paths` is required on Ubuntu 18.04
+to specify the alternative NSS lib directories.
 
 For example:
 
 ```
 $ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" \
-    JTREG="JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs"
+    JTREG="JAVA_OPTIONS=-Dtest.nss.lib.paths=/path/to/your/latest/NSS-libs"
 ```
 
 For more notes about the PKCS11 tests, please refer to
@@ -621,14 +573,12 @@ test/jdk/sun/security/pkcs11/README.
 
 ### Client UI Tests
 
-#### System key shortcuts
-
 Some Client UI tests use key sequences which may be reserved by the operating
 system. Usually that causes the test failure. So it is highly recommended to
 disable system key shortcuts prior testing. The steps to access and disable
 system key shortcuts for various platforms are provided below.
 
-##### macOS
+#### MacOS
 
 Choose Apple menu; System Preferences, click Keyboard, then click Shortcuts;
 select or deselect desired shortcut.
@@ -641,12 +591,12 @@ test correctly the default global key shortcut should be disabled using the
 steps described above, and then deselect "Turn keyboard access on or off"
 option which is responsible for `CTRL + F1` combination.
 
-##### Linux
+#### Linux
 
 Open the Activities overview and start typing Settings; Choose Settings, click
 Devices, then click Keyboard; set or override desired shortcut.
 
-##### Windows
+#### Windows
 
 Type `gpedit` in the Search and then click Edit group policy; navigate to User
 Configuration -> Administrative Templates -> Windows Components -> File
@@ -655,38 +605,10 @@ double click on it; enable or disable hotkeys.
 
 Note: restart is required to make the settings take effect.
 
-#### Robot API
-
-Most automated Client UI tests use `Robot` API to control the UI. Usually, the
-default operating system settings need to be adjusted for Robot to work
-correctly. The detailed steps how to access and update these settings for
-different platforms are provided below.
-
-##### macOS
-
-`Robot` is not permitted to control your Mac by default since macOS 10.15. To
-allow it, choose Apple menu -> System Settings, click Privacy & Security; then
-click Accessibility and ensure the following apps are allowed to control your
-computer: *Java* and *Terminal*. If the tests are run from an IDE, the IDE
-should be granted this permission too.
-
-##### Windows
-
-On Windows if Cygwin terminal is used to run the tests, there is a delay in
-focus transfer. Usually it causes automated UI test failure. To disable the
-delay, type `regedit` in the Search and then select Registry Editor; navigate
-to the following key: `HKEY_CURRENT_USER\Control Panel\Desktop`; make sure the
-`ForegroundLockTimeout` value is set to 0.
-
-Additional information about Client UI tests configuration for various
-operating systems can be obtained at [Automated client GUI testing system set
-up
-requirements](https://wiki.openjdk.org/display/ClientLibs/Automated+client+GUI+testing+system+set+up+requirements)
-
 ## Editing this document
 
-If you want to contribute changes to this document, edit `doc/testing.md` and
-then run `make update-build-docs` to generate the same changes in
+If you want to contribute changes to this document, edit `doc/testing.md` and 
+then run `make update-build-docs` to generate the same changes in 
 `doc/testing.html`.
 
 ---

make/Bundles.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2023, 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
@@ -449,7 +449,7 @@ ifneq ($(filter jcov-bundles, $(MAKECMDGOALS)), )
       BUNDLE_NAME := $(JCOV_BUNDLE_NAME), \
       FILES := $(JCOV_BUNDLE_FILES), \
       BASE_DIRS := $(JCOV_IMAGE_DIR), \
-      SUBDIR := jdk-$(VERSION_NUMBER), \
+      SUBDIR := $(JDK_BUNDLE_SUBDIR), \
   ))
 
   JCOV_TARGETS += $(BUILD_JCOV_BUNDLE)
@@ -478,27 +478,6 @@ endif
 
 ################################################################################
 
-ifneq ($(filter static-libs-graal-bundles, $(MAKECMDGOALS)), )
-  STATIC_LIBS_GRAAL_BUNDLE_FILES := $(call FindFiles, $(STATIC_LIBS_GRAAL_IMAGE_DIR))
-
-  ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release)
-    STATIC_LIBS_GRAAL_BUNDLE_SUBDIR := $(JDK_MACOSX_CONTENTS_SUBDIR)/Home
-  else
-    STATIC_LIBS_GRAAL_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)
-  endif
-
-  $(eval $(call SetupBundleFile, BUILD_STATIC_LIBS_GRAAL_BUNDLE, \
-      BUNDLE_NAME := $(STATIC_LIBS_GRAAL_BUNDLE_NAME), \
-      FILES := $(STATIC_LIBS_GRAAL_BUNDLE_FILES), \
-      BASE_DIRS := $(STATIC_LIBS_GRAAL_IMAGE_DIR), \
-      SUBDIR := $(STATIC_LIBS_GRAAL_BUNDLE_SUBDIR), \
-  ))
-
-  STATIC_LIBS_GRAAL_TARGETS += $(BUILD_STATIC_LIBS_GRAAL_BUNDLE)
-endif
-
-################################################################################
-
 # Hook to include the corresponding custom file, if present.
 $(eval $(call IncludeCustomExtension, Bundles.gmk))
 
@@ -511,9 +490,8 @@ docs-jdk-bundles: $(DOCS_JDK_TARGETS)
 docs-javase-bundles: $(DOCS_JAVASE_TARGETS)
 docs-reference-bundles: $(DOCS_REFERENCE_TARGETS)
 static-libs-bundles: $(STATIC_LIBS_TARGETS)
-static-libs-graal-bundles: $(STATIC_LIBS_GRAAL_TARGETS)
 jcov-bundles: $(JCOV_TARGETS)
 
 .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
+    static-libs-bundles jcov-bundles

make/CompileDemos.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -58,7 +58,7 @@ DEMO_MANIFEST := $(SUPPORT_OUTPUTDIR)/demos/java-main-manifest.mf
 # This rule will be depended on due to the MANIFEST line in SetupBuildDemo
 # and SetupBuildJvmtiDemo.
 $(eval $(call SetupTextFileProcessing, BUILD_JAVA_MANIFEST, \
-  SOURCE_FILES := $(TOPDIR)/make/data/mainmanifest/manifest.mf.template, \
+  SOURCE_FILES := $(TOPDIR)/make/data/mainmanifest/manifest.mf, \
   OUTPUT_FILE := $(DEMO_MANIFEST), \
   REPLACEMENTS := \
       @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \
@@ -171,41 +171,41 @@ $(BUILD_DEMO_CodePointIM_JAR): $(CODEPOINT_METAINF_SERVICE_FILE)
 
 $(eval $(call SetupBuildDemo, FileChooserDemo, \
     DEMO_SUBDIR := jfc, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked this-escape, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked, \
 ))
 
 $(eval $(call SetupBuildDemo, SwingSet2, \
     DEMO_SUBDIR := jfc, \
     EXTRA_COPY_TO_JAR := .java, \
     EXTRA_MANIFEST_ATTR := SplashScreen-Image: resources/images/splash.png, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked static serial cast this-escape, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked static serial cast, \
 ))
 
 $(eval $(call SetupBuildDemo, Font2DTest, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked serial cast this-escape, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked serial cast, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, J2Ddemo, \
     DEMO_SUBDIR := jfc, \
     MAIN_CLASS := java2d.J2Ddemo, \
-    DISABLED_WARNINGS := rawtypes deprecation unchecked cast lossy-conversions this-escape, \
+    DISABLED_WARNINGS := rawtypes deprecation unchecked cast lossy-conversions, \
     JAR_NAME := J2Ddemo, \
 ))
 
 $(eval $(call SetupBuildDemo, Metalworks, \
-    DISABLED_WARNINGS := rawtypes unchecked this-escape, \
+    DISABLED_WARNINGS := rawtypes unchecked, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, Notepad, \
-    DISABLED_WARNINGS := rawtypes this-escape, \
+    DISABLED_WARNINGS := rawtypes, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, Stylepad, \
     DEMO_SUBDIR := jfc, \
-    DISABLED_WARNINGS := rawtypes unchecked this-escape, \
+    DISABLED_WARNINGS := rawtypes unchecked, \
     EXTRA_SRC_DIR := $(DEMO_SHARE_SRC)/jfc/Notepad, \
     EXCLUDE_FILES := $(DEMO_SHARE_SRC)/jfc/Notepad/README.txt, \
 ))
@@ -215,12 +215,11 @@ $(eval $(call SetupBuildDemo, SampleTree, \
 ))
 
 $(eval $(call SetupBuildDemo, TableExample, \
-    DISABLED_WARNINGS := rawtypes unchecked deprecation this-escape, \
+    DISABLED_WARNINGS := rawtypes unchecked deprecation, \
     DEMO_SUBDIR := jfc, \
 ))
 
 $(eval $(call SetupBuildDemo, TransparentRuler, \
-    DISABLED_WARNINGS := this-escape, \
     DEMO_SUBDIR := jfc, \
     MAIN_CLASS := transparentruler.Ruler, \
 ))

make/CompileInterimLangtools.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2023, 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
@@ -98,10 +98,6 @@ define SetupInterimModule
       EXCLUDES := sun javax/tools/snippet-files, \
       EXCLUDE_FILES := $(TOPDIR)/src/$1/share/classes/module-info.java \
           $(TOPDIR)/src/$1/share/classes/javax/tools/ToolProvider.java \
-          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/Main.java \
-          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryContext.java \
-          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryModuleFinder.java \
-          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java \
           Standard.java, \
       EXTRA_FILES := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim/module-info.java \
           $($1.interim_EXTRA_FILES), \
@@ -113,9 +109,7 @@ define SetupInterimModule
           $$(INTERIM_LANGTOOLS_ADD_EXPORTS) \
           --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
           --add-exports java.base/jdk.internal.javac=java.compiler.interim \
-          --add-exports java.base/jdk.internal.javac=jdk.compiler.interim \
-          --add-exports jdk.internal.opt/jdk.internal.opt=jdk.compiler.interim \
-          --add-exports jdk.internal.opt/jdk.internal.opt=jdk.javadoc.interim, \
+          --add-exports java.base/jdk.internal.javac=jdk.compiler.interim, \
   ))
 
   $1_DEPS_INTERIM := $$(addsuffix .interim, $$(filter \
@@ -131,20 +125,5 @@ $(foreach m, $(INTERIM_LANGTOOLS_BASE_MODULES), \
 )
 
 ################################################################################
-# Setup the compilation of the javac server build tool. Technically, this is not
-# really "interim" langtools, but just like it, it is needed henceforth for all
-# java compilation using the interim compiler.
-$(eval $(call SetupJavaCompilation, BUILD_JAVAC_SERVER, \
-    COMPILER := bootjdk, \
-    TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
-    SRC := $(TOPDIR)/make/langtools/tools, \
-    INCLUDES := javacserver, \
-    BIN := $(BUILDTOOLS_OUTPUTDIR)/langtools_javacserver_classes, \
-))
-
-TARGETS += $(BUILD_JAVAC_SERVER)
-
-################################################################################
-
 
 all: $(TARGETS)

make/CompileModuleTools.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2023, 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
@@ -53,7 +53,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JIGSAW_TOOLS, \
                 build/tools/jigsaw, \
     COPY := .properties .html, \
     BIN := $(TOOLS_CLASSES_DIR), \
-    DISABLED_WARNINGS := fallthrough this-escape, \
+    DISABLED_WARNINGS := fallthrough, \
     JAVAC_FLAGS := \
         --add-modules jdk.jdeps \
         --add-exports java.base/jdk.internal.module=ALL-UNNAMED \

make/CompileToolsJdk.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -57,9 +57,7 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_JDK, \
     JAVAC_FLAGS := \
         --add-exports java.desktop/sun.awt=ALL-UNNAMED \
         --add-exports java.base/sun.text=ALL-UNNAMED \
-        --add-exports java.base/sun.security.util=ALL-UNNAMED \
-        --add-exports jdk.internal.opt/jdk.internal.opt=jdk.compiler.interim \
-        --add-exports jdk.internal.opt/jdk.internal.opt=jdk.javadoc.interim, \
+        --add-exports java.base/sun.security.util=ALL-UNNAMED, \
 ))
 
 TARGETS += $(BUILD_TOOLS_JDK)
@@ -71,13 +69,6 @@ $(eval $(call SetupCopyFiles,COPY_NIMBUS_TEMPLATES, \
 
 TARGETS += $(COPY_NIMBUS_TEMPLATES)
 
-$(eval $(call SetupCopyFiles,COPY_CLDRCONVERTER_PROPERTIES, \
-    SRC := $(TOPDIR)/make/jdk/src/classes/build/tools/cldrconverter, \
-    DEST := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/cldrconverter, \
-    FILES := $(wildcard $(TOPDIR)/make/jdk/src/classes/build/tools/cldrconverter/*.properties)))
-
-TARGETS += $(COPY_CLDRCONVERTER_PROPERTIES)
-
 ################################################################################
 
 $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \
@@ -92,9 +83,7 @@ $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \
         --add-exports jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
         --add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
         --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
-        --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
-        --add-exports jdk.internal.opt/jdk.internal.opt=jdk.compiler.interim \
-        --add-exports jdk.internal.opt/jdk.internal.opt=jdk.javadoc.interim, \
+        --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED, \
 ))
 
 DEPEND_SERVICE_PROVIDER := $(BUILDTOOLS_OUTPUTDIR)/depend/META-INF/services/com.sun.source.util.Plugin

make/CreateJmods.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2023, 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
@@ -81,11 +81,13 @@ endif
 ifneq ($(CMDS_DIR), )
   DEPS += $(call FindFiles, $(CMDS_DIR))
   ifeq ($(call isTargetOs, windows)+$(SHIP_DEBUG_SYMBOLS), true+public)
-    # For public debug symbols on Windows, we have to use stripped pdbs and rename them
+    # For public debug symbols on Windows, we have to use stripped pdbs, rename them
+    # and filter out a few launcher pdbs where there's a lib that goes by the same name
     rename_stripped = $(patsubst %.stripped.pdb,%.pdb,$1)
     CMDS_DIR_FILTERED := $(subst modules_cmds,modules_cmds_filtered, $(CMDS_DIR))
     FILES_CMDS := $(filter-out %.pdb, $(call FindFiles, $(CMDS_DIR))) \
-        $(filter %.stripped.pdb, $(call FindFiles, $(CMDS_DIR)))
+        $(filter-out %jimage.stripped.pdb %jpackage.stripped.pdb %java.stripped.pdb, \
+            $(filter %.stripped.pdb, $(call FindFiles, $(CMDS_DIR))))
     $(eval $(call SetupCopyFiles, COPY_FILTERED_CMDS, \
         SRC := $(CMDS_DIR), \
         DEST := $(CMDS_DIR_FILTERED), \
@@ -94,6 +96,18 @@ ifneq ($(CMDS_DIR), )
     ))
     DEPS += $(COPY_FILTERED_CMDS)
     JMOD_FLAGS += --cmds $(CMDS_DIR_FILTERED)
+  else ifeq ($(call isTargetOs, windows)+$(SHIP_DEBUG_SYMBOLS), true+full)
+    # For full debug symbols on Windows, we have to filter out a few launcher pdbs
+    # where there's a lib that goes by the same name
+    CMDS_DIR_FILTERED := $(subst modules_cmds,modules_cmds_filtered, $(CMDS_DIR))
+    $(eval $(call SetupCopyFiles, COPY_FILTERED_CMDS, \
+        SRC := $(CMDS_DIR), \
+        DEST := $(CMDS_DIR_FILTERED), \
+        FILES := $(filter-out %jimage.pdb %jpackage.pdb %java.pdb, \
+            $(call FindFiles, $(CMDS_DIR))), \
+    ))
+    DEPS += $(COPY_FILTERED_CMDS)
+    JMOD_FLAGS += --cmds $(CMDS_DIR_FILTERED)
   else
     JMOD_FLAGS += --cmds $(CMDS_DIR)
   endif
@@ -182,14 +196,9 @@ else # not java.base
   endif
 endif
 
-################################################################################
-# Include module specific build settings
-
--include Jmod.gmk
-
-# Set main class
-ifneq ($(JMOD_FLAGS_main_class), )
-  JMOD_FLAGS += $(JMOD_FLAGS_main_class)
+# Set main class of jdk.httpserver module
+ifeq ($(MODULE), jdk.httpserver)
+    JMOD_FLAGS += --main-class sun.net.httpserver.simpleserver.Main
 endif
 
 # Changes to the jmod tool itself should also trigger a rebuild of all jmods.

make/Docs.gmk

@@ -1,4 +1,4 @@
-# Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2021, 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
@@ -66,6 +66,11 @@ MODULES_SOURCE_PATH := $(call PathList, $(call GetModuleSrcPath) )
 # In order to get a specific ordering it's necessary to specify the total
 # ordering of tags as the tags are otherwise ordered in order of definition.
 JAVADOC_TAGS := \
+    -tag beaninfo:X \
+    -tag revised:X \
+    -tag since.unbundled:X \
+    -tag Note:X \
+    -tag ToDo:X \
     -tag 'apiNote:a:API Note:' \
     -tag 'implSpec:a:Implementation Requirements:' \
     -tag 'implNote:a:Implementation Note:' \
@@ -75,7 +80,6 @@ JAVADOC_TAGS := \
     -taglet build.tools.taglet.JSpec\$$JLS \
     -taglet build.tools.taglet.JSpec\$$JVMS \
     -taglet build.tools.taglet.ModuleGraph \
-    -taglet build.tools.taglet.SealedGraph \
     -taglet build.tools.taglet.ToolGuide \
     -tag since \
     -tag serialData \
@@ -97,23 +101,17 @@ 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 \
     -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
     -splitIndex --system none -javafx --expand-requires transitive \
-    --override-methods=summary \
-    --no-external-specs-page
+    --override-methods=summary
 
 # The reference options must stay stable to allow for comparisons across the
 # development cycle.
 REFERENCE_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
     -encoding ISO-8859-1 -breakiterator -splitIndex --system none \
-    -html5 -javafx --expand-requires transitive \
-    --no-external-specs-page
+    -html5 -javafx --expand-requires transitive
 
 # Should we add DRAFT stamps to the generated javadoc?
 ifeq ($(VERSION_IS_GA), true)
@@ -189,55 +187,25 @@ JAVASE_LONG_NAME := Java<sup>&reg;</sup> Platform, Standard Edition
 # Functions
 
 # Helper function for creating a svg file from a dot file generated by the
-# GenGraphs tool for a module.
+# GenGraphs tool.
 # param 1: SetupJavadocGeneration namespace ($1)
 # param 2: module name
 #
-define setup_module_graph_dot_to_svg
-  $1_$2_DOT_SRC :=  $$($1_MODULE_GRAPHS_DIR)/$2.dot
+define setup_gengraph_dot_to_svg
+  $1_$2_DOT_SRC :=  $$($1_GENGRAPHS_DIR)/$2.dot
   $1_$2_SVG_TARGET := $$($1_TARGET_DIR)/$2/module-graph.svg
 
     # For each module needing a graph, create a svg file from the dot file
     # generated by the GenGraphs tool and store it in the target dir.
-    $$(eval $$(call SetupExecute, module_graphs_svg_$1_$2, \
+    $$(eval $$(call SetupExecute, gengraphs_svg_$1_$2, \
         INFO := Running dot for module graphs for $2, \
-        DEPS := $$(module_graphs_dot_$1_TARGET), \
+        DEPS := $$(gengraphs_$1_TARGET), \
         OUTPUT_FILE := $$($1_$2_SVG_TARGET), \
-        SUPPORT_DIR := $$($1_MODULE_GRAPHS_DIR), \
+        SUPPORT_DIR := $$($1_GENGRAPHS_DIR), \
         COMMAND := $$(DOT) -Tsvg -o $$($1_$2_SVG_TARGET) $$($1_$2_DOT_SRC), \
     ))
 
-  $1_GRAPHS_TARGETS += $$($1_$2_SVG_TARGET)
-endef
-
-# Helper function for creating a svg file for a class for which the SealedGraph
-# taglet has generated a dot file. The dot file has a special name which
-# encodes the module and class the graph belongs to.
-#
-# param 1: SetupJavadocGeneration namespace ($1)
-# param 2: dot file name
-#
-define setup_sealed_graph_dot_to_svg
-  $1_$2_DOT_SRC :=  $$($1_SEALED_GRAPHS_DIR)/$2.dot
-  $1_$2_TARGET_CLASS := $$(word 2, $$(subst _, , $2))
-  $1_$2_SLASHED_NAME := $$(subst .,/, $$($1_$2_TARGET_CLASS))
-  $1_$2_TARGET_MODULE := $$(word 1, $$(subst _, , $2))
-  $1_$2_TARGET_PATH := $$($1_TARGET_DIR)/$$($1_$2_TARGET_MODULE)/$$(dir $$($1_$2_SLASHED_NAME))
-  $1_$2_TARGET_NAME := $$(notdir $$($1_$2_SLASHED_NAME))
-  $1_$2_SVG_TARGET := $$($1_$2_TARGET_PATH)/$$($1_$2_TARGET_NAME)-sealed-graph.svg
-  $$(call MakeDir, $$($1_$2_TARGET_PATH))
-
-    # For each class needing a graph, create a svg file from the dot file
-    # generated by the SealedGraph taglet and store it in the target dir.
-    $$(eval $$(call SetupExecute, sealed_graphs_svg_$1_$2, \
-        INFO := Running dot for sealed graphs for $$($1_$2_TARGET_MODULE)/$$($1_$2_TARGET_CLASS), \
-        DEPS := $$($1_$2_DOT_SRC), \
-        OUTPUT_FILE := $$($1_$2_SVG_TARGET), \
-        SUPPORT_DIR := $$($1_SEALED_GRAPHS_DIR), \
-        COMMAND := $$(DOT) -Tsvg -o $$($1_$2_SVG_TARGET) $$($1_$2_DOT_SRC), \
-    ))
-
-  $1_GRAPHS_TARGETS += $$($1_$2_SVG_TARGET)
+  $1_MODULEGRAPH_TARGETS += $$($1_$2_SVG_TARGET)
 endef
 
 # Helper function to create the overview.html file to use with the -overview
@@ -285,7 +253,7 @@ endef
 #
 # Parameter 1 is the name of the rule. This name is used as variable prefix.
 # Targets generated are returned as $1_JAVADOC_TARGETS and
-# $1_GRAPHS_TARGETS. Note that the index.html file will work as a "touch
+# $1_MODULEGRAPH_TARGETS. Note that the index.html file will work as a "touch
 # file" for all the magnitude of files that are generated by javadoc.
 #
 # Remaining parameters are named arguments. These include:
@@ -308,12 +276,9 @@ define SetupApiDocsGenerationBody
 	-Djspec.version=$$(VERSION_SPECIFICATION)
 
   ifeq ($$(ENABLE_FULL_DOCS), true)
-    $1_SEALED_GRAPHS_DIR := $$(SUPPORT_OUTPUTDIR)/docs/$1-sealed-graphs
-
-    # Tell the ModuleGraph and SealedGraph taglets to generate html links to
-    # soon-to-be-created svg files with module/sealed graphs.
-    $1_JAVA_ARGS += -DenableModuleGraph=true -DsealedDotOutputDir=$$($1_SEALED_GRAPHS_DIR)
-    $$(call MakeDir, $$($1_SEALED_GRAPHS_DIR))
+    # Tell the ModuleGraph taglet to generate html links to soon-to-be-created
+    # svg files with module graphs.
+    $1_JAVA_ARGS += -DenableModuleGraph=true
   endif
 
   # Start with basic options and tags
@@ -334,7 +299,6 @@ define SetupApiDocsGenerationBody
   # Ignore the doclint warnings in certain packages
   $1_OPTIONS += -Xdoclint/package:$$(call CommaList, $$(addprefix -, \
       $$(JAVADOC_DISABLED_DOCLINT_PACKAGES)))
-  $1_OPTIONS += $$(JAVA_WARNINGS_ARE_ERRORS)
 
   $1_DOC_TITLE := $$($1_LONG_NAME)<br>Version $$(VERSION_SPECIFICATION) API \
       Specification
@@ -420,46 +384,30 @@ define SetupApiDocsGenerationBody
 
     # First we run the GenGraph tool. It will query the module structure of the
     # running JVM and output .dot files for all existing modules.
-    MODULE_GRAPHS_PROPS := \
+    GENGRAPHS_PROPS := \
         $$(TOPDIR)/make/jdk/src/classes/build/tools/jigsaw/javadoc-graphs.properties
 
-    $1_MODULE_GRAPHS_DIR := $$(SUPPORT_OUTPUTDIR)/docs/$1-module-graphs
+    $1_GENGRAPHS_DIR := $$(SUPPORT_OUTPUTDIR)/docs/$1-gengraphs
 
-    $$(eval $$(call SetupExecute, module_graphs_dot_$1, \
-        INFO := Generating module graphs for $1 documentation, \
-        DEPS := $$(BUILD_JIGSAW_TOOLS) $$(MODULE_GRAPHS_PROPS), \
-        OUTPUT_DIR := $$($1_MODULE_GRAPHS_DIR), \
-        COMMAND := $$(TOOL_GENGRAPHS) --spec --output $$($1_MODULE_GRAPHS_DIR) \
-            --dot-attributes $$(MODULE_GRAPHS_PROPS), \
+    $$(eval $$(call SetupExecute, gengraphs_$1, \
+        INFO := Running gengraphs for $1 documentation, \
+        DEPS := $$(BUILD_JIGSAW_TOOLS) $$(GENGRAPHS_PROPS), \
+        OUTPUT_DIR := $$($1_GENGRAPHS_DIR), \
+        COMMAND := $$(TOOL_GENGRAPHS) --spec --output $$($1_GENGRAPHS_DIR) \
+            --dot-attributes $$(GENGRAPHS_PROPS), \
     ))
 
     # For each module needing a graph, create a svg file from the dot file
     # generated by the GenGraphs tool and store it in the target dir.
-    # They will depend on module_graphs_dot_$1_TARGET, and will be added to
-    # $1_GRAPHS_TARGETS.
+    # They will depend on gengraphs_$1_TARGET, and will be added to $1.
     $$(foreach m, $$($1_MODULES_NEEDING_GRAPH), \
-      $$(eval $$(call setup_module_graph_dot_to_svg,$1,$$m)) \
-    )
-
-    # We have asked SealedGraph to generate dot files and links to svg files.
-    # Now we must produce the svg files from the dot files.
-
-    # Get a list of classes for which SealedGraph has generated dot files
-    $1_SEALED_CLASSES := $$(patsubst %.dot,%,$$(patsubst \
-        $$($1_SEALED_GRAPHS_DIR)/%,%, \
-        $$(wildcard $$($1_SEALED_GRAPHS_DIR)/*.dot)))
-
-    # For each class needing a graph, create a svg file from the dot file
-    # generated by the SealedGraph taglet and store it in the target dir.
-    # They will will be added to $1_GRAPHS_TARGETS.
-    $$(foreach c, $$($1_SEALED_CLASSES), \
-      $$(eval $$(call setup_sealed_graph_dot_to_svg,$1,$$c)) \
+      $$(eval $$(call setup_gengraph_dot_to_svg,$1,$$m)) \
     )
   endif
 endef
 
 ################################################################################
-# Setup generation of the JDK API documentation (javadoc + graphs)
+# Setup generation of the JDK API documentation (javadoc + modulegraph)
 
 # Define the groups of the JDK API documentation
 JavaSE_GROUP_NAME := Java SE
@@ -508,10 +456,10 @@ $(eval $(call SetupApiDocsGeneration, JDK_API, \
 ))
 
 # Targets generated are returned in JDK_API_JAVADOC_TARGETS and
-# JDK_API_GRAPHS_TARGETS.
+# JDK_API_MODULEGRAPH_TARGETS.
 
 ################################################################################
-# Setup generation of the Java SE API documentation (javadoc + graphs)
+# Setup generation of the Java SE API documentation (javadoc + modulegraph)
 
 # The Java SE module scope is just java.se and its transitive indirect
 # exports.
@@ -525,10 +473,10 @@ $(eval $(call SetupApiDocsGeneration, JAVASE_API, \
 ))
 
 # Targets generated are returned in JAVASE_API_JAVADOC_TARGETS and
-# JAVASE_API_GRAPHS_TARGETS.
+# JAVASE_API_MODULEGRAPH_TARGETS.
 
 ################################################################################
-# Setup generation of the reference Java SE API documentation (javadoc + graphs)
+# Setup generation of the reference Java SE API documentation (javadoc + modulegraph)
 
 # The reference javadoc is just the same as javase, but using the BootJDK javadoc
 # and a stable set of javadoc options.  Typically it is used for generating
@@ -546,7 +494,7 @@ $(eval $(call SetupApiDocsGeneration, REFERENCE_API, \
 ))
 
 # Targets generated are returned in REFERENCE_API_JAVADOC_TARGETS and
-# REFERENCE_API_GRAPHS_TARGETS.
+# REFERENCE_API_MODULEGRAPH_TARGETS.
 
 ################################################################################
 
@@ -616,7 +564,7 @@ $(foreach n, 0 1 2, \
   $(eval specs_bottom_rel_path := $(specs_bottom_rel_path)../) \
 )
 
-SPECS_TOP := $(if $(filter true, $(IS_DRAFT)), <header class="draft-header" role="banner">$(DRAFT_TEXT)</header>)
+SPECS_TOP := $(if $(filter true, $(IS_DRAFT)), <header class="draft-header">$(DRAFT_TEXT)</header>)
 
 # For all html files in $module/share/specs directories, copy and add the
 # copyright footer.
@@ -645,9 +593,6 @@ ifeq ($(ENABLE_PANDOC), true)
   # html, if we have pandoc (otherwise we'll just skip this).
 
   GLOBAL_SPECS_DEFAULT_CSS_FILE := $(DOCS_OUTPUTDIR)/resources/jdk-default.css
-  # Unset the following to suppress the link to the tool guides
-  NAV_LINK_GUIDES := --nav-link-guides
-  HEADER_RIGHT_SIDE_INFO := <strong>$(subst &amp;,&,$(JDK_SHORT_NAME))$(DRAFT_MARKER_STR)</strong>
 
   $(foreach m, $(ALL_MODULES), \
     $(eval SPECS_$m := $(call FindModuleSpecsDirs, $m)) \
@@ -664,8 +609,7 @@ ifeq ($(ENABLE_PANDOC), true)
             REPLACEMENTS := \
 		@@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \
 		@@VERSION_STRING@@ => $(VERSION_STRING), \
-            POST_PROCESS := $(TOOL_FIXUPPANDOC) --insert-nav --nav-right-info '$(HEADER_RIGHT_SIDE_INFO)' \
-                --nav-subdirs $($m_$f_NOF_SUBDIRS) $(NAV_LINK_GUIDES), \
+            POST_PROCESS := $(TOOL_FIXUPPANDOC), \
         )) \
         $(eval JDK_SPECS_TARGETS += $($($m_$f_NAME))) \
       ) \
@@ -699,8 +643,7 @@ ifeq ($(ENABLE_PANDOC), true)
 		@@VERSION_SHORT@@ => $(VERSION_SHORT) ; \
 		@@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION), \
             OPTIONS := --toc -V include-before='$(SPECS_TOP)' -V include-after='$(SPECS_BOTTOM_1)', \
-            POST_PROCESS := $(TOOL_FIXUPPANDOC) --insert-nav --nav-right-info '$(HEADER_RIGHT_SIDE_INFO)' \
-                --nav-subdirs 1 --nav-link-guides, \
+            POST_PROCESS := $(TOOL_FIXUPPANDOC), \
             EXTRA_DEPS := $(PANDOC_HTML_MANPAGE_FILTER) \
                 $(PANDOC_HTML_MANPAGE_FILTER_SOURCE), \
         )) \
@@ -715,25 +658,13 @@ endif
 
 # Special treatment for generated documentation
 
-SPEC_HEADER_BLOCK := \
-<header id="title-block-header"> \
-    <div class="navbar"> \
-        <div>$(HEADER_RIGHT_SIDE_INFO)</div> \
-        <nav><ul><li><a href="PATH_TO_SPECS/../api/index.html">API</a> \
-        <li><a href="PATH_TO_SPECS/index.html">OTHER SPECIFICATIONS \
-        <li><a href="PATH_TO_SPECS/man/index.html">TOOL GUIDES</a></ul></nav> \
-    </div> \
-</header>
-
 JDWP_PROTOCOL := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/jdwp-protocol.html
 ifneq ($(call ApplySpecFilter, $(JDWP_PROTOCOL)), )
-  JDWP_HEADER_BLOCK := $(subst PATH_TO_SPECS,..,$(SPEC_HEADER_BLOCK))
   $(eval $(call SetupTextFileProcessing, PROCESS_JDWP_PROTOCOL, \
       SOURCE_FILES := $(JDWP_PROTOCOL), \
       OUTPUT_DIR := $(DOCS_OUTPUTDIR)/specs/jdwp, \
       REPLACEMENTS := \
-          <style> => <link rel="stylesheet" href="../../resources/jdk-default.css"/><style> ; \
-          <body> => <body>$(SPECS_TOP)$(JDWP_HEADER_BLOCK) ; \
+          <body> => <body>$(SPECS_TOP) ; \
           </body> => $(SPECS_BOTTOM_1)</body>, \
   ))
   JDK_SPECS_TARGETS += $(PROCESS_JDWP_PROTOCOL)
@@ -742,13 +673,11 @@ endif
 # Get jvmti.html from the main jvm variant (all variants' jvmti.html are identical).
 JVMTI_HTML ?= $(HOTSPOT_OUTPUTDIR)/variant-$(JVM_VARIANT_MAIN)/gensrc/jvmtifiles/jvmti.html
 ifneq ($(call ApplySpecFilter, $(JVMTI_HTML)), )
-  JVMTI_HEADER_BLOCK := $(subst PATH_TO_SPECS,.,$(SPEC_HEADER_BLOCK))
   $(eval $(call SetupTextFileProcessing, PROCESS_JVMTI_HTML, \
       SOURCE_FILES := $(JVMTI_HTML), \
       OUTPUT_DIR := $(DOCS_OUTPUTDIR)/specs/, \
       REPLACEMENTS := \
-          <style> => <link rel="stylesheet" href="../resources/jdk-default.css"/><style> ; \
-          <body> => <body>$(SPECS_TOP)$(JVMTI_HEADER_BLOCK) ; \
+          <body> => <body>$(SPECS_TOP) ; \
           </body> => $(SPECS_BOTTOM_0)</body>, \
   ))
   JDK_SPECS_TARGETS += $(PROCESS_JVMTI_HTML)
@@ -763,7 +692,7 @@ JAVADOC_ZIP_FILE := $(OUTPUTDIR)/bundles/$(JAVADOC_ZIP_NAME)
 $(eval $(call SetupZipArchive, BUILD_JAVADOC_ZIP, \
     SRC := $(DOCS_OUTPUTDIR), \
     ZIP := $(JAVADOC_ZIP_FILE), \
-    EXTRA_DEPS := $(JDK_API_JAVADOC_TARGETS) $(JDK_API_GRAPHS_TARGETS) \
+    EXTRA_DEPS := $(JDK_API_JAVADOC_TARGETS) $(JDK_API_MODULEGRAPH_TARGETS) \
         $(JDK_SPECS_TARGETS), \
 ))
 
@@ -791,15 +720,15 @@ SPECS_ZIP_TARGETS += $(BUILD_SPECS_ZIP)
 
 docs-jdk-api-javadoc: $(JDK_API_JAVADOC_TARGETS) $(JDK_API_CUSTOM_TARGETS)
 
-docs-jdk-api-graphs: $(JDK_API_GRAPHS_TARGETS)
+docs-jdk-api-modulegraph: $(JDK_API_MODULEGRAPH_TARGETS)
 
 docs-javase-api-javadoc: $(JAVASE_API_JAVADOC_TARGETS) $(JAVASE_API_CUSTOM_TARGETS)
 
-docs-javase-api-graphs: $(JAVASE_API_GRAPHS_TARGETS)
+docs-javase-api-modulegraph: $(JAVASE_API_MODULEGRAPH_TARGETS)
 
 docs-reference-api-javadoc: $(REFERENCE_API_JAVADOC_TARGETS) $(REFERENCE_API_CUSTOM_TARGETS)
 
-docs-reference-api-graphs: $(REFERENCE_API_GRAPHS_TARGETS)
+docs-reference-api-modulegraph: $(REFERENCE_API_MODULEGRAPH_TARGETS)
 
 docs-jdk-specs: $(JDK_SPECS_TARGETS)
 
@@ -809,12 +738,12 @@ docs-zip: $(ZIP_TARGETS)
 
 docs-specs-zip: $(SPECS_ZIP_TARGETS)
 
-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 \
+all: docs-jdk-api-javadoc docs-jdk-api-modulegraph docs-javase-api-javadoc \
+    docs-javase-api-modulegraph docs-reference-api-javadoc \
+    docs-reference-api-modulegraph docs-jdk-specs docs-jdk-index docs-zip \
     docs-specs-zip
 
-.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 \
+.PHONY: default all docs-jdk-api-javadoc docs-jdk-api-modulegraph \
+    docs-javase-api-javadoc docs-javase-api-modulegraph \
+    docs-reference-api-javadoc docs-reference-api-modulegraph docs-jdk-specs \
     docs-jdk-index docs-zip docs-specs-zip

make/Global.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
@@ -52,6 +52,7 @@ help:
 	$(info $(_) make docs              # Create all docs)
 	$(info $(_) make docs-jdk-api      # Create just JDK javadocs)
 	$(info $(_) make bootcycle-images  # Build images twice, second time with newly built JDK)
+	$(info $(_) make install           # Install the generated images locally)
 	$(info $(_) make check             # Run basic testing (currently tier1))
 	$(info $(_) make test-<test>       # Run test, e.g. test-tier1)
 	$(info $(_) make test TEST=<t>     # Run test(s) given by TEST specification)
@@ -124,11 +125,6 @@ test-prebuilt:
 	    $(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) && \
-	    $(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)" )
-
 # Alias for backwards compatibility
 run-test-prebuilt: test-prebuilt
 

make/GraalBuilderImage.gmk

@@ -43,10 +43,10 @@ $(eval $(call SetupCopyFiles, COPY_JDK_IMG, \
 TARGETS += $(COPY_JDK_IMG)
 
 $(eval $(call SetupCopyFiles, COPY_STATIC_LIBS, \
-      SRC := $(STATIC_LIBS_GRAAL_IMAGE_DIR)/lib, \
+      SRC := $(STATIC_LIBS_IMAGE_DIR)/lib, \
       DEST := $(GRAAL_BUILDER_IMAGE_DIR)/lib, \
       FILES := $(filter %$(STATIC_LIBRARY_SUFFIX), \
-          $(call FindFiles, $(STATIC_LIBS_GRAAL_IMAGE_DIR)/lib)), \
+          $(call FindFiles, $(STATIC_LIBS_IMAGE_DIR)/lib)), \
 ))
 TARGETS += $(COPY_STATIC_LIBS)
 

make/Hsdis.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 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
@@ -47,7 +47,7 @@ ifeq ($(HSDIS_BACKEND), capstone)
     CAPSTONE_ARCH := CS_ARCH_X86
     CAPSTONE_MODE := CS_MODE_$(OPENJDK_TARGET_CPU_BITS)
   else ifeq ($(call isTargetCpuArch, aarch64), true)
-    CAPSTONE_ARCH := CS_ARCH_$(CAPSTONE_ARCH_AARCH64_NAME)
+    CAPSTONE_ARCH := CS_ARCH_ARM64
     CAPSTONE_MODE := CS_MODE_ARM
   else
     $(error No support for Capstone on this platform)

make/Images.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2023, 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
@@ -29,7 +29,6 @@ include $(SPEC)
 include MakeBase.gmk
 include Execute.gmk
 include Modules.gmk
-include Utils.gmk
 
 JDK_TARGETS :=
 JRE_TARGETS :=
@@ -40,7 +39,7 @@ $(eval $(call IncludeCustomExtension, Images-pre.gmk))
 ################################################################################
 
 # All modules for the current target platform.
-ALL_MODULES := $(call FindAllModules) $(EXTRA_MODULES)
+ALL_MODULES := $(call FindAllModules)
 
 $(eval $(call ReadImportMetaData))
 
@@ -55,10 +54,7 @@ JDK_MODULES_LIST := $(call CommaList, $(JDK_MODULES))
 
 BASE_RELEASE_FILE := $(JDK_OUTPUTDIR)/release
 
-JMODS_DIRS := $(EXTRA_JMODS_DIR) $(IMAGES_OUTPUTDIR)/jmods
-
-JDK_JMODS := $(foreach m, $(JDK_MODULES), $(firstword $(wildcard $(addsuffix /$m.jmod, $(JMODS_DIRS)))))
-JRE_JMODS := $(foreach m, $(JRE_MODULES), $(firstword $(wildcard $(addsuffix /$m.jmod, $(JMODS_DIRS)))))
+JMODS := $(wildcard $(IMAGES_OUTPUTDIR)/jmods/*.jmod)
 
 JLINK_ORDER_RESOURCES := **module-info.class
 JLINK_JLI_CLASSES :=
@@ -75,7 +71,7 @@ JLINK_ORDER_RESOURCES += \
     #
 
 JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \
-    --module-path $(call PathList, $(JMODS_DIRS)) \
+    --module-path $(IMAGES_OUTPUTDIR)/jmods \
     --endian $(OPENJDK_TARGET_CPU_ENDIAN) \
     --release-info $(BASE_RELEASE_FILE) \
     --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \
@@ -91,15 +87,12 @@ endif
 
 JLINK_DISABLE_WARNINGS := | ( $(GREP) -v -e "WARNING: Using incubator module" || test "$$?" = "1" )
 
-JDK_IMAGE_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jdk
-JRE_IMAGE_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jre
-
 $(eval $(call SetupExecute, jlink_jdk, \
     WARN := Creating jdk image, \
-    DEPS := $(JDK_JMODS) $(BASE_RELEASE_FILE) \
-        $(call DependOnVariable, JDK_MODULES_LIST, $(JDK_IMAGE_SUPPORT_DIR)/_jlink_jdk.vardeps), \
+    DEPS := $(JMODS) $(BASE_RELEASE_FILE) \
+        $(call DependOnVariable, JDK_MODULES_LIST), \
     OUTPUT_DIR := $(JDK_IMAGE_DIR), \
-    SUPPORT_DIR := $(JDK_IMAGE_SUPPORT_DIR), \
+    SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jdk, \
     PRE_COMMAND := $(RM) -r $(JDK_IMAGE_DIR), \
     COMMAND := $(JLINK_TOOL) --add-modules $(JDK_MODULES_LIST) \
         $(JLINK_JDK_EXTRA_OPTS) --output $(JDK_IMAGE_DIR) \
@@ -110,10 +103,10 @@ JLINK_JDK_TARGETS := $(jlink_jdk)
 
 $(eval $(call SetupExecute, jlink_jre, \
     WARN := Creating legacy jre image, \
-    DEPS := $(JRE_JMODS) $(BASE_RELEASE_FILE) \
-        $(call DependOnVariable, JRE_MODULES_LIST, $(JRE_IMAGE_SUPPORT_DIR)/_jlink_jre.vardeps), \
+    DEPS := $(JMODS) $(BASE_RELEASE_FILE) \
+        $(call DependOnVariable, JDK_MODULES_LIST), \
     OUTPUT_DIR := $(JRE_IMAGE_DIR), \
-    SUPPORT_DIR := $(JRE_IMAGE_SUPPORT_DIR), \
+    SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jre, \
     PRE_COMMAND := $(RM) -r $(JRE_IMAGE_DIR), \
     COMMAND := $(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \
         $(JLINK_JRE_EXTRA_OPTS) --output $(JRE_IMAGE_DIR), \
@@ -149,7 +142,7 @@ define CreateCDSArchive
       INFO := Using CDS flags for $1: $$($1_$2_CDS_DUMP_FLAGS), \
       DEPS := $$(jlink_jdk), \
       OUTPUT_FILE := $$(JDK_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE), \
-      SUPPORT_DIR := $$(JDK_IMAGE_SUPPORT_DIR), \
+      SUPPORT_DIR := $$(SUPPORT_OUTPUTDIR)/images/jdk, \
       COMMAND := $$(FIXPATH) $$(JDK_IMAGE_DIR)/bin/java -Xshare:dump \
           -XX:SharedArchiveFile=$$(JDK_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE) \
           -$1 $$($1_$2_DUMP_EXTRA_ARG) $$($1_$2_CDS_DUMP_FLAGS) $$(LOG_INFO), \
@@ -162,7 +155,7 @@ define CreateCDSArchive
       INFO := Using CDS flags for $1: $$($1_$2_CDS_DUMP_FLAGS), \
       DEPS := $$(jlink_jre), \
       OUTPUT_FILE := $$(JRE_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE), \
-      SUPPORT_DIR := $$(JRE_IMAGE_SUPPORT_DIR), \
+      SUPPORT_DIR := $$(SUPPORT_OUTPUTDIR)/images/jre, \
       COMMAND := $$(FIXPATH) $$(JRE_IMAGE_DIR)/bin/java -Xshare:dump \
           -XX:SharedArchiveFile=$$(JRE_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE) \
           -$1 $$($1_$2_DUMP_EXTRA_ARG) $$($1_$2_CDS_DUMP_FLAGS) $$(LOG_INFO), \
@@ -274,6 +267,9 @@ else
   endif
 endif
 
+FILTERED_PDBS := %jimage.stripped.pdb %jpackage.stripped.pdb %java.stripped.pdb \
+    %jimage.pdb %jpackage.pdb %java.pdb %jimage.map %jpackage.map %java.map
+
 # Param 1 - either JDK or JRE
 SetupCopyDebuginfo = \
     $(foreach m, $(ALL_$1_MODULES), \
@@ -287,8 +283,8 @@ SetupCopyDebuginfo = \
       $(eval $(call SetupCopyFiles, COPY_$1_CMDS_DEBUGINFO_$m, \
           SRC := $(SUPPORT_OUTPUTDIR)/modules_cmds/$m, \
           DEST := $($1_IMAGE_DIR)/$(CMDS_TARGET_SUBDIR), \
-          FILES := $(call FindDebuginfoFiles, \
-              $(SUPPORT_OUTPUTDIR)/modules_cmds/$m), \
+          FILES := $(filter-out $(FILTERED_PDBS), $(call FindDebuginfoFiles, \
+              $(SUPPORT_OUTPUTDIR)/modules_cmds/$m)), \
       )) \
       $(eval $1_TARGETS += $$(COPY_$1_CMDS_DEBUGINFO_$m)) \
     )

make/Init.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
@@ -138,10 +138,7 @@ ifeq ($(HAS_SPEC),)
     # 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)))
+            $(if $(CUSTOM_CONFIG_DIR), $(wildcard $(CUSTOM_CONFIG_DIR)/*))
         ifeq ($(CONF_CHECK), fail)
 	  @echo Error: The configuration is not up to date for \
 	      "'$(lastword $(subst /, , $(dir $@)))'."
@@ -280,20 +277,15 @@ else # HAS_SPEC=true
 	  $(ECHO) $(CONFIGURE_COMMAND_LINE)
 
   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))
-        else ifneq ($(CONFIGURE_COMMAND_LINE), )
+        ifneq ($(CONFIGURE_COMMAND_LINE), )
 	  $(ECHO) "Re-running configure using arguments '$(CONFIGURE_COMMAND_LINE)'"
-	  $(eval RECONFIGURE_COMMAND := $(BASH) $(TOPDIR)/configure $(CONFIGURE_COMMAND_LINE))
         else
 	  $(ECHO) "Re-running configure using default settings"
-	  $(eval RECONFIGURE_COMMAND := $(BASH) $(TOPDIR)/configure)
         endif
 	( cd $(CONFIGURE_START_DIR) && PATH="$(ORIGINAL_PATH)" AUTOCONF="$(AUTOCONF)" \
 	    CUSTOM_ROOT="$(CUSTOM_ROOT)" \
 	    CUSTOM_CONFIG_DIR="$(CUSTOM_CONFIG_DIR)" \
-	    $(RECONFIGURE_COMMAND) )
+	    $(BASH) $(TOPDIR)/configure $(CONFIGURE_COMMAND_LINE) )
 
   ##############################################################################
   # The main target, for delegating into Main.gmk
@@ -327,7 +319,7 @@ else # HAS_SPEC=true
           ifneq ($(PARALLEL_TARGETS), )
 	    $(call PrepareFailureLogs)
 	    $(call StartGlobalTimer)
-	    $(call PrepareJavacServer)
+	    $(call PrepareSmartJavac)
             # JOBS will only be empty for a bootcycle-images recursive call
             # or if specified via a make argument directly. In those cases
             # treat it as NOT using jobs at all.
@@ -342,7 +334,7 @@ else # HAS_SPEC=true
 	        cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -j 1 -f make/Init.gmk \
 	            HAS_SPEC=true on-failure ; \
 	        exit $$exitcode ) )
-	    $(call CleanupJavacServer)
+	    $(call CleanupSmartJavac)
 	    $(call StopGlobalTimer)
 	    $(call ReportBuildTimes)
           endif
@@ -354,7 +346,7 @@ else # HAS_SPEC=true
         endif
 
     on-failure:
-	$(call CleanupJavacServer)
+	$(call CleanupSmartJavac)
 	$(call StopGlobalTimer)
 	$(call ReportBuildTimes)
 	$(call PrintFailureReports)
@@ -367,11 +359,11 @@ else # HAS_SPEC=true
 
     # Support targets for COMPARE_BUILD, used for makefile development
     pre-compare-build:
-	$(call WaitForJavacServerFinish)
+	$(call WaitForSmartJavacFinish)
 	$(call PrepareCompareBuild)
 
     post-compare-build:
-	$(call WaitForJavacServerFinish)
+	$(call WaitForSmartJavacFinish)
 	$(call CleanupCompareBuild)
 	$(call CompareBuildDoComparison)
 

make/InitSupport.gmk

@@ -204,15 +204,6 @@ ifeq ($(HAS_SPEC),)
           # Otherwise select those that contain the given CONF string
           matching_confs := $$(strip $$(foreach var, $$(all_confs), \
               $$(if $$(findstring $$(CONF), $$(var)), $$(var))))
-          ifneq ($$(filter $$(CONF), $$(matching_confs)), )
-            # If we found an exact match, use that
-            matching_confs := $$(CONF)
-            # 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).)
@@ -435,10 +426,10 @@ else # $(HAS_SPEC)=true
         # 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), \
-	  +(cd $(COMPARE_BUILD_OUTPUTDIR) && ./compare.sh -vv $(COMPARE_BUILD_COMP_OPTS) \
+	  +(cd $(COMPARE_BUILD_OUTPUTDIR) && ./compare.sh $(COMPARE_BUILD_COMP_OPTS) \
 	      -2dirs $(COMPARE_BUILD_OUTPUTDIR)/$(COMPARE_BUILD_COMP_DIR) \
 	      $(OUTPUTDIR)/$(COMPARE_BUILD_COMP_DIR) $(COMPARE_BUILD_IGNORE_RESULT)), \
-	  +(cd $(COMPARE_BUILD_OUTPUTDIR) && ./compare.sh -vv $(COMPARE_BUILD_COMP_OPTS) \
+	  +(cd $(COMPARE_BUILD_OUTPUTDIR) && ./compare.sh $(COMPARE_BUILD_COMP_OPTS) \
 	      -o $(OUTPUTDIR) $(COMPARE_BUILD_IGNORE_RESULT)) \
 	)
   endef
@@ -502,15 +493,15 @@ else # $(HAS_SPEC)=true
 
   # Remove any javac server logs and port files. This
   # prevents a new make run to reuse the previous servers.
-  define PrepareJavacServer
+  define PrepareSmartJavac
 	$(if $(JAVAC_SERVER_DIR), \
 	  $(RM) -r $(JAVAC_SERVER_DIR) 2> /dev/null && \
 	  $(MKDIR) -p $(JAVAC_SERVER_DIR) \
 	)
   endef
 
-  define CleanupJavacServer
-	[ -f $(JAVAC_SERVER_DIR)/server.port ] && $(ECHO) Stopping javac server && \
+  define CleanupSmartJavac
+	[ -f $(JAVAC_SERVER_DIR)/server.port ] && $(ECHO) Stopping sjavac server && \
 	    $(TOUCH) $(JAVAC_SERVER_DIR)/server.port.stop; true
   endef
 
@@ -519,13 +510,13 @@ else # $(HAS_SPEC)=true
     # 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
+    define WaitForSmartJavacFinish
 	$(if $(JAVAC_SERVER_DIR), \
 	  sleep 5\
 	)
     endef
   else
-    define WaitForJavacServerFinish
+    define WaitForSmartJavacFinish
     endef
   endif
 

make/Install.gmk

@@ -0,0 +1,43 @@
+#
+# Copyright (c) 2014, 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
+# 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.
+#
+
+default: install
+
+include $(SPEC)
+
+BINARIES := $(notdir $(wildcard $(JDK_IMAGE_DIR)/bin/*))
+INSTALLDIR := openjdk-$(VERSION_SHORT)
+
+# Install the jdk image, in a very crude way. Not taking into
+# account, how to install properly on macosx or windows etc.
+install:
+	echo Installing jdk image into $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
+	echo and creating $(words $(BINARIES)) links from $(INSTALL_PREFIX)/bin into the jdk.
+	$(MKDIR) -p $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
+	$(RM) -r $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/*
+	$(CP) -rp $(JDK_IMAGE_DIR)/* $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
+	$(MKDIR) -p $(INSTALL_PREFIX)/bin
+	$(RM) $(addprefix $(INSTALL_PREFIX)/bin/, $(BINARIES))
+	$(foreach b, $(BINARIES), $(LN) -s $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/bin/$b $(INSTALL_PREFIX)/bin/$b &&) true

make/JrtfsJar.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2023, 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
@@ -33,7 +33,7 @@ include TextFileProcessing.gmk
 
 # This rule will be depended on due to the MANIFEST line
 $(eval $(call SetupTextFileProcessing, BUILD_JAVA_MANIFEST, \
-  SOURCE_FILES := $(TOPDIR)/make/data/mainmanifest/manifest.mf.template, \
+  SOURCE_FILES := $(TOPDIR)/make/data/mainmanifest/manifest.mf, \
   OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/java-main-manifest.mf, \
   REPLACEMENTS := \
       @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \
@@ -46,10 +46,8 @@ JIMAGE_PKGS := \
     jdk/internal/jrtfs \
     #
 
-# Compile jrt-fs.jar with the interim compiler, as it
-# ends up in the image, this will ensure reproducible classes
 $(eval $(call SetupJavaCompilation, BUILD_JRTFS, \
-    COMPILER := interim, \
+    COMPILER := bootjdk, \
     DISABLED_WARNINGS := options, \
     TARGET_RELEASE := $(TARGET_RELEASE_JDK8), \
     SRC := $(TOPDIR)/src/java.base/share/classes, \

make/MacBundles.gmk

@@ -69,7 +69,7 @@ ifeq ($(call isTargetOs, macosx), true)
   ))
 
   $(eval $(call SetupTextFileProcessing, BUILD_JDK_PLIST, \
-      SOURCE_FILES := $(MACOSX_PLIST_SRC)/JDK-Info.plist.template, \
+      SOURCE_FILES := $(MACOSX_PLIST_SRC)/JDK-Info.plist, \
       OUTPUT_FILE := $(JDK_MACOSX_CONTENTS_DIR)/Info.plist, \
       REPLACEMENTS := \
           @@ID@@ => $(MACOSX_BUNDLE_ID_BASE).jdk ; \
@@ -82,7 +82,7 @@ ifeq ($(call isTargetOs, macosx), true)
   ))
 
   $(eval $(call SetupTextFileProcessing, BUILD_JRE_PLIST, \
-      SOURCE_FILES := $(MACOSX_PLIST_SRC)/JRE-Info.plist.template, \
+      SOURCE_FILES := $(MACOSX_PLIST_SRC)/JRE-Info.plist, \
       OUTPUT_FILE := $(JRE_MACOSX_CONTENTS_DIR)/Info.plist, \
       REPLACEMENTS := \
           @@ID@@ => $(MACOSX_BUNDLE_ID_BASE).jre ; \

make/Main.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -233,7 +233,6 @@ ALL_TARGETS += $(LAUNCHER_TARGETS)
 HOTSPOT_VARIANT_TARGETS := $(addprefix hotspot-, $(JVM_VARIANTS))
 HOTSPOT_VARIANT_GENSRC_TARGETS := $(addsuffix -gensrc, $(HOTSPOT_VARIANT_TARGETS))
 HOTSPOT_VARIANT_LIBS_TARGETS := $(addsuffix -libs, $(HOTSPOT_VARIANT_TARGETS))
-HOTSPOT_VARIANT_STATIC_LIBS_TARGETS := $(addsuffix -static-libs, $(HOTSPOT_VARIANT_TARGETS))
 
 define DeclareHotspotGensrcRecipe
   hotspot-$1-gensrc:
@@ -252,62 +251,14 @@ endef
 
 $(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v)))
 
-define DeclareHotspotStaticLibsRecipe
-  hotspot-$1-static-libs:
-	+($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibraries.gmk \
-	    JVM_VARIANT=$1 STATIC_LIBS=true)
-endef
-
-$(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotStaticLibsRecipe,$v)))
-
 $(eval $(call SetupTarget, hotspot-ide-project, \
     MAKEFILE := ide/visualstudio/hotspot/CreateVSProject, \
     DEPS := hotspot exploded-image, \
     ARGS := -I$(TOPDIR)/make/hotspot, \
 ))
 
-$(eval $(call SetupTarget, eclipse-java-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=java SHARED=false, \
-))
-
-$(eval $(call SetupTarget, eclipse-hotspot-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=hotspot SHARED=false, \
-))
-
-$(eval $(call SetupTarget, eclipse-native-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=native SHARED=false, \
-))
-
-$(eval $(call SetupTarget, eclipse-mixed-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make SHARED=false, \
-))
-
-$(eval $(call SetupTarget, eclipse-shared-java-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=java SHARED=true, \
-))
-
-$(eval $(call SetupTarget, eclipse-shared-hotspot-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=hotspot SHARED=true, \
-))
-
-$(eval $(call SetupTarget, eclipse-shared-native-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make WORKSPACE=native SHARED=true, \
-))
-
-$(eval $(call SetupTarget, eclipse-shared-mixed-env, \
-    MAKEFILE := ide/eclipse/CreateWorkspace, \
-    ARGS := --always-make SHARED=true, \
-))
-
 ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
-    $(HOTSPOT_VARIANT_LIBS_TARGETS) $(HOTSPOT_VARIANT_STATIC_LIBS_TARGETS)
+    $(HOTSPOT_VARIANT_LIBS_TARGETS)
 
 ################################################################################
 # Help and user support
@@ -405,9 +356,8 @@ JMOD_TARGETS := $(addsuffix -jmod, $(JMOD_MODULES))
 
 define DeclareJmodRecipe
   $1-jmod:
-	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
-	    $(patsubst %,-I%/modules/$1,$(PHASE_MAKEDIRS)) \
-	    -f CreateJmods.gmk MODULE=$1)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateJmods.gmk \
+	    MODULE=$1)
 endef
 
 $(foreach m, $(JMOD_MODULES), $(eval $(call DeclareJmodRecipe,$m)))
@@ -472,12 +422,6 @@ $(eval $(call SetupTarget, symbols-image, \
 
 $(eval $(call SetupTarget, static-libs-image, \
     MAKEFILE := StaticLibsImage, \
-    TARGET := static-libs-image, \
-))
-
-$(eval $(call SetupTarget, static-libs-graal-image, \
-    MAKEFILE := StaticLibsImage, \
-    TARGET := static-libs-graal-image, \
 ))
 
 $(eval $(call SetupTarget, mac-jdk-bundle, \
@@ -505,7 +449,7 @@ $(eval $(call SetupTarget, exploded-image-optimize, \
 
 $(eval $(call SetupTarget, graal-builder-image, \
     MAKEFILE := GraalBuilderImage, \
-    DEPS := jdk-image static-libs-graal-image, \
+    DEPS := jdk-image static-libs-image, \
 ))
 
 ifeq ($(JCOV_ENABLED), true)
@@ -522,15 +466,15 @@ ALL_TARGETS += bootcycle-images
 # Docs targets
 
 # If building full docs, to complete docs-*-api we need both the javadoc and
-# graphs targets.
+# modulegraph targets.
 $(eval $(call SetupTarget, docs-jdk-api-javadoc, \
     MAKEFILE := Docs, \
     TARGET := docs-jdk-api-javadoc, \
 ))
 
-$(eval $(call SetupTarget, docs-jdk-api-graphs, \
+$(eval $(call SetupTarget, docs-jdk-api-modulegraph, \
     MAKEFILE := Docs, \
-    TARGET := docs-jdk-api-graphs, \
+    TARGET := docs-jdk-api-modulegraph, \
     DEPS := buildtools-modules runnable-buildjdk, \
 ))
 
@@ -539,9 +483,9 @@ $(eval $(call SetupTarget, docs-javase-api-javadoc, \
     TARGET := docs-javase-api-javadoc, \
 ))
 
-$(eval $(call SetupTarget, docs-javase-api-graphs, \
+$(eval $(call SetupTarget, docs-javase-api-modulegraph, \
     MAKEFILE := Docs, \
-    TARGET := docs-javase-api-graphs, \
+    TARGET := docs-javase-api-modulegraph, \
     DEPS := buildtools-modules runnable-buildjdk, \
 ))
 
@@ -550,9 +494,9 @@ $(eval $(call SetupTarget, docs-reference-api-javadoc, \
     TARGET := docs-reference-api-javadoc, \
 ))
 
-$(eval $(call SetupTarget, docs-reference-api-graphs, \
+$(eval $(call SetupTarget, docs-reference-api-modulegraph, \
     MAKEFILE := Docs, \
-    TARGET := docs-reference-api-graphs, \
+    TARGET := docs-reference-api-modulegraph, \
     DEPS := buildtools-modules runnable-buildjdk, \
 ))
 
@@ -608,11 +552,11 @@ endif
 ifeq ($(CREATING_BUILDJDK), true)
   # This target is only called by the recursive call below.
   create-buildjdk-interim-image-helper: interim-image jdk.jlink-launchers \
-      java.base-copy jdk.jdeps-launchers jdk.compiler-launchers
+      java.base-copy jdk.jdeps-launchers
 endif
 
-BUILDJDK_MODULES := $(sort $(foreach m, jdk.jlink jdk.compiler \
-    $(INTERIM_IMAGE_MODULES), $(call FindTransitiveDepsForModule, $m) $m))
+BUILDJDK_MODULES := $(sort $(foreach m, jdk.jlink $(INTERIM_IMAGE_MODULES), \
+    $(call FindTransitiveDepsForModule, $m) $m))
 
 $(eval $(call SetupTarget, create-buildjdk-interim-image, \
     MAKEFILE := Main, \
@@ -744,16 +688,9 @@ endif
 
 $(eval $(call SetupTarget, build-test-lib, \
     MAKEFILE := test/BuildTestLib, \
-    TARGET := build-test-lib, \
     DEPS := exploded-image, \
 ))
 
-$(eval $(call SetupTarget, test-image-lib, \
-    MAKEFILE := test/BuildTestLib, \
-    TARGET := test-image-lib, \
-    DEPS := build-test-lib, \
-))
-
 ifeq ($(BUILD_FAILURE_HANDLER), true)
   # Builds the failure handler jtreg extension
   $(eval $(call SetupTarget, build-test-failure-handler, \
@@ -770,25 +707,9 @@ ifeq ($(BUILD_FAILURE_HANDLER), true)
   ))
 endif
 
-ifeq ($(BUILD_JTREG_TEST_THREAD_FACTORY), true)
-  # Builds the test thread factory jtreg extension
-  $(eval $(call SetupTarget, build-test-test-thread-factory, \
-      MAKEFILE := test/BuildJtregTestThreadFactory, \
-      TARGET := build, \
-      DEPS := interim-langtools exploded-image, \
-  ))
-
-  # Copies the jtreg test thread factory into the test image
-  $(eval $(call SetupTarget, test-image-test-thread-factory, \
-      MAKEFILE := test/BuildJtregTestThreadFactory, \
-      TARGET := images, \
-      DEPS := build-test-test-thread-factory, \
-  ))
-endif
-
 $(eval $(call SetupTarget, build-microbenchmark, \
     MAKEFILE := test/BuildMicrobenchmark, \
-    DEPS := interim-langtools exploded-image build-test-lib, \
+    DEPS := interim-langtools exploded-image, \
 ))
 
 ################################################################################
@@ -859,12 +780,6 @@ $(eval $(call SetupTarget, static-libs-bundles, \
     DEPS := static-libs-image, \
 ))
 
-$(eval $(call SetupTarget, static-libs-graal-bundles, \
-    MAKEFILE := Bundles, \
-    TARGET := static-libs-graal-bundles, \
-    DEPS := static-libs-graal-image, \
-))
-
 ifeq ($(JCOV_ENABLED), true)
   $(eval $(call SetupTarget, jcov-bundles, \
       MAKEFILE := Bundles, \
@@ -873,6 +788,14 @@ ifeq ($(JCOV_ENABLED), true)
   ))
 endif
 
+################################################################################
+# Install targets
+
+$(eval $(call SetupTarget, install, \
+    MAKEFILE := Install, \
+    DEPS := product-images, \
+))
+
 ################################################################################
 #
 # Dependency declarations between targets.
@@ -910,7 +833,6 @@ else
   $(foreach v, $(JVM_VARIANTS), \
       $(eval hotspot-$v-gensrc: java.base-copy buildtools-hotspot) \
       $(eval hotspot-$v-libs: hotspot-$v-gensrc java.base-copy) \
-      $(eval hotspot-$v-static-libs: hotspot-$v-gensrc java.base-copy) \
   )
 
   # If not already set, set the JVM variant target so that the JVM will be built.
@@ -970,31 +892,14 @@ else
   jdk.jdeps-gendata: java
 
   # The ct.sym generation uses all the moduleinfos as input
-  jdk.compiler-gendata: $(GENSRC_MODULEINFO_TARGETS) $(JAVA_TARGETS)
-  # jdk.compiler-gendata needs the BUILD_JDK. If the BUILD_JDK was supplied
-  # externally, no extra prerequisites are needed.
-  ifeq ($(CREATE_BUILDJDK), true)
-    ifneq ($(CREATING_BUILDJDK), true)
-      # When cross compiling and an external BUILD_JDK wasn't supplied, it's
-      # produced by the create-buildjdk target.
-      jdk.compiler-gendata: create-buildjdk
-    endif
-  else ifeq ($(EXTERNAL_BUILDJDK), false)
-    # When not cross compiling, the BUILD_JDK is the interim jdk image, and
-    # the javac launcher is needed.
-    jdk.compiler-gendata: jdk.compiler-launchers
-  endif
+  jdk.compiler-gendata: $(GENSRC_MODULEINFO_TARGETS)
 
   # Declare dependencies between jmod targets.
-  # java.base jmod needs jrt-fs.jar and access to the jmods for all non
-  # upgradeable modules and their transitive dependencies.
+  # java.base jmod needs jrt-fs.jar and access to the other jmods to be built.
   # When creating the BUILDJDK, we don't need to add hashes to java.base, thus
   # we don't need to depend on all other jmods
   ifneq ($(CREATING_BUILDJDK), true)
-    java.base-jmod: jrtfs-jar $(addsuffix -jmod, $(filter-out java.base, $(sort \
-        $(foreach m, $(filter-out $(call FindAllUpgradeableModules), $(JMOD_MODULES)), \
-          $m $(call FindTransitiveDepsForModules, $m) \
-        ))))
+    java.base-jmod: jrtfs-jar $(filter-out java.base-jmod, $(JMOD_TARGETS))
   endif
 
   # If not already set, set the JVM target so that the JVM will be built.
@@ -1066,9 +971,6 @@ else
   # All modules include the main license files from java.base.
   $(JMOD_TARGETS): java.base-copy
 
-  # jdk.javadoc uses an internal copy of the main license files from java.base.
-  jdk.javadoc-copy: java.base-copy
-
   zip-security: $(filter jdk.crypto%, $(JAVA_TARGETS))
 
   ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
@@ -1089,9 +991,7 @@ else
 
   symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS)
 
-  static-libs-image: hotspot-static-libs $(STATIC_LIBS_TARGETS)
-
-  static-libs-graal-image: $(STATIC_LIBS_TARGETS)
+  static-libs-image: $(STATIC_LIBS_TARGETS)
 
   bootcycle-images: jdk-image
 
@@ -1141,7 +1041,6 @@ hotspot: $(HOTSPOT_VARIANT_TARGETS)
 $(foreach v, $(JVM_VARIANTS), \
   $(eval hotspot-libs: hotspot-$v-libs) \
   $(eval hotspot-gensrc: hotspot-$v-gensrc) \
-  $(eval hotspot-static-libs: hotspot-$v-static-libs) \
 )
 
 gensrc: $(GENSRC_TARGETS)
@@ -1208,14 +1107,9 @@ docs-reference-api: docs-reference-api-javadoc
 # If we're building full docs, we must also generate the module graphs to
 # get non-broken api documentation.
 ifeq ($(ENABLE_FULL_DOCS), true)
-  docs-jdk-api: docs-jdk-api-graphs
-  docs-javase-api: docs-javase-api-graphs
-  docs-reference-api: docs-reference-api-graphs
-
-  # We must generate javadoc first so we know what graphs are needed
-  docs-jdk-api-graphs: docs-jdk-api-javadoc
-  docs-javase-api-graphs: docs-javase-api-javadoc
-  docs-reference-api-graphs: docs-reference-api-javadoc
+  docs-jdk-api: docs-jdk-api-modulegraph
+  docs-javase-api: docs-javase-api-modulegraph
+  docs-reference-api: docs-reference-api-modulegraph
 endif
 
 docs-jdk: docs-jdk-api docs-jdk-specs docs-jdk-index
@@ -1271,7 +1165,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-lib-native
 
 ifneq ($(JVM_TEST_IMAGE_TARGETS), )
   # If JVM_TEST_IMAGE_TARGETS is externally defined, use it instead of the
@@ -1288,10 +1182,6 @@ ifeq ($(BUILD_FAILURE_HANDLER), true)
   test-image: test-image-failure-handler
 endif
 
-ifeq ($(BUILD_JTREG_TEST_THREAD_FACTORY), true)
-  test-image: test-image-test-thread-factory
-endif
-
 ifneq ($(JMH_CORE_JAR), )
   test-image: build-microbenchmark
 endif
@@ -1304,8 +1194,7 @@ 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
 
-ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-static-libs \
-    hotspot-gensrc gensrc gendata \
+ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \
     copy java libs static-libs launchers jmods \
     jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \
     exploded-image-base exploded-image runnable-buildjdk \
@@ -1447,13 +1336,13 @@ ALL_TARGETS += $(addsuffix -only, $(filter-out dist-clean clean%, $(ALL_TARGETS)
 # are internal only, to support Init.gmk.
 
 print-targets:
-	$(info $(subst $(SPACE),$(NEWLINE),$(sort $(ALL_TARGETS))))
+	  @$(ECHO) $(sort $(ALL_TARGETS))
 
 print-modules:
-	$(info $(subst $(SPACE),$(NEWLINE),$(sort $(ALL_MODULES))))
+	  @$(ECHO) $(sort $(ALL_MODULES))
 
 print-tests:
-	$(info $(subst $(SPACE),$(NEWLINE),$(sort $(ALL_NAMED_TESTS))))
+	  @$(ECHO) $(sort $(ALL_NAMED_TESTS))
 
 create-main-targets-include:
 	  $(call LogInfo, Generating main target list)

make/MainSupport.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -38,16 +38,11 @@ _MAINSUPPORT_GMK := 1
 #   TARGET the makefile target
 #   ARGS arguments to the makefile
 #   DEPS the target(s) this new rule depends on
-#   DIR the directory of the makefile (defaults to $(TOPDIR)/make)
 #
 SetupTarget = $(NamedParamsMacroTemplate)
 define SetupTargetBody
-  ifeq ($$($1_DIR), )
-    $1_DIR := $(TOPDIR)/make
-  endif
-
   $1:
-	+($(CD) $$($1_DIR) && $(MAKE) $(MAKE_ARGS) -f $$($1_MAKEFILE).gmk $$($1_TARGET) $$($1_ARGS))
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f $$($1_MAKEFILE).gmk $$($1_TARGET) $$($1_ARGS))
 
   ALL_TARGETS += $1
 

make/ReleaseFile.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,6 @@ define create-info-file
   $(if $(VENDOR_VERSION_STRING), \
     $(call info-file-item, "IMPLEMENTOR_VERSION", "$(VENDOR_VERSION_STRING)"))
   $(call info-file-item, "JAVA_VERSION_DATE", "$(VERSION_DATE)")
-  $(call info-file-item, "JAVA_RUNTIME_VERSION", "$(VERSION_STRING)")
   $(call info-file-item, "OS_NAME", "$(RELEASE_FILE_OS_NAME)")
   $(call info-file-item, "OS_ARCH", "$(RELEASE_FILE_OS_ARCH)")
   $(call info-file-item, "LIBC", "$(RELEASE_FILE_LIBC)")

make/RunTests.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -93,9 +93,6 @@ endif
 JTREG_FAILURE_HANDLER_DIR := $(TEST_IMAGE_DIR)/failure_handler
 JTREG_FAILURE_HANDLER := $(JTREG_FAILURE_HANDLER_DIR)/jtregFailureHandler.jar
 
-JTREG_TEST_THREAD_FACTORY_DIR := $(TEST_IMAGE_DIR)/jtreg_test_thread_factory
-JTREG_TEST_THREAD_FACTORY_JAR := $(JTREG_TEST_THREAD_FACTORY_DIR)/jtregTestThreadFactory.jar
-
 JTREG_FAILURE_HANDLER_TIMEOUT ?= 0
 
 ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), )
@@ -178,8 +175,7 @@ ifeq ($(TEST_JOBS), 0)
       c = c * $(TEST_JOBS_FACTOR_JDL); \
       c = c * $(TEST_JOBS_FACTOR_MACHINE); \
       if (c < 1) c = 1; \
-      c = c + 0.5; \
-      printf "%d", c; \
+      printf "%.0f", c; \
     }')
 endif
 
@@ -200,12 +196,11 @@ $(eval $(call SetTestOpt,JAVA_OPTIONS,JTREG))
 $(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 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 $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
+        TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS \
+        RETRY_COUNT REPEAT_COUNT MAX_OUTPUT $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
     STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
         EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \
         $(CUSTOM_JTREG_STRING_KEYWORDS), \
@@ -357,7 +352,7 @@ ExpandJtregPath = \
 # with test id: dir/Test.java#selection -> Test.java#selection -> .java#selection -> #selection
 #      without: dir/Test.java           -> Test.java           -> .java           -> <<empty string>>
 TestID = \
-    $(subst .jasm,,$(subst .sh,,$(subst .html,,$(subst .java,,$(suffix $(notdir $1))))))
+    $(subst .java,,$(suffix $(notdir $1)))
 
 # The test id starting with a hash (#testid) will be stripped by all
 # evals in ParseJtregTestSelectionInner and will be reinserted by calling
@@ -747,11 +742,9 @@ define SetupRunJtregTestBody
 
   JTREG_VERBOSE ?= fail,error,summary
   JTREG_RETAIN ?= fail,error
-  JTREG_TEST_THREAD_FACTORY ?=
   JTREG_RUN_PROBLEM_LISTS ?= false
   JTREG_RETRY_COUNT ?= 0
   JTREG_REPEAT_COUNT ?= 0
-  JTREG_REPORT ?= files
 
   ifneq ($$(JTREG_RETRY_COUNT), 0)
     ifneq ($$(JTREG_REPEAT_COUNT), 0)
@@ -761,14 +754,6 @@ define SetupRunJtregTestBody
     endif
   endif
 
-  ifneq ($$(JTREG_TEST_THREAD_FACTORY), )
-    $1_JTREG_BASIC_OPTIONS += -testThreadFactoryPath:$$(JTREG_TEST_THREAD_FACTORY_JAR)
-    $1_JTREG_BASIC_OPTIONS += -testThreadFactory:$$(JTREG_TEST_THREAD_FACTORY)
-    $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
-	$$(addprefix $$($1_TEST_ROOT)/, ProblemList-$$(JTREG_TEST_THREAD_FACTORY).txt) \
-    ))
-  endif
-
   ifneq ($$(JTREG_LAUNCHER_OPTIONS), )
     $1_JTREG_LAUNCHER_OPTIONS += $$(JTREG_LAUNCHER_OPTIONS)
   endif
@@ -785,13 +770,10 @@ define SetupRunJtregTestBody
   # Make sure the tmp dir is normalized as some tests will react badly otherwise
   $1_TEST_TMP_DIR := $$(abspath $$($1_TEST_SUPPORT_DIR)/tmp)
 
-  # test.boot.jdk is used by some test cases that want to execute a previous
-  # version of the JDK.
   $1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \
       -verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \
       -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR) \
       -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE) \
-      -vmoption:-Dtest.boot.jdk="$$(BOOT_JDK)" \
       -vmoption:-Djava.io.tmpdir="$$($1_TEST_TMP_DIR)"
 
   $1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet
@@ -801,10 +783,8 @@ define SetupRunJtregTestBody
   $1_JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR
   # If running on Windows, propagate the _NT_SYMBOL_PATH to enable
   # symbol lookup in hserr files
-  # The minidumps are disabled by default on client Windows, so enable them
   ifeq ($$(call isTargetOs, windows), true)
     $1_JTREG_BASIC_OPTIONS += -e:_NT_SYMBOL_PATH
-    $1_JTREG_BASIC_OPTIONS += -vmoption:-XX:+CreateCoredumpOnCrash
   else ifeq ($$(call isTargetOs, linux), true)
       $1_JTREG_BASIC_OPTIONS += -e:_JVM_DWARF_PATH=$$(SYMBOLS_IMAGE_DIR)
   endif
@@ -863,19 +843,17 @@ define SetupRunJtregTestBody
 
   $$(eval $$(call SetupRunJtregTestCustom, $1))
 
-  clean-outputdirs-$1:
+  clean-workdir-$1:
 	$$(RM) -r $$($1_TEST_SUPPORT_DIR)
-	$$(RM) -r $$($1_TEST_RESULTS_DIR)
 
   $1_COMMAND_LINE := \
-      $$(JTREG_JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
+      $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
           -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \
           $$($1_JTREG_BASIC_OPTIONS) \
           -testjdk:$$(JDK_UNDER_TEST) \
           -dir:$$(JTREG_TOPDIR) \
           -reportDir:$$($1_TEST_RESULTS_DIR) \
           -workDir:$$($1_TEST_SUPPORT_DIR) \
-          -report:$${JTREG_REPORT} \
           $$$${JTREG_STATUS} \
           $$(JTREG_OPTIONS) \
           $$(JTREG_FAILURE_HANDLER_OPTIONS) \
@@ -911,7 +889,7 @@ define SetupRunJtregTestBody
         done
   endif
 
-  run-test-$1: pre-run-test clean-outputdirs-$1
+  run-test-$1: pre-run-test clean-workdir-$1
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR) \
@@ -948,9 +926,9 @@ define SetupRunJtregTestBody
 	  $$(eval $1_TOTAL := 1) \
 	)
 
-  $1: run-test-$1 parse-test-$1 clean-outputdirs-$1
+  $1: run-test-$1 parse-test-$1 clean-workdir-$1
 
-  TARGETS += $1 run-test-$1 parse-test-$1 clean-outputdirs-$1
+  TARGETS += $1 run-test-$1 parse-test-$1 clean-workdir-$1
   TEST_TARGETS += parse-test-$1
 
 endef

make/RunTestsPrebuilt.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2021, 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
@@ -122,7 +122,6 @@ $(eval $(call SetupVariable,JT_HOME))
 $(eval $(call SetupVariable,JDK_IMAGE_DIR,$(OUTPUTDIR)/images/jdk))
 $(eval $(call SetupVariable,TEST_IMAGE_DIR,$(OUTPUTDIR)/images/test))
 $(eval $(call SetupVariable,SYMBOLS_IMAGE_DIR,$(OUTPUTDIR)/images/symbols,NO_CHECK))
-$(eval $(call SetupVariable,JTREG_JDK,$(BOOT_JDK)))
 
 # Provide default values for tools that we need
 $(eval $(call SetupVariable,MAKE,make,NO_CHECK))
@@ -158,10 +157,6 @@ ifeq ($(UNAME_OS), CYGWIN)
   OPENJDK_TARGET_OS := windows
   OPENJDK_TARGET_OS_TYPE := windows
   OPENJDK_TARGET_OS_ENV := windows.cygwin
-else ifeq ($(UNAME_OS), MINGW64)
-  OPENJDK_TARGET_OS := windows
-  OPENJDK_TARGET_OS_TYPE := windows
-  OPENJDK_TARGET_OS_ENV := windows.msys2
 else
   OPENJDK_TARGET_OS_TYPE:=unix
   ifeq ($(UNAME_OS), Linux)
@@ -174,9 +169,6 @@ else
   OPENJDK_TARGET_OS_ENV := $(OPENJDK_TARGET_OS)
 endif
 
-# Sanity check env detection
-$(info Detected target OS, type and env: [$(OPENJDK_TARGET_OS)] [$(OPENJDK_TARGET_OS_TYPE)] [$(OPENJDK_TARGET_OS_ENV)])
-
 # Assume little endian unless otherwise specified
 OPENJDK_TARGET_CPU_ENDIAN := little
 
@@ -256,7 +248,6 @@ $(call CreateNewSpec, $(NEW_SPEC), \
     TOPDIR := $(TOPDIR), \
     OUTPUTDIR := $(OUTPUTDIR), \
     BOOT_JDK := $(BOOT_JDK), \
-    JTREG_JDK := $(JTREG_JDK), \
     JT_HOME := $(JT_HOME), \
     JDK_IMAGE_DIR := $(JDK_IMAGE_DIR), \
     JCOV_IMAGE_DIR := $(JCOV_IMAGE_DIR), \
@@ -304,11 +295,6 @@ test-prebuilt:
 	@cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -f make/RunTests.gmk run-test \
 	    TEST="$(TEST)"
 
-test-prebuilt-with-exit-code: test-prebuilt
-	@if test -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error ; then \
-	  exit 1 ; \
-	fi
-
 all: test-prebuilt
 
 .PHONY: default all test-prebuilt

make/RunTestsPrebuiltSpec.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2023, 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
@@ -124,8 +124,6 @@ JAR := $(FIXPATH) $(JAR_CMD)
 JLINK := $(FIXPATH) $(JLINK_CMD)
 JMOD := $(FIXPATH) $(JMOD_CMD)
 
-JTREG_JAVA := $(FIXPATH) $(JTREG_JDK)/bin/java $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
-
 BUILD_JAVA := $(JDK_IMAGE_DIR)/bin/JAVA
 ################################################################################
 # Some common tools. Assume most common name and no path.

make/StaticLibsImage.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2023, 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
@@ -38,43 +38,19 @@ 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)), )
-  IMAGE_DEST_DIR=$(STATIC_LIBS_GRAAL_IMAGE_DIR)/lib
-endif
-
-# Copy JDK static libs to the image.
 $(foreach m, $(ALL_MODULES), \
   $(eval $(call SetupCopyFiles, COPY_STATIC_LIBS_$m, \
       FLATTEN := true, \
       SRC := $(SUPPORT_OUTPUTDIR)/native/$m, \
-      DEST := $(IMAGE_DEST_DIR), \
+      DEST := $(STATIC_LIBS_IMAGE_DIR)/lib, \
       FILES := $(filter %$(STATIC_LIBRARY_SUFFIX), \
           $(call FindFiles, $(SUPPORT_OUTPUTDIR)/native/$m/*/static)), \
   )) \
   $(eval TARGETS += $$(COPY_STATIC_LIBS_$m)) \
-  $(eval STATIC_LIBS_TARGETS += $$(COPY_STATIC_LIBS_$m)) \
 )
 
-ifneq ($(filter static-libs-image, $(MAKECMDGOALS)), )
-  # Copy libjvm static library to the image.
-  $(foreach v, $(JVM_VARIANTS), \
-    $(eval $(call SetupCopyFiles, COPY_STATIC_LIBS_$v, \
-        SRC := $(HOTSPOT_OUTPUTDIR)/variant-$v/libjvm/objs/static, \
-        DEST := $(IMAGE_DEST_DIR)/$v, \
-        FILES := $(wildcard $(HOTSPOT_OUTPUTDIR)/variant-$v/libjvm/objs/static/*$(STATIC_LIBRARY_SUFFIX)), \
-    )) \
-    $(eval TARGETS += $$(COPY_STATIC_LIBS_$v)) \
-    $(eval HOTSPOT_VARIANT_STATIC_LIBS_TARGETS += $$(COPY_STATIC_LIBS_$v)) \
-  )
-endif
-
 ################################################################################
 
-static-libs-image: $(HOTSPOT_VARIANT_STATIC_LIBS_TARGETS) $(STATIC_LIBS_TARGETS)
-static-libs-graal-image: $(STATIC_LIBS_TARGETS)
-
 all: $(TARGETS)
 
 .PHONY: all

make/ToolsJdk.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -76,8 +76,8 @@ TOOL_GENERATECACERTS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_class
     -Dkeystore.pkcs12.macAlgorithm=NONE \
     build.tools.generatecacerts.GenerateCacerts
 
-TOOL_GENERATEEXTRAPROPERTIES = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
-    build.tools.generateextraproperties.GenerateExtraProperties
+TOOL_GENERATEEMOJIDATA = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    build.tools.generateemojidata.GenerateEmojiData
 
 TOOL_MAKEZIPREPRODUCIBLE = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.makezipreproducible.MakeZipReproducible
@@ -137,7 +137,4 @@ PANDOC_HTML_MANPAGE_FILTER := $(BUILDTOOLS_OUTPUTDIR)/manpages/pandoc-html-manpa
 
 ##########################################################################################
 
-# Hook to include the corresponding custom post file, if present.
-$(eval $(call IncludeCustomExtension, ToolsJdk-post.gmk))
-
 endif # _TOOLS_GMK

make/ZipSecurity.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2023, 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
@@ -41,6 +41,7 @@ $(eval $(call SetupZipArchive,BUILD_SEC_BIN_ZIP, \
         modules/java.base/sun/security/internal/interfaces \
         modules/java.base/sun/security/internal/spec \
         modules/java.base/com/sun/crypto/provider \
+        modules/jdk.crypto.ec/sun/security/ec \
         modules/jdk.crypto.mscapi/sun/security/mscapi \
         modules/jdk.crypto.cryptoki/sun/security/pkcs11 \
         modules/jdk.crypto.cryptoki/sun/security/pkcs11/wrapper \
@@ -87,9 +88,9 @@ ifeq ($(call isTargetOs, windows), true)
   $(eval $(call SetupZipArchive,BUILD_JGSS_BIN_ZIP, \
       SRC := $(SUPPORT_OUTPUTDIR), \
       INCLUDE_FILES := modules_libs/java.security.jgss/w2k_lsa_auth.dll \
-          modules_libs/java.security.jgss/w2k_lsa_auth.dll.diz \
-          modules_libs/java.security.jgss/w2k_lsa_auth.dll.map \
-          modules_libs/java.security.jgss/w2k_lsa_auth.dll.pdb, \
+          modules_libs/java.security.jgss/w2k_lsa_auth.diz \
+          modules_libs/java.security.jgss/w2k_lsa_auth.map \
+          modules_libs/java.security.jgss/w2k_lsa_auth.pdb, \
       ZIP := $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)))
 
   TARGETS += $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)

make/ZipSource.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2022, 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
@@ -31,7 +31,6 @@ include JavaCompilation.gmk
 include Modules.gmk
 
 SRC_ZIP_WORK_DIR := $(SUPPORT_OUTPUTDIR)/src
-$(if $(filter $(TOPDIR)/%, $(SUPPORT_OUTPUTDIR)), $(eval SRC_ZIP_BASE := $(TOPDIR)), $(eval SRC_ZIP_BASE := $(SUPPORT_OUTPUTDIR)))
 
 # Hook to include the corresponding custom file, if present.
 $(eval $(call IncludeCustomExtension, ZipSource.gmk))
@@ -46,10 +45,10 @@ ALL_MODULES := $(FindAllModules)
 # again to create src.zip.
 $(foreach m, $(ALL_MODULES), \
   $(foreach d, $(call FindModuleSrcDirs, $m), \
-    $(eval $d_TARGET := $(SRC_ZIP_WORK_DIR)/$(patsubst $(TOPDIR)/%,%,$(patsubst $(SUPPORT_OUTPUTDIR)/%,%,$d))/$m) \
+    $(eval $d_TARGET := $(SRC_ZIP_WORK_DIR)/$(patsubst $(TOPDIR)/%,%,$d)/$m) \
     $(if $(SRC_GENERATED), , \
       $(eval $$($d_TARGET): $d ; \
-          $$(if $(filter $(SRC_ZIP_BASE)/%, $d), $$(link-file-relative), $$(link-file-absolute)) \
+          $$(if $(filter $(TOPDIR)/%, $d), $$(link-file-relative), $$(link-file-absolute)) \
       ) \
     ) \
     $(eval SRC_ZIP_SRCS += $$($d_TARGET)) \

make/autoconf/Makefile.in

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

make/autoconf/Makefile.template

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

make/autoconf/basic.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -31,11 +31,6 @@ AC_DEFUN_ONCE([BASIC_INIT],
 [
   # Save the original command line. This is passed to us by the wrapper configure script.
   AC_SUBST(CONFIGURE_COMMAND_LINE)
-  # We might have the original command line if the wrapper was called by some
-  # other script.
-  AC_SUBST(REAL_CONFIGURE_COMMAND_EXEC_SHORT)
-  AC_SUBST(REAL_CONFIGURE_COMMAND_EXEC_FULL)
-  AC_SUBST(REAL_CONFIGURE_COMMAND_LINE)
   # AUTOCONF might be set in the environment by the user. Preserve for "make reconfigure".
   AC_SUBST(AUTOCONF)
   # Save the path variable before it gets changed
@@ -60,7 +55,6 @@ AC_DEFUN([BASIC_CHECK_LEFTOVER_OVERRIDDEN],
 
 ###############################################################################
 # Setup basic configuration paths, and platform-specific stuff related to PATHs.
-# Make sure to only use tools set up in BASIC_SETUP_FUNDAMENTAL_TOOLS.
 AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
 [
   # Save the current directory this script was started from
@@ -102,29 +96,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
   AUTOCONF_DIR=$TOPDIR/make/autoconf
 ])
 
-###############################################################################
-# Setup what kind of build environment type we have (CI or local developer)
-AC_DEFUN_ONCE([BASIC_SETUP_BUILD_ENV],
-[
-  if test "x$CI" = "xtrue"; then
-    DEFAULT_BUILD_ENV="ci"
-    AC_MSG_NOTICE([CI environment variable set to $CI])
-  else
-    DEFAULT_BUILD_ENV="dev"
-  fi
-
-  UTIL_ARG_WITH(NAME: build-env, TYPE: literal,
-      RESULT: BUILD_ENV,
-      VALID_VALUES: [auto dev ci], DEFAULT: auto,
-      CHECKING_MSG: [for build environment type],
-      DESC: [select build environment type (affects certain default values)],
-      IF_AUTO: [
-        RESULT=$DEFAULT_BUILD_ENV
-      ]
-  )
-  AC_SUBST(BUILD_ENV)
-])
-
 ###############################################################################
 # Evaluates platform specific overrides for devkit variables.
 # $1: Name of variable
@@ -168,15 +139,6 @@ AC_DEFUN([BASIC_SETUP_XCODE_SYSROOT],
     if test $? -ne 0; then
       AC_MSG_ERROR([The xcodebuild tool in the devkit reports an error: $XCODEBUILD_OUTPUT])
     fi
-  elif test "x$TOOLCHAIN_PATH" != x; then
-    UTIL_LOOKUP_PROGS(XCODEBUILD, xcodebuild, $TOOLCHAIN_PATH)
-    if test "x$XCODEBUILD" != x; then
-      XCODEBUILD_OUTPUT=`"$XCODEBUILD" -version 2>&1`
-      if test $? -ne 0; then
-        AC_MSG_WARN([Ignoring the located xcodebuild tool $XCODEBUILD due to an error: $XCODEBUILD_OUTPUT])
-        XCODEBUILD=
-      fi
-    fi
   else
     UTIL_LOOKUP_PROGS(XCODEBUILD, xcodebuild)
     if test "x$XCODEBUILD" != x; then
@@ -326,22 +288,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
       [UTIL_PREPEND_TO_PATH([TOOLCHAIN_PATH],$with_toolchain_path)]
   )
 
-  AC_ARG_WITH([xcode-path], [AS_HELP_STRING([--with-xcode-path],
-      [set up toolchain on Mac OS using a path to an Xcode installation])])
-
-  if test "x$with_xcode_path" != x; then
-    if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then
-      UTIL_PREPEND_TO_PATH([TOOLCHAIN_PATH],
-          $with_xcode_path/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin:$with_xcode_path/Contents/Developer/usr/bin)
-    else
-      AC_MSG_WARN([Option --with-xcode-path is only valid on Mac OS, ignoring.])
-    fi
-  fi
-
-  AC_MSG_CHECKING([for toolchain path])
-  AC_MSG_RESULT([$TOOLCHAIN_PATH])
-  AC_SUBST(TOOLCHAIN_PATH)
-
   AC_ARG_WITH([extra-path], [AS_HELP_STRING([--with-extra-path],
       [prepend these directories to the default path])],
       [UTIL_PREPEND_TO_PATH([EXTRA_PATH],$with_extra_path)]
@@ -360,6 +306,10 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
   AC_MSG_RESULT([$SYSROOT])
   AC_SUBST(SYSROOT)
 
+  AC_MSG_CHECKING([for toolchain path])
+  AC_MSG_RESULT([$TOOLCHAIN_PATH])
+  AC_SUBST(TOOLCHAIN_PATH)
+
   AC_MSG_CHECKING([for extra path])
   AC_MSG_RESULT([$EXTRA_PATH])
 ])
@@ -406,9 +356,9 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
     # WARNING: This might be a bad thing to do. You need to be sure you want to
     # have a configuration in this directory. Do some sanity checks!
 
-    if test ! -e "$OUTPUTDIR/spec.gmk" && test ! -e "$OUTPUTDIR/configure-support/generated-configure.sh"; then
-      # If we have a spec.gmk or configure-support/generated-configure.sh,
-      # we have run here before and we are OK. Otherwise, check for other files
+    if test ! -e "$OUTPUTDIR/spec.gmk"; then
+      # If we have a spec.gmk, we have run here before and we are OK. Otherwise, check for
+      # other files
       files_present=`$LS $OUTPUTDIR`
       # Configure has already touched config.log and confdefs.h in the current dir when this check
       # is performed.
@@ -423,9 +373,8 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
         AC_MSG_NOTICE([Current directory is $CONFIGURE_START_DIR.])
         AC_MSG_NOTICE([Since this is not the source root, configure will output the configuration here])
         AC_MSG_NOTICE([(as opposed to creating a configuration in <src_root>/build/<conf-name>).])
-        AC_MSG_NOTICE([However, this directory is not empty, additionally to some allowed files])
-        AC_MSG_NOTICE([it contains $filtered_files.])
-        AC_MSG_NOTICE([This is not allowed, since it could seriously mess up just about everything.])
+        AC_MSG_NOTICE([However, this directory is not empty. This is not allowed, since it could])
+        AC_MSG_NOTICE([seriously mess up just about everything.])
         AC_MSG_NOTICE([Try 'cd $TOPDIR' and restart configure])
         AC_MSG_NOTICE([(or create a new empty directory and cd to it).])
         AC_MSG_ERROR([Will not continue creating configuration in $CONFIGURE_START_DIR])
@@ -448,17 +397,17 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
   AC_SUBST(CONFIGURESUPPORT_OUTPUTDIR)
 
   # The spec.gmk file contains all variables for the make system.
-  AC_CONFIG_FILES([$OUTPUTDIR/spec.gmk:$AUTOCONF_DIR/spec.gmk.template])
+  AC_CONFIG_FILES([$OUTPUTDIR/spec.gmk:$AUTOCONF_DIR/spec.gmk.in])
   # The bootcycle-spec.gmk file contains support for boot cycle builds.
-  AC_CONFIG_FILES([$OUTPUTDIR/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.template])
+  AC_CONFIG_FILES([$OUTPUTDIR/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in])
   # The buildjdk-spec.gmk file contains support for building a buildjdk when cross compiling.
-  AC_CONFIG_FILES([$OUTPUTDIR/buildjdk-spec.gmk:$AUTOCONF_DIR/buildjdk-spec.gmk.template])
+  AC_CONFIG_FILES([$OUTPUTDIR/buildjdk-spec.gmk:$AUTOCONF_DIR/buildjdk-spec.gmk.in])
   # The compare.sh is used to compare the build output to other builds.
-  AC_CONFIG_FILES([$OUTPUTDIR/compare.sh:$AUTOCONF_DIR/compare.sh.template])
+  AC_CONFIG_FILES([$OUTPUTDIR/compare.sh:$AUTOCONF_DIR/compare.sh.in])
   # The generated Makefile knows where the spec.gmk is and where the source is.
   # You can run make from the OUTPUTDIR, or from the top-level Makefile
   # which will look for generated configurations
-  AC_CONFIG_FILES([$OUTPUTDIR/Makefile:$AUTOCONF_DIR/Makefile.template])
+  AC_CONFIG_FILES([$OUTPUTDIR/Makefile:$AUTOCONF_DIR/Makefile.in])
 ])
 
 ###############################################################################
@@ -479,11 +428,7 @@ AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
     # df on AIX does not understand -l. On modern AIXes it understands "-T local" which
     # is the same. On older AIXes we just continue to live with a "not local build" warning.
     if test "x$OPENJDK_TARGET_OS" = xaix; then
-      if $DF -T local > /dev/null 2>&1; then
-        DF_LOCAL_ONLY_OPTION='-T local'
-      else # AIX may use GNU-utils instead
-        DF_LOCAL_ONLY_OPTION='-l'
-      fi
+      DF_LOCAL_ONLY_OPTION='-T local'
     elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl1"; then
       # In WSL1, we can only build on a drvfs file system (that is, a mounted real Windows drive)
       DF_LOCAL_ONLY_OPTION='-t drvfs'

make/autoconf/basic_tools.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,13 +24,8 @@
 #
 
 ###############################################################################
-# It is recommended to use exactly this version of pandoc, especially for
-# re-generating checked in html files
-RECOMMENDED_PANDOC_VERSION=2.19.2
-
-###############################################################################
-# Setup the most fundamental tools, used for setting up build platform and
-# path handling.
+# Setup the most fundamental tools that relies on not much else to set up,
+# but is used by much of the early bootstrap code.
 AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
 [
   # Bootstrapping: These tools are needed by UTIL_LOOKUP_PROGS
@@ -42,28 +37,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
   UTIL_CHECK_NONEMPTY(FILE)
   AC_PATH_PROGS(LDD, ldd)
 
-  # Required tools
-  UTIL_REQUIRE_PROGS(ECHO, echo)
-  UTIL_REQUIRE_PROGS(TR, tr)
-  UTIL_REQUIRE_PROGS(UNAME, uname)
-  UTIL_REQUIRE_PROGS(WC, wc)
-
-  # Required tools with some special treatment
-  UTIL_REQUIRE_SPECIAL(GREP, [AC_PROG_GREP])
-  UTIL_REQUIRE_SPECIAL(EGREP, [AC_PROG_EGREP])
-  UTIL_REQUIRE_SPECIAL(SED, [AC_PROG_SED])
-
-  # Tools only needed on some platforms
-  UTIL_LOOKUP_PROGS(PATHTOOL, cygpath wslpath)
-  UTIL_LOOKUP_PROGS(CMD, cmd.exe, $PATH:/cygdrive/c/windows/system32:/mnt/c/windows/system32:/c/windows/system32)
-])
-
-###############################################################################
-# Setup further tools that should be resolved early but after setting up
-# build platform and path handling.
-AC_DEFUN_ONCE([BASIC_SETUP_TOOLS],
-[
-  # Required tools
+  # First are all the fundamental required tools.
   UTIL_REQUIRE_PROGS(BASH, bash)
   UTIL_REQUIRE_PROGS(CAT, cat)
   UTIL_REQUIRE_PROGS(CHMOD, chmod)
@@ -71,6 +45,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_TOOLS],
   UTIL_REQUIRE_PROGS(CUT, cut)
   UTIL_REQUIRE_PROGS(DATE, date)
   UTIL_REQUIRE_PROGS(DIFF, gdiff diff)
+  UTIL_REQUIRE_PROGS(ECHO, echo)
   UTIL_REQUIRE_PROGS(EXPR, expr)
   UTIL_REQUIRE_PROGS(FIND, find)
   UTIL_REQUIRE_PROGS(GUNZIP, gunzip)
@@ -92,20 +67,27 @@ AC_DEFUN_ONCE([BASIC_SETUP_TOOLS],
   UTIL_REQUIRE_PROGS(TAR, gtar tar)
   UTIL_REQUIRE_PROGS(TEE, tee)
   UTIL_REQUIRE_PROGS(TOUCH, touch)
+  UTIL_REQUIRE_PROGS(TR, tr)
+  UTIL_REQUIRE_PROGS(UNAME, uname)
+  UTIL_REQUIRE_PROGS(WC, wc)
   UTIL_REQUIRE_PROGS(XARGS, xargs)
 
-  # Required tools with some special treatment
+  # Then required tools that require some special treatment.
+  UTIL_REQUIRE_SPECIAL(GREP, [AC_PROG_GREP])
+  UTIL_REQUIRE_SPECIAL(EGREP, [AC_PROG_EGREP])
   UTIL_REQUIRE_SPECIAL(FGREP, [AC_PROG_FGREP])
+  UTIL_REQUIRE_SPECIAL(SED, [AC_PROG_SED])
 
   # Optional tools, we can do without them
   UTIL_LOOKUP_PROGS(DF, df)
   UTIL_LOOKUP_PROGS(GIT, git)
   UTIL_LOOKUP_PROGS(NICE, nice)
   UTIL_LOOKUP_PROGS(READLINK, greadlink readlink)
-  UTIL_LOOKUP_PROGS(WHOAMI, whoami)
 
-  # Tools only needed on some platforms
+  # These are only needed on some platforms
+  UTIL_LOOKUP_PROGS(PATHTOOL, cygpath wslpath)
   UTIL_LOOKUP_PROGS(LSB_RELEASE, lsb_release)
+  UTIL_LOOKUP_PROGS(CMD, cmd.exe, $PATH:/cygdrive/c/windows/system32:/mnt/c/windows/system32:/c/windows/system32)
 
   # For compare.sh only
   UTIL_LOOKUP_PROGS(CMP, cmp)
@@ -298,7 +280,7 @@ AC_DEFUN([BASIC_CHECK_TAR],
   if test "x$TAR_TYPE" = "xgnu"; then
     TAR_INCLUDE_PARAM="T"
     TAR_SUPPORTS_TRANSFORM="true"
-  elif test "x$TAR_TYPE" = "xaix"; then
+  elif test "x$TAR_TYPE" = "aix"; then
     # -L InputList of aix tar: name of file listing the files and directories
     # that need to be archived or extracted
     TAR_INCLUDE_PARAM="L"
@@ -390,17 +372,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
 
   if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
     UTIL_REQUIRE_PROGS(DSYMUTIL, dsymutil)
-    AC_MSG_CHECKING([if dsymutil supports --reproducer option])
-    if $DSYMUTIL --help | $GREP -q '\--reproducer '; then
-      AC_MSG_RESULT([yes])
-      # --reproducer option is supported
-      # set "--reproducer Off" to prevent unnecessary temporary
-      # directories creation
-      DSYMUTIL="$DSYMUTIL --reproducer Off"
-    else
-      # --reproducer option isn't supported
-      AC_MSG_RESULT([no])
-    fi
     UTIL_REQUIRE_PROGS(MIG, mig)
     UTIL_REQUIRE_PROGS(XATTR, xattr)
     UTIL_LOOKUP_PROGS(CODESIGN, codesign)
@@ -455,29 +426,22 @@ AC_DEFUN_ONCE([BASIC_SETUP_PANDOC],
 [
   UTIL_LOOKUP_PROGS(PANDOC, pandoc)
 
-  if test "x$PANDOC" != x; then
-    AC_MSG_CHECKING([for pandoc version])
-    PANDOC_VERSION=`$PANDOC --version 2>&1 | $TR -d '\r' | $HEAD -1 | $CUT -d " " -f 2`
-    AC_MSG_RESULT([$PANDOC_VERSION])
-
-    if test "x$PANDOC_VERSION" != x$RECOMMENDED_PANDOC_VERSION; then
-      AC_MSG_WARN([pandoc is version $PANDOC_VERSION, not the recommended version $RECOMMENDED_PANDOC_VERSION])
-    fi
-
-    PANDOC_MARKDOWN_FLAG="markdown"
-    AC_MSG_CHECKING([if the pandoc smart extension needs to be disabled for markdown])
-    if $PANDOC --list-extensions | $GREP -q '+smart'; then
+  PANDOC_MARKDOWN_FLAG="markdown"
+  if test -n "$PANDOC"; then
+    AC_MSG_CHECKING(if the pandoc smart extension needs to be disabled for markdown)
+    if $PANDOC --list-extensions | $GREP -q '\+smart'; then
       AC_MSG_RESULT([yes])
       PANDOC_MARKDOWN_FLAG="markdown-smart"
     else
       AC_MSG_RESULT([no])
     fi
+  fi
 
+  if test -n "$PANDOC"; then
     ENABLE_PANDOC="true"
   else
     ENABLE_PANDOC="false"
   fi
-
   AC_SUBST(ENABLE_PANDOC)
   AC_SUBST(PANDOC_MARKDOWN_FLAG)
 ])

make/autoconf/boot-jdk.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -382,7 +382,7 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
   # Finally, set some other options...
 
   # Determine if the boot jdk jar supports the --date option
-  if $JAR --help 2>&1 | $GREP -q -e "--date=TIMESTAMP"; then
+  if $JAR --help 2>&1 | $GREP -q "\-\-date=TIMESTAMP"; then
     BOOT_JDK_JAR_SUPPORTS_DATE=true
   else
     BOOT_JDK_JAR_SUPPORTS_DATE=false
@@ -520,8 +520,8 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
 
   # Don't presuppose SerialGC is present in the buildjdk. Also, we cannot test
   # the buildjdk, but on the other hand we know what it will support.
-  BUILD_JAVA_FLAGS_SMALL="-Xms32M -Xmx512M -XX:TieredStopAtLevel=1"
-  AC_SUBST(BUILD_JAVA_FLAGS_SMALL)
+  BUILDJDK_JAVA_FLAGS_SMALL="-Xms32M -Xmx512M -XX:TieredStopAtLevel=1"
+  AC_SUBST(BUILDJDK_JAVA_FLAGS_SMALL)
 
   JAVA_TOOL_FLAGS_SMALL=""
   for f in $JAVA_FLAGS_SMALL; do

make/autoconf/build-aux/config.guess

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -29,27 +29,16 @@
 # and fix the broken property, if needed.
 
 DIR=`dirname $0`
-OUT=`. $DIR/autoconf-config.guess 2> /dev/null`
+OUT=`. $DIR/autoconf-config.guess`
 
-# Handle some cases that autoconf-config.guess is not capable of
-if [ "x$OUT" = x ]; then
-  if [ `uname -s` = Linux ]; then
-    # Test and fix little endian MIPS.
-    if [ `uname -m` = mipsel ]; then
-      OUT=mipsel-unknown-linux-gnu
-    fi
-  # Test and fix cygwin machine arch .x86_64
-  elif [[ `uname -s` = CYGWIN* ]]; then
-    if [ `uname -m` = ".x86_64" ]; then
-      OUT=x86_64-unknown-cygwin
-    fi
-  fi
-
-  if [ "x$OUT" = x ]; then
-    # Run autoconf-config.guess again to get the error message.
-    . $DIR/autoconf-config.guess > /dev/null
-  else
-    printf "guessed by custom config.guess... " >&2
+# Detect C library.
+# Use '-gnu'  suffix on systems that use glibc.
+# Use '-musl' suffix on systems that use the musl libc.
+echo $OUT | grep -- -linux- > /dev/null 2> /dev/null
+if test $? = 0; then
+  libc_vendor=`ldd --version 2>&1 | sed -n '1s/.*\(musl\).*/\1/p'`
+  if [ x"${libc_vendor}" = x"musl" ]; then
+    OUT=`echo $OUT | sed 's/-gnu/-musl/'`
   fi
 fi
 
@@ -68,11 +57,11 @@ if test $? = 0; then
 fi
 
 # Test and fix wsl
-echo $OUT | grep '\(unknown\|pc\)-linux-gnu' > /dev/null 2> /dev/null
+echo $OUT | grep unknown-linux-gnu > /dev/null 2> /dev/null
 if test $? = 0; then
   uname -r | grep -i microsoft > /dev/null 2> /dev/null
   if test $? = 0; then
-    OUT=`echo $OUT | sed -e 's/\(unknown\|pc\)-linux-gnu/pc-wsl/'`
+    OUT=`echo $OUT | sed -e 's/unknown-linux-gnu/pc-wsl/'`
   fi
 fi
 
@@ -92,6 +81,57 @@ if test $? = 0; then
   OUT=powerpc$KERNEL_BITMODE`echo $OUT | sed -e 's/[^-]*//'`
 fi
 
+# Test and fix little endian PowerPC64.
+# TODO: should be handled by autoconf-config.guess.
+if [ "x$OUT" = x ]; then
+  if [ `uname -m` = ppc64le ]; then
+    if [ `uname -s` = Linux ]; then
+      OUT=powerpc64le-unknown-linux-gnu
+    fi
+  fi
+fi
+
+# Test and fix little endian MIPS.
+if [ "x$OUT" = x ]; then
+  if [ `uname -s` = Linux ]; then
+    if [ `uname -m` = mipsel ]; then
+      OUT=mipsel-unknown-linux-gnu
+    elif [ `uname -m` = mips64el ]; then
+      OUT=mips64el-unknown-linux-gnu
+    fi
+  fi
+fi
+
+# Test and fix LoongArch64.
+if [ "x$OUT" = x ]; then
+  if [ `uname -s` = Linux ]; then
+    if [ `uname -m` = loongarch64 ]; then
+      OUT=loongarch64-unknown-linux-gnu
+    fi
+  fi
+fi
+
+# Test and fix RISC-V.
+if [ "x$OUT" = x ]; then
+  if [ `uname -s` = Linux ]; then
+    if [ `uname -m` = riscv64 ]; then
+      OUT=riscv64-unknown-linux-gnu
+    fi
+  fi
+fi
+
+# Test and fix cpu on macos-aarch64, uname -p reports arm, buildsys expects aarch64
+echo $OUT | grep arm-apple-darwin > /dev/null 2> /dev/null
+if test $? != 0; then
+  # The GNU version of uname may be on the PATH which reports arm64 instead
+  echo $OUT | grep arm64-apple-darwin > /dev/null 2> /dev/null
+fi
+if test $? = 0; then
+  if [ `uname -m` = arm64 ]; then
+    OUT=aarch64`echo $OUT | sed -e 's/[^-]*//'`
+  fi
+fi
+
 # Test and fix cpu on Macosx when C preprocessor is not on the path
 echo $OUT | grep i386-apple-darwin > /dev/null 2> /dev/null
 if test $? = 0; then

make/autoconf/build-aux/config.sub

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2014, 2023, 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
@@ -29,16 +29,46 @@
 
 DIR=`dirname $0`
 
+if echo $* | grep linux-musl >/dev/null ; then
+    echo $*
+    exit
+fi
+
 # Allow wsl
 if echo $* | grep pc-wsl >/dev/null ; then
     echo $*
     exit
 fi
 
+# Allow msys2
+if echo $* | grep pc-msys >/dev/null ; then
+    echo $*
+    exit
+fi
+
+# Canonicalize for riscv which autoconf-config.sub doesn't handle
+if echo $* | grep '^riscv\(32\|64\)-linux' >/dev/null ; then
+    result=`echo $@ | sed 's/linux/unknown-linux/'`
+    echo $result
+    exit
+fi
+
+# Filter out everything that doesn't begin with "aarch64-"
+if ! echo $* | grep '^aarch64-' >/dev/null ; then
+    . $DIR/autoconf-config.sub "$@"
+    # autoconf-config.sub exits, so we never reach here, but just in
+    # case we do:
+    exit
+fi
+
 while test $# -gt 0 ; do
     case $1 in
         -- )   # Stop option processing
             shift; break ;;
+        aarch64-* )
+            config=`echo $1 | sed 's/^aarch64-/arm-/'`
+            sub_args="$sub_args $config"
+            shift; ;;
         - )    # Use stdin as input.
             sub_args="$sub_args $1"
             shift; break ;;
@@ -51,5 +81,7 @@ done
 result=`. $DIR/autoconf-config.sub $sub_args "$@"`
 exitcode=$?
 
+result=`echo $result | sed "s/^arm-/aarch64-/"`
+
 echo $result
 exit $exitcode

make/autoconf/build-performance.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -26,29 +26,39 @@
 AC_DEFUN([BPERF_CHECK_CORES],
 [
   AC_MSG_CHECKING([for number of cores])
+  NUM_CORES=1
+  FOUND_CORES=no
 
   if test -f /proc/cpuinfo; then
     # Looks like a Linux (or cygwin) system
-    NUM_CORES=`cat /proc/cpuinfo  | grep -cw processor`
+    NUM_CORES=`cat /proc/cpuinfo  | grep -c processor`
     if test "$NUM_CORES" -eq "0"; then
       NUM_CORES=`cat /proc/cpuinfo  | grep -c ^CPU`
     fi
+    if test "$NUM_CORES" -ne "0"; then
+      FOUND_CORES=yes
+    fi
   elif test -x /usr/sbin/sysctl; then
     # Looks like a MacOSX system
     NUM_CORES=`/usr/sbin/sysctl -n hw.ncpu`
+    FOUND_CORES=yes
   elif test "x$OPENJDK_BUILD_OS" = xaix ; then
-    NUM_CORES=`lparstat -m 2> /dev/null | $GREP -o "lcpu=[[0-9]]*" | $CUT -d "=" -f 2`
+    NUM_LCPU=`lparstat -m 2> /dev/null | $GREP -o "lcpu=[[0-9]]*" | $CUT -d "=" -f 2`
+    if test -n "$NUM_LCPU"; then
+      NUM_CORES=$NUM_LCPU
+      FOUND_CORES=yes
+    fi
   elif test -n "$NUMBER_OF_PROCESSORS"; then
     # On windows, look in the env
     NUM_CORES=$NUMBER_OF_PROCESSORS
+    FOUND_CORES=yes
   fi
 
-  if test "$NUM_CORES" -eq "0"; then
-    NUM_CORES=1
+  if test "x$FOUND_CORES" = xyes; then
+    AC_MSG_RESULT([$NUM_CORES])
+  else
     AC_MSG_RESULT([could not detect number of cores, defaulting to 1])
     AC_MSG_WARN([This will disable all parallelism from build!])
-  else
-    AC_MSG_RESULT([$NUM_CORES])
   fi
 ])
 
@@ -243,11 +253,8 @@ AC_DEFUN([BPERF_SETUP_CCACHE_USAGE],
       fi
     fi
 
-    # The CCACHE_BASEDIR needs to end with '/' as ccache will otherwise think
-    # directories next to it, that have the base dir name as a prefix, are sub
-    # directories of CCACHE_BASEDIR.
     CCACHE="CCACHE_COMPRESS=1 $SET_CCACHE_DIR \
-        CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS CCACHE_BASEDIR=$WORKSPACE_ROOT/ $CCACHE"
+        CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS CCACHE_BASEDIR=$TOPDIR $CCACHE"
 
     if test "x$SET_CCACHE_DIR" != x; then
       mkdir -p $CCACHE_DIR > /dev/null 2>&1

make/autoconf/buildjdk-spec.gmk.in

@@ -0,0 +1,105 @@
+#
+# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  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 spec file is used to compile a BUILD_JDK while cross compiling. The
+# BUILD_JDK runs on the build/host platform and is of the same version as
+# the main build.
+
+# First include the real base spec.gmk file
+include @SPEC@
+
+CC := @BUILD_CC@
+CXX := @BUILD_CXX@
+# Ideally this should be probed by configure but that is tricky to implement,
+# and this should work in most cases.
+CPP := @BUILD_CC@ -E
+LD := @BUILD_LD@
+LDCXX := @BUILD_LDCXX@
+AS := @BUILD_AS@
+NM := @BUILD_NM@
+AR := @BUILD_AR@
+OBJCOPY := @BUILD_OBJCOPY@
+STRIP := @BUILD_STRIP@
+SYSROOT_CFLAGS := @BUILD_SYSROOT_CFLAGS@
+SYSROOT_LDFLAGS := @BUILD_SYSROOT_LDFLAGS@
+
+# These directories should not be moved to BUILDJDK_OUTPUTDIR
+HOTSPOT_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(HOTSPOT_OUTPUTDIR))
+BUILDTOOLS_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(BUILDTOOLS_OUTPUTDIR))
+SUPPORT_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(SUPPORT_OUTPUTDIR))
+JDK_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(JDK_OUTPUTDIR))
+IMAGES_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(IMAGES_OUTPUTDIR))
+
+OPENJDK_BUILD_CPU_LEGACY := @OPENJDK_BUILD_CPU_LEGACY@
+OPENJDK_BUILD_CPU_LEGACY_LIB := @OPENJDK_BUILD_CPU_LEGACY_LIB@
+OPENJDK_BUILD_LIBC := @OPENJDK_BUILD_LIBC@
+OPENJDK_TARGET_CPU := @OPENJDK_BUILD_CPU@
+OPENJDK_TARGET_CPU_ARCH := @OPENJDK_BUILD_CPU_ARCH@
+OPENJDK_TARGET_CPU_BITS := @OPENJDK_BUILD_CPU_BITS@
+OPENJDK_TARGET_CPU_ENDIAN := @OPENJDK_BUILD_CPU_ENDIAN@
+OPENJDK_TARGET_CPU_LEGACY := @OPENJDK_BUILD_CPU_LEGACY@
+OPENJDK_TARGET_LIBC := @OPENJDK_BUILD_LIBC@
+OPENJDK_TARGET_OS_INCLUDE_SUBDIR := @OPENJDK_BUILD_OS_INCLUDE_SUBDIR@
+
+HOTSPOT_TARGET_OS := @HOTSPOT_BUILD_OS@
+HOTSPOT_TARGET_OS_TYPE := @HOTSPOT_BUILD_OS_TYPE@
+HOTSPOT_TARGET_CPU := @HOTSPOT_BUILD_CPU@
+HOTSPOT_TARGET_CPU_ARCH := @HOTSPOT_BUILD_CPU_ARCH@
+HOTSPOT_TARGET_CPU_DEFINE := @HOTSPOT_BUILD_CPU_DEFINE@
+HOTSPOT_TARGET_LIBC := @HOTSPOT_BUILD_LIBC@
+
+CFLAGS_JDKLIB := @OPENJDK_BUILD_CFLAGS_JDKLIB@
+CXXFLAGS_JDKLIB := @OPENJDK_BUILD_CXXFLAGS_JDKLIB@
+LDFLAGS_JDKLIB := @OPENJDK_BUILD_LDFLAGS_JDKLIB@
+CFLAGS_JDKEXE := @OPENJDK_BUILD_CFLAGS_JDKEXE@
+CXXFLAGS_JDKEXE := @OPENJDK_BUILD_CXXFLAGS_JDKEXE@
+LDFLAGS_JDKEXE := @OPENJDK_BUILD_LDFLAGS_JDKEXE@
+
+JVM_CFLAGS := @OPENJDK_BUILD_JVM_CFLAGS@
+JVM_LDFLAGS := @OPENJDK_BUILD_JVM_LDFLAGS@
+JVM_ASFLAGS := @OPENJDK_BUILD_JVM_ASFLAGS@
+JVM_LIBS := @OPENJDK_BUILD_JVM_LIBS@
+
+FDLIBM_CFLAGS := @OPENJDK_BUILD_FDLIBM_CFLAGS@
+
+INTERIM_LANGTOOLS_ARGS := $(subst $(OUTPUTDIR),$(BUILDJDK_OUTPUTDIR),$(INTERIM_LANGTOOLS_ARGS))
+
+# The compiler for the build platform is likely not warning compatible with the official
+# compiler.
+WARNINGS_AS_ERRORS := false
+DISABLE_WARNING_PREFIX := @BUILD_CC_DISABLE_WARNING_PREFIX@
+
+# Save speed and disk space by not enabling debug symbols for the buildjdk
+ENABLE_DEBUG_SYMBOLS := false
+
+JVM_VARIANTS := server
+JVM_VARIANT_MAIN := server
+JVM_FEATURES_server := cds compiler1 compiler2 g1gc serialgc
+
+# Some users still set EXTRA_*FLAGS on the make command line. Must
+# make sure to override that when building buildjdk.
+override EXTRA_CFLAGS :=
+override EXTRA_CXXFLAGS :=
+override EXTRA_LDFLAGS :=

make/autoconf/buildjdk-spec.gmk.template

@@ -1,109 +0,0 @@
-#
-# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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 spec file is used to compile a BUILD_JDK while cross compiling. The
-# BUILD_JDK runs on the build/host platform and is of the same version as
-# the main build.
-
-# First include the real base spec.gmk file
-include @SPEC@
-
-CC := @BUILD_CC@
-CXX := @BUILD_CXX@
-# Ideally this should be probed by configure but that is tricky to implement,
-# and this should work in most cases.
-CPP := @BUILD_CC@ -E
-LD := @BUILD_LD@
-LDCXX := @BUILD_LDCXX@
-AS := @BUILD_AS@
-NM := @BUILD_NM@
-AR := @BUILD_AR@
-OBJCOPY := @BUILD_OBJCOPY@
-STRIP := @BUILD_STRIP@
-SYSROOT_CFLAGS := @BUILD_SYSROOT_CFLAGS@
-SYSROOT_LDFLAGS := @BUILD_SYSROOT_LDFLAGS@
-
-# These directories should not be moved to BUILDJDK_OUTPUTDIR
-HOTSPOT_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(HOTSPOT_OUTPUTDIR))
-BUILDTOOLS_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(BUILDTOOLS_OUTPUTDIR))
-SUPPORT_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(SUPPORT_OUTPUTDIR))
-JDK_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(JDK_OUTPUTDIR))
-IMAGES_OUTPUTDIR := $(patsubst $(OUTPUTDIR)%,$(BUILDJDK_OUTPUTDIR)%,$(IMAGES_OUTPUTDIR))
-
-OPENJDK_BUILD_CPU_LEGACY := @OPENJDK_BUILD_CPU_LEGACY@
-OPENJDK_BUILD_CPU_LEGACY_LIB := @OPENJDK_BUILD_CPU_LEGACY_LIB@
-OPENJDK_BUILD_LIBC := @OPENJDK_BUILD_LIBC@
-OPENJDK_TARGET_CPU := @OPENJDK_BUILD_CPU@
-OPENJDK_TARGET_CPU_ARCH := @OPENJDK_BUILD_CPU_ARCH@
-OPENJDK_TARGET_CPU_BITS := @OPENJDK_BUILD_CPU_BITS@
-OPENJDK_TARGET_CPU_ENDIAN := @OPENJDK_BUILD_CPU_ENDIAN@
-OPENJDK_TARGET_CPU_LEGACY := @OPENJDK_BUILD_CPU_LEGACY@
-OPENJDK_TARGET_LIBC := @OPENJDK_BUILD_LIBC@
-OPENJDK_TARGET_OS_INCLUDE_SUBDIR := @OPENJDK_BUILD_OS_INCLUDE_SUBDIR@
-
-HOTSPOT_TARGET_OS := @HOTSPOT_BUILD_OS@
-HOTSPOT_TARGET_OS_TYPE := @HOTSPOT_BUILD_OS_TYPE@
-HOTSPOT_TARGET_CPU := @HOTSPOT_BUILD_CPU@
-HOTSPOT_TARGET_CPU_ARCH := @HOTSPOT_BUILD_CPU_ARCH@
-HOTSPOT_TARGET_CPU_DEFINE := @HOTSPOT_BUILD_CPU_DEFINE@
-HOTSPOT_TARGET_LIBC := @HOTSPOT_BUILD_LIBC@
-
-CFLAGS_JDKLIB := @OPENJDK_BUILD_CFLAGS_JDKLIB@
-CXXFLAGS_JDKLIB := @OPENJDK_BUILD_CXXFLAGS_JDKLIB@
-LDFLAGS_JDKLIB := @OPENJDK_BUILD_LDFLAGS_JDKLIB@
-CFLAGS_JDKEXE := @OPENJDK_BUILD_CFLAGS_JDKEXE@
-CXXFLAGS_JDKEXE := @OPENJDK_BUILD_CXXFLAGS_JDKEXE@
-LDFLAGS_JDKEXE := @OPENJDK_BUILD_LDFLAGS_JDKEXE@
-
-JVM_CFLAGS := @OPENJDK_BUILD_JVM_CFLAGS@
-JVM_LDFLAGS := @OPENJDK_BUILD_JVM_LDFLAGS@
-JVM_ASFLAGS := @OPENJDK_BUILD_JVM_ASFLAGS@
-JVM_LIBS := @OPENJDK_BUILD_JVM_LIBS@
-
-FDLIBM_CFLAGS := @OPENJDK_BUILD_FDLIBM_CFLAGS@
-
-INTERIM_LANGTOOLS_ARGS := $(subst $(OUTPUTDIR),$(BUILDJDK_OUTPUTDIR),$(INTERIM_LANGTOOLS_ARGS))
-
-# The compiler for the build platform is likely not warning compatible with the official
-# compiler.
-WARNINGS_AS_ERRORS := false
-DISABLE_WARNING_PREFIX := @BUILD_CC_DISABLE_WARNING_PREFIX@
-
-# Save speed and disk space by not enabling debug symbols for the buildjdk
-ENABLE_DEBUG_SYMBOLS := false
-
-JVM_VARIANTS := server
-JVM_VARIANT_MAIN := server
-JVM_FEATURES_server := cds compiler1 compiler2 g1gc serialgc
-
-# Some users still set EXTRA_*FLAGS on the make command line. Must
-# make sure to override that when building buildjdk.
-override EXTRA_CFLAGS :=
-override EXTRA_CXXFLAGS :=
-override EXTRA_LDFLAGS :=
-
-# hsdis is not needed
-HSDIS_BACKEND := none
-ENABLE_HSDIS_BUNDLING := false

make/autoconf/configure

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
@@ -39,12 +39,6 @@ if test "x$BASH" = x; then
   echo "Error: This script must be run using bash." 1>&2
   exit 1
 fi
-
-if [[ "$TOPDIR" =~ .*[[:space:]]+.* ]]; then
-  echo "Error: Build path containing space character is not supported" 1>&2
-  exit 1
-fi
-
 # Force autoconf to use bash. This also means we must disable autoconf re-exec.
 export CONFIG_SHELL=$BASH
 export _as_can_reexec=no

make/autoconf/configure.ac

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -86,8 +86,6 @@ PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET
 
 # Continue setting up basic stuff. Most remaining code require fundamental tools.
 BASIC_SETUP_PATHS
-BASIC_SETUP_TOOLS
-BASIC_SETUP_BUILD_ENV
 
 # Check if it's a pure open build or if custom sources are to be used.
 JDKOPT_SETUP_OPEN_OR_CUSTOM
@@ -217,16 +215,6 @@ JDKOPT_SETUP_CODE_COVERAGE
 # AddressSanitizer
 JDKOPT_SETUP_ADDRESS_SANITIZER
 
-# UndefinedBehaviorSanitizer
-JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER
-
-# LeakSanitizer
-JDKOPT_SETUP_LEAK_SANITIZER
-
-# Fallback linker
-# This needs to go before 'LIB_DETERMINE_DEPENDENCIES'
-JDKOPT_SETUP_FALLBACK_LINKER
-
 ###############################################################################
 #
 # Check dependencies for external and internal libraries.
@@ -254,7 +242,6 @@ HOTSPOT_SETUP_MISC
 ###############################################################################
 
 LIB_TESTS_ENABLE_DISABLE_FAILURE_HANDLER
-LIB_TESTS_ENABLE_DISABLE_JTREG_TEST_THREAD_FACTORY
 
 JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST
 JDKOPT_EXCLUDE_TRANSLATIONS

make/autoconf/flags-cflags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -51,14 +51,6 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
       SET_SHARED_LIBRARY_NAME='-Wl,-install_name,@rpath/[$]1'
       SET_SHARED_LIBRARY_MAPFILE='-Wl,-exported_symbols_list,[$]1'
 
-    elif test "x$OPENJDK_TARGET_OS" = xaix; then
-      # Linking is different on aix
-      SHARED_LIBRARY_FLAGS="-shared -Wl,-bM:SRE -Wl,-bnoentry"
-      SET_EXECUTABLE_ORIGIN=""
-      SET_SHARED_LIBRARY_ORIGIN=''
-      SET_SHARED_LIBRARY_NAME=''
-      SET_SHARED_LIBRARY_MAPFILE=''
-
     else
       # Default works for linux, might work on other platforms as well.
       SHARED_LIBRARY_FLAGS='-shared'
@@ -136,12 +128,7 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
       )
     fi
 
-    # -gdwarf-4 and -gdwarf-aranges were introduced in clang 5.0
-    GDWARF_FLAGS="-gdwarf-4 -gdwarf-aranges"
-    FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${GDWARF_FLAGS}],
-        IF_FALSE: [GDWARF_FLAGS=""])
-
-    CFLAGS_DEBUG_SYMBOLS="-g ${GDWARF_FLAGS}"
+    CFLAGS_DEBUG_SYMBOLS="-g"
     ASFLAGS_DEBUG_SYMBOLS="-g"
   elif test "x$TOOLCHAIN_TYPE" = xxlc; then
     CFLAGS_DEBUG_SYMBOLS="-g1"
@@ -197,10 +184,6 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       WARNINGS_ENABLE_ALL_CXXFLAGS="$WARNINGS_ENABLE_ALL_CFLAGS $WARNINGS_ENABLE_ADDITIONAL_CXX"
 
       DISABLED_WARNINGS="unused-parameter unused"
-      # gcc10/11 on ppc generate lots of abi warnings about layout of aggregates containing vectors
-      if test "x$OPENJDK_TARGET_CPU_ARCH" = "xppc"; then
-        DISABLED_WARNINGS="$DISABLED_WARNINGS psabi"
-      fi
       ;;
 
     clang)
@@ -214,6 +197,7 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       WARNINGS_ENABLE_ALL="-Wall -Wextra -Wformat=2 $WARNINGS_ENABLE_ADDITIONAL"
 
       DISABLED_WARNINGS="unknown-warning-option unused-parameter unused"
+
       ;;
 
     xlc)
@@ -291,15 +275,9 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
       C_O_FLAG_NONE="${C_O_FLAG_NONE} ${DISABLE_FORTIFY_CFLAGS}"
     fi
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
-    if test "x$OPENJDK_TARGET_OS" = xaix; then
-      C_O_FLAG_HIGHEST_JVM="-O3 -finline-functions"
-      C_O_FLAG_HIGHEST="-O3 -finline-functions"
-      C_O_FLAG_HI="-O3 -finline-functions"
-    else
-      C_O_FLAG_HIGHEST_JVM="-O3"
-      C_O_FLAG_HIGHEST="-O3"
-      C_O_FLAG_HI="-O3"
-    fi
+    C_O_FLAG_HIGHEST_JVM="-O3"
+    C_O_FLAG_HIGHEST="-O3"
+    C_O_FLAG_HI="-O3"
     C_O_FLAG_NORM="-O2"
     C_O_FLAG_DEBUG_JVM="-O0"
     C_O_FLAG_SIZE="-Os"
@@ -471,9 +449,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
       # so for debug we build with '-qpic=large -bbigtoc'.
       DEBUG_CFLAGS_JVM="-qpic=large"
     fi
-    if test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
-      DEBUG_CFLAGS_JVM="-fpic -mcmodel=large"
-    fi
   fi
 
   if test "x$DEBUG_LEVEL" != xrelease; then
@@ -496,7 +471,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     ALWAYS_DEFINES_JDK="-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602 \
         -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DWIN32 -DIAL"
     ALWAYS_DEFINES_JVM="-DNOMINMAX -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0602 \
-        -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE"
+        -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE \
+        -D_WINSOCK_DEPRECATED_NO_WARNINGS"
   fi
 
   ###############################################################################
@@ -509,20 +485,14 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
         -fvisibility=hidden -fno-strict-aliasing -fno-omit-frame-pointer"
   fi
 
-  if test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
-    # clang compiler on aix needs -ffunction-sections
-    TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -ffunction-sections -ftls-model -fno-math-errno -fstack-protector"
-    TOOLCHAIN_CFLAGS_JDK="-ffunction-sections -fsigned-char -fstack-protector"
-  fi
-
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -fstack-protector"
+    TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -fcheck-new -fstack-protector"
     TOOLCHAIN_CFLAGS_JDK="-pipe -fstack-protector"
     # reduce lib size on linux in link step, this needs also special compile flags
     # do this on s390x also for libjvm (where serviceability agent is not supported)
     if test "x$ENABLE_LINKTIME_GC" = xtrue; then
       TOOLCHAIN_CFLAGS_JDK="$TOOLCHAIN_CFLAGS_JDK -ffunction-sections -fdata-sections"
-      if test "x$OPENJDK_TARGET_CPU" = xs390x && test "x$DEBUG_LEVEL" == xrelease; then
+      if test "x$OPENJDK_TARGET_CPU" = xs390x; then
         TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -ffunction-sections -fdata-sections"
       fi
     fi
@@ -557,13 +527,11 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     # Suggested additions: -qsrcmsg to get improved error reporting
     # set -qtbtable=full for a better traceback table/better stacks in hs_err when xlc16 is used
     TOOLCHAIN_CFLAGS_JDK="-qtbtable=full -qchars=signed -qfullpath -qsaveopt -qstackprotect"  # add on both CFLAGS
-    TOOLCHAIN_CFLAGS_JVM="-qtbtable=full -qtune=balanced -fno-exceptions \
+    TOOLCHAIN_CFLAGS_JVM="-qtbtable=full -qtune=balanced \
         -qalias=noansi -qstrict -qtls=default -qnortti -qnoeh -qignerrno -qstackprotect"
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    # The -utf-8 option sets source and execution character sets to UTF-8 to enable correct
-    # compilation of all source files regardless of the active code page on Windows.
-    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:strictStrings -Zc:inline -permissive- -utf-8 -MP"
-    TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:strictStrings -Zc:inline -utf-8 -Zc:wchar_t-"
+    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:strictStrings -MP"
+    TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:strictStrings -Zc:wchar_t-"
   fi
 
   # CFLAGS C language level for JDK sources (hotspot only uses C++)
@@ -625,9 +593,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
     PICFLAG="-fPIC"
     PIEFLAG="-fPIE"
-  elif test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
-    JVM_PICFLAG="-fpic -mcmodel=large -Wl,-bbigtoc
-    JDK_PICFLAG="-fpic
   elif test "x$TOOLCHAIN_TYPE" = xxlc; then
     # '-qpic' defaults to 'qpic=small'. This means that the compiler generates only
     # one instruction for accessing the TOC. If the TOC grows larger than 64K, the linker
@@ -664,7 +629,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   STATIC_LIBS_CFLAGS="-DSTATIC_BUILD=1"
   if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
     STATIC_LIBS_CFLAGS="$STATIC_LIBS_CFLAGS -ffunction-sections -fdata-sections \
-      -DJNIEXPORT='__attribute__((visibility(\"default\")))'"
+      -DJNIEXPORT='__attribute__((visibility(\"hidden\")))'"
   else
     STATIC_LIBS_CFLAGS="$STATIC_LIBS_CFLAGS -DJNIEXPORT="
   fi
@@ -773,9 +738,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
         $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer"
       fi
     fi
-    if test "x$OPENJDK_TARGET_OS" = xaix; then
-      $1_CFLAGS_CPU="-mcpu=pwr8"
-    fi
 
   elif test "x$TOOLCHAIN_TYPE" = xxlc; then
     if test "x$FLAGS_CPU" = xppc64; then
@@ -799,6 +761,15 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
     $1_TOOLCHAIN_CFLAGS="${$1_GCC6_CFLAGS}"
 
     $1_WARNING_CFLAGS_JVM="-Wno-format-zero-length -Wtype-limits -Wuninitialized"
+  elif test "x$TOOLCHAIN_TYPE" = xclang; then
+    NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks"
+    FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_DELETE_NULL_POINTER_CHECKS_CFLAG],
+        PREFIX: $3,
+        IF_FALSE: [
+            NO_DELETE_NULL_POINTER_CHECKS_CFLAG=
+        ]
+    )
+    $1_TOOLCHAIN_CFLAGS="${NO_DELETE_NULL_POINTER_CHECKS_CFLAG}"
   fi
 
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
@@ -809,7 +780,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
             REPRODUCIBLE_CFLAGS=
         ]
     )
-    AC_SUBST(REPRODUCIBLE_CFLAGS)
   fi
 
   # Prevent the __FILE__ macro from generating absolute paths into the built
@@ -843,22 +813,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
               FILE_MACRO_CFLAGS=
           ]
       )
-      if test "x$FILE_MACRO_CFLAGS" != x; then
-        # Add -pathmap for all VS system include paths using Windows
-        # full Long path name that is generated by the compiler
-        # Not enabled under WSL as there is no easy way to obtain the
-        # Windows full long paths, thus reproducible WSL builds will
-        # depend on building with the same VS toolchain install location.
-        if test "x$OPENJDK_BUILD_OS_ENV" != "xwindows.wsl1" && test "x$OPENJDK_BUILD_OS_ENV" != "xwindows.wsl2"; then
-          for ipath in ${$3SYSROOT_CFLAGS}; do
-              if test "x${ipath:0:2}" == "x-I"; then
-                  ipath_path=${ipath#"-I"}
-                  UTIL_FIXUP_WIN_LONG_PATH(ipath_path)
-                  FILE_MACRO_CFLAGS="$FILE_MACRO_CFLAGS -pathmap:\"$ipath_path\"=vsi"
-              fi
-          done
-        fi
-      fi
     fi
 
     AC_MSG_CHECKING([how to prevent absolute paths in output])
@@ -936,12 +890,17 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
 # $2 - Prefix for compiler variables (either BUILD_ or nothing).
 AC_DEFUN([FLAGS_SETUP_GCC6_COMPILER_FLAGS],
 [
-  # This flag is required for GCC 6 builds as undefined behavior in OpenJDK code
-  # runs afoul of the more aggressive versions of this optimization.
+  # These flags are required for GCC 6 builds as undefined behavior in OpenJDK code
+  # runs afoul of the more aggressive versions of these optimizations.
+  # Notably, value range propagation now assumes that the this pointer of C++
+  # member functions is non-null.
+  NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks"
+  FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_DELETE_NULL_POINTER_CHECKS_CFLAG],
+      PREFIX: $2, IF_FALSE: [NO_DELETE_NULL_POINTER_CHECKS_CFLAG=""])
   NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse"
   FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_LIFETIME_DSE_CFLAG],
       PREFIX: $2, IF_FALSE: [NO_LIFETIME_DSE_CFLAG=""])
-  $1_GCC6_CFLAGS="${NO_LIFETIME_DSE_CFLAG}"
+  $1_GCC6_CFLAGS="${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
 ])
 
 AC_DEFUN_ONCE([FLAGS_SETUP_BRANCH_PROTECTION],

make/autoconf/flags-ldflags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -60,8 +60,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     # Add -z,defs, to forbid undefined symbols in object files.
     # add -z,relro (mark relocations read only) for all libs
     # add -z,now ("full relro" - more of the Global Offset Table GOT is marked read only)
-    # add --no-as-needed to disable default --as-needed link flag on some GCC toolchains
-    BASIC_LDFLAGS="-Wl,-z,defs -Wl,-z,relro -Wl,-z,now -Wl,--no-as-needed"
+    BASIC_LDFLAGS="-Wl,-z,defs -Wl,-z,relro -Wl,-z,now"
     # Linux : remove unused code+data in link step
     if test "x$ENABLE_LINKTIME_GC" = xtrue; then
       if test "x$OPENJDK_TARGET_CPU" = xs390x; then
@@ -71,21 +70,12 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
       fi
     fi
 
-    BASIC_LDFLAGS_JVM_ONLY=""
-
-    LDFLAGS_CXX_PARTIAL_LINKING="$MACHINE_FLAG -r"
+    BASIC_LDFLAGS_JVM_ONLY="-Wl,-O1"
 
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     BASIC_LDFLAGS_JVM_ONLY="-mno-omit-leaf-frame-pointer -mstack-alignment=16 \
         -fPIC"
 
-    LDFLAGS_CXX_PARTIAL_LINKING="$MACHINE_FLAG -r"
-
-    if test "x$OPENJDK_TARGET_OS" = xaix; then
-      BASIC_LDFLAGS="-Wl,-b64 -Wl,-brtl -Wl,-bnorwexec -Wl,-bnolibpath -Wl,-bnoexpall \
-        -Wl,-bernotok -Wl,-bdatapsize:64k -Wl,-btextpsize:64k -Wl,-bstackpsize:64k"
-      BASIC_LDFLAGS_JVM_ONLY="$BASIC_LDFLAGS_JVM_ONLY -Wl,-lC_r -Wl,-bbigtoc"
-    fi
   elif test "x$TOOLCHAIN_TYPE" = xxlc; then
     BASIC_LDFLAGS="-b64 -brtl -bnorwexec -bnolibpath -bnoexpall -bernotok -btextpsize:64K \
         -bdatapsize:64K -bstackpsize:64K"
@@ -98,8 +88,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     BASIC_LDFLAGS_JVM_ONLY="-opt:icf,8 -subsystem:windows"
   fi
 
-  if (test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang) \
-      && test "x$OPENJDK_TARGET_OS" != xaix; then
+  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
     if test -n "$HAS_NOEXECSTACK"; then
       BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,-z,noexecstack"
     fi
@@ -127,14 +116,6 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     if test "x$DEBUG_LEVEL" != xrelease; then
       DEBUGLEVEL_LDFLAGS_JVM_ONLY="$DEBUGLEVEL_LDFLAGS_JVM_ONLY -bbigtoc"
     fi
-
-  elif test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
-    # We need '-fpic' or '-fpic -mcmodel=large -Wl,-bbigtoc' if the TOC overflows.
-    # Hotspot now overflows its 64K TOC (currently only for debug),
-    # so we build with '-fpic -mcmodel=large -Wl,-bbigtoc'.
-    if test "x$DEBUG_LEVEL" != xrelease; then
-      DEBUGLEVEL_LDFLAGS_JVM_ONLY="$DEBUGLEVEL_LDFLAGS_JVM_ONLY -Wl,-bbigtoc"
-    fi
   fi
 
   # Setup LDFLAGS for linking executables
@@ -167,7 +148,6 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
   # Export some intermediate variables for compatibility
   LDFLAGS_CXX_JDK="$BASIC_LDFLAGS_ONLYCXX $BASIC_LDFLAGS_ONLYCXX_JDK_ONLY $DEBUGLEVEL_LDFLAGS_JDK_ONLY"
   AC_SUBST(LDFLAGS_CXX_JDK)
-  AC_SUBST(LDFLAGS_CXX_PARTIAL_LINKING)
 ])
 
 ################################################################################

make/autoconf/flags-other.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -46,31 +46,15 @@ AC_DEFUN([FLAGS_SETUP_ARFLAGS],
 AC_DEFUN([FLAGS_SETUP_STRIPFLAGS],
 [
   ## Setup strip.
-  if test "x$STRIP" != x; then
-    AC_MSG_CHECKING([how to run strip])
-
-    # Easy cheat: Check strip variant by passing --version as an argument.
-    # Different types of strip have varying command line syntaxes for querying their
-    # version string, and all noisily fail if the provided version option is not
-    # recognised.
-    #
-    # The actual version string or failure to execute strip are hidden by redirection
-    # to config.log with 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD
-
-    if $STRIP "--version" 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD; then
-      # strip that comes from the GNU family uses --version
-      # This variant of strip is usually found accompanying gcc and clang
-      STRIPFLAGS="--strip-debug"
-    elif $STRIP "-V" 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD; then
-      # IBM strip that works with AIX binaries only supports -V
-      STRIPFLAGS="-X32_64"
-    else
-      # The only strip variant left is MacOS/Xcode strip, which does not have any
-      # way whatsoever to be identified (lacking even basic help or version options),
-      # so we leave it as the last fallback when all other tests have failed.
-      STRIPFLAGS="-S"
-    fi
-    AC_MSG_RESULT($STRIPFLAGS)
+  # FIXME: should this really be per platform, or should it be per toolchain type?
+  # strip is not provided by clang; so guessing platform makes most sense.
+  # FIXME: we should really only export STRIPFLAGS from here, not POST_STRIP_CMD.
+  if test "x$OPENJDK_TARGET_OS" = xlinux; then
+    STRIPFLAGS="-g"
+  elif test "x$OPENJDK_TARGET_OS" = xmacosx; then
+    STRIPFLAGS="-S"
+  elif test "x$OPENJDK_TARGET_OS" = xaix; then
+    STRIPFLAGS="-X32_64"
   fi
 
   AC_SUBST(STRIPFLAGS)
@@ -88,16 +72,6 @@ AC_DEFUN([FLAGS_SETUP_RCFLAGS],
   AC_SUBST(RCFLAGS)
 ])
 
-AC_DEFUN([FLAGS_SETUP_NMFLAGS],
-[
-  # On AIX, we need to set NM flag -X64 for processing 64bit object files
-  if test "x$OPENJDK_TARGET_OS" = xaix; then
-    NMFLAGS="-X64"
-  fi
-
-  AC_SUBST(NMFLAGS)
-])
-
 ################################################################################
 # platform independent
 AC_DEFUN([FLAGS_SETUP_ASFLAGS],
@@ -143,3 +117,4 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS_CPU_DEP],
 
   AC_SUBST($2JVM_ASFLAGS)
 ])
+

make/autoconf/flags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -128,12 +128,16 @@ AC_DEFUN([FLAGS_SETUP_MACOSX_VERSION],
     # The expected format for <version> is either nn.n.n or nn.nn.nn. See
     # /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/AvailabilityVersions.h
 
-    # MACOSX_VERSION_MIN specifies the lowest version of macOS that the built
+    # MACOSX_VERSION_MIN specifies the lowest version of Macosx that the built
     # binaries should be compatible with, even if compiled on a newer version
     # of the OS. It currently has a hard coded value. Setting this also limits
     # exposure to API changes in header files. Bumping this is likely to
     # require code changes to build.
-    MACOSX_VERSION_MIN=11.00.00
+    if test "x$OPENJDK_TARGET_CPU_ARCH" = xaarch64; then
+      MACOSX_VERSION_MIN=11.00.00
+    else
+      MACOSX_VERSION_MIN=10.12.0
+    fi
     MACOSX_VERSION_MIN_NODOTS=${MACOSX_VERSION_MIN//\./}
 
     AC_SUBST(MACOSX_VERSION_MIN)
@@ -297,7 +301,6 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
   EXTRA_LDFLAGS="$MACHINE_FLAG $USER_LDFLAGS"
   EXTRA_ASFLAGS="$USER_ASFLAGS"
 
-  AC_SUBST(MACHINE_FLAG)
   AC_SUBST(EXTRA_CFLAGS)
   AC_SUBST(EXTRA_CXXFLAGS)
   AC_SUBST(EXTRA_LDFLAGS)
@@ -339,7 +342,6 @@ AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL],
       AC_MSG_CHECKING([if @file is supported by gcc])
       # Extra empty "" to prevent ECHO from interpreting '--version' as argument
       $ECHO "" "--version" > command.file
-      # Redirect stderr and stdout to config.log (AS_MESSAGE_LOG_FD) via merge
       if $CXX @command.file 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD; then
         AC_MSG_RESULT(yes)
         COMPILER_COMMAND_FILE_FLAG="@"
@@ -425,7 +427,6 @@ AC_DEFUN([FLAGS_SETUP_FLAGS],
   FLAGS_SETUP_ARFLAGS
   FLAGS_SETUP_STRIPFLAGS
   FLAGS_SETUP_RCFLAGS
-  FLAGS_SETUP_NMFLAGS
 
   FLAGS_SETUP_ASFLAGS
   FLAGS_SETUP_ASFLAGS_CPU_DEP([TARGET])
@@ -501,14 +502,14 @@ UTIL_DEFUN_NAMED([FLAGS_CXX_COMPILER_CHECK_ARGUMENTS],
 UTIL_DEFUN_NAMED([FLAGS_COMPILER_CHECK_ARGUMENTS],
     [*ARGUMENT IF_TRUE IF_FALSE PREFIX], [$@],
 [
-  FLAGS_C_COMPILER_CHECK_ARGUMENTS(ARGUMENT: ARG_ARGUMENT,
+  FLAGS_C_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARG_ARGUMENT],
       IF_TRUE: [C_COMP_SUPPORTS="yes"],
       IF_FALSE: [C_COMP_SUPPORTS="no"],
-      PREFIX: ARG_PREFIX)
-  FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: ARG_ARGUMENT,
+      PREFIX: [ARG_PREFIX])
+  FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARG_ARGUMENT],
       IF_TRUE: [CXX_COMP_SUPPORTS="yes"],
       IF_FALSE: [CXX_COMP_SUPPORTS="no"],
-      PREFIX: ARG_PREFIX)
+      PREFIX: [ARG_PREFIX])
 
   AC_MSG_CHECKING([if both ARG_PREFIX[CC] and ARG_PREFIX[CXX] support "ARG_ARGUMENT"])
   supports=no

make/autoconf/help.m4

@@ -278,11 +278,6 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
     printf "using default settings.\n"
   fi
 
-  if test "x$REAL_CONFIGURE_COMMAND_EXEC_FULL" != x; then
-    printf "\n"
-    printf "The original configure invocation was '$REAL_CONFIGURE_COMMAND_EXEC_SHORT $REAL_CONFIGURE_COMMAND_LINE'.\n"
-  fi
-
   printf "\n"
   printf "Configuration summary:\n"
   printf "* Name:           $CONF_NAME\n"

make/autoconf/jdk-options.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -410,13 +410,12 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_CODE_COVERAGE],
 #
 AC_DEFUN_ONCE([JDKOPT_SETUP_ADDRESS_SANITIZER],
 [
-  UTIL_ARG_ENABLE(NAME: asan, DEFAULT: false, RESULT: ASAN_ENABLED,
+  UTIL_ARG_ENABLE(NAME: asan, DEFAULT: false,
       DESC: [enable AddressSanitizer],
       CHECK_AVAILABLE: [
         AC_MSG_CHECKING([if AddressSanitizer (asan) is available])
         if test "x$TOOLCHAIN_TYPE" = "xgcc" ||
-           test "x$TOOLCHAIN_TYPE" = "xclang" ||
-           test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
+            test "x$TOOLCHAIN_TYPE" = "xclang"; then
           AC_MSG_RESULT([yes])
         else
           AC_MSG_RESULT([no])
@@ -424,20 +423,11 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_ADDRESS_SANITIZER],
         fi
       ],
       IF_ENABLED: [
-        if test "x$TOOLCHAIN_TYPE" = "xgcc" ||
-           test "x$TOOLCHAIN_TYPE" = "xclang"; then
-          # ASan is simply incompatible with gcc -Wstringop-truncation. See
-          # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85650
-          # It's harmless to be suppressed in clang as well.
-          ASAN_CFLAGS="-fsanitize=address -Wno-stringop-truncation -fno-omit-frame-pointer -fno-common -DADDRESS_SANITIZER"
-          ASAN_LDFLAGS="-fsanitize=address"
-        elif test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
-          # -Oy- is equivalent to -fno-omit-frame-pointer in GCC/Clang.
-          ASAN_CFLAGS="-fsanitize=address -Oy- -DADDRESS_SANITIZER"
-          # MSVC produces a warning if you pass -fsanitize=address to the linker. It also complains
-          $ if -DEBUG is not passed to the linker when building with ASan.
-          ASAN_LDFLAGS="-debug"
-        fi
+        # ASan is simply incompatible with gcc -Wstringop-truncation. See
+        # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85650
+        # It's harmless to be suppressed in clang as well.
+        ASAN_CFLAGS="-fsanitize=address -Wno-stringop-truncation -fno-omit-frame-pointer"
+        ASAN_LDFLAGS="-fsanitize=address"
         JVM_CFLAGS="$JVM_CFLAGS $ASAN_CFLAGS"
         JVM_LDFLAGS="$JVM_LDFLAGS $ASAN_LDFLAGS"
         CFLAGS_JDKLIB="$CFLAGS_JDKLIB $ASAN_CFLAGS"
@@ -446,85 +436,15 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_ADDRESS_SANITIZER],
         CXXFLAGS_JDKEXE="$CXXFLAGS_JDKEXE $ASAN_CFLAGS"
         LDFLAGS_JDKLIB="$LDFLAGS_JDKLIB $ASAN_LDFLAGS"
         LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE $ASAN_LDFLAGS"
+        ASAN_ENABLED="yes"
+      ],
+      IF_DISABLED: [
+        ASAN_ENABLED="no"
       ])
+
   AC_SUBST(ASAN_ENABLED)
 ])
 
-###############################################################################
-#
-# LeakSanitizer
-#
-AC_DEFUN_ONCE([JDKOPT_SETUP_LEAK_SANITIZER],
-[
-  UTIL_ARG_ENABLE(NAME: lsan, DEFAULT: false, RESULT: LSAN_ENABLED,
-      DESC: [enable LeakSanitizer],
-      CHECK_AVAILABLE: [
-        AC_MSG_CHECKING([if LeakSanitizer (lsan) is available])
-        if test "x$TOOLCHAIN_TYPE" = "xgcc" ||
-            test "x$TOOLCHAIN_TYPE" = "xclang"; then
-          AC_MSG_RESULT([yes])
-        else
-          AC_MSG_RESULT([no])
-          AVAILABLE=false
-        fi
-      ],
-      IF_ENABLED: [
-        LSAN_CFLAGS="-fsanitize=leak -fno-omit-frame-pointer -DLEAK_SANITIZER"
-        LSAN_LDFLAGS="-fsanitize=leak"
-        JVM_CFLAGS="$JVM_CFLAGS $LSAN_CFLAGS"
-        JVM_LDFLAGS="$JVM_LDFLAGS $LSAN_LDFLAGS"
-        CFLAGS_JDKLIB="$CFLAGS_JDKLIB $LSAN_CFLAGS"
-        CFLAGS_JDKEXE="$CFLAGS_JDKEXE $LSAN_CFLAGS"
-        CXXFLAGS_JDKLIB="$CXXFLAGS_JDKLIB $LSAN_CFLAGS"
-        CXXFLAGS_JDKEXE="$CXXFLAGS_JDKEXE $LSAN_CFLAGS"
-        LDFLAGS_JDKLIB="$LDFLAGS_JDKLIB $LSAN_LDFLAGS"
-        LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE $LSAN_LDFLAGS"
-      ])
-  AC_SUBST(LSAN_ENABLED)
-])
-
-###############################################################################
-#
-# UndefinedBehaviorSanitizer
-#
-AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER],
-[
-  # GCC reports lots of likely false positives for stringop-truncation and format-overflow.
-  # Silence them for now.
-  UBSAN_CHECKS="-fsanitize=undefined -fsanitize=float-divide-by-zero -fno-sanitize=shift-base"
-  UBSAN_CFLAGS="$UBSAN_CHECKS -Wno-stringop-truncation -Wno-format-overflow -fno-omit-frame-pointer -DUNDEFINED_BEHAVIOR_SANITIZER"
-  UBSAN_LDFLAGS="$UBSAN_CHECKS"
-  UTIL_ARG_ENABLE(NAME: ubsan, DEFAULT: false, RESULT: UBSAN_ENABLED,
-      DESC: [enable UndefinedBehaviorSanitizer],
-      CHECK_AVAILABLE: [
-        AC_MSG_CHECKING([if UndefinedBehaviorSanitizer (ubsan) is available])
-        if test "x$TOOLCHAIN_TYPE" = "xgcc" ||
-            test "x$TOOLCHAIN_TYPE" = "xclang"; then
-          AC_MSG_RESULT([yes])
-        else
-          AC_MSG_RESULT([no])
-          AVAILABLE=false
-        fi
-      ],
-      IF_ENABLED: [
-        JVM_CFLAGS="$JVM_CFLAGS $UBSAN_CFLAGS"
-        JVM_LDFLAGS="$JVM_LDFLAGS $UBSAN_LDFLAGS"
-        CFLAGS_JDKLIB="$CFLAGS_JDKLIB $UBSAN_CFLAGS"
-        CFLAGS_JDKEXE="$CFLAGS_JDKEXE $UBSAN_CFLAGS"
-        CXXFLAGS_JDKLIB="$CXXFLAGS_JDKLIB $UBSAN_CFLAGS"
-        CXXFLAGS_JDKEXE="$CXXFLAGS_JDKEXE $UBSAN_CFLAGS"
-        LDFLAGS_JDKLIB="$LDFLAGS_JDKLIB $UBSAN_LDFLAGS"
-        LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE $UBSAN_LDFLAGS"
-      ])
-  if test "x$UBSAN_ENABLED" = xfalse; then
-    UBSAN_CFLAGS=""
-    UBSAN_LDFLAGS=""
-  fi
-  AC_SUBST(UBSAN_CFLAGS)
-  AC_SUBST(UBSAN_LDFLAGS)
-  AC_SUBST(UBSAN_ENABLED)
-])
-
 ################################################################################
 #
 # Static build support.  When enabled will generate static
@@ -822,10 +742,7 @@ AC_DEFUN([JDKOPT_CHECK_CODESIGN_PARAMS],
   $RM "$CODESIGN_TESTFILE"
   $TOUCH "$CODESIGN_TESTFILE"
   CODESIGN_SUCCESS=false
-
-  $ECHO "check codesign, calling $CODESIGN $PARAMS $CODESIGN_TESTFILE" >&AS_MESSAGE_LOG_FD
-
-  eval \"$CODESIGN\" $PARAMS \"$CODESIGN_TESTFILE\" 2>&AS_MESSAGE_LOG_FD \
+  $CODESIGN $PARAMS "$CODESIGN_TESTFILE" 2>&AS_MESSAGE_LOG_FD \
       >&AS_MESSAGE_LOG_FD && CODESIGN_SUCCESS=true
   $RM "$CODESIGN_TESTFILE"
   AC_MSG_CHECKING([$MESSAGE])
@@ -838,7 +755,7 @@ AC_DEFUN([JDKOPT_CHECK_CODESIGN_PARAMS],
 
 AC_DEFUN([JDKOPT_CHECK_CODESIGN_HARDENED],
 [
-  JDKOPT_CHECK_CODESIGN_PARAMS([-s \"$MACOSX_CODESIGN_IDENTITY\" --option runtime],
+  JDKOPT_CHECK_CODESIGN_PARAMS([-s "$MACOSX_CODESIGN_IDENTITY" --option runtime],
       [if codesign with hardened runtime is possible])
 ])
 
@@ -864,7 +781,7 @@ AC_DEFUN([JDKOPT_SETUP_MACOSX_SIGNING],
 
       # Check for user provided code signing identity.
       UTIL_ARG_WITH(NAME: macosx-codesign-identity, TYPE: string,
-          DEFAULT: openjdk_codesign, CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY],
+          DEFAULT: openjdk_codesign, CHECK_VALUE: UTIL_CHECK_STRING_NON_EMPTY,
           DESC: [specify the macosx code signing identity],
           CHECKING_MSG: [for macosx code signing identity]
       )
@@ -906,22 +823,3 @@ AC_DEFUN([JDKOPT_SETUP_MACOSX_SIGNING],
     AC_SUBST(MACOSX_CODESIGN_MODE)
   fi
 ])
-
-################################################################################
-#
-# fallback linker
-#
-AC_DEFUN_ONCE([JDKOPT_SETUP_FALLBACK_LINKER],
-[
-  FALLBACK_LINKER_DEFAULT=false
-
-  if HOTSPOT_CHECK_JVM_VARIANT(zero); then
-    FALLBACK_LINKER_DEFAULT=true
-  fi
-
-  UTIL_ARG_ENABLE(NAME: fallback-linker, DEFAULT: $FALLBACK_LINKER_DEFAULT,
-      RESULT: ENABLE_FALLBACK_LINKER,
-      DESC: [enable libffi-based fallback implementation of java.lang.foreign.Linker],
-      CHECKING_MSG: [if fallback linker enabled])
-  AC_SUBST(ENABLE_FALLBACK_LINKER)
-])

make/autoconf/jdk-version.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2021, 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
@@ -69,146 +69,149 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   AC_SUBST(JDK_RC_PLATFORM_NAME)
   AC_SUBST(HOTSPOT_VM_DISTRO)
 
-  # Note: UTIL_ARG_WITH treats empty strings as valid values when OPTIONAL is false!
-
-  # Outer [ ] to quote m4.
-  [ USERNAME=`$ECHO "$USER" | $TR -d -c '[a-z][A-Z][0-9]'` ]
-
-  # $USER may be not defined in dockers, so try to check with $WHOAMI
-  if test "x$USERNAME" = x && test "x$WHOAMI" != x; then
-    [ USERNAME=`$WHOAMI | $TR -d -c '[a-z][A-Z][0-9]'` ]
-  fi
-
   # Setup username (for use in adhoc version strings etc)
-  UTIL_ARG_WITH(NAME: build-user, TYPE: string,
-    RESULT: USERNAME,
-    DEFAULT: $USERNAME,
-    DESC: [build username to use in version strings],
-    DEFAULT_DESC: [current username, sanitized],
-    CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY])
+  AC_ARG_WITH([build-user], [AS_HELP_STRING([--with-build-user],
+      [build username to use in version strings])])
+  if test "x$with_build_user" = xyes || test "x$with_build_user" = xno; then
+    AC_MSG_ERROR([--with-build-user must have a value])
+  elif test "x$with_build_user" != x; then
+    USERNAME="$with_build_user"
+  else
+    # Outer [ ] to quote m4.
+    [ USERNAME=`$ECHO "$USER" | $TR -d -c '[a-z][A-Z][0-9]'` ]
+  fi
   AC_SUBST(USERNAME)
 
   # Set the JDK RC name
-  # Otherwise calculate from "branding.conf" included above.
-  UTIL_ARG_WITH(NAME: jdk-rc-name, TYPE: string,
-    DEFAULT: $PRODUCT_NAME $JDK_RC_PLATFORM_NAME,
-    DESC: [Set JDK RC name. This is used for FileDescription and ProductName
-       properties of MS Windows binaries.],
-    DEFAULT_DESC: [from branding.conf],
-    CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE])
+  AC_ARG_WITH(jdk-rc-name, [AS_HELP_STRING([--with-jdk-rc-name],
+      [Set JDK RC name. This is used for FileDescription and ProductName properties
+       of MS Windows binaries. @<:@not specified@:>@])])
+  if test "x$with_jdk_rc_name" = xyes || test "x$with_jdk_rc_name" = xno; then
+    AC_MSG_ERROR([--with-jdk-rc-name must have a value])
+  elif [ ! [[ $with_jdk_rc_name =~ ^[[:print:]]*$ ]] ]; then
+    AC_MSG_ERROR([--with-jdk-rc-name contains non-printing characters: $with_jdk_rc_name])
+  elif test "x$with_jdk_rc_name" != x; then
+    # Set JDK_RC_NAME to a custom value if '--with-jdk-rc-name' was used and is not empty.
+    JDK_RC_NAME="$with_jdk_rc_name"
+  else
+    # Otherwise calculate from "branding.conf" included above.
+    JDK_RC_NAME="$PRODUCT_NAME $JDK_RC_PLATFORM_NAME"
+  fi
   AC_SUBST(JDK_RC_NAME)
 
   # The vendor name, if any
-  # Only set COMPANY_NAME if '--with-vendor-name' was used and is not empty.
-  # Otherwise we will use the value from "branding.conf" included above.
-  UTIL_ARG_WITH(NAME: vendor-name, TYPE: string,
-    RESULT: COMPANY_NAME,
-    DEFAULT: $COMPANY_NAME,
-    DESC: [Set vendor name. Among others, used to set the 'java.vendor'
-       and 'java.vm.vendor' system properties.],
-    DEFAULT_DESC: [from branding.conf],
-    CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE])
+  AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name],
+      [Set vendor name. Among others, used to set the 'java.vendor'
+       and 'java.vm.vendor' system properties. @<:@not specified@:>@])])
+  if test "x$with_vendor_name" = xyes || test "x$with_vendor_name" = xno; then
+    AC_MSG_ERROR([--with-vendor-name must have a value])
+  elif [ ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ]; then
+    AC_MSG_ERROR([--with-vendor-name contains non-printing characters: $with_vendor_name])
+  elif test "x$with_vendor_name" != x; then
+    # Only set COMPANY_NAME if '--with-vendor-name' was used and is not empty.
+    # Otherwise we will use the value from "branding.conf" included above.
+    COMPANY_NAME="$with_vendor_name"
+  fi
   AC_SUBST(COMPANY_NAME)
 
-  # Set the JDK RC Company name
-  # Otherwise uses the value set for "vendor-name".
-  UTIL_ARG_WITH(NAME: jdk-rc-company-name, TYPE: string,
-    DEFAULT: $COMPANY_NAME,
-    DESC: [Set JDK RC company name. This is used for CompanyName properties of MS Windows binaries.],
-    DEFAULT_DESC: [from branding.conf],
-    CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE])
-  AC_SUBST(JDK_RC_COMPANY_NAME)
-
   # The vendor URL, if any
-  # Only set VENDOR_URL if '--with-vendor-url' was used and is not empty.
-  # Otherwise we will use the value from "branding.conf" included above.
-  UTIL_ARG_WITH(NAME: vendor-url, TYPE: string,
-    DEFAULT: $VENDOR_URL,
-    DESC: [Set the 'java.vendor.url' system property],
-    DEFAULT_DESC: [from branding.conf],
-    CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE])
+  AC_ARG_WITH(vendor-url, [AS_HELP_STRING([--with-vendor-url],
+      [Set the 'java.vendor.url' system property @<:@not specified@:>@])])
+  if test "x$with_vendor_url" = xyes || test "x$with_vendor_url" = xno; then
+    AC_MSG_ERROR([--with-vendor-url must have a value])
+  elif [ ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ]; then
+    AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url])
+  elif test "x$with_vendor_url" != x; then
+    # Only set VENDOR_URL if '--with-vendor-url' was used and is not empty.
+    # Otherwise we will use the value from "branding.conf" included above.
+    VENDOR_URL="$with_vendor_url"
+  fi
   AC_SUBST(VENDOR_URL)
 
   # The vendor bug URL, if any
-  # Only set VENDOR_URL_BUG if '--with-vendor-bug-url' was used and is not empty.
-  # Otherwise we will use the value from "branding.conf" included above.
-  UTIL_ARG_WITH(NAME: vendor-bug-url, TYPE: string,
-    RESULT: VENDOR_URL_BUG,
-    DEFAULT: $VENDOR_URL_BUG,
-    DESC: [Set the 'java.vendor.url.bug' system property],
-    DEFAULT_DESC: [from branding.conf],
-    CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE])
+  AC_ARG_WITH(vendor-bug-url, [AS_HELP_STRING([--with-vendor-bug-url],
+      [Set the 'java.vendor.url.bug' system property @<:@not specified@:>@])])
+  if test "x$with_vendor_bug_url" = xyes || test "x$with_vendor_bug_url" = xno; then
+    AC_MSG_ERROR([--with-vendor-bug-url must have a value])
+  elif [ ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ]; then
+    AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url])
+  elif test "x$with_vendor_bug_url" != x; then
+    # Only set VENDOR_URL_BUG if '--with-vendor-bug-url' was used and is not empty.
+    # Otherwise we will use the value from "branding.conf" included above.
+    VENDOR_URL_BUG="$with_vendor_bug_url"
+  fi
   AC_SUBST(VENDOR_URL_BUG)
 
   # The vendor VM bug URL, if any
-  # Only set VENDOR_URL_VM_BUG if '--with-vendor-vm-bug-url' was used and is not empty.
-  # Otherwise we will use the value from "branding.conf" included above.
-  UTIL_ARG_WITH(NAME: vendor-vm-bug-url, TYPE: string,
-    RESULT: VENDOR_URL_VM_BUG,
-    DEFAULT: $VENDOR_URL_VM_BUG,
-    DESC: [Sets the bug URL which will be displayed when the VM crashes],
-    DEFAULT_DESC: [from branding.conf],
-    CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE])
+  AC_ARG_WITH(vendor-vm-bug-url, [AS_HELP_STRING([--with-vendor-vm-bug-url],
+      [Sets the bug URL which will be displayed when the VM crashes @<:@not specified@:>@])])
+  if test "x$with_vendor_vm_bug_url" = xyes || test "x$with_vendor_vm_bug_url" = xno; then
+    AC_MSG_ERROR([--with-vendor-vm-bug-url must have a value])
+  elif [ ! [[ $with_vendor_vm_bug_url =~ ^[[:print:]]*$ ]] ]; then
+    AC_MSG_ERROR([--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url])
+  elif test "x$with_vendor_vm_bug_url" != x; then
+    # Only set VENDOR_URL_VM_BUG if '--with-vendor-vm-bug-url' was used and is not empty.
+    # Otherwise we will use the value from "branding.conf" included above.
+    VENDOR_URL_VM_BUG="$with_vendor_vm_bug_url"
+  fi
   AC_SUBST(VENDOR_URL_VM_BUG)
 
   # Override version from arguments
 
   # If --with-version-string is set, process it first. It is possible to
   # override parts with more specific flags, since these are processed later.
-  UTIL_ARG_WITH(NAME: version-string, TYPE: string,
-    DEFAULT: [],
-    DESC: [Set version string],
-    DEFAULT_DESC: [calculated],
-    CHECK_VALUE: [
-      if test "x$RESULT" != x; then
-        # Additional [] needed to keep m4 from mangling shell constructs.
-        if [ [[ $RESULT =~ ^([0-9]+)(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(-([a-zA-Z0-9]+))?(((\+)([0-9]*))?(-([-a-zA-Z0-9.]+))?)?$ ]] ]; then
-          VERSION_FEATURE=${BASH_REMATCH[[1]]}
-          VERSION_INTERIM=${BASH_REMATCH[[3]]}
-          VERSION_UPDATE=${BASH_REMATCH[[5]]}
-          VERSION_PATCH=${BASH_REMATCH[[7]]}
-          VERSION_EXTRA1=${BASH_REMATCH[[9]]}
-          VERSION_EXTRA2=${BASH_REMATCH[[11]]}
-          VERSION_EXTRA3=${BASH_REMATCH[[13]]}
-          VERSION_PRE=${BASH_REMATCH[[15]]}
-          version_plus_separator=${BASH_REMATCH[[18]]}
-          VERSION_BUILD=${BASH_REMATCH[[19]]}
-          VERSION_OPT=${BASH_REMATCH[[21]]}
-          # Unspecified numerical fields are interpreted as 0.
-          if test "x$VERSION_INTERIM" = x; then
-            VERSION_INTERIM=0
-          fi
-          if test "x$VERSION_UPDATE" = x; then
-            VERSION_UPDATE=0
-          fi
-          if test "x$VERSION_PATCH" = x; then
-            VERSION_PATCH=0
-          fi
-          if test "x$VERSION_EXTRA1" = x; then
-            VERSION_EXTRA1=0
-          fi
-          if test "x$VERSION_EXTRA2" = x; then
-            VERSION_EXTRA2=0
-          fi
-          if test "x$VERSION_EXTRA3" = x; then
-            VERSION_EXTRA3=0
-          fi
-          if test "x$version_plus_separator" != x \
-              && test "x$VERSION_BUILD$VERSION_OPT" = x; then
-            AC_MSG_ERROR([Version string contains + but both 'BUILD' and 'OPT' are missing])
-          fi
-          if test "x$VERSION_BUILD" = x0; then
-            AC_MSG_WARN([Version build 0 is interpreted as no build number])
-            VERSION_BUILD=
-          fi
-          # Stop the version part process from setting default values.
-          # We still allow them to explicitly override though.
-          NO_DEFAULT_VERSION_PARTS=true
-        else
-          FAILURE="--with-version-string fails to parse as a valid version string: $RESULT"
-        fi
+  AC_ARG_WITH(version-string, [AS_HELP_STRING([--with-version-string],
+      [Set version string @<:@calculated@:>@])])
+  if test "x$with_version_string" = xyes || test "x$with_version_string" = xno; then
+    AC_MSG_ERROR([--with-version-string must have a value])
+  elif test "x$with_version_string" != x; then
+    # Additional [] needed to keep m4 from mangling shell constructs.
+    if [ [[ $with_version_string =~ ^([0-9]+)(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(-([a-zA-Z0-9]+))?(((\+)([0-9]*))?(-([-a-zA-Z0-9.]+))?)?$ ]] ]; then
+      VERSION_FEATURE=${BASH_REMATCH[[1]]}
+      VERSION_INTERIM=${BASH_REMATCH[[3]]}
+      VERSION_UPDATE=${BASH_REMATCH[[5]]}
+      VERSION_PATCH=${BASH_REMATCH[[7]]}
+      VERSION_EXTRA1=${BASH_REMATCH[[9]]}
+      VERSION_EXTRA2=${BASH_REMATCH[[11]]}
+      VERSION_EXTRA3=${BASH_REMATCH[[13]]}
+      VERSION_PRE=${BASH_REMATCH[[15]]}
+      version_plus_separator=${BASH_REMATCH[[18]]}
+      VERSION_BUILD=${BASH_REMATCH[[19]]}
+      VERSION_OPT=${BASH_REMATCH[[21]]}
+      # Unspecified numerical fields are interpreted as 0.
+      if test "x$VERSION_INTERIM" = x; then
+        VERSION_INTERIM=0
       fi
-    ])
+      if test "x$VERSION_UPDATE" = x; then
+        VERSION_UPDATE=0
+      fi
+      if test "x$VERSION_PATCH" = x; then
+        VERSION_PATCH=0
+      fi
+      if test "x$VERSION_EXTRA1" = x; then
+        VERSION_EXTRA1=0
+      fi
+      if test "x$VERSION_EXTRA2" = x; then
+        VERSION_EXTRA2=0
+      fi
+      if test "x$VERSION_EXTRA3" = x; then
+        VERSION_EXTRA3=0
+      fi
+      if test "x$version_plus_separator" != x \
+          && test "x$VERSION_BUILD$VERSION_OPT" = x; then
+        AC_MSG_ERROR([Version string contains + but both 'BUILD' and 'OPT' are missing])
+      fi
+      if test "x$VERSION_BUILD" = x0; then
+        AC_MSG_WARN([Version build 0 is interpreted as no build number])
+        VERSION_BUILD=
+      fi
+      # Stop the version part process from setting default values.
+      # We still allow them to explicitly override though.
+      NO_DEFAULT_VERSION_PARTS=true
+    else
+      AC_MSG_ERROR([--with-version-string fails to parse as a valid version string: $with_version_string])
+    fi
+  fi
 
   AC_ARG_WITH(version-pre, [AS_HELP_STRING([--with-version-pre],
       [Set the base part of the version 'PRE' field (pre-release identifier) @<:@'internal'@:>@])],
@@ -287,18 +290,22 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     fi
   fi
 
-  # Default is to get value from version-numbers.conf
-  if test "x$NO_DEFAULT_VERSION_PARTS" = xtrue; then
-    DEFAULT_VERSION_FEATURE="$VERSION_FEATURE"
-  fi
+  AC_ARG_WITH(version-feature, [AS_HELP_STRING([--with-version-feature],
+      [Set version 'FEATURE' field (first number) @<:@current source value@:>@])],
+      [with_version_feature_present=true], [with_version_feature_present=false])
 
-  UTIL_ARG_WITH(NAME: version-feature, TYPE: string,
-    DEFAULT: $DEFAULT_VERSION_FEATURE,
-    DESC: [Set version 'FEATURE' field (first number)],
-    DEFAULT_DESC: [current source value],
-    CHECK_VALUE: [
-      JDKVER_CHECK_AND_SET_NUMBER(VERSION_FEATURE, $RESULT)
-    ])
+  if test "x$with_version_feature_present" = xtrue; then
+    if test "x$with_version_feature" = xyes || test "x$with_version_feature" = xno; then
+      AC_MSG_ERROR([--with-version-feature must have a value])
+    else
+      JDKVER_CHECK_AND_SET_NUMBER(VERSION_FEATURE, $with_version_feature)
+    fi
+  else
+    if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
+      # Default is to get value from version-numbers.conf
+      VERSION_FEATURE="$DEFAULT_VERSION_FEATURE"
+    fi
+  fi
 
   AC_ARG_WITH(version-interim, [AS_HELP_STRING([--with-version-interim],
       [Set version 'INTERIM' field (second number) @<:@current source value@:>@])],
@@ -473,81 +480,91 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   VERSION_SHORT=$VERSION_NUMBER${VERSION_PRE:+-$VERSION_PRE}
 
   # The version date
-  UTIL_ARG_WITH(NAME: version-date, TYPE: string,
-    DEFAULT: $DEFAULT_VERSION_DATE,
-    DESC: [Set version date],
-    DEFAULT_DESC: [current source value],
-    CHECK_VALUE: [
-      if test "x$RESULT" = x; then
-        FAILURE="--with-version-date cannot be empty"
-      elif [ ! [[ $RESULT =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}$ ]] ]; then
-        FAILURE="\"$RESULT\" is not a valid version date"
-      fi
-    ])
+  AC_ARG_WITH(version-date, [AS_HELP_STRING([--with-version-date],
+      [Set version date @<:@current source value@:>@])])
+  if test "x$with_version_date" = xyes || test "x$with_version_date" = xno; then
+    AC_MSG_ERROR([--with-version-date must have a value])
+  elif test "x$with_version_date" != x; then
+    if [ ! [[ $with_version_date =~ ^[0-9]{4}-[0-9]{2}-[0-9]{2}$ ]] ]; then
+      AC_MSG_ERROR(["$with_version_date" is not a valid version date])
+    else
+      VERSION_DATE="$with_version_date"
+    fi
+  else
+    VERSION_DATE="$DEFAULT_VERSION_DATE"
+  fi
 
   # The vendor version string, if any
-  # DEFAULT is set to an empty string in the case of --with-vendor-version-string without
-  # any value, which would set VENDOR_VERSION_STRING_ENABLED to true and ultimately also
-  # cause VENDOR_VERSION_STRING to fall back to the value in DEFAULT
-  UTIL_ARG_WITH(NAME: vendor-version-string, TYPE: string,
-    DEFAULT: [],
-    OPTIONAL: true,
-    DESC: [Set vendor version string],
-    DEFAULT_DESC: [not specified])
-
-  if test "x$VENDOR_VERSION_STRING_ENABLED" = xtrue; then
-    if [ ! [[ $VENDOR_VERSION_STRING =~ ^[[:graph:]]*$ ]] ]; then
-      AC_MSG_ERROR([--with--vendor-version-string contains non-graphical characters: $VENDOR_VERSION_STRING])
-    fi
+  AC_ARG_WITH(vendor-version-string, [AS_HELP_STRING([--with-vendor-version-string],
+      [Set vendor version string @<:@not specified@:>@])])
+  if test "x$with_vendor_version_string" = xyes; then
+    AC_MSG_ERROR([--with-vendor-version-string must have a value])
+  elif [ ! [[ $with_vendor_version_string =~ ^[[:graph:]]*$ ]] ]; then
+    AC_MSG_ERROR([--with--vendor-version-string contains non-graphical characters: $with_vendor_version_string])
+  elif test "x$with_vendor_version_string" != xno; then
+    # Set vendor version string if --without is not passed
+    # Check not required if an empty value is passed, since VENDOR_VERSION_STRING
+    # would then be set to ""
+    VENDOR_VERSION_STRING="$with_vendor_version_string"
   fi
 
   # Set the MACOSX Bundle Name base
-  UTIL_ARG_WITH(NAME: macosx-bundle-name-base, TYPE: string,
-    DEFAULT: $MACOSX_BUNDLE_NAME_BASE,
-    DESC: [Set the MacOSX Bundle Name base. This is the base name for calculating MacOSX Bundle Names.],
-    DEFAULT_DESC: [from branding.conf],
-    CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE])
+  AC_ARG_WITH(macosx-bundle-name-base, [AS_HELP_STRING([--with-macosx-bundle-name-base],
+      [Set the MacOSX Bundle Name base. This is the base name for calculating MacOSX Bundle Names.
+      @<:@not specified@:>@])])
+  if test "x$with_macosx_bundle_name_base" = xyes || test "x$with_macosx_bundle_name_base" = xno; then
+    AC_MSG_ERROR([--with-macosx-bundle-name-base must have a value])
+  elif [ ! [[ $with_macosx_bundle_name_base =~ ^[[:print:]]*$ ]] ]; then
+    AC_MSG_ERROR([--with-macosx-bundle-name-base contains non-printing characters: $with_macosx_bundle_name_base])
+  elif test "x$with_macosx_bundle_name_base" != x; then
+    # Set MACOSX_BUNDLE_NAME_BASE to the configured value.
+    MACOSX_BUNDLE_NAME_BASE="$with_macosx_bundle_name_base"
+  fi
   AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
 
-  # If using the default value, append the VERSION_PRE if there is one
-  # to make it possible to tell official builds apart from developer builds
-  if test "x$VERSION_PRE" != x; then
-    MACOSX_BUNDLE_ID_BASE="$MACOSX_BUNDLE_ID_BASE-$VERSION_PRE"
-  fi
-
   # Set the MACOSX Bundle ID base
-  UTIL_ARG_WITH(NAME: macosx-bundle-id-base, TYPE: string,
-    DEFAULT: $MACOSX_BUNDLE_ID_BASE,
-    DESC: [Set the MacOSX Bundle ID base. This is the base ID for calculating MacOSX Bundle IDs.],
-    DEFAULT_DESC: [based on branding.conf and VERSION_PRE],
-    CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE])
+  AC_ARG_WITH(macosx-bundle-id-base, [AS_HELP_STRING([--with-macosx-bundle-id-base],
+      [Set the MacOSX Bundle ID base. This is the base ID for calculating MacOSX Bundle IDs.
+      @<:@not specified@:>@])])
+  if test "x$with_macosx_bundle_id_base" = xyes || test "x$with_macosx_bundle_id_base" = xno; then
+    AC_MSG_ERROR([--with-macosx-bundle-id-base must have a value])
+  elif [ ! [[ $with_macosx_bundle_id_base =~ ^[[:print:]]*$ ]] ]; then
+    AC_MSG_ERROR([--with-macosx-bundle-id-base contains non-printing characters: $with_macosx_bundle_id_base])
+  elif test "x$with_macosx_bundle_id_base" != x; then
+    # Set MACOSX_BUNDLE_ID_BASE to the configured value.
+    MACOSX_BUNDLE_ID_BASE="$with_macosx_bundle_id_base"
+  else
+    # If using the default value, append the VERSION_PRE if there is one
+    # to make it possible to tell official builds apart from developer builds
+    if test "x$VERSION_PRE" != x; then
+      MACOSX_BUNDLE_ID_BASE="$MACOSX_BUNDLE_ID_BASE-$VERSION_PRE"
+    fi
+  fi
   AC_SUBST(MACOSX_BUNDLE_ID_BASE)
 
-  if test "x$VERSION_BUILD" != x; then
-    MACOSX_BUNDLE_BUILD_VERSION="$VERSION_BUILD"
-  else
-    MACOSX_BUNDLE_BUILD_VERSION=0
-  fi
-
-  # If VERSION_OPT consists of only numbers and periods, add it.
-  if [ [[ $VERSION_OPT =~ ^[0-9\.]+$ ]] ]; then
-    MACOSX_BUNDLE_BUILD_VERSION="$MACOSX_BUNDLE_BUILD_VERSION.$VERSION_OPT"
-  fi
-
   # Set the MACOSX CFBundleVersion field
-  UTIL_ARG_WITH(NAME: macosx-bundle-build-version, TYPE: string,
-    DEFAULT: $MACOSX_BUNDLE_BUILD_VERSION,
-    DESC: [Set the MacOSX Bundle CFBundleVersion field. This key is a machine-readable
+  AC_ARG_WITH(macosx-bundle-build-version, [AS_HELP_STRING([--with-macosx-bundle-build-version],
+      [Set the MacOSX Bundle CFBundleVersion field. This key is a machine-readable
       string composed of one to three period-separated integers and should represent the
-      build version.],
-    DEFAULT_DESC: [the build number],
-    CHECK_VALUE: [
-      if test "x$RESULT" = x; then
-        FAILURE="--with-macosx-bundle-build-version must have a value"
-      elif [ ! [[ $RESULT =~ ^[0-9\.]*$ ]] ]; then
-        FAILURE="--with-macosx-bundle-build-version contains non numbers and periods: $RESULT"
-      fi
-    ])
+      build version. Defaults to the build number.])])
+  if test "x$with_macosx_bundle_build_version" = xyes || test "x$with_macosx_bundle_build_version" = xno; then
+    AC_MSG_ERROR([--with-macosx-bundle-build-version must have a value])
+  elif [ ! [[ $with_macosx_bundle_build_version =~ ^[0-9\.]*$ ]] ]; then
+    AC_MSG_ERROR([--with-macosx-bundle-build-version contains non numbers and periods: $with_macosx_bundle_build_version])
+  elif test "x$with_macosx_bundle_build_version" != x; then
+    MACOSX_BUNDLE_BUILD_VERSION="$with_macosx_bundle_build_version"
+  else
+    if test "x$VERSION_BUILD" != x; then
+      MACOSX_BUNDLE_BUILD_VERSION="$VERSION_BUILD"
+    else
+      MACOSX_BUNDLE_BUILD_VERSION=0
+    fi
+
+    # If VERSION_OPT consists of only numbers and periods, add it.
+    if [ [[ $VERSION_OPT =~ ^[0-9\.]+$ ]] ]; then
+      MACOSX_BUNDLE_BUILD_VERSION="$MACOSX_BUNDLE_BUILD_VERSION.$VERSION_OPT"
+    fi
+  fi
   AC_SUBST(MACOSX_BUNDLE_BUILD_VERSION)
 
   # We could define --with flags for these, if really needed

make/autoconf/jvm-features.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -247,14 +247,8 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_CDS],
 AC_DEFUN_ONCE([JVM_FEATURES_CHECK_DTRACE],
 [
   JVM_FEATURES_CHECK_AVAILABILITY(dtrace, [
-    AC_MSG_CHECKING([for dtrace tool and platform support])
-    if test "x$OPENJDK_TARGET_CPU_ARCH" = "xppc"; then
-      AC_MSG_RESULT([no, $OPENJDK_TARGET_CPU_ARCH])
-      AVAILABLE=false
-    elif test "x$OPENJDK_TARGET_CPU_ARCH" = "xs390"; then
-      AC_MSG_RESULT([no, $OPENJDK_TARGET_CPU_ARCH])
-      AVAILABLE=false
-    elif test "x$DTRACE" != "x" && test -x "$DTRACE"; then
+    AC_MSG_CHECKING([for dtrace tool])
+    if test "x$DTRACE" != "x" && test -x "$DTRACE"; then
       AC_MSG_RESULT([$DTRACE])
     else
       AC_MSG_RESULT([no])

make/autoconf/lib-cups.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -68,20 +68,12 @@ AC_DEFUN_ONCE([LIB_SETUP_CUPS],
       fi
     fi
     if test "x$CUPS_FOUND" = xno; then
-      # Are the cups headers installed in the default AIX or /usr/include location?
-      if test "x$OPENJDK_TARGET_OS" = "xaix"; then
-        AC_CHECK_HEADERS([/opt/freeware/include/cups/cups.h /opt/freeware/include/cups/ppd.h], [
-            CUPS_FOUND=yes
-            CUPS_CFLAGS="-I/opt/freeware/include"
-            DEFAULT_CUPS=yes
-        ])
-      else
-        AC_CHECK_HEADERS([cups/cups.h cups/ppd.h], [
-            CUPS_FOUND=yes
-            CUPS_CFLAGS=
-            DEFAULT_CUPS=yes
-        ])
-      fi
+      # Are the cups headers installed in the default /usr/include location?
+      AC_CHECK_HEADERS([cups/cups.h cups/ppd.h], [
+          CUPS_FOUND=yes
+          CUPS_CFLAGS=
+          DEFAULT_CUPS=yes
+      ])
     fi
     if test "x$CUPS_FOUND" = xno; then
       HELP_MSG_MISSING_DEPENDENCY([cups])

make/autoconf/lib-ffi.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -57,11 +57,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],
 
     if test "x${with_libffi}" != x; then
       LIBFFI_LIB_PATH="${with_libffi}/lib"
-      if test "x${OPENJDK_TARGET_OS}" != "xwindows"; then
-        LIBFFI_LIBS="-L${with_libffi}/lib -lffi"
-      else
-        LIBFFI_LIBS="${with_libffi}/lib/libffi.lib"
-      fi
+      LIBFFI_LIBS="-L${with_libffi}/lib -lffi"
       LIBFFI_CFLAGS="-I${with_libffi}/include"
       LIBFFI_FOUND=yes
     fi
@@ -71,11 +67,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],
     fi
     if test "x${with_libffi_lib}" != x; then
       LIBFFI_LIB_PATH="${with_libffi_lib}"
-      if test "x${OPENJDK_TARGET_OS}" != "xwindows"; then
-        LIBFFI_LIBS="-L${with_libffi_lib} -lffi"
-      else
-        LIBFFI_LIBS="${with_libffi_lib}/libffi.lib"
-      fi
+      LIBFFI_LIBS="-L${with_libffi_lib} -lffi"
       LIBFFI_FOUND=yes
     fi
     # Do not try pkg-config if we have a sysroot set.
@@ -114,13 +106,12 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],
       AC_MSG_ERROR([Could not find libffi! $HELP_MSG])
     fi
 
+    AC_MSG_CHECKING([if libffi works])
     AC_LANG_PUSH(C)
     OLD_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $LIBFFI_CFLAGS"
     OLD_LIBS="$LIBS"
     LIBS="$LIBS $LIBFFI_LIBS"
-
-    AC_MSG_CHECKING([if libffi works])
     AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ffi.h>],
         [
           ffi_call(NULL, NULL, NULL, NULL);
@@ -129,6 +120,9 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],
         [LIBFFI_WORKS=yes],
         [LIBFFI_WORKS=no]
     )
+    CFLAGS="$OLD_CFLAGS"
+    LIBS="$OLD_LIBS"
+    AC_LANG_POP(C)
     AC_MSG_RESULT([$LIBFFI_WORKS])
 
     if test "x$LIBFFI_WORKS" = xno; then
@@ -136,71 +130,39 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],
       AC_MSG_ERROR([Found libffi but could not link and compile with it. $HELP_MSG])
     fi
 
-    # Check if FFI_GO_CLOSURES is properly defined. On some distributions, notably MacOS AArch64,
-    # ffitarget.h (included from ffi.h) does not explicitly define FFI_GO_CLOSURES. This makes the
-    # further include of ffi.h trigger the "FFI_GO_CLOSURES is undefined" warning, which fails
-    # the build when warnings are fatal.
-    AC_MSG_CHECKING([for FFI_GO_CLOSURES definition])
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-      #include <ffi.h>
-      #ifndef FFI_GO_CLOSURES
-      #error "FFI_GO_CLOSURES is not defined"
-      #endif
-      ][])],
-      [
-        AC_MSG_RESULT([yes])
-      ],
-      [
-        AC_MSG_RESULT([no, defining])
-        LIBFFI_CFLAGS="$LIBFFI_CFLAGS -DFFI_GO_CLOSURES=0"
-      ]
-    )
-
-    CFLAGS="$OLD_CFLAGS"
-    LIBS="$OLD_LIBS"
-    AC_LANG_POP(C)
-
     # Find the libffi.so.X to bundle
     if test "x${ENABLE_LIBFFI_BUNDLING}" = "xtrue"; then
-      if test "x${OPENJDK_TARGET_OS}" = "xmacosx"; then
-        LIBFFI_LIB_FILE_NAME=libffi.?.dylib
-      elif test "x${OPENJDK_TARGET_OS}" = "xwindows"; then
-        LIBFFI_LIB_FILE_NAME=libffi.dll
-      else
-        LIBFFI_LIB_FILE_NAME=libffi.so.?
-      fi
-
       AC_MSG_CHECKING([for libffi lib file location])
       if test "x${LIBFFI_LIB_PATH}" != x; then
-        if test -e ${LIBFFI_LIB_PATH}/${LIBFFI_LIB_FILE_NAME}; then
-          LIBFFI_LIB_FILE="${LIBFFI_LIB_PATH}/${LIBFFI_LIB_FILE_NAME}"
+        if test -e ${LIBFFI_LIB_PATH}/libffi.so.?; then
+          LIBFFI_LIB_FILE="${LIBFFI_LIB_PATH}/libffi.so.?"
         else
-          AC_MSG_ERROR([Could not locate ${LIBFFI_LIB_FILE_NAME} for bundling in ${LIBFFI_LIB_PATH}])
+          AC_MSG_ERROR([Could not locate libffi.so.? for bundling in ${LIBFFI_LIB_PATH}])
         fi
       else
         # If we don't have an explicit path, look in a few obvious places
         if test "x${OPENJDK_TARGET_CPU}" = "xx86"; then
-          if test -e ${SYSROOT}/usr/lib/${LIBFFI_LIB_FILE_NAME} ; then
-            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/${LIBFFI_LIB_FILE_NAME}"
-          elif test -e ${SYSROOT}/usr/lib/i386-linux-gnu/${LIBFFI_LIB_FILE_NAME} ; then
-            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/i386-linux-gnu/${LIBFFI_LIB_FILE_NAME}"
+          if test -e ${SYSROOT}/usr/lib/libffi.so.? ; then
+            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/libffi.so.?"
+          elif test -e ${SYSROOT}/usr/lib/i386-linux-gnu/libffi.so.? ; then
+            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/i386-linux-gnu/libffi.so.?"
           else
-            AC_MSG_ERROR([Could not locate ${LIBFFI_LIB_FILE_NAME} for bundling])
+            AC_MSG_ERROR([Could not locate libffi.so.? for bundling])
           fi
         elif test "x${OPENJDK_TARGET_CPU}" = "xx86_64" || test "x${OPENJDK_TARGET_CPU}" = "xaarch64"; then
-          if test -e ${SYSROOT}/usr/lib64/${LIBFFI_LIB_FILE_NAME} ; then
-            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib64/${LIBFFI_LIB_FILE_NAME}"
-          elif test -e ${SYSROOT}/usr/lib/x86_64-linux-gnu/${LIBFFI_LIB_FILE_NAME} ; then
-            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/x86_64-linux-gnu/${LIBFFI_LIB_FILE_NAME}"
+          if test -e ${SYSROOT}/usr/lib64/libffi.so.? ; then
+            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib64/libffi.so.?"
+          elif test -e ${SYSROOT}/usr/lib/x86_64-linux-gnu/libffi.so.? ; then
+            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/x86_64-linux-gnu/libffi.so.?"
           else
-            AC_MSG_ERROR([Could not locate ${LIBFFI_LIB_FILE_NAME} for bundling])
+            AC_MSG_ERROR([Could not locate libffi.so.? for bundling])
           fi
         else
           # Fallback on the default /usr/lib dir
-          if test -e ${SYSROOT}/usr/lib/${LIBFFI_LIB_FILE_NAME} ; then
-            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/${LIBFFI_LIB_FILE_NAME}"
+          if test -e ${SYSROOT}/usr/lib/libffi.so.? ; then
+            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/libffi.so.?"
           else
-            AC_MSG_ERROR([Could not locate ${LIBFFI_LIB_FILE_NAME} for bundling])
+            AC_MSG_ERROR([Could not locate libffi.so.? for bundling])
           fi
         fi
       fi

make/autoconf/lib-hsdis.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2021, 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
@@ -63,19 +63,6 @@ AC_DEFUN([LIB_SETUP_HSDIS_CAPSTONE],
       AC_MSG_ERROR([Cannot continue])
     fi
   fi
-
-  capstone_header="\"$CAPSTONE/include/capstone/capstone.h\""
-  AC_MSG_CHECKING([capstone aarch64 arch name])
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include $capstone_header],[[cs_arch test = CS_ARCH_AARCH64]])],
-    [
-      AC_MSG_RESULT([AARCH64])
-      CAPSTONE_ARCH_AARCH64_NAME="AARCH64"
-    ],
-    [
-      AC_MSG_RESULT([ARM64])
-      CAPSTONE_ARCH_AARCH64_NAME="ARM64"
-    ]
-  )
 ])
 
 ################################################################################
@@ -147,9 +134,6 @@ AC_DEFUN([LIB_BUILD_BINUTILS],
   BINUTILS_SRC="$with_binutils_src"
   UTIL_FIXUP_PATH(BINUTILS_SRC)
 
-  BINUTILS_BUILD_DIR="$CONFIGURESUPPORT_OUTPUTDIR/binutils"
-  BINUTILS_INSTALL_DIR="$CONFIGURESUPPORT_OUTPUTDIR/binutils-install"
-
   if ! test -d $BINUTILS_SRC; then
     AC_MSG_ERROR([--with-binutils-src is not pointing to a directory])
   fi
@@ -157,15 +141,11 @@ AC_DEFUN([LIB_BUILD_BINUTILS],
     AC_MSG_ERROR([--with-binutils-src does not look like a binutils source directory])
   fi
 
-  if ! test -d $BINUTILS_BUILD_DIR; then
-    $MKDIR -p $BINUTILS_BUILD_DIR
-  fi
-
-  # We don't know the version, not checking for libsframe.a
-  if test -e $BINUTILS_INSTALL_DIR/lib/libbfd.a && \
-     test -e $BINUTILS_INSTALL_DIR/lib/libopcodes.a && \
-     test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a; then
-    AC_MSG_NOTICE([Found binutils binaries in binutils install directory -- not building])
+  if test -e $BINUTILS_SRC/bfd/libbfd.a && \
+      test -e $BINUTILS_SRC/opcodes/libopcodes.a && \
+      test -e $BINUTILS_SRC/libiberty/libiberty.a && \
+      test -e $BINUTILS_SRC/zlib/libz.a; then
+    AC_MSG_NOTICE([Found binutils binaries in binutils source directory -- not building])
   else
     # On Windows, we cannot build with the normal Microsoft CL, but must instead use
     # a separate mingw toolchain.
@@ -195,38 +175,30 @@ AC_DEFUN([LIB_BUILD_BINUTILS],
       fi
     else
       binutils_cc="$CC $SYSROOT_CFLAGS"
-      if test "x$COMPILE_TYPE" = xcross; then
-        binutils_target="--host=$OPENJDK_TARGET_AUTOCONF_NAME"
-      else
-        binutils_target=""
-      fi
+      binutils_target=""
     fi
     binutils_cflags="$binutils_cflags $MACHINE_FLAG $JVM_PICFLAG $C_O_FLAG_NORM"
 
     AC_MSG_NOTICE([Running binutils configure])
-    AC_MSG_NOTICE([configure command line: cd $BINUTILS_BUILD_DIR && $BINUTILS_SRC/configure --disable-werror --prefix=$BINUTILS_INSTALL_DIR --enable-install-libiberty --with-system-zlib --without-zstd --disable-nls CFLAGS="$binutils_cflags" CC="$binutils_cc" AR="$AR" $binutils_target])
+    AC_MSG_NOTICE([configure command line: ./configure --disable-nls CFLAGS="$binutils_cflags" CC="$binutils_cc" $binutils_target])
     saved_dir=`pwd`
-    cd "$BINUTILS_BUILD_DIR"
-    $BINUTILS_SRC/configure --disable-werror --prefix=$BINUTILS_INSTALL_DIR --enable-install-libiberty --with-system-zlib --without-zstd --disable-nls CFLAGS="$binutils_cflags" CC="$binutils_cc" AR="$AR" $binutils_target
-    if test $? -ne 0 || ! test -e $BINUTILS_BUILD_DIR/Makefile; then
+    cd "$BINUTILS_SRC"
+    ./configure --disable-nls CFLAGS="$binutils_cflags" CC="$binutils_cc" $binutils_target
+    if test $? -ne 0 || ! test -e $BINUTILS_SRC/Makefile; then
       AC_MSG_NOTICE([Automatic building of binutils failed on configure. Try building it manually])
       AC_MSG_ERROR([Cannot continue])
     fi
     AC_MSG_NOTICE([Running binutils make])
-    $MAKE all-opcodes all-libiberty
+    $MAKE all-opcodes
     if test $? -ne 0; then
       AC_MSG_NOTICE([Automatic building of binutils failed on make. Try building it manually])
       AC_MSG_ERROR([Cannot continue])
     fi
-    AC_MSG_NOTICE([Running binutils make install])
-    $MAKE install-opcodes install-libiberty
-    if test $? -ne 0; then
-      AC_MSG_NOTICE([Automatic building, install step, of binutils failed on make. Try building it manually])
-      AC_MSG_ERROR([Cannot continue])
-    fi
     cd $saved_dir
     AC_MSG_NOTICE([Building of binutils done])
   fi
+
+  BINUTILS_DIR="$BINUTILS_SRC"
 ])
 
 ################################################################################
@@ -243,66 +215,34 @@ AC_DEFUN([LIB_SETUP_HSDIS_BINUTILS],
 
   # We need the binutils static libs and includes.
   if test "x$with_binutils_src" != x; then
-    # Try building the source first. If it succeeds, it sets $BINUTILS_INSTALL_DIR.
+    # Try building the source first. If it succeeds, it sets $BINUTILS_DIR.
     LIB_BUILD_BINUTILS
   fi
 
   if test "x$with_binutils" != x; then
-    BINUTILS_INSTALL_DIR="$with_binutils"
+    BINUTILS_DIR="$with_binutils"
   fi
 
   binutils_system_error=""
-  HSDIS_LDFLAGS=""
   HSDIS_LIBS=""
-  disasm_header="<dis-asm.h>"
-
-  if test "x$BINUTILS_INSTALL_DIR" = xsystem; then
+  if test "x$BINUTILS_DIR" = xsystem; then
     AC_CHECK_LIB(bfd, bfd_openr, [ HSDIS_LIBS="-lbfd" ], [ binutils_system_error="libbfd not found" ])
     AC_CHECK_LIB(opcodes, disassembler, [ HSDIS_LIBS="$HSDIS_LIBS -lopcodes" ], [ binutils_system_error="libopcodes not found" ])
+    AC_CHECK_LIB(iberty, xmalloc, [ HSDIS_LIBS="$HSDIS_LIBS -liberty" ], [ binutils_system_error="libiberty not found" ])
     AC_CHECK_LIB(z, deflate, [ HSDIS_LIBS="$HSDIS_LIBS -lz" ], [ binutils_system_error="libz not found" ])
-    # libiberty is not required on Ubuntu
-    AC_CHECK_LIB(iberty, xmalloc, [ HSDIS_LIBS="$HSDIS_LIBS -liberty" ])
-    AC_CHECK_LIB(sframe, frame, [ HSDIS_LIBS="$HSDIS_LIBS -lsframe" ], )
     HSDIS_CFLAGS="-DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB"
-  elif test "x$BINUTILS_INSTALL_DIR" != x; then
-    disasm_header="\"$BINUTILS_INSTALL_DIR/include/dis-asm.h\""
-    if test -e $BINUTILS_INSTALL_DIR/lib/libbfd.a && \
-       test -e $BINUTILS_INSTALL_DIR/lib/libopcodes.a && \
-       (test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a || test -e $BINUTILS_INSTALL_DIR/lib64/libiberty.a); then
-      HSDIS_CFLAGS="-DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB -I$BINUTILS_INSTALL_DIR/include"
-
-      # libiberty ignores --libdir and may be installed in $BINUTILS_INSTALL_DIR/lib or $BINUTILS_INSTALL_DIR/lib64
-      # depending on system setup
-      LIBIBERTY_LIB=""
-      if test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a; then
-        LIBIBERTY_LIB="$BINUTILS_INSTALL_DIR/lib/libiberty.a"
-      else
-        LIBIBERTY_LIB="$BINUTILS_INSTALL_DIR/lib64/libiberty.a"
-      fi
-      HSDIS_LIBS="$BINUTILS_INSTALL_DIR/lib/libbfd.a $BINUTILS_INSTALL_DIR/lib/libopcodes.a $LIBIBERTY_LIB"
-      # If we have libsframe add it.
-      if test -e $BINUTILS_INSTALL_DIR/lib/libsframe.a; then
-        HSDIS_LIBS="$HSDIS_LIBS $BINUTILS_INSTALL_DIR/lib/libsframe.a"
-      fi
-      AC_CHECK_LIB(z, deflate, [ HSDIS_LIBS="$HSDIS_LIBS -lz" ], AC_MSG_ERROR([libz not found]))
-    else
-      AC_MSG_ERROR(["$BINUTILS_INSTALL_DIR/lib[64] must contain libbfd.a, libopcodes.a and libiberty.a"])
+  elif test "x$BINUTILS_DIR" != x; then
+    if test -e $BINUTILS_DIR/bfd/libbfd.a && \
+        test -e $BINUTILS_DIR/opcodes/libopcodes.a && \
+        test -e $BINUTILS_DIR/libiberty/libiberty.a; then
+      HSDIS_CFLAGS="-I$BINUTILS_DIR/include -I$BINUTILS_DIR/bfd -DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB"
+      HSDIS_LDFLAGS=""
+      HSDIS_LIBS="$BINUTILS_DIR/bfd/libbfd.a $BINUTILS_DIR/opcodes/libopcodes.a $BINUTILS_DIR/libiberty/libiberty.a $BINUTILS_DIR/zlib/libz.a"
     fi
   fi
 
-  AC_MSG_CHECKING([Checking binutils API])
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include $disasm_header],[[init_disassemble_info(0, 0, 0, 0);]])],
-    [
-      AC_MSG_RESULT([New API])
-      HSDIS_CFLAGS="$HSDIS_CFLAGS -DBINUTILS_NEW_API"
-    ],
-    [
-      AC_MSG_RESULT([Old API])
-    ]
-  )
-
   AC_MSG_CHECKING([for binutils to use with hsdis])
-  case "x$BINUTILS_INSTALL_DIR" in
+  case "x$BINUTILS_DIR" in
     xsystem)
       if test "x$OPENJDK_TARGET_OS" != xlinux; then
         AC_MSG_RESULT([invalid])
@@ -325,10 +265,10 @@ AC_DEFUN([LIB_SETUP_HSDIS_BINUTILS],
       ;;
     *)
       if test "x$HSDIS_LIBS" != x; then
-        AC_MSG_RESULT([$BINUTILS_INSTALL_DIR])
+        AC_MSG_RESULT([$BINUTILS_DIR])
       else
         AC_MSG_RESULT([invalid])
-        AC_MSG_ERROR([$BINUTILS_INSTALL_DIR does not contain a proper binutils installation])
+        AC_MSG_ERROR([$BINUTILS_DIR does not contain a proper binutils installation])
       fi
       ;;
   esac
@@ -378,7 +318,6 @@ AC_DEFUN_ONCE([LIB_SETUP_HSDIS],
   AC_SUBST(HSDIS_CFLAGS)
   AC_SUBST(HSDIS_LDFLAGS)
   AC_SUBST(HSDIS_LIBS)
-  AC_SUBST(CAPSTONE_ARCH_AARCH64_NAME)
 
   AC_MSG_CHECKING([if hsdis should be bundled])
   if test "x$ENABLE_HSDIS_BUNDLING" = "xtrue"; then

make/autoconf/lib-tests.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 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
@@ -27,9 +27,8 @@
 # Setup libraries and functionalities needed to test the JDK.
 ################################################################################
 
-# Minimum supported versions
-JTREG_MINIMUM_VERSION=7.3.1
-GTEST_MINIMUM_VERSION=1.14.0
+# Minimum supported version
+JTREG_MINIMUM_VERSION=7
 
 ###############################################################################
 #
@@ -55,18 +54,9 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_GTEST],
         AC_MSG_RESULT([no])
         AC_MSG_ERROR([Can't find 'googlemock/include/gmock/gmock.h' under ${with_gtest} given with the --with-gtest option.])
       else
-        GTEST_FRAMEWORK_SRC=$with_gtest
+        GTEST_FRAMEWORK_SRC=${with_gtest}
         AC_MSG_RESULT([$GTEST_FRAMEWORK_SRC])
         UTIL_FIXUP_PATH([GTEST_FRAMEWORK_SRC])
-
-        # Verify that the version is the required one.
-        # This is a simplified version of TOOLCHAIN_CHECK_COMPILER_VERSION
-        gtest_version="`$GREP GOOGLETEST_VERSION $GTEST_FRAMEWORK_SRC/CMakeLists.txt | $SED -e 's/set(GOOGLETEST_VERSION \(.*\))/\1/'`"
-        comparable_actual_version=`$AWK -F. '{ printf("%05d%05d%05d%05d\n", [$]1, [$]2, [$]3, [$]4) }' <<< "$gtest_version"`
-        comparable_minimum_version=`$AWK -F. '{ printf("%05d%05d%05d%05d\n", [$]1, [$]2, [$]3, [$]4) }' <<< "$GTEST_MINIMUM_VERSION"`
-        if test $comparable_actual_version -lt $comparable_minimum_version ; then
-          AC_MSG_ERROR([gtest version is too old, at least version $GTEST_MINIMUM_VERSION is required])
-        fi
       fi
     fi
   fi
@@ -227,47 +217,12 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_JTREG],
   UTIL_FIXUP_PATH(JT_HOME)
   AC_SUBST(JT_HOME)
 
-  # Specify a JDK for running jtreg. Defaults to the BOOT_JDK.
-  AC_ARG_WITH(jtreg-jdk, [AS_HELP_STRING([--with-jdk],
-    [path to JDK for running jtreg @<:@BOOT_JDK@:>@])])
-
-  AC_MSG_CHECKING([for jtreg jdk])
-  if test "x${with_jtreg_jdk}" != x; then
-    if test "x${with_jtreg_jdk}" = xno; then
-      AC_MSG_RESULT([no, jtreg jdk not specified])
-    elif test "x${with_jtreg_jdk}" = xyes; then
-      AC_MSG_RESULT([not specified])
-      AC_MSG_ERROR([--with-jtreg-jdk needs a value])
-    else
-      JTREG_JDK="${with_jtreg_jdk}"
-      AC_MSG_RESULT([$JTREG_JDK])
-      UTIL_FIXUP_PATH(JTREG_JDK)
-      if test ! -f "$JTREG_JDK/bin/java"; then
-        AC_MSG_ERROR([Could not find jtreg java at $JTREG_JDK/bin/java])
-      fi
-    fi
-  else
-    JTREG_JDK="${BOOT_JDK}"
-    AC_MSG_RESULT([no, using BOOT_JDK])
-  fi
-
-  UTIL_FIXUP_PATH(JTREG_JDK)
-  AC_SUBST([JTREG_JDK])
-  # For use in the configure script
-  JTREG_JAVA="$FIXPATH $JTREG_JDK/bin/java"
-
   # Verify jtreg version
   if test "x$JT_HOME" != x; then
-    AC_MSG_CHECKING([jtreg jar existence])
-    if test ! -f "$JT_HOME/lib/jtreg.jar"; then
-      AC_MSG_ERROR([Could not find jtreg jar at $JT_HOME/lib/jtreg.jar])
-    fi
-
     AC_MSG_CHECKING([jtreg version number])
     # jtreg -version looks like this: "jtreg 6.1+1-19"
     # Extract actual version part ("6.1" in this case)
-    jtreg_version_full=$($JTREG_JAVA -jar $JT_HOME/lib/jtreg.jar -version | $HEAD -n 1 | $CUT -d ' ' -f 2)
-
+    jtreg_version_full=`$JAVA -jar $JT_HOME/lib/jtreg.jar -version | $HEAD -n 1 | $CUT -d ' ' -f 2`
     jtreg_version=${jtreg_version_full/%+*}
     AC_MSG_RESULT([$jtreg_version])
 
@@ -314,16 +269,10 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_JIB],
 #
 AC_DEFUN_ONCE([LIB_TESTS_ENABLE_DISABLE_FAILURE_HANDLER],
 [
-  if test "x$BUILD_ENV" = "xci"; then
-    BUILD_FAILURE_HANDLER_DEFAULT=auto
-  else
-    BUILD_FAILURE_HANDLER_DEFAULT=false
-  fi
-
-  UTIL_ARG_ENABLE(NAME: jtreg-failure-handler, DEFAULT: $BUILD_FAILURE_HANDLER_DEFAULT,
+  UTIL_ARG_ENABLE(NAME: jtreg-failure-handler, DEFAULT: auto,
       RESULT: BUILD_FAILURE_HANDLER,
       DESC: [enable building of the jtreg failure handler],
-      DEFAULT_DESC: [enabled if jtreg is present and build env is CI],
+      DEFAULT_DESC: [enabled if jtreg is present],
       CHECKING_MSG: [if the jtreg failure handler should be built],
       CHECK_AVAILABLE: [
         AC_MSG_CHECKING([if the jtreg failure handler is available])
@@ -336,22 +285,3 @@ AC_DEFUN_ONCE([LIB_TESTS_ENABLE_DISABLE_FAILURE_HANDLER],
       ])
   AC_SUBST(BUILD_FAILURE_HANDLER)
 ])
-
-AC_DEFUN_ONCE([LIB_TESTS_ENABLE_DISABLE_JTREG_TEST_THREAD_FACTORY],
-[
-  UTIL_ARG_ENABLE(NAME: jtreg-test-thread-factory, DEFAULT: auto,
-      RESULT: BUILD_JTREG_TEST_THREAD_FACTORY,
-      DESC: [enable building of the jtreg test thread factory],
-      DEFAULT_DESC: [enabled if jtreg is present],
-      CHECKING_MSG: [if the jtreg test thread factory should be built],
-      CHECK_AVAILABLE: [
-        AC_MSG_CHECKING([if the jtreg test thread factory is available])
-        if test "x$JT_HOME" != "x"; then
-          AC_MSG_RESULT([yes])
-        else
-          AVAILABLE=false
-          AC_MSG_RESULT([no (jtreg not present)])
-        fi
-      ])
-  AC_SUBST(BUILD_JTREG_TEST_THREAD_FACTORY)
-])

make/autoconf/lib-wayland.m4

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

make/autoconf/lib-x11.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -35,7 +35,6 @@ AC_DEFUN_ONCE([LIB_SETUP_X11],
     X_CFLAGS=
     X_LIBS=
   else
-    x_libraries_orig="$x_libraries"
 
     if test "x${with_x}" = xno; then
       AC_MSG_ERROR([It is not possible to disable the use of X11. Remove the --without-x option.])
@@ -49,7 +48,6 @@ AC_DEFUN_ONCE([LIB_SETUP_X11],
       fi
       if test "x$x_libraries" = xNONE; then
         x_libraries="${with_x}/lib"
-        x_libraries_orig="$x_libraries"
       fi
     else
       # Check if the user has specified sysroot, but not --with-x, --x-includes or --x-libraries.
@@ -84,8 +82,8 @@ AC_DEFUN_ONCE([LIB_SETUP_X11],
     AC_PATH_XTRA
 
     # AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling
-    # this doesn't make sense so we remove it; same for sysroot (devkit).
-    if test "x$COMPILE_TYPE" = xcross || (test "x$SYSROOT" != "x" && test "x$x_libraries_orig" = xNONE); then
+    # this doesn't make sense so we remove it.
+    if test "x$COMPILE_TYPE" = xcross; then
       X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[[^ ]]*//g'`
     fi
 
@@ -98,29 +96,24 @@ AC_DEFUN_ONCE([LIB_SETUP_X11],
     OLD_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $SYSROOT_CFLAGS $X_CFLAGS"
 
+    HEADERS_TO_CHECK="X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h"
+    # There is no Xrandr extension on AIX
     if test "x$OPENJDK_TARGET_OS" = xaix; then
-      # There is no Xrandr extension on AIX. Code is duplicated to avoid autoconf
-      # 2.71+ warning "AC_CHECK_HEADERS: you should use literals"
       X_CFLAGS="$X_CFLAGS -DNO_XRANDR"
-      AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h],
-          [X11_HEADERS_OK=yes],
-          [X11_HEADERS_OK=no; break],
-          [
-            # include <X11/Xlib.h>
-            # include <X11/Xutil.h>
-          ]
-      )
     else
-      AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h X11/extensions/Xrandr.h],
-          [X11_HEADERS_OK=yes],
-          [X11_HEADERS_OK=no; break],
-          [
-            # include <X11/Xlib.h>
-            # include <X11/Xutil.h>
-          ]
-      )
+      HEADERS_TO_CHECK="$HEADERS_TO_CHECK X11/extensions/Xrandr.h"
     fi
 
+    # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
+    AC_CHECK_HEADERS([$HEADERS_TO_CHECK],
+        [X11_HEADERS_OK=yes],
+        [X11_HEADERS_OK=no; break],
+        [
+          # include <X11/Xlib.h>
+          # include <X11/Xutil.h>
+        ]
+    )
+
     if test "x$X11_HEADERS_OK" = xno; then
       HELP_MSG_MISSING_DEPENDENCY([x11])
       AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h Xrandr.h XTest.h Intrinsic.h). $HELP_MSG])

make/autoconf/libraries.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ m4_include([lib-freetype.m4])
 m4_include([lib-hsdis.m4])
 m4_include([lib-std.m4])
 m4_include([lib-x11.m4])
+m4_include([lib-wayland.m4])
 
 m4_include([lib-tests.m4])
 
@@ -41,14 +42,20 @@ m4_include([lib-tests.m4])
 ################################################################################
 AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
 [
-  # Check if X11 is needed
+  # Check if X11 and wayland is needed
   if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    # No X11 support on windows or macosx
+    # No X11 and wayland support on windows or macosx
     NEEDS_LIB_X11=false
+    NEEDS_LIB_WAYLAND=false
+  elif test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
+    # No X11 support needed when building headless only
+    NEEDS_LIB_X11=false
+    NEEDS_LIB_WAYLAND=false
   else
-    # All other instances need X11, even if building headless only, libawt still
+    # All other instances need X11 and wayland, even if building headless only, libawt still
     # needs X11 headers.
     NEEDS_LIB_X11=true
+    NEEDS_LIB_WAYLAND=true
   fi
 
   # Check if fontconfig is needed
@@ -82,34 +89,13 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
   fi
 
   # Check if ffi is needed
-  if HOTSPOT_CHECK_JVM_VARIANT(zero) || test "x$ENABLE_FALLBACK_LINKER" = "xtrue"; then
+  if HOTSPOT_CHECK_JVM_VARIANT(zero); then
     NEEDS_LIB_FFI=true
   else
     NEEDS_LIB_FFI=false
   fi
 ])
 
-################################################################################
-# Setup BASIC_JVM_LIBS that can be different depending on build/target platform
-################################################################################
-AC_DEFUN([LIB_SETUP_JVM_LIBS],
-[
-  # Atomic library
-  # 32-bit platforms needs fallback library for 8-byte atomic ops on Zero
-  if HOTSPOT_CHECK_JVM_VARIANT(zero); then
-    if test "x$OPENJDK_$1_OS" = xlinux &&
-        (test "x$OPENJDK_$1_CPU" = xarm ||
-         test "x$OPENJDK_$1_CPU" = xm68k ||
-         test "x$OPENJDK_$1_CPU" = xmips ||
-         test "x$OPENJDK_$1_CPU" = xmipsel ||
-         test "x$OPENJDK_$1_CPU" = xppc ||
-         test "x$OPENJDK_$1_CPU" = xsh ||
-         test "x$OPENJDK_$1_CPU" = xriscv32); then
-      BASIC_JVM_LIBS_$1="$BASIC_JVM_LIBS_$1 -latomic"
-    fi
-  fi
-])
-
 ################################################################################
 # Parse library options, and setup needed libraries
 ################################################################################
@@ -126,11 +112,11 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
   LIB_SETUP_LIBFFI
   LIB_SETUP_MISC_LIBS
   LIB_SETUP_X11
+  LIB_SETUP_WAYLAND
 
   LIB_TESTS_SETUP_GTEST
 
   BASIC_JDKLIB_LIBS=""
-  BASIC_JDKLIB_LIBS_TARGET=""
   if test "x$TOOLCHAIN_TYPE" != xmicrosoft; then
     BASIC_JDKLIB_LIBS="-ljava -ljvm"
   fi
@@ -157,6 +143,27 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lrt"
   fi
 
+  # Atomic library
+  # 32-bit platforms needs fallback library for 8-byte atomic ops on Zero
+  if HOTSPOT_CHECK_JVM_VARIANT(zero); then
+    if test "x$OPENJDK_TARGET_OS" = xlinux &&
+        (test "x$OPENJDK_TARGET_CPU" = xarm ||
+         test "x$OPENJDK_TARGET_CPU" = xm68k ||
+         test "x$OPENJDK_TARGET_CPU" = xmips ||
+         test "x$OPENJDK_TARGET_CPU" = xmipsel ||
+         test "x$OPENJDK_TARGET_CPU" = xppc ||
+         test "x$OPENJDK_TARGET_CPU" = xsh ||
+         test "x$OPENJDK_TARGET_CPU" = xriscv32); then
+      BASIC_JVM_LIBS="$BASIC_JVM_LIBS -latomic"
+    fi
+  fi
+
+  # Because RISC-V only has word-sized atomics, it requires libatomic where
+  # other common architectures do not.  So link libatomic by default.
+  if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xriscv64; then
+    BASIC_JVM_LIBS="$BASIC_JVM_LIBS -latomic"
+  fi
+
   # perfstat lib
   if test "x$OPENJDK_TARGET_OS" = xaix; then
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lperfstat"
@@ -164,17 +171,15 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
 
   if test "x$OPENJDK_TARGET_OS" = xwindows; then
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS kernel32.lib user32.lib gdi32.lib winspool.lib \
-        comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib powrprof.lib uuid.lib \
-        ws2_32.lib winmm.lib version.lib psapi.lib"
+        comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \
+        wsock32.lib winmm.lib version.lib psapi.lib"
   fi
-  LIB_SETUP_JVM_LIBS(BUILD)
-  LIB_SETUP_JVM_LIBS(TARGET)
 
   JDKLIB_LIBS="$BASIC_JDKLIB_LIBS"
   JDKEXE_LIBS=""
-  JVM_LIBS="$BASIC_JVM_LIBS $BASIC_JVM_LIBS_TARGET"
+  JVM_LIBS="$BASIC_JVM_LIBS"
   OPENJDK_BUILD_JDKLIB_LIBS="$BASIC_JDKLIB_LIBS"
-  OPENJDK_BUILD_JVM_LIBS="$BASIC_JVM_LIBS $BASIC_JVM_LIBS_BUILD"
+  OPENJDK_BUILD_JVM_LIBS="$BASIC_JVM_LIBS"
 
   AC_SUBST(JDKLIB_LIBS)
   AC_SUBST(JDKEXE_LIBS)

make/autoconf/platform.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -567,6 +567,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
     HOTSPOT_$1_CPU_DEFINE=PPC64
   elif test "x$OPENJDK_$1_CPU" = xppc64le; then
     HOTSPOT_$1_CPU_DEFINE=PPC64
+  elif test "x$OPENJDK_$1_CPU" = xriscv32; then
+    HOTSPOT_$1_CPU_DEFINE=RISCV32
   elif test "x$OPENJDK_$1_CPU" = xriscv64; then
     HOTSPOT_$1_CPU_DEFINE=RISCV64
 
@@ -575,14 +577,10 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
     HOTSPOT_$1_CPU_DEFINE=SPARC
   elif test "x$OPENJDK_$1_CPU" = xppc; then
     HOTSPOT_$1_CPU_DEFINE=PPC32
-  elif test "x$OPENJDK_$1_CPU" = xriscv32; then
-    HOTSPOT_$1_CPU_DEFINE=RISCV32
   elif test "x$OPENJDK_$1_CPU" = xs390; then
     HOTSPOT_$1_CPU_DEFINE=S390
   elif test "x$OPENJDK_$1_CPU" = xs390x; then
     HOTSPOT_$1_CPU_DEFINE=S390
-  elif test "x$OPENJDK_$1_CPU" = xloongarch64; then
-    HOTSPOT_$1_CPU_DEFINE=LOONGARCH64
   elif test "x$OPENJDK_$1_CPU" != x; then
     HOTSPOT_$1_CPU_DEFINE=$(echo $OPENJDK_$1_CPU | tr a-z A-Z)
   fi
@@ -642,7 +640,6 @@ AC_DEFUN([PLATFORM_SET_MODULE_TARGET_OS_VALUES],
 ])
 
 #%%% Build and target systems %%%
-# Make sure to only use tools set up in BASIC_SETUP_FUNDAMENTAL_TOOLS.
 AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET],
 [
   # Figure out the build and target systems. # Note that in autoconf terminology, "build" is obvious, but "target"
@@ -659,21 +656,6 @@ AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET],
   PLATFORM_SET_MODULE_TARGET_OS_VALUES
   PLATFORM_SET_RELEASE_FILE_OS_VALUES
   PLATFORM_SETUP_LEGACY_VARS
-  PLATFORM_CHECK_DEPRECATION
-])
-
-AC_DEFUN([PLATFORM_CHECK_DEPRECATION],
-[
-  AC_ARG_ENABLE(deprecated-ports, [AS_HELP_STRING([--enable-deprecated-ports@<:@=yes/no@:>@],
-       [Suppress the error when configuring for a deprecated port @<:@no@:>@])])
-  if test "x$OPENJDK_TARGET_OS" = xwindows && test "x$OPENJDK_TARGET_CPU" = xx86; then
-    if test "x$enable_deprecated_ports" = "xyes"; then
-      AC_MSG_WARN([The Windows 32-bit x86 port is deprecated and may be removed in a future release.])
-    else
-      AC_MSG_ERROR(m4_normalize([The Windows 32-bit x86 port is deprecated and may be removed in a future release.
-        Use --enable-deprecated-ports=yes to suppress this error.]))
-    fi
-  fi
 ])
 
 AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION],
@@ -741,7 +723,7 @@ AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_TARGET_ENDIANNESS],
 [
   ###############################################################################
   #
-  # Is the target little or big endian?
+  # Is the target little of big endian?
   #
   AC_C_BIGENDIAN([ENDIAN="big"],[ENDIAN="little"],[ENDIAN="unknown"],[ENDIAN="universal_endianness"])
 

make/autoconf/spec.gmk.in

@@ -0,0 +1,986 @@
+#
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# 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.
+#
+
+# Configured @DATE_WHEN_CONFIGURED@ to build
+# for target system @OPENJDK_TARGET_OS@-@OPENJDK_TARGET_CPU@
+#   (called @OPENJDK_TARGET_AUTOCONF_NAME@ by autoconf)
+# on build system @OPENJDK_BUILD_OS@-@OPENJDK_BUILD_CPU@
+#   (called @OPENJDK_BUILD_AUTOCONF_NAME@ by autoconf)
+# using 'configure @CONFIGURE_COMMAND_LINE@'
+
+# The command line given to configure.
+CONFIGURE_COMMAND_LINE:=@CONFIGURE_COMMAND_LINE@
+# The current directory when configure was run
+CONFIGURE_START_DIR:=@CONFIGURE_START_DIR@
+
+# A self-referential reference to this file.
+SPEC:=@SPEC@
+
+# Path to autoconf if overridden by the user, to be used by "make reconfigure"
+AUTOCONF := @AUTOCONF@
+
+# SPACE and COMMA are defined in MakeBase.gmk, but they are also used in
+# some definitions here, and are needed if MakeBase.gmk is not included before
+# this file.
+X:=
+SPACE:=$(X) $(X)
+COMMA:=,
+
+# What make to use for main processing, after bootstrapping top-level Makefile.
+MAKE := @MAKE@
+
+# Make sure all shell commands are executed with the C locale
+export LC_ALL := C
+
+# Make sure we override any local CLASSPATH variable
+export CLASSPATH := @CLASSPATH@
+
+# The default make arguments
+MAKE_ARGS = $(MAKE_LOG_FLAGS) -r -R -I $(TOPDIR)/make/common SPEC=$(SPEC) \
+    MAKE_LOG_FLAGS="$(MAKE_LOG_FLAGS)" $(MAKE_LOG_VARS)
+
+OUTPUT_SYNC_SUPPORTED:=@OUTPUT_SYNC_SUPPORTED@
+OUTPUT_SYNC:=@OUTPUT_SYNC@
+
+# Override the shell with bash
+BASH:=@BASH@
+BASH_ARGS:=@BASH_ARGS@
+SHELL:=$(BASH) $(BASH_ARGS)
+
+# The "human readable" name of this configuration
+CONF_NAME:=@CONF_NAME@
+
+# The built jdk will run in this target system.
+OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@
+OPENJDK_TARGET_OS_TYPE:=@OPENJDK_TARGET_OS_TYPE@
+OPENJDK_TARGET_OS_ENV:=@OPENJDK_TARGET_OS_ENV@
+OPENJDK_TARGET_OS_UPPERCASE:=@OPENJDK_TARGET_OS_UPPERCASE@
+
+OPENJDK_TARGET_CPU:=@OPENJDK_TARGET_CPU@
+OPENJDK_TARGET_CPU_ARCH:=@OPENJDK_TARGET_CPU_ARCH@
+OPENJDK_TARGET_CPU_BITS:=@OPENJDK_TARGET_CPU_BITS@
+OPENJDK_TARGET_CPU_ENDIAN:=@OPENJDK_TARGET_CPU_ENDIAN@
+
+OPENJDK_TARGET_LIBC:=@OPENJDK_TARGET_LIBC@
+
+COMPILE_TYPE:=@COMPILE_TYPE@
+
+# Legacy support
+OPENJDK_TARGET_CPU_LEGACY:=@OPENJDK_TARGET_CPU_LEGACY@
+OPENJDK_TARGET_CPU_LEGACY_LIB:=@OPENJDK_TARGET_CPU_LEGACY_LIB@
+OPENJDK_TARGET_CPU_OSARCH:=@OPENJDK_TARGET_CPU_OSARCH@
+OPENJDK_TARGET_OS_INCLUDE_SUBDIR:=@OPENJDK_TARGET_OS_INCLUDE_SUBDIR@
+
+HOTSPOT_TARGET_OS := @HOTSPOT_TARGET_OS@
+HOTSPOT_TARGET_OS_TYPE := @HOTSPOT_TARGET_OS_TYPE@
+
+HOTSPOT_TARGET_CPU := @HOTSPOT_TARGET_CPU@
+HOTSPOT_TARGET_CPU_ARCH := @HOTSPOT_TARGET_CPU_ARCH@
+HOTSPOT_TARGET_CPU_DEFINE := @HOTSPOT_TARGET_CPU_DEFINE@
+
+HOTSPOT_TARGET_LIBC := @HOTSPOT_TARGET_LIBC@
+
+OPENJDK_TARGET_BUNDLE_PLATFORM:=@OPENJDK_TARGET_BUNDLE_PLATFORM@
+JDK_ARCH_ABI_PROP_NAME := @JDK_ARCH_ABI_PROP_NAME@
+
+# We are building on this build system.
+# When not cross-compiling, it is the same as the target.
+OPENJDK_BUILD_OS:=@OPENJDK_BUILD_OS@
+OPENJDK_BUILD_OS_TYPE:=@OPENJDK_BUILD_OS_TYPE@
+OPENJDK_BUILD_OS_ENV:=@OPENJDK_BUILD_OS_ENV@
+
+OPENJDK_BUILD_CPU:=@OPENJDK_BUILD_CPU@
+OPENJDK_BUILD_CPU_ARCH:=@OPENJDK_BUILD_CPU_ARCH@
+OPENJDK_BUILD_CPU_BITS:=@OPENJDK_BUILD_CPU_BITS@
+OPENJDK_BUILD_CPU_ENDIAN:=@OPENJDK_BUILD_CPU_ENDIAN@
+
+OPENJDK_BUILD_LIBC:=@OPENJDK_BUILD_LIBC@
+
+OPENJDK_BUILD_OS_INCLUDE_SUBDIR:=@OPENJDK_TARGET_OS_INCLUDE_SUBDIR@
+
+# Target platform value in ModuleTarget class file attribute.
+OPENJDK_MODULE_TARGET_PLATFORM:=@OPENJDK_MODULE_TARGET_PLATFORM@
+
+# OS_* properties in release file
+RELEASE_FILE_OS_NAME:=@RELEASE_FILE_OS_NAME@
+RELEASE_FILE_OS_ARCH:=@RELEASE_FILE_OS_ARCH@
+RELEASE_FILE_LIBC:=@RELEASE_FILE_LIBC@
+
+SOURCE_DATE := @SOURCE_DATE@
+ISO_8601_FORMAT_STRING := @ISO_8601_FORMAT_STRING@
+
+ifneq ($(SOURCE_DATE), updated)
+  # For "updated" source date value, these are set in InitSupport.gmk
+  export SOURCE_DATE_EPOCH := $(SOURCE_DATE)
+  SOURCE_DATE_ISO_8601 := @SOURCE_DATE_ISO_8601@
+endif
+
+LIBM:=@LIBM@
+LIBDL:=@LIBDL@
+
+WINENV_ROOT := @WINENV_ROOT@
+WINENV_PREFIX := @WINENV_PREFIX@
+
+ifneq ($(findstring windows.wsl, @OPENJDK_BUILD_OS_ENV@), )
+  # Tell WSL to convert PATH between linux and windows
+  export WSLENV := PATH/l
+else ifeq (@OPENJDK_BUILD_OS_ENV@, windows.msys2)
+  # Prohibit msys2 from attempting any path wrangling
+  export MSYS2_ARG_CONV_EXCL := "*"
+endif
+
+# Save the original path before replacing it with the Visual Studio tools
+ORIGINAL_PATH := @ORIGINAL_PATH@
+
+ifeq (@TOOLCHAIN_TYPE@, microsoft)
+  # The Visual Studio toolchain needs the PATH to be adjusted to include
+  # Visual Studio tools.
+  export PATH := @TOOLCHAIN_PATH@:$(PATH)
+endif
+
+SYSROOT_CFLAGS := @SYSROOT_CFLAGS@
+SYSROOT_LDFLAGS := @SYSROOT_LDFLAGS@
+
+# The top-level directory of the source repository
+TOPDIR:=@TOPDIR@
+# Usually the top level directory, but could be something else if a custom
+# root is defined.
+WORKSPACE_ROOT:=@WORKSPACE_ROOT@
+IMPORT_MODULES_CLASSES:=@IMPORT_MODULES_CLASSES@
+IMPORT_MODULES_CMDS:=@IMPORT_MODULES_CMDS@
+IMPORT_MODULES_LIBS:=@IMPORT_MODULES_LIBS@
+IMPORT_MODULES_CONF:=@IMPORT_MODULES_CONF@
+IMPORT_MODULES_LEGAL:=@IMPORT_MODULES_LEGAL@
+IMPORT_MODULES_MAN:=@IMPORT_MODULES_MAN@
+IMPORT_MODULES_SRC:=@IMPORT_MODULES_SRC@
+IMPORT_MODULES_MAKE:=@IMPORT_MODULES_MAKE@
+
+COPYRIGHT_YEAR:=@COPYRIGHT_YEAR@
+HOTSPOT_BUILD_TIME:=@HOTSPOT_BUILD_TIME@
+
+# Platform naming variables
+LAUNCHER_NAME:=@LAUNCHER_NAME@
+PRODUCT_NAME:=@PRODUCT_NAME@
+PRODUCT_SUFFIX:=@PRODUCT_SUFFIX@
+JDK_RC_PLATFORM_NAME:=@JDK_RC_PLATFORM_NAME@
+JDK_RC_NAME:=@JDK_RC_NAME@
+COMPANY_NAME:=@COMPANY_NAME@
+HOTSPOT_VM_DISTRO:=@HOTSPOT_VM_DISTRO@
+MACOSX_BUNDLE_NAME_BASE=@MACOSX_BUNDLE_NAME_BASE@
+MACOSX_BUNDLE_ID_BASE=@MACOSX_BUNDLE_ID_BASE@
+MACOSX_BUNDLE_BUILD_VERSION=@MACOSX_BUNDLE_BUILD_VERSION@
+USERNAME:=@USERNAME@
+VENDOR_URL:=@VENDOR_URL@
+VENDOR_URL_BUG:=@VENDOR_URL_BUG@
+VENDOR_URL_VM_BUG:=@VENDOR_URL_VM_BUG@
+
+# New (JEP-223) version information
+
+## Building blocks of the version string
+# First three version numbers, with well-specified meanings (numerical)
+VERSION_FEATURE := @VERSION_FEATURE@
+VERSION_INTERIM := @VERSION_INTERIM@
+VERSION_UPDATE := @VERSION_UPDATE@
+VERSION_PATCH := @VERSION_PATCH@
+VERSION_EXTRA1 := @VERSION_EXTRA1@
+VERSION_EXTRA2 := @VERSION_EXTRA2@
+VERSION_EXTRA3 := @VERSION_EXTRA3@
+# The pre-release identifier (string)
+VERSION_PRE := @VERSION_PRE@
+# The build number (numerical)
+VERSION_BUILD := @VERSION_BUILD@
+# Optional build information (string)
+VERSION_OPT := @VERSION_OPT@
+
+## Composite variables
+# The version number as a dot separated sequence of numbers, e.g. 9.0.1
+VERSION_NUMBER := @VERSION_NUMBER@
+# VERSION_NUMBER but always with exactly 4 positions, with 0 for empty positions.
+VERSION_NUMBER_FOUR_POSITIONS := @VERSION_NUMBER_FOUR_POSITIONS@
+# The complete version string, with additional build information
+VERSION_STRING := @VERSION_STRING@
+# The short version string, without trailing zeroes and just PRE, if present.
+VERSION_SHORT := @VERSION_SHORT@
+# The Java specification version. It usually equals the feature version number.
+VERSION_SPECIFICATION := @VERSION_FEATURE@
+# A GA version is defined by the PRE string being empty. Rather than testing for
+# that, this variable defines it with true/false.
+VERSION_IS_GA := @VERSION_IS_GA@
+
+# Version date
+VERSION_DATE := @VERSION_DATE@
+
+# Vendor version string
+VENDOR_VERSION_STRING := @VENDOR_VERSION_STRING@
+
+# Class-file version
+VERSION_CLASSFILE_MAJOR := @VERSION_CLASSFILE_MAJOR@
+VERSION_CLASSFILE_MINOR := @VERSION_CLASSFILE_MINOR@
+
+# Version for API docs "new-since" feature
+VERSION_DOCS_API_SINCE := @VERSION_DOCS_API_SINCE@
+
+JDK_SOURCE_TARGET_VERSION := @JDK_SOURCE_TARGET_VERSION@
+
+# Convenience CFLAGS settings for passing version information into native programs.
+VERSION_CFLAGS = \
+    -DVERSION_FEATURE=$(VERSION_FEATURE) \
+    -DVERSION_INTERIM=$(VERSION_INTERIM) \
+    -DVERSION_UPDATE=$(VERSION_UPDATE) \
+    -DVERSION_PATCH=$(VERSION_PATCH) \
+    -DVERSION_EXTRA1=$(VERSION_EXTRA1) \
+    -DVERSION_EXTRA2=$(VERSION_EXTRA2) \
+    -DVERSION_EXTRA3=$(VERSION_EXTRA3) \
+    -DVERSION_PRE='"$(VERSION_PRE)"' \
+    -DVERSION_BUILD=$(VERSION_BUILD) \
+    -DVERSION_OPT='"$(VERSION_OPT)"' \
+    -DVERSION_NUMBER='"$(VERSION_NUMBER)"' \
+    -DVERSION_STRING='"$(VERSION_STRING)"' \
+    -DVERSION_SHORT='"$(VERSION_SHORT)"' \
+    -DVERSION_SPECIFICATION='"$(VERSION_SPECIFICATION)"' \
+    -DVERSION_DATE='"$(VERSION_DATE)"' \
+    -DVENDOR_VERSION_STRING='"$(VENDOR_VERSION_STRING)"' \
+    -DVERSION_CLASSFILE_MAJOR=$(VERSION_CLASSFILE_MAJOR) \
+    -DVERSION_CLASSFILE_MINOR=$(VERSION_CLASSFILE_MINOR) \
+    #
+
+ifneq ($(COMPANY_NAME),)
+  # COMPANY_NAME is set to "N/A" in make/conf/branding.conf by default,
+  # but can be customized with the '--with-vendor-name' configure option.
+  # Only export "VENDOR" to the build if COMPANY_NAME contains a real value.
+  # Otherwise the default value for VENDOR, which is used to set the "java.vendor"
+  # and "java.vm.vendor" properties is hard-coded into the source code (i.e. in
+  # VersionProps.java.template in the jdk for "java.vendor" and
+  # vm_version.cpp in the VM for "java.vm.vendor")
+  ifneq ($(COMPANY_NAME), N/A)
+    VERSION_CFLAGS += -DVENDOR='"$(COMPANY_NAME)"'
+  endif
+endif
+
+# Only export VENDOR_URL, VENDOR_URL_BUG and VENDOR_VM_URL_BUG to the build if
+# they are not empty. Otherwise, default values which are defined in the sources
+# will be used.
+ifneq ($(VENDOR_URL),)
+  VERSION_CFLAGS += -DVENDOR_URL='"$(VENDOR_URL)"'
+endif
+ifneq ($(VENDOR_URL_BUG),)
+  VERSION_CFLAGS += -DVENDOR_URL_BUG='"$(VENDOR_URL_BUG)"'
+endif
+ifneq ($(VENDOR_URL_VM_BUG),)
+  VERSION_CFLAGS += -DVENDOR_URL_VM_BUG='"$(VENDOR_URL_VM_BUG)"'
+endif
+
+# Different naming strings generated from the above information.
+RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX)
+
+# How to compile the code: release, fastdebug or slowdebug
+DEBUG_LEVEL:=@DEBUG_LEVEL@
+HOTSPOT_DEBUG_LEVEL:=@HOTSPOT_DEBUG_LEVEL@
+
+# Which JVM variants to build (space-separated list)
+JVM_VARIANTS := @JVM_VARIANTS@
+JVM_VARIANT_MAIN := @JVM_VARIANT_MAIN@
+
+# Lists of features per variant. Only relevant for the variants listed in
+# JVM_VARIANTS.
+JVM_FEATURES_server := @JVM_FEATURES_server@
+JVM_FEATURES_client := @JVM_FEATURES_client@
+JVM_FEATURES_core := @JVM_FEATURES_core@
+JVM_FEATURES_minimal := @JVM_FEATURES_minimal@
+JVM_FEATURES_zero := @JVM_FEATURES_zero@
+JVM_FEATURES_custom := @JVM_FEATURES_custom@
+
+# Used for make-time verifications
+VALID_JVM_FEATURES := @VALID_JVM_FEATURES@
+VALID_JVM_VARIANTS := @VALID_JVM_VARIANTS@
+
+# Allow overriding the default hotspot library path
+HOTSPOT_OVERRIDE_LIBPATH := @HOTSPOT_OVERRIDE_LIBPATH@
+
+# Control use of precompiled header in hotspot libjvm build
+USE_PRECOMPILED_HEADER := @USE_PRECOMPILED_HEADER@
+
+# Only build headless support or not
+ENABLE_HEADLESS_ONLY := @ENABLE_HEADLESS_ONLY@
+
+ENABLE_LINKTIME_GC := @ENABLE_LINKTIME_GC@
+
+# Ship debug symbols (e.g. pdbs on Windows)
+SHIP_DEBUG_SYMBOLS := @SHIP_DEBUG_SYMBOLS@
+
+ENABLE_FULL_DOCS := @ENABLE_FULL_DOCS@
+
+# JDK_OUTPUTDIR specifies where a working jvm is built.
+# You can run $(JDK_OUTPUTDIR)/bin/java
+
+OUTPUTDIR := @OUTPUTDIR@
+# Colon left out to be able to override IMAGES_OUTPUTDIR for bootcycle-images
+SUPPORT_OUTPUTDIR=$(OUTPUTDIR)/support
+BUILDTOOLS_OUTPUTDIR=$(OUTPUTDIR)/buildtools
+
+HOTSPOT_OUTPUTDIR=$(OUTPUTDIR)/hotspot
+JDK_OUTPUTDIR=$(OUTPUTDIR)/jdk
+IMAGES_OUTPUTDIR=$(OUTPUTDIR)/images
+BUNDLES_OUTPUTDIR=$(OUTPUTDIR)/bundles
+TESTMAKE_OUTPUTDIR=$(OUTPUTDIR)/test-make
+MAKESUPPORT_OUTPUTDIR=$(OUTPUTDIR)/make-support
+
+# This does not get overridden in a bootcycle build
+CONFIGURESUPPORT_OUTPUTDIR:=@CONFIGURESUPPORT_OUTPUTDIR@
+BUILDJDK_OUTPUTDIR=$(OUTPUTDIR)/buildjdk
+
+BUILD_FAILURE_HANDLER := @BUILD_FAILURE_HANDLER@
+
+ENABLE_GENERATE_CLASSLIST := @ENABLE_GENERATE_CLASSLIST@
+
+EXCLUDE_TRANSLATIONS := @EXCLUDE_TRANSLATIONS@
+
+BUILD_MANPAGES := @BUILD_MANPAGES@
+
+BUILD_CDS_ARCHIVE := @BUILD_CDS_ARCHIVE@
+
+ENABLE_COMPATIBLE_CDS_ALIGNMENT := @ENABLE_COMPATIBLE_CDS_ALIGNMENT@
+
+ALLOW_ABSOLUTE_PATHS_IN_OUTPUT := @ALLOW_ABSOLUTE_PATHS_IN_OUTPUT@
+
+HSDIS_BACKEND := @HSDIS_BACKEND@
+ENABLE_HSDIS_BUNDLING := @ENABLE_HSDIS_BUNDLING@
+HSDIS_CFLAGS := @HSDIS_CFLAGS@
+HSDIS_LDFLAGS := @HSDIS_LDFLAGS@
+HSDIS_LIBS := @HSDIS_LIBS@
+
+# The boot jdk to use. This is overridden in bootcycle-spec.gmk. Make sure to keep
+# it in sync.
+BOOT_JDK:=@BOOT_JDK@
+
+BUILD_JDK:=@BUILD_JDK@
+CREATE_BUILDJDK:=@CREATE_BUILDJDK@
+EXTERNAL_BUILDJDK:=@EXTERNAL_BUILDJDK@
+
+# Whether the boot jdk jar supports --date=TIMESTAMP
+BOOT_JDK_JAR_SUPPORTS_DATE:=@BOOT_JDK_JAR_SUPPORTS_DATE@
+
+# When compiling Java source to be run by the boot jdk
+# use these extra flags, eg -source 6 -target 6
+BOOT_JDK_SOURCETARGET:=@BOOT_JDK_SOURCETARGET@
+
+# Information about the build system
+NUM_CORES:=@NUM_CORES@
+MEMORY_SIZE:=@MEMORY_SIZE@
+ENABLE_JAVAC_SERVER:=@ENABLE_JAVAC_SERVER@
+# Store javac server synchronization files here, and
+# the javac server log files.
+JAVAC_SERVER_DIR=$(MAKESUPPORT_OUTPUTDIR)/javacservers
+
+# Number of parallel jobs to use for compilation
+JOBS?=@JOBS@
+TEST_JOBS?=@TEST_JOBS@
+
+# Default make target
+DEFAULT_MAKE_TARGET:=@DEFAULT_MAKE_TARGET@
+DEFAULT_LOG:=@DEFAULT_LOG@
+
+FREETYPE_TO_USE:=@FREETYPE_TO_USE@
+FREETYPE_LIBS:=@FREETYPE_LIBS@
+FREETYPE_CFLAGS:=@FREETYPE_CFLAGS@
+FONTCONFIG_CFLAGS:=@FONTCONFIG_CFLAGS@
+CUPS_CFLAGS:=@CUPS_CFLAGS@
+ALSA_LIBS:=@ALSA_LIBS@
+ALSA_CFLAGS:=@ALSA_CFLAGS@
+LIBFFI_LIBS:=@LIBFFI_LIBS@
+LIBFFI_CFLAGS:=@LIBFFI_CFLAGS@
+ENABLE_LIBFFI_BUNDLING:=@ENABLE_LIBFFI_BUNDLING@
+LIBFFI_LIB_FILE:=@LIBFFI_LIB_FILE@
+FILE_MACRO_CFLAGS := @FILE_MACRO_CFLAGS@
+BRANCH_PROTECTION_CFLAGS := @BRANCH_PROTECTION_CFLAGS@
+
+STATIC_LIBS_CFLAGS := @STATIC_LIBS_CFLAGS@
+
+JMH_CORE_JAR := @JMH_CORE_JAR@
+JMH_GENERATOR_JAR := @JMH_GENERATOR_JAR@
+JMH_JOPT_SIMPLE_JAR := @JMH_JOPT_SIMPLE_JAR@
+JMH_COMMONS_MATH_JAR := @JMH_COMMONS_MATH_JAR@
+JMH_VERSION := @JMH_VERSION@
+
+GTEST_FRAMEWORK_SRC := @GTEST_FRAMEWORK_SRC@
+
+# Source file for cacerts
+CACERTS_FILE=@CACERTS_FILE@
+# Source folder for user provided cacerts PEM files
+CACERTS_SRC=@CACERTS_SRC@
+
+# Enable unlimited crypto policy
+UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@
+
+GCOV_ENABLED=@GCOV_ENABLED@
+JCOV_ENABLED=@JCOV_ENABLED@
+JCOV_HOME=@JCOV_HOME@
+JCOV_INPUT_JDK=@JCOV_INPUT_JDK@
+JCOV_FILTERS=@JCOV_FILTERS@
+
+# AddressSanitizer
+export ASAN_ENABLED:=@ASAN_ENABLED@
+export DEVKIT_LIB_DIR:=@DEVKIT_LIB_DIR@
+ifeq ($(ASAN_ENABLED), yes)
+  export ASAN_OPTIONS=handle_segv=0 detect_leaks=0
+  ifneq ($(DEVKIT_LIB_DIR),)
+    export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(DEVKIT_LIB_DIR)
+  endif
+endif
+
+# Necessary additional compiler flags to compile X11
+X_CFLAGS:=@X_CFLAGS@
+X_LIBS:=@X_LIBS@
+WAYLAND_CFLAGS:=@WAYLAND_CFLAGS@
+WAYLAND_LIBS:=@WAYLAND_LIBS@
+# The lowest required version of macosx
+MACOSX_VERSION_MIN=@MACOSX_VERSION_MIN@
+# The highest allowed version of macosx
+MACOSX_VERSION_MAX=@MACOSX_VERSION_MAX@
+
+# The macosx code signing configuration
+MACOSX_CODESIGN_MODE:=@MACOSX_CODESIGN_MODE@
+MACOSX_CODESIGN_IDENTITY=@MACOSX_CODESIGN_IDENTITY@
+
+# Toolchain type: gcc, clang, xlc, microsoft...
+TOOLCHAIN_TYPE:=@TOOLCHAIN_TYPE@
+TOOLCHAIN_VERSION := @TOOLCHAIN_VERSION@
+CC_VERSION_NUMBER := @CC_VERSION_NUMBER@
+CXX_VERSION_NUMBER := @CXX_VERSION_NUMBER@
+
+# Legacy support
+HOTSPOT_TOOLCHAIN_TYPE := @HOTSPOT_TOOLCHAIN_TYPE@
+
+# Option used to tell the compiler whether to create 32- or 64-bit executables
+COMPILER_TARGET_BITS_FLAG:=@COMPILER_TARGET_BITS_FLAG@
+COMPILER_SUPPORTS_TARGET_BITS_FLAG=@COMPILER_SUPPORTS_TARGET_BITS_FLAG@
+
+# Option used to pass a command file to the compiler
+COMPILER_COMMAND_FILE_FLAG:=@COMPILER_COMMAND_FILE_FLAG@
+
+# Option for specifying a file which saves the binder commands
+# produced by the link step (for debugging, currently AIX only)
+COMPILER_BINDCMD_FILE_FLAG:=@COMPILER_BINDCMD_FILE_FLAG@
+
+CC_OUT_OPTION:=@CC_OUT_OPTION@
+LD_OUT_OPTION:=@LD_OUT_OPTION@
+AR_OUT_OPTION:=@AR_OUT_OPTION@
+
+# Flags used for overriding the default opt setting for a C/C++ source file.
+C_O_FLAG_HIGHEST_JVM:=@C_O_FLAG_HIGHEST_JVM@
+C_O_FLAG_HIGHEST:=@C_O_FLAG_HIGHEST@
+C_O_FLAG_HI:=@C_O_FLAG_HI@
+C_O_FLAG_NORM:=@C_O_FLAG_NORM@
+C_O_FLAG_NONE:=@C_O_FLAG_NONE@
+C_O_FLAG_SIZE:=@C_O_FLAG_SIZE@
+CXX_O_FLAG_HIGHEST_JVM:=@CXX_O_FLAG_HIGHEST_JVM@
+CXX_O_FLAG_HIGHEST:=@CXX_O_FLAG_HIGHEST@
+CXX_O_FLAG_HI:=@CXX_O_FLAG_HI@
+CXX_O_FLAG_NORM:=@CXX_O_FLAG_NORM@
+CXX_O_FLAG_NONE:=@CXX_O_FLAG_NONE@
+CXX_O_FLAG_SIZE:=@CXX_O_FLAG_SIZE@
+
+GENDEPS_FLAGS := @GENDEPS_FLAGS@
+
+DISABLE_WARNING_PREFIX := @DISABLE_WARNING_PREFIX@
+CFLAGS_WARNINGS_ARE_ERRORS:=@CFLAGS_WARNINGS_ARE_ERRORS@
+DISABLED_WARNINGS := @DISABLED_WARNINGS@
+DISABLED_WARNINGS_C := @DISABLED_WARNINGS_C@
+DISABLED_WARNINGS_CXX := @DISABLED_WARNINGS_CXX@
+
+# A global flag (true or false) determining if native warnings are considered errors.
+WARNINGS_AS_ERRORS := @WARNINGS_AS_ERRORS@
+
+CFLAGS_CCACHE:=@CFLAGS_CCACHE@
+ADLC_LANGSTD_CXXFLAGS=@ADLC_LANGSTD_CXXFLAGS@
+ADLC_LDFLAGS=@ADLC_LDFLAGS@
+
+# Tools that potentially need to be cross compilation aware.
+CC := @CCACHE@ @ICECC@ @CC@
+
+# CFLAGS used to compile the jdk native libraries (C-code)
+CFLAGS_JDKLIB:=@CFLAGS_JDKLIB@
+CXXFLAGS_JDKLIB:=@CXXFLAGS_JDKLIB@
+
+# CFLAGS used to compile the jdk native launchers (C-code)
+CFLAGS_JDKEXE:=@CFLAGS_JDKEXE@
+CXXFLAGS_JDKEXE:=@CXXFLAGS_JDKEXE@
+
+FDLIBM_CFLAGS := @FDLIBM_CFLAGS@
+JVM_CFLAGS := @JVM_CFLAGS@
+JVM_LDFLAGS := @JVM_LDFLAGS@
+JVM_ASFLAGS := @JVM_ASFLAGS@
+JVM_LIBS := @JVM_LIBS@
+
+BASIC_ASFLAGS := @BASIC_ASFLAGS@
+
+# These flags might contain variables set by a custom extension that is included later.
+EXTRA_CFLAGS = @EXTRA_CFLAGS@
+EXTRA_CXXFLAGS = @EXTRA_CXXFLAGS@
+EXTRA_LDFLAGS = @EXTRA_LDFLAGS@
+EXTRA_ASFLAGS = @EXTRA_ASFLAGS@
+
+CXX := @CCACHE@ @ICECC@ @CXX@
+
+CPP := @CPP@
+
+# The linker can be gcc or ld on unix systems, or link.exe on windows systems.
+LD := @LD@
+
+SYSROOT := @SYSROOT@
+
+# LDFLAGS used to link the jdk native libraries (C-code)
+LDFLAGS_JDKLIB:=@LDFLAGS_JDKLIB@
+JDKLIB_LIBS:=@JDKLIB_LIBS@
+
+# LDFLAGS used to link the jdk native launchers (C-code)
+LDFLAGS_JDKEXE:=@LDFLAGS_JDKEXE@
+JDKEXE_LIBS:=@JDKEXE_LIBS@
+
+# LDFLAGS specific to C++ linking.
+LDFLAGS_CXX_JDK:=@LDFLAGS_CXX_JDK@
+
+# Sometimes a different linker is needed for c++ libs
+LDCXX := @LDCXX@
+# The flags for linking libstdc++ linker.
+LIBCXX:=@LIBCXX@
+
+# Compiler and linker flags used when building native tests
+LDFLAGS_TESTEXE:=@LDFLAGS_TESTEXE@
+
+# BUILD_CC/BUILD_LD is a compiler/linker that generates code that is runnable on the
+# build platform.
+BUILD_CC := @BUILD_ICECC@ @BUILD_CC@
+BUILD_CXX := @BUILD_ICECC@ @BUILD_CXX@
+BUILD_LD := @BUILD_LD@
+BUILD_LDCXX := @BUILD_LDCXX@
+BUILD_AS := @BUILD_AS@
+BUILD_AR := @BUILD_AR@
+BUILD_NM := @BUILD_NM@
+BUILD_OBJCOPY:=@BUILD_OBJCOPY@
+BUILD_STRIP:=@BUILD_STRIP@
+BUILD_SYSROOT_CFLAGS:=@BUILD_SYSROOT_CFLAGS@
+BUILD_SYSROOT_LDFLAGS:=@BUILD_SYSROOT_LDFLAGS@
+
+AS := @AS@
+
+# AR is used to create a static library (is ar in unix, lib.exe in windows)
+AR := @AR@
+ARFLAGS:=@ARFLAGS@
+
+NM:=@NM@
+STRIP:=@STRIP@
+OBJDUMP:=@OBJDUMP@
+CXXFILT:=@CXXFILT@
+
+LIPO:=@LIPO@
+INSTALL_NAME_TOOL:=@INSTALL_NAME_TOOL@
+METAL := @METAL@
+METALLIB := @METALLIB@
+
+# Options to linker to specify a mapfile.
+# (Note absence of := assignment, because we do not want to evaluate the macro body here)
+SET_SHARED_LIBRARY_MAPFILE=@SET_SHARED_LIBRARY_MAPFILE@
+
+#
+# Options for generating debug symbols
+COMPILE_WITH_DEBUG_SYMBOLS := @COMPILE_WITH_DEBUG_SYMBOLS@
+COPY_DEBUG_SYMBOLS := @COPY_DEBUG_SYMBOLS@
+ZIP_EXTERNAL_DEBUG_SYMBOLS := @ZIP_EXTERNAL_DEBUG_SYMBOLS@
+
+CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
+ASFLAGS_DEBUG_SYMBOLS:=@ASFLAGS_DEBUG_SYMBOLS@
+
+#
+# Compress (or not) jars
+COMPRESS_JARS=@COMPRESS_JARS@
+
+# Options to linker to specify the library name.
+# (Note absence of := assignment, because we do not want to evaluate the macro body here)
+SET_SHARED_LIBRARY_NAME=@SET_SHARED_LIBRARY_NAME@
+
+SHARED_LIBRARY_FLAGS=@SHARED_LIBRARY_FLAGS@
+
+# Set origin using the linker, ie use the relative path to the dependent library to find the dependencies.
+# (Note absence of := assignment, because we do not want to evaluate the macro body here)
+SET_SHARED_LIBRARY_ORIGIN=@SET_SHARED_LIBRARY_ORIGIN@
+SET_EXECUTABLE_ORIGIN=@SET_EXECUTABLE_ORIGIN@
+
+# Different OS:es have different ways of naming shared libraries.
+# The SHARED_LIBRARY macro takes "verify" as and argument and returns:
+#    "libverify.so" or "libverify.dylib" or "verify.dll" depending on platform.
+# (Note absence of := assignment, because we do not want to evaluate the macro body here)
+SHARED_LIBRARY=@SHARED_LIBRARY@
+STATIC_LIBRARY=@STATIC_LIBRARY@
+LIBRARY_PREFIX:=@LIBRARY_PREFIX@
+SHARED_LIBRARY_SUFFIX:=@SHARED_LIBRARY_SUFFIX@
+STATIC_LIBRARY_SUFFIX:=@STATIC_LIBRARY_SUFFIX@
+EXECUTABLE_SUFFIX:=@EXECUTABLE_SUFFIX@
+OBJ_SUFFIX:=@OBJ_SUFFIX@
+STATIC_BUILD:=@STATIC_BUILD@
+
+STRIPFLAGS:=@STRIPFLAGS@
+
+JAVA_FLAGS:=@JAVA_FLAGS@
+JAVA_FLAGS_BIG:=@JAVA_FLAGS_BIG@
+JAVA_FLAGS_SMALL:=@JAVA_FLAGS_SMALL@
+BUILDJDK_JAVA_FLAGS_SMALL:=@BUILDJDK_JAVA_FLAGS_SMALL@
+JAVA_TOOL_FLAGS_SMALL:=@JAVA_TOOL_FLAGS_SMALL@
+
+# The *_CMD variables are defined separately to be easily overridden in bootcycle-spec.gmk
+# for bootcycle-images build. Make sure to keep them in sync. Do not use the *_CMD
+# versions of the variables directly.
+JAVA_CMD:=@JAVA@
+JAVAC_CMD:=@JAVAC@
+JAVADOC_CMD:=@JAVADOC@
+JAR_CMD:=@JAR@
+JLINK_CMD := @JLINK@
+JMOD_CMD := @JMOD@
+# These variables are meant to be used. They are defined with = instead of := to make
+# it possible to override only the *_CMD variables.
+JAVA = $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
+JAVA_SMALL = $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
+JAVAC = $(JAVAC_CMD)
+JAVADOC = $(JAVADOC_CMD)
+JAR = $(JAR_CMD)
+JLINK = $(JLINK_CMD)
+JMOD = $(JMOD_CMD)
+
+BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
+BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
+BUILD_JAVAC=@FIXPATH@ $(BUILD_JDK)/bin/javac
+BUILD_JAR=@FIXPATH@ $(BUILD_JDK)/bin/jar
+
+DOCS_REFERENCE_JAVADOC := @DOCS_REFERENCE_JAVADOC@
+
+# Interim langtools modules and arguments
+INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc
+INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES))
+INTERIM_LANGTOOLS_ADD_EXPORTS := \
+    --add-exports java.base/sun.reflect.annotation=jdk.compiler.interim \
+    --add-exports java.base/jdk.internal.jmod=jdk.compiler.interim \
+    --add-exports java.base/jdk.internal.misc=jdk.compiler.interim \
+    --add-exports java.base/sun.invoke.util=jdk.compiler.interim \
+    --add-exports java.base/jdk.internal.javac=java.compiler.interim \
+    --add-exports java.base/jdk.internal.javac=jdk.compiler.interim \
+    #
+INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \
+    $(INTERIM_LANGTOOLS_MODULES))))
+INTERIM_LANGTOOLS_ARGS := \
+    --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \
+    --add-modules $(INTERIM_LANGTOOLS_MODULES_COMMA) \
+    --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
+    --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
+    $(INTERIM_LANGTOOLS_ADD_EXPORTS) \
+    #
+JAVAC_MAIN_CLASS = -m jdk.compiler.interim/com.sun.tools.javac.Main
+JAVADOC_MAIN_CLASS = -m jdk.javadoc.interim/jdk.javadoc.internal.tool.Main
+
+# You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
+# Use = assignment to be able to override in bootcycle-spec.gmk
+NEW_JAVAC   = $(INTERIM_LANGTOOLS_ARGS) $(JAVAC_MAIN_CLASS)
+NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) $(JAVADOC_MAIN_CLASS)
+
+JMOD_COMPRESS:=@JMOD_COMPRESS@
+JLINK_KEEP_PACKAGED_MODULES:=@JLINK_KEEP_PACKAGED_MODULES@
+
+RCFLAGS := @RCFLAGS@
+
+# Tools adhering to a minimal and common standard of posix compliance.
+AWK:=@AWK@
+BASENAME:=@BASENAME@
+CAT:=@CAT@
+CCACHE:=@CCACHE@
+# CD is going away, but remains to cater for legacy makefiles.
+CD:=cd
+CHMOD:=@CHMOD@
+CODESIGN:=@CODESIGN@
+CP:=@CP@
+CUT:=@CUT@
+DATE:=@DATE@
+IS_GNU_DATE:=@IS_GNU_DATE@
+DIFF:=@DIFF@
+DIRNAME:=@DIRNAME@
+DSYMUTIL:=@DSYMUTIL@
+FIND:=@FIND@
+FIND_DELETE:=@FIND_DELETE@
+FLOCK:=@FLOCK@
+ECHO:=@ECHO@
+EGREP:=@EGREP@
+FGREP:=@FGREP@
+GREP:=@GREP@
+GZIP:=@GZIP@
+HEAD:=@HEAD@
+LS:=@LS@
+LN:=@LN@
+MIG:=@MIG@
+MKDIR:=@MKDIR@
+MV:=@MV@
+NICE:=@NICE@
+PANDOC:=@PANDOC@
+PATCH:=@PATCH@
+PRINTF:=@PRINTF@
+READLINK:=@READLINK@
+RM:=@RM@
+RMDIR:=@RMDIR@
+SED:=@SED@
+SH:=@SH@
+SORT:=@SORT@
+TAR:=@TAR@
+TAIL:=@TAIL@
+TEE:=@TEE@
+TIME:=@TIME@
+IS_GNU_TIME:=@IS_GNU_TIME@
+TR:=@TR@
+TOUCH:=@TOUCH@
+WC:=@WC@
+XARGS:=@XARGS@
+ZIPEXE:=@ZIPEXE@
+UNZIP:=@UNZIP@
+MT:=@MT@
+RC:=@RC@
+DUMPBIN:=@DUMPBIN@
+PATHTOOL:=@PATHTOOL@
+WSLPATH:=@WSLPATH@
+LDD:=@LDD@
+OTOOL:=@OTOOL@
+READELF:=@READELF@
+EXPR:=@EXPR@
+FILE:=@FILE@
+DOT:=@DOT@
+GIT:=@GIT@
+OBJCOPY:=@OBJCOPY@
+SETFILE:=@SETFILE@
+XATTR:=@XATTR@
+JT_HOME:=@JT_HOME@
+JIB_HOME:=@JIB_HOME@
+DTRACE := @DTRACE@
+FIXPATH := @FIXPATH@
+FIXPATH_BASE := @FIXPATH_BASE@
+ULIMIT:=@ULIMIT@
+
+TAR_TYPE:=@TAR_TYPE@
+TAR_INCLUDE_PARAM:=@TAR_INCLUDE_PARAM@
+TAR_SUPPORTS_TRANSFORM:=@TAR_SUPPORTS_TRANSFORM@
+
+# Build setup
+USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
+USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
+USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
+LIBZ_CFLAGS:=@LIBZ_CFLAGS@
+LIBZ_LIBS:=@LIBZ_LIBS@
+LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
+MSVCR_DLL:=@MSVCR_DLL@
+VCRUNTIME_1_DLL:=@VCRUNTIME_1_DLL@
+MSVCP_DLL:=@MSVCP_DLL@
+UCRT_DLL_DIR:=@UCRT_DLL_DIR@
+ENABLE_PANDOC:=@ENABLE_PANDOC@
+PANDOC_MARKDOWN_FLAG:=@PANDOC_MARKDOWN_FLAG@
+
+####################################################
+#
+# INSTALLATION
+#
+
+# Common prefix for all installed files. Defaults to /usr/local,
+# but /opt/myjdk is another common version.
+INSTALL_PREFIX=@prefix@
+
+# Directories containing architecture-dependent files should be relative to exec_prefix
+INSTALL_EXECPREFIX=@exec_prefix@
+
+# java,javac,javap etc are installed here.
+INSTALL_BINDIR=@bindir@
+
+# Read only architecture-independent data
+INSTALL_DATADIR=@datadir@
+
+# Root of above.
+INSTALL_DATAROOTDIR=@datarootdir@
+
+# Doc files, other than info and man.
+INSTALL_DOCDIR=@docdir@
+
+# Html documentation
+INSTALL_HTMLDIR=@htmldir@
+
+# Installing C header files, JNI headers for example.
+INSTALL_INCLUDEDIR=@includedir@
+
+# Installing library files....
+INSTALL_INCLUDEDIR=@libdir@
+
+# Executables that other programs run.
+INSTALL_LIBEXECDIR=@libexecdir@
+
+# Locale-dependent but architecture-independent data, such as message catalogs.
+INSTALL_LOCALEDIR=@localedir@
+
+# Modifiable single-machine data
+INSTALL_LOCALSTATEDIR=@localstatedir@
+
+# Man pages
+INSTALL_MANDIR=@mandir@
+
+# Modifiable architecture-independent data.
+INSTALL_SHAREDSTATEDIR=@sharedstatedir@
+
+# Read-only single-machine data
+INSTALL_SYSCONFDIR=@sysconfdir@
+
+####################################################
+#
+# Libraries
+#
+
+USE_EXTERNAL_LCMS:=@USE_EXTERNAL_LCMS@
+LCMS_CFLAGS:=@LCMS_CFLAGS@
+LCMS_LIBS:=@LCMS_LIBS@
+
+USE_EXTERNAL_HARFBUZZ:=@USE_EXTERNAL_HARFBUZZ@
+HARFBUZZ_CFLAGS:=@HARFBUZZ_CFLAGS@
+HARFBUZZ_LIBS:=@HARFBUZZ_LIBS@
+
+USE_EXTERNAL_LIBPNG:=@USE_EXTERNAL_LIBPNG@
+PNG_LIBS:=@PNG_LIBS@
+PNG_CFLAGS:=@PNG_CFLAGS@
+
+####################################################
+#
+# Misc
+#
+
+INCLUDE_SA=@INCLUDE_SA@
+INCLUDE_JVMCI=@INCLUDE_JVMCI@
+INCLUDE_COMPILER2=@INCLUDE_COMPILER2@
+
+OS_VERSION_MAJOR:=@OS_VERSION_MAJOR@
+OS_VERSION_MINOR:=@OS_VERSION_MINOR@
+OS_VERSION_MICRO:=@OS_VERSION_MICRO@
+
+# Images directory definitions
+JDK_IMAGE_SUBDIR:=jdk
+JRE_IMAGE_SUBDIR:=jre
+JCOV_IMAGE_SUBDIR := jdk-jcov
+
+# Colon left out to be able to override output dir for bootcycle-images
+JDK_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR)
+JRE_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR)
+JCOV_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JCOV_IMAGE_SUBDIR)
+
+# Test image, as above
+TEST_IMAGE_SUBDIR:=test
+TEST_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(TEST_IMAGE_SUBDIR)
+
+# Symbols image
+SYMBOLS_IMAGE_SUBDIR:=symbols
+SYMBOLS_IMAGE_DIR=$(IMAGES_OUTPUTDIR)/$(SYMBOLS_IMAGE_SUBDIR)
+
+# Interim image
+INTERIM_JMODS_DIR := $(SUPPORT_OUTPUTDIR)/interim-jmods
+INTERIM_IMAGE_DIR := $(SUPPORT_OUTPUTDIR)/interim-image
+
+# Docs image
+DOCS_JDK_IMAGE_SUBDIR := docs
+DOCS_JDK_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_JDK_IMAGE_SUBDIR)
+DOCS_JAVASE_IMAGE_SUBDIR := docs-javase
+DOCS_JAVASE_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_JAVASE_IMAGE_SUBDIR)
+DOCS_REFERENCE_IMAGE_SUBDIR := docs-reference
+DOCS_REFERENCE_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_REFERENCE_IMAGE_SUBDIR)
+# Output docs directly into image
+DOCS_OUTPUTDIR := $(DOCS_JDK_IMAGE_DIR)
+
+# Static libs image
+STATIC_LIBS_IMAGE_SUBDIR := static-libs
+STATIC_LIBS_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(STATIC_LIBS_IMAGE_SUBDIR)
+
+# Graal builder image
+GRAAL_BUILDER_IMAGE_SUBDIR := graal-builder-jdk
+GRAAL_BUILDER_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(GRAAL_BUILDER_IMAGE_SUBDIR)
+
+# Macosx bundles directory definitions
+JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle
+JRE_MACOSX_BUNDLE_SUBDIR=jre-bundle
+JDK_MACOSX_BUNDLE_SUBDIR_SIGNED=jdk-bundle-signed
+JRE_MACOSX_BUNDLE_SUBDIR_SIGNED=jre-bundle-signed
+JDK_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR)
+JRE_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR)
+JDK_MACOSX_BUNDLE_DIR_SIGNED=$(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR_SIGNED)
+JRE_MACOSX_BUNDLE_DIR_SIGNED=$(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR_SIGNED)
+JDK_MACOSX_BUNDLE_TOP_DIR=jdk-$(VERSION_NUMBER).jdk
+JRE_MACOSX_BUNDLE_TOP_DIR=jre-$(VERSION_NUMBER).jre
+JDK_MACOSX_CONTENTS_SUBDIR=$(JDK_MACOSX_BUNDLE_TOP_DIR)/Contents
+JRE_MACOSX_CONTENTS_SUBDIR=$(JRE_MACOSX_BUNDLE_TOP_DIR)/Contents
+JDK_MACOSX_CONTENTS_DIR=$(JDK_MACOSX_BUNDLE_DIR)/$(JDK_MACOSX_CONTENTS_SUBDIR)
+JRE_MACOSX_CONTENTS_DIR=$(JRE_MACOSX_BUNDLE_DIR)/$(JRE_MACOSX_CONTENTS_SUBDIR)
+
+# Bundle names
+ifneq ($(VERSION_BUILD), )
+  BASE_NAME := $(VERSION_SHORT)+$(VERSION_BUILD)_$(OPENJDK_TARGET_BUNDLE_PLATFORM)
+else
+  BASE_NAME := $(VERSION_SHORT)_$(OPENJDK_TARGET_BUNDLE_PLATFORM)
+endif
+
+ifeq ($(DEBUG_LEVEL), fastdebug)
+  DEBUG_PART := -debug
+else ifneq ($(DEBUG_LEVEL), release)
+  DEBUG_PART := -$(DEBUG_LEVEL)
+endif
+ifeq ($(OPENJDK_TARGET_OS), windows)
+  JDK_BUNDLE_EXTENSION := zip
+else
+  JDK_BUNDLE_EXTENSION := tar.gz
+endif
+JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
+JRE_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
+JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
+TEST_DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests-demos$(DEBUG_PART).tar.gz
+TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz
+DOCS_JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
+DOCS_JAVASE_BUNDLE_NAME := javase-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
+DOCS_REFERENCE_BUNDLE_NAME := jdk-reference-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
+STATIC_LIBS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-static-libs$(DEBUG_PART).tar.gz
+JCOV_BUNDLE_NAME := jdk-jcov-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
+
+JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
+JRE_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JRE_BUNDLE_NAME)
+JDK_SYMBOLS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME)
+TEST_DEMOS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_DEMOS_BUNDLE_NAME)
+TEST_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
+DOCS_JDK_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(DOCS_JDK_BUNDLE_NAME)
+DOCS_JAVASE_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(DOCS_JAVASE_BUNDLE_NAME)
+DOCS_REFERENCE_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(DOCS_REFERENCE_BUNDLE_NAME)
+JCOV_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JCOV_BUNDLE_NAME)
+
+# This macro is called to allow inclusion of closed source counterparts.
+# Unless overridden in closed sources, it expands to nothing.
+# Usage: This function is called in an open makefile, with the following
+# argument:
+# $1 the name of the makefile
+define IncludeCustomExtension
+endef
+
+# Include the custom-spec.gmk file if it exists
+-include $(dir @SPEC@)/custom-spec.gmk

make/autoconf/spec.gmk.template

@@ -1,966 +0,0 @@
-#
-# 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
-# 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.
-#
-
-# Configured @DATE_WHEN_CONFIGURED@ to build
-# for target system @OPENJDK_TARGET_OS@-@OPENJDK_TARGET_CPU@
-#   (called @OPENJDK_TARGET_AUTOCONF_NAME@ by autoconf)
-# on build system @OPENJDK_BUILD_OS@-@OPENJDK_BUILD_CPU@
-#   (called @OPENJDK_BUILD_AUTOCONF_NAME@ by autoconf)
-# using 'configure @CONFIGURE_COMMAND_LINE@'
-
-# The command line given to configure.
-CONFIGURE_COMMAND_LINE := @CONFIGURE_COMMAND_LINE@
-# The current directory when configure was run
-CONFIGURE_START_DIR := @CONFIGURE_START_DIR@
-
-# How configure was originally called, if not called directly
-REAL_CONFIGURE_COMMAND_EXEC_SHORT := @REAL_CONFIGURE_COMMAND_EXEC_SHORT@
-REAL_CONFIGURE_COMMAND_EXEC_FULL := @REAL_CONFIGURE_COMMAND_EXEC_FULL@
-REAL_CONFIGURE_COMMAND_LINE := @REAL_CONFIGURE_COMMAND_LINE@
-
-# A self-referential reference to this file.
-SPEC := @SPEC@
-
-# Path to autoconf if overridden by the user, to be used by "make reconfigure"
-AUTOCONF := @AUTOCONF@
-
-# SPACE and COMMA are defined in MakeBase.gmk, but they are also used in
-# some definitions here, and are needed if MakeBase.gmk is not included before
-# this file.
-X :=
-SPACE := $(X) $(X)
-COMMA := ,
-
-# What make to use for main processing, after bootstrapping top-level Makefile.
-MAKE := @MAKE@
-
-# Make sure all shell commands are executed with the C locale
-export LC_ALL := C
-
-# Make sure we override any local CLASSPATH variable
-export CLASSPATH := @CLASSPATH@
-
-# The default make arguments
-MAKE_ARGS = $(MAKE_LOG_FLAGS) -r -R -I $(TOPDIR)/make/common SPEC=$(SPEC) \
-    MAKE_LOG_FLAGS="$(MAKE_LOG_FLAGS)" $(MAKE_LOG_VARS)
-
-OUTPUT_SYNC_SUPPORTED := @OUTPUT_SYNC_SUPPORTED@
-OUTPUT_SYNC := @OUTPUT_SYNC@
-
-# Override the shell with bash
-BASH := @BASH@
-BASH_ARGS := @BASH_ARGS@
-SHELL := $(BASH) $(BASH_ARGS)
-
-# The "human readable" name of this configuration
-CONF_NAME := @CONF_NAME@
-
-# The built jdk will run in this target system.
-OPENJDK_TARGET_OS := @OPENJDK_TARGET_OS@
-OPENJDK_TARGET_OS_TYPE := @OPENJDK_TARGET_OS_TYPE@
-OPENJDK_TARGET_OS_ENV := @OPENJDK_TARGET_OS_ENV@
-OPENJDK_TARGET_OS_UPPERCASE := @OPENJDK_TARGET_OS_UPPERCASE@
-
-OPENJDK_TARGET_CPU := @OPENJDK_TARGET_CPU@
-OPENJDK_TARGET_CPU_ARCH := @OPENJDK_TARGET_CPU_ARCH@
-OPENJDK_TARGET_CPU_BITS := @OPENJDK_TARGET_CPU_BITS@
-OPENJDK_TARGET_CPU_ENDIAN := @OPENJDK_TARGET_CPU_ENDIAN@
-
-OPENJDK_TARGET_LIBC := @OPENJDK_TARGET_LIBC@
-
-COMPILE_TYPE := @COMPILE_TYPE@
-
-# Legacy support
-OPENJDK_TARGET_CPU_LEGACY := @OPENJDK_TARGET_CPU_LEGACY@
-OPENJDK_TARGET_CPU_LEGACY_LIB := @OPENJDK_TARGET_CPU_LEGACY_LIB@
-OPENJDK_TARGET_CPU_OSARCH := @OPENJDK_TARGET_CPU_OSARCH@
-OPENJDK_TARGET_OS_INCLUDE_SUBDIR := @OPENJDK_TARGET_OS_INCLUDE_SUBDIR@
-
-HOTSPOT_TARGET_OS := @HOTSPOT_TARGET_OS@
-HOTSPOT_TARGET_OS_TYPE := @HOTSPOT_TARGET_OS_TYPE@
-
-HOTSPOT_TARGET_CPU := @HOTSPOT_TARGET_CPU@
-HOTSPOT_TARGET_CPU_ARCH := @HOTSPOT_TARGET_CPU_ARCH@
-HOTSPOT_TARGET_CPU_DEFINE := @HOTSPOT_TARGET_CPU_DEFINE@
-
-HOTSPOT_TARGET_LIBC := @HOTSPOT_TARGET_LIBC@
-
-OPENJDK_TARGET_BUNDLE_PLATFORM := @OPENJDK_TARGET_BUNDLE_PLATFORM@
-JDK_ARCH_ABI_PROP_NAME := @JDK_ARCH_ABI_PROP_NAME@
-
-# We are building on this build system.
-# When not cross-compiling, it is the same as the target.
-OPENJDK_BUILD_OS := @OPENJDK_BUILD_OS@
-OPENJDK_BUILD_OS_TYPE := @OPENJDK_BUILD_OS_TYPE@
-OPENJDK_BUILD_OS_ENV := @OPENJDK_BUILD_OS_ENV@
-
-OPENJDK_BUILD_CPU := @OPENJDK_BUILD_CPU@
-OPENJDK_BUILD_CPU_ARCH := @OPENJDK_BUILD_CPU_ARCH@
-OPENJDK_BUILD_CPU_BITS := @OPENJDK_BUILD_CPU_BITS@
-OPENJDK_BUILD_CPU_ENDIAN := @OPENJDK_BUILD_CPU_ENDIAN@
-
-OPENJDK_BUILD_LIBC := @OPENJDK_BUILD_LIBC@
-
-OPENJDK_BUILD_OS_INCLUDE_SUBDIR := @OPENJDK_TARGET_OS_INCLUDE_SUBDIR@
-
-# Target platform value in ModuleTarget class file attribute.
-OPENJDK_MODULE_TARGET_PLATFORM := @OPENJDK_MODULE_TARGET_PLATFORM@
-
-# OS_* properties in release file
-RELEASE_FILE_OS_NAME := @RELEASE_FILE_OS_NAME@
-RELEASE_FILE_OS_ARCH := @RELEASE_FILE_OS_ARCH@
-RELEASE_FILE_LIBC := @RELEASE_FILE_LIBC@
-
-SOURCE_DATE := @SOURCE_DATE@
-ISO_8601_FORMAT_STRING := @ISO_8601_FORMAT_STRING@
-
-ifneq ($(SOURCE_DATE), updated)
-  # For "updated" source date value, these are set in InitSupport.gmk
-  export SOURCE_DATE_EPOCH := $(SOURCE_DATE)
-  SOURCE_DATE_ISO_8601 := @SOURCE_DATE_ISO_8601@
-endif
-
-LIBM := @LIBM@
-LIBDL := @LIBDL@
-
-WINENV_ROOT := @WINENV_ROOT@
-WINENV_PREFIX := @WINENV_PREFIX@
-
-ifneq ($(findstring windows.wsl, @OPENJDK_BUILD_OS_ENV@), )
-  # Tell WSL to convert PATH between linux and windows
-  export WSLENV := PATH/l
-else ifeq (@OPENJDK_BUILD_OS_ENV@, windows.msys2)
-  # Prohibit msys2 from attempting any path wrangling
-  export MSYS2_ARG_CONV_EXCL := "*"
-endif
-
-# Save the original path before replacing it with the Visual Studio tools
-ORIGINAL_PATH := @ORIGINAL_PATH@
-
-ifeq (@TOOLCHAIN_TYPE@, microsoft)
-  # The Visual Studio toolchain needs the PATH to be adjusted to include
-  # Visual Studio tools.
-  export PATH := @TOOLCHAIN_PATH@:$(PATH)
-endif
-
-SYSROOT_CFLAGS := @SYSROOT_CFLAGS@
-SYSROOT_LDFLAGS := @SYSROOT_LDFLAGS@
-
-# The top-level directory of the source repository
-TOPDIR := @TOPDIR@
-# Usually the top level directory, but could be something else if a custom
-# root is defined.
-WORKSPACE_ROOT := @WORKSPACE_ROOT@
-IMPORT_MODULES_CLASSES := @IMPORT_MODULES_CLASSES@
-IMPORT_MODULES_CMDS := @IMPORT_MODULES_CMDS@
-IMPORT_MODULES_LIBS := @IMPORT_MODULES_LIBS@
-IMPORT_MODULES_CONF := @IMPORT_MODULES_CONF@
-IMPORT_MODULES_LEGAL := @IMPORT_MODULES_LEGAL@
-IMPORT_MODULES_MAN := @IMPORT_MODULES_MAN@
-IMPORT_MODULES_SRC := @IMPORT_MODULES_SRC@
-IMPORT_MODULES_MAKE := @IMPORT_MODULES_MAKE@
-
-COPYRIGHT_YEAR := @COPYRIGHT_YEAR@
-HOTSPOT_BUILD_TIME := @HOTSPOT_BUILD_TIME@
-
-# Platform naming variables
-LAUNCHER_NAME := @LAUNCHER_NAME@
-PRODUCT_NAME := @PRODUCT_NAME@
-PRODUCT_SUFFIX := @PRODUCT_SUFFIX@
-JDK_RC_PLATFORM_NAME := @JDK_RC_PLATFORM_NAME@
-JDK_RC_NAME := @JDK_RC_NAME@
-JDK_RC_COMPANY_NAME:=@JDK_RC_COMPANY_NAME@
-COMPANY_NAME := @COMPANY_NAME@
-HOTSPOT_VM_DISTRO := @HOTSPOT_VM_DISTRO@
-MACOSX_BUNDLE_NAME_BASE := @MACOSX_BUNDLE_NAME_BASE@
-MACOSX_BUNDLE_ID_BASE := @MACOSX_BUNDLE_ID_BASE@
-MACOSX_BUNDLE_BUILD_VERSION := @MACOSX_BUNDLE_BUILD_VERSION@
-USERNAME := @USERNAME@
-VENDOR_URL := @VENDOR_URL@
-VENDOR_URL_BUG := @VENDOR_URL_BUG@
-VENDOR_URL_VM_BUG := @VENDOR_URL_VM_BUG@
-
-# New (JEP-223) version information
-
-## Building blocks of the version string
-# First three version numbers, with well-specified meanings (numerical)
-VERSION_FEATURE := @VERSION_FEATURE@
-VERSION_INTERIM := @VERSION_INTERIM@
-VERSION_UPDATE := @VERSION_UPDATE@
-VERSION_PATCH := @VERSION_PATCH@
-VERSION_EXTRA1 := @VERSION_EXTRA1@
-VERSION_EXTRA2 := @VERSION_EXTRA2@
-VERSION_EXTRA3 := @VERSION_EXTRA3@
-# The pre-release identifier (string)
-VERSION_PRE := @VERSION_PRE@
-# The build number (numerical)
-VERSION_BUILD := @VERSION_BUILD@
-# Optional build information (string)
-VERSION_OPT := @VERSION_OPT@
-
-## Composite variables
-# The version number as a dot separated sequence of numbers, e.g. 9.0.1
-VERSION_NUMBER := @VERSION_NUMBER@
-# VERSION_NUMBER but always with exactly 4 positions, with 0 for empty positions.
-VERSION_NUMBER_FOUR_POSITIONS := @VERSION_NUMBER_FOUR_POSITIONS@
-# The complete version string, with additional build information
-VERSION_STRING := @VERSION_STRING@
-# The short version string, without trailing zeroes and just PRE, if present.
-VERSION_SHORT := @VERSION_SHORT@
-# The Java specification version. It usually equals the feature version number.
-VERSION_SPECIFICATION := @VERSION_FEATURE@
-# A GA version is defined by the PRE string being empty. Rather than testing for
-# that, this variable defines it with true/false.
-VERSION_IS_GA := @VERSION_IS_GA@
-
-# Version date
-VERSION_DATE := @VERSION_DATE@
-
-# Vendor version string
-VENDOR_VERSION_STRING := @VENDOR_VERSION_STRING@
-
-# Class-file version
-VERSION_CLASSFILE_MAJOR := @VERSION_CLASSFILE_MAJOR@
-VERSION_CLASSFILE_MINOR := @VERSION_CLASSFILE_MINOR@
-
-# Version for API docs "new-since" feature
-VERSION_DOCS_API_SINCE := @VERSION_DOCS_API_SINCE@
-
-JDK_SOURCE_TARGET_VERSION := @JDK_SOURCE_TARGET_VERSION@
-
-# Convenience CFLAGS settings for passing version information into native programs.
-VERSION_CFLAGS = \
-    -DVERSION_FEATURE=$(VERSION_FEATURE) \
-    -DVERSION_INTERIM=$(VERSION_INTERIM) \
-    -DVERSION_UPDATE=$(VERSION_UPDATE) \
-    -DVERSION_PATCH=$(VERSION_PATCH) \
-    -DVERSION_EXTRA1=$(VERSION_EXTRA1) \
-    -DVERSION_EXTRA2=$(VERSION_EXTRA2) \
-    -DVERSION_EXTRA3=$(VERSION_EXTRA3) \
-    -DVERSION_PRE='"$(VERSION_PRE)"' \
-    -DVERSION_BUILD=$(VERSION_BUILD) \
-    -DVERSION_OPT='"$(VERSION_OPT)"' \
-    -DVERSION_NUMBER='"$(VERSION_NUMBER)"' \
-    -DVERSION_STRING='"$(VERSION_STRING)"' \
-    -DVERSION_SHORT='"$(VERSION_SHORT)"' \
-    -DVERSION_SPECIFICATION='"$(VERSION_SPECIFICATION)"' \
-    -DVERSION_DATE='"$(VERSION_DATE)"' \
-    -DVENDOR_VERSION_STRING='"$(VENDOR_VERSION_STRING)"' \
-    -DVERSION_CLASSFILE_MAJOR=$(VERSION_CLASSFILE_MAJOR) \
-    -DVERSION_CLASSFILE_MINOR=$(VERSION_CLASSFILE_MINOR) \
-    #
-
-ifneq ($(COMPANY_NAME),)
-  # COMPANY_NAME is set to "N/A" in make/conf/branding.conf by default,
-  # but can be customized with the '--with-vendor-name' configure option.
-  # Only export "VENDOR" to the build if COMPANY_NAME contains a real value.
-  # Otherwise the default value for VENDOR, which is used to set the "java.vendor"
-  # and "java.vm.vendor" properties is hard-coded into the source code (i.e. in
-  # VersionProps.java.template in the jdk for "java.vendor" and
-  # vm_version.cpp in the VM for "java.vm.vendor")
-  ifneq ($(COMPANY_NAME), N/A)
-    VERSION_CFLAGS += -DVENDOR='"$(COMPANY_NAME)"'
-  endif
-endif
-
-# Only export VENDOR_URL, VENDOR_URL_BUG and VENDOR_VM_URL_BUG to the build if
-# they are not empty. Otherwise, default values which are defined in the sources
-# will be used.
-ifneq ($(VENDOR_URL),)
-  VERSION_CFLAGS += -DVENDOR_URL='"$(VENDOR_URL)"'
-endif
-ifneq ($(VENDOR_URL_BUG),)
-  VERSION_CFLAGS += -DVENDOR_URL_BUG='"$(VENDOR_URL_BUG)"'
-endif
-ifneq ($(VENDOR_URL_VM_BUG),)
-  VERSION_CFLAGS += -DVENDOR_URL_VM_BUG='"$(VENDOR_URL_VM_BUG)"'
-endif
-
-# Different naming strings generated from the above information.
-RUNTIME_NAME = $(PRODUCT_NAME) $(PRODUCT_SUFFIX)
-
-# How to compile the code: release, fastdebug or slowdebug
-DEBUG_LEVEL := @DEBUG_LEVEL@
-HOTSPOT_DEBUG_LEVEL := @HOTSPOT_DEBUG_LEVEL@
-
-# Which JVM variants to build (space-separated list)
-JVM_VARIANTS := @JVM_VARIANTS@
-JVM_VARIANT_MAIN := @JVM_VARIANT_MAIN@
-
-# Lists of features per variant. Only relevant for the variants listed in
-# JVM_VARIANTS.
-JVM_FEATURES_server := @JVM_FEATURES_server@
-JVM_FEATURES_client := @JVM_FEATURES_client@
-JVM_FEATURES_core := @JVM_FEATURES_core@
-JVM_FEATURES_minimal := @JVM_FEATURES_minimal@
-JVM_FEATURES_zero := @JVM_FEATURES_zero@
-JVM_FEATURES_custom := @JVM_FEATURES_custom@
-
-# Used for make-time verifications
-VALID_JVM_FEATURES := @VALID_JVM_FEATURES@
-VALID_JVM_VARIANTS := @VALID_JVM_VARIANTS@
-
-# Allow overriding the default hotspot library path
-HOTSPOT_OVERRIDE_LIBPATH := @HOTSPOT_OVERRIDE_LIBPATH@
-
-# Control use of precompiled header in hotspot libjvm build
-USE_PRECOMPILED_HEADER := @USE_PRECOMPILED_HEADER@
-
-# Only build headless support or not
-ENABLE_HEADLESS_ONLY := @ENABLE_HEADLESS_ONLY@
-
-ENABLE_LINKTIME_GC := @ENABLE_LINKTIME_GC@
-
-# Ship debug symbols (e.g. pdbs on Windows)
-SHIP_DEBUG_SYMBOLS := @SHIP_DEBUG_SYMBOLS@
-
-ENABLE_FULL_DOCS := @ENABLE_FULL_DOCS@
-
-# JDK_OUTPUTDIR specifies where a working jvm is built.
-# You can run $(JDK_OUTPUTDIR)/bin/java
-
-OUTPUTDIR := @OUTPUTDIR@
-# Colon left out to be able to override IMAGES_OUTPUTDIR for bootcycle-images
-SUPPORT_OUTPUTDIR = $(OUTPUTDIR)/support
-BUILDTOOLS_OUTPUTDIR = $(OUTPUTDIR)/buildtools
-
-HOTSPOT_OUTPUTDIR = $(OUTPUTDIR)/hotspot
-JDK_OUTPUTDIR = $(OUTPUTDIR)/jdk
-IMAGES_OUTPUTDIR = $(OUTPUTDIR)/images
-BUNDLES_OUTPUTDIR = $(OUTPUTDIR)/bundles
-TESTMAKE_OUTPUTDIR = $(OUTPUTDIR)/test-make
-MAKESUPPORT_OUTPUTDIR = $(OUTPUTDIR)/make-support
-
-# This does not get overridden in a bootcycle build
-CONFIGURESUPPORT_OUTPUTDIR := @CONFIGURESUPPORT_OUTPUTDIR@
-BUILDJDK_OUTPUTDIR = $(OUTPUTDIR)/buildjdk
-
-BUILD_FAILURE_HANDLER := @BUILD_FAILURE_HANDLER@
-
-BUILD_JTREG_TEST_THREAD_FACTORY := @BUILD_JTREG_TEST_THREAD_FACTORY@
-
-ENABLE_GENERATE_CLASSLIST := @ENABLE_GENERATE_CLASSLIST@
-
-EXCLUDE_TRANSLATIONS := @EXCLUDE_TRANSLATIONS@
-
-BUILD_MANPAGES := @BUILD_MANPAGES@
-
-BUILD_CDS_ARCHIVE := @BUILD_CDS_ARCHIVE@
-
-ENABLE_COMPATIBLE_CDS_ALIGNMENT := @ENABLE_COMPATIBLE_CDS_ALIGNMENT@
-
-ALLOW_ABSOLUTE_PATHS_IN_OUTPUT := @ALLOW_ABSOLUTE_PATHS_IN_OUTPUT@
-
-HSDIS_BACKEND := @HSDIS_BACKEND@
-ENABLE_HSDIS_BUNDLING := @ENABLE_HSDIS_BUNDLING@
-HSDIS_CFLAGS := @HSDIS_CFLAGS@
-HSDIS_LDFLAGS := @HSDIS_LDFLAGS@
-HSDIS_LIBS := @HSDIS_LIBS@
-CAPSTONE_ARCH_AARCH64_NAME := @CAPSTONE_ARCH_AARCH64_NAME@
-
-# The boot jdk to use. This is overridden in bootcycle-spec.gmk. Make sure to keep
-# it in sync.
-BOOT_JDK := @BOOT_JDK@
-
-BUILD_JDK := @BUILD_JDK@
-CREATE_BUILDJDK := @CREATE_BUILDJDK@
-EXTERNAL_BUILDJDK := @EXTERNAL_BUILDJDK@
-
-# Whether the boot jdk jar supports --date=TIMESTAMP
-BOOT_JDK_JAR_SUPPORTS_DATE := @BOOT_JDK_JAR_SUPPORTS_DATE@
-
-# When compiling Java source to be run by the boot jdk
-# use these extra flags, eg -source 6 -target 6
-BOOT_JDK_SOURCETARGET := @BOOT_JDK_SOURCETARGET@
-
-# Information about the build system
-NUM_CORES := @NUM_CORES@
-MEMORY_SIZE := @MEMORY_SIZE@
-ENABLE_JAVAC_SERVER := @ENABLE_JAVAC_SERVER@
-# Store javac server synchronization files here, and
-# the javac server log files.
-JAVAC_SERVER_DIR = $(MAKESUPPORT_OUTPUTDIR)/javacservers
-
-# Number of parallel jobs to use for compilation
-JOBS ?= @JOBS@
-TEST_JOBS ?= @TEST_JOBS@
-
-# Default make target
-DEFAULT_MAKE_TARGET := @DEFAULT_MAKE_TARGET@
-DEFAULT_LOG := @DEFAULT_LOG@
-
-# Fallback linker
-ENABLE_FALLBACK_LINKER := @ENABLE_FALLBACK_LINKER@
-
-FREETYPE_TO_USE := @FREETYPE_TO_USE@
-FREETYPE_LIBS := @FREETYPE_LIBS@
-FREETYPE_CFLAGS := @FREETYPE_CFLAGS@
-FONTCONFIG_CFLAGS := @FONTCONFIG_CFLAGS@
-CUPS_CFLAGS := @CUPS_CFLAGS@
-ALSA_LIBS := @ALSA_LIBS@
-ALSA_CFLAGS := @ALSA_CFLAGS@
-LIBFFI_LIBS := @LIBFFI_LIBS@
-LIBFFI_CFLAGS := @LIBFFI_CFLAGS@
-ENABLE_LIBFFI_BUNDLING := @ENABLE_LIBFFI_BUNDLING@
-LIBFFI_LIB_FILE := @LIBFFI_LIB_FILE@
-FILE_MACRO_CFLAGS := @FILE_MACRO_CFLAGS@
-REPRODUCIBLE_CFLAGS := @REPRODUCIBLE_CFLAGS@
-BRANCH_PROTECTION_CFLAGS := @BRANCH_PROTECTION_CFLAGS@
-
-STATIC_LIBS_CFLAGS := @STATIC_LIBS_CFLAGS@
-
-JMH_CORE_JAR := @JMH_CORE_JAR@
-JMH_GENERATOR_JAR := @JMH_GENERATOR_JAR@
-JMH_JOPT_SIMPLE_JAR := @JMH_JOPT_SIMPLE_JAR@
-JMH_COMMONS_MATH_JAR := @JMH_COMMONS_MATH_JAR@
-JMH_VERSION := @JMH_VERSION@
-
-GTEST_FRAMEWORK_SRC := @GTEST_FRAMEWORK_SRC@
-
-# Source file for cacerts
-CACERTS_FILE := @CACERTS_FILE@
-# Source folder for user provided cacerts PEM files
-CACERTS_SRC := @CACERTS_SRC@
-
-# Enable unlimited crypto policy
-UNLIMITED_CRYPTO := @UNLIMITED_CRYPTO@
-
-GCOV_ENABLED := @GCOV_ENABLED@
-JCOV_ENABLED := @JCOV_ENABLED@
-JCOV_HOME := @JCOV_HOME@
-JCOV_INPUT_JDK := @JCOV_INPUT_JDK@
-JCOV_FILTERS := @JCOV_FILTERS@
-
-# AddressSanitizer
-ASAN_ENABLED := @ASAN_ENABLED@
-
-# LeakSanitizer
-LSAN_ENABLED := @LSAN_ENABLED@
-
-# UndefinedBehaviorSanitizer
-UBSAN_ENABLED := @UBSAN_ENABLED@
-UBSAN_CFLAGS := @UBSAN_CFLAGS@
-UBSAN_LDFLAGS := @UBSAN_LDFLAGS@
-
-# Necessary additional compiler flags to compile X11
-X_CFLAGS := @X_CFLAGS@
-X_LIBS := @X_LIBS@
-
-# The lowest required version of macosx
-MACOSX_VERSION_MIN := @MACOSX_VERSION_MIN@
-# The highest allowed version of macosx
-MACOSX_VERSION_MAX := @MACOSX_VERSION_MAX@
-
-# The macosx code signing configuration
-MACOSX_CODESIGN_MODE := @MACOSX_CODESIGN_MODE@
-MACOSX_CODESIGN_IDENTITY := @MACOSX_CODESIGN_IDENTITY@
-
-# Toolchain type: gcc, clang, xlc, microsoft...
-TOOLCHAIN_TYPE := @TOOLCHAIN_TYPE@
-TOOLCHAIN_VERSION := @TOOLCHAIN_VERSION@
-CC_VERSION_NUMBER := @CC_VERSION_NUMBER@
-CXX_VERSION_NUMBER := @CXX_VERSION_NUMBER@
-
-# Legacy support
-HOTSPOT_TOOLCHAIN_TYPE := @HOTSPOT_TOOLCHAIN_TYPE@
-
-# Option used to tell the compiler whether to create 32- or 64-bit executables
-COMPILER_TARGET_BITS_FLAG := @COMPILER_TARGET_BITS_FLAG@
-COMPILER_SUPPORTS_TARGET_BITS_FLAG := @COMPILER_SUPPORTS_TARGET_BITS_FLAG@
-
-# Option used to pass a command file to the compiler
-COMPILER_COMMAND_FILE_FLAG := @COMPILER_COMMAND_FILE_FLAG@
-
-# Option for specifying a file which saves the binder commands
-# produced by the link step (for debugging, currently AIX only)
-COMPILER_BINDCMD_FILE_FLAG := @COMPILER_BINDCMD_FILE_FLAG@
-
-CC_OUT_OPTION := @CC_OUT_OPTION@
-LD_OUT_OPTION := @LD_OUT_OPTION@
-AR_OUT_OPTION := @AR_OUT_OPTION@
-
-# Flags used for overriding the default opt setting for a C/C++ source file.
-C_O_FLAG_HIGHEST_JVM := @C_O_FLAG_HIGHEST_JVM@
-C_O_FLAG_HIGHEST := @C_O_FLAG_HIGHEST@
-C_O_FLAG_HI := @C_O_FLAG_HI@
-C_O_FLAG_NORM := @C_O_FLAG_NORM@
-C_O_FLAG_NONE := @C_O_FLAG_NONE@
-C_O_FLAG_SIZE := @C_O_FLAG_SIZE@
-CXX_O_FLAG_HIGHEST_JVM := @CXX_O_FLAG_HIGHEST_JVM@
-CXX_O_FLAG_HIGHEST := @CXX_O_FLAG_HIGHEST@
-CXX_O_FLAG_HI := @CXX_O_FLAG_HI@
-CXX_O_FLAG_NORM := @CXX_O_FLAG_NORM@
-CXX_O_FLAG_NONE := @CXX_O_FLAG_NONE@
-CXX_O_FLAG_SIZE := @CXX_O_FLAG_SIZE@
-
-GENDEPS_FLAGS := @GENDEPS_FLAGS@
-
-DISABLE_WARNING_PREFIX := @DISABLE_WARNING_PREFIX@
-CFLAGS_WARNINGS_ARE_ERRORS := @CFLAGS_WARNINGS_ARE_ERRORS@
-DISABLED_WARNINGS := @DISABLED_WARNINGS@
-DISABLED_WARNINGS_C := @DISABLED_WARNINGS_C@
-DISABLED_WARNINGS_CXX := @DISABLED_WARNINGS_CXX@
-
-# A global flag (true or false) determining if native warnings are considered errors.
-WARNINGS_AS_ERRORS := @WARNINGS_AS_ERRORS@
-
-CFLAGS_CCACHE := @CFLAGS_CCACHE@
-ADLC_LANGSTD_CXXFLAGS := @ADLC_LANGSTD_CXXFLAGS@
-ADLC_LDFLAGS := @ADLC_LDFLAGS@
-
-# Tools that potentially need to be cross compilation aware.
-CC := @CCACHE@ @ICECC@ @CC@
-
-# CFLAGS used to compile the jdk native libraries (C-code)
-CFLAGS_JDKLIB := @CFLAGS_JDKLIB@
-CXXFLAGS_JDKLIB := @CXXFLAGS_JDKLIB@
-
-# CFLAGS used to compile the jdk native launchers (C-code)
-CFLAGS_JDKEXE := @CFLAGS_JDKEXE@
-CXXFLAGS_JDKEXE := @CXXFLAGS_JDKEXE@
-
-FDLIBM_CFLAGS := @FDLIBM_CFLAGS@
-JVM_CFLAGS := @JVM_CFLAGS@
-JVM_LDFLAGS := @JVM_LDFLAGS@
-JVM_ASFLAGS := @JVM_ASFLAGS@
-JVM_LIBS := @JVM_LIBS@
-
-BASIC_ASFLAGS := @BASIC_ASFLAGS@
-
-MACHINE_FLAG := @MACHINE_FLAG@
-
-# These flags might contain variables set by a custom extension that is included later.
-EXTRA_CFLAGS := @EXTRA_CFLAGS@
-EXTRA_CXXFLAGS := @EXTRA_CXXFLAGS@
-EXTRA_LDFLAGS := @EXTRA_LDFLAGS@
-EXTRA_ASFLAGS := @EXTRA_ASFLAGS@
-
-CXX := @CCACHE@ @ICECC@ @CXX@
-
-CPP := @CPP@
-
-# The linker can be gcc or ld on unix systems, or link.exe on windows systems.
-LD := @LD@
-
-SYSROOT := @SYSROOT@
-
-# LDFLAGS used to link the jdk native libraries (C-code)
-LDFLAGS_JDKLIB := @LDFLAGS_JDKLIB@
-JDKLIB_LIBS := @JDKLIB_LIBS@
-
-# LDFLAGS used to link the jdk native launchers (C-code)
-LDFLAGS_JDKEXE := @LDFLAGS_JDKEXE@
-JDKEXE_LIBS := @JDKEXE_LIBS@
-
-# LDFLAGS specific to C++ linking.
-LDFLAGS_CXX_JDK := @LDFLAGS_CXX_JDK@
-
-# LDFLAGS specific to partial linking.
-LDFLAGS_CXX_PARTIAL_LINKING := @LDFLAGS_CXX_PARTIAL_LINKING@
-
-# Sometimes a different linker is needed for c++ libs
-LDCXX := @LDCXX@
-# The flags for linking libstdc++ linker.
-LIBCXX := @LIBCXX@
-
-# Compiler and linker flags used when building native tests
-LDFLAGS_TESTEXE := @LDFLAGS_TESTEXE@
-
-# BUILD_CC/BUILD_LD is a compiler/linker that generates code that is runnable on the
-# build platform.
-BUILD_CC := @BUILD_ICECC@ @BUILD_CC@
-BUILD_CXX := @BUILD_ICECC@ @BUILD_CXX@
-BUILD_LD := @BUILD_LD@
-BUILD_LDCXX := @BUILD_LDCXX@
-BUILD_AS := @BUILD_AS@
-BUILD_AR := @BUILD_AR@
-BUILD_NM := @BUILD_NM@
-BUILD_OBJCOPY := @BUILD_OBJCOPY@
-BUILD_STRIP := @BUILD_STRIP@
-BUILD_SYSROOT_CFLAGS := @BUILD_SYSROOT_CFLAGS@
-BUILD_SYSROOT_LDFLAGS := @BUILD_SYSROOT_LDFLAGS@
-
-AS := @AS@
-
-# AR is used to create a static library (is ar in unix, lib.exe in windows)
-AR := @AR@
-ARFLAGS := @ARFLAGS@
-
-NM := @NM@
-NMFLAGS := @NMFLAGS@
-STRIP := @STRIP@
-OBJDUMP := @OBJDUMP@
-CXXFILT := @CXXFILT@
-
-LIPO := @LIPO@
-INSTALL_NAME_TOOL := @INSTALL_NAME_TOOL@
-METAL := @METAL@
-METALLIB := @METALLIB@
-
-# Options to linker to specify a mapfile.
-# (Note absence of := assignment, because we do not want to evaluate the macro body here)
-SET_SHARED_LIBRARY_MAPFILE = @SET_SHARED_LIBRARY_MAPFILE@
-
-#
-# Options for generating debug symbols
-COMPILE_WITH_DEBUG_SYMBOLS := @COMPILE_WITH_DEBUG_SYMBOLS@
-COPY_DEBUG_SYMBOLS := @COPY_DEBUG_SYMBOLS@
-ZIP_EXTERNAL_DEBUG_SYMBOLS := @ZIP_EXTERNAL_DEBUG_SYMBOLS@
-
-CFLAGS_DEBUG_SYMBOLS := @CFLAGS_DEBUG_SYMBOLS@
-ASFLAGS_DEBUG_SYMBOLS := @ASFLAGS_DEBUG_SYMBOLS@
-
-#
-# Compress (or not) jars
-COMPRESS_JARS := @COMPRESS_JARS@
-
-# Options to linker to specify the library name.
-# (Note absence of := assignment, because we do not want to evaluate the macro body here)
-SET_SHARED_LIBRARY_NAME = @SET_SHARED_LIBRARY_NAME@
-
-SHARED_LIBRARY_FLAGS := @SHARED_LIBRARY_FLAGS@
-
-# Set origin using the linker, ie use the relative path to the dependent library to find the dependencies.
-# (Note absence of := assignment, because we do not want to evaluate the macro body here)
-SET_SHARED_LIBRARY_ORIGIN = @SET_SHARED_LIBRARY_ORIGIN@
-SET_EXECUTABLE_ORIGIN = @SET_EXECUTABLE_ORIGIN@
-
-# Different OS:es have different ways of naming shared libraries.
-# The SHARED_LIBRARY and STATIC_LIBRARY macros takes "verify" as and argument and returns:
-#    "libverify.so" or "libverify.dylib" or "verify.dll" depending on platform.
-# (Note absence of := assignment, because we do not want to evaluate the macro body here)
-SHARED_LIBRARY = @SHARED_LIBRARY@
-STATIC_LIBRARY = @STATIC_LIBRARY@
-
-LIBRARY_PREFIX := @LIBRARY_PREFIX@
-SHARED_LIBRARY_SUFFIX := @SHARED_LIBRARY_SUFFIX@
-STATIC_LIBRARY_SUFFIX := @STATIC_LIBRARY_SUFFIX@
-EXECUTABLE_SUFFIX := @EXECUTABLE_SUFFIX@
-OBJ_SUFFIX := @OBJ_SUFFIX@
-STATIC_BUILD := @STATIC_BUILD@
-
-STRIPFLAGS := @STRIPFLAGS@
-
-JAVA_FLAGS := @JAVA_FLAGS@
-JAVA_FLAGS_BIG := @JAVA_FLAGS_BIG@
-JAVA_FLAGS_SMALL := @JAVA_FLAGS_SMALL@
-BUILD_JAVA_FLAGS_SMALL := @BUILD_JAVA_FLAGS_SMALL@
-JAVA_TOOL_FLAGS_SMALL := @JAVA_TOOL_FLAGS_SMALL@
-
-# The *_CMD variables are defined separately to be easily overridden in bootcycle-spec.gmk
-# for bootcycle-images build. Make sure to keep them in sync. Do not use the *_CMD
-# versions of the variables directly.
-JAVA_CMD := @JAVA@
-JAVAC_CMD := @JAVAC@
-JAVADOC_CMD := @JAVADOC@
-JAR_CMD := @JAR@
-JLINK_CMD := @JLINK@
-JMOD_CMD := @JMOD@
-# These variables are meant to be used. They are defined with = instead of := to make
-# it possible to override only the *_CMD variables.
-JAVA = $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
-JAVA_SMALL = $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
-JAVAC = $(JAVAC_CMD)
-JAVADOC = $(JAVADOC_CMD)
-JAR = $(JAR_CMD)
-JLINK = $(JLINK_CMD)
-JMOD = $(JMOD_CMD)
-
-JTREG_JDK := @JTREG_JDK@
-JTREG_JAVA = @FIXPATH@ $(JTREG_JDK)/bin/java $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
-
-BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
-BUILD_JAVA = @FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
-BUILD_JAVA_SMALL = @FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS_SMALL)
-BUILD_JAVAC = @FIXPATH@ $(BUILD_JDK)/bin/javac
-BUILD_JAR = @FIXPATH@ $(BUILD_JDK)/bin/jar
-
-DOCS_REFERENCE_JAVADOC := @DOCS_REFERENCE_JAVADOC@
-
-# Interim langtools modules and arguments
-INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc
-INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES))
-INTERIM_LANGTOOLS_ADD_EXPORTS := \
-    --add-exports java.base/sun.reflect.annotation=jdk.compiler.interim \
-    --add-exports java.base/jdk.internal.jmod=jdk.compiler.interim \
-    --add-exports java.base/jdk.internal.misc=jdk.compiler.interim \
-    --add-exports java.base/sun.invoke.util=jdk.compiler.interim \
-    --add-exports java.base/jdk.internal.javac=java.compiler.interim \
-    --add-exports java.base/jdk.internal.javac=jdk.compiler.interim \
-    --add-exports jdk.internal.opt/jdk.internal.opt=jdk.compiler.interim \
-    --add-exports jdk.internal.opt/jdk.internal.opt=jdk.javadoc.interim \
-    #
-INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \
-    $(INTERIM_LANGTOOLS_MODULES))))
-INTERIM_LANGTOOLS_ARGS := \
-    --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \
-    --add-modules $(INTERIM_LANGTOOLS_MODULES_COMMA) \
-    --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
-    --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
-    $(INTERIM_LANGTOOLS_ADD_EXPORTS) \
-    #
-JAVAC_MAIN_CLASS := -m jdk.compiler.interim/com.sun.tools.javac.Main
-JAVADOC_MAIN_CLASS := -m jdk.javadoc.interim/jdk.javadoc.internal.tool.Main
-
-# You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
-# Use = assignment to be able to override in bootcycle-spec.gmk
-NEW_JAVAC = $(INTERIM_LANGTOOLS_ARGS) $(JAVAC_MAIN_CLASS)
-NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) $(JAVADOC_MAIN_CLASS)
-
-JMOD_COMPRESS := @JMOD_COMPRESS@
-JLINK_KEEP_PACKAGED_MODULES := @JLINK_KEEP_PACKAGED_MODULES@
-
-RCFLAGS := @RCFLAGS@
-
-# Tools adhering to a minimal and common standard of posix compliance.
-AWK := @AWK@
-BASENAME := @BASENAME@
-CAT := @CAT@
-CCACHE := @CCACHE@
-# CD is going away, but remains to cater for legacy makefiles.
-CD := cd
-CHMOD := @CHMOD@
-CODESIGN := @CODESIGN@
-CP := @CP@
-CUT := @CUT@
-DATE := @DATE@
-IS_GNU_DATE := @IS_GNU_DATE@
-DIFF := @DIFF@
-DIRNAME := @DIRNAME@
-DSYMUTIL := @DSYMUTIL@
-FIND := @FIND@
-FIND_DELETE := @FIND_DELETE@
-FLOCK := @FLOCK@
-ECHO := @ECHO@
-EGREP := @EGREP@
-FGREP := @FGREP@
-GREP := @GREP@
-GZIP := @GZIP@
-HEAD := @HEAD@
-LS := @LS@
-LN := @LN@
-MIG := @MIG@
-MKDIR := @MKDIR@
-MV := @MV@
-NICE := @NICE@
-PANDOC := @PANDOC@
-PATCH := @PATCH@
-PRINTF := @PRINTF@
-READLINK := @READLINK@
-RM := @RM@
-RMDIR := @RMDIR@
-SED := @SED@
-SH := @SH@
-SORT := @SORT@
-TAR := @TAR@
-TAIL := @TAIL@
-TEE := @TEE@
-TIME := @TIME@
-IS_GNU_TIME := @IS_GNU_TIME@
-TR := @TR@
-TOUCH := @TOUCH@
-WC := @WC@
-XARGS := @XARGS@
-ZIPEXE := @ZIPEXE@
-UNZIP := @UNZIP@
-MT := @MT@
-RC := @RC@
-DUMPBIN := @DUMPBIN@
-PATHTOOL := @PATHTOOL@
-WSLPATH := @WSLPATH@
-LDD := @LDD@
-OTOOL := @OTOOL@
-READELF := @READELF@
-EXPR := @EXPR@
-FILE := @FILE@
-DOT := @DOT@
-GIT := @GIT@
-OBJCOPY := @OBJCOPY@
-SETFILE := @SETFILE@
-XATTR := @XATTR@
-JT_HOME := @JT_HOME@
-JIB_HOME := @JIB_HOME@
-DTRACE := @DTRACE@
-FIXPATH := @FIXPATH@
-FIXPATH_BASE := @FIXPATH_BASE@
-ULIMIT := @ULIMIT@
-
-TAR_TYPE := @TAR_TYPE@
-TAR_INCLUDE_PARAM := @TAR_INCLUDE_PARAM@
-TAR_SUPPORTS_TRANSFORM := @TAR_SUPPORTS_TRANSFORM@
-
-# Build setup
-USE_EXTERNAL_LIBJPEG := @USE_EXTERNAL_LIBJPEG@
-USE_EXTERNAL_LIBGIF := @USE_EXTERNAL_LIBGIF@
-USE_EXTERNAL_LIBZ := @USE_EXTERNAL_LIBZ@
-LIBZ_CFLAGS := @LIBZ_CFLAGS@
-LIBZ_LIBS := @LIBZ_LIBS@
-LIBZIP_CAN_USE_MMAP := @LIBZIP_CAN_USE_MMAP@
-MSVCR_DLL := @MSVCR_DLL@
-VCRUNTIME_1_DLL := @VCRUNTIME_1_DLL@
-MSVCP_DLL := @MSVCP_DLL@
-UCRT_DLL_DIR := @UCRT_DLL_DIR@
-ENABLE_PANDOC := @ENABLE_PANDOC@
-PANDOC_MARKDOWN_FLAG := @PANDOC_MARKDOWN_FLAG@
-
-####################################################
-#
-# Libraries
-#
-
-USE_EXTERNAL_LCMS := @USE_EXTERNAL_LCMS@
-LCMS_CFLAGS := @LCMS_CFLAGS@
-LCMS_LIBS := @LCMS_LIBS@
-
-USE_EXTERNAL_HARFBUZZ := @USE_EXTERNAL_HARFBUZZ@
-HARFBUZZ_CFLAGS := @HARFBUZZ_CFLAGS@
-HARFBUZZ_LIBS := @HARFBUZZ_LIBS@
-
-USE_EXTERNAL_LIBPNG := @USE_EXTERNAL_LIBPNG@
-PNG_LIBS := @PNG_LIBS@
-PNG_CFLAGS := @PNG_CFLAGS@
-
-####################################################
-#
-# Misc
-#
-
-INCLUDE_SA := @INCLUDE_SA@
-INCLUDE_JVMCI := @INCLUDE_JVMCI@
-INCLUDE_COMPILER2 := @INCLUDE_COMPILER2@
-
-OS_VERSION_MAJOR := @OS_VERSION_MAJOR@
-OS_VERSION_MINOR := @OS_VERSION_MINOR@
-OS_VERSION_MICRO := @OS_VERSION_MICRO@
-
-# Images directory definitions
-JDK_IMAGE_SUBDIR := jdk
-JRE_IMAGE_SUBDIR := jre
-JCOV_IMAGE_SUBDIR := jdk-jcov
-
-# Colon left out to be able to override output dir for bootcycle-images
-JDK_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR)
-JRE_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR)
-JCOV_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JCOV_IMAGE_SUBDIR)
-
-# Test image, as above
-TEST_IMAGE_SUBDIR := test
-TEST_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(TEST_IMAGE_SUBDIR)
-
-# Symbols image
-SYMBOLS_IMAGE_SUBDIR := symbols
-SYMBOLS_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(SYMBOLS_IMAGE_SUBDIR)
-
-# Interim image
-INTERIM_JMODS_DIR := $(SUPPORT_OUTPUTDIR)/interim-jmods
-INTERIM_IMAGE_DIR := $(SUPPORT_OUTPUTDIR)/interim-image
-
-# Docs image
-DOCS_JDK_IMAGE_SUBDIR := docs
-DOCS_JDK_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_JDK_IMAGE_SUBDIR)
-DOCS_JAVASE_IMAGE_SUBDIR := docs-javase
-DOCS_JAVASE_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_JAVASE_IMAGE_SUBDIR)
-DOCS_REFERENCE_IMAGE_SUBDIR := docs-reference
-DOCS_REFERENCE_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_REFERENCE_IMAGE_SUBDIR)
-# Output docs directly into image
-DOCS_OUTPUTDIR := $(DOCS_JDK_IMAGE_DIR)
-
-# Static libs image
-STATIC_LIBS_IMAGE_SUBDIR := static-libs
-STATIC_LIBS_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(STATIC_LIBS_IMAGE_SUBDIR)
-
-# Graal static libs image
-STATIC_LIBS_GRAAL_IMAGE_SUBDIR := static-libs-graal
-STATIC_LIBS_GRAAL_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(STATIC_LIBS_GRAAL_IMAGE_SUBDIR)
-
-# Graal builder image
-GRAAL_BUILDER_IMAGE_SUBDIR := graal-builder-jdk
-GRAAL_BUILDER_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(GRAAL_BUILDER_IMAGE_SUBDIR)
-
-# Macosx bundles directory definitions
-JDK_MACOSX_BUNDLE_SUBDIR := jdk-bundle
-JRE_MACOSX_BUNDLE_SUBDIR := jre-bundle
-JDK_MACOSX_BUNDLE_SUBDIR_SIGNED := jdk-bundle-signed
-JRE_MACOSX_BUNDLE_SUBDIR_SIGNED := jre-bundle-signed
-JDK_MACOSX_BUNDLE_DIR = $(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR)
-JRE_MACOSX_BUNDLE_DIR = $(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR)
-JDK_MACOSX_BUNDLE_DIR_SIGNED = $(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR_SIGNED)
-JRE_MACOSX_BUNDLE_DIR_SIGNED = $(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR_SIGNED)
-JDK_MACOSX_BUNDLE_TOP_DIR = jdk-$(VERSION_NUMBER).jdk
-JRE_MACOSX_BUNDLE_TOP_DIR = jre-$(VERSION_NUMBER).jre
-JDK_MACOSX_CONTENTS_SUBDIR = $(JDK_MACOSX_BUNDLE_TOP_DIR)/Contents
-JRE_MACOSX_CONTENTS_SUBDIR = $(JRE_MACOSX_BUNDLE_TOP_DIR)/Contents
-JDK_MACOSX_CONTENTS_DIR = $(JDK_MACOSX_BUNDLE_DIR)/$(JDK_MACOSX_CONTENTS_SUBDIR)
-JRE_MACOSX_CONTENTS_DIR = $(JRE_MACOSX_BUNDLE_DIR)/$(JRE_MACOSX_CONTENTS_SUBDIR)
-
-# Bundle names
-ifneq ($(VERSION_BUILD), )
-  BASE_NAME := $(VERSION_SHORT)+$(VERSION_BUILD)_$(OPENJDK_TARGET_BUNDLE_PLATFORM)
-else
-  BASE_NAME := $(VERSION_SHORT)_$(OPENJDK_TARGET_BUNDLE_PLATFORM)
-endif
-
-ifeq ($(DEBUG_LEVEL), fastdebug)
-  DEBUG_PART := -debug
-else ifneq ($(DEBUG_LEVEL), release)
-  DEBUG_PART := -$(DEBUG_LEVEL)
-endif
-ifeq ($(OPENJDK_TARGET_OS), windows)
-  JDK_BUNDLE_EXTENSION := zip
-else
-  JDK_BUNDLE_EXTENSION := tar.gz
-endif
-JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
-JRE_BUNDLE_NAME := jre-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
-JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
-TEST_DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests-demos$(DEBUG_PART).tar.gz
-TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz
-DOCS_JDK_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
-DOCS_JAVASE_BUNDLE_NAME := javase-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
-DOCS_REFERENCE_BUNDLE_NAME := jdk-reference-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
-STATIC_LIBS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-static-libs$(DEBUG_PART).tar.gz
-STATIC_LIBS_GRAAL_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-static-libs-graal$(DEBUG_PART).tar.gz
-JCOV_BUNDLE_NAME := jdk-jcov-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
-
-JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
-JRE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JRE_BUNDLE_NAME)
-JDK_SYMBOLS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_SYMBOLS_BUNDLE_NAME)
-TEST_DEMOS_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_DEMOS_BUNDLE_NAME)
-TEST_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
-DOCS_JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_JDK_BUNDLE_NAME)
-DOCS_JAVASE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_JAVASE_BUNDLE_NAME)
-DOCS_REFERENCE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_REFERENCE_BUNDLE_NAME)
-JCOV_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JCOV_BUNDLE_NAME)
-
-# This macro is called to allow inclusion of closed source counterparts.
-# Unless overridden in closed sources, it expands to nothing.
-# Usage: This function is called in an open makefile, with the following
-# argument:
-# $1 the name of the makefile
-define IncludeCustomExtension
-endef
-
-# Include the custom-spec.gmk file if it exists
--include $(dir @SPEC@)/custom-spec.gmk

make/autoconf/toolchain.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@ VALID_TOOLCHAINS_all="gcc clang xlc microsoft"
 # These toolchains are valid on different platforms
 VALID_TOOLCHAINS_linux="gcc clang"
 VALID_TOOLCHAINS_macosx="clang"
-VALID_TOOLCHAINS_aix="xlc clang"
+VALID_TOOLCHAINS_aix="xlc"
 VALID_TOOLCHAINS_windows="microsoft"
 
 # Toolchain descriptions
@@ -53,7 +53,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
 TOOLCHAIN_MINIMUM_VERSION_clang="3.5"
 TOOLCHAIN_MINIMUM_VERSION_gcc="6.0"
 TOOLCHAIN_MINIMUM_VERSION_microsoft="19.28.0.0" # VS2019 16.8, aka MSVC 14.28
-TOOLCHAIN_MINIMUM_VERSION_xlc="16.1.0.0011"
+TOOLCHAIN_MINIMUM_VERSION_xlc=""
 
 # Minimum supported linker versions, empty means unspecified
 TOOLCHAIN_MINIMUM_LD_VERSION_gcc="2.18"
@@ -234,25 +234,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE],
   # First toolchain type in the list is the default
   DEFAULT_TOOLCHAIN=${VALID_TOOLCHAINS%% *}
 
-  # On AIX the default toolchain depends on the installed (found) compiler
-  #   xlclang++     -> xlc toolchain
-  #   ibm-clang++_r -> clang toolchain
-  # The compiler is searched on the PATH and TOOLCHAIN_PATH
-  # xlclang++ has precedence over ibm-clang++_r if both are installed
-  if test "x$OPENJDK_TARGET_OS" = xaix; then
-    DEFAULT_TOOLCHAIN="clang"
-    if test "x$TOOLCHAIN_PATH" != x; then
-      if test -e ${TOOLCHAIN_PATH}/xlclang++; then
-        DEFAULT_TOOLCHAIN="xlc"
-      fi
-    else
-      UTIL_LOOKUP_PROGS(XLCLANG_TEST_PATH, xlclang++)
-      if test "x$XLCLANG_TEST_PATH" != x; then
-        DEFAULT_TOOLCHAIN="xlc"
-      fi
-    fi
-  fi
-
   if test "x$with_toolchain_type" = xlist; then
     # List all toolchains
     AC_MSG_NOTICE([The following toolchains are valid on this platform:])
@@ -282,40 +263,22 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE],
     if test "x$TOOLCHAIN_PATH" != x; then
       XLC_TEST_PATH=${TOOLCHAIN_PATH}/
     fi
-    if test "x$TOOLCHAIN_TYPE" = xclang; then
-      TOOLCHAIN_DESCRIPTION_clang="IBM Open XL C/C++"
-      XLCLANG_VERSION_OUTPUT=`${XLC_TEST_PATH}ibm-clang++_r --version 2>&1 | $HEAD -n 1`
-      $ECHO "$XLCLANG_VERSION_OUTPUT" | $GREP "IBM Open XL C/C++ for AIX" > /dev/null
-      if test $? -eq 0; then
-        AC_MSG_NOTICE([ibm-clang++_r output: $XLCLANG_VERSION_OUTPUT])
-      else
-        AC_MSG_ERROR([ibm-clang++_r version output check failed, output: $XLCLANG_VERSION_OUTPUT])
-      fi
+
+    XLCLANG_VERSION_OUTPUT=`${XLC_TEST_PATH}xlclang++ -qversion 2>&1 | $HEAD -n 1`
+    $ECHO "$XLCLANG_VERSION_OUTPUT" | $GREP "IBM XL C/C++ for AIX" > /dev/null
+    if test $? -eq 0; then
+      AC_MSG_NOTICE([xlclang++ output: $XLCLANG_VERSION_OUTPUT])
     else
-      XLCLANG_VERSION_OUTPUT=`${XLC_TEST_PATH}xlclang++ -qversion 2>&1 | $HEAD -n 1`
-      $ECHO "$XLCLANG_VERSION_OUTPUT" | $GREP "IBM XL C/C++ for AIX" > /dev/null
-      if test $? -eq 0; then
-        AC_MSG_NOTICE([xlclang++ output: $XLCLANG_VERSION_OUTPUT])
-      else
-        AC_MSG_ERROR([xlclang++ version output check failed, output: $XLCLANG_VERSION_OUTPUT])
-      fi
+      AC_MSG_ERROR([xlclang++ version output check failed, output: $XLCLANG_VERSION_OUTPUT])
     fi
   fi
 
-  if test "x$OPENJDK_TARGET_OS" = xaix; then
-    TOOLCHAIN_CC_BINARY_clang="ibm-clang_r"
-  else
-    TOOLCHAIN_CC_BINARY_clang="clang"
-  fi
+  TOOLCHAIN_CC_BINARY_clang="clang"
   TOOLCHAIN_CC_BINARY_gcc="gcc"
   TOOLCHAIN_CC_BINARY_microsoft="cl"
   TOOLCHAIN_CC_BINARY_xlc="xlclang"
 
-  if test "x$OPENJDK_TARGET_OS" = xaix; then
-    TOOLCHAIN_CXX_BINARY_clang="ibm-clang++_r"
-  else
-    TOOLCHAIN_CXX_BINARY_clang="clang++"
-  fi
+  TOOLCHAIN_CXX_BINARY_clang="clang++"
   TOOLCHAIN_CXX_BINARY_gcc="g++"
   TOOLCHAIN_CXX_BINARY_microsoft="cl"
   TOOLCHAIN_CXX_BINARY_xlc="xlclang++"
@@ -421,7 +384,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
     # Collapse compiler output into a single line
     COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT`
     COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
-        $SED -e 's/^.*Version: \(@<:@1-9@:>@@<:@0-9.@:>@*\).*$/\1/'`
+        $SED -e 's/^.*, V\(@<:@1-9@:>@@<:@0-9.@:>@*\).*$/\1/'`
   elif test  "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     # There is no specific version flag, but all output starts with a version string.
     # First line typically looks something like:
@@ -669,7 +632,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
   if test "x$TOOLCHAIN_MINIMUM_VERSION" != x; then
     TOOLCHAIN_CHECK_COMPILER_VERSION(VERSION: $TOOLCHAIN_MINIMUM_VERSION,
         IF_OLDER_THAN: [
-          AC_MSG_WARN([You are using $TOOLCHAIN_TYPE $CC_VERSION_NUMBER which is older than $TOOLCHAIN_MINIMUM_VERSION. This is not a supported configuration.])
+          AC_MSG_WARN([You are using $TOOLCHAIN_TYPE older than $TOOLCHAIN_MINIMUM_VERSION. This is not a supported configuration.])
         ]
     )
   fi
@@ -804,11 +767,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA],
 
   case $TOOLCHAIN_TYPE in
     gcc|clang)
-      if test "x$OPENJDK_TARGET_OS" = xaix; then
-        UTIL_REQUIRE_TOOLCHAIN_PROGS(CXXFILT, ibm-llvm-cxxfilt)
-      else
-        UTIL_REQUIRE_TOOLCHAIN_PROGS(CXXFILT, c++filt)
-      fi
+      UTIL_REQUIRE_TOOLCHAIN_PROGS(CXXFILT, c++filt)
       ;;
   esac
 ])
@@ -1007,11 +966,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
   # Setup hotspot lecagy names for toolchains
   HOTSPOT_TOOLCHAIN_TYPE=$TOOLCHAIN_TYPE
   if test "x$TOOLCHAIN_TYPE" = xclang; then
-    if test "x$OPENJDK_TARGET_OS" = xaix; then
-      HOTSPOT_TOOLCHAIN_TYPE=xlc
-    else
-      HOTSPOT_TOOLCHAIN_TYPE=gcc
-    fi
+    HOTSPOT_TOOLCHAIN_TYPE=gcc
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     HOTSPOT_TOOLCHAIN_TYPE=visCPP
   fi

make/autoconf/util.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@ m4_include([util_paths.m4])
 AC_DEFUN([UTIL_DEFUN_NAMED],
 [
   AC_DEFUN($1, [
-    m4_foreach([arg], m4_split(m4_normalize($2)), [
+    m4_foreach(arg, m4_split(m4_normalize($2)), [
       m4_if(m4_bregexp(arg, [^\*]), -1,
         [
           m4_set_add(legal_named_args, arg)
@@ -64,18 +64,13 @@ AC_DEFUN([UTIL_DEFUN_NAMED],
       )
     ])
 
-    # Delicate quoting and unquoting sequence to ensure the actual value is passed along unchanged
-    # For details on how this works, see https://git.openjdk.org/jdk/pull/11458#discussion_r1038173051
-    # WARNING: Proceed at the risk of your own sanity, getting this to work has made me completely
-    # incapable of feeling love or any other positive emotion
-    # ~Julian
-    m4_foreach([arg], m4_dquote(m4_dquote_elt($3)), [
-      m4_if(m4_index(arg, [: ]), -1, [m4_define([arg], m4_dquote(m4_bpatsubst(m4_dquote(arg), [:], [: ])))])
-      m4_define(arg_name, m4_substr(arg, 0, m4_index(arg, [: ])))
+    m4_foreach([arg], [$3], [
+      m4_if(m4_bregexp(arg, [: ]), -1, m4_define([arg], m4_bpatsubst(arg, [:], [: ])))
+      m4_define(arg_name, m4_substr(arg, 0, m4_bregexp(arg, [: ])))
       m4_set_contains(legal_named_args, arg_name, [],[AC_MSG_ERROR([Internal error: m4_if(arg_name, , arg, arg_name) is not a valid named argument to [$1]. Valid arguments are 'm4_set_contents(defined_args, [ ]) m4_set_contents(legal_named_args, [ ])'.])])
       m4_set_remove(required_named_args, arg_name)
       m4_set_remove(legal_named_args, arg_name)
-      m4_pushdef([ARG_][]arg_name, m4_bpatsubst(m4_bpatsubst(m4_dquote(m4_dquote(arg)), arg_name[: ]), [^\s*]))
+      m4_pushdef([ARG_][]arg_name, m4_bpatsubst(m4_substr(arg, m4_incr(m4_incr(m4_bregexp(arg, [: ])))), [^\s*], []))
       m4_set_add(defined_args, arg_name)
       m4_undefine([arg_name])
     ])
@@ -381,18 +376,18 @@ UTIL_DEFUN_NAMED([UTIL_ARG_ENABLE],
   m4_define(ARG_GIVEN, m4_translit(ARG_NAME, [a-z-], [A-Z_])[_GIVEN])
 
   # If DESC is not specified, set it to a generic description.
-  m4_define([ARG_DESC], m4_if(m4_quote(ARG_DESC), , [[Enable the ARG_NAME feature]], [m4_normalize(ARG_DESC)]))
+  m4_define([ARG_DESC], m4_if(ARG_DESC, , [Enable the ARG_NAME feature], m4_normalize(ARG_DESC)))
 
   # If CHECKING_MSG is not specified, set it to a generic description.
-  m4_define([ARG_CHECKING_MSG], m4_if(m4_quote(ARG_CHECKING_MSG), , [[for --enable-ARG_NAME]], [m4_normalize(ARG_CHECKING_MSG)]))
+  m4_define([ARG_CHECKING_MSG], m4_if(ARG_CHECKING_MSG, , [for --enable-ARG_NAME], m4_normalize(ARG_CHECKING_MSG)))
 
   # If the code blocks are not given, set them to the empty statements to avoid
   # tripping up bash.
-  m4_if(ARG_CHECK_AVAILABLE, , [m4_define([ARG_CHECK_AVAILABLE], [:])])
-  m4_if(ARG_IF_GIVEN, , [m4_define([ARG_IF_GIVEN], [:])])
-  m4_if(ARG_IF_NOT_GIVEN, , [m4_define([ARG_IF_NOT_GIVEN], [:])])
-  m4_if(ARG_IF_ENABLED, , [m4_define([ARG_IF_ENABLED], [:])])
-  m4_if(ARG_IF_DISABLED, , [m4_define([ARG_IF_DISABLED], [:])])
+  m4_define([ARG_CHECK_AVAILABLE], m4_if(ARG_CHECK_AVAILABLE, , :, ARG_CHECK_AVAILABLE))
+  m4_define([ARG_IF_GIVEN], m4_if(ARG_IF_GIVEN, , :, ARG_IF_GIVEN))
+  m4_define([ARG_IF_NOT_GIVEN], m4_if(ARG_IF_NOT_GIVEN, , :, ARG_IF_NOT_GIVEN))
+  m4_define([ARG_IF_ENABLED], m4_if(ARG_IF_ENABLED, , :, ARG_IF_ENABLED))
+  m4_define([ARG_IF_DISABLED], m4_if(ARG_IF_DISABLED, , :, ARG_IF_DISABLED))
 
   ##########################
   # Part 2: Set up autoconf shell code
@@ -509,7 +504,7 @@ AC_DEFUN([UTIL_CHECK_TYPE_directory],
     FAILURE="Directory $1 does not exist or is not readable"
   fi
 
-  if test "[x]ARG_CHECK_FOR_FILES" != "x:"; then
+  if test "[x]ARG_CHECK_FOR_FILES" != x; then
     for file in ARG_CHECK_FOR_FILES; do
       found_files=$($ECHO $(ls $1/$file 2> /dev/null))
       if test "x$found_files" = x; then
@@ -655,21 +650,21 @@ UTIL_DEFUN_NAMED([UTIL_ARG_WITH],
   m4_define(ARG_GIVEN, m4_translit(ARG_NAME, [a-z-], [A-Z_])[_GIVEN])
 
   # If DESC is not specified, set it to a generic description.
-  m4_define([ARG_DESC], m4_if(m4_quote(ARG_DESC), , [[Give a value for the ARG_NAME feature]], [m4_normalize(ARG_DESC)]))
+  m4_define([ARG_DESC], m4_if(ARG_DESC, , [Give a value for the ARG_NAME feature], m4_normalize(ARG_DESC)))
 
   # If CHECKING_MSG is not specified, set it to a generic description.
-  m4_define([ARG_CHECKING_MSG], m4_if(m4_quote(ARG_CHECKING_MSG), , [[for --with-ARG_NAME]], [m4_normalize(ARG_CHECKING_MSG)]))
+  m4_define([ARG_CHECKING_MSG], m4_if(ARG_CHECKING_MSG, , [for --with-ARG_NAME], m4_normalize(ARG_CHECKING_MSG)))
 
   m4_define([ARG_HAS_AUTO_BLOCK], m4_if(ARG_IF_AUTO, , false, true))
 
   # If the code blocks are not given, set them to the empty statements to avoid
   # tripping up bash.
-  m4_if(ARG_CHECK_AVAILABLE, , [m4_define([ARG_CHECK_AVAILABLE], [:])])
-  m4_if(ARG_CHECK_VALUE, , [m4_define([ARG_CHECK_VALUE], [:])])
-  m4_if(ARG_CHECK_FOR_FILES, , [m4_define([ARG_CHECK_FOR_FILES], [:])])
-  m4_if(ARG_IF_AUTO, , [m4_define([ARG_IF_AUTO], [:])])
-  m4_if(ARG_IF_GIVEN, , [m4_define([ARG_IF_GIVEN], [:])])
-  m4_if(ARG_IF_NOT_GIVEN, , [m4_define([ARG_IF_NOT_GIVEN], [:])])
+  m4_define([ARG_CHECK_AVAILABLE], m4_if(ARG_CHECK_AVAILABLE, , :, ARG_CHECK_AVAILABLE))
+  m4_define([ARG_CHECK_VALUE], m4_if(ARG_CHECK_VALUE, , :, ARG_CHECK_VALUE))
+  m4_define([ARG_CHECK_FOR_FILES], m4_if(ARG_CHECK_FOR_FILES, , :, ARG_CHECK_FOR_FILES))
+  m4_define([ARG_IF_AUTO], m4_if(ARG_IF_AUTO, , :, ARG_IF_AUTO))
+  m4_define([ARG_IF_GIVEN], m4_if(ARG_IF_GIVEN, , :, ARG_IF_GIVEN))
+  m4_define([ARG_IF_NOT_GIVEN], m4_if(ARG_IF_NOT_GIVEN, , :, ARG_IF_NOT_GIVEN))
 
   ##########################
   # Part 2: Set up autoconf shell code
@@ -781,25 +776,25 @@ UTIL_DEFUN_NAMED([UTIL_ARG_WITH],
     else
       AC_MSG_RESULT([$ARG_RESULT, $REASON])
     fi
+  fi
 
-    # Verify value
-    # First use our dispatcher to verify that type requirements are satisfied
-    UTIL_CHECK_TYPE(ARG_TYPE, $ARG_RESULT)
+  # Verify value
+  # First use our dispatcher to verify that type requirements are satisfied
+  UTIL_CHECK_TYPE(ARG_TYPE, $ARG_RESULT)
 
-    if test "x$FAILURE" = x; then
-      # Execute custom verification payload, if present
-      RESULT="$ARG_RESULT"
+  if test "x$FAILURE" = x; then
+    # Execute custom verification payload, if present
+    RESULT="$ARG_RESULT"
 
-      ARG_CHECK_VALUE
+    ARG_CHECK_VALUE
 
-      ARG_RESULT="$RESULT"
-    fi
+    ARG_RESULT="$RESULT"
+  fi
 
-    if test "x$FAILURE" != x; then
-      AC_MSG_NOTICE([Invalid value for [--with-]ARG_NAME: "$ARG_RESULT"])
-      AC_MSG_NOTICE([$FAILURE])
-      AC_MSG_ERROR([Cannot continue])
-    fi
+  if test "x$FAILURE" != x; then
+    AC_MSG_NOTICE([Invalid value for [--with-]ARG_NAME: "$ARG_RESULT"])
+    AC_MSG_NOTICE([$FAILURE])
+    AC_MSG_ERROR([Cannot continue])
   fi
 
   # Execute result payloads, if present
@@ -818,12 +813,3 @@ AC_DEFUN([UTIL_CHECK_STRING_NON_EMPTY],
     FAILURE="Value cannot be empty"
   fi
 ])
-
-AC_DEFUN([UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE],
-[
-  if test "x$RESULT" = x; then
-    FAILURE="Value cannot be empty"
-  elif [ ! [[ $RESULT =~ ^[[:print:]]*$ ]] ]; then
-    FAILURE="Value contains non-printing characters: $RESULT"
-  fi
-])

make/autoconf/util_paths.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -118,24 +118,6 @@ AC_DEFUN([UTIL_FIXUP_PATH],
   fi
 ])
 
-##############################################################################
-# Fixup path to be a Windows full long path
-# Note: Only supported with cygwin/msys2 (cygpath tool)
-AC_DEFUN([UTIL_FIXUP_WIN_LONG_PATH],
-[
-  # Only process if variable expands to non-empty
-  path="[$]$1"
-  if test "x$path" != x; then
-    if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
-      win_path=$($PATHTOOL -wl "$path")
-      if test "x$win_path" != "x$path"; then
-        $1="$win_path"
-      fi
-    fi
-  fi
-])
-
-
 ###############################################################################
 # Check if the given file is a unix-style or windows-style executable, that is,
 # if it expects paths in unix-style or windows-style.
@@ -539,7 +521,7 @@ AC_DEFUN([UTIL_REMOVE_SYMBOLIC_LINKS],
       sym_link_dir=`pwd -P`
       # Resolve file symlinks
       while test $COUNTER -lt 20; do
-        ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP -e '->' | $SED -e 's/.*-> \(.*\)/\1/'`
+        ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
         if test "x$ISLINK" == x; then
           # This is not a symbolic link! We are done!
           break

make/common/JavaCompilation.gmk

@@ -219,35 +219,31 @@ define SetupJavaCompilationBody
     # Use java server if it is enabled, and the user does not want a specialized
     # class path.
     ifeq ($$(ENABLE_JAVAC_SERVER)+$$($1_CLASSPATH), true+)
+      $1_JAVAC := $$(INTERIM_LANGTOOLS_ARGS) -m jdk.compiler.interim/com.sun.tools.sjavac.Main
+
       # Create a configuration file with the needed information for the javac
       # server to function properly.
-      $1_JAVAC_SERVER_CONFIG := $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$$($1_SAFE_NAME)-javacserver.conf
-
-      # Arguments needed to launch the javacserver client, as well as for the
-      # client to launch the server.
-      $1_JAVAC_SERVER_ARGS := $$(INTERIM_LANGTOOLS_ARGS) \
-          -cp $(BUILDTOOLS_OUTPUTDIR)/langtools_javacserver_classes
+      $1_JAVAC_SERVER_CONFIG := $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$$($1_SAFE_NAME)-server.conf
 
       # The portfile contains the tcp/ip on which the server listens
       # and the cookie necessary to talk to the server.
       $1_JAVAC_PORT_FILE := $$(call FixPath, $$(JAVAC_SERVER_DIR)/server.port)
 
-      # The javacmd tells the client how to run java to launch the server.
-      $1_JAVAC_SERVER_JAVA_CMD := $$(call FixPath, $$(JAVA) $$($1_JAVA_FLAGS) \
-          $$($1_JAVAC_SERVER_ARGS))
+      # The servercmd specifies how to launch the server. This will be executed
+      # by the client, if needed.
+      $1_JAVAC_SERVER_CMD := $$(call FixPath, $$(JAVA) $$($1_JAVA_FLAGS) $$($1_JAVAC))
 
-      $1_CONFIG_VARDEPS := $$($1_JAVAC_PORT_FILE) $$($1_JAVAC_SERVER_JAVA_CMD)
+      $1_CONFIG_VARDEPS := $$($1_JAVAC_PORT_FILE) $$($1_JAVAC_SERVER_CMD)
       $1_CONFIG_VARDEPS_FILE := $$(call DependOnVariable, $1_CONFIG_VARDEPS, \
           $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$1.config_vardeps)
 
-      # Write these values to a config file
       $$($1_JAVAC_SERVER_CONFIG): $$($1_CONFIG_VARDEPS_FILE)
 	$(ECHO) portfile=$$($1_JAVAC_PORT_FILE) > $$@
-	$(ECHO) javacmd=$$($1_JAVAC_SERVER_JAVA_CMD) >> $$@
+	$(ECHO) servercmd=$$($1_JAVAC_SERVER_CMD) >> $$@
 
       # Always use small java to launch client
-      $1_JAVAC_CMD := $$(JAVA_SMALL) $$($1_JAVA_FLAGS) $$($1_JAVAC_SERVER_ARGS) \
-          javacserver.Main --conf=$$($1_JAVAC_SERVER_CONFIG)
+      $1_JAVAC_CMD := $$(JAVA_SMALL) $$($1_JAVA_FLAGS) $$($1_JAVAC) \
+          --server:conf=$$($1_JAVAC_SERVER_CONFIG)
     else
       # No javac server
       $1_JAVAC := $$(INTERIM_LANGTOOLS_ARGS) -m jdk.compiler.interim/com.sun.tools.javac.Main

make/common/JdkNativeCompilation.gmk

@@ -98,7 +98,7 @@ GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/ve
 
 JDK_RCFLAGS=$(RCFLAGS) \
     -D"JDK_VERSION_STRING=$(VERSION_STRING)" \
-    -D"JDK_COMPANY=$(JDK_RC_COMPANY_NAME)" \
+    -D"JDK_COMPANY=$(COMPANY_NAME)" \
     -D"JDK_VER=$(VERSION_NUMBER_FOUR_POSITIONS)" \
     -D"JDK_COPYRIGHT=Copyright \xA9 $(COPYRIGHT_YEAR)" \
     -D"JDK_NAME=$(JDK_RC_NAME) $(VERSION_SHORT)" \

make/common/MakeBase.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -194,7 +194,7 @@ $(eval $(call SetupLogging))
 
 ################################################################################
 
-MAX_PARAMS := 96
+MAX_PARAMS := 36
 PARAM_SEQUENCE := $(call sequence, 2, $(MAX_PARAMS))
 
 # Template for creating a macro taking named parameters. To use it, assign the
@@ -219,7 +219,7 @@ define NamedParamsMacroTemplate
   $(foreach i,$(PARAM_SEQUENCE), $(if $(strip $($i)),\
     $(strip $1)_$(strip $(call EscapeHash, $(call DoubleDollar, $($i))))$(NEWLINE)))
   # Debug print all named parameter names and values
-  $(if $(findstring $(LOG_LEVEL), trace), \
+  $(if $(findstring $(LOG_LEVEL),debug trace), \
     $(info $0 $(strip $1) $(foreach i,$(PARAM_SEQUENCE), \
       $(if $(strip $($i)),$(NEWLINE) $(strip [$i] $(if $(filter $(LOG_LEVEL), trace), \
         $($i), $(wordlist 1, 20, $($(i))) $(if $(word 21, $($(i))), ...)))))))
@@ -306,36 +306,17 @@ endef
 # There are two versions, either creating a relative or an absolute link. Be
 # careful when using this on Windows since the symlink created is only valid in
 # the unix emulation environment.
-# In msys2 we use mklink /J because its ln would perform a deep copy of the target.
-# This inhibits performance and can lead to issues with long paths. With mklink /J
-# relative linking does not work, so we handle the link as absolute path.
-ifeq ($(OPENJDK_BUILD_OS_ENV), windows.msys2)
-  define link-file-relative
-	$(call MakeTargetDir)
-	$(RM) '$(call DecodeSpace, $@)'
-	cmd //c "mklink /J $(call FixPath, $(call DecodeSpace, $@)) $(call FixPath, $(call DecodeSpace, $<))"
-  endef
-else
-  define link-file-relative
+define link-file-relative
 	$(call MakeTargetDir)
 	$(RM) '$(call DecodeSpace, $@)'
 	$(LN) -s '$(call DecodeSpace, $(call RelativePath, $<, $(@D)))' '$(call DecodeSpace, $@)'
-  endef
-endif
+endef
 
-ifeq ($(OPENJDK_BUILD_OS_ENV), windows.msys2)
-  define link-file-absolute
-	$(call MakeTargetDir)
-	$(RM) '$(call DecodeSpace, $@)'
-	cmd //c "mklink /J $(call FixPath, $(call DecodeSpace, $@)) $(call FixPath, $(call DecodeSpace, $<))"
-  endef
-else
-  define link-file-absolute
+define link-file-absolute
 	$(call MakeTargetDir)
 	$(RM) '$(call DecodeSpace, $@)'
 	$(LN) -s '$(call DecodeSpace, $<)' '$(call DecodeSpace, $@)'
-  endef
-endif
+endef
 
 ################################################################################