Merge

8275849: TestZoneInfo310.java fails with tzdata2021e
8276536: Update TimeZoneNames files to follow the changes made by JDK-8275766

Reviewed-by: coffeys

.github/actions/config/action.yml

@@ -1,46 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-name: 'Config'
-description: 'Read JDK Configuration Variables'
-inputs:
-  var:
-    description: 'The name of the variable to read'
-    required: true
-outputs:
-  value:
-    description: 'The value of the configuration variable'
-    value: ${{ steps.read-config.outputs.value }}
-
-runs:
-  using: composite
-  steps:
-    - name: 'Read configuration variable from repo'
-      id: read-config
-      run: |
-        # Extract value from configuration file
-        value="$(grep -h ${{ inputs.var }}= make/conf/github-actions.conf | cut -d '=' -f 2-)"
-        echo "::set-output name=value::$value"
-      shell: bash

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

@@ -1,80 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-name: 'Do build'
-description: 'Build the JDK using make'
-inputs:
-  make-target:
-    description: 'Make target(s)'
-    required: true
-  platform:
-    description: 'Platform name'
-    required: true
-  debug-suffix:
-    description: 'File name suffix denoting debug level, possibly empty'
-    required: false
-
-runs:
-  using: composite
-  steps:
-    - name: 'Build'
-      id: build
-      run: >
-        make LOG=info ${{ inputs.make-target }}
-        || bash ./.github/scripts/gen-build-failure-report.sh "$GITHUB_STEP_SUMMARY"
-      shell: bash
-
-    - name: 'Check for failure'
-      id: check
-      run: |
-        # Check for failure marker file
-        build_dir="$(ls -d build/*)"
-        if [[ -e $build_dir/build-failure ]]; then
-          # Collect relevant log files
-          mkdir failure-logs
-          cp \
-              $build_dir/spec.gmk \
-              $build_dir/build.log \
-              $build_dir/configure.log \
-              $build_dir/make-support/failure-summary.log \
-              $build_dir/make-support/failure-logs/* \
-              failure-logs/ 2> /dev/null || true
-          echo '::set-output name=failure::true'
-        fi
-      shell: bash
-
-    - name: 'Upload build logs'
-      uses: actions/upload-artifact@v3
-      with:
-        name: failure-logs-${{ inputs.platform }}${{ inputs.debug-suffix }}
-        path: failure-logs
-      if: steps.check.outputs.failure == 'true'
-
-      # This is the best way I found to abort the job with an error message
-    - name: 'Notify about build failures'
-      uses: actions/github-script@v6
-      with:
-        script: core.setFailed('Build failed. See summary for details.')
-      if: steps.check.outputs.failure == 'true'

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

@@ -1,109 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-name: 'Get BootJDK'
-description: 'Download the BootJDK from cache or source location'
-inputs:
-  platform:
-    description: 'Platform'
-    required: true
-outputs:
-  path:
-    description: 'Path to the installed BootJDK'
-    value: ${{ steps.path-name.outputs.path }}
-
-runs:
-  using: composite
-  steps:
-    - name: 'Determine platform prefix'
-      id: platform-prefix
-      run: |
-        # Convert platform name to upper case
-        platform_prefix="$(echo ${{ inputs.platform }} | tr [a-z-] [A-Z_])"
-        echo "::set-output name=value::$platform_prefix"
-      shell: bash
-
-    - name: 'Get URL configuration'
-      id: url
-      uses: ./.github/actions/config
-      with:
-        var: ${{ steps.platform-prefix.outputs.value}}_BOOT_JDK_URL
-
-    - name: 'Get SHA256 configuration'
-      id: sha256
-      uses: ./.github/actions/config
-      with:
-        var: ${{ steps.platform-prefix.outputs.value}}_BOOT_JDK_SHA256
-
-    - name: 'Get file extension configuration'
-      id: ext
-      uses: ./.github/actions/config
-      with:
-        var: ${{ steps.platform-prefix.outputs.value}}_BOOT_JDK_EXT
-
-    - name: 'Check cache for BootJDK'
-      id: get-cached-bootjdk
-      uses: actions/cache@v3
-      with:
-        path: bootjdk/jdk
-        key: boot-jdk-${{ inputs.platform }}-${{ steps.sha256.outputs.value }}
-
-      # macOS is missing sha256sum
-    - name: 'Install sha256sum'
-      run: |
-        # Run Homebrew installation
-        brew install coreutils
-      shell: bash
-      if: steps.get-cached-bootjdk.outputs.cache-hit != 'true' && runner.os == 'macOS'
-
-    - name: 'Download BootJDK'
-      run: |
-        # Download BootJDK and verify checksum
-        mkdir -p bootjdk/jdk
-        mkdir -p bootjdk/unpacked
-        wget --progress=dot:mega -O bootjdk/jdk.${{ steps.ext.outputs.value }} '${{ steps.url.outputs.value }}'
-        echo '${{ steps.sha256.outputs.value }} bootjdk/jdk.${{ steps.ext.outputs.value }}' | sha256sum -c >/dev/null -
-      shell: bash
-      if: steps.get-cached-bootjdk.outputs.cache-hit != 'true'
-
-    - name: 'Unpack BootJDK'
-      run: |
-        # Unpack the BootJDK and move files to a common location
-        if [[ '${{ steps.ext.outputs.value }}' == 'tar.gz' ]]; then
-          tar -xf bootjdk/jdk.${{ steps.ext.outputs.value }} -C bootjdk/unpacked
-        else
-          unzip -q bootjdk/jdk.${{ steps.ext.outputs.value }} -d bootjdk/unpacked
-        fi
-        jdk_root="$(dirname $(find bootjdk/unpacked -name bin -type d))"
-        mv "$jdk_root"/* bootjdk/jdk/
-      shell: bash
-      if: steps.get-cached-bootjdk.outputs.cache-hit != 'true'
-
-    - name: 'Export path to where BootJDK is installed'
-      id: path-name
-      run: |
-        # Export the path
-        echo '::set-output name=path::bootjdk/jdk'
-      shell: bash

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

@@ -1,109 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-name: 'Get bundles'
-description: 'Download resulting JDK bundles'
-inputs:
-  platform:
-    description: 'Platform name'
-    required: true
-  debug-suffix:
-    description: 'File name suffix denoting debug level, possibly empty'
-    required: false
-outputs:
-  jdk-path:
-    description: 'Path to the installed JDK bundle'
-    value: ${{ steps.path-name.outputs.jdk }}
-  symbols-path:
-    description: 'Path to the installed symbols bundle'
-    value: ${{ steps.path-name.outputs.symbols }}
-  tests-path:
-    description: 'Path to the installed tests bundle'
-    value: ${{ steps.path-name.outputs.tests }}
-
-runs:
-  using: composite
-  steps:
-    - name: 'Download bundles artifact'
-      id: download-bundles
-      uses: actions/download-artifact@v3
-      with:
-        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
-        path: bundles
-      continue-on-error: true
-
-    - name: 'Download bundles artifact (retry)'
-      uses: actions/download-artifact@v3
-      with:
-        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
-        path: bundles
-      if: steps.download-bundles.outcome == 'failure'
-
-    - name: 'Unpack bundles'
-      run: |
-        if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.zip ]]; then
-          echo 'Unpacking jdk bundle...'
-          mkdir -p bundles/jdk
-          unzip -q bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.zip -d bundles/jdk
-        fi
-
-        if [[ -e bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz ]]; then
-          echo 'Unpacking jdk bundle...'
-          mkdir -p bundles/jdk
-          tar -xf bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz -C bundles/jdk
-        fi
-
-        if [[ -e bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz ]]; then
-          echo 'Unpacking symbols bundle...'
-          mkdir -p bundles/symbols
-          tar -xf bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz -C bundles/symbols
-        fi
-
-        if [[ -e bundles/tests-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz ]]; then
-          echo 'Unpacking tests bundle...'
-          mkdir -p bundles/tests
-          tar -xf bundles/tests-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz -C bundles/tests
-        fi
-      shell: bash
-
-    - name: 'Export paths to where bundles are installed'
-      id: path-name
-      run: |
-        # Export the paths
-
-        jdk_dir="$GITHUB_WORKSPACE/$(dirname $(find bundles/jdk -name bin -type d))"
-        symbols_dir="$GITHUB_WORKSPACE/$(dirname $(find bundles/symbols -name bin -type d))"
-        tests_dir="$GITHUB_WORKSPACE/bundles/tests"
-
-        if [[ '${{ runner.os }}' == 'Windows' ]]; then
-          jdk_dir="$(cygpath $jdk_dir)"
-          symbols_dir="$(cygpath $symbols_dir)"
-          tests_dir="$(cygpath $tests_dir)"
-        fi
-
-        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,54 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-name: 'Get GTest'
-description: 'Download GTest source'
-outputs:
-  path:
-    description: 'Path to the installed GTest'
-    value: ${{ steps.path-name.outputs.path }}
-
-runs:
-  using: composite
-  steps:
-    - name: 'Get GTest version configuration'
-      id: version
-      uses: ./.github/actions/config
-      with:
-        var: GTEST_VERSION
-
-    - name: 'Checkout GTest source'
-      uses: actions/checkout@v3
-      with:
-        repository: google/googletest
-        ref: 'release-${{ steps.version.outputs.value }}'
-        path: gtest
-
-    - name: 'Export path to where GTest is installed'
-      id: path-name
-      run: |
-        # Export the path
-        echo '::set-output name=path::gtest'
-      shell: bash

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

@@ -1,72 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-name: 'Get JTReg'
-description: 'Download JTReg from cache or source location'
-outputs:
-  path:
-    description: 'Path to the installed JTReg'
-    value: ${{ steps.path-name.outputs.path }}
-
-runs:
-  using: composite
-  steps:
-    - name: 'Get JTReg version configuration'
-      id: version
-      uses: ./.github/actions/config
-      with:
-        var: JTREG_VERSION
-
-    - name: 'Check cache for JTReg'
-      id: get-cached-jtreg
-      uses: actions/cache@v3
-      with:
-        path: jtreg/installed
-        key: jtreg-${{ steps.version.outputs.value }}
-
-    - name: 'Checkout the JTReg source'
-      uses: actions/checkout@v3
-      with:
-        repository: openjdk/jtreg
-        ref: jtreg-${{ steps.version.outputs.value }}
-        path: jtreg/src
-      if: steps.get-cached-jtreg.outputs.cache-hit != 'true'
-
-    - name: 'Build JTReg'
-      run: |
-        # Build JTReg and move files to the proper locations
-        bash make/build.sh --jdk "$JAVA_HOME_11_X64"
-        mkdir ../installed
-        mv build/images/jtreg/* ../installed
-      working-directory: jtreg/src
-      shell: bash
-      if: steps.get-cached-jtreg.outputs.cache-hit != 'true'
-
-    - name: 'Export path to where JTReg is installed'
-      id: path-name
-      run: |
-        # Export the path
-        echo '::set-output name=path::jtreg/installed'
-      shell: bash

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

@@ -1,44 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-name: 'Get MSYS2'
-description: 'Download MSYS2 and prepare a Windows host'
-
-runs:
-  using: composite
-  steps:
-    - name: 'Install MSYS2'
-      uses: msys2/setup-msys2@v2
-      with:
-        install: 'autoconf tar unzip zip make'
-        path-type: minimal
-        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:GITHUB_WORKSPACE/msys2/msys64/usr/bin" >> $env:GITHUB_PATH
-      shell: pwsh

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

@@ -1,77 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-name: 'Upload bundles'
-description: 'Upload resulting JDK bundles'
-inputs:
-  platform:
-    description: 'Platform name'
-    required: true
-  debug-suffix:
-    description: 'File name suffix denoting debug level, possibly empty'
-    required: false
-
-runs:
-  using: composite
-  steps:
-
-    - name: 'Determine bundle names'
-      id: bundles
-      run: |
-        # Rename bundles to consistent names
-        jdk_bundle_zip="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.zip 2> /dev/null || true)"
-        jdk_bundle_tar_gz="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
-        symbols_bundle="$(ls build/*/bundles/jdk-*_bin${{ inputs.debug-suffix }}-symbols.tar.gz 2> /dev/null || true)"
-        tests_bundle="$(ls build/*/bundles/jdk-*_bin-tests${{ inputs.debug-suffix }}.tar.gz 2> /dev/null || true)"
-
-        mkdir bundles
-
-        if [[ "$jdk_bundle_zip" != "" ]]; then
-          mv "$jdk_bundle_zip" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.zip"
-        fi
-        if [[ "$jdk_bundle_tar_gz" != "" ]]; then
-          mv "$jdk_bundle_tar_gz" "bundles/jdk-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
-        fi
-        if [[ "$symbols_bundle" != "" ]]; then
-          mv "$symbols_bundle" "bundles/symbols-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
-        fi
-        if [[ "$tests_bundle" != "" ]]; then
-          mv "$tests_bundle" "bundles/tests-${{ inputs.platform }}${{ inputs.debug-suffix }}.tar.gz"
-        fi
-
-        if [[ "$jdk_bundle_zip$jdk_bundle_tar_gz$symbols_bundle$tests_bundle" != "" ]]; then
-          echo '::set-output name=bundles-found::true'
-        else
-          echo '::set-output name=bundles-found::false'
-        fi
-      shell: bash
-
-    - name: 'Upload bundles artifact'
-      uses: actions/upload-artifact@v3
-      with:
-        name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}
-        path: bundles
-        retention-days: 1
-      if: steps.bundles.outputs.bundles-found == 'true'

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

@@ -1,51 +0,0 @@
-#!/bin/bash
-#
-# 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
-# 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.
-#
-
-GITHUB_STEP_SUMMARY="$1"
-BUILD_DIR="$(ls -d build/*)"
-
-# Send signal to the do-build action that we failed
-touch "$BUILD_DIR/build-failure"
-
-(
-  echo '### :boom: Build failure summary'
-  echo ''
-  echo 'The build failed. Here follows the failure summary from the build.'
-  echo '<details><summary><b>View build failure summary</b></summary>'
-  echo ''
-  echo '```'
-  if [[ -f "$BUILD_DIR/make-support/failure-summary.log" ]]; then
-    cat "$BUILD_DIR/make-support/failure-summary.log"
-  else
-    echo "Failure summary ($BUILD_DIR/make-support/failure-summary.log) not found"
-  fi
-  echo '```'
-  echo '</details>'
-  echo ''
-
-  echo ''
-  echo ':arrow_right: To see the entire test log, click the job in the list to the left. To download logs, see the `failure-logs` [artifact above](#artifacts).'
-) >> $GITHUB_STEP_SUMMARY

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

@@ -1,92 +0,0 @@
-#!/bin/bash
-#
-# 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
-# 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.
-#
-
-GITHUB_STEP_SUMMARY="$1"
-
-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
-report_dir=build/run-test-prebuilt/test-support/$test_suite_name
-
-failures=$(sed -E -e 's/(.*)\.(java|sh)/\1/' -e '/^#/d' $results_dir/newfailures.txt 2> /dev/null || true)
-errors=$(sed -E -e 's/(.*)\.(java|sh)/\1/' -e '/^#/d' $results_dir/other_errors.txt 2> /dev/null || true)
-
-if [[ "$failures" = "" && "$errors" = "" ]]; then
-  # If we have nothing to report, exit this step now
-  exit 0
-fi
-
-echo "### Test output for failed tests" >> $GITHUB_STEP_SUMMARY
-for test in $failures $errors; do
-  anchor="$(echo "$test" | tr [A-Z/] [a-z_])"
-  base_path="$(echo "$test" | tr '#' '_')"
-  report_file="$report_dir/$base_path.jtr"
-  hs_err_files=$(ls $report_dir/$base_path/hs_err*.log 2> /dev/null || true)
-  echo "####  <a id="$anchor">$test"
-
-  echo '<details><summary>View test results</summary>'
-  echo ''
-  echo '```'
-  if [[ -f "$report_file" ]]; then
-    cat "$report_file"
-  else
-    echo "Error: Result file $report_file not found"
-  fi
-  echo '```'
-  echo '</details>'
-  echo ''
-
-  if [[ "$hs_err_files" != "" ]]; then
-    echo '<details><summary>View HotSpot error log</summary>'
-    echo ''
-    for hs_err in $hs_err_files; do
-      echo '```'
-      echo "$hs_err:"
-      echo ''
-      cat "$hs_err"
-      echo '```'
-    done
-
-    echo '</details>'
-    echo ''
-  fi
-
-done >> $GITHUB_STEP_SUMMARY
-
-# With many failures, the summary can easily exceed 1024 kB, the limit set by Github
-# Trim it down if so.
-summary_size=$(wc -c < $GITHUB_STEP_SUMMARY)
-if [[ $summary_size -gt 1000000 ]]; then
-  # Trim to below 1024 kB, and cut off after the last detail group
-  head -c 1000000 $GITHUB_STEP_SUMMARY | tac | sed -n -e '/<\/details>/,$ p' | tac > $GITHUB_STEP_SUMMARY.tmp
-  mv $GITHUB_STEP_SUMMARY.tmp $GITHUB_STEP_SUMMARY
-  (
-    echo ''
-    echo ':x: **WARNING: Summary is too large and has been truncated.**'
-    echo ''
-  )  >> $GITHUB_STEP_SUMMARY
-fi
-
-echo ':arrow_right: To see the entire test log, click the job in the list to the left.'  >> $GITHUB_STEP_SUMMARY

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

@@ -1,69 +0,0 @@
-#!/bin/bash
-#
-# 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
-# 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.
-#
-
-GITHUB_STEP_SUMMARY="$1"
-
-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
-
-if [[ ! -f build/run-test-prebuilt/make-support/exit-with-error ]]; then
-  # There were no failures, exit now
-  exit
-fi
-
-failures=$(sed -E -e 's/(.*)\.(java|sh)/\1/' -e '/^#/d' $results_dir/newfailures.txt 2> /dev/null || true)
-errors=$(sed -E -e 's/(.*)\.(java|sh)/\1/' -e '/^#/d' $results_dir/other_errors.txt 2> /dev/null || true)
-failure_count=$(echo $failures | wc -w || true)
-error_count=$(echo $errors | wc -w || true)
-
-if [[ "$failures" = "" && "$errors" = "" ]]; then
-  # We know something went wrong, but not what
-  echo '::set-output name=error-message::Unspecified test suite failure. Please see log for job for details.'
-  exit 0
-fi
-
-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
-
-if [[ "$failures" != "" ]]; then
-  echo '' >> $GITHUB_STEP_SUMMARY
-  echo 'These tests reported failure:' >> $GITHUB_STEP_SUMMARY
-  for test in $failures; do
-    anchor="$(echo "$test" | tr [A-Z/] [a-z_])"
-    echo "* [$test](#user-content-$anchor)"
-  done >> $GITHUB_STEP_SUMMARY
-fi
-
-if [[ "$errors" != "" ]]; then
-  echo '' >> $GITHUB_STEP_SUMMARY
-  echo 'These tests reported errors:'  >> $GITHUB_STEP_SUMMARY
-  for test in $errors; do
-    anchor="$(echo "$test" | tr [A-Z/] [a-z_])"
-    echo "* [$test](#user-content-$anchor)"
-  done >> $GITHUB_STEP_SUMMARY
-fi

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

@@ -1,154 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-name: 'Build (cross-compile)'
-
-on:
-  workflow_call:
-    inputs:
-      gcc-major-version:
-        required: false
-        type: string
-        default: '10'
-      apt-gcc-version:
-        required: false
-        type: string
-        default: '10.3.0-1ubuntu1~20.04'
-      apt-gcc-cross-suffix:
-        required: false
-        type: string
-        default: 'cross1'
-
-jobs:
-  build-cross-compile:
-    name: build
-    runs-on: ubuntu-20.04
-
-    strategy:
-      fail-fast: false
-      matrix:
-        target-cpu:
-          - aarch64
-          - arm
-          - s390x
-          - ppc64le
-        include:
-          - target-cpu: aarch64
-            debian-arch: arm64
-            gnu-arch: aarch64
-          - target-cpu: arm
-            debian-arch: armhf
-            gnu-arch: arm
-            gnu-abi: eabihf
-          - target-cpu: s390x
-            debian-arch: s390x
-            gnu-arch: s390x
-          - target-cpu: ppc64le
-            debian-arch: ppc64el
-            gnu-arch: powerpc64le
-
-    steps:
-      - name: 'Checkout the JDK source'
-        uses: actions/checkout@v3
-
-      - name: 'Get the BootJDK'
-        id: bootjdk
-        uses: ./.github/actions/get-bootjdk
-        with:
-          platform: linux-x64
-
-        # Use linux-x64 JDK bundle as build JDK
-      - name: 'Get build JDK'
-        id: buildjdk
-        uses: ./.github/actions/get-bundles
-        with:
-          platform: linux-x64
-
-        # Upgrading apt to solve libc6 installation bugs, see JDK-8260460.
-      - name: 'Install toolchain and dependencies'
-        run: |
-          # Install dependencies using apt-get
-          sudo apt-get update
-          sudo apt-get install --only-upgrade apt
-          sudo apt-get install \
-              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-version }}${{ inputs.apt-gcc-cross-suffix }} \
-              g++-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}=${{ inputs.apt-gcc-version }}${{ inputs.apt-gcc-cross-suffix }} \
-              libxrandr-dev libxtst-dev libcups2-dev libasound2-dev
-          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'
-        id: get-cached-sysroot
-        uses: actions/cache@v3
-        with:
-          path: sysroot
-          key: sysroot-${{ matrix.debian-arch }}-${{ hashFiles('./.github/workflows/build-cross-compile.yml') }}
-
-      - name: 'Install sysroot dependencies'
-        run: sudo apt-get install debootstrap qemu-user-static
-        if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
-
-      - name: 'Create sysroot'
-        run: >
-          sudo qemu-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,libfreetype6-dev,libpng-dev
-          --resolve-deps
-          buster
-          sysroot
-          https://httpredir.debian.org/debian/
-        if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
-
-      - name: 'Prepare sysroot'
-        run: |
-          # Prepare sysroot and remove unused files to minimize cache
-          sudo chroot sysroot symlinks -cr .
-          sudo chown ${USER} -R sysroot
-          rm -rf sysroot/{dev,proc,run,sys}
-        if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
-
-      - name: 'Configure'
-        run: >
-          bash configure
-          --with-conf-name=linux-${{ matrix.target-cpu }}
-          --with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
-          --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
-          --with-zlib=system
-          --enable-debug
-          --disable-precompiled-headers
-          --openjdk-target=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}
-          --with-sysroot=sysroot
-          --with-build-jdk=${{ steps.buildjdk.outputs.jdk-path }}
-          CC=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-gcc-10
-          CXX=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-g++-10
-
-      - name: 'Build'
-        id: build
-        uses: ./.github/actions/do-build
-        with:
-          make-target: 'hotspot'
-          platform: linux-${{ matrix.target-cpu }}

.github/workflows/build-linux.yml

@@ -1,132 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-name: 'Build (linux)'
-
-on:
-  workflow_call:
-    inputs:
-      platform:
-        required: true
-        type: string
-      extra-conf-options:
-        required: false
-        type: string
-      make-target:
-        required: false
-        type: string
-        default: 'product-bundles test-bundles'
-      debug-levels:
-        required: false
-        type: string
-        default: '[ "debug", "release" ]'
-      apt-gcc-version:
-        required: true
-        type: string
-      apt-architecture:
-        required: false
-        type: string
-      apt-extra-packages:
-        required: false
-        type: string
-
-jobs:
-  build-linux:
-    name: build
-    runs-on: ubuntu-20.04
-
-    strategy:
-      fail-fast: false
-      matrix:
-        debug-level: ${{ fromJSON(inputs.debug-levels) }}
-        include:
-          - debug-level: debug
-            flags: --with-debug-level=fastdebug
-            suffix: -debug
-
-    steps:
-      - name: 'Checkout the JDK source'
-        uses: actions/checkout@v3
-
-      - name: 'Get the BootJDK'
-        id: bootjdk
-        uses: ./.github/actions/get-bootjdk
-        with:
-          platform: linux-x64
-
-      - name: 'Get JTReg'
-        id: jtreg
-        uses: ./.github/actions/get-jtreg
-
-      - name: 'Get GTest'
-        id: gtest
-        uses: ./.github/actions/get-gtest
-
-      - name: 'Set architecture'
-        id: arch
-        run: |
-          # Set a proper suffix for packages if using a different architecture
-          if [[ '${{ inputs.apt-architecture }}' != '' ]]; then
-            echo '::set-output name=suffix:::${{ inputs.apt-architecture }}'
-          fi
-
-      # Upgrading apt to solve libc6 installation bugs, see JDK-8260460.
-      - name: 'Install toolchain and dependencies'
-        run: |
-          # Install dependencies using apt-get
-          if [[ '${{ inputs.apt-architecture }}' != '' ]]; then
-            sudo dpkg --add-architecture ${{ inputs.apt-architecture }}
-          fi
-          sudo apt-get update
-          sudo apt-get install --only-upgrade apt
-          sudo apt-get install gcc-${{ inputs.apt-gcc-version }} g++-${{ 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-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
-
-      - name: 'Configure'
-        run: >
-          bash configure
-          --with-conf-name=${{ inputs.platform }}
-          ${{ matrix.flags }}
-          --with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
-          --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
-          ${{ inputs.extra-conf-options }}
-
-      - name: 'Build'
-        id: build
-        uses: ./.github/actions/do-build
-        with:
-          make-target: '${{ inputs.make-target }}'
-          platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'
-
-      - name: 'Upload bundles'
-        uses: ./.github/actions/upload-bundles
-        with:
-          platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'

.github/workflows/build-macos.yml

@@ -1,114 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-name: 'Build (macos)'
-
-on:
-  workflow_call:
-    inputs:
-      platform:
-        required: true
-        type: string
-      extra-conf-options:
-        required: false
-        type: string
-      make-target:
-        required: false
-        type: string
-        default: 'product-bundles test-bundles'
-      debug-levels:
-        required: false
-        type: string
-        default: '[ "debug", "release" ]'
-      xcode-toolset-version:
-        required: true
-        type: string
-
-jobs:
-  build-macos:
-    name: build
-    runs-on: macos-10.15
-
-    strategy:
-      fail-fast: false
-      matrix:
-        debug-level: ${{ fromJSON(inputs.debug-levels) }}
-        include:
-          - debug-level: debug
-            flags: --with-debug-level=fastdebug
-            suffix: -debug
-
-    steps:
-      - name: 'Checkout the JDK source'
-        uses: actions/checkout@v3
-
-      - name: 'Get the BootJDK'
-        id: bootjdk
-        uses: ./.github/actions/get-bootjdk
-        with:
-          platform: macos-x64
-
-      - name: 'Get JTReg'
-        id: jtreg
-        uses: ./.github/actions/get-jtreg
-
-      - name: 'Get GTest'
-        id: gtest
-        uses: ./.github/actions/get-gtest
-
-      - name: 'Install toolchain and dependencies'
-        run: |
-          # Run Homebrew installation and xcode-select
-          brew install make
-          sudo xcode-select --switch /Applications/Xcode_${{ inputs.xcode-toolset-version }}.app/Contents/Developer
-          # This will make GNU make available as 'make' and not only as 'gmake'
-          echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
-
-      - name: 'Configure'
-        run: >
-          bash configure
-          --with-conf-name=${{ inputs.platform }}
-          ${{ matrix.flags }}
-          --with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
-          --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
-          ${{ inputs.extra-conf-options }}
-
-      - name: 'Build'
-        id: build
-        uses: ./.github/actions/do-build
-        with:
-          make-target: '${{ inputs.make-target }}'
-          platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'
-
-      - name: 'Upload bundles'
-        uses: ./.github/actions/upload-bundles
-        with:
-          platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'

.github/workflows/build-windows.yml

@@ -1,131 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-name: 'Build (windows)'
-
-on:
-  workflow_call:
-    inputs:
-      platform:
-        required: true
-        type: string
-      extra-conf-options:
-        required: false
-        type: string
-      make-target:
-        required: false
-        type: string
-        default: 'product-bundles test-bundles'
-      debug-levels:
-        required: false
-        type: string
-        default: '[ "debug", "release" ]'
-      msvc-toolset-version:
-        required: true
-        type: string
-      msvc-toolset-architecture:
-        required: true
-        type: string
-
-env:
-  # These are needed to make the MSYS2 bash work properly
-  MSYS2_PATH_TYPE: minimal
-  CHERE_INVOKING: 1
-
-jobs:
-  build-windows:
-    name: build
-    runs-on: windows-2019
-    defaults:
-      run:
-        shell: bash
-
-    strategy:
-      fail-fast: false
-      matrix:
-        debug-level: ${{ fromJSON(inputs.debug-levels) }}
-        include:
-          - debug-level: debug
-            flags: --with-debug-level=fastdebug
-            suffix: -debug
-
-    steps:
-      - name: 'Checkout the JDK source'
-        uses: actions/checkout@v3
-
-      - name: 'Get MSYS2'
-        uses: ./.github/actions/get-msys2
-
-      - name: 'Get the BootJDK'
-        id: bootjdk
-        uses: ./.github/actions/get-bootjdk
-        with:
-          platform: windows-x64
-
-      - name: 'Get JTReg'
-        id: jtreg
-        uses: ./.github/actions/get-jtreg
-
-      - name: 'Get GTest'
-        id: gtest
-        uses: ./.github/actions/get-gtest
-
-      - 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' \
-            --add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
-
-      - name: 'Configure'
-        run: >
-          bash configure
-          --with-conf-name=${{ inputs.platform }}
-          ${{ matrix.flags }}
-          --with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
-          --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 }}
-          ${{ inputs.extra-conf-options }}
-        env:
-          # We need a minimal PATH on Windows
-          # Set PATH to "", so just GITHUB_PATH is included
-          PATH: ''
-
-      - name: 'Build'
-        id: build
-        uses: ./.github/actions/do-build
-        with:
-          make-target: '${{ inputs.make-target }}'
-          platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'
-
-      - name: 'Upload bundles'
-        uses: ./.github/actions/upload-bundles
-        with:
-          platform: ${{ inputs.platform }}
-          debug-suffix: '${{ matrix.suffix }}'

.github/workflows/main.yml

@@ -1,331 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-name: 'OpenJDK GHA Sanity Checks'
-
-on:
-  push:
-    branches-ignore:
-      - master
-      - pr/*
-  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'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-
-  ###
-  ### Determine platforms to include
-  ###
-
-  select:
-    name: 'Select platforms'
-    runs-on: ubuntu-20.04
-    outputs:
-      linux-x64: ${{ steps.include.outputs.linux-x64 }}
-      linux-x86: ${{ steps.include.outputs.linux-x86 }}
-      linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }}
-      linux-cross-compile: ${{ steps.include.outputs.linux-cross-compile }}
-      macos-x64: ${{ steps.include.outputs.macos-x64 }}
-      macos-aarch64: ${{ steps.include.outputs.macos-aarch64 }}
-      windows-x64: ${{ steps.include.outputs.windows-x64 }}
-      windows-aarch64: ${{ steps.include.outputs.windows-aarch64 }}
-
-    steps:
-        # This function must be inlined in main.yml, or we'd be forced to checkout the repo
-      - name: 'Check what jobs to run'
-        id: include
-        run: |
-          # Determine which platform jobs to run
-
-          # Returns 'true' if the input platform list matches any of the platform monikers given as argument,
-          # 'false' otherwise.
-          # arg $1: platform name or names to look for
-          function check_platform() {
-            if [[ '${{ !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
-              input='${{ secrets.JDK_SUBMIT_PLATFORMS }}'
-            else
-              echo 'Internal error in GHA'
-              exit 1
-            fi
-
-            normalized_input="$(echo ,$input, | tr -d ' ')"
-            if [[ "$normalized_input" == ",," ]]; then
-              # For an empty input, assume all platforms should run
-              echo 'true'
-              return
-            else
-              # Check for all acceptable platform names
-              for part in $* ; do
-                if echo "$normalized_input" | grep -q -e ",$part," ; then
-                  echo 'true'
-                  return
-                fi
-              done
-            fi
-
-            echo 'false'
-          }
-
-          echo "::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
-  ###
-
-  build-linux-x64:
-    name: linux-x64
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      apt-gcc-version: '10=10.3.0-1ubuntu1~20.04'
-    # The linux-x64 jdk bundle is used as buildjdk for the cross-compile job
-    if: needs.select.outputs.linux-x64 == 'true' || needs.select.outputs.linux-cross-compile == 'true'
-
-  build-linux-x86:
-    name: linux-x86
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x86
-      apt-gcc-version: '10-multilib'
-      apt-architecture: 'i386'
-      # Some multilib libraries do not have proper inter-dependencies, so we have to
-      # install their dependencies manually.
-      apt-extra-packages: 'libfreetype6-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386'
-      extra-conf-options: '--with-target-bits=32'
-    if: needs.select.outputs.linux-x86 == 'true'
-
-  build-linux-x64-hs-nopch:
-    name: linux-x64-hs-nopch
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      make-target: 'hotspot'
-      debug-levels: '[ "debug" ]'
-      apt-gcc-version: '10=10.3.0-1ubuntu1~20.04'
-      extra-conf-options: '--disable-precompiled-headers'
-    if: needs.select.outputs.linux-x64-variants == 'true'
-
-  build-linux-x64-hs-zero:
-    name: linux-x64-hs-zero
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      make-target: 'hotspot'
-      debug-levels: '[ "debug" ]'
-      apt-gcc-version: '10=10.3.0-1ubuntu1~20.04'
-      extra-conf-options: '--with-jvm-variants=zero --disable-precompiled-headers'
-    if: needs.select.outputs.linux-x64-variants == 'true'
-
-  build-linux-x64-hs-minimal:
-    name: linux-x64-hs-minimal
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      make-target: 'hotspot'
-      debug-levels: '[ "debug" ]'
-      apt-gcc-version: '10=10.3.0-1ubuntu1~20.04'
-      extra-conf-options: '--with-jvm-variants=minimal --disable-precompiled-headers'
-    if: needs.select.outputs.linux-x64-variants == 'true'
-
-  build-linux-x64-hs-optimized:
-    name: linux-x64-hs-optimized
-    needs: select
-    uses: ./.github/workflows/build-linux.yml
-    with:
-      platform: linux-x64
-      make-target: 'hotspot'
-      # Technically this is not the "debug" level, but we can't inject a new matrix state for just this job
-      debug-levels: '[ "debug" ]'
-      apt-gcc-version: '10=10.3.0-1ubuntu1~20.04'
-      extra-conf-options: '--with-debug-level=optimized --disable-precompiled-headers'
-    if: needs.select.outputs.linux-x64-variants == 'true'
-
-  build-linux-cross-compile:
-    name: linux-cross-compile
-    needs:
-      - select
-      - build-linux-x64
-    uses: ./.github/workflows/build-cross-compile.yml
-    if: needs.select.outputs.linux-cross-compile == 'true'
-
-  build-macos-x64:
-    name: macos-x64
-    needs: select
-    uses: ./.github/workflows/build-macos.yml
-    with:
-      platform: macos-x64
-      xcode-toolset-version: '11.3.1'
-    if: needs.select.outputs.macos-x64 == 'true'
-
-  build-macos-aarch64:
-    name: macos-aarch64
-    needs: select
-    uses: ./.github/workflows/build-macos.yml
-    with:
-      platform: macos-aarch64
-      xcode-toolset-version: '12.4'
-      extra-conf-options: '--openjdk-target=aarch64-apple-darwin'
-    if: needs.select.outputs.macos-aarch64 == 'true'
-
-  build-windows-x64:
-    name: windows-x64
-    needs: select
-    uses: ./.github/workflows/build-windows.yml
-    with:
-      platform: windows-x64
-      msvc-toolset-version: '14.25'
-      msvc-toolset-architecture: 'x86.x64'
-    if: needs.select.outputs.windows-x64 == 'true'
-
-  build-windows-aarch64:
-    name: windows-aarch64
-    needs: select
-    uses: ./.github/workflows/build-windows.yml
-    with:
-      platform: windows-aarch64
-      msvc-toolset-version: '14.29'
-      msvc-toolset-architecture: 'arm64'
-      make-target: 'hotspot'
-      extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
-    if: needs.select.outputs.windows-aarch64 == 'true'
-
-  ###
-  ### Test jobs
-  ###
-
-  test-linux-x64:
-    name: linux-x64
-    needs:
-      - build-linux-x64
-    uses: ./.github/workflows/test.yml
-    with:
-      platform: linux-x64
-      bootjdk-platform: linux-x64
-      runs-on: ubuntu-20.04
-
-  test-linux-x86:
-    name: linux-x86
-    needs:
-      - build-linux-x86
-    uses: ./.github/workflows/test.yml
-    with:
-      platform: linux-x86
-      bootjdk-platform: linux-x64
-      runs-on: ubuntu-20.04
-
-  test-macos-x64:
-    name: macos-x64
-    needs:
-      - build-macos-x64
-    uses: ./.github/workflows/test.yml
-    with:
-      platform: macos-x64
-      bootjdk-platform: macos-x64
-      runs-on: macos-10.15
-
-  test-windows-x64:
-    name: windows-x64
-    needs:
-      - build-windows-x64
-    uses: ./.github/workflows/test.yml
-    with:
-      platform: windows-x64
-      bootjdk-platform: windows-x64
-      runs-on: windows-2019
-
-  # Remove bundles so they are not misconstrued as binary distributions from the JDK project
-  remove-bundles:
-    name: 'Remove bundle artifacts'
-    runs-on: ubuntu-20.04
-    if: always()
-    needs:
-      - build-linux-x64
-      - build-linux-x86
-      - build-linux-x64-hs-nopch
-      - build-linux-x64-hs-zero
-      - build-linux-x64-hs-minimal
-      - build-linux-x64-hs-optimized
-      - build-linux-cross-compile
-      - build-macos-x64
-      - build-macos-aarch64
-      - build-windows-x64
-      - build-windows-aarch64
-      - test-linux-x64
-      - test-linux-x86
-      - test-macos-x64
-      - test-windows-x64
-
-    steps:
-        # Hack to get hold of the api environment variables that are only defined for actions
-      - name: 'Get API configuration'
-        id: api
-        uses: actions/github-script@v6
-        with:
-          script: 'return { url: process.env["ACTIONS_RUNTIME_URL"], token: process.env["ACTIONS_RUNTIME_TOKEN"] }'
-
-      - name: 'Remove bundle artifacts'
-        run: |
-          # Find and remove all bundle artifacts
-          ALL_ARTIFACT_URLS="$(curl -s \
-              -H 'Accept: application/json;api-version=6.0-preview' \
-              -H 'Authorization: Bearer ${{ fromJson(steps.api.outputs.result).token }}' \
-              '${{ fromJson(steps.api.outputs.result).url }}_apis/pipelines/workflows/${{ github.run_id }}/artifacts?api-version=6.0-preview')"
-          BUNDLE_ARTIFACT_URLS="$(echo "$ALL_ARTIFACT_URLS" | jq -r -c '.value | map(select(.name|startswith("bundles-"))) | .[].url')"
-          for url in $BUNDLE_ARTIFACT_URLS; do
-            echo "Removing $url"
-            curl -s \
-                -H 'Accept: application/json;api-version=6.0-preview' \
-                -H 'Authorization: Bearer ${{ fromJson(steps.api.outputs.result).token }}' \
-                -X DELETE "$url" \
-            || echo "Failed to remove bundle"
-          done

.github/workflows/test.yml

@@ -1,205 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-name: 'Run tests'
-
-on:
-  workflow_call:
-    inputs:
-      platform:
-        required: true
-        type: string
-      bootjdk-platform:
-        required: true
-        type: string
-      runs-on:
-        required: true
-        type: string
-
-env:
-  # These are needed to make the MSYS2 bash work properly
-  MSYS2_PATH_TYPE: minimal
-  CHERE_INVOKING: 1
-
-jobs:
-  test:
-    name: test
-    runs-on: ${{ inputs.runs-on }}
-    defaults:
-      run:
-        shell: bash
-
-    strategy:
-      fail-fast: false
-      matrix:
-        test-name:
-          - 'jdk/tier1 part 1'
-          - 'jdk/tier1 part 2'
-          - 'jdk/tier1 part 3'
-          - 'langtools/tier1'
-          - 'hs/tier1 common'
-          - 'hs/tier1 compiler'
-          - 'hs/tier1 gc'
-          - 'hs/tier1 runtime'
-          - 'hs/tier1 serviceability'
-
-        include:
-          - test-name: 'jdk/tier1 part 1'
-            test-suite: 'test/jdk/:tier1_part1'
-
-          - test-name: 'jdk/tier1 part 2'
-            test-suite: 'test/jdk/:tier1_part2'
-
-          - test-name: 'jdk/tier1 part 3'
-            test-suite: 'test/jdk/:tier1_part3'
-
-          - test-name: 'langtools/tier1'
-            test-suite: 'test/langtools/:tier1'
-
-          - test-name: 'hs/tier1 common'
-            test-suite: 'test/hotspot/jtreg/:tier1_common'
-            debug-suffix: -debug
-
-          - test-name: 'hs/tier1 compiler'
-            test-suite: 'test/hotspot/jtreg/:tier1_compiler'
-            debug-suffix: -debug
-
-          - test-name: 'hs/tier1 gc'
-            test-suite: 'test/hotspot/jtreg/:tier1_gc'
-            debug-suffix: -debug
-
-          - test-name: 'hs/tier1 runtime'
-            test-suite: 'test/hotspot/jtreg/:tier1_runtime'
-            debug-suffix: -debug
-
-          - test-name: 'hs/tier1 serviceability'
-            test-suite: 'test/hotspot/jtreg/:tier1_serviceability'
-            debug-suffix: -debug
-
-    steps:
-      - name: 'Checkout the JDK source'
-        uses: actions/checkout@v3
-
-      - name: 'Get MSYS2'
-        uses: ./.github/actions/get-msys2
-        if: runner.os == 'Windows'
-
-      - name: 'Get the BootJDK'
-        id: bootjdk
-        uses: ./.github/actions/get-bootjdk
-        with:
-          platform: ${{ inputs.bootjdk-platform }}
-
-      - name: 'Get JTReg'
-        id: jtreg
-        uses: ./.github/actions/get-jtreg
-
-      - name: 'Get bundles'
-        id: bundles
-        uses: ./.github/actions/get-bundles
-        with:
-          platform: ${{ inputs.platform }}
-          debug-suffix: ${{ matrix.debug-suffix }}
-
-      - name: 'Install dependencies'
-        run: |
-          # On macOS we need to install some dependencies for testing
-          brew install make
-          sudo xcode-select --switch /Applications/Xcode_11.3.1.app/Contents/Developer
-          # This will make GNU make available as 'make' and not only as 'gmake'
-          echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
-        if: runner.os == 'macOS'
-
-      - name: 'Set PATH'
-        id: path
-        run: |
-          # We need a minimal PATH on Windows
-          # Set PATH to "", so just GITHUB_PATH is included
-          if [[ '${{ runner.os }}' == 'Windows' ]]; then
-            echo "::set-output name=value::"
-          else
-            echo "::set-output name=value::$PATH"
-          fi
-
-      - name: 'Run tests'
-        id: run-tests
-        run: >
-          make test-prebuilt
-          TEST='${{ matrix.test-suite }}'
-          BOOT_JDK=${{ steps.bootjdk.outputs.path }}
-          JT_HOME=${{ steps.jtreg.outputs.path }}
-          JDK_IMAGE_DIR=${{ steps.bundles.outputs.jdk-path }}
-          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"
-        env:
-          PATH: ${{ steps.path.outputs.value }}
-
-        # This is a separate step, since if the markdown from a step gets bigger than
-        # 1024 kB it is skipped, but then the short summary above is still generated
-      - name: 'Generate test report'
-        run: bash ./.github/scripts/gen-test-results.sh "$GITHUB_STEP_SUMMARY"
-        if: always()
-
-      - name: 'Package test results'
-        id: package
-        run: |
-          # Package test-results and relevant parts of test-support
-          mkdir results
-
-          if [[ -d build/run-test-prebuilt/test-results ]]; then
-            cd build/run-test-prebuilt/test-results/
-            zip -r -9 "$GITHUB_WORKSPACE/results/test-results.zip" .
-            cd $GITHUB_WORKSPACE
-          else
-            echo '::warning ::Missing test-results directory'
-          fi
-
-          if [[ -d build/run-test-prebuilt/test-support ]]; then
-            cd build/run-test-prebuilt/test-support/
-            zip -r -9 "$GITHUB_WORKSPACE/results/test-support.zip" . -i *.jtr -i */hs_err*.log -i */replay*.log
-            cd $GITHUB_WORKSPACE
-          else
-            echo '::warning ::Missing test-support directory'
-          fi
-
-          artifact_name="results-${{ inputs.platform }}-$(echo ${{ matrix.test-name }} | tr '/ ' '__')"
-          echo "::set-output name=artifact-name::$artifact_name"
-        if: always()
-
-      - name: 'Upload test results'
-        uses: actions/upload-artifact@v3
-        with:
-          path: results
-          name: ${{ steps.package.outputs.artifact-name }}
-        if: always()
-
-        # This is the best way I found to abort the job with an error message
-      - name: 'Notify about test failures'
-        uses: actions/github-script@v6
-        with:
-          script: core.setFailed('${{ steps.run-tests.outputs.error-message }}')
-        if: steps.run-tests.outputs.failure == 'true'

.gitignore

@@ -16,5 +16,3 @@ NashornProfile.txt
 **/JTreport/**
 **/JTwork/**
 /src/utils/LogCompilation/target/
-/.project/
-/.settings/

.hgtags

@@ -0,0 +1,664 @@
+3cc80be736f24704e505ad8ddaa598dec3fa2ed3 jdk-9+181
+e2b70be325bd10dae4c06f74c46d70d480854916 jdk-9+179
+5b16a1c3ccffff2a82c88bb7ea894c4ff1c9ebde jdk-9+180
+43bf6f30fcba031ecf0cc7e511efe3a8179d0f77 jdk-9+176
+d9f6bc6ba599d0487dc18b2fbdb6c34eedf6f958 jdk-9+177
+bc9df7dd63ec76f50fafeb4acc44465044662f0a jdk-9+178
+994036e74ab805bcc09afa0646be17a725bec42f jdk-9+175
+94680c6d60ecd9ed3ffd1847706efde7eb947afc jdk-9+174
+6dd7fda42bab7ecf648cafb0a4e9b4ca11b3094f jdk-9+173
+dad6746278facbbea57dd462cb56fb743dc0a5f0 jdk-9+172
+643b5f18c2656fe91b69fea85b07b98d5fad394d jdk-9+171
+898cbe31fbdae2d25d141384fac746cc244a730c jdk-9+170
+c7efde2b60fc1ec04630be769d9ad60efb39c39c jdk-9+169
+8fd0a4569191f33c98ee90c2709174a342fefb0d jdk-9+167
+fcabc74bd44e56c7419d111d59b95669ecb33c55 jdk-9+168
+d3e973f1809606c67412361041ad197e50fe8cec jdk-9+166
+3965b747cfe1e6cbd66b8739da5a1ea6ec6985e9 jdk-9+165
+d16aebbb56d37f12e0c0b0a4fb427db65e1fb1a8 jdk-9+162
+18c41483a082e097ac2f5f983c1226ed94aa4215 jdk-9+163
+32db52c675e7d5bc413605d2e89b68b608b19be0 jdk-9+164
+fd1497902bbe3aa24b21f270ecdcb8de5f7aa9ac jdk-9+159
+6aa8be0c4e054fe8b3ab016ae00d16d680f92145 jdk-9+160
+f6883b1a5a6478437cd4181c4bd45328ab24feaf jdk-9+161
+fa3e76b477829afc4476f0b725cfaa440a6fd917 jdk-9+157
+b5015f742ba648184bb7fc547197bd33ebfde30d jdk-9+158
+1cc8dd79fd1cd13d36b385196271a29632c67c3b jdk7-b24
+bf2517e15f0c0f950e5b3143c4ca11e2df73dcc1 jdk7-b25
+5ae7db536e3fcf6be78e45b240a9058095e0ed38 jdk7-b26
+67052ac87fc927d048e62ec54ff42adb230d3f7c jdk7-b27
+18dc4ba4739a537fd146f77da51db16efce28da2 jdk7-b28
+bfe4572fd301a6fcd120373cdb2eff5d2da0c72c jdk7-b29
+bee4731164a06ddece1297ae58db24aca6a1c626 jdk7-b30
+cd8b8f500face60d1566d850857a7fccadbd383a jdk7-b31
+a9f1805e3ba9ca520cad199d522c84af5433e85a jdk7-b32
+6838c1a3296aaa3572364d2ce7d70826cee96286 jdk7-b33
+90cf935adb353bb0af4b46fb0677e841fd24c000 jdk7-b34
+6d909d5803e3a22850e6c4e5a75b888742ee7e20 jdk7-b35
+d718a441936196b93d8bc9f084933af9a4c2a350 jdk7-b36
+c2036bf76829c03b99108fffab52e20910a9be4f jdk7-b37
+a2879b2837f5a4c87e9542efe69ef138194af8ff jdk7-b38
+126f365cec6c3c2c72de934fa1c64b5f082b55b5 jdk7-b39
+3c53424bbe3bb77e01b468b4b0140deec33e11fc jdk7-b40
+3cb2a607c347934f8e7e86f840a094c28b08d9ea jdk7-b41
+caf58ffa084568990cbb3441f9ae188e36b31770 jdk7-b42
+41bd0a702bc8ec6feebd725a63e7c3227f82ab11 jdk7-b43
+5843778bda89b1d5ac8e1aa05e26930ac90b3145 jdk7-b44
+54dffad0bf066791a2793305875250c395011d5f jdk7-b45
+04b2620edc72de93671646e4720c5992c74ac8b5 jdk7-b46
+0c4657194eec95c08ba478aee9cfc3c295e41657 jdk7-b47
+1bf51a4c2627c2f0e0cbcc2cf0421bdb37f1f2b2 jdk7-b48
+6b84b04a80afe23262377c60913eebfc898f14c4 jdk7-b49
+5da0e6b9f4f18ef483c977337214b12ee0e1fc8f jdk7-b50
+a25c5ec5e40e07733d1ff9898a0abe36159288ff jdk7-b51
+7a90e89e36d103038f8667f6a7daae34ecfa1ad8 jdk7-b52
+d52186ee770dac57950536cd00ccbfdef360b04c jdk7-b53
+15096652c4d48dfb9fc0b2cb135304db94c65ba0 jdk7-b54
+c8b275d62d6b0a980c510e839b70292245863e85 jdk7-b55
+a8134c4ee2cf451cf9b5e1609f39d83ecd53acc5 jdk7-b56
+b44f05654c26fcd1f995e712992f9b07ffd7c0c6 jdk7-b57
+d60a9ce3c3eabf28f5d50ae839d18be04a551bc2 jdk7-b58
+c33e7d38c9210741dbc285507403a4b20bd802a0 jdk7-b59
+5a10e4d0b14d7beac53a7b2213ae6864afe1fd3e jdk7-b60
+dbb955b1ee59b876dd1f133952b557b48b1d7732 jdk7-b61
+6107cbff3130c747d243c25a7874cd59db5744a8 jdk7-b62
+dfd8506f74c3731bb169ce93c72612d78ee0413b jdk7-b63
+d22867c5f1b295a0a2b3b4bc8999a2676f6e20c3 jdk7-b64
+7d3bf00f3cc4f8125de1842521e7567f37dc84b8 jdk7-b65
+62109d1b9e7310f29ab51ca6f1d71b899c0ce6b0 jdk7-b66
+eb24af1404aec8aa140c4cd4d13d2839b150dd41 jdk7-b67
+bca2225b66d78c4bf4d9801f54cac7715a598650 jdk7-b68
+1b662b1ed14eb4ae31d5138a36c433b13d941dc5 jdk7-b69
+207f694795c448c17753eff1a2f50363106960c2 jdk7-b70
+c5d39b6be65cba0effb5f466ea48fe43764d0e0c jdk7-b71
+df4bcd06e1d0ab306efa5a44f24a409dc0c0c742 jdk7-b72
+ce74bd35ce948d629a356e168797f44b593b1578 jdk7-b73
+4e7661eaa211e186674f6cbefec4aef1144ac2a0 jdk7-b74
+946518568340c4e511549318f19f47f06b7f5f9b jdk7-b75
+09e0b33177af2b98a03c9ca19eedf61440bd1cf6 jdk7-b76
+1d0121b741f029dc4b828e4b36ba6fda92907dd7 jdk7-b77
+4061c66ba1af1a2e27c2c839ba887407dd3ce050 jdk7-b78
+e9c98378f6b9256c0595ef2985ca5899f0c0e274 jdk7-b79
+e6abd38682d237306d6c147c17538ec9e7f8e3a7 jdk7-b80
+dcc938ac40cc45f1ef454d76020b5db5d943001c jdk7-b81
+a30062be6d9ca1d48579826f870f85974300004e jdk7-b82
+34c8199936a1682aa8587857f44cfaf37c2b6381 jdk7-b83
+b1e55627a6980b9508854ed0c0f21d4f981b4494 jdk7-b84
+b6f633a93ae0ec4555ff4bf756f5e2150c9bdede jdk7-b85
+c94d9cc81f495d97817eba9d71b84fc45f7661a5 jdk7-b86
+b7456c473862048fa70ed8092313a4ef0a55d403 jdk7-b87
+7077b95d42f6b3942a8751bba033801ff50e5889 jdk7-b88
+44158f6d3b94c0fa020e33632532473d92d1ea96 jdk7-b89
+1d1927f9ec097b62c913921e2dfa5dbaf5dc325b jdk7-b90
+308ad8f68b8dd68e22d73dd490e110059b732422 jdk7-b91
+ff9031a745d9cc52318f2148e43ca3b07ee08098 jdk7-b92
+b5dab6a313fdff4c043250e4d9c8f66fd624d27e jdk7-b93
+8bb281f0f91582104d65d032be22522bfd2d8110 jdk7-b94
+654298d26561b76dfe3cfcffbbd7078080837300 jdk7-b95
+d260f892491e040ae385a8e6df59557a7d721abf jdk7-b96
+7e406ebed9a5968b584f3c3e6b60893b5d6d9741 jdk7-b97
+db6e660120446c407e2d908d52ec046592b21726 jdk7-b98
+c4c8a5bc54f66abc68cd185d9294042121922154 jdk7-b99
+2d6ba7a221915bdf0311acc5641c7f3875cb793e jdk7-b100
+2548ac036b8fca3326d058d758e6df8355a42469 jdk7-b101
+88db80c8e49cea352c2900f689600dc410761c1f jdk7-b102
+64770970865839b0443066370e7d476ef47e90cd jdk7-b103
+10bc903a228d3a8efdf46fb8c3fcf82a59b88bc5 jdk7-b104
+1ce7938efb03224ccc8b3cdd7803eb39e889539c jdk7-b105
+6bdae472f77205046703b685eff2ac4f7a0ecf4e jdk7-b106
+439de530aac531a360beedba6e2fe51e17292cc0 jdk7-b107
+044d31b99ef5609389fc771c422e722e5e224228 jdk7-b108
+e02b4d709e177d08d56130a4bc68061e4bbacc7d jdk7-b109
+a6442d6bc38a44152e0662688213ce4d2701f42a jdk7-b110
+69f3edf083477955b5bd2f754252c7504167d8e1 jdk7-b111
+f960f117f1623629f64203e2b09a92a8f6f14ff5 jdk7-b112
+1fee41c7ed2b3388970a756a85aa693c0de8407a jdk7-b113
+750c1ccb2f2d1ddfa95ab6c7f897fdab2f87f7e9 jdk7-b114
+9cb24917216bc68997154f6e9566c3de62acb2f4 jdk7-b115
+a4e6aa1f45ad23a6f083ed98d970b5006ea4d292 jdk7-b116
+228e73f288c543a8c34e2a54227103ae5649e6af jdk7-b117
+2e876e59938a853934aa738c811b26c452bd9fe8 jdk7-b118
+4951967a61b4dbbf514828879f57bd1a0d4b420b jdk7-b119
+8c840d3ab24f8d0f422b991638acb44b6ab1d98c jdk7-b120
+0ce0a2c3a6926677dc507839a820ab6625541e5a jdk7-b121
+6f09ea1c034f087916d2a8cf0d22be768400118f jdk7-b122
+142129d8599d1f56b29387e7f9a5fad53b6d61df jdk7-b123
+aa894c225b1a517b665ac2a58295217ea2245134 jdk7-b124
+f658ec2730fa29323c36d23c27e54c7219ef5e16 jdk7-b125
+f1df068076986679ea1105532a65529d63a89060 jdk7-b126
+f83cd8bd35c678f94e526990e03dc838d0ec2717 jdk7-b127
+7da3f5f30855dec6bf3a86529e87dee883b90c72 jdk7-b128
+6823ea7eb8eb6fab405d7edb7a5c2f690887a2fa jdk7-b129
+a36beda9b9de91231d92a2c529f21cc218fcf8d5 jdk7-b130
+d8af56da89bc0fc02a6b6ad78f51157a46d665ab jdk7-b131
+d61280d36755d1941fb487f554e8b7a6d0bca6a1 jdk7-b132
+fd444c61e7ed3d92b2a730da7c737b02191b682f jdk7-b133
+def8e16dd237a47fc067d66d4c616d7baaec6001 jdk7-b134
+f75a1efb141210901aabe00a834e0fc32bb8b337 jdk7-b135
+46acf76a533954cfd594bb88fdea79938abfbe20 jdk7-b136
+d1cf7d4ee16c341f5b8c7e7f1d68a8c412b6c693 jdk7-b137
+62b8e328f8c8c66c14b0713222116f2add473f3f jdk7-b138
+955488f34ca418f6cdab843d61c20d2c615637d9 jdk7-b139
+f4298bc3f4b6baa315643be06966f09684290068 jdk7-b140
+5d86d0c7692e8f4a58d430d68c03594e2d3403b3 jdk7-b141
+92bf0655022d4187e9b49c1400f98fb3392a4630 jdk7-b142
+4a05062d8c4dfa3edec3faf1052af28baba5adff jdk7-b143
+07a8728ad49ef6dfa469c3a8bf5ab1e9c80bed5c jdk7-b144
+8294c99e685a1f6d1d37c45cd97854cf74be771e jdk7-b145
+dca1e8a87e8f756f95b99bac8fe795750d42e1b0 jdk7-b146
+a2a589fc29543ed32919c78a1810ad93a6fcf5bc jdk7-b147
+de9223c94f9c710b3eebb599cd3586f36c8b94a9 jdk8-b01
+1b9d19620eb4606a25b1e28f86d66c8bfa867e06 jdk8-b02
+6815e85bf96d6d3875954f9777660372cd70d065 jdk8-b03
+31f5c34d78081572ad9a2401c0bb0c6b9711dd65 jdk8-b04
+c4f9ea1ecb55ff44e0dd21d2888ead308c86a3aa jdk8-b05
+429da7734bf491bccde2a752fae97e9f225896dc jdk8-b06
+bc5710332b294676661103bb20d47d2ea3ba8def jdk8-b07
+24ee504f80412770c6874836cd9e55b536427b1d jdk8-b08
+fbf3cabc9e3bb1fcf710941d777cb0400505fbe6 jdk8-b09
+f651ce87127980c58e3599daba964eba2f3b4026 jdk8-b10
+cc1f5ce8e504d350e0b0c28c5f84333f8d540132 jdk8-b11
+86db042b3385c338e17f7664447fdc7d406dd19e jdk8-b12
+4cc0ef72c812943743ef4765f1100e2fbe2b1a08 jdk8-b13
+9ffaa48dbfb0f5936c2b789867d0785faec7071d jdk8-b14
+b5060eae3b32fd9f884a09774338cd8186d7fafa jdk8-b15
+736a63b854f321c7824b7e47890135f80aee05e3 jdk8-b16
+f0eccb2946986fb9626efde7d8ed9c8192623f5c jdk8-b17
+885050364691ac1ac978305c63f3368a197fb04d jdk8-b18
+0ff7113a0882ec82d642cb9f0297b4e497807ced jdk8-b19
+6561530ea757c3f3a6fb171c9cc7b3885cdeca85 jdk8-b20
+b3a426170188f52981cf4573a2f14d487fddab0d jdk8-b21
+e8f03541af27e38aafb619b96863e17f65ffe53b jdk8-b22
+498124337041ad53cbaa7eb110f3d7acd6d4eac4 jdk8-b23
+7d3720d8c595d1519c31e9ff7366203fc2c61350 jdk8-b24
+0071a6d64113a35ba345bb1580c256de5ce17d3e jdk8-b25
+6c805d8ed4e5449ea5e4d158c7bdbd7b0b70efd1 jdk8-b26
+c51754cddc037b9609e202b9ed38363d8683e7a8 jdk8-b27
+16ba58282d117247f480aae7a79b88141ade52a3 jdk8-b28
+e070119aa56ee4dc5506c19d2c4d2eecab8ad429 jdk8-b29
+23da7804aca0c9c4e6e86532a1453125a76d95ee jdk8-b30
+bac81e9f7d57b75fba5ab31b571f3fe0dc08af69 jdk8-b31
+2c5208ccb863db936eab523f49450b3fcd230348 jdk8-b32
+a6e6d42203e6d35f9e8b31eac25b0021b4dd58ad jdk8-b33
+0ae89825c75c9492e44efb3aca3d9ee3d8a209df jdk8-b34
+f151d5833912a82cd4f203944da0305c3be83ecc jdk8-b35
+98ce9816ae089c959ba1e70fba98423a31c4e9fa jdk8-b36
+b3a91113026c99b0da010d41055719ab0d8938f0 jdk8-b37
+4cc5610a6dd6227da766ebf9742eb11ff5ded6c0 jdk8-b38
+35a5397278779a2f8f3013f81586dc8f30cb149d jdk8-b39
+6e4e654931b976304bf6e7b4d0d6db8f75bac5d9 jdk8-b40
+c029c972396cea042a0dc67c0f7ccf2fe68007d4 jdk8-b41
+5c5a64ec0839df5affe9394b99ff338c363acbca jdk8-b42
+69d8a827cdf9236be9694a46d75c710d71dac7d7 jdk8-b43
+7e981cb0ad6a194f1fa859f9ad47586db461f269 jdk8-b44
+9b19b2302c28f4da6d4078f66234abecfed5688a jdk8-b45
+600c9a1feb01633cbcf2341a43d1d21e6497ecd0 jdk8-b46
+b820143a6f1ce993c6e6f31db4d64de990f42654 jdk8-b47
+086271e35b0a419b38e8bda9bebd70693811df0a jdk8-b48
+cecd7026f30cbd83b0601925a7a5e059aec98138 jdk8-b49
+38fe5ab028908cf64dd73a43336ba3211577bfc3 jdk8-b50
+382651d28f2502d371eca751962232c0e535e57a jdk8-b51
+b67041a6cb508da18d2f5c7687e6a31e08bea4fc jdk8-b52
+c7aa5cca1c01689a7b1a92411daf83684af05a33 jdk8-b53
+7c6aa31ff1b2ae48c1c686ebe1aadf0c3da5be15 jdk8-b54
+319f583f66db47395fa86127dd3ddb729eb7c64f jdk8-b55
+ffe6bce5a521be40146af2ac03c509b7bac30595 jdk8-b56
+2c21c080b11b93efb3851e39e1363e45da805943 jdk8-b57
+479d3302a26d7607ba271d66973e59ebf58825b6 jdk8-b58
+3bd874584fc01aae92fbc8827e2bd04d8b6ace04 jdk8-b59
+5e3adc681779037a2d33b7be6f75680619085492 jdk8-b60
+cdaa6122185f9bf512dcd6600f56bfccc4824e8c jdk8-b61
+8d9d430b4244b95f5cf1ebe719f834a1ac5d6cd5 jdk8-b62
+21ee1dd7b809639284900a128b9b656a592ebc7a jdk8-b63
+70fa4b11f26522e69b51fd652215f60ce350bac3 jdk8-b64
+a2cf4d4a484378caea2e827ed604b2bbae58bdba jdk8-b65
+17820b958ae84f7c1cc6719319c8e2232f7a4f1d jdk8-b66
+76cc9bd3ece407d3a15d3bea537b57927973c5e7 jdk8-b67
+cb33628d4e8f11e879c371959e5948b66a53376f jdk8-b68
+adb5171c554e14cd86f618b5584f6e3d693d5889 jdk8-b69
+0d625373c69e2ad6f546fd88ab50c6c9aad01271 jdk8-b70
+a41ada2ed4ef735449531c6ebe6cec593d890a1c jdk8-b71
+6725b3961f987cf40f446d1c11cd324a3bec545f jdk8-b72
+fe94b40ffd9390f6cffcdf51c0389b0e6dde0c13 jdk8-b73
+f627eff819628822a0777af8062244352f2a29cf jdk8-b74
+f1478a6d25fddd311a84dcbfac50824cc1858bdd jdk8-b75
+f407160c280d1c5b00d314c535441ac26f195fee jdk8-b76
+d17eb2e13e362085e866d46235314c50cc4661cc jdk8-b77
+6d3dcd34b5b962ea1ef9eed0dafdee9e812401bc jdk8-b78
+a1313a8d90d17d363a3b2a645dc4030ec204b168 jdk8-b79
+3fa21fbf9be7e6b482af43aacb6a09acfa30bdb6 jdk8-b80
+e41d716405b209d3eddef8bd4240cec2bd34dcca jdk8-b81
+5e8c55025644730385a6f8fa029ecdb2d2c98a07 jdk8-b82
+bcebd3fdefc91abb9d7fa0c5af6211b3f8720da6 jdk8-b83
+d7ad0dfaa41151bd3a9ae46725b0aec3730a9cd0 jdk8-b84
+1872c12529090e1c1dbf567f02ad7ae6231b8f0c jdk8-b85
+da9a4c9312816451884aa6db6f18be51a07bff13 jdk8-b86
+5ebf6c63714de2c9dcf831074086d31daec819df jdk8-b87
+e517701a4d0e25ae9c7945bca6e1762a8c5d8aa6 jdk8-b88
+4dec41b3c5e3bb616f0c6f15830d940905aa5d16 jdk8-b89
+f09ab0c416185e3cba371e81bcb6a16060c90f44 jdk8-b90
+80b6c3172dc2cfceb022411292d290a967f9c728 jdk8-b91
+2fd6acba737b01e705e1f7c33588c922a3787f13 jdk8-b92
+b72ae39e1329fefae50d4690db4fde43f3841a95 jdk8-b93
+0d804e3b955dce406af6a79ac1cc35c696aff7fb jdk8-b94
+49fe9c8049132647ad38837a877dd473e6c9b0e5 jdk8-b95
+ea73f01b9053e7165e7ba80f242bafecbc6af712 jdk8-b96
+0a85476a0b9cb876d5666d45097dac68bef3fce1 jdk8-b97
+711eb4aa87de68de78250e0549980936bab53d54 jdk8-b98
+2d3875b0d18b3ad1c2bebf385a697e309e4005a4 jdk8-b99
+3d34036aae4ea90b2ca59712d5a69db3221f0875 jdk8-b100
+edb01c460d4cab21ff0ff13512df7b746efaa0e7 jdk8-b101
+bbe43d712fe08e650808d774861b256ccb34e500 jdk8-b102
+30a1d677a20c6a95f98043d8f20ce570304e3818 jdk8-b103
+b5ed503c26ad38869c247c5e32debec217fd056b jdk8-b104
+589f4fdc584e373a47cde0162e9eceec9165c381 jdk8-b105
+514b0b69fb9683ef52062fd962a3e0644431f64d jdk8-b106
+892889f445755790ae90e61775bfb59ddc6182b5 jdk8-b107
+74049f7a28b48c14910106a75d9f2504169c352e jdk8-b108
+af9a674e12a16da1a4bd53e4990ddb1121a21ef1 jdk8-b109
+b5d2bf482a3ea1cca08c994512804ffbc73de0a1 jdk8-b110
+b9a0f6c693f347a6f4b9bb994957f4eaa05bdedd jdk8-b111
+ad67c34f79c28a8e755f4a49f313868619d6702c jdk8-b112
+4a4dbcf7cb7d3e1a81beaa3b11cd909f69ebc79a jdk8-b113
+dfa34ab293faad9b543a24646dbb381bc3ab5586 jdk8-b114
+3dd9732b17034f45d111996d1d50287b05a3998c jdk8-b115
+aaf663f591aba43ec942263b15ba62759ce26a1e jdk8-b116
+31b0e03fcad73d7886b306b4c2e57ad270780d0d jdk8-b117
+f5b521ade7a35cea18df78ee86322207729f5611 jdk8-b118
+87b743b2263cc53955266411b7797b365a0fb050 jdk8-b119
+a1ee9743f4ee165eae59389a020f2552f895dac8 jdk8-b120
+13b877757b0b1c0d5813298df85364f41d7ba6fe jdk9-b00
+f130ca87de6637acae7d99fcd7a8573eea1cbaed jdk9-b01
+b32e2219736e42baaf45daf0ad67ed34f6033799 jdk9-b02
+7f655f31f9bcee618cf832f08176ad8c1ed3fdd3 jdk9-b03
+099891b1d86f3719e116ac717ffdafc90d037fb7 jdk9-b04
+dd311791ad6895a3989020dd6c6c46db87972ab8 jdk9-b05
+85dbdc227c5e11429b4fc4a8ba763f50107edd6e jdk9-b06
+c826d05f1fb0773f6a28caa763307dd30d90d36e jdk9-b07
+b47e021195757f8f45582124ea7cad48ccf5f872 jdk9-b08
+efe7dbc6088691757404e0c8745f894e3ca9c022 jdk9-b09
+8c0bdeecd7c0f9ce3f3762a51991f755cb3a972c jdk9-b10
+0809c9a4d36e6291f1c4384604c4bbf29e975722 jdk9-b11
+0d1f816217dce5e72187f167cc1816080cbeb453 jdk9-b12
+1a30593dcb9802faec3b6edb24d86ca088594e4e jdk9-b13
+97932f6ad950ae5a73a9da5c96e6e58503ff646b jdk9-b14
+74eb0778e4f2dbff6628e718378449fba27c4265 jdk9-b15
+4a09f5d30be844ac6f714bdb0f63d8c3c08b9a98 jdk9-b16
+410bccbded9e9cce80f1e13ad221e37ae97a3986 jdk9-b17
+c5495e25c7258ab5f96a1ae14610887d76d2be63 jdk9-b18
+2dcf544eb7ed5ac6a3f7813a32e33acea7442405 jdk9-b19
+89731ae72a761afdf4262e8b9513f302f6563f89 jdk9-b20
+28dd0c7beb3cad9cf95f17b4b5ad87eb447a4084 jdk9-b21
+9678e0db8ff6ed845d4c2ee4a3baf7f386a777e5 jdk9-b22
+39cfdc2dcaf3f195c55398e4e677ab053b07e3d2 jdk9-b23
+d9ce05f36ffec3e5e8af62a92455c1c66a63c320 jdk9-b24
+13a5c76976fe48e55c9727c25fae2d2ce7c05da0 jdk9-b25
+cd6f4557e7fea5799ff3762ed7a80a743e75d5fd jdk9-b26
+d06a6d3c66c08293b2a9650f3cc01fd55c620e65 jdk9-b27
+f4269e8f454eb77763ecee228a88ae102a9aef6e jdk9-b28
+c36c0092693707a8255561433647e8c3cd724ccd jdk9-b29
+b2287cac7813c70ed7f679d9a46fe774bd4005f8 jdk9-b30
+9d0e6639a4d71b63507dd94b1a028e963b27e798 jdk9-b31
+1b1ec4291abc0ba6da7bf79b754f08dd759a4a0c jdk9-b32
+f0c5e4b732da823bdaa4184133675f384e7cd68d jdk9-b33
+9618201c5df28a460631577fad1f61e96f775c34 jdk9-b34
+a137992d750c72f6f944f341aa19b0d0d96afe0c jdk9-b35
+41df50e7303daf73c0d661ef601c4fe250915de5 jdk9-b36
+b409bc51bc23cfd51f2bd04ea919ec83535af9d0 jdk9-b37
+948cceef81ba4cb34bc233e7cc5952951ff04e88 jdk9-b38
+4e7c4d692e934cb9023af8201e7c2b510e9c4ee1 jdk9-b39
+82f4cb44b2d7af2352f48568a64b7b6a5ae960cd jdk9-b40
+9fffb959eb4197ff806e4ac12244761815b4deee jdk9-b41
+3107be2ba9c6e208a0b86bc7100a141abbc5b5fb jdk9-b42
+6494b13f88a867026ee316b444d9a4fa589dd6bd jdk9-b43
+abbfccd659b91a7bb815d5e36fed635dcdd40f31 jdk9-b44
+bfc24ae2b900187585079bb11e66e459d1e525fe jdk9-b45
+722378bc599e38d9a1dd484de30f10dfd7b21438 jdk9-b46
+8327024a99559982b848e9c2191da9c0bf8838fd jdk9-b47
+b2f9702efbe95527ea3a991474fda23987ff1c5c jdk9-b48
+5b8db585a33c3cc48e70e688ceee57dd9271dc5d jdk9-b49
+1550b2f6b63d1411fa84dc7bbc6f04809aedb43f jdk9-b50
+6efe265424e3f1ea596408a1f71baf2de316c772 jdk9-b51
+d6224d6021459ac8b3832e822f5acc849fa944af jdk9-b52
+874d76e4699dfcd61ae1826c9fe0ddc1610ad598 jdk9-b53
+82cd31c5d6ca8d4c1653f4eb1c09eb2d9a3b2813 jdk9-b54
+c97e2d1bad9708d379793ba2a4c848eda14c741e jdk9-b55
+47544495db2d3d2edf0f85862d8715592fdb919f jdk9-b56
+ddb95d8f169b09544cc17e72a6baaff2400092f5 jdk9-b57
+f40752db7773ca0c737f2ad88371e35c57fdfed7 jdk9-b58
+da950f343762a856d69751570a4c07cfa68a415b jdk9-b59
+38f98cb6b33562a926ec3b79c7b34128be37647d jdk9-b60
+ac3f5a39d4ff14d70c365e12cf5ec8f2abd52a04 jdk9-b61
+e7dbbef69d12b6a74dfad331b7188e7f893e8d29 jdk9-b62
+989253a902c34dcb7564695161c9200a5fbb7412 jdk9-b63
+8ffdeabc7c2b9a8280bf46cae026ac46b4d31c26 jdk9-b64
+4915246064b2f89d5f00c96e758686b7fdad36a6 jdk9-b65
+ff3fc75f3214ad7e03595be1b0d0f38d887b6f0e jdk9-b66
+56166ce66037952fa21e9f680b31bf8eb47312c0 jdk9-b67
+5b500c93ce4822d47061cd518ff3f72d9d8cb5b5 jdk9-b68
+d69c968463f0ae5d0b45de3fc14fe65171b23948 jdk9-b69
+43d0179ee9de3bfffae3417f09e07eb6d8efc963 jdk9-b70
+f66c185284727f6e6ffd27e9c45ed2dd9da0a691 jdk9-b71
+61d2d0629b6dbf4c091dc86151ade1b3ef34fffe jdk9-b72
+9b3a9d72f07b40c648de79961679f42283af1bb5 jdk9-b73
+7c577fda1855d03c04546694d514678f596508c9 jdk9-b74
+f55df5cfe11c97e4b58998b76f5bd00a73cde12d jdk9-b75
+eeea9adfd1e3d075ef82148c00a4847a1aab4d26 jdk9-b76
+c25e882cee9622ec75c4e9d60633539a2f0a8809 jdk9-b77
+c8753d0be1778944dc512ec86a459941ea1ad2c3 jdk9-b78
+3966bd3b8167419aa05c6718a4af1cf54b1e3c58 jdk9-b79
+3c9f5bd909ae7187f24622ee4b69f8a5756a9271 jdk9-b80
+2050b3a0aadcb0e024bf798197421d58e54ec8bf jdk9-b81
+6521875cb63e1d0121b30af56ebbc36db078c4c6 jdk9-b82
+f61a63b7d1e52e307abc0bfc751203155d362ec4 jdk9-b83
+51b2db2fa04c16d767b66113dbf08c5349ce382a jdk9-b84
+8392405ab038b22e69a3728e17dbdd9e3d3a22ed jdk9-b85
+7db0663a5e968059fa7c772172187ebd60b6492d jdk9-b86
+1a52a30674cd28c24d4d388150336121f2e9ddf9 jdk9-b87
+16b4968f9bb8f34371b42c0ba483d76e91ba84d8 jdk9-b88
+4a0312f2894bcbe1fd20266c8fda8d983bd2fcf6 jdk9-b89
+d131f4b8433a79408f935eff9bf92a0664229b60 jdk9-b90
+8077fd2f055d31e50b46fcf62d9c035bc385a215 jdk9-b91
+f242d4332f563648426a1b0fa02d8741beba19ef jdk9-b92
+09206c6513b300e1ac8541f3be012e1a49312104 jdk9-b93
+25a2cab05cfbe6034b71d9e72d64c65b0572ce63 jdk9-b94
+5ac6287ec71aafe021cc839d8bc828108d23aaba jdk-9+95
+139f19d70350238e15e107945cea75082b6380b3 jdk-9+96
+4edcff1b9a8875eb6380a2165dfec599e8e3f7c0 jdk-9+97
+d00ad2d9049ac60815f70bff445e95df85648bd2 jdk-9+98
+f9bcdce2df26678c3fe468130b535c0342c69b89 jdk-9+99
+4379223f8806626852c46c52d4e7a27a584b406e jdk-9+100
+80f67512daa15cf37b4825c1c62a675d524d7c49 jdk-9+101
+2dc4c11fe48831854916d53c3913bdb7d49023ea jdk-9+102
+4a652e4ca9523422149958673033e0ac740d5e1e jdk-9+103
+086c682bd8c5f195c324f61e2c61fbcd0226d63b jdk-9+104
+db483b34fa7148d257a429acddbde9c13687dcae jdk-9+105
+6c644cca3f3fc2763e2ff7d669849a75d34543ba jdk-9+106
+1c076468bf7dad5b8f2ee5dcf66e2279caa3e208 jdk-9+107
+257b579d813201682931d6b42f0445ffe5b4210d jdk-9+108
+c870cb782aca71093d2584376f27f0cfbfec0e3a jdk-9+109
+4a95f4b1bd8bfce85dc02a593896749feab96c34 jdk-9+110
+a6614ff7bf09da74be1d0ef3d9755090d244697a jdk-9+111
+7359994942f8d8e723b584d66a3a92c2e9e95e5c jdk-9+112
+6072af7a98be3922f26bdce71b53bb3646cb2ac9 jdk-9+113
+c84d0cce090e161d736de69e941830adf8c2f87a jdk-9+114
+8d78fb40648dd221ce4ef19f9d5aa41ee1a3a884 jdk-9+115
+84aba7335005a3a47751dcf1f37935f97df9f99a jdk-9+116
+82b8d12a553f5617737c238cec060281d52e351c jdk-9+117
+7c04fcb12bd4a31570a238e663fa846dfa5ec3b8 jdk-9+118
+caf97b37ebec84288c112d21d3a60cb628cba1e8 jdk-9+119
+9330543436402b8f3bd070524846a464d8143557 jdk-9+120
+18e5cdecb37a2f03ba74f6c8f022858bcbaacf56 jdk-9+121
+7693aa00e131493ceb42b93305e2f014c9922a3b jdk-9+122
+d53037a90c441cb528dc41c30827985de0e67c62 jdk-9+123
+2a5697a98620c4f40e4a1a71478464399b8878de jdk-9+124
+3aa52182b3ad7c5b3a61cf05a59dd07e4c5884e5 jdk-9+125
+03e7b2c5ae345be3caf981d76ceb3efe5ff447f8 jdk-9+126
+8e45018bde9de4ad15b972ae62874bba52dba2d5 jdk-9+127
+5bf88dce615f6804f9e101a96ffa7c9dfb4fbbbe jdk-9+128
+e8373543a3f0f60589b7d72b1f9b172721124caf jdk-9+129
+e613affb88d178dc7c589f1679db113d589bddb4 jdk-9+130
+4d2a15091124488080d65848b704e25599b2aaeb jdk-9+131
+2e83d21d78cd9c1d52e6cd2599e9c8aa36ea1f52 jdk-9+132
+e17429a7e843c4a4ed3651458d0f950970edcbcc jdk-9+133
+a71210c0d9800eb6925b61ecd6198abd554f90ee jdk-9+134
+e384420383a5b79fa0012ebcb25d8f83cff7f777 jdk-9+135
+1b4b5d01aa11edf24b6fadbe3d2f3e411e3b02cd jdk-9+136
+9cb87c88ed851c0575b8ead753ea238ed5b544e9 jdk-9+137
+d273dfe9a126d3bffe92072547fef2cd1361b0eb jdk-9+138
+65477538bec32963dc41153d89c4417eb46c45fc jdk-9+139
+0875007901f7d364a08220b052f0c81003e9c8c5 jdk-9+140
+9aadd2163b568d76f8969ad2fb404a63733da359 jdk-9+141
+df0e03e3ca0ed1307793017dfc1a054c8726131c jdk-9+142
+d62173b931bf5b6bffc6e80a9060bb2e8b8efc75 jdk-9+143
+31f5023200d42185b70c4c00ba5672391e4642d0 jdk-9+144
+3ee4e7827413fa5c5c4fca58597b0ad89e921bfb jdk-9+145
+581331db696a62dd411926ba7fd437252252a71d jdk-9+146
+f4e854a77aa38749bd90f722b06974a56e7233d5 jdk-9+147
+5c71ea43933b6c7e8a85eb1a4eb2213011b95d82 jdk-9+148
+cf139f925da04c8bd7efd33270a0315d72b338d3 jdk-9+149
+17469f16fbb406ec9f0dd262ce776ab6efbc38f1 jdk-9+150
+37b95df0042ae0687324e1f7dc4a2519e230e704 jdk-9+151
+ab2c8b03c3284fcbdd157551a66f807e3a182d9b jdk-9+152
+d7034ff7f8e257e81c9f95c7785dd4eaaa3c2afc jdk-9+153
+8c70d170e62c0c58b5bc3ba666bd140399b98c9c jdk-10+0
+45b751afd11e6c05991cf4913c5a0ac3304fcc4e jdk-9+154
+f4aff695ffe05cfdb69d8af25a4ddc6a029754ea jdk-9+155
+06bce0388880b5ff8e040e4a9d72a3ea11dac321 jdk-9+156
+74116beae88a8f17a80301aa6c83865c82f10ece jdk-10+1
+4a79ad46e578112fce68f1af9dd931025cc235cb jdk-10+2
+d1cab6c7e608479be4ebfad48a25b0ed48600f62 jdk-10+3
+02253db2ace1422f576f58502fc7831ead77424b jdk-10+4
+f113ce12fe24fbd24acf02711372d9f1e1c12426 jdk-10+5
+1407b19a2ddf6baae162f5a1a5b96af473f4d7d1 jdk-10+6
+30e75693ae99fd8e47fd2f5116527aff1b59aff9 jdk-10+7
+c42dc7b58b4d4301ea676a76326fd9bbd403d595 jdk-10+8
+aa5b01f5e5620438fd39efdb2e2f6365a2c7d898 jdk-10+9
+b0f2b8ff25a2209b2c807785d75f20e5086bbfc2 jdk-10+10
+036dbf8b381798e5d31065109714d04d97bf98a4 jdk-10+11
+e6d70017f5b9adbb2ec82d826973d0251800a3c3 jdk-10+12
+9927a9f16738e240ab7014f0118f41e314ef8f99 jdk-10+13
+9ef5029b247b4d940080417a287440bbdbab995b jdk-10+14
+878e216039322cb3f0ecbd0944642a2b4e2593f3 jdk-10+15
+4bbea012e5676e8025ade2bcfab4d6581e6e9f4b jdk-10+16
+7db699468b4f84abbcc01647e5a964409737411a jdk-10+17
+3739654290616e533fc6f51bf9ad69ed47a6abba jdk-10+18
+14df107500cc3b8ab238c3e4ad2c74e12bfe6067 jdk-10+19
+4586bc5d28d13d3147b993e6237eaf29a7073bbb jdk-10+20
+a85884d55ce32799f5c7382b7ea4839052b362a2 jdk-10+21
+e5357aa85dadacc6562175ff74714fecfb4470cf jdk-10+22
+22850b3a55240253841b9a425ad60a7fcdb22d47 jdk-10+23
+3b201865d5c1f244f555cad58da599c9261286d8 jdk-10+24
+8eb5e3ccee560c28ac9b1df2670adac2b3d36fad jdk-10+25
+1129253d3bc728a2963ba411ab9dd1adf358fb6b jdk-10+26
+b87d7b5d5dedc1185e5929470f945b7378cdb3ad jdk-10+27
+92f08900cb3c0d694e5c529a676c1c9e5909193f jdk-10+28
+a6e591e12f122768f675428e1e5a838fd0e9c7ec jdk-10+29
+8fee80b92e65149f7414250fd5e34b6f35d417b4 jdk-10+30
+e6278add9ff28fab70fe1cc4c1d65f7363dc9445 jdk-10+31
+a2008587c13fa05fa2dbfcb09fe987576fbedfd1 jdk-10+32
+bbd692ad4fa300ecca7939ffbe3b1d5e52a28cc6 jdk-10+33
+89deac44e51517841491ba86ff44aa82a5ca96b3 jdk-10+34
+d8c634b016c628622c9abbdc6bf50509e5dedbec jdk-10+35
+0ee20aad71c4f33c426372b4c8bcc1235ce2ec08 jdk-11+0
+959f2f7cbaa6d2ee45d50029744efb219721576c jdk-10+36
+4f830b447edf04fb4a52151a5ad44d9bb60723cd jdk-10+37
+e569e83139fdfbecfeb3cd9014d560917787f158 jdk-10+38
+5b834ec962366e00d4445352a999a3ac14e26f64 jdk-10+39
+860326263d1f6a83996d7da0f4c66806ae4aa1eb jdk-10+40
+3eae36c6baa5f916a3024cf1513e22357e00185d jdk-10+41
+4b62b815b4f49970b91a952929cf50115c263cb3 jdk-10+42
+107413b070b92c88bde6230ceb4a19b579781068 jdk-10+43
+dfa46cfe56346884a61efdc30dc50f7505d66761 jdk-11+1
+03ae177c26b016353e5ea1cab6ffd051dfa086ca jdk-11+2
+663f20fc51091bd7f95d18448850ba091207b7bd jdk-10+44
+4f96cf952e71cb8a127334494faf28880c26181b jdk-10+45
+1fd4d6068f54561cfc67d54fc9ca84af7212c4f8 jdk-11+3
+e59941f7247d451fa7df9eaef3fce0f492f8420c jdk-11+4
+d5c43e9f08fb9a7c74aae0d48daf17f2ad2afaef jdk-11+5
+3acb379b86725c47e7f33358cb22efa8752ae532 jdk-11+6
+f7363de371c9a1f668bd0a01b7df3d1ddb9cc58b jdk-11+7
+755e1b55a4dff510f9639cdb5c5e82549a7e09b3 jdk-11+8
+0c3e252cea44f06aef570ef464950ab97c669970 jdk-11+9
+6fa770f9f8ab296e1ce255ec17ccf6d4e1051886 jdk-10+46
+69d7398038c54774d9395b6810e0cca335edc02c jdk-11+10
+e1e60f75cd39312a7f59d2a4f91d624e5aecc95e jdk-11+11
+3ab6ba9f94a9045a526d645af26c933235371d6f jdk-11+12
+758deedaae8406ae60147486107a54e9864aa7b0 jdk-11+13
+3595bd343b65f8c37818ebe6a4c343ddeb1a5f88 jdk-11+14
+a11c1cb542bbd1671d25b85efe7d09b983c48525 jdk-11+15
+02934b0d661b82b7fe1052a04998d2091352e08d jdk-11+16
+64e4b1686141e57a681936a8283983341484676e jdk-11+17
+e1b3def126240d5433902f3cb0e91a4c27f6db50 jdk-11+18
+36ca515343e00b021dcfc902e986d26ec994a2e5 jdk-11+19
+95aad0c785e497f1bade3955c4e4a677b629fa9d jdk-12+0
+9816d7cc655e53ba081f938b656e31971b8f097a jdk-11+20
+14708e1acdc3974f4539027cbbcfa6d69f83cf51 jdk-11+21
+00b16d0457e43d23f6ca5ade6b243edce62750a0 jdk-12+1
+9937ef7499dcd7673714517fd5e450410c14ba4e jdk-11+22
+69b438908512d3dfef5852c6a843a5778333a309 jdk-12+2
+1edcf36fe15f79d6228d1a63eb680878e2386480 jdk-11+23
+990db216e7199b2ba9989d8fa20b657e0ca7d969 jdk-12+3
+ea900a7dc7d77dee30865c60eabd87fc24b1037c jdk-11+24
+499b873761d8e8a1cc4aa649daf04cbe98cbce77 jdk-12+4
+331888ea4a788df801b1edf8836646cd25fc758b jdk-11+25
+f8696e0ab9b795030429fc3374ec03e378fd9ed7 jdk-12+5
+945ba9278a272a5477ffb1b3ea1b04174fed8036 jdk-11+26
+7939b3c4e4088bf4f70ec5bbd8030393b653372f jdk-12+6
+9d7d74c6f2cbe522e39fa22dc557fdd3f79b32ad jdk-11+27
+ef57958c7c511162da8d9a75f0b977f0f7ac464e jdk-12+7
+76072a077ee1d815152d45d1692c4b36c53c5c49 jdk-11+28
+492b366f8e5784cc4927c2c98f9b8a3f16c067eb jdk-12+8
+31b159f30fb281016c5f0c103552809aeda84063 jdk-12+9
+8f594f75e0547d4ca16649cb3501659e3155e81b jdk-12+10
+f0f5d23449d31f1b3580c8a73313918cafeaefd7 jdk-12+11
+15094d12a632f452a2064318a4e416d0c7a9ce0c jdk-12+12
+511a9946f83e3e3c7b9dbe1840367063fb39b4e1 jdk-12+13
+8897e41b327c0a5601c6ba2bba5d07f15a3ffc91 jdk-12+14
+8897e41b327c0a5601c6ba2bba5d07f15a3ffc91 jdk-12+14
+6f04692c7d5137ee34a6bd94c0c8a6c9219cb127 jdk-12+14
+f8626bcc169813a4b2a15880386b952719d1d6d1 jdk-12+15
+199658d1ef860cdc17055b4fd3e94b057f292fe9 jdk-12+16
+eefa65e142af305923d2adcd596fab9c639723a1 jdk-12+17
+e38473506688e0995e701fc7f77d5a91b438ef93 jdk-12+18
+dc1f9dec2018a37fedba47d8a2aedef99faaec64 jdk-12+19
+40098289d5804c3b5e7074bc75501a81e70d9b0d jdk-12+20
+f8fb0c86f2b3d24294d39c5685a628e1beb14ba7 jdk-12+21
+732bec44c89e8b93a38296bf690f97b7230c5b6d jdk-12+22
+eef755718cb24813031a842bbfc716a6cea18e9a jdk-12+23
+cc4098b3bc10d1c390384289025fea7b0d4b9e93 jdk-13+0
+7d4397b43fa305806160785a4c7210600d59581a jdk-12+24
+11033c4ada542f9c9a873314b6ecf60af19e8256 jdk-13+1
+7496df94b3b79f3da53925d2d137317715f11d97 jdk-12+25
+50677f43ac3df9a8684222b8893543c60f3aa0bd jdk-13+2
+de9fd809bb475401aad188eab2264226788aad81 jdk-12+26
+642346a11059b9f283110dc301a24ed43b76a94e jdk-13+3
+f15d443f97318e9b40e6f451e327ff69ed4ec361 jdk-12+27
+a47b8125b7cc9ef59619745c163975fe935b57ed jdk-13+4
+659b004b6a1bd8c31e766cbdf328d8f8473fd4d7 jdk-12+28
+e3ed960609927b5fdfd0a797159835cd83a81a31 jdk-13+5
+44f41693631f9b5ac78ff4d2bfabd6734fe46df2 jdk-12+29
+b5f05fe4a6f8b3996a000c20078b356d991ca8ec jdk-13+6
+6c377af36a5c4203f16aed8a5e4c2ecc08fcd8bd jdk-12+30
+021917019cda1c0c5853255322274f37693a2431 jdk-13+7
+b5f7bb57de2f797be34f6c75d45c3245ad37ab97 jdk-12+31
+a535ba736cabc6886acdff36de3a096c46e5ddc5 jdk-13+8
+4ce47bc1fb92cf94c6e3d1f49d582f02dcb851ab jdk-12+32
+c081f3ea6b9300265a4a34e38f970b1e3ddaae9f jdk-13+9
+b67884871b5fff79c5ef3eb8ac74dd48d71ea9b1 jdk-12+33
+8e069f7b4fabfe05d9f500783e6d56cb0196d25c jdk-13+10
+21ea4076a275a0f498afa517e9ee1b94a9cf0255 jdk-13+11
+1d7aec80147a6d92b101a76aef92f3ddc88bedf4 jdk-13+12
+b67884871b5fff79c5ef3eb8ac74dd48d71ea9b1 jdk-12-ga
+83cace4142c8563b6a921787db02388e1bc48d01 jdk-13+13
+46cf212cdccaf4fb064d913b12004007d3322b67 jdk-13+14
+f855ec13aa2501ae184c8b3e0626a8cec9966116 jdk-13+15
+9d0ae9508d5337b0dc7cc4684be42888c4023755 jdk-13+16
+93b702d2a0cb9e32160208f6700aede1f8492773 jdk-13+17
+bebb82ef3434a25f8142edafec20165f07ac562d jdk-13+18
+a43d6467317d8f1e160f67aadec37919c9d64443 jdk-13+19
+6ccc7cd7931e34129f6b7e04988fc9a63958dde0 jdk-13+20
+f2f11d7f7f4e7128f8aba6ffa576cfa76fbf7d1a jdk-13+21
+181986c5476468bc2dd4532af49599003ee8af37 jdk-13+22
+b034d2dee5fc93d42a81b65e58ce3f91e42586ff jdk-13+23
+7e2238451585029680f126ccbb46d01f2ff5607f jdk-13+24
+22b3b7983adab54e318f75aeb94471f7a4429c1e jdk-14+0
+22b3b7983adab54e318f75aeb94471f7a4429c1e jdk-13+25
+2f4e214781a1d597ed36bf5a36f20928c6c82996 jdk-14+1
+0692b67f54621991ba7afbf23e55b788f3555e69 jdk-13+26
+43627549a488b7d0b4df8fad436e36233df89877 jdk-14+2
+b7f68ddec66f996ae3aad03291d129ca9f02482d jdk-13+27
+e64383344f144217c36196c3c8a2df8f588a2af3 jdk-14+3
+1e95931e7d8fa7e3899340a9c7cb28dbea50c10c jdk-13+28
+19d0b382f0869f72d4381b54fa129f1c74b6e766 jdk-14+4
+3081f39a3d30d63b112098386ac2bb027c2b7223 jdk-13+29
+0f1e29c77e50c7da11d83df410026392c4d1a28c jdk-14+5
+2e63fb0a885fa908a97bbb0da8d7c3de11536aca jdk-13+30
+443f7359b34d60e7821216ffc60f88b6ffe0ccdd jdk-14+6
+6a159c6c23ccd0029140ab91653442e412305ce5 jdk-13+31
+28ab01c067551ef158abaef08e154e1051ca0893 jdk-14+7
+929f37a9c35d530d4e866f6e832001aeb4cfb371 jdk-13+32
+c0023e364b6f130cb1e93747b796d8718d544db1 jdk-14+8
+9c250a7600e12bdb1e611835250af3204d4aa152 jdk-13+33
+18f189e69b29f8215a3500b875127ed4fb2d977a jdk-14+9
+ececb6dae777e622abda42c705fd984a42f46b5a jdk-14+10
+bf4c808a4488025a415f867e54c8b088417e08a0 jdk-14+11
+8570f22b9b6ac6bec673899b582150865696e425 jdk-14+12
+fbbe6672ae15deaf350a9e935290a36f57ba9c25 jdk-14+13
+cddef3bde924f3ff4f17f3d369280cf69d0450e5 jdk-14+14
+9c250a7600e12bdb1e611835250af3204d4aa152 jdk-13-ga
+778fc2dcbdaa8981e07e929a2cacef979c72261e jdk-14+15
+d29f0181ba424a95d881aba5eabf2e393abcc70f jdk-14+16
+5c83830390baafb76a1fbe33443c57620bd45fb9 jdk-14+17
+e84d8379815ba0d3e50fb096d28c25894cb50b8c jdk-14+18
+9b67dd88a9313e982ec5f710a7747161bc8f0c23 jdk-14+19
+54ffb15c48399dd59922ee22bb592d815307e77c jdk-14+20
+c16ac7a2eba4e73cb4f7ee9294dd647860eebff0 jdk-14+21
+83810b7d12e7ff761ad3dd91f323a22dad96f108 jdk-14+22
+15936b142f86731afa4b1a2c0fe4a01e806c4944 jdk-14+23
+438337c846fb071900ddb6922bddf8b3e895a514 jdk-14+24
+17d242844fc9e7d18b3eac97426490a9c246119e jdk-14+25
+288777cf0702914e5266bc1e5d380eed9032ca41 jdk-14+26
+2c724dba4c3cf9516b2152e151c9aea66b21b30b jdk-15+0
+91a3f092682fc715d991a87eb6ec6f28886d2035 jdk-14+27
+63e17cf29bed191ea21020b4648c9cdf893f80f5 jdk-15+1
+2069b4bfd23b56b6fc659fba8b75aaaa23debbe0 jdk-14+28
+f33197adda9ad82fdef46ac0f7dc0126204f35b2 jdk-15+2
+563fa900fa17c290ae516c7a3a69e8c069dde304 jdk-14+29
+d05fcdf25717d85e80a3a39a6b719458b22be5fe jdk-15+3
+d54ce919da90dab361995bb4d87be9851f00537a jdk-14+30
+bb0a7975b31ded63d594ee8dbfc4d4ead587f79b jdk-15+4
+decd3d2953b640f1043ee76953ff89238bff92e8 jdk-14+31
+b97c1773ccafae4a8c16cc6aedb10b2a4f9a07ed jdk-15+5
+2776da28515e087cc8849acf1e131a65ea7e77b6 jdk-14+32
+ef7d53b4fccd4a0501b17d974e84f37aa99fa813 jdk-15+6
+f728b6c7f4910d6bd6070cb4dde8393f4ba95113 jdk-14+33
+e2bc57500c1b785837982f7ce8af6751387ed73b jdk-15+7
+a96bc204e3b31ddbf909b20088964112f052927e jdk-14+34
+c7d4f2849dbfb755fc5860b362a4044ea0c9e082 jdk-15+8
+4a87bb7ebfd7f6a25ec59a5982fe3607242777f8 jdk-14+35
+62b5bfef8d618e08e6f3a56cf1fb0e67e89e9cc2 jdk-15+9
+bc54620a3848c26cff9766e5e2a6e5ddab98ed18 jdk-14+36
+1bee69801aeea1a34261c93f35bc9de072a98704 jdk-15+10
+b2dd4028a6de4e40dda8b76109e4b5c6b294f980 jdk-15+11
+2ec0ff3042630ddbd3587e340fe0dd40391cb6c4 jdk-15+12
+1c06a8ee8acad4d93c782626a233693a73de0add jdk-15+13
+1d6ceb13e142665ea833fca01c8c8598e0ddd211 jdk-15+14
+bc54620a3848c26cff9766e5e2a6e5ddab98ed18 jdk-14-ga
+82b7c62cf4cc56828a8fb724f57087967232a2a7 jdk-15+15
+5c7ec21f5d13f6eb5cd32288c69b8be2f9cac256 jdk-15+16
+dd5198db2e5b1ebcafe065d987c03ba9fcb50fc3 jdk-15+17
+44aef192b488a48cce12422394691a6b1d16b98e jdk-15+18
+7cc27caabe6e342151e8baf549beb07a9c755ec2 jdk-15+19
+46bca5e5e6fb26efd07245d26fe96a9c3260f51e jdk-15+20
+12b55fad80f30d24b1f8fdb3b947ea6465ef9518 jdk-15+21
+7223c6d610343fd8323af9d07d501e01fa1a7696 jdk-15+22
+f143729ca00ec14a98ea5c7f73acba88da97746e jdk-15+23
+497fd9f9129c4928fd5a876dd55e0daf6298b511 jdk-15+24
+90b266a84c06f1b3dc0ed8767856793e8c1c357e jdk-15+25
+0a32396f7a690015d22ca3328ac441a358295d90 jdk-15+26
+93813843680bbe1b7efbca56c03fd137f20a2c31 jdk-16+0
+93813843680bbe1b7efbca56c03fd137f20a2c31 jdk-15+27
+4a485c89d5a08b495961835f5308a96038678aeb jdk-16+1
+06c9f89459daba98395fad726100feb44f89ba71 jdk-15+28
+bcbe7b8a77b8971bc221c0be1bd2abb6fb68c2d0 jdk-16+2
+b58fc60580550a4a587cab729d8fd87223ad6932 jdk-15+29
+76810b3a88c8c641ae3850a8dfd7c40c984aea9d jdk-16+3
+6909e4a1f25bfe9a2727026f5845fc1fc44a36aa jdk-15+30
+e2622818f0bd30e736252eba101fe7d2c27f400b jdk-16+4
+a32f58c6b8be81877411767de7ba9c4cf087c1b5 jdk-15+31
+143e258f64af490010eb7e0bacc1cfaeceff0993 jdk-16+5
+2dad000726b8d5db9f3df647fb4949d88f269dd4 jdk-15+32
+4a8fd81d64bafa523cddb45f82805536edace106 jdk-16+6
+6b65f4e7a975628df51ef755b02642075390041d jdk-15+33
+c3a4a7ea7c304cabdacdc31741eb94c51351668d jdk-16+7
+b0817631d2f4395508cb10e81c3858a94d9ae4de jdk-15+34
+0a73d6f3aab48ff6d7e61e47f0bc2d87a054f217 jdk-16+8
+fd60c3146a024037cdd9be34c645bb793995a7cc jdk-15+35
+c075a286cc7df767cce28e8057d6ec5051786490 jdk-16+9
+b01985b4f88f554f97901e53e1ba314681dd9c19 jdk-16+10
+e3f940bd3c8fcdf4ca704c6eb1ac745d155859d5 jdk-15+36
+5c18d696c7ce724ca36df13933aa53f50e12b9e0 jdk-16+11
+fc8e62b399bd93d06e8d13dc3b384c450e853dcd jdk-16+12
+fd07cdb26fc70243ef23d688b545514f4ddf1c2b jdk-16+13
+36b29df125dc88f11657ce93b4998aa9ff5f5d41 jdk-16+14

.jcheck/conf

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

bin/idea.sh

@@ -25,7 +25,7 @@
 # Shell script for generating an IDEA project from a given list of modules
 
 usage() {
-      echo "usage: $0 [-h|--help] [-v|--verbose] [-o|--output <path>] [-c|--conf <conf_name>] [modules]+"
+      echo "usage: $0 [-h|--help] [-v|--verbose] [-o|--output <path>] [modules]+"
       exit 1
 }
 
@@ -37,7 +37,6 @@ cd $TOP;
 
 IDEA_OUTPUT=$TOP/.idea
 VERBOSE="false"
-CONF_ARG=
 while [ $# -gt 0 ]
 do
   case $1 in
@@ -53,10 +52,6 @@ do
       IDEA_OUTPUT=$2/.idea
       shift
       ;;
-    -c | --conf )
-      CONF_ARG="CONF_NAME=$2"
-      shift
-      ;;
 
     -*)  # bad option
       usage
@@ -69,9 +64,6 @@ do
   shift
 done
 
-if [ -e $IDEA_OUTPUT ] ; then
-    rm -r $IDEA_OUTPUT
-fi
 mkdir -p $IDEA_OUTPUT || exit 1
 cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
 
@@ -99,7 +91,7 @@ if [ "$VERBOSE" = "true" ] ; then
   echo "idea template dir: $IDEA_TEMPLATE"
 fi
 
-cd $TOP ; make -f "$IDEA_MAKE/idea.gmk" -I $MAKE_DIR/.. idea MAKEOVERRIDES= OUT=$IDEA_OUTPUT/env.cfg MODULES="$*" $CONF_ARG || exit 1
+cd $TOP ; make -f "$IDEA_MAKE/idea.gmk" -I $MAKE_DIR/.. idea MAKEOVERRIDES= OUT=$IDEA_OUTPUT/env.cfg MODULES="$*" || exit 1
 cd $SCRIPT_DIR
 
 . $IDEA_OUTPUT/env.cfg
@@ -156,14 +148,14 @@ add_replacement "###MODULE_NAMES###" "$MODULE_NAMES"
 add_replacement "###VCS_TYPE###" "$VCS_TYPE"
 SPEC_DIR=`dirname $SPEC`
 if [ "x$CYGPATH" != "x" ]; then
-    add_replacement "###BUILD_DIR###" "`$CYGPATH -am $SPEC_DIR`"
-    add_replacement "###IMAGES_DIR###" "`$CYGPATH -am $SPEC_DIR`/images/jdk"
-    add_replacement "###ROOT_DIR###" "`$CYGPATH -am $TOPLEVEL_DIR`"
-    add_replacement "###IDEA_DIR###" "`$CYGPATH -am $IDEA_OUTPUT`"
+    add_replacement "###BUILD_DIR###" "`cygpath -am $SPEC_DIR`"
+    add_replacement "###IMAGES_DIR###" "`cygpath -am $SPEC_DIR`/images/jdk"
+    add_replacement "###ROOT_DIR###" "`cygpath -am $TOPLEVEL_DIR`"
+    add_replacement "###IDEA_DIR###" "`cygpath -am $IDEA_OUTPUT`"
     if [ "x$JT_HOME" = "x" ]; then
       add_replacement "###JTREG_HOME###" ""
     else
-      add_replacement "###JTREG_HOME###" "`$CYGPATH -am $JT_HOME`"
+      add_replacement "###JTREG_HOME###" "`cygpath -am $JT_HOME`"
     fi
 elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
     add_replacement "###BUILD_DIR###" "`wslpath -am $SPEC_DIR`"
@@ -188,7 +180,7 @@ SOURCE_POSTFIX="\" isTestSource=\"false\" />"
 
 for root in $MODULE_ROOTS; do
     if [ "x$CYGPATH" != "x" ]; then
-      root=`$CYGPATH -am $root`
+      root=`cygpath -am $root`
     elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
       root=`wslpath -am $root`
     fi
@@ -227,33 +219,26 @@ fi
 CP=$ANT_HOME/lib/ant.jar
 rm -rf $CLASSES; mkdir $CLASSES
 
-# If we have a Windows boot JDK, we need a .exe suffix
-if [ -e "$BOOT_JDK/bin/java.exe" ] ; then
-  JAVAC=javac.exe
-else 
+if [ "x$CYGPATH" != "x" ] ; then ## CYGPATH may be set in env.cfg
+  JAVAC_SOURCE_FILE=`cygpath -am $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
+  JAVAC_SOURCE_PATH=`cygpath -am $IDEA_OUTPUT/src`
+  JAVAC_CLASSES=`cygpath -am $CLASSES`
+  JAVAC_CP=`cygpath -am $CP`
   JAVAC=javac
-fi
-
-# If we are on WSL, the boot JDK might be either Windows or Linux,
-# and we need to use realpath instead of CYGPATH to make javac work on both.
-# We need to handle this case first since CYGPATH might be set on WSL.
-if [ "x$WSL_DISTRO_NAME" != "x" ]; then
+elif [ "x$WSL_DISTRO_NAME" != "x" ]; then
   JAVAC_SOURCE_FILE=`realpath --relative-to=./ $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
   JAVAC_SOURCE_PATH=`realpath --relative-to=./ $IDEA_OUTPUT/src`
   JAVAC_CLASSES=`realpath --relative-to=./ $CLASSES`
   ANT_TEMP=`mktemp -d -p ./`
   cp $ANT_HOME/lib/ant.jar $ANT_TEMP/ant.jar
   JAVAC_CP=$ANT_TEMP/ant.jar
-elif [ "x$CYGPATH" != "x" ] ; then ## CYGPATH may be set in env.cfg
-  JAVAC_SOURCE_FILE=`$CYGPATH -am $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
-  JAVAC_SOURCE_PATH=`$CYGPATH -am $IDEA_OUTPUT/src`
-  JAVAC_CLASSES=`$CYGPATH -am $CLASSES`
-  JAVAC_CP=`$CYGPATH -am $CP`
+  JAVAC=javac.exe
 else
   JAVAC_SOURCE_FILE=$IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java
   JAVAC_SOURCE_PATH=$IDEA_OUTPUT/src
   JAVAC_CLASSES=$CLASSES
   JAVAC_CP=$CP
+  JAVAC=javac
 fi
 
 $BOOT_JDK/bin/$JAVAC -d $JAVAC_CLASSES -sourcepath $JAVAC_SOURCE_PATH -cp $JAVAC_CP $JAVAC_SOURCE_FILE

bin/print-config.js

@@ -0,0 +1,45 @@
+/*
+ * 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
+ * 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 little utility can be used to expand the jib-profiles configuration
+ * files into plain json.
+ *
+ * Usage:
+ *
+ *   jjs -scripting print-config.js -- [<jib-profiles.js>]
+ *
+ */
+
+var file = $ARG[0];
+if (file == null) {
+    file = new java.io.File(__DIR__, "../conf/jib-profiles.js").getCanonicalPath();
+}
+load(file);
+var input = {};
+input.get = function(dependencyName, attribute) {
+    return "\${" + dependencyName + "." + attribute + "}";
+};
+print(JSON.stringify(getJibProfiles(input), null, 2));

doc/building.html

@@ -96,7 +96,6 @@
 <li><a href="#specific-build-issues">Specific Build Issues</a></li>
 <li><a href="#getting-help">Getting Help</a></li>
 </ul></li>
-<li><a href="#reproducible-builds">Reproducible Builds</a></li>
 <li><a href="#hints-and-suggestions-for-advanced-users">Hints and Suggestions for Advanced Users</a><ul>
 <li><a href="#bash-completion">Bash Completion</a></li>
 <li><a href="#using-multiple-configurations">Using Multiple Configurations</a></li>
@@ -163,8 +162,6 @@
 <h3 id="building-on-aarch64">Building on aarch64</h3>
 <p>At a minimum, a machine with 8 cores is advisable, as well as 8 GB of RAM. (The more cores to use, the more memory you need.) At least 6 GB of free disk space is required.</p>
 <p>If you do not have access to sufficiently powerful hardware, it is also possible to use <a href="#cross-compiling">cross-compiling</a>.</p>
-<h4 id="branch-protection">Branch Protection</h4>
-<p>In order to use Branch Protection features in the VM, <code>--enable-branch-protection</code> must be used. This option requires C++ compiler support (GCC 9.1.0+ or Clang 10+). The resulting build can be run on both machines with and without support for branch protection in hardware. Branch Protection is only supported for Linux targets.</p>
 <h3 id="building-on-32-bit-arm">Building on 32-bit arm</h3>
 <p>This is not recommended. Instead, see the section on <a href="#cross-compiling">Cross-compiling</a>.</p>
 <h2 id="operating-system-requirements">Operating System Requirements</h2>
@@ -198,7 +195,7 @@
 <h3 id="windows">Windows</h3>
 <p>Windows XP is not a supported platform, but all newer Windows should be able to build the JDK.</p>
 <p>On Windows, it is important that you pay attention to the instructions in the <a href="#special-considerations">Special Considerations</a>.</p>
-<p>Windows is the only non-POSIX OS supported by the JDK, and as such, requires some extra care. A POSIX support layer is required to build on Windows. Currently, the only supported such layers are Cygwin, Windows Subsystem for Linux (WSL), and MSYS2. (MSYS is no longer supported due to an outdated bash; While OpenJDK can be built with MSYS2, support for it is still experimental, so build failures and unusual errors are not uncommon.)</p>
+<p>Windows is the only non-POSIX OS supported by the JDK, and as such, requires some extra care. A POSIX support layer is required to build on Windows. Currently, the only supported such layers are Cygwin and Windows Subsystem for Linux (WSL). (Msys is no longer supported due to a too old bash; msys2 would likely be possible to support in a future version but that would require effort to implement.)</p>
 <p>Internally in the build system, all paths are represented as Unix-style paths, e.g. <code>/cygdrive/c/git/jdk/Makefile</code> rather than <code>C:\git\jdk\Makefile</code>. This rule also applies to input to the build system, e.g. in arguments to <code>configure</code>. So, use <code>--with-msvcr-dll=/cygdrive/c/msvcr100.dll</code> rather than <code>--with-msvcr-dll=c:\msvcr100.dll</code>. For details on this conversion, see the section on <a href="#fixpath">Fixpath</a>.</p>
 <h4 id="cygwin">Cygwin</h4>
 <p>A functioning <a href="http://www.cygwin.com/">Cygwin</a> environment is required for building the JDK on Windows. If you have a 64-bit OS, we strongly recommend using the 64-bit version of Cygwin.</p>
@@ -216,7 +213,7 @@
 <p>Unfortunately, Cygwin can be unreliable in certain circumstances. If you experience build tool crashes or strange issues when building on Windows, please check the Cygwin FAQ on the <a href="https://cygwin.com/faq/faq.html#faq.using.bloda">&quot;BLODA&quot; list</a> and the section on <a href="https://cygwin.com/faq/faq.html#faq.using.fixing-fork-failures">fork() failures</a>.</p>
 <h4 id="windows-subsystem-for-linux-wsl">Windows Subsystem for Linux (WSL)</h4>
 <p>Windows 10 1809 or newer is supported due to a dependency on the wslpath utility and support for environment variable sharing through WSLENV. Version 1803 can work but intermittent build failures have been observed.</p>
-<p>It's possible to build both Windows and Linux binaries from WSL. To build Windows binaries, you must use a Windows boot JDK (located in a Windows-accessible directory). To build Linux binaries, you must use a Linux boot JDK. The default behavior is to build for Windows. To build for Linux, pass <code>--build=x86_64-unknown-linux-gnu --openjdk-target=x86_64-unknown-linux-gnu</code> to <code>configure</code>.</p>
+<p>It's possible to build both Windows and Linux binaries from WSL. To build Windows binaries, you must use a Windows boot JDK (located in a Windows-accessible directory). To build Linux binaries, you must use a Linux boot JDK. The default behavior is to build for Windows. To build for Linux, pass <code>--build=x86_64-unknown-linux-gnu --host=x86_64-unknown-linux-gnu</code> to <code>configure</code>.</p>
 <p>If building Windows binaries, the source code must be located in a Windows- accessible directory. This is because Windows executables (such as Visual Studio and the boot JDK) must be able to access the source code. Also, the drive where the source is stored must be mounted as case-insensitive by changing either /etc/fstab or /etc/wsl.conf in WSL. Individual directories may be corrected using the fsutil tool in case the source was cloned before changing the mount options.</p>
 <p>Note that while it's possible to build on WSL, testing is still not fully supported.</p>
 <h3 id="macos">macOS</h3>
@@ -273,7 +270,7 @@
 <tbody>
 <tr class="odd">
 <td style="text-align: left;">Linux</td>
-<td style="text-align: left;">gcc 11.2.0</td>
+<td style="text-align: left;">gcc 10.2.0</td>
 </tr>
 <tr class="even">
 <td style="text-align: left;">macOS</td>
@@ -281,14 +278,14 @@
 </tr>
 <tr class="odd">
 <td style="text-align: left;">Windows</td>
-<td style="text-align: left;">Microsoft Visual Studio 2022 update 17.1.0</td>
+<td style="text-align: left;">Microsoft Visual Studio 2019 update 16.7.2</td>
 </tr>
 </tbody>
 </table>
 <p>All compilers are expected to be able to compile to the C99 language standard, as some C99 features are used in the source code. Microsoft Visual Studio doesn't fully support C99 so in practice shared code is limited to using C99 features that it does support.</p>
 <h3 id="gcc">gcc</h3>
 <p>The minimum accepted version of gcc is 5.0. Older versions will generate a warning by <code>configure</code> and are unlikely to work.</p>
-<p>The JDK is currently known to be able to compile with at least version 11.2 of gcc.</p>
+<p>The JDK is currently known to be able to compile with at least version 10.2 of gcc.</p>
 <p>In general, any version between these two should be usable.</p>
 <h3 id="clang">clang</h3>
 <p>The minimum accepted version of clang is 3.5. Older versions will not be accepted by <code>configure</code>.</p>
@@ -300,7 +297,7 @@
 <p>It is advisable to keep an older version of Xcode for building the JDK when updating Xcode. This <a href="http://iosdevelopertips.com/xcode/install-multiple-versions-of-xcode.html">blog page</a> has good suggestions on managing multiple Xcode versions. To use a specific version of Xcode, use <code>xcode-select -s</code> before running <code>configure</code>, or use <code>--with-toolchain-path</code> to point to the version of Xcode to use, e.g. <code>configure --with-toolchain-path=/Applications/Xcode8.app/Contents/Developer/usr/bin</code></p>
 <p>If you have recently (inadvertently) updated your OS and/or Xcode version, and the JDK can no longer be built, please see the section on <a href="#problems-with-the-build-environment">Problems with the Build Environment</a>, and <a href="#getting-help">Getting Help</a> to find out if there are any recent, non-merged patches available for this update.</p>
 <h3 id="microsoft-visual-studio">Microsoft Visual Studio</h3>
-<p>For aarch64 machines running Windows the minimum accepted version is Visual Studio 2019 (16.8 or higher). For all other platforms the minimum accepted version of Visual Studio is 2017. Older versions will not be accepted by <code>configure</code> and will not work. For all platforms the maximum accepted version of Visual Studio is 2022.</p>
+<p>The minimum accepted version of Visual Studio is 2017. Older versions will not be accepted by <code>configure</code> and will not work. The maximum accepted version of Visual Studio is 2019.</p>
 <p>If you have multiple versions of Visual Studio installed, <code>configure</code> will by default pick the latest. You can request a specific version to be used by setting <code>--with-toolchain-version</code>, e.g. <code>--with-toolchain-version=2017</code>.</p>
 <p>If you have Visual Studio installed but <code>configure</code> fails to detect it, it may be because of <a href="#spaces-in-path">spaces in path</a>.</p>
 <h3 id="ibm-xl-cc">IBM XL C/C++</h3>
@@ -491,7 +488,7 @@
 <li><code>CONF</code> and <code>CONF_NAME</code> - Selecting the configuration(s) to use. See <a href="#using-multiple-configurations">Using Multiple Configurations</a></li>
 </ul>
 <h4 id="test-make-control-variables">Test Make Control Variables</h4>
-<p>These make control variables only make sense when running tests. Please see <strong>Testing the JDK</strong> (<a href="testing.html">html</a>, <a href="testing.md">markdown</a>) for details.</p>
+<p>These make control variables only make sense when running tests. Please see <a href="testing.html">Testing the JDK</a> for details.</p>
 <ul>
 <li><code>TEST</code></li>
 <li><code>TEST_JOBS</code></li>
@@ -509,7 +506,7 @@
 </ul>
 <h2 id="running-tests">Running Tests</h2>
 <p>Most of the JDK tests are using the <a href="http://openjdk.java.net/jtreg">JTReg</a> test framework. Make sure that your configuration knows where to find your installation of JTReg. If this is not picked up automatically, 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.</p>
-<p>The <a href="https://wiki.openjdk.java.net/display/Adoption">Adoption Group</a> provides recent builds of jtreg <a href="https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/">here</a>. Download the latest <code>.tar.gz</code> file, unpack it, and point <code>--with-jtreg</code> to the <code>jtreg</code> directory that you just unpacked.</p>
+<p>The <a href="https://wiki.openjdk.java.net/display/Adoption">Adoption Group</a> provides recent builds of jtreg <a href="https://ci.adoptopenjdk.net/view/Dependencies/job/jtreg/lastSuccessfulBuild/artifact">here</a>. Download the latest <code>.tar.gz</code> file, unpack it, and point <code>--with-jtreg</code> to the <code>jtreg</code> directory that you just unpacked.</p>
 <p>Building of Hotspot Gtest suite requires the source code of Google Test framework. The top directory, which contains both <code>googletest</code> and <code>googlemock</code> directories, should be specified via <code>--with-gtest</code>. The supported version of Google Test is 1.8.1, whose source code can be obtained:</p>
 <ul>
 <li>by downloading and unpacking the source bundle from <a href="https://github.com/google/googletest/releases/tag/release-1.8.1">here</a></li>
@@ -517,7 +514,7 @@
 </ul>
 <p>To execute the most basic tests (tier 1), use:</p>
 <pre><code>make run-test-tier1</code></pre>
-<p>For more details on how to run tests, please see <strong>Testing the JDK</strong> (<a href="testing.html">html</a>, <a href="testing.md">markdown</a>).</p>
+<p>For more details on how to run tests, please see the <a href="testing.html">Testing the JDK</a> document.</p>
 <h2 id="cross-compiling">Cross-compiling</h2>
 <p>Cross-compiling means using one platform (the <em>build</em> platform) to generate output that can ran on another platform (the <em>target</em> platform).</p>
 <p>The typical reason for cross-compiling is that the build is performed on a more powerful desktop computer, but the resulting binaries will be able to run on a different, typically low-performing system. Most of the complications that arise when building for embedded is due to this separation of <em>build</em> and <em>target</em> systems.</p>
@@ -570,8 +567,7 @@ x86_64-linux-gnu-to-ppc64le-linux-gnu</code></pre>
 <p>To be able to build, we need a &quot;Build JDK&quot;, which is a JDK built from the current sources (that is, the same as the end result of the entire build process), but able to run on the <em>build</em> system, and not the <em>target</em> system. (In contrast, the Boot JDK should be from an older release, e.g. JDK 8 when building JDK 9.)</p>
 <p>The build process will create a minimal Build JDK for you, as part of building. To speed up the build, you can use <code>--with-build-jdk</code> to <code>configure</code> to point to a pre-built Build JDK. Please note that the build result is unpredictable, and can possibly break in subtle ways, if the Build JDK does not <strong>exactly</strong> match the current sources.</p>
 <h3 id="specifying-the-target-platform">Specifying the Target Platform</h3>
-<p>You <em>must</em> specify the target platform when cross-compiling. Doing so will also automatically turn the build into a cross-compiling mode. The simplest way to do this is to use the <code>--openjdk-target</code> argument, e.g. <code>--openjdk-target=arm-linux-gnueabihf</code>. or <code>--openjdk-target=aarch64-oe-linux</code>. This will automatically set the <code>--host</code> and <code>--target</code> options for autoconf, which can otherwise be confusing. (In autoconf terminology, the &quot;target&quot; is known as &quot;host&quot;, and &quot;target&quot; is used for building a Canadian cross-compiler.)</p>
-<p>If <code>--build</code> has not been explicitly passed to configure, <code>--openjdk-target</code> will autodetect the build platform and internally set the flag automatically, otherwise the platform that was explicitly passed to <code>--build</code> will be used instead.</p>
+<p>You <em>must</em> specify the target platform when cross-compiling. Doing so will also automatically turn the build into a cross-compiling mode. The simplest way to do this is to use the <code>--openjdk-target</code> argument, e.g. <code>--openjdk-target=arm-linux-gnueabihf</code>. or <code>--openjdk-target=aarch64-oe-linux</code>. This will automatically set the <code>--build</code>, <code>--host</code> and <code>--target</code> options for autoconf, which can otherwise be confusing. (In autoconf terminology, the &quot;target&quot; is known as &quot;host&quot;, and &quot;target&quot; is used for building a Canadian cross-compiler.)</p>
 <h3 id="toolchain-considerations">Toolchain Considerations</h3>
 <p>You will need two copies of your toolchain, one which generates output that can run on the target system (the normal, or <em>target</em>, toolchain), and one that generates output that can run on the build system (the <em>build</em> toolchain). Note that cross-compiling is only supported for gcc at the time being. The gcc standard is to prefix cross-compiling toolchains with the target denominator. If you follow this standard, <code>configure</code> is likely to pick up the toolchain correctly.</p>
 <p>The <em>build</em> toolchain will be autodetected just the same way the normal <em>build</em>/<em>target</em> toolchain will be autodetected when not cross-compiling. If this is not what you want, or if the autodetection fails, you can specify a devkit containing the <em>build</em> toolchain using <code>--with-build-devkit</code> to <code>configure</code>, or by giving <code>BUILD_CC</code> and <code>BUILD_CXX</code> arguments.</p>
@@ -888,30 +884,6 @@ spawn failed</code></pre>
 <h3 id="getting-help">Getting Help</h3>
 <p>If none of the suggestions in this document helps you, or if you find what you believe is a bug in the build system, please contact the Build Group by sending a mail to <a href="mailto:build-dev@openjdk.java.net">build-dev@openjdk.java.net</a>. Please include the relevant parts of the configure and/or build log.</p>
 <p>If you need general help or advice about developing for the JDK, you can also contact the Adoption Group. See the section on <a href="#contributing-to-openjdk">Contributing to OpenJDK</a> for more information.</p>
-<h2 id="reproducible-builds">Reproducible Builds</h2>
-<p>Build reproducibility is the property of getting exactly the same bits out when building, every time, independent on who builds the product, or where. This is for many reasons a harder goal than it initially appears, but it is an important goal, for security reasons and others. Please see <a href="https://reproducible-builds.org">Reproducible Builds</a> for more information about the background and reasons for reproducible builds.</p>
-<p>Currently, it is not possible to build OpenJDK fully reproducibly, but getting there is an ongoing effort.</p>
-<p>An absolute prerequisite for building reproducible is to speficy a fixed build time, since time stamps are embedded in many file formats. This is done by setting the <code>SOURCE_DATE_EPOCH</code> environment variable, which is an <a href="https://reproducible-builds.org/docs/source-date-epoch/">industry standard</a>, that many tools, such as gcc, recognize, and use in place of the current time when generating output.</p>
-<p>To generate reproducible builds, you must set <code>SOURCE_DATE_EPOCH</code> before running <code>configure</code>. The value in <code>SOURCE_DATE_EPOCH</code> will be stored in the configuration, and used by <code>make</code>. Setting <code>SOURCE_DATE_EPOCH</code> before running <code>make</code> will have no effect on the build.</p>
-<p>You must also make sure your build does not rely on <code>configure</code>'s default adhoc version strings. Default adhoc version strings <code>OPT</code> segment include user name and source directory. You can either override just the <code>OPT</code> segment using <code>--with-version-opt=&lt;any fixed string&gt;</code>, or you can specify the entire version string using <code>--with-version-string=&lt;your version&gt;</code>.</p>
-<p>This is a typical example of how to build the JDK in a reproducible way:</p>
-<pre><code>export SOURCE_DATE_EPOCH=946684800
-bash configure --with-version-opt=adhoc
-make</code></pre>
-<p>Note that regardless if you specify a source date for <code>configure</code> or not, the JDK build system will set <code>SOURCE_DATE_EPOCH</code> for all build tools when building. If <code>--with-source-date</code> has the value <code>updated</code> (which is the default unless <code>SOURCE_DATE_EPOCH</code> is found by in the environment by <code>configure</code>), the source date value will be determined at build time.</p>
-<p>There are several aspects of reproducible builds that can be individually adjusted by <code>configure</code> arguments. If any of these are given, they will override the value derived from <code>SOURCE_DATE_EPOCH</code>. These arguments are:</p>
-<ul>
-<li><p><code>--with-source-date</code></p>
-<p>This option controls how the JDK build sets <code>SOURCE_DATE_EPOCH</code> when building. It can be set to a value describing a date, either an epoch based timestamp as an integer, or a valid ISO-8601 date.</p>
-<p>It can also be set to one of the special values <code>current</code>, <code>updated</code> or <code>version</code>. <code>current</code> means that the time of running <code>configure</code> will be used. <code>version</code> will use the nominal release date for the current JDK version. <code>updated</code>, which means that <code>SOURCE_DATE_EPOCH</code> will be set to the current time each time you are running <code>make</code>. All choices, except for <code>updated</code>, will set a fixed value for the source date timestamp.</p>
-<p>When <code>SOURCE_DATE_EPOCH</code> is set, the default value for <code>--with-source-date</code> will be the value given by <code>SOURCE_DATE_EPOCH</code>. Otherwise, the default value is <code>updated</code>.</p></li>
-<li><p><code>--with-hotspot-build-time</code></p>
-<p>This option controls the build time string that will be included in the hotspot library (<code>libjvm.so</code> or <code>jvm.dll</code>). When the source date is fixed (e.g. by setting <code>SOURCE_DATE_EPOCH</code>), the default value for <code>--with-hotspot-build-time</code> will be an ISO 8601 representation of that time stamp. Otherwise the default value will be the current time when building hotspot.</p></li>
-<li><p><code>--with-copyright-year</code></p>
-<p>This option controls the copyright year in some generated text files. When the source date is fixed (e.g. by setting <code>SOURCE_DATE_EPOCH</code>), the default value for <code>--with-copyright-year</code> will be the year of that time stamp. Otherwise the default is the current year at the time of running configure. This can be overridden by <code>--with-copyright-year=&lt;year&gt;</code>.</p></li>
-<li><p><code>--enable-reproducible-build</code></p>
-<p>This option controls some additional behavior needed to make the build reproducible. When the source date is fixed (e.g. by setting <code>SOURCE_DATE_EPOCH</code>), this flag will be turned on by default. Otherwise, the value is determined by heuristics. If it is explicitly turned off, the build might not be reproducible.</p></li>
-</ul>
 <h2 id="hints-and-suggestions-for-advanced-users">Hints and Suggestions for Advanced Users</h2>
 <h3 id="bash-completion">Bash Completion</h3>
 <p>The <code>configure</code> and <code>make</code> commands tries to play nice with bash command-line completion (using <code>&lt;tab&gt;</code> or <code>&lt;tab&gt;&lt;tab&gt;</code>). To use this functionality, make sure you enable completion in your <code>~/.bashrc</code> (see instructions for bash in your operating system).</p>

doc/building.md

@@ -135,14 +135,6 @@ space is required.
 If you do not have access to sufficiently powerful hardware, it is also
 possible to use [cross-compiling](#cross-compiling).
 
-#### Branch Protection
-
-In order to use Branch Protection features in the VM, `--enable-branch-protection`
-must be used. This option requires C++ compiler support (GCC 9.1.0+ or Clang
-10+). The resulting build can be run on both machines with and without support
-for branch protection in hardware. Branch Protection is only supported for
-Linux targets.
-
 ### Building on 32-bit arm
 
 This is not recommended. Instead, see the section on [Cross-compiling](
@@ -187,10 +179,10 @@ On Windows, it is important that you pay attention to the instructions in the
 
 Windows is the only non-POSIX OS supported by the JDK, and as such, requires
 some extra care. A POSIX support layer is required to build on Windows.
-Currently, the only supported such layers are Cygwin, Windows Subsystem for
-Linux (WSL), and MSYS2. (MSYS is no longer supported due to an outdated bash;
-While OpenJDK can be built with MSYS2, support for it is still experimental, so
-build failures and unusual errors are not uncommon.)
+Currently, the only supported such layers are Cygwin and Windows Subsystem for
+Linux (WSL). (Msys is no longer supported due to a too old bash; msys2 would
+likely be possible to support in a future version but that would require effort
+to implement.)
 
 Internally in the build system, all paths are represented as Unix-style paths,
 e.g. `/cygdrive/c/git/jdk/Makefile` rather than `C:\git\jdk\Makefile`. This
@@ -244,8 +236,8 @@ It's possible to build both Windows and Linux binaries from WSL. To build
 Windows binaries, you must use a Windows boot JDK (located in a
 Windows-accessible directory). To build Linux binaries, you must use a Linux
 boot JDK. The default behavior is to build for Windows. To build for Linux, pass
-`--build=x86_64-unknown-linux-gnu --openjdk-target=x86_64-unknown-linux-gnu`
-to `configure`.
+`--build=x86_64-unknown-linux-gnu --host=x86_64-unknown-linux-gnu` to
+`configure`.
 
 If building Windows binaries, the source code must be located in a Windows-
 accessible directory. This is because Windows executables (such as Visual Studio
@@ -329,9 +321,9 @@ issues.
 
  Operating system   Toolchain version
  ------------------ -------------------------------------------------------
- Linux              gcc 11.2.0
+ Linux              gcc 10.2.0
  macOS              Apple Xcode 10.1 (using clang 10.0.0)
- Windows            Microsoft Visual Studio 2022 update 17.1.0
+ Windows            Microsoft Visual Studio 2019 update 16.7.2
 
 All compilers are expected to be able to compile to the C99 language standard,
 as some C99 features are used in the source code. Microsoft Visual Studio
@@ -343,7 +335,7 @@ features that it does support.
 The minimum accepted version of gcc is 5.0. Older versions will generate a warning
 by `configure` and are unlikely to work.
 
-The JDK is currently known to be able to compile with at least version 11.2 of
+The JDK is currently known to be able to compile with at least version 10.2 of
 gcc.
 
 In general, any version between these two should be usable.
@@ -382,10 +374,9 @@ available for this update.
 
 ### Microsoft Visual Studio
 
-For aarch64 machines running Windows the minimum accepted version is Visual Studio 2019
-(16.8 or higher). For all other platforms the minimum accepted version of
-Visual Studio is 2017. Older versions will not be accepted by `configure` and will
-not work. For all platforms the maximum accepted version of Visual Studio is 2022.
+The minimum accepted version of Visual Studio is 2017. Older versions will not
+be accepted by `configure` and will not work. The maximum accepted
+version of Visual Studio is 2019.
 
 If you have multiple versions of Visual Studio installed, `configure` will by
 default pick the latest. You can request a specific version to be used by
@@ -827,7 +818,7 @@ configuration, as opposed to the "configure time" configuration.
 #### Test Make Control Variables
 
 These make control variables only make sense when running tests. Please see
-**Testing the JDK** ([html](testing.html), [markdown](testing.md)) for details.
+[Testing the JDK](testing.html) for details.
 
   * `TEST`
   * `TEST_JOBS`
@@ -857,7 +848,7 @@ containing `lib/jtreg.jar` etc.
 
 The [Adoption Group](https://wiki.openjdk.java.net/display/Adoption) provides
 recent builds of jtreg [here](
-https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/).
+https://ci.adoptopenjdk.net/view/Dependencies/job/jtreg/lastSuccessfulBuild/artifact).
 Download the latest `.tar.gz` file, unpack it, and point `--with-jtreg` to the
 `jtreg` directory that you just unpacked.
 
@@ -874,8 +865,8 @@ To execute the most basic tests (tier 1), use:
 make run-test-tier1
 ```
 
-For more details on how to run tests, please see **Testing the JDK**
-([html](testing.html), [markdown](testing.md)).
+For more details on how to run tests, please see the [Testing
+the JDK](testing.html) document.
 
 ## Cross-compiling
 
@@ -986,16 +977,11 @@ You *must* specify the target platform when cross-compiling. Doing so will also
 automatically turn the build into a cross-compiling mode. The simplest way to
 do this is to use the `--openjdk-target` argument, e.g.
 `--openjdk-target=arm-linux-gnueabihf`. or `--openjdk-target=aarch64-oe-linux`.
-This will automatically set the `--host` and `--target` options for
+This will automatically set the `--build`, `--host` and `--target` options for
 autoconf, which can otherwise be confusing. (In autoconf terminology, the
 "target" is known as "host", and "target" is used for building a Canadian
 cross-compiler.)
 
-If `--build` has not been explicitly passed to configure, `--openjdk-target`
-will autodetect the build platform and internally set the flag automatically,
-otherwise the platform that was explicitly passed to `--build` will be used
-instead.
-
 ### Toolchain Considerations
 
 You will need two copies of your toolchain, one which generates output that can
@@ -1517,96 +1503,6 @@ If you need general help or advice about developing for the JDK, you can also
 contact the Adoption Group. See the section on [Contributing to OpenJDK](
 #contributing-to-openjdk) for more information.
 
-## Reproducible Builds
-
-Build reproducibility is the property of getting exactly the same bits out when
-building, every time, independent on who builds the product, or where. This is
-for many reasons a harder goal than it initially appears, but it is an important
-goal, for security reasons and others. Please see [Reproducible Builds](
-https://reproducible-builds.org) for more information about the background and
-reasons for reproducible builds.
-
-Currently, it is not possible to build OpenJDK fully reproducibly, but getting
-there is an ongoing effort.
-
-An absolute prerequisite for building reproducible is to speficy a fixed build
-time, since time stamps are embedded in many file formats. This is done by
-setting the `SOURCE_DATE_EPOCH` environment variable, which is an [industry
-standard]( https://reproducible-builds.org/docs/source-date-epoch/), that many
-tools, such as gcc, recognize, and use in place of the current time when
-generating output.
-
-To generate reproducible builds, you must set `SOURCE_DATE_EPOCH` before running
-`configure`. The value in `SOURCE_DATE_EPOCH` will be stored in the
-configuration, and used by `make`. Setting `SOURCE_DATE_EPOCH` before running
-`make` will have no effect on the build.
-
-You must also make sure your build does not rely on `configure`'s default adhoc
-version strings. Default adhoc version strings `OPT` segment include user name
-and source directory. You can either override just the `OPT` segment using
-`--with-version-opt=<any fixed string>`, or you can specify the entire version
-string using `--with-version-string=<your version>`.
-
-This is a typical example of how to build the JDK in a reproducible way:
-
-```
-export SOURCE_DATE_EPOCH=946684800
-bash configure --with-version-opt=adhoc
-make
-```
-
-Note that regardless if you specify a source date for `configure` or not, the
-JDK build system will set `SOURCE_DATE_EPOCH` for all build tools when building.
-If `--with-source-date` has the value `updated` (which is the default unless
-`SOURCE_DATE_EPOCH` is found by in the environment by `configure`), the source
-date value will be determined at build time.
-
-There are several aspects of reproducible builds that can be individually
-adjusted by `configure` arguments. If any of these are given, they will override
-the value derived from `SOURCE_DATE_EPOCH`. These arguments are:
-
- * `--with-source-date`
-
-    This option controls how the JDK build sets `SOURCE_DATE_EPOCH` when
-    building. It can be set to a value describing a date, either an epoch based
-    timestamp as an integer, or a valid ISO-8601 date.
-
-    It can also be set to one of the special values `current`, `updated` or
-    `version`. `current` means that the time of running `configure` will be
-    used. `version` will use the nominal release date for the current JDK
-    version. `updated`, which means that `SOURCE_DATE_EPOCH` will be set to the
-    current time each time you are running `make`. All choices, except for
-    `updated`, will set a fixed value for the source date timestamp.
-
-    When `SOURCE_DATE_EPOCH` is set, the default value for `--with-source-date`
-    will be the value given by `SOURCE_DATE_EPOCH`. Otherwise, the default value
-    is `updated`.
-
- * `--with-hotspot-build-time`
-
-    This option controls the build time string that will be included in the
-    hotspot library (`libjvm.so` or `jvm.dll`). When the source date is fixed
-    (e.g. by setting `SOURCE_DATE_EPOCH`), the default value for
-    `--with-hotspot-build-time` will be an ISO 8601 representation of that time
-    stamp. Otherwise the default value will be the current time when building
-    hotspot.
-
- * `--with-copyright-year`
-
-    This option controls the copyright year in some generated text files. When
-    the source date is fixed (e.g. by setting `SOURCE_DATE_EPOCH`), the default
-    value for `--with-copyright-year` will be the year of that time stamp.
-    Otherwise the default is the current year at the time of running configure.
-    This can be overridden by `--with-copyright-year=<year>`.
-
- * `--enable-reproducible-build`
-
-    This option controls some additional behavior needed to make the build
-    reproducible. When the source date is fixed (e.g. by setting
-    `SOURCE_DATE_EPOCH`), this flag will be turned on by default. Otherwise, the
-    value is determined by heuristics. If it is explicitly turned off, the build
-    might not be reproducible.
-
 ## Hints and Suggestions for Advanced Users
 
 ### Bash Completion

doc/hotspot-style.html

@@ -50,8 +50,6 @@
 <li><a href="#nullptr">nullptr</a></li>
 <li><a href="#atomic">&lt;atomic&gt;</a></li>
 <li><a href="#uniform-initialization">Uniform Initialization</a></li>
-<li><a href="#local-function-objects">Local Function Objects</a></li>
-<li><a href="#inheriting-constructors">Inheriting constructors</a></li>
 <li><a href="#additional-permitted-features">Additional Permitted Features</a></li>
 <li><a href="#excluded-features">Excluded Features</a></li>
 <li><a href="#undecided-features">Undecided Features</a></li>
@@ -68,9 +66,7 @@
 <h3 id="counterexamples-and-updates">Counterexamples and Updates</h3>
 <p>Many of the guidelines mentioned here have (sometimes widespread) counterexamples in the HotSpot code base. Finding a counterexample is not sufficient justification for new code to follow the counterexample as a precedent, since readers of your code will rightfully expect your code to follow the greater bulk of precedents documented here.</p>
 <p>Occasionally a guideline mentioned here may be just out of synch with the actual HotSpot code base. If you find that a guideline is consistently contradicted by a large number of counterexamples, please bring it up for discussion and possible change. The architectural rule, of course, is &quot;When in Rome do as the Romans&quot;. Sometimes in the suburbs of Rome the rules are a little different; these differences can be pointed out here.</p>
-<p>Proposed changes should be discussed on the <a href="mailto:hotspot-dev@openjdk.java.net">HotSpot Developers</a> mailing list. Changes are likely to be cautious and incremental, since HotSpot coders have been using these guidelines for years.</p>
-<p>Substantive changes are approved by <a href="https://www.rfc-editor.org/rfc/rfc7282.html">rough consensus</a> of the <a href="https://openjdk.java.net/census#hotspot">HotSpot Group</a> Members. The Group Lead determines whether consensus has been reached.</p>
-<p>Editorial changes (changes that only affect the description of HotSpot style, not its substance) do not require the full consensus gathering process. The normal HotSpot pull request process may be used for editorial changes, with the additional requirement that the requisite reviewers are also HotSpot Group Members.</p>
+<p>Proposed changes should be discussed on the <a href="mailto:hotspot-dev@openjdk.java.net">HotSpot Developers</a> mailing list, and approved by <a href="https://en.wikipedia.org/wiki/Rough_consensus">rough consensus</a> of the <a href="https://openjdk.java.net/census#hotspot">HotSpot Group</a> Members. The Group Lead determines whether consensus has been reached. Changes are likely to be cautious and incremental, since HotSpot coders have been using these guidelines for years.</p>
 <h2 id="structure-and-formatting">Structure and Formatting</h2>
 <h3 id="factoring-and-class-design">Factoring and Class Design</h3>
 <ul>
@@ -154,7 +150,7 @@
 <h3 id="whitespace">Whitespace</h3>
 <ul>
 <li><p>In general, don't change whitespace unless it improves readability or consistency. Gratuitous whitespace changes will make integrations and backports more difficult.</p></li>
-<li><p>Use <a href="https://en.wikipedia.org/wiki/Indentation_style#Variant:_1TBS_(OTBS)">One-True-Brace-Style</a>. The opening brace for a function or class is normally at the end of the line; it is sometimes moved to the beginning of the next line for emphasis. Substatements are enclosed in braces, even if there is only a single statement. Extremely simple one-line statements may drop braces around a substatement.</p></li>
+<li><p>Use One-True-Brace-Style. The opening brace for a function or class is normally at the end of the line; it is sometimes moved to the beginning of the next line for emphasis. Substatements are enclosed in braces, even if there is only a single statement. Extremely simple one-line statements may drop braces around a substatement.</p></li>
 <li><p>Indentation levels are two columns.</p></li>
 <li><p>There is no hard line length limit. That said, bear in mind that excessively long lines can cause difficulties. Some people like to have multiple side-by-side windows in their editors, and long lines may force them to choose among unpleasant options. They can use wide windows, reducing the number that can fit across the screen, and wasting a lot of screen real estate because most lines are not that long. Alternatively, they can have more windows across the screen, with long lines wrapping (or worse, requiring scrolling to see in their entirety), which is harder to read. Similar issues exist for side-by-side code reviews.</p></li>
 <li><p>Tabs are not allowed in code. Set your editor accordingly.<br> (Emacs: <code>(setq-default indent-tabs-mode nil)</code>.)</p></li>
@@ -198,7 +194,7 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <p>Similar discussions for some other projects:</p>
 <ul>
 <li><p><a href="https://google.github.io/styleguide/cppguide.html">Google C++ Style Guide</a> — Currently (2020) targeting C++17.</p></li>
-<li><p><a href="https://chromium.googlesource.com/chromium/src/+/main/styleguide/c++/c++-features.md">C++11 and C++14 use in Chromium</a> — Categorizes features as allowed, banned, or to be discussed.</p></li>
+<li><p><a href="https://chromium-cpp.appspot.com">C++11 and C++14 use in Chromium</a> — Categorizes features as allowed, banned, or to be discussed.</p></li>
 <li><p><a href="https://llvm.org/docs/CodingStandards.html">llvm Coding Standards</a> — Currently (2020) targeting C++14.</p></li>
 <li><p><a href="https://firefox-source-docs.mozilla.org/code-quality/coding-style/using_cxx_in_firefox_code.html">Using C++ in Mozilla code</a> — C++17 support is required for recent versions (2020).</p></li>
 </ul>
@@ -211,7 +207,7 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <p>Rationale: Other than to implement exceptions (which HotSpot doesn't use), most potential uses of <a href="https://en.wikipedia.org/wiki/Run-time_type_information" title="Runtime Type Information">RTTI</a> are better done via virtual functions. Some of the remainder can be replaced by bespoke mechanisms. The cost of the additional runtime data structures needed to support <a href="https://en.wikipedia.org/wiki/Run-time_type_information" title="Runtime Type Information">RTTI</a> are deemed not worthwhile, given the alternatives.</p>
 <h3 id="memory-allocation">Memory Allocation</h3>
 <p>Do not use the standard global allocation and deallocation functions (operator new and related functions). Use of these functions by HotSpot code is disabled for some platforms.</p>
-<p>Rationale: HotSpot often uses &quot;resource&quot; or &quot;arena&quot; allocation. Even where heap allocation is used, the standard global functions are avoided in favor of wrappers around malloc and free that support the VM's Native Memory Tracking (NMT) feature. Typically, uses of the global operator new are inadvertent and therefore often associated with memory leaks.</p>
+<p>Rationale: HotSpot often uses &quot;resource&quot; or &quot;arena&quot; allocation. Even where heap allocation is used, the standard global functions are avoided in favor of wrappers around malloc and free that support the VM's Native Memory Tracking (NMT) feature.</p>
 <p>Native memory allocation failures are often treated as non-recoverable. The place where &quot;out of memory&quot; is (first) detected may be an innocent bystander, unrelated to the actual culprit.</p>
 <h3 id="class-inheritance">Class Inheritance</h3>
 <p>Use public single inheritance.</p>
@@ -258,7 +254,8 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <li><p>Function argument deduction. This is always permitted, and indeed encouraged. It is nearly always better to allow the type of a function template argument to be deduced rather than explicitly specified.</p></li>
 <li><p><code>auto</code> variable declarations (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n1984.pdf">n1984</a>)<br> For local variables, this can be used to make the code clearer by eliminating type information that is obvious or irrelevant. Excessive use can make code much harder to understand.</p></li>
 <li><p>Function return type deduction (<a href="https://isocpp.org/files/papers/N3638.html">n3638</a>)<br> Only use if the function body has a very small number of <code>return</code> statements, and generally relatively little other code.</p></li>
-<li><p>Also see <a href="#lambdaexpressions">lambda expressions</a>.</p></li>
+<li><p>Generic lambdas. Lambdas are not (yet) permitted.</p></li>
+<li><p>Lambda init captures. Lambdas are not (yet) permitted.</p></li>
 </ul>
 <h3 id="expression-sfinae">Expression SFINAE</h3>
 <p><a href="https://en.cppreference.com/w/cpp/language/sfinae" title="Substitution Failure Is Not An Error">Substitution Failure Is Not An Error</a> (SFINAE) is a template metaprogramming technique that makes use of template parameter substitution failures to make compile-time decisions.</p>
@@ -271,8 +268,8 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <p>The underlying type of a <em>scoped-enum</em> should also be specified explicitly if conversions may be applied to values of that type.</p>
 <p>Due to bugs in certain (very old) compilers, there is widespread use of enums and avoidance of in-class initialization of static integral constant members. Compilers having such bugs are no longer supported. Except where an enum is semantically appropriate, new code should use integral constants.</p>
 <h3 id="thread_local">thread_local</h3>
-<p>Avoid use of <code>thread_local</code> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2659.htm">n2659</a>); and instead, use the HotSpot macro <code>THREAD_LOCAL</code>, for which the initializer must be a constant expression. When <code>thread_local</code> must be used, use the Hotspot macro <code>APPROVED_CPP_THREAD_LOCAL</code> to indicate that the use has been given appropriate consideration.</p>
-<p>As was discussed in the review for <a href="https://mail.openjdk.java.net/pipermail/hotspot-dev/2019-September/039487.html">JDK-8230877</a>, <code>thread_local</code> allows dynamic initialization and destruction semantics. However, that support requires a run-time penalty for references to non-function-local <code>thread_local</code> variables defined in a different translation unit, even if they don't need dynamic initialization. Dynamic initialization and destruction of non-local <code>thread_local</code> variables also has the same ordering problems as for ordinary non-local variables. So we avoid use of <code>thread_local</code> in general, limiting its use to only those cases where dynamic initialization or destruction are essential. See <a href="https://bugs.openjdk.java.net/browse/JDK-8282469">JDK-8282469</a> for further discussion.</p>
+<p>Do not use <code>thread_local</code> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2659.htm">n2659</a>); instead, use the HotSpot macro <code>THREAD_LOCAL</code>. The initializer must be a constant expression.</p>
+<p>As was discussed in the review for <a href="https://mail.openjdk.java.net/pipermail/hotspot-dev/2019-September/039487.html">JDK-8230877</a>, <code>thread_local</code> allows dynamic initialization and destruction semantics. However, that support requires a run-time penalty for references to non-function-local <code>thread_local</code> variables defined in a different translation unit, even if they don't need dynamic initialization. Dynamic initialization and destruction of namespace-scoped thread local variables also has the same ordering problems as for ordinary namespace-scoped variables.</p>
 <h3 id="nullptr">nullptr</h3>
 <p>Prefer <code>nullptr</code> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2431.pdf">n2431</a>) to <code>NULL</code>. Don't use (constexpr or literal) 0 for pointers.</p>
 <p>For historical reasons there are widespread uses of both <code>NULL</code> and of integer 0 as a pointer value.</p>
@@ -291,125 +288,6 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <li><a href="https://en.cppreference.com/w/cpp/language/aggregate_initialization">aggregate initialization</a></li>
 </ul>
 <p>Although related, the use of <code>std::initializer_list</code> remains forbidden, as part of the avoidance of the C++ Standard Library in HotSpot code.</p>
-<h3 id="local-function-objects">Local Function Objects</h3>
-<ul>
-<li>Local function objects, including lambda expressions, may be used.</li>
-<li>Lambda expressions must only be used as a downward value.</li>
-<li>Prefer <code>[&amp;]</code> as the capture list of a lambda expression.</li>
-<li>Return type deduction for lambda expressions is permitted, and indeed encouraged.</li>
-<li>An empty parameter list for a lambda expression may be elided.</li>
-<li>A lambda expression must not be <code>mutable</code>.</li>
-<li>Generic lambda expressions are permitted.</li>
-<li>Lambda expressions should be relatively simple.</li>
-<li>Anonymous lambda expressions should not overly clutter the enclosing expression.</li>
-<li>An anonymous lambda expression must not be directly invoked.</li>
-<li>Bind expressions are forbidden.</li>
-</ul>
-<p>Single-use function objects can be defined locally within a function, directly at the point of use. This is an alternative to having a function or function object class defined at class or namespace scope.</p>
-<p>This usage was somewhat limited by C++03, which does not permit such a class to be used as a template parameter. That restriction was removed by C++11 (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm">n2657</a>). Use of this feature is permitted.</p>
-<p>Many HotSpot protocols involve &quot;function-like&quot; objects that involve some named member function rather than a call operator. For example, a function that performs some action on all threads might be written as</p>
-<pre><code>void do_something() {
-  struct DoSomething : public ThreadClosure {
-    virtual void do_thread(Thread* t) {
-      ... do something with t ...
-    }
-  } closure;
-  Threads::threads_do(&amp;closure);
-}</code></pre>
-<p>HotSpot code has historically usually placed the DoSomething class at namespace (or sometimes class) scope. This separates the function's code from its use, often to the detriment of readability. It requires giving the class a globally unique name (if at namespace scope). It also loses the information that the class is intended for use in exactly one place, and does not have any subclasses. (However, the latter can now be indicated by declaring it <code>final</code>.) Often, for simplicity, a local class will skip things like access control and accessor functions, giving the enclosing function direct access to the implementation and eliminating some boilerplate that might be provided if the class is in some outer (more accessible) scope. On the other hand, if there is a lot of surrounding code in the function body or the local class is of significant size, defining it locally can increase clutter and reduce readability.</p>
-<p><a name="lambdaexpressions"></a> C++11 added <em>lambda expressions</em> as a new way to write a function object. Simple lambda expressions can be significantly more concise than a function object, eliminating a lot of boiler-plate. On the other hand, a complex lambda expression may not provide much, if any, readability benefit compared to an ordinary function object. Also, while a lambda can encapsulate a call to a &quot;function-like&quot; object, it cannot be used in place of such.</p>
-<p>A common use for local functions is as one-use <a href="https://en.cppreference.com/w/cpp/language/raii" title="Resource Acquisition Is Initialization">RAII</a> objects. The amount of boilerplate for a function object class (local or not) makes such usage somewhat clumsy and verbose. But with the help of a small amount of supporting utility code, lambdas work particularly well for this use case.</p>
-<p>Another use for local functions is <a href="https://en.wikipedia.org/wiki/Partial_application" title="Partial Application">partial application</a>. Again here, lambdas are typically much simpler and less verbose than function object classes.</p>
-<p>Because of these benefits, lambda expressions are permitted in HotSpot code, with some restrictions and usage guidance. An anonymous lambda is one which is passed directly as an argument. A named lambda is the value of a variable, which is its name.</p>
-<p>Lambda expressions should only be passed downward. In particular, a lambda should not be returned from a function or stored in a global variable, whether directly or as the value of a member of some other object. Lambda capture is syntactically subtle (by design), and propagating a lambda in such ways can easily pass references to captured values to places where they are no longer valid. In particular, members of the enclosing <code>this</code> object are effectively captured by reference, even if the default capture is by-value. For such uses-cases a function object class should be used to make the desired value capturing and propagation explicit.</p>
-<p>Limiting the capture list to <code>[&amp;]</code> (implicitly capture by reference) is a simplifying restriction that still provides good support for HotSpot usage, while reducing the cases a reader must recognize and understand.</p>
-<ul>
-<li><p>Many common lambda uses require reference capture. Not permitting it would substantially reduce the utility of lambdas.</p></li>
-<li><p>Referential transparency. Implicit reference capture makes variable references in the lambda body have the same meaning they would have in the enclosing code. There isn't a semantic barrier across which the meaning of a variable changes.</p></li>
-<li><p>Explicit reference capture introduces significant clutter, especially when lambda expressions are relatively small and simple, as they should be in HotSpot code.</p></li>
-<li><p>There are a number of reasons why by-value capture might be used, but for the most part they don't apply to HotSpot code, given other usage restrictions.</p>
-<ul>
-<li><p>A primary use-case for by-value capture is to support escaping uses, where values captured by-reference might become invalid. That use-case doesn't apply if only downward lambdas are used.</p></li>
-<li><p>By-value capture can also make a lambda-local copy for mutation, which requires making the lambda <code>mutable</code>; see below.</p></li>
-<li><p>By-value capture might be viewed as an optimization, avoiding any overhead for reference capture of cheap to copy values. But the compiler can often eliminate any such overhead.</p></li>
-<li><p>By-value capture by a non-<code>mutable</code> lambda makes the captured values const, preventing any modification by the lambda and making the captured value unaffected by modifications to the outer variable. But this only applies to captured auto variables, not member variables, and is inconsistent with referential transparency.</p></li>
-</ul></li>
-<li><p>Non-capturing lambdas (with an empty capture list - <code>[]</code>) have limited utility. There are cases where no captures are required (pure functions, for example), but if the function is small and simple then that's obvious anyway.</p></li>
-<li><p>Capture initializers (a C++14 feature - <a href="https://isocpp.org/files/papers/N3649.html">N3649</a>) are not permitted. Capture initializers inherently increase the complexity of the capture list, and provide little benefit over an additional in-scope local variable.</p></li>
-</ul>
-<p>The use of <code>mutable</code> lambda expressions is forbidden because there don't seem to be many, if any, good use-cases for them in HotSpot. A lambda expression needs to be mutable in order to modify a by-value captured value. But with only downward lambdas, such usage seems likely to be rare and complicated. It is better to use a function object class in any such cases that arise, rather than requiring all HotSpot developers to understand this relatively obscure feature.</p>
-<p>While it is possible to directly invoke an anonymous lambda expression, that feature should not be used, as such a form can be confusing to readers. Instead, name the lambda and call it by name.</p>
-<p>Some reasons to prefer a named lambda instead of an anonymous lambda are</p>
-<ul>
-<li><p>The body contains non-trivial control flow or declarations or other nested constructs.</p></li>
-<li><p>Its role in an argument list is hard to guess without examining the function declaration. Give it a name that indicates its purpose.</p></li>
-<li><p>It has an unusual capture list.</p></li>
-<li><p>It has a complex explicit return type or parameter types.</p></li>
-</ul>
-<p>Lambda expressions, and particularly anonymous lambda expressions, should be simple and compact. One-liners are good. Anonymous lambdas should usually be limited to a couple lines of body code. More complex lambdas should be named. A named lambda should not clutter the enclosing function and make it long and complex; do continue to break up large functions via the use of separate helper functions.</p>
-<p>An anonymous lambda expression should either be a one-liner in a one-line expression, or isolated in its own set of lines. Don't place part of a lambda expression on the same line as other arguments to a function. The body of a multi-line lambda argument should be indented from the start of the capture list, as if that were the start of an ordinary function definition. The body of a multi-line named lambda should be indented one step from the variable's indentation.</p>
-<p>Some examples:</p>
-<ol type="1">
-<li><code>foo([&amp;] { ++counter; });</code></li>
-<li><code>foo(x, [&amp;] { ++counter; });</code></li>
-<li><code>foo([&amp;] { if (predicate) ++counter; });</code></li>
-<li><code>foo([&amp;] { auto tmp = process(x); tmp.f(); return tmp.g(); })</code></li>
-<li><p>Separate one-line lambda from other arguments:</p>
-<pre><code>foo(c.begin(), c.end(),
-    [&amp;] (const X&amp; x) { do_something(x); return x.value(); });</code></pre></li>
-<li><p>Indentation for multi-line lambda:</p>
-<pre><code>c.do_entries([&amp;] (const X&amp; x) {
-               do_something(x, a);
-               do_something1(x, b);
-               do_something2(x, c);
-             });</code></pre></li>
-<li><p>Separate multi-line lambda from other arguments:</p>
-<pre><code>foo(c.begin(), c.end(),
-    [&amp;] (const X&amp; x) {
-      do_something(x, a);
-      do_something1(x, b);
-      do_something2(x, c);
-    });</code></pre></li>
-<li><p>Multi-line named lambda:</p>
-<pre><code>auto do_entry = [&amp;] (const X&amp; x) {
-  do_something(x, a);
-  do_something1(x, b);
-  do_something2(x, c);
-};</code></pre></li>
-</ol>
-<p>Item 4, and especially items 6 and 7, are pushing the simplicity limits for anonymous lambdas. Item 6 might be better written using a named lambda:</p>
-<pre><code>c.do_entries(do_entry);</code></pre>
-<p>Note that C++11 also added <em>bind expressions</em> as a way to write a function object for partial application, using <code>std::bind</code> and related facilities from the Standard Library. <code>std::bind</code> generalizes and replaces some of the binders from C++03. Bind expressions are not permitted in HotSpot code. They don't provide enough benefit over lambdas or local function classes in the cases where bind expressions are applicable to warrant the introduction of yet another mechanism in this space into HotSpot code.</p>
-<p>References:</p>
-<ul>
-<li>Local and unnamed types as template parameters (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm">n2657</a>)</li>
-<li>New wording for C++0x lambdas (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2009/n2927.pdf">n2927</a>)</li>
-<li>Generalized lambda capture (init-capture) (<a href="https://isocpp.org/files/papers/N3648.html">N3648</a>)</li>
-<li>Generic (polymorphic) lambda expressions (<a href="https://isocpp.org/files/papers/N3649.html">N3649</a>)</li>
-</ul>
-<p>References from C++17</p>
-<ul>
-<li>Wording for constexpr lambda (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0170r1.pdf">p0170r1</a>)</li>
-<li>Lambda capture of *this by Value (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0018r3.html">p0018r3</a>)</li>
-</ul>
-<p>References from C++20</p>
-<ul>
-<li>Allow lambda capture [=, this] (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0409r2.html">p0409r2</a>)</li>
-<li>Familiar template syntax for generic lambdas (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0428r2.pdf">p0428r2</a>)</li>
-<li>Simplifying implicit lambda capture (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0588r1.html">p0588r1</a>)</li>
-<li>Default constructible and assignable stateless lambdas (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0624r2.pdf">p0624r2</a>)</li>
-<li>Lambdas in unevaluated contexts (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0315r4.pdf">p0315r4</a>)</li>
-<li>Allow pack expansion in lambda init-capture (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0780r2.html">p0780r2</a>) (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p2095r0.html">p2095r0</a>)</li>
-<li>Deprecate implicit capture of this via [=] (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0806r2.html">p0806r2</a>)</li>
-</ul>
-<p>References from C++23</p>
-<ul>
-<li>Make () more optional for lambdas (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p1102r2.html">p1102r2</a>)</li>
-</ul>
-<h3 id="inheriting-constructors">Inheriting constructors</h3>
-<p>Do not use <em>inheriting constructors</em> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2540.htm">n2540</a>).</p>
-<p>C++11 provides simple syntax allowing a class to inherit the constructors of a base class. Unfortunately there are a number of problems with the original specification, and C++17 contains significant revisions (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0136r1.html" title="p0136r1">p0136r1</a> opens with a list of 8 Core Issues). Since HotSpot doesn't support use of C++17, use of inherited constructors could run into those problems. Such uses might also change behavior in a future HotSpot update to use C++17 or later, potentially in subtle ways that could lead to hard to diagnose problems. Because of this, HotSpot code must not use inherited constructors.</p>
-<p>Note that gcc7 provides the <code>-fnew-inheriting-ctors</code> option to use the <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0136r1.html" title="p0136r1">p0136r1</a> semantics. This is enabled by default when using C++17 or later. It is also enabled by default for <code>fabi-version=11</code> (introduced by gcc7) or higher when using C++11/14, as the change is considered a Defect Report that applies to those versions. Earlier versions of gcc don't have that option, and other supported compilers may not have anything similar.</p>
 <h3 id="additional-permitted-features">Additional Permitted Features</h3>
 <ul>
 <li><p><code>constexpr</code> (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2235.pdf">n2235</a>) (<a href="https://isocpp.org/files/papers/N3652.html">n3652</a>)</p></li>
@@ -427,8 +305,8 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <li><p>Dynamic initialization and destruction with concurrency (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2660.htm">n2660</a>)</p></li>
 <li><p><code>final</code> virtual specifiers for classes and virtual functions (<a href="http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2928.htm">n2928</a>), (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3206.htm">n3206</a>), (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3272.htm">n3272</a>)</p></li>
 <li><p><code>override</code> virtual specifiers for virtual functions (<a href="http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2928.htm">n2928</a>), (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3206.htm">n3206</a>), (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3272.htm">n3272</a>)</p></li>
+<li><p>Local and unnamed types as template parameters (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm">n2657</a>)</p></li>
 <li><p>Range-based <code>for</code> loops (<a href="http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2930.html">n2930</a>) (<a href="https://en.cppreference.com/w/cpp/language/range-for">range-for</a>)</p></li>
-<li><p>Unrestricted Unions (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2544.pdf">n2544</a>)</p></li>
 </ul>
 <h3 id="excluded-features">Excluded Features</h3>
 <ul>
@@ -444,7 +322,7 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <li><p>Inline namespaces (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2535.htm">n2535</a>) — HotSpot makes very limited use of namespaces.</p></li>
 <li><p><code>using namespace</code> directives. In particular, don't use <code>using namespace std;</code> to avoid needing to qualify Standard Library names.</p></li>
 <li><p>Propagating exceptions (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2179.html">n2179</a>) — HotSpot does not permit the use of exceptions, so this feature isn't useful.</p></li>
-<li><p>Avoid non-local variables with non-constexpr initialization. In particular, avoid variables with types requiring non-trivial initialization or destruction. Initialization order problems can be difficult to deal with and lead to surprises, as can destruction ordering. HotSpot doesn't generally try to cleanup on exit, and running destructors at exit can also lead to problems.</p></li>
+<li><p>Avoid namespace-scoped variables with non-constexpr initialization. In particular, avoid variables with types requiring non-trivial initialization or destruction. Initialization order problems can be difficult to deal with and lead to surprises, as can destruction ordering. HotSpot doesn't generally try to cleanup on exit, and running destructors at exit can also lead to problems.</p></li>
 <li><p><code>[[deprecated]]</code> attribute (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3760.html">n3760</a>) — Not relevant in HotSpot code.</p></li>
 <li><p>Avoid most operator overloading, preferring named functions. When operator overloading is used, ensure the semantics conform to the normal expected behavior of the operation.</p></li>
 <li><p>Avoid most implicit conversion constructors and (implicit or explicit) conversion operators. (Note that conversion to <code>bool</code> isn't needed in HotSpot code because of the &quot;no implicit boolean&quot; guideline.)</p></li>
@@ -459,6 +337,7 @@ while ( test_foo(args...) ) { // No, excess spaces around control</code></pre></
 <li><p>Member initializers and aggregates (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3653.html">n3653</a>)</p></li>
 <li><p><code>[[noreturn]]</code> attribute (<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2761.pdf">n2761</a>)</p></li>
 <li><p>Rvalue references and move semantics</p></li>
+<li><p>Lambdas</p></li>
 </ul>
 </body>
 </html>

doc/hotspot-style.md

@@ -56,19 +56,12 @@ can be pointed out here.
 
 Proposed changes should be discussed on the
 [HotSpot Developers](mailto:hotspot-dev@openjdk.java.net) mailing
-list.  Changes are likely to be cautious and incremental, since HotSpot
-coders have been using these guidelines for years.
-
-Substantive changes are approved by
-[rough consensus](https://www.rfc-editor.org/rfc/rfc7282.html) of
+list, and approved by
+[rough consensus](https://en.wikipedia.org/wiki/Rough_consensus) of
 the [HotSpot Group](https://openjdk.java.net/census#hotspot) Members.
 The Group Lead determines whether consensus has been reached.
-
-Editorial changes (changes that only affect the description of HotSpot
-style, not its substance) do not require the full consensus gathering
-process.  The normal HotSpot pull request process may be used for
-editorial changes, with the additional requirement that the requisite
-reviewers are also HotSpot Group Members.
+Changes are likely to be cautious and incremental, since HotSpot
+coders have been using these guidelines for years.
 
 ## Structure and Formatting
 
@@ -294,9 +287,7 @@ well.
 or consistency.  Gratuitous whitespace changes will make integrations
 and backports more difficult.
 
-* Use [One-True-Brace-Style](
-https://en.wikipedia.org/wiki/Indentation_style#Variant:_1TBS_(OTBS)).
-The opening brace for a function or class
+* Use One-True-Brace-Style. The opening brace for a function or class
 is normally at the end of the line; it is sometimes moved to the
 beginning of the next line for emphasis.  Substatements are enclosed
 in braces, even if there is only a single statement.  Extremely simple
@@ -418,7 +409,7 @@ Similar discussions for some other projects:
 * [Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html) —
 Currently (2020) targeting C++17.
 
-* [C++11 and C++14 use in Chromium](https://chromium.googlesource.com/chromium/src/+/main/styleguide/c++/c++-features.md) —
+* [C++11 and C++14 use in Chromium](https://chromium-cpp.appspot.com) —
 Categorizes features as allowed, banned, or to be discussed.
 
 * [llvm Coding Standards](https://llvm.org/docs/CodingStandards.html) —
@@ -471,9 +462,7 @@ code is disabled for some platforms.
 Rationale: HotSpot often uses "resource" or "arena" allocation.  Even
 where heap allocation is used, the standard global functions are
 avoided in favor of wrappers around malloc and free that support the
-VM's Native Memory Tracking (NMT) feature.  Typically, uses of the global
-operator new are inadvertent and therefore often associated with memory
-leaks.
+VM's Native Memory Tracking (NMT) feature.
 
 Native memory allocation failures are often treated as non-recoverable.
 The place where "out of memory" is (first) detected may be an innocent
@@ -607,7 +596,9 @@ use can make code much harder to understand.
 Only use if the function body has a very small number of `return`
 statements, and generally relatively little other code.
 
-* Also see [lambda expressions](#lambdaexpressions).
+* Generic lambdas.  Lambdas are not (yet) permitted.
+
+* Lambda init captures.  Lambdas are not (yet) permitted.
 
 ### Expression SFINAE
 
@@ -633,7 +624,7 @@ Here are a few closely related example bugs:<br>
 ### enum
 
 Where appropriate, _scoped-enums_ should be used.
-([n2347](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2347.pdf))
+([n2347](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2347.pdf)) 
 
 Use of _unscoped-enums_ is permitted, though ordinary constants may be
 preferable when the automatic initializer feature isn't used.
@@ -653,12 +644,10 @@ integral constants.
 
 ### thread_local
 
-Avoid use of `thread_local`
+Do not use `thread_local`
 ([n2659](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2659.htm));
-and instead, use the HotSpot macro `THREAD_LOCAL`, for which the initializer must
-be a constant expression. When `thread_local` must be used, use the Hotspot macro
-`APPROVED_CPP_THREAD_LOCAL` to indicate that the use has been given appropriate
-consideration.
+instead, use the HotSpot macro `THREAD_LOCAL`.  The initializer must
+be a constant expression.
 
 As was discussed in the review for
 [JDK-8230877](https://mail.openjdk.java.net/pipermail/hotspot-dev/2019-September/039487.html),
@@ -667,18 +656,14 @@ semantics.  However, that support requires a run-time penalty for
 references to non-function-local `thread_local` variables defined in a
 different translation unit, even if they don't need dynamic
 initialization.  Dynamic initialization and destruction of
-non-local `thread_local` variables also has the same ordering
-problems as for ordinary non-local variables. So we avoid use of
-`thread_local` in general, limiting its use to only those cases where dynamic
-initialization or destruction are essential. See
-[JDK-8282469](https://bugs.openjdk.java.net/browse/JDK-8282469)
-for further discussion.
+namespace-scoped thread local variables also has the same ordering
+problems as for ordinary namespace-scoped variables.
 
 ### nullptr
 
 Prefer `nullptr`
 ([n2431](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2431.pdf))
-to `NULL`.  Don't use (constexpr or literal) 0 for pointers.
+to `NULL`.  Don't use (constexpr or literal) 0 for pointers. 
 
 For historical reasons there are widespread uses of both `NULL` and of
 integer 0 as a pointer value.
@@ -718,301 +703,10 @@ Some relevant sections from cppreference.com:
 Although related, the use of `std::initializer_list` remains forbidden, as
 part of the avoidance of the C++ Standard Library in HotSpot code.
 
-### Local Function Objects
-
-* Local function objects, including lambda expressions, may be used.
-* Lambda expressions must only be used as a downward value.
-* Prefer `[&]` as the capture list of a lambda expression.
-* Return type deduction for lambda expressions is permitted, and indeed encouraged.
-* An empty parameter list for a lambda expression may be elided.
-* A lambda expression must not be `mutable`.
-* Generic lambda expressions are permitted.
-* Lambda expressions should be relatively simple.
-* Anonymous lambda expressions should not overly clutter the enclosing expression.
-* An anonymous lambda expression must not be directly invoked.
-* Bind expressions are forbidden.
-
-Single-use function objects can be defined locally within a function,
-directly at the point of use.  This is an alternative to having a function
-or function object class defined at class or namespace scope.
-
-This usage was somewhat limited by C++03, which does not permit such a class
-to be used as a template parameter.  That restriction was removed by C++11
-([n2657]). Use of this feature is permitted.
-
-Many HotSpot protocols involve "function-like" objects that involve some
-named member function rather than a call operator.  For example, a function
-that performs some action on all threads might be written as
-
-```
-void do_something() {
-  struct DoSomething : public ThreadClosure {
-    virtual void do_thread(Thread* t) {
-      ... do something with t ...
-    }
-  } closure;
-  Threads::threads_do(&closure);
-}
-```
-
-HotSpot code has historically usually placed the DoSomething class at
-namespace (or sometimes class) scope.  This separates the function's code
-from its use, often to the detriment of readability.  It requires giving the
-class a globally unique name (if at namespace scope).  It also loses the
-information that the class is intended for use in exactly one place, and
-does not have any subclasses.  (However, the latter can now be indicated by
-declaring it `final`.)  Often, for simplicity, a local class will skip
-things like access control and accessor functions, giving the enclosing
-function direct access to the implementation and eliminating some
-boilerplate that might be provided if the class is in some outer (more
-accessible) scope.  On the other hand, if there is a lot of surrounding code
-in the function body or the local class is of significant size, defining it
-locally can increase clutter and reduce readability.
-
-<a name="lambdaexpressions"></a>
-C++11 added _lambda expressions_ as a new way to write a function object.
-Simple lambda expressions can be significantly more concise than a function
-object, eliminating a lot of boiler-plate.  On the other hand, a complex
-lambda expression may not provide much, if any, readability benefit compared
-to an ordinary function object.  Also, while a lambda can encapsulate a call
-to a "function-like" object, it cannot be used in place of such.
-
-A common use for local functions is as one-use [RAII] objects.  The amount
-of boilerplate for a function object class (local or not) makes such usage
-somewhat clumsy and verbose.  But with the help of a small amount of
-supporting utility code, lambdas work particularly well for this use case.
-
-Another use for local functions is [partial application][PARTIALAPP].  Again
-here, lambdas are typically much simpler and less verbose than function
-object classes.
-
-Because of these benefits, lambda expressions are permitted in HotSpot code,
-with some restrictions and usage guidance.  An anonymous lambda is one which
-is passed directly as an argument.  A named lambda is the value of a
-variable, which is its name.
-
-Lambda expressions should only be passed downward.  In particular, a lambda
-should not be returned from a function or stored in a global variable,
-whether directly or as the value of a member of some other object.  Lambda
-capture is syntactically subtle (by design), and propagating a lambda in
-such ways can easily pass references to captured values to places where they
-are no longer valid.  In particular, members of the enclosing `this` object
-are effectively captured by reference, even if the default capture is
-by-value.  For such uses-cases a function object class should be used to
-make the desired value capturing and propagation explicit.
-
-Limiting the capture list to `[&]` (implicitly capture by reference) is a
-simplifying restriction that still provides good support for HotSpot usage,
-while reducing the cases a reader must recognize and understand.
-
-* Many common lambda uses require reference capture.  Not permitting it
-would substantially reduce the utility of lambdas.
-
-* Referential transparency.  Implicit reference capture makes variable
-references in the lambda body have the same meaning they would have in the
-enclosing code.  There isn't a semantic barrier across which the meaning of
-a variable changes.
-
-* Explicit reference capture introduces significant clutter, especially when
-lambda expressions are relatively small and simple, as they should be in
-HotSpot code.
-
-* There are a number of reasons why by-value capture might be used, but for
-the most part they don't apply to HotSpot code, given other usage restrictions.
-
-    * A primary use-case for by-value capture is to support escaping uses,
-    where values captured by-reference might become invalid.  That use-case
-    doesn't apply if only downward lambdas are used.
-
-    * By-value capture can also make a lambda-local copy for mutation, which
-    requires making the lambda `mutable`; see below.
-
-    * By-value capture might be viewed as an optimization, avoiding any
-    overhead for reference capture of cheap to copy values.  But the
-    compiler can often eliminate any such overhead.
-
-    * By-value capture by a non-`mutable` lambda makes the captured values
-    const, preventing any modification by the lambda and making the captured
-    value unaffected by modifications to the outer variable.  But this only
-    applies to captured auto variables, not member variables, and is
-    inconsistent with referential transparency.
-
-* Non-capturing lambdas (with an empty capture list - `[]`) have limited
-utility.  There are cases where no captures are required (pure functions,
-for example), but if the function is small and simple then that's obvious
-anyway.
-
-* Capture initializers (a C++14 feature - [N3649]) are not permitted.
-Capture initializers inherently increase the complexity of the capture list,
-and provide little benefit over an additional in-scope local variable.
-
-The use of `mutable` lambda expressions is forbidden because there don't
-seem to be many, if any, good use-cases for them in HotSpot.  A lambda
-expression needs to be mutable in order to modify a by-value captured value.
-But with only downward lambdas, such usage seems likely to be rare and
-complicated.  It is better to use a function object class in any such cases
-that arise, rather than requiring all HotSpot developers to understand this
-relatively obscure feature.
-
-While it is possible to directly invoke an anonymous lambda expression, that
-feature should not be used, as such a form can be confusing to readers.
-Instead, name the lambda and call it by name.
-
-Some reasons to prefer a named lambda instead of an anonymous lambda are
-
-* The body contains non-trivial control flow or declarations or other nested
-constructs.
-
-* Its role in an argument list is hard to guess without examining the
-function declaration.  Give it a name that indicates its purpose.
-
-* It has an unusual capture list.
-
-* It has a complex explicit return type or parameter types.
-
-Lambda expressions, and particularly anonymous lambda expressions, should be
-simple and compact.  One-liners are good.  Anonymous lambdas should usually
-be limited to a couple lines of body code.  More complex lambdas should be
-named.  A named lambda should not clutter the enclosing function and make it
-long and complex; do continue to break up large functions via the use of
-separate helper functions.
-
-An anonymous lambda expression should either be a one-liner in a one-line
-expression, or isolated in its own set of lines.  Don't place part of a
-lambda expression on the same line as other arguments to a function.  The
-body of a multi-line lambda argument should be indented from the start of
-the capture list, as if that were the start of an ordinary function
-definition.  The body of a multi-line named lambda should be indented one
-step from the variable's indentation.
-
-Some examples:
-
-1. `foo([&] { ++counter; });`
-2. `foo(x, [&] { ++counter; });`
-3. `foo([&] { if (predicate) ++counter; });`
-4. `foo([&] { auto tmp = process(x); tmp.f(); return tmp.g(); })`
-5. Separate one-line lambda from other arguments:
-
-    ```
-    foo(c.begin(), c.end(),
-        [&] (const X& x) { do_something(x); return x.value(); });
-    ```
-6. Indentation for multi-line lambda:
-
-    ```
-    c.do_entries([&] (const X& x) {
-                   do_something(x, a);
-                   do_something1(x, b);
-                   do_something2(x, c);
-                 });
-    ```
-7. Separate multi-line lambda from other arguments:
-
-    ```
-    foo(c.begin(), c.end(),
-        [&] (const X& x) {
-          do_something(x, a);
-          do_something1(x, b);
-          do_something2(x, c);
-        });
-    ```
-8. Multi-line named lambda:
-
-    ```
-    auto do_entry = [&] (const X& x) {
-      do_something(x, a);
-      do_something1(x, b);
-      do_something2(x, c);
-    };
-    ```
-
-Item 4, and especially items 6 and 7, are pushing the simplicity limits for
-anonymous lambdas.  Item 6 might be better written using a named lambda:
-```
-c.do_entries(do_entry);
-```
-
-Note that C++11 also added _bind expressions_ as a way to write a function
-object for partial application, using `std::bind` and related facilities
-from the Standard Library.  `std::bind` generalizes and replaces some of the
-binders from C++03.  Bind expressions are not permitted in HotSpot code.
-They don't provide enough benefit over lambdas or local function classes in
-the cases where bind expressions are applicable to warrant the introduction
-of yet another mechanism in this space into HotSpot code.
-
-References:
-
-* Local and unnamed types as template parameters ([n2657])
-* New wording for C++0x lambdas ([n2927])
-* Generalized lambda capture (init-capture) ([N3648])
-* Generic (polymorphic) lambda expressions ([N3649])
-
-[n2657]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm
-[n2927]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2009/n2927.pdf
-[N3648]: https://isocpp.org/files/papers/N3648.html
-[N3649]: https://isocpp.org/files/papers/N3649.html
-
-References from C++17
-
-* Wording for constexpr lambda ([p0170r1])
-* Lambda capture of *this by Value ([p0018r3])
-
-[p0170r1]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0170r1.pdf
-[p0018r3]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0018r3.html
-
-References from C++20
-
-* Allow lambda capture [=, this] ([p0409r2])
-* Familiar template syntax for generic lambdas ([p0428r2])
-* Simplifying implicit lambda capture ([p0588r1])
-* Default constructible and assignable stateless lambdas ([p0624r2])
-* Lambdas in unevaluated contexts ([p0315r4])
-* Allow pack expansion in lambda init-capture ([p0780r2]) ([p2095r0])
-* Deprecate implicit capture of this via [=] ([p0806r2])
-
-[p0409r2]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0409r2.html
-[p0428r2]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0428r2.pdf
-[p0588r1]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0588r1.html
-[p0624r2]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0624r2.pdf
-[p0315r4]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2017/p0315r4.pdf
-[p0780r2]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0780r2.html
-[p2095r0]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p2095r0.html
-[p0806r2]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0806r2.html
-
-References from C++23
-
-* Make () more optional for lambdas  ([p1102r2])
-
-[p1102r2]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p1102r2.html
-
-### Inheriting constructors
-
-Do not use _inheriting constructors_
-([n2540](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2540.htm)).
-
-C++11 provides simple syntax allowing a class to inherit the constructors of a
-base class.  Unfortunately there are a number of problems with the original
-specification, and C++17 contains significant revisions ([p0136r1] opens with
-a list of 8 Core Issues).  Since HotSpot doesn't support use of C++17, use of
-inherited constructors could run into those problems. Such uses might also
-change behavior in a future HotSpot update to use C++17 or later, potentially
-in subtle ways that could lead to hard to diagnose problems.  Because of this,
-HotSpot code must not use inherited constructors.
-
-Note that gcc7 provides the `-fnew-inheriting-ctors` option to use the
-[p0136r1] semantics.  This is enabled by default when using C++17 or later.
-It is also enabled by default for `fabi-version=11` (introduced by gcc7) or
-higher when using C++11/14, as the change is considered a Defect Report that
-applies to those versions.  Earlier versions of gcc don't have that option,
-and other supported compilers may not have anything similar.
-
-[p0136r1]: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/p0136r1.html
-  "p0136r1"
-
 ### Additional Permitted Features
 
 * `constexpr`
-([n2235](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2235.pdf))
+([n2235](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2235.pdf)) 
 ([n3652](https://isocpp.org/files/papers/N3652.html))
 
 * Sized deallocation
@@ -1063,13 +757,13 @@ and other supported compilers may not have anything similar.
 ([n3206](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2010/n3206.htm)),
 ([n3272](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3272.htm))
 
+* Local and unnamed types as template parameters
+([n2657](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2657.htm))
+
 * Range-based `for` loops
 ([n2930](http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2009/n2930.html))
 ([range-for](https://en.cppreference.com/w/cpp/language/range-for))
 
-* Unrestricted Unions
-([n2544](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2544.pdf))
-
 ### Excluded Features
 
 * New string and character literals
@@ -1101,7 +795,7 @@ namespace std;` to avoid needing to qualify Standard Library names.
 ([n2179](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2179.html)) &mdash;
 HotSpot does not permit the use of exceptions, so this feature isn't useful.
 
-* Avoid non-local variables with non-constexpr initialization.
+* Avoid namespace-scoped variables with non-constexpr initialization.
 In particular, avoid variables with types requiring non-trivial
 initialization or destruction.  Initialization order problems can be
 difficult to deal with and lead to surprises, as can destruction
@@ -1122,14 +816,14 @@ in HotSpot code because of the "no implicit boolean" guideline.)
 
 * Avoid covariant return types.
 
-* Avoid `goto` statements.
+* Avoid `goto` statements. 
 
 ### Undecided Features
 
 This list is incomplete; it serves to explicitly call out some
 features that have not yet been discussed.
 
-* Trailing return type syntax for functions
+* Trailing return type syntax for functions 
 ([n2541](http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2541.htm))
 
 * Variable templates
@@ -1143,7 +837,10 @@ features that have not yet been discussed.
 
 * Rvalue references and move semantics
 
-[ADL]: https://en.cppreference.com/w/cpp/language/adl
+* Lambdas
+
+
+[ADL]: https://en.cppreference.com/w/cpp/language/adl 
   "Argument Dependent Lookup"
 
 [ODR]: https://en.cppreference.com/w/cpp/language/definition
@@ -1157,6 +854,3 @@ features that have not yet been discussed.
 
 [SFINAE]: https://en.cppreference.com/w/cpp/language/sfinae
   "Substitution Failure Is Not An Error"
-
-[PARTIALAPP]: https://en.wikipedia.org/wiki/Partial_application
-  "Partial Application"

doc/ide.html

@@ -41,20 +41,14 @@
 <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>
 <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>
-<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>
+<p>This section is a work in progress.</p>
+<pre class="shell"><code>make ide-project</code></pre>
 <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>
 <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>
 <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>
-<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>
+<p>This section is a work in progress.</p>
 </body>
 </html>

doc/ide.md

@@ -45,17 +45,12 @@ after the workspace has been generated.
 
 #### Visual Studio
 
-The make system can generate a Visual Studio project for the Hotspot
-native source. After configuring, the project is generated using:
+This section is a work in progress.
 
 ```shell
-make hotspot-ide-project
+make ide-project
 ```
 
-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`.
-
 #### Compilation Database
 
 The make system can generate generic native code indexing support in the form of
@@ -75,24 +70,4 @@ make compile-commands-hotspot
 
 ### IDE support for Java code
 
-#### IntelliJ IDEA
-
-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:
-
-```shell
-bash bin/idea.sh
-```
-
-To use it, choose `File -> Open...` in IntelliJ and select the folder where
-you ran the above script.
-
-Next, configure the project SDK in IntelliJ. Open
-`File -> Project Structure -> Project` and select `build/<config>/images/jdk`
-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).
+This section is a work in progress.

doc/testing.html

@@ -193,9 +193,7 @@ TEST FAILURE</code></pre>
 <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>
 <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>
-<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>
+<p>Retry failed tests up to a set number of times. 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>
@@ -231,7 +229,7 @@ TEST FAILURE</code></pre>
     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=&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>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, 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>

doc/testing.md

@@ -419,15 +419,7 @@ 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.
-
-#### 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.
+Retry failed tests up to a set number of times. Defaults to 0.
 
 ### Gtest keywords
 
@@ -514,7 +506,7 @@ $ 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
+in the environment before running tests should work. On Windows, setting
 `JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US"` helps for most, but
 not all test cases.
 

make/CompileCommands.gmk

@@ -29,7 +29,7 @@ include $(SPEC)
 include MakeBase.gmk
 
 # When FIXPATH is set, let it process the file to make sure all paths are usable
-# by system native tools. The FIXPATH tool assumes arguments preceded by an @
+# by system native tools. The FIXPATH tool assumes arguments preceeded by an @
 # character points to a text file containing further arguments (similar to a
 # linker). It replaces any such arguments with a different temporary filename,
 # whose contents has been processed to make any paths native. To obtain a

make/CompileDemos.gmk

@@ -104,7 +104,7 @@ define SetupBuildDemoBody
   ifneq ($$($1_SRC_SUB_DIR), )
     $1_MAIN_SRC := $$($1_SRC_BASE)/$$($1_SRC_SUB_DIR)
   else
-    # for almost all
+    # for allmost all
     $1_MAIN_SRC := $$($1_SRC_BASE)
   endif
 

make/CompileInterimLangtools.gmk

@@ -71,11 +71,11 @@ define SetupInterimModule
       SRC := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim \
           $$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$1) \
           $(TOPDIR)/src/$1/share/classes, \
-      EXCLUDES := sun javax/tools/snippet-files, \
+      EXCLUDES := sun, \
       EXCLUDE_FILES := $(TOPDIR)/src/$1/share/classes/module-info.java \
           Standard.java, \
       EXTRA_FILES := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim/module-info.java, \
-      COPY := .gif .png .xml .css .svg .js .js.template .txt javax.tools.JavaCompilerTool, \
+      COPY := .gif .png .xml .css .js .js.template .txt javax.tools.JavaCompilerTool, \
       BIN := $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules/$1.interim, \
       DISABLED_WARNINGS := module options, \
       JAVAC_FLAGS := \

make/CreateJmods.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2021, 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
@@ -196,11 +196,6 @@ else # not java.base
   endif
 endif
 
-# 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.
 # The variable JMOD_CMD could contain an environment variable assignment before
 # the actual command. Filter that out using wildcard before adding to DEPS.
@@ -226,13 +221,6 @@ else
   JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.debuginfo,*.dSYM/**,*.dSYM}'
 endif
 
-# For reproducible builds specify the jmod --date using SOURCE_DATE in ISO-8601
-ifeq ($(ENABLE_REPRODUCIBLE_BUILD), true)
-  JMOD_SOURCE_DATE := --date $(SOURCE_DATE_ISO_8601)
-else
-  JMOD_SOURCE_DATE :=
-endif
-
 # Create jmods in the support dir and then move them into place to keep the
 # module path in $(IMAGES_OUTPUTDIR)/jmods valid at all times.
 $(eval $(call SetupExecute, create_$(JMOD_FILE), \
@@ -244,7 +232,6 @@ $(eval $(call SetupExecute, create_$(JMOD_FILE), \
     COMMAND := $(JMOD) create --module-version $(VERSION_SHORT) \
         --target-platform '$(OPENJDK_MODULE_TARGET_PLATFORM)' \
         --module-path $(JMODS_DIR) $(JMOD_FLAGS) \
-        $(JMOD_SOURCE_DATE) \
         $(JMODS_SUPPORT_DIR)/$(JMOD_FILE), \
     POST_COMMAND := $(MV) $(JMODS_SUPPORT_DIR)/$(JMOD_FILE) $(JMODS_DIR)/$(JMOD_FILE), \
 ))

make/Docs.gmk

@@ -104,14 +104,14 @@ JAVADOC_DISABLED_DOCLINT_PACKAGES := org.w3c.* javax.smartcardio
 
 # The initial set of options for javadoc
 JAVADOC_OPTIONS := -use -keywords -notimestamp \
-    -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
+    -serialwarn -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
     -splitIndex --system none -javafx --expand-requires transitive \
     --override-methods=summary
 
 # The reference options must stay stable to allow for comparisons across the
 # development cycle.
 REFERENCE_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
-    -encoding ISO-8859-1 -breakiterator -splitIndex --system none \
+    -serialwarn -encoding ISO-8859-1 -breakiterator -splitIndex --system none \
     -html5 -javafx --expand-requires transitive
 
 # Should we add DRAFT stamps to the generated javadoc?
@@ -131,7 +131,7 @@ JAVA_PLATFORM := Java Platform
 
 ifeq ($(IS_DRAFT), true)
   DRAFT_MARKER_STR := <br><strong>DRAFT $(VERSION_STRING)</strong>
-  ifeq ($(VERSION_BUILD), )
+  ifeq ($(VERSION_BUILD), 0)
     DRAFT_MARKER_TITLE := $(SPACE)[ad-hoc build]
   else
     DRAFT_MARKER_TITLE := $(SPACE)[build $(VERSION_BUILD)]

make/Doctor.gmk

@@ -1,148 +0,0 @@
-#
-# 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
-# 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: all
-
-include $(SPEC)
-include MakeBase.gmk
-
-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, Doctor.gmk))
-
-################################################################################
-#
-# Help user diagnose possible errors and problems with the build environment.
-#
-
-prologue:
-	$(ECHO)
-	$(ECHO) '"make doctor" will help you analyze your build environment. It can highlight'
-	$(ECHO) 'certain well-known problems, but it can never find all possible errors.'
-
-TARGETS += prologue
-
-check-git: prologue
-	$(ECHO)
-	$(ECHO) '* Verifying that configure has picked up git...'
-        ifeq ($(GIT), )
-	  $(ECHO) 'WARNING: "git" is not present. This will disable several checks.'
-	  $(ECHO) '! Correct by installing git and verifying that it is in the PATH'
-        endif
-
-TARGETS += check-git
-
-ifneq ($(GIT), )
-  AUTOCRLF := $(shell $(GIT) config core.autocrlf)
-endif
-
-check-autocrlf: check-git
-        ifneq ($(GIT), )
-          ifeq ($(call isBuildOs, windows), true)
-	    $(ECHO)
-	    $(ECHO) '* Verifying git core.autocrlf value...'
-            ifneq ($(AUTOCRLF), false)
-	      $(ECHO) 'WARNING: core.autocrlf is not "false".  HIGH RISK of build failure!'
-	      $(ECHO) '! Correct by running 'git config --global core.autocrlf false' and re-cloning the repo'
-            endif
-          endif
-        endif
-
-TARGETS += check-autocrlf
-
-check-configure-warnings: check-autocrlf
-	$(ECHO)
-	$(ECHO) '* Checking for warnings from configure...'
-	warning_output=`$(GREP) -e "^\* Memory limit:" -A 300 $(OUTPUTDIR)/configure.log | $(TAIL) -n +3 | $(SED) -e '$(DOLLAR){/^$(DOLLAR)/d;}'` && \
-	if test -n "$$warning_output" ; then \
-	  $(ECHO) ' ---' ; \
-	  $(GREP) -e "^\* Memory limit:" -A 300 $(OUTPUTDIR)/configure.log | $(TAIL) -n +3 | $(SED) -e '$(DOLLAR){/^$(DOLLAR)/d;}' ; \
-	  $(ECHO) ' ---' ; \
-	  $(ECHO) '! Inspect the warnings, fix any problems, and re-run configure' ; \
-	fi
-
-TARGETS += check-configure-warnings
-
-ifneq ($(GIT), )
-  # This might have been set by custom component
-  UNTRACKED_FILES ?= $(shell $(GIT) status --porcelain --ignored | $(CUT) -c 4-)
-endif
-
-check-core-files: check-configure-warnings
-        ifneq ($(GIT), )
-	  $(ECHO)
-	  $(ECHO) '* Checking for left-over core files...'
-	  core_files_found=`echo "$(UNTRACKED_FILES)" | $(TR) ' ' '\n' | $(GREP) core` && \
-	  if test -n "$$core_files_found" ; then \
-	    $(ECHO) 'Found these potential core files. They might interfere with the build process:' ; \
-	    $(ECHO) ' ---' ; \
-	    $(ECHO) $$core_files_found | $(TR) ' ' '\n'; \
-	    $(ECHO) ' ---' ; \
-	    $(ECHO) '! Remove left-over core files' ; \
-	  fi || : # do nothing if grep returns non-0 value
-        endif
-
-TARGETS += check-core-files
-
-check-bad-file-names: check-core-files
-        ifneq ($(GIT), )
-	  $(ECHO)
-	  $(ECHO) '* Checking for untracked files with illegal names...'
-	  core_files_found=`echo "$(UNTRACKED_FILES)" | $(TR) ' ' '\n' | $(GREP) '#'` && \
-	  if test -n "$$core_files_found" ; then \
-	    $(ECHO) 'Found these files with illegal names. They *will* cause build failures:' ; \
-	    $(ECHO) ' ---' ; \
-	    $(ECHO) $$core_files_found | $(TR) ' ' '\n'; \
-	    $(ECHO) ' ---' ; \
-	    $(ECHO) '! Remove all files with '#' in their name from the JDK source tree' ; \
-	  fi || : # do nothing if grep returns non-0 value
-        endif
-
-TARGETS += check-bad-file-names
-
-epilogue: check-bad-file-names
-	$(ECHO)
-	$(ECHO) '* If all else fails, try removing the entire build directory and re-creating'
-	$(ECHO) 'the same configuration using:'
-	$(ECHO) ' ---' ; \
-	$(ECHO) configure_command_line=\$$\(make print-configuration\)
-	$(ECHO) make dist-clean
-	$(ECHO) bash configure \$$configure_command_line
-	$(ECHO) ' ---' ; \
-	$(ECHO)
-	$(ECHO) '* The build README (doc/building.md) is a great source of information,'
-	$(ECHO) 'especially the chapter "Fixing Unexpected Build Failures". Check it out!'
-	$(ECHO)
-	$(ECHO) '* If you still need assistance please contact build-dev@openjdk.java.net.'
-	$(ECHO)
-
-TARGETS += epilogue
-
-################################################################################
-
-doctor: $(TARGETS)
-
-all: doctor
-
-.PHONY: default all doctor $(TARGETS)

make/GenerateLinkOptData.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2021, 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
@@ -88,10 +88,7 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	        $(CAT) $(LINK_OPT_DIR)/stderr $(JLI_TRACE_FILE) ; \
 	        exit $$exitcode \
 	    )
-	$(GREP) -v HelloClasslist $@.raw.2 > $@.raw.3
-	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java \
-	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
-	    build.tools.classlist.SortClasslist $@.raw.3 > $@
+	$(GREP) -v HelloClasslist $@.raw.2 > $@
 
 # The jli trace is created by the same recipe as classlist. By declaring these
 # dependencies, make will correctly rebuild both jli trace and classlist

make/Global.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2022, 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
@@ -53,17 +53,14 @@ help:
 	$(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 reconfigure       # Rerun configure with the same arguments as last time)
+	$(info $(_) make help              # Give some help on using make)
 	$(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)
 	$(info $(_) make exploded-test TEST=<t> # Run test(s) on the exploded image instead of)
 	$(info $(_)                        # the full jdk image)
 	$(info )
-	$(info Targets for troubleshooting)
-	$(info $(_) make help              # Give some help on using make)
-	$(info $(_) make doctor            # Diagnose build environment problems)
-	$(info $(_) make reconfigure       # Rerun configure with the same arguments as last time)
-	$(info )
 	$(info Targets for cleaning)
 	$(info $(_) make clean             # Remove all files generated by make, but not those)
 	$(info $(_)                        # generated by configure)

make/GraalBuilderImage.gmk

@@ -23,7 +23,7 @@
 # questions.
 #
 
-# This makefile creates a jdk image overlaid with statically linked core
+# This makefile creates a jdk image overlayed with statically linked core
 # libraries.
 
 default: all

make/Hsdis.gmk

@@ -1,204 +0,0 @@
-#
-# 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
-# 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: all
-
-include $(SPEC)
-include MakeBase.gmk
-include JdkNativeCompilation.gmk
-
-################################################################################
-# This makefile compiles and installs the hsdis library
-#
-################################################################################
-
-HSDIS_OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/hsdis
-REAL_HSDIS_NAME := hsdis-$(OPENJDK_TARGET_CPU_LEGACY_LIB)$(SHARED_LIBRARY_SUFFIX)
-BUILT_HSDIS_LIB := $(HSDIS_OUTPUT_DIR)/$(REAL_HSDIS_NAME)
-
-HSDIS_TOOLCHAIN := TOOLCHAIN_DEFAULT
-HSDIS_TOOLCHAIN_CFLAGS := $(CFLAGS_JDKLIB)
-HSDIS_TOOLCHAIN_LDFLAGS := $(LDFLAGS_JDKLIB)
-
-ifeq ($(HSDIS_BACKEND), capstone)
-  ifeq ($(call isTargetCpuArch, x86), true)
-    CAPSTONE_ARCH := CS_ARCH_X86
-    CAPSTONE_MODE := CS_MODE_$(OPENJDK_TARGET_CPU_BITS)
-  else ifeq ($(call isTargetCpuArch, aarch64), true)
-    CAPSTONE_ARCH := CS_ARCH_ARM64
-    CAPSTONE_MODE := CS_MODE_ARM
-  else
-    $(error No support for Capstone on this platform)
-  endif
-
-  HSDIS_CFLAGS += -DCAPSTONE_ARCH=$(CAPSTONE_ARCH) \
-      -DCAPSTONE_MODE=$(CAPSTONE_MODE)
-endif
-
-ifeq ($(HSDIS_BACKEND), llvm)
-  # Use C++ instead of C
-  HSDIS_TOOLCHAIN_CFLAGS := $(CXXFLAGS_JDKLIB)
-  HSDIS_TOOLCHAIN := TOOLCHAIN_LINK_CXX
-
-  ifeq ($(call isTargetOs, linux), true)
-    LLVM_OS := pc-linux-gnu
-  else ifeq ($(call isTargetOs, macosx), true)
-    LLVM_OS := apple-darwin
-  else ifeq ($(call isTargetOs, windows), true)
-    LLVM_OS := pc-windows-msvc
-  else
-    $(error No support for LLVM on this platform)
-  endif
-
-  HSDIS_CFLAGS += -DLLVM_DEFAULT_TRIPLET='"$(OPENJDK_TARGET_CPU)-$(LLVM_OS)"'
-endif
-
-ifeq ($(HSDIS_BACKEND), binutils)
-  ifeq ($(call isTargetOs, windows), true)
-    # On windows, we need to "fake" a completely different toolchain using gcc
-    # instead of the normal microsoft toolchain. This is quite hacky...
-
-    MINGW_BASE := x86_64-w64-mingw32
-
-    MINGW_SYSROOT = $(shell $(MINGW_BASE)-gcc -print-sysroot)
-    ifeq ($(wildcard $(MINGW_SYSROOT)), )
-      # Use fallback path
-      MINGW_SYSROOT := /usr/$(MINGW_BASE)
-      ifeq ($(wildcard $(MINGW_SYSROOT)), )
-        $(error mingw sysroot not found)
-      endif
-    endif
-
-    $(eval $(call DefineNativeToolchain, TOOLCHAIN_MINGW, \
-        CC := $(MINGW_BASE)-gcc, \
-        LD := $(MINGW_BASE)-ld, \
-        OBJCOPY := $(MINGW_BASE)-objcopy, \
-        RC := $(RC), \
-        SYSROOT_CFLAGS := --sysroot=$(MINGW_SYSROOT), \
-        SYSROOT_LDFLAGS := --sysroot=$(MINGW_SYSROOT), \
-    ))
-
-    MINGW_SYSROOT_LIB_PATH := $(MINGW_SYSROOT)/mingw/lib
-    ifeq ($(wildcard $(MINGW_SYSROOT_LIB_PATH)), )
-      # Try without mingw
-      MINGW_SYSROOT_LIB_PATH := $(MINGW_SYSROOT)/lib
-      ifeq ($(wildcard $(MINGW_SYSROOT_LIB_PATH)), )
-        $(error mingw sysroot lib path not found)
-      endif
-    endif
-
-    MINGW_VERSION = $(shell $(MINGW_BASE)-gcc -v 2>&1 | $(GREP) "gcc version" | $(CUT) -d " " -f 3)
-    MINGW_GCC_LIB_PATH := /usr/lib/gcc/$(MINGW_BASE)/$(MINGW_VERSION)
-    ifeq ($(wildcard $(MINGW_GCC_LIB_PATH)), )
-      # Try using only major version number
-      MINGW_VERSION_MAJOR := $(firstword $(subst ., , $(MINGW_VERSION)))
-      MINGW_GCC_LIB_PATH := /usr/lib/gcc/$(MINGW_BASE)/$(MINGW_VERSION_MAJOR)
-      ifeq ($(wildcard $(MINGW_GCC_LIB_PATH)), )
-        $(error mingw gcc lib path not found)
-      endif
-    endif
-
-    TOOLCHAIN_TYPE := gcc
-    OPENJDK_TARGET_OS := linux
-    CC_OUT_OPTION := -o$(SPACE)
-    LD_OUT_OPTION := -o$(SPACE)
-    GENDEPS_FLAGS := -MMD -MF
-    CFLAGS_DEBUG_SYMBOLS := -g
-    DISABLED_WARNINGS :=
-    DISABLE_WARNING_PREFIX := -Wno-
-    CFLAGS_WARNINGS_ARE_ERRORS := -Werror
-    SHARED_LIBRARY_FLAGS := -shared
-
-    HSDIS_TOOLCHAIN := TOOLCHAIN_MINGW
-    HSDIS_TOOLCHAIN_CFLAGS :=
-    HSDIS_TOOLCHAIN_LDFLAGS := -L$(MINGW_GCC_LIB_PATH) -L$(MINGW_SYSROOT_LIB_PATH)
-    MINGW_DLLCRT := $(MINGW_SYSROOT_LIB_PATH)/dllcrt2.o
-    HSDIS_TOOLCHAIN_LIBS := $(MINGW_DLLCRT) -lmingw32 -lgcc -lgcc_eh -lmoldname \
-        -lmingwex -lmsvcrt -lpthread -ladvapi32 -lshell32 -luser32 -lkernel32
-  else
-    HSDIS_TOOLCHAIN_LIBS := -ldl
-  endif
-endif
-
-$(eval $(call SetupJdkLibrary, BUILD_HSDIS, \
-    NAME := hsdis, \
-    SRC := $(TOPDIR)/src/utils/hsdis/$(HSDIS_BACKEND), \
-    EXTRA_HEADER_DIRS := $(TOPDIR)/src/utils/hsdis, \
-    TOOLCHAIN := $(HSDIS_TOOLCHAIN), \
-    OUTPUT_DIR := $(HSDIS_OUTPUT_DIR), \
-    OBJECT_DIR := $(HSDIS_OUTPUT_DIR), \
-    DISABLED_WARNINGS_gcc := undef format-nonliteral sign-compare, \
-    DISABLED_WARNINGS_clang := undef format-nonliteral, \
-    CFLAGS := $(HSDIS_TOOLCHAIN_CFLAGS) $(HSDIS_CFLAGS), \
-    LDFLAGS := $(HSDIS_TOOLCHAIN_LDFLAGS) $(HSDIS_LDFLAGS) $(SHARED_LIBRARY_FLAGS), \
-    LIBS := $(HSDIS_LIBS) $(HSDIS_TOOLCHAIN_LIBS), \
-))
-
-$(BUILT_HSDIS_LIB): $(BUILD_HSDIS_TARGET)
-	$(install-file)
-
-build: $(BUILD_HSDIS) $(BUILT_HSDIS_LIB)
-
-TARGETS += build
-
-ifeq ($(ENABLE_HSDIS_BUNDLING), false)
-
-  ifeq ($(call isTargetOs, windows), true)
-    JDK_HSDIS_DIR := $(JDK_OUTPUTDIR)/bin
-    IMAGE_HSDIS_DIR := $(JDK_IMAGE_DIR)/bin
-  else
-    JDK_HSDIS_DIR := $(JDK_OUTPUTDIR)/lib
-    IMAGE_HSDIS_DIR := $(JDK_IMAGE_DIR)/lib
-  endif
-
-
-  INSTALLED_HSDIS_JDK := $(JDK_HSDIS_DIR)/$(REAL_HSDIS_NAME)
-  INSTALLED_HSDIS_IMAGE := $(IMAGE_HSDIS_DIR)/$(REAL_HSDIS_NAME)
-
-  $(INSTALLED_HSDIS_JDK): $(BUILT_HSDIS_LIB)
-          ifeq ($(HSDIS_BACKEND), binutils)
-	    $(call LogWarn, NOTE: The resulting build might not be redistributable. Seek legal advice before distributing.)
-          endif
-	$(install-file)
-
-  $(INSTALLED_HSDIS_IMAGE): $(BUILT_HSDIS_LIB)
-	$(install-file)
-
-  install: $(INSTALLED_HSDIS_JDK) $(INSTALLED_HSDIS_IMAGE)
-
-else
-
-  install:
-	$(ECHO) NOTE: make install-hsdis is a no-op with --enable-hsdis-bundling
-
-endif
-
-TARGETS += install
-
-################################################################################
-
-all: $(TARGETS)
-
-.PHONY: all default build install

make/Init.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2022, 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
@@ -352,7 +352,7 @@ else # HAS_SPEC=true
 	$(call PrintFailureReports)
 	$(call PrintBuildLogFailures)
 	$(call ReportProfileTimes)
-	$(PRINTF) "HELP: Run 'make doctor' to diagnose build problems.\n\n"
+	$(PRINTF) "Hint: See doc/building.html#troubleshooting for assistance.\n\n"
         ifneq ($(COMPARE_BUILD), )
 	  $(call CleanupCompareBuild)
         endif

make/InitSupport.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -310,10 +310,9 @@ else # $(HAS_SPEC)=true
   # level of reproducible builds
   define SetupReproducibleBuild
     ifeq ($$(SOURCE_DATE), updated)
-      # For static values of SOURCE_DATE (not "updated"), these are set in spec.gmk
-      export SOURCE_DATE_EPOCH := $$(shell $$(DATE) +"%s")
-      export SOURCE_DATE_ISO_8601 := $$(call EpochToISO8601, $$(SOURCE_DATE_EPOCH))
+      SOURCE_DATE := $$(shell $$(DATE) +"%s")
     endif
+    export SOURCE_DATE_EPOCH := $$(SOURCE_DATE)
   endef
 
   # Parse COMPARE_BUILD into COMPARE_BUILD_*
@@ -436,24 +435,21 @@ else # $(HAS_SPEC)=true
 
   define PrintFailureReports
 	$(if $(filter none, $(LOG_REPORT)), , \
-	  $(RM) $(MAKESUPPORT_OUTPUTDIR)/failure-summary.log ; \
 	  $(if $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*.log), \
-	    ( \
-	      $(PRINTF) "\n=== Output from failing command(s) repeated here ===\n" ;  \
-	      $(foreach logfile, $(sort $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*.log)), \
-	          $(PRINTF) "* For target $(notdir $(basename $(logfile))):\n" ; \
-	          $(if $(filter all, $(LOG_REPORT)), \
-	            $(GREP) -v -e "^Note: including file:" <  $(logfile) || true ; \
-	          , \
-	            ($(GREP) -v -e "^Note: including file:" <  $(logfile) || true) | $(HEAD) -n 15 ; \
-	            if test `$(WC) -l < $(logfile)` -gt 15; then \
-	              $(ECHO) "   ... (rest of output omitted)" ; \
-	            fi ; \
-	          ) \
-	      ) \
-	      $(PRINTF) "\n* All command lines available in $(MAKESUPPORT_OUTPUTDIR)/failure-logs.\n" ; \
-	      $(PRINTF) "=== End of repeated output ===\n" ; \
-	    )  >> $(MAKESUPPORT_OUTPUTDIR)/failure-summary.log  \
+	    $(PRINTF) "\n=== Output from failing command(s) repeated here ===\n" $(NEWLINE) \
+	    $(foreach logfile, $(sort $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*.log)), \
+	        $(PRINTF) "* For target $(notdir $(basename $(logfile))):\n" $(NEWLINE) \
+	        $(if $(filter all, $(LOG_REPORT)), \
+	          $(GREP) -v -e "^Note: including file:" <  $(logfile) || true $(NEWLINE) \
+	        , \
+	          ($(GREP) -v -e "^Note: including file:" <  $(logfile) || true) | $(HEAD) -n 15 $(NEWLINE) \
+	          if test `$(WC) -l < $(logfile)` -gt 15; then \
+	            $(ECHO) "   ... (rest of output omitted)" ; \
+	          fi $(NEWLINE) \
+	        ) \
+	    ) \
+	    $(PRINTF) "\n* All command lines available in $(MAKESUPPORT_OUTPUTDIR)/failure-logs.\n" $(NEWLINE) \
+	    $(PRINTF) "=== End of repeated output ===\n" \
 	  ) \
 	)
   endef
@@ -464,12 +460,11 @@ else # $(HAS_SPEC)=true
 	    $(PRINTF) "\n=== Make failed targets repeated here ===\n" ; \
 	    $(GREP) "recipe for target .* failed" $(BUILD_LOG) ; \
 	    $(PRINTF) "=== End of repeated output ===\n" ; \
-	    $(PRINTF) "\nHELP: Try searching the build log for the name of the first failed target.\n" ; \
+	    $(PRINTF) "\nHint: Try searching the build log for the name of the first failed target.\n" ; \
 	  else \
 	    $(PRINTF) "\nNo indication of failed target found.\n" ; \
-	    $(PRINTF) "HELP: Try searching the build log for '] Error'.\n" ; \
-	  fi >> $(MAKESUPPORT_OUTPUTDIR)/failure-summary.log ; \
-	  $(CAT) $(MAKESUPPORT_OUTPUTDIR)/failure-summary.log \
+	    $(PRINTF) "Hint: Try searching the build log for '] Error'.\n" ; \
+	  fi \
 	)
   endef
 

make/Main.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, 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
@@ -260,13 +260,6 @@ $(eval $(call SetupTarget, hotspot-ide-project, \
 ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
     $(HOTSPOT_VARIANT_LIBS_TARGETS)
 
-################################################################################
-# Help and user support
-
-$(eval $(call SetupTarget, doctor, \
-    MAKEFILE := Doctor, \
-))
-
 ################################################################################
 # Generate libs and launcher targets for creating compile_commands.json fragments
 define DeclareCompileCommandsRecipe
@@ -331,7 +324,7 @@ $(eval $(call SetupTarget, vscode-project-ccls, \
 # aren't built until after libjava and libjvm are available to link to.
 $(eval $(call SetupTarget, demos-jdk, \
     MAKEFILE := CompileDemos, \
-    DEPS := java.base-libs exploded-image buildtools-jdk, \
+    DEPS := java.base-libs exploded-image, \
 ))
 
 $(eval $(call SetupTarget, test-image-demos-jdk, \
@@ -390,12 +383,12 @@ bootcycle-images:
 
 $(eval $(call SetupTarget, zip-security, \
     MAKEFILE := ZipSecurity, \
-    DEPS := buildtools-jdk java.base-java java.security.jgss-java java.security.jgss-libs, \
+    DEPS := java.base-java java.security.jgss-java java.security.jgss-libs, \
 ))
 
 $(eval $(call SetupTarget, zip-source, \
     MAKEFILE := ZipSource, \
-    DEPS := buildtools-jdk gensrc, \
+    DEPS := gensrc, \
 ))
 
 $(eval $(call SetupTarget, jrtfs-jar, \
@@ -515,13 +508,13 @@ $(eval $(call SetupTarget, docs-jdk-index, \
 $(eval $(call SetupTarget, docs-zip, \
     MAKEFILE := Docs, \
     TARGET := docs-zip, \
-    DEPS :=  docs-jdk buildtools-jdk, \
+    DEPS :=  docs-jdk, \
 ))
 
 $(eval $(call SetupTarget, docs-specs-zip, \
     MAKEFILE := Docs, \
     TARGET := docs-specs-zip, \
-    DEPS := docs-jdk-specs buildtools-jdk, \
+    DEPS := docs-jdk-specs, \
 ))
 
 $(eval $(call SetupTarget, update-build-docs, \
@@ -533,19 +526,6 @@ $(eval $(call SetupTarget, update-x11wrappers, \
     DEPS := java.base-copy buildtools-jdk, \
 ))
 
-ifneq ($(HSDIS_BACKEND), none)
-  $(eval $(call SetupTarget, build-hsdis, \
-      MAKEFILE := Hsdis, \
-      TARGET := build, \
-  ))
-
-  $(eval $(call SetupTarget, install-hsdis, \
-      MAKEFILE := Hsdis, \
-      TARGET := install, \
-      DEPS := jdk-image, \
-  ))
-endif
-
 ################################################################################
 # Cross compilation support
 
@@ -869,10 +849,6 @@ else
   $(foreach t, $(filter-out java.base-libs, $(LIBS_TARGETS)), \
       $(eval $t: java.base-libs))
 
-  ifeq ($(ENABLE_HSDIS_BUNDLING), true)
-    java.base-copy: build-hsdis
-  endif
-
   # jdk.accessibility depends on java.desktop
   jdk.accessibility-libs: java.desktop-libs
 

make/ModuleWrapper.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
@@ -35,8 +35,6 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
-MODULE_SRC := $(TOPDIR)/src/$(MODULE)
-
 # All makefiles should add the targets to be built to this variable.
 TARGETS :=
 

make/RunTests.gmk

@@ -139,7 +139,7 @@ endif
 ################################################################################
 
 # Each factor variable comes in 3 variants. The first one is reserved for users
-# to use on command line. The other two are for predefined configurations in JDL
+# to use on command line. The other two are for predifined configurations in JDL
 # and for machine specific configurations respectively.
 TEST_JOBS_FACTOR ?= 1
 TEST_JOBS_FACTOR_JDL ?= 1
@@ -200,10 +200,9 @@ $(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG))
 $(eval $(call ParseKeywordVariable, JTREG, \
     SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
         TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS \
-        RETRY_COUNT REPEAT_COUNT MAX_OUTPUT $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
+        RETRY_COUNT MAX_OUTPUT, \
     STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
-        EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \
-        $(CUSTOM_JTREG_STRING_KEYWORDS), \
+        EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS, \
 ))
 
 ifneq ($(JTREG), )
@@ -524,7 +523,7 @@ define SetupRunGtestTestBody
 	    $$(subst $$(TOPDIR)/, , $$($1_TEST_RESULTS_DIR))))
 	$$(if $$(wildcard $$($1_RESULT_FILE)), \
 	  $$(eval $1_TOTAL := $$(shell $$(AWK) '/==========.* tests? from .* \
-	      test (cases?|suites?) ran/ { print $$$$2 }' $$($1_RESULT_FILE))) \
+	      test cases? ran/ { print $$$$2 }' $$($1_RESULT_FILE))) \
 	  $$(if $$($1_TOTAL), , $$(eval $1_TOTAL := 0)) \
 	  $$(eval $1_PASSED := $$(shell $$(AWK) '/\[  PASSED  \] .* tests?./ \
 	      { print $$$$4 }' $$($1_RESULT_FILE))) \
@@ -745,15 +744,6 @@ define SetupRunJtregTestBody
   JTREG_RETAIN ?= fail,error
   JTREG_RUN_PROBLEM_LISTS ?= false
   JTREG_RETRY_COUNT ?= 0
-  JTREG_REPEAT_COUNT ?= 0
-
-  ifneq ($$(JTREG_RETRY_COUNT), 0)
-    ifneq ($$(JTREG_REPEAT_COUNT), 0)
-      $$(info Error: Cannot use both JTREG_RETRY_COUNT and JTREG_REPEAT_COUNT together.)
-      $$(info Please choose one or the other.)
-      $$(error Cannot continue)
-    endif
-  endif
 
   ifneq ($$(JTREG_LAUNCHER_OPTIONS), )
     $1_JTREG_LAUNCHER_OPTIONS += $$(JTREG_LAUNCHER_OPTIONS)
@@ -782,6 +772,8 @@ define SetupRunJtregTestBody
   # Make it possible to specify the JIB_DATA_DIR for tests using the
   # JIB Artifact resolver
   $1_JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR
+  # Some tests needs to find a boot JDK using the JDK8_HOME variable.
+  $1_JTREG_BASIC_OPTIONS += -e:JDK8_HOME=$$(BOOT_JDK)
   # If running on Windows, propagate the _NT_SYMBOL_PATH to enable
   # symbol lookup in hserr files
   ifeq ($$(call isTargetOs, windows), true)
@@ -840,8 +832,6 @@ define SetupRunJtregTestBody
     endif
   endif
 
-  $$(eval $$(call SetupRunJtregTestCustom, $1))
-
   clean-workdir-$1:
 	$$(RM) -r $$($1_TEST_SUPPORT_DIR)
 
@@ -876,18 +866,6 @@ define SetupRunJtregTestBody
         done
   endif
 
-  ifneq ($$(JTREG_REPEAT_COUNT), 0)
-    $1_COMMAND_LINE := \
-        for i in {1..$$(JTREG_REPEAT_COUNT)}; do \
-          $$(PRINTF) "\nRepeating Jtreg run: $$$$i out of $$(JTREG_REPEAT_COUNT)\n"; \
-          $$($1_COMMAND_LINE); \
-          if [ "`$$(CAT) $$($1_EXITCODE)`" != "0" ]; then \
-            $$(PRINTF) "\nFailures detected, no more repeats.\n"; \
-            break; \
-          fi; \
-        done
-  endif
-
   run-test-$1: pre-run-test clean-workdir-$1
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')

make/SourceRevision.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -50,8 +50,8 @@ else ifneq ($(and $(GIT), $(wildcard $(TOPDIR)/.git)), )
   USE_SCM := true
   SCM_DIR := .git
   ID_COMMAND := $(PRINTF) "git:%s%s\n" \
-      "$$($(GIT) log -n1 --format=%H | cut -c1-12)" \
-      "$$(if test -n "$$($(GIT) status --porcelain)"; then printf '+'; fi)"
+      "$$(git log -n1 --format=%H | cut -c1-12)" \
+      "$$(if test -n "$$(git status --porcelain)"; then printf '+'; fi)"
 endif
 
 ifeq ($(USE_SCM), true)

make/TestImage.gmk

@@ -35,8 +35,8 @@ BUILD_INFO_PROPERTIES := $(TEST_IMAGE_DIR)/build-info.properties
 $(BUILD_INFO_PROPERTIES):
 	$(call MakeTargetDir)
 	$(ECHO) "# Build info properties for JDK tests" > $@
-	$(ECHO) 'build.workspace.root=$(call FixPath, $(WORKSPACE_ROOT))' >> $@
-	$(ECHO) 'build.output.root=$(call FixPath, $(OUTPUTDIR))' >> $@
+	$(ECHO) "build.workspace.root=$(call FixPath, $(WORKSPACE_ROOT))" >> $@
+	$(ECHO) "build.output.root=$(call FixPath, $(OUTPUTDIR))" >> $@
 
 README := $(TEST_IMAGE_DIR)/Readme.txt
 

make/ToolsJdk.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, 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
@@ -44,13 +44,16 @@ TOOL_COMPILEFONTCONFIG = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_cla
     --add-exports java.desktop/sun.awt=ALL-UNNAMED \
     build.tools.compilefontconfig.CompileFontConfig
 
+TOOL_COMPILEPROPERTIES = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    build.tools.compileproperties.CompileProperties
+
 TOOL_GENERATECHARACTER = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.generatecharacter.GenerateCharacter
 
 TOOL_CHARACTERNAME = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.generatecharacter.CharacterName
 
-TOOL_DTDBUILDER = $(JAVA_SMALL) -Ddtd_home=$(TOPDIR)/src/java.desktop/share/data/dtdbuilder \
+TOOL_DTDBUILDER = $(JAVA_SMALL) -Ddtd_home=$(TOPDIR)/make/data/dtdbuilder \
     -Djava.awt.headless=true \
     -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes build.tools.dtdbuilder.DTDBuilder
 
@@ -72,15 +75,11 @@ TOOL_MAKEJAVASECURITY = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_clas
     build.tools.makejavasecurity.MakeJavaSecurity
 
 TOOL_GENERATECACERTS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
-    -Dkeystore.pkcs12.certProtectionAlgorithm=NONE \
-    -Dkeystore.pkcs12.macAlgorithm=NONE \
     build.tools.generatecacerts.GenerateCacerts
 
 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
 
 # TODO: There are references to the jdwpgen.jar in jdk/make/netbeans/jdwpgen/build.xml
 # and nbproject/project.properties in the same dir. Needs to be looked at.

make/UpdateX11Wrappers.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
@@ -50,7 +50,7 @@ endif
 X11WRAPPERS_OUTPUT := $(SUPPORT_OUTPUTDIR)/x11wrappers
 GENERATOR_SOURCE_FILE := $(X11WRAPPERS_OUTPUT)/src/data_generator.c
 
-GENSRC_X11WRAPPERS_DATADIR := $(TOPDIR)/src/java.desktop/unix/data/x11wrappergen
+GENSRC_X11WRAPPERS_DATADIR := $(TOPDIR)/make/data/x11wrappergen
 WRAPPER_OUTPUT_FILE := $(GENSRC_X11WRAPPERS_DATADIR)/sizes-$(BITS).txt
 
 BITS := $(OPENJDK_TARGET_CPU_BITS)

make/autoconf/basic.m4

@@ -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
@@ -94,6 +94,11 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
 
   # Locate the directory of this script.
   AUTOCONF_DIR=$TOPDIR/make/autoconf
+
+  # Setup username (for use in adhoc version strings etc)
+  # Outer [ ] to quote m4.
+  [ USERNAME=`$ECHO "$USER" | $TR -d -c '[a-z][A-Z][0-9]'` ]
+  AC_SUBST(USERNAME)
 ])
 
 ###############################################################################
@@ -116,82 +121,6 @@ AC_DEFUN([BASIC_EVAL_BUILD_DEVKIT_VARIABLE],
   fi
 ])
 
-###############################################################################
-AC_DEFUN([BASIC_SETUP_XCODE_SYSROOT],
-[
-  AC_MSG_CHECKING([for sdk name])
-  AC_ARG_WITH([sdk-name], [AS_HELP_STRING([--with-sdk-name],
-      [use the Xcode platform SDK of the given name. @<:@macosx@:>@])],
-      [SDK_NAME=$with_sdk_name]
-  )
-  if test "x$SDK_NAME" = x; then
-    SDK_NAME=macosx
-  fi
-  AC_MSG_RESULT([$SDK_NAME])
-
-  if test "x$DEVKIT_ROOT" != x; then
-    # We need to use xcodebuild from the devkit, if provided
-    UTIL_LOOKUP_PROGS(XCODEBUILD, xcodebuild, $DEVKIT_TOOLCHAIN_PATH)
-    if test "x$XCODEBUILD" = x; then
-      AC_MSG_ERROR([No xcodebuild tool found in the provided devkit])
-    fi
-    XCODEBUILD_OUTPUT=`"$XCODEBUILD" -version 2>&1`
-    if test $? -ne 0; then
-      AC_MSG_ERROR([The xcodebuild tool in the devkit reports an error: $XCODEBUILD_OUTPUT])
-    fi
-  else
-    UTIL_LOOKUP_PROGS(XCODEBUILD, xcodebuild)
-    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
-  fi
-
-  if test "x$SYSROOT" != x; then
-    if ! test -f "$SYSROOT/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then
-      AC_MSG_ERROR([Invalid sysroot, framework headers not found])
-    fi
-    if test "x$with_sdk_name" != x; then
-      AC_MSG_WARN([--with-sdk-name will be ignored since a sysroot or devkit is provided])
-    fi
-    AC_MSG_NOTICE([Setting sysroot from devkit or --with-sysroot])
-  else
-    if test "x$XCODEBUILD" != x; then
-      SYSROOT=`"$XCODEBUILD" -sdk "$SDK_NAME" -version | $GREP '^Path: ' | $SED 's/Path: //'`
-      if test "x$SYSROOT" = x; then
-        AC_MSG_ERROR([No sysroot found for SDK $SDK_NAME from xcodebuild. Check your Xcode installation.])
-      fi
-      if ! test -f "$SYSROOT/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then
-        AC_MSG_ERROR([Unable to find required framework headers, provide a path to an SDK via --with-sysroot or --with-sdk-name and be sure Xcode is installed properly])
-      fi
-      AC_MSG_NOTICE([Setting sysroot from xcodebuild with SDK $SDK_NAME])
-    else
-      UTIL_LOOKUP_PROGS(XCRUN, xcrun)
-      if test "x$XCRUN" != x; then
-        XCRUN_SDK_PATH=`"$XCRUN" --show-sdk-path -sdk "$SDK_NAME"`
-      fi
-
-      if test "x$XCRUN_SDK_PATH" != x && test -f "$XCRUN_SDK_PATH/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then
-        AC_MSG_NOTICE([Setting sysroot from xcrun with SDK $SDK_NAME])
-        SYSROOT="$XCRUN_SDK_PATH"
-      elif test -f /System/Library/Frameworks/Foundation.framework/Headers/Foundation.h; then
-        AC_MSG_WARN([No devkit provided and no xcodebuild found. Proceeding using system headers.])
-        if test "x$with_sdk_name" != x; then
-          AC_MSG_WARN([--with-sdk-name will be ignored since no xcodebuild could be found])
-        fi
-      else
-        AC_MSG_NOTICE([No devkit provided, no xcodebuild tool and no system headers found in the system.])
-        AC_MSG_NOTICE([Check that Xcode is properly installed, or set a devkit with --with-devkit,])
-        AC_MSG_NOTICE([or override SDK selection using --with-sysroot or --with-sdk-name.])
-        AC_MSG_ERROR([Cannot continue])
-      fi
-    fi
-  fi
-])
-
 ###############################################################################
 AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
 [
@@ -248,7 +177,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
     UTIL_PREPEND_TO_PATH([TOOLCHAIN_PATH],$DEVKIT_TOOLCHAIN_PATH)
 
     # If DEVKIT_SYSROOT is set, use that, otherwise try a couple of known
-    # places for backwards compatibility.
+    # places for backwards compatiblity.
     if test "x$DEVKIT_SYSROOT" != x; then
       SYSROOT="$DEVKIT_SYSROOT"
     elif test -d "$DEVKIT_ROOT/$host_alias/libc"; then
@@ -269,7 +198,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
   # You can force the sysroot if the sysroot encoded into the compiler tools
   # is not correct.
   AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root],
-      [alias for --with-sysroot for backwards compatibility])],
+      [alias for --with-sysroot for backwards compatability])],
       [SYSROOT=$with_sys_root]
   )
 
@@ -294,22 +223,87 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
   )
 
   if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then
-    BASIC_SETUP_XCODE_SYSROOT
+    # If a devkit has been supplied, find xcodebuild in the toolchain_path.
+    # If not, detect if Xcode is installed by running xcodebuild -version
+    # if no Xcode installed, xcodebuild exits with 1
+    # if Xcode is installed, even if xcode-select is misconfigured, then it exits with 0
+    if test "x$DEVKIT_ROOT" != x || /usr/bin/xcodebuild -version >/dev/null 2>&1; then
+      # We need to use xcodebuild in the toolchain dir provided by the user
+      UTIL_LOOKUP_PROGS(XCODEBUILD, xcodebuild, $TOOLCHAIN_PATH)
+      if test x$XCODEBUILD = x; then
+        # fall back on the stub binary in /usr/bin/xcodebuild
+        XCODEBUILD=/usr/bin/xcodebuild
+      fi
+    else
+      # this should result in SYSROOT being empty, unless --with-sysroot is provided
+      # when only the command line tools are installed there are no SDKs, so headers
+      # are copied into the system frameworks
+      XCODEBUILD=
+      AC_SUBST(XCODEBUILD)
+    fi
+
+    AC_MSG_CHECKING([for sdk name])
+    AC_ARG_WITH([sdk-name], [AS_HELP_STRING([--with-sdk-name],
+        [use the platform SDK of the given name. @<:@macosx@:>@])],
+        [SDKNAME=$with_sdk_name]
+    )
+    AC_MSG_RESULT([$SDKNAME])
+
+    # if toolchain path is specified then don't rely on system headers, they may not compile
+    HAVE_SYSTEM_FRAMEWORK_HEADERS=0
+    test -z "$TOOLCHAIN_PATH" && \
+      HAVE_SYSTEM_FRAMEWORK_HEADERS=`test ! -f /System/Library/Frameworks/Foundation.framework/Headers/Foundation.h; echo $?`
+
+    if test -z "$SYSROOT"; then
+      if test -n "$XCODEBUILD"; then
+        # if we don't have system headers, use default SDK name (last resort)
+        if test -z "$SDKNAME" -a $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0; then
+          SDKNAME=${SDKNAME:-macosx}
+        fi
+
+        if test -n "$SDKNAME"; then
+          # Call xcodebuild to determine SYSROOT
+          SYSROOT=`"$XCODEBUILD" -sdk $SDKNAME -version | $GREP '^Path: ' | $SED 's/Path: //'`
+        fi
+      else
+        if test $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0; then
+          AC_MSG_ERROR([No xcodebuild tool and no system framework headers found, use --with-sysroot or --with-sdk-name to provide a path to a valid SDK])
+        fi
+      fi
+    else
+      # warn user if --with-sdk-name was also set
+      if test -n "$with_sdk_name"; then
+        AC_MSG_WARN([Both SYSROOT and --with-sdk-name are set, only SYSROOT will be used])
+      fi
+    fi
+
+    if test $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0 -a -z "$SYSROOT"; then
+      # If no system framework headers, then SYSROOT must be set, or we won't build
+      AC_MSG_ERROR([Unable to determine SYSROOT and no headers found in /System/Library/Frameworks. Check Xcode configuration, --with-sysroot or --with-sdk-name arguments.])
+    fi
+
+    # Perform a basic sanity test
+    if test ! -f "$SYSROOT/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then
+      if test -z "$SYSROOT"; then
+        AC_MSG_ERROR([Unable to find required framework headers, provide a path to an SDK via --with-sysroot or --with-sdk-name and be sure Xcode is installed properly])
+      else
+        AC_MSG_ERROR([Invalid SDK or SYSROOT path, dependent framework headers not found])
+      fi
+    fi
+
+    # set SDKROOT too, Xcode tools will pick it up
+    SDKROOT="$SYSROOT"
+    AC_SUBST(SDKROOT)
   fi
 
   # Prepend the extra path to the global path
   UTIL_PREPEND_TO_PATH([PATH],$EXTRA_PATH)
 
-  UTIL_FIXUP_PATH([SYSROOT])
-
   AC_MSG_CHECKING([for sysroot])
   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])
 ])
@@ -449,9 +443,7 @@ AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
 AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
 [
   if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
-    # The choice of file here is somewhat arbitrary, it just needs to be there
-    # in the source tree when configure runs
-    file_to_test="$TOPDIR/Makefile"
+    file_to_test="$TOPDIR/LICENSE"
     if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
       AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin.])
     fi
@@ -507,7 +499,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEFAULT_MAKE_TARGET],
 AC_DEFUN_ONCE([BASIC_SETUP_DEFAULT_LOG],
 [
   AC_ARG_WITH(log, [AS_HELP_STRING([--with-log],
-      [[default value for make LOG argument [warn]]])])
+      [[default vaue for make LOG argument [warn]]])])
   AC_MSG_CHECKING([for default LOG value])
   if test "x$with_log" = x; then
     DEFAULT_LOG=""

make/autoconf/basic_tools.m4

@@ -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
@@ -80,7 +80,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
 
   # 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)
 
@@ -161,23 +160,25 @@ AC_DEFUN([BASIC_CHECK_MAKE_VERSION],
 AC_DEFUN([BASIC_CHECK_MAKE_OUTPUT_SYNC],
 [
   # Check if make supports the output sync option and if so, setup using it.
-  UTIL_ARG_WITH(NAME: output-sync, TYPE: literal,
-      VALID_VALUES: [none recurse line target], DEFAULT: none,
-      OPTIONAL: true, ENABLED_DEFAULT: true,
-      ENABLED_RESULT: OUTPUT_SYNC_SUPPORTED,
-      CHECKING_MSG: [for make --output-sync value],
-      DESC: [set make --output-sync type if supported by make],
-      CHECK_AVAILABLE:
-      [
-        AC_MSG_CHECKING([if make --output-sync is supported])
-        if ! $MAKE --version -O > /dev/null 2>&1; then
-          AC_MSG_RESULT([no])
-          AVAILABLE=false
-        else
-          AC_MSG_RESULT([yes])
-        fi
-      ]
-  )
+  AC_MSG_CHECKING([if make --output-sync is supported])
+  if $MAKE --version -O > /dev/null 2>&1; then
+    OUTPUT_SYNC_SUPPORTED=true
+    AC_MSG_RESULT([yes])
+    AC_MSG_CHECKING([for output-sync value])
+    AC_ARG_WITH([output-sync], [AS_HELP_STRING([--with-output-sync],
+      [set make output sync type if supported by make. @<:@recurse@:>@])],
+      [OUTPUT_SYNC=$with_output_sync])
+    if test "x$OUTPUT_SYNC" = "x"; then
+      OUTPUT_SYNC=none
+    fi
+    AC_MSG_RESULT([$OUTPUT_SYNC])
+    if ! $MAKE --version -O$OUTPUT_SYNC > /dev/null 2>&1; then
+      AC_MSG_ERROR([Make did not the support the value $OUTPUT_SYNC as output sync type.])
+    fi
+  else
+    OUTPUT_SYNC_SUPPORTED=false
+    AC_MSG_RESULT([no])
+  fi
   AC_SUBST(OUTPUT_SYNC_SUPPORTED)
   AC_SUBST(OUTPUT_SYNC)
 ])
@@ -269,8 +270,6 @@ AC_DEFUN([BASIC_CHECK_TAR],
     TAR_TYPE="bsd"
   elif test "x$($TAR -v | $GREP "bsdtar")" != "x"; then
     TAR_TYPE="bsd"
-  elif test "x$($TAR --version | $GREP "busybox")" != "x"; then
-    TAR_TYPE="busybox"
   elif test "x$OPENJDK_BUILD_OS" = "xaix"; then
     TAR_TYPE="aix"
   fi
@@ -282,12 +281,9 @@ AC_DEFUN([BASIC_CHECK_TAR],
     TAR_SUPPORTS_TRANSFORM="true"
   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
+    # that need to be   archived or extracted
     TAR_INCLUDE_PARAM="L"
     TAR_SUPPORTS_TRANSFORM="false"
-  elif test "x$TAR_TYPE" = "xbusybox"; then
-    TAR_INCLUDE_PARAM="T"
-    TAR_SUPPORTS_TRANSFORM="false"
   else
     TAR_INCLUDE_PARAM="I"
     TAR_SUPPORTS_TRANSFORM="false"
@@ -343,6 +339,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
   UTIL_LOOKUP_PROGS(READELF, greadelf readelf)
   UTIL_LOOKUP_PROGS(DOT, dot)
   UTIL_LOOKUP_PROGS(HG, hg)
+  UTIL_LOOKUP_PROGS(GIT, git)
   UTIL_LOOKUP_PROGS(STAT, stat)
   UTIL_LOOKUP_PROGS(TIME, time)
   UTIL_LOOKUP_PROGS(FLOCK, flock)
@@ -351,7 +348,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
   UTIL_LOOKUP_PROGS(DTRACE, dtrace, $PATH:/usr/sbin)
   UTIL_LOOKUP_PROGS(PATCH, gpatch patch)
   # Check if it's GNU time
-  [ IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU [Tt]ime'` ]
+  IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
   if test "x$IS_GNU_TIME" != x; then
     IS_GNU_TIME=yes
   else
@@ -359,33 +356,23 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
   fi
   AC_SUBST(IS_GNU_TIME)
 
-  # Check if it's a GNU date compatible version
-  AC_MSG_CHECKING([if date is a GNU compatible version])
-  check_date=`$DATE --version 2>&1 | $GREP "GNU\|BusyBox"`
-  if test "x$check_date" != x; then
-    AC_MSG_RESULT([yes])
-    IS_GNU_DATE=yes
-  else
-    AC_MSG_RESULT([no])
-    IS_GNU_DATE=no
-  fi
-  AC_SUBST(IS_GNU_DATE)
-
   if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
     UTIL_REQUIRE_PROGS(DSYMUTIL, dsymutil)
     UTIL_REQUIRE_PROGS(MIG, mig)
     UTIL_REQUIRE_PROGS(XATTR, xattr)
     UTIL_LOOKUP_PROGS(CODESIGN, codesign)
 
-    # 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,
-        DESC: [specify the macosx code signing identity],
-        CHECKING_MSG: [for macosx code signing identity]
-    )
-    AC_SUBST(MACOSX_CODESIGN_IDENTITY)
-
     if test "x$CODESIGN" != "x"; then
+      # Check for user provided code signing identity.
+      # If no identity was provided, fall back to "openjdk_codesign".
+      AC_ARG_WITH([macosx-codesign-identity], [AS_HELP_STRING([--with-macosx-codesign-identity],
+        [specify the code signing identity])],
+        [MACOSX_CODESIGN_IDENTITY=$with_macosx_codesign_identity],
+        [MACOSX_CODESIGN_IDENTITY=openjdk_codesign]
+      )
+
+      AC_SUBST(MACOSX_CODESIGN_IDENTITY)
+
       # Verify that the codesign certificate is present
       AC_MSG_CHECKING([if codesign certificate is present])
       $RM codesign-testfile

make/autoconf/basic_windows.m4

@@ -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
@@ -34,10 +34,9 @@ AC_DEFUN([BASIC_SETUP_PATHS_WINDOWS],
       OPENJDK_BUILD_OS_ENV=windows.wsl1
     else
       # This test is not guaranteed, but there is no documented way of
-      # distinguishing between WSL1 and WSL2.
-      # Check whether "Hyper-V" appears in /proc/interrupts because WSL2 runs on Hyper-V.
-      $GREP -q Hyper-V /proc/interrupts
-      if test $? -eq 0; then
+      # distinguishing between WSL1 and WSL2. Assume only WSL2 has WSL_INTEROP
+      # in /run/WSL
+      if test -d "/run/WSL" ; then
         OPENJDK_BUILD_OS_ENV=windows.wsl2
       else
         OPENJDK_BUILD_OS_ENV=windows.wsl1
@@ -185,16 +184,6 @@ AC_DEFUN([BASIC_SETUP_PATHS_WINDOWS],
     AC_MSG_RESULT([unknown])
     AC_MSG_WARN([It seems that your find utility is non-standard.])
   fi
-
-  if test "x$GIT" != x && test -e $TOPDIR/.git; then
-    git_autocrlf=`$GIT config core.autocrlf`
-    if test "x$git_autocrlf" != x && test "x$git_autocrlf" != "xfalse"; then
-      AC_MSG_NOTICE([Your git configuration does not set core.autocrlf to false.])
-      AC_MSG_NOTICE([If you checked out this code using that setting, the build WILL fail.])
-      AC_MSG_NOTICE([To correct, run "git config --global core.autocrlf false" and re-clone the repo.])
-      AC_MSG_WARN([Code is potentially incorrectly cloned. HIGH RISK of build failure!])
-    fi
-  fi
 ])
 
 # Verify that the directory is usable on Windows

make/autoconf/boot-jdk.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, 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
@@ -27,7 +27,7 @@
 # This file handles detection of the Boot JDK. The Boot JDK detection
 # process has been developed as a response to solve a complex real-world
 # problem. Initially, it was simple, but it has grown as platform after
-# platform, idiosyncrasy after idiosyncrasy has been supported.
+# platform, idiosyncracy after idiosyncracy has been supported.
 #
 # The basic idea is this:
 # 1) You need an acceptable *) JDK to use as a Boot JDK
@@ -126,18 +126,16 @@ AC_DEFUN([BOOTJDK_DO_CHECK],
 AC_DEFUN([BOOTJDK_CHECK_ARGUMENTS],
 [
   if test "x$with_boot_jdk" != x; then
-    BOOT_JDK_ARG="$with_boot_jdk"
-    UTIL_FIXUP_PATH(BOOT_JDK_ARG)
-    if test -d "$BOOT_JDK_ARG"; then
-      BOOT_JDK=$BOOT_JDK_ARG
+    if test -d "$with_boot_jdk"; then
+      BOOT_JDK=$with_boot_jdk
       BOOT_JDK_FOUND=maybe
-    elif test -f "$BOOT_JDK_ARG"; then
-      case "$BOOT_JDK_ARG" in
+    elif test -f "$with_boot_jdk"; then
+      case "$with_boot_jdk" in
         *.tar.gz )
             BOOT_JDK_SUPPORT_DIR=$CONFIGURESUPPORT_OUTPUTDIR/boot-jdk
             $RM -rf $BOOT_JDK_SUPPORT_DIR
             $MKDIR -p $BOOT_JDK_SUPPORT_DIR
-            $GUNZIP -c $BOOT_JDK_ARG | $TAR xf - -C $BOOT_JDK_SUPPORT_DIR
+            $GUNZIP -c $with_boot_jdk | $TAR xf - -C $BOOT_JDK_SUPPORT_DIR
 
             # Try to find javac to determine BOOT_JDK path
             BOOT_JDK_JAVAC_PATH=`$FIND $BOOT_JDK_SUPPORT_DIR | $GREP "/bin/javac"`
@@ -300,28 +298,6 @@ AC_DEFUN([BOOTJDK_CHECK_TOOL_IN_BOOTJDK],
     ])
 ])
 
-# Setup CLASSPATH environment variable
-AC_DEFUN([BOOTJDK_SETUP_CLASSPATH],
-[
-  AC_ARG_WITH([classpath], [AS_HELP_STRING([--with-classpath],
-      [Optional classpath to set as CLASSPATH to all Java invocations @<:@none@:>@])])
-
-  if test "x$CLASSPATH" != x; then
-    AC_MSG_WARN([CLASSPATH is set in the environment. This will be ignored. Use --with-classpath instead.])
-  fi
-
-  CLASSPATH=
-
-  if test "x$with_classpath" != x && test "x$with_classpath" != xyes &&
-      test "x$with_classpath" != xno ; then
-    CLASSPATH="$with_classpath"
-    AC_MSG_CHECKING([for classpath to use for all Java invocations])
-    AC_MSG_RESULT([$CLASSPATH])
-  fi
-
-  AC_SUBST(CLASSPATH)
-])
-
 ###############################################################################
 #
 # We need a Boot JDK to bootstrap the build.
@@ -381,16 +357,6 @@ 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 "\-\-date=TIMESTAMP"; then
-    BOOT_JDK_JAR_SUPPORTS_DATE=true
-  else
-    BOOT_JDK_JAR_SUPPORTS_DATE=false
-  fi
-  AC_MSG_CHECKING([if Boot JDK jar supports --date=TIMESTAMP])
-  AC_MSG_RESULT([$BOOT_JDK_JAR_SUPPORTS_DATE])
-  AC_SUBST(BOOT_JDK_JAR_SUPPORTS_DATE)
-
   # When compiling code to be executed by the Boot JDK, force compatibility with the
   # oldest supported bootjdk.
   OLDEST_BOOT_JDK=`$ECHO $DEFAULT_ACCEPTABLE_BOOT_VERSIONS \
@@ -428,8 +394,6 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
     BOOTJDK_USE_LOCAL_CDS=false
     AC_MSG_RESULT([no, -XX:SharedArchiveFile not supported])
   fi
-
-  BOOTJDK_SETUP_CLASSPATH
 ])
 
 AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],

make/autoconf/build-aux/config.guess

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2021, 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.
 #
@@ -67,7 +67,7 @@ fi
 
 # Test and fix architecture string on AIX
 # On AIX 'config.guess' returns 'powerpc' as architecture but 'powerpc' is
-# implicitly handled as 32-bit architecture in 'platform.m4' so we check
+# implicitely handled as 32-bit architecture in 'platform.m4' so we check
 # for the kernel mode rewrite it to 'powerpc64' if we'Re running in 64-bit mode.
 # The check could also be done with `/usr/sbin/prtconf | grep "Kernel Type" | grep "64-bit"`
 echo $OUT | grep powerpc-ibm-aix > /dev/null 2> /dev/null
@@ -111,15 +111,6 @@ if [ "x$OUT" = x ]; then
   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

make/autoconf/build-aux/config.sub

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 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
@@ -46,13 +46,6 @@ if echo $* | grep pc-msys >/dev/null ; then
     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 "$@"
@@ -85,3 +78,4 @@ result=`echo $result | sed "s/^arm-/aarch64-/"`
 
 echo $result
 exit $exitcode
+

make/autoconf/compare.sh.in

@@ -53,7 +53,7 @@ export LDD="@LDD@"
 export LN="@LN@"
 export MKDIR="@MKDIR@"
 export MV="@MV@"
-export NM="@NM@"
+export NM="@GNM@"
 export OBJDUMP="@OBJDUMP@"
 export OTOOL="@OTOOL@"
 export PRINTF="@PRINTF@"

make/autoconf/configure

@@ -274,11 +274,11 @@ do
   # Check for certain autoconf options that require extra action
   case $conf_option in
     -build | --build | --buil | --bui | --bu |-build=* | --build=* | --buil=* | --bui=* | --bu=*)
-      conf_build_set=true ;;
+      conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
     -target | --target | --targe | --targ | --tar | --ta | --t | -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-      conf_incompatible_crosscompile="$conf_incompatible_crosscompile $conf_option" ;;
+      conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
     -host | --host | --hos | --ho | -host=* | --host=* | --hos=* | --ho=*)
-      conf_incompatible_crosscompile="$conf_incompatible_crosscompile $conf_option" ;;
+      conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
     -help | --help | --hel | --he | -h)
       conf_print_help=true ;;
   esac
@@ -287,30 +287,23 @@ done
 # Save the quoted command line
 CONFIGURE_COMMAND_LINE="${conf_quoted_arguments[@]}"
 
-if test "x$conf_incompatible_crosscompile" != "x"; then
+if test "x$conf_legacy_crosscompile" != "x"; then
   if test "x$conf_openjdk_target" != "x"; then
-    echo "Error: --openjdk-target was specified together with"
-    echo "incompatible autoconf cross-compilation flags."
-    echo "You specified: --openjdk-target=$conf_openjdk_target and $conf_incompatible_crosscompile."
-    echo "It is recommended that you only use --openjdk-target."
+    echo "Error: Specifying --openjdk-target together with autoconf"
+    echo "legacy cross-compilation flags is not supported."
+    echo "You specified: --openjdk-target=$conf_openjdk_target and $conf_legacy_crosscompile."
+    echo "The recommended use is just --openjdk-target."
     exit 1
   else
-    echo "Warning: You are using misleading autoconf cross-compilation flag(s)."
-    echo "This is not encouraged as use of such flags during building can"
-    echo "quickly become confusing."
-    echo "It is highly recommended that you use --openjdk-target instead."
+    echo "Warning: You are using legacy autoconf cross-compilation flags."
+    echo "It is recommended that you use --openjdk-target instead."
     echo ""
   fi
 fi
 
 if test "x$conf_openjdk_target" != "x"; then
-  conf_processed_arguments=("--host=$conf_openjdk_target" "--target=$conf_openjdk_target" "${conf_processed_arguments[@]}")
-
-  # If --build has been explicitly set don't override that flag with our own
-  if test "x$conf_build_set" != xtrue; then
-    conf_build_platform=`sh $conf_script_dir/build-aux/config.guess`
-    conf_processed_arguments=("--build=$conf_build_platform" "${conf_processed_arguments[@]}")
-  fi
+  conf_build_platform=`sh $conf_script_dir/build-aux/config.guess`
+  conf_processed_arguments=("--build=$conf_build_platform" "--host=$conf_openjdk_target" "--target=$conf_openjdk_target" "${conf_processed_arguments[@]}")
 fi
 
 # Make configure exit with error on invalid options as default.
@@ -348,9 +341,7 @@ Additional (non-autoconf) OpenJDK Options:
   --openjdk-target=TARGET cross-compile with TARGET as target platform
                           (i.e. the one you will run the resulting binary on).
                           Equivalent to --host=TARGET --target=TARGET
-                          --build=<current platform>, or the platform you
-                          have provided if you have explicitly passed
-                          --build to configure
+                          --build=<current platform>
   --debug-configure       Run the configure script with additional debug
                           logging enabled.
 

make/autoconf/configure.ac

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, 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
@@ -152,7 +152,6 @@ BOOTJDK_SETUP_DOCS_REFERENCE_JDK
 #
 ###############################################################################
 
-JDKOPT_SETUP_REPRODUCIBLE_BUILD
 JDKOPT_SETUP_JDK_OPTIONS
 
 ###############################################################################
@@ -208,6 +207,7 @@ PLATFORM_SETUP_OPENJDK_TARGET_BITS
 PLATFORM_SETUP_OPENJDK_TARGET_ENDIANNESS
 
 # Configure flags for the tools. Need to know if we should build reproducible.
+JDKOPT_SETUP_REPRODUCIBLE_BUILD
 FLAGS_SETUP_FLAGS
 
 # Setup debug symbols (need objcopy from the toolchain for that)

make/autoconf/flags-cflags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, 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
@@ -95,39 +95,11 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
   # info flags for toolchains unless we know they work.
   # See JDK-8207057.
   ASFLAGS_DEBUG_SYMBOLS=""
-
-  # Debug prefix mapping if supported by compiler
-  DEBUG_PREFIX_CFLAGS=
-
   # Debug symbols
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
-      # Check if compiler supports -fdebug-prefix-map. If so, use that to make
-      # the debug symbol paths resolve to paths relative to the workspace root.
-      workspace_root_trailing_slash="${WORKSPACE_ROOT%/}/"
-      DEBUG_PREFIX_CFLAGS="-fdebug-prefix-map=${workspace_root_trailing_slash}="
-      FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${DEBUG_PREFIX_CFLAGS}],
-        IF_FALSE: [
-            DEBUG_PREFIX_CFLAGS=
-        ]
-      )
-    fi
-
     CFLAGS_DEBUG_SYMBOLS="-g"
     ASFLAGS_DEBUG_SYMBOLS="-g"
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
-    if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
-      # Check if compiler supports -fdebug-prefix-map. If so, use that to make
-      # the debug symbol paths resolve to paths relative to the workspace root.
-      workspace_root_trailing_slash="${WORKSPACE_ROOT%/}/"
-      DEBUG_PREFIX_CFLAGS="-fdebug-prefix-map=${workspace_root_trailing_slash}="
-      FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${DEBUG_PREFIX_CFLAGS}],
-        IF_FALSE: [
-            DEBUG_PREFIX_CFLAGS=
-        ]
-      )
-    fi
-
     CFLAGS_DEBUG_SYMBOLS="-g"
     ASFLAGS_DEBUG_SYMBOLS="-g"
   elif test "x$TOOLCHAIN_TYPE" = xxlc; then
@@ -136,11 +108,6 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
     CFLAGS_DEBUG_SYMBOLS="-Z7"
   fi
 
-  if test "x$DEBUG_PREFIX_CFLAGS" != x; then
-    CFLAGS_DEBUG_SYMBOLS="$CFLAGS_DEBUG_SYMBOLS $DEBUG_PREFIX_CFLAGS"
-    ASFLAGS_DEBUG_SYMBOLS="$ASFLAGS_DEBUG_SYMBOLS $DEBUG_PREFIX_CFLAGS"
-  fi
-
   AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
   AC_SUBST(ASFLAGS_DEBUG_SYMBOLS)
 ])
@@ -170,7 +137,7 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       DISABLED_WARNINGS="4800"
       if test "x$TOOLCHAIN_VERSION" = x2017; then
         # VS2017 incorrectly triggers this warning for constexpr
-        DISABLED_WARNINGS="$DISABLED_WARNINGS 4307"
+        DISABLED_WARNINGS+=" 4307"
       fi
       ;;
 
@@ -192,7 +159,6 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
 
     clang)
       DISABLE_WARNING_PREFIX="-Wno-"
-      BUILD_CC_DISABLE_WARNING_PREFIX="-Wno-"
       CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
 
       # Additional warnings that are not activated by -Wall and -Wextra
@@ -234,7 +200,7 @@ AC_DEFUN([FLAGS_SETUP_QUALITY_CHECKS],
       ;;
     slowdebug )
       # FIXME: By adding this to C(XX)FLAGS_DEBUG_OPTIONS/JVM_CFLAGS_SYMBOLS it
-      # gets added conditionally on whether we produce debug symbols or not.
+      # get's added conditionally on whether we produce debug symbols or not.
       # This is most likely not really correct.
 
       # Add runtime stack smashing and undefined behavior checks.
@@ -470,13 +436,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     ALWAYS_DEFINES_JVM="-D_REENTRANT"
     ALWAYS_DEFINES_JDK="-D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    # Access APIs for Windows 8 and above
-    # see https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=msvc-170
-    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_WINSOCK_DEPRECATED_NO_WARNINGS"
+    ALWAYS_DEFINES_JDK="-DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_DEPRECATE \
+        -D_CRT_NONSTDC_NO_DEPRECATE -DWIN32 -DIAL"
+    ALWAYS_DEFINES_JVM="-DNOMINMAX -DWIN32_LEAN_AND_MEAN"
   fi
 
   ###############################################################################
@@ -534,8 +496,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     TOOLCHAIN_CFLAGS_JVM="-qtbtable=full -qtune=balanced \
         -qalias=noansi -qstrict -qtls=default -qnortti -qnoeh -qignerrno -qstackprotect"
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:strictStrings -MP"
-    TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:strictStrings -Zc:wchar_t-"
+    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -MP"
+    TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:wchar_t-"
   fi
 
   # CFLAGS C language level for JDK sources (hotspot only uses C++)
@@ -684,7 +646,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
     $1_DEFINES_CPU_JVM="${$1_DEFINES_CPU_JVM} -D_LP64=1"
   fi
 
-  # toolchain dependent, per-cpu
+  # toolchain dependend, per-cpu
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     if test "x$FLAGS_CPU" = xaarch64; then
       $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_ARM64_ -Darm64"
@@ -820,8 +782,10 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
         test "x$ENABLE_REPRODUCIBLE_BUILD" = xtrue; then
       # There is a known issue with the pathmap if the mapping is made to the
       # empty string. Add a minimal string "s" as prefix to work around this.
+      workspace_root_win=`$FIXPATH_BASE print "${WORKSPACE_ROOT%/}"`
       # PATHMAP_FLAGS is also added to LDFLAGS in flags-ldflags.m4.
-      PATHMAP_FLAGS="-pathmap:${WORKSPACE_ROOT}=s"
+      PATHMAP_FLAGS="-pathmap:${workspace_root_win//\//\\\\}=s \
+          -pathmap:${workspace_root_win}=s"
       FILE_MACRO_CFLAGS="$PATHMAP_FLAGS"
       FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${FILE_MACRO_CFLAGS}],
           PREFIX: $3,
@@ -841,19 +805,17 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
   fi
   AC_SUBST(FILE_MACRO_CFLAGS)
 
-  FLAGS_SETUP_BRANCH_PROTECTION
-
   # EXPORT to API
   CFLAGS_JVM_COMMON="$ALWAYS_CFLAGS_JVM $ALWAYS_DEFINES_JVM \
       $TOOLCHAIN_CFLAGS_JVM ${$1_TOOLCHAIN_CFLAGS_JVM} \
       $OS_CFLAGS $OS_CFLAGS_JVM $CFLAGS_OS_DEF_JVM $DEBUG_CFLAGS_JVM \
       $WARNING_CFLAGS $WARNING_CFLAGS_JVM $JVM_PICFLAG $FILE_MACRO_CFLAGS \
-      $REPRODUCIBLE_CFLAGS $BRANCH_PROTECTION_CFLAGS"
+      $REPRODUCIBLE_CFLAGS"
 
   CFLAGS_JDK_COMMON="$ALWAYS_CFLAGS_JDK $ALWAYS_DEFINES_JDK $TOOLCHAIN_CFLAGS_JDK \
       $OS_CFLAGS $CFLAGS_OS_DEF_JDK $DEBUG_CFLAGS_JDK $DEBUG_OPTIONS_FLAGS_JDK \
       $WARNING_CFLAGS $WARNING_CFLAGS_JDK $DEBUG_SYMBOLS_CFLAGS_JDK \
-      $FILE_MACRO_CFLAGS $REPRODUCIBLE_CFLAGS $BRANCH_PROTECTION_CFLAGS"
+      $FILE_MACRO_CFLAGS $REPRODUCIBLE_CFLAGS"
 
   # Use ${$2EXTRA_CFLAGS} to block EXTRA_CFLAGS to be added to build flags.
   # (Currently we don't have any OPENJDK_BUILD_EXTRA_CFLAGS, but that might
@@ -907,8 +869,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
 # $2 - Prefix for compiler variables (either BUILD_ or nothing).
 AC_DEFUN([FLAGS_SETUP_GCC6_COMPILER_FLAGS],
 [
-  # These flags are required for GCC 6 builds as undefined behavior in OpenJDK code
-  # runs afoul of the more aggressive versions of these optimizations.
+  # These flags are required for GCC 6 builds as undefined behaviour in OpenJDK code
+  # runs afoul of the more aggressive versions of these optimisations.
   # 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"
@@ -919,24 +881,3 @@ AC_DEFUN([FLAGS_SETUP_GCC6_COMPILER_FLAGS],
       PREFIX: $2, IF_FALSE: [NO_LIFETIME_DSE_CFLAG=""])
   $1_GCC6_CFLAGS="${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
 ])
-
-AC_DEFUN_ONCE([FLAGS_SETUP_BRANCH_PROTECTION],
-[
-  # Is branch protection available?
-  BRANCH_PROTECTION_AVAILABLE=false
-  BRANCH_PROTECTION_FLAG="-mbranch-protection=standard"
-
-  if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-      FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${BRANCH_PROTECTION_FLAG}],
-          IF_TRUE: [BRANCH_PROTECTION_AVAILABLE=true])
-    fi
-  fi
-
-  BRANCH_PROTECTION_CFLAGS=""
-  UTIL_ARG_ENABLE(NAME: branch-protection, DEFAULT: false,
-      RESULT: USE_BRANCH_PROTECTION, AVAILABLE: $BRANCH_PROTECTION_AVAILABLE,
-      DESC: [enable branch protection when compiling C/C++],
-      IF_ENABLED: [ BRANCH_PROTECTION_CFLAGS=${BRANCH_PROTECTION_FLAG}])
-  AC_SUBST(BRANCH_PROTECTION_CFLAGS)
-])

make/autoconf/flags-ldflags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, 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
@@ -32,10 +32,16 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS],
 
   # Setup the target toolchain
 
-  # The target dir matches the name of VM variant
-  TARGET_JVM_VARIANT_PATH=$JVM_VARIANT_MAIN
-
   # On some platforms (mac) the linker warns about non existing -L dirs.
+  # For any of the variants server, client or minimal, the dir matches the
+  # variant name. The "main" variant should be used for linking. For the
+  # rest, the dir is just server.
+  if HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client) \
+      || HOTSPOT_CHECK_JVM_VARIANT(minimal); then
+    TARGET_JVM_VARIANT_PATH=$JVM_VARIANT_MAIN
+  else
+    TARGET_JVM_VARIANT_PATH=server
+  fi
   FLAGS_SETUP_LDFLAGS_CPU_DEP([TARGET])
 
   # Setup the build toolchain
@@ -77,7 +83,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
         -fPIC"
 
   elif test "x$TOOLCHAIN_TYPE" = xxlc; then
-    BASIC_LDFLAGS="-b64 -brtl -bnorwexec -bnolibpath -bnoexpall -bernotok -btextpsize:64K \
+    BASIC_LDFLAGS="-b64 -brtl -bnorwexec -bnolibpath -bexpall -bernotok -btextpsize:64K \
         -bdatapsize:64K -bstackpsize:64K"
     # libjvm.so has gotten too large for normal TOC size; compile with qpic=large and link with bigtoc
     BASIC_LDFLAGS_JVM_ONLY="-Wl,-lC_r -bbigtoc"
@@ -95,10 +101,13 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
   fi
 
   # Setup OS-dependent LDFLAGS
-  if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$TOOLCHAIN_TYPE" = xclang; then
-    # FIXME: We should really generalize SET_SHARED_LIBRARY_ORIGIN instead.
-    OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.."
-    OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN"
+  if test "x$TOOLCHAIN_TYPE" = xclang || test "x$TOOLCHAIN_TYPE" = xgcc; then
+    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+      # Assume clang or gcc.
+      # FIXME: We should really generalize SET_SHARED_LIBRARY_ORIGIN instead.
+      OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.."
+      OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN"
+    fi
   fi
 
   # Setup debug level-dependent LDFLAGS

make/autoconf/flags-other.m4

@@ -89,12 +89,11 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS],
 
     # Fix linker warning.
     # Code taken from make/autoconf/flags-cflags.m4 and adapted.
-    JVM_BASIC_ASFLAGS="$JVM_BASIC_ASFLAGS \
-        -DMAC_OS_X_VERSION_MIN_REQUIRED=$MACOSX_VERSION_MIN_NODOTS \
+    JVM_BASIC_ASFLAGS+=" -DMAC_OS_X_VERSION_MIN_REQUIRED=$MACOSX_VERSION_MIN_NODOTS \
         -mmacosx-version-min=$MACOSX_VERSION_MIN"
 
     if test -n "$MACOSX_VERSION_MAX"; then
-        JVM_BASIC_ASFLAGS="$JVM_BASIC_ASFLAGS $OS_CFLAGS \
+        JVM_BASIC_ASFLAGS+=" $OS_CFLAGS \
             -DMAC_OS_X_VERSION_MAX_ALLOWED=$MACOSX_VERSION_MAX_NODOTS"
     fi
   fi

make/autoconf/flags.m4

@@ -215,21 +215,8 @@ AC_DEFUN([FLAGS_SETUP_SYSROOT_FLAGS],
       $1SYSROOT_CFLAGS="--sysroot=[$]$1SYSROOT"
       $1SYSROOT_LDFLAGS="--sysroot=[$]$1SYSROOT"
     elif test "x$TOOLCHAIN_TYPE" = xclang; then
-      if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
-        # -isysroot has no effect on linux
-        # https://bugs.llvm.org/show_bug.cgi?id=11503
-        $1SYSROOT_CFLAGS="--sysroot=[$]$1SYSROOT"
-        $1SYSROOT_LDFLAGS="--sysroot=[$]$1SYSROOT"
-        if test -d "$DEVKIT_TOOLCHAIN_PATH"; then
-          # In devkits, gcc is not located in the sysroot.
-          # use --gcc-toolchain to let clang find the gcc installation.
-          $1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS --gcc-toolchain=$DEVKIT_TOOLCHAIN_PATH/.."
-          $1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS --gcc-toolchain=$DEVKIT_TOOLCHAIN_PATH/.."
-        fi
-      else
-        $1SYSROOT_CFLAGS="-isysroot [$]$1SYSROOT"
-        $1SYSROOT_LDFLAGS="-isysroot [$]$1SYSROOT"
-      fi
+      $1SYSROOT_CFLAGS="-isysroot [$]$1SYSROOT"
+      $1SYSROOT_LDFLAGS="-isysroot [$]$1SYSROOT"
     fi
   fi
 
@@ -295,7 +282,7 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
   # FIXME: Don't really know how to do with this, but this was the old behavior
   GLOBAL_CPPFLAGS="$SYSROOT_CFLAGS"
 
-  # FIXME: For compatibility, export this as EXTRA_CFLAGS for now.
+  # FIXME: For compatilibity, export this as EXTRA_CFLAGS for now.
   EXTRA_CFLAGS="$MACHINE_FLAG $USER_CFLAGS"
   EXTRA_CXXFLAGS="$MACHINE_FLAG $USER_CXXFLAGS"
   EXTRA_LDFLAGS="$MACHINE_FLAG $USER_LDFLAGS"
@@ -340,7 +327,7 @@ AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL],
     # Check if @file is supported by gcc
     if test "x$TOOLCHAIN_TYPE" = xgcc; then
       AC_MSG_CHECKING([if @file is supported by gcc])
-      # Extra empty "" to prevent ECHO from interpreting '--version' as argument
+      # Extra emtpy "" to prevent ECHO from interpreting '--version' as argument
       $ECHO "" "--version" > command.file
       if $CXX @command.file 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD; then
         AC_MSG_RESULT(yes)

make/autoconf/help.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, 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
@@ -25,7 +25,7 @@
 
 AC_DEFUN_ONCE([HELP_SETUP_DEPENDENCY_HELP],
 [
-  UTIL_LOOKUP_PROGS(PKGHANDLER, zypper apt-get yum brew port pkgutil pkgadd pacman apk)
+  UTIL_LOOKUP_PROGS(PKGHANDLER, zypper apt-get yum brew port pkgutil pkgadd pacman)
 ])
 
 AC_DEFUN([HELP_MSG_MISSING_DEPENDENCY],
@@ -58,8 +58,6 @@ AC_DEFUN([HELP_MSG_MISSING_DEPENDENCY],
         zypper_help  $MISSING_DEPENDENCY ;;
       *pacman)
         pacman_help  $MISSING_DEPENDENCY ;;
-      *apk)
-        apk_help     $MISSING_DEPENDENCY ;;
     esac
 
     if test "x$PKGHANDLER_COMMAND" != x; then
@@ -82,14 +80,6 @@ cygwin_help() {
       PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P make )"
       HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
       ;;
-    i686-w64-mingw32-gcc)
-      PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P gcc-core i686-w64-mingw32-gcc-core mingw64-i686-glib2.0 )"
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-      ;;
-    x86_64-w64-mingw32-gcc)
-      PKGHANDLER_COMMAND="( cd <location of cygwin setup.exe> && cmd /c setup -q -P gcc-core x86_64-w64-mingw32-gcc-core mingw64-x86_64-glib2.0 )"
-      HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
-      ;;
   esac
 }
 
@@ -117,8 +107,6 @@ apt_help() {
       PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
     dtrace)
       PKGHANDLER_COMMAND="sudo apt-get install systemtap-sdt-dev" ;;
-    capstone)
-      PKGHANDLER_COMMAND="sudo apt-get install libcapstone-dev" ;;
   esac
 }
 
@@ -170,8 +158,6 @@ brew_help() {
       PKGHANDLER_COMMAND="brew install freetype" ;;
     ccache)
       PKGHANDLER_COMMAND="brew install ccache" ;;
-    capstone)
-      PKGHANDLER_COMMAND="brew install capstone" ;;
   esac
 }
 
@@ -198,27 +184,6 @@ pkgadd_help() {
   PKGHANDLER_COMMAND=""
 }
 
-apk_help() {
-  case $1 in
-    devkit)
-      PKGHANDLER_COMMAND="sudo apk add alpine-sdk linux-headers" ;;
-    alsa)
-      PKGHANDLER_COMMAND="sudo apk add alsa-lib-dev" ;;
-    cups)
-      PKGHANDLER_COMMAND="sudo apk add cups-dev" ;;
-    fontconfig)
-      PKGHANDLER_COMMAND="sudo apk add fontconfig-dev" ;;
-    freetype)
-      PKGHANDLER_COMMAND="sudo apk add freetype-dev" ;;
-    harfbuzz)
-      PKGHANDLER_COMMAND="sudo apk add harfbuzz-dev" ;;
-    x11)
-      PKGHANDLER_COMMAND="sudo apk add libxtst-dev libxt-dev libxrender-dev libxrandr-dev" ;;
-    ccache)
-      PKGHANDLER_COMMAND="sudo apk add ccache" ;;
-  esac
-}
-
 # This function will check if we're called from the "configure" wrapper while
 # printing --help. If so, we will print out additional information that can
 # only be extracted within the autoconf script, and then exit. This must be
@@ -296,13 +261,6 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
   printf "* OpenJDK target: OS: $OPENJDK_TARGET_OS, CPU architecture: $OPENJDK_TARGET_CPU_ARCH, address length: $OPENJDK_TARGET_CPU_BITS\n"
   printf "* Version string: $VERSION_STRING ($VERSION_SHORT)\n"
 
-  if test "x$SOURCE_DATE" != xupdated; then
-    source_date_info="$SOURCE_DATE ($SOURCE_DATE_ISO_8601)"
-  else
-    source_date_info="Determined at build time"
-  fi
-  printf "* Source date:    $source_date_info\n"
-
   printf "\n"
   printf "Tools summary:\n"
   if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
@@ -311,19 +269,12 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
   fi
   printf "* Boot JDK:       $BOOT_JDK_VERSION (at $BOOT_JDK)\n"
   printf "* Toolchain:      $TOOLCHAIN_TYPE ($TOOLCHAIN_DESCRIPTION)\n"
-  if test "x$DEVKIT_NAME" != x; then
-    printf "* Devkit:         $DEVKIT_NAME ($DEVKIT_ROOT)\n"
-  elif test "x$DEVKIT_ROOT" != x; then
-    printf "* Devkit:         $DEVKIT_ROOT\n"
-  elif test "x$SYSROOT" != x; then
-    printf "* Sysroot:        $SYSROOT\n"
-  fi
   printf "* C Compiler:     Version $CC_VERSION_NUMBER (at ${CC#"$FIXPATH "})\n"
   printf "* C++ Compiler:   Version $CXX_VERSION_NUMBER (at ${CXX#"$FIXPATH "})\n"
 
   printf "\n"
   printf "Build performance summary:\n"
-  printf "* Build jobs:     $JOBS\n"
+  printf "* Cores to use:   $JOBS\n"
   printf "* Memory limit:   $MEMORY_SIZE MB\n"
   if test "x$CCACHE_STATUS" != "x"; then
     printf "* ccache status:  $CCACHE_STATUS\n"

make/autoconf/hotspot.m4

@@ -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
@@ -83,10 +83,19 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_VARIANTS],
     AC_MSG_ERROR([Cannot continue])
   fi
 
+  # All "special" variants share the same output directory ("server")
+  VALID_MULTIPLE_JVM_VARIANTS="server client minimal"
+  UTIL_GET_NON_MATCHING_VALUES(INVALID_MULTIPLE_VARIANTS, $JVM_VARIANTS, \
+      $VALID_MULTIPLE_JVM_VARIANTS)
+  if  test "x$INVALID_MULTIPLE_VARIANTS" != x && \
+      test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = xtrue; then
+    AC_MSG_ERROR([You can only build multiple variants using these variants: '$VALID_MULTIPLE_JVM_VARIANTS'])
+  fi
+
   # The "main" variant is the one used by other libs to link against during the
   # build.
   if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xtrue"; then
-    MAIN_VARIANT_PRIO_ORDER="server client minimal zero"
+    MAIN_VARIANT_PRIO_ORDER="server client minimal"
     for variant in $MAIN_VARIANT_PRIO_ORDER; do
       if HOTSPOT_CHECK_JVM_VARIANT($variant); then
         JVM_VARIANT_MAIN="$variant"
@@ -114,26 +123,12 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_MISC],
     HOTSPOT_TARGET_CPU_ARCH=zero
   fi
 
-
   AC_ARG_WITH([hotspot-build-time], [AS_HELP_STRING([--with-hotspot-build-time],
-  [timestamp to use in hotspot version string, empty means determined at build time @<:@source-date/empty@:>@])])
-
-  AC_MSG_CHECKING([what hotspot build time to use])
+  [timestamp to use in hotspot version string, empty for on-the-fly @<:@empty@:>@])])
 
   if test "x$with_hotspot_build_time" != x; then
     HOTSPOT_BUILD_TIME="$with_hotspot_build_time"
-    AC_MSG_RESULT([$HOTSPOT_BUILD_TIME (from --with-hotspot-build-time)])
-  else
-    if test "x$SOURCE_DATE" = xupdated; then
-      HOTSPOT_BUILD_TIME=""
-      AC_MSG_RESULT([determined at build time (default)])
-    else
-      # If we have a fixed value for SOURCE_DATE, use it as default
-      HOTSPOT_BUILD_TIME="$SOURCE_DATE_ISO_8601"
-      AC_MSG_RESULT([$HOTSPOT_BUILD_TIME (from --with-source-date)])
-    fi
   fi
-
   AC_SUBST(HOTSPOT_BUILD_TIME)
 
 
@@ -142,4 +137,10 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_MISC],
     HOTSPOT_TARGET_CPU=arm_32
     HOTSPOT_TARGET_CPU_DEFINE="ARM32"
   fi
+
+  # --with-cpu-port is no longer supported
+  UTIL_DEPRECATED_ARG_WITH(with-cpu-port)
+
+  # in jdk15 hotspot-gtest was replaced with --with-gtest
+  UTIL_DEPRECATED_ARG_ENABLE(hotspot-gtest)
 ])

make/autoconf/jdk-options.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, 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
@@ -23,6 +23,20 @@
 # questions.
 #
 
+###############################################################################
+# Check which variant of the JDK that we want to build.
+# Currently we have:
+#    normal:   standard edition
+# but the custom make system may add other variants
+#
+# Effectively the JDK variant gives a name to a specific set of
+# modules to compile into the JDK.
+AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VARIANT],
+[
+  # Deprecated in JDK 12
+  UTIL_DEPRECATED_ARG_WITH([jdk-variant])
+])
+
 ###############################################################################
 # Set the debug level
 #    release: no debug information, all optimizations, no asserts.
@@ -155,23 +169,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
   fi
   AC_SUBST(CACERTS_FILE)
 
-  # Choose cacerts source folder for user provided PEM files
-  AC_ARG_WITH(cacerts-src, [AS_HELP_STRING([--with-cacerts-src],
-      [specify alternative cacerts source folder containing certificates])])
-  CACERTS_SRC=""
-  AC_MSG_CHECKING([for cacerts source])
-  if test "x$with_cacerts_src" == x; then
-    AC_MSG_RESULT([default])
-  else
-    CACERTS_SRC=$with_cacerts_src
-    if test ! -d "$CACERTS_SRC"; then
-      AC_MSG_RESULT([fail])
-      AC_MSG_ERROR([Specified cacerts source folder "$CACERTS_SRC" does not exist])
-    fi
-    AC_MSG_RESULT([$CACERTS_SRC])
-  fi
-  AC_SUBST(CACERTS_SRC)
-
   # Enable or disable unlimited crypto
   UTIL_ARG_ENABLE(NAME: unlimited-crypto, DEFAULT: true, RESULT: UNLIMITED_CRYPTO,
       DESC: [enable unlimited crypto policy])
@@ -197,17 +194,11 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
 
   # Setup default copyright year. Mostly overridden when building close to a new year.
   AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year],
-      [Set copyright year value for build @<:@current year/source-date@:>@])])
+      [Set copyright year value for build @<:@current year@:>@])])
   if test "x$with_copyright_year" = xyes; then
     AC_MSG_ERROR([Copyright year must have a value])
   elif test "x$with_copyright_year" != x; then
     COPYRIGHT_YEAR="$with_copyright_year"
-  elif test "x$SOURCE_DATE" != xupdated; then
-    if test "x$IS_GNU_DATE" = xyes; then
-      COPYRIGHT_YEAR=`$DATE --date=@$SOURCE_DATE +%Y`
-    else
-      COPYRIGHT_YEAR=`$DATE -j -f %s $SOURCE_DATE +%Y`
-    fi
   else
     COPYRIGHT_YEAR=`$DATE +'%Y'`
   fi
@@ -494,7 +485,7 @@ AC_DEFUN_ONCE([JDKOPT_ENABLE_DISABLE_FAILURE_HANDLER],
 [
   UTIL_ARG_ENABLE(NAME: jtreg-failure-handler, DEFAULT: auto,
       RESULT: BUILD_FAILURE_HANDLER,
-      DESC: [enable building of the jtreg failure handler],
+      DESC: [enable keeping of packaged modules in jdk image],
       DEFAULT_DESC: [enabled if jtreg is present],
       CHECKING_MSG: [if the jtreg failure handler should be built],
       CHECK_AVAILABLE: [
@@ -648,28 +639,15 @@ AC_DEFUN([JDKOPT_ALLOW_ABSOLUTE_PATHS_IN_OUTPUT],
 AC_DEFUN_ONCE([JDKOPT_SETUP_REPRODUCIBLE_BUILD],
 [
   AC_ARG_WITH([source-date], [AS_HELP_STRING([--with-source-date],
-      [how to set SOURCE_DATE_EPOCH ('updated', 'current', 'version' a timestamp or an ISO-8601 date) @<:@updated/value of SOURCE_DATE_EPOCH@:>@])],
+      [how to set SOURCE_DATE_EPOCH ('updated', 'current', 'version' a timestamp or an ISO-8601 date) @<:@updated@:>@])],
       [with_source_date_present=true], [with_source_date_present=false])
 
-  if test "x$SOURCE_DATE_EPOCH" != x && test "x$with_source_date" != x; then
-    AC_MSG_WARN([--with-source-date will override SOURCE_DATE_EPOCH])
-  fi
-
   AC_MSG_CHECKING([what source date to use])
 
   if test "x$with_source_date" = xyes; then
     AC_MSG_ERROR([--with-source-date must have a value])
-  elif test "x$with_source_date" = x; then
-    if test "x$SOURCE_DATE_EPOCH" != x; then
-      SOURCE_DATE=$SOURCE_DATE_EPOCH
-      with_source_date_present=true
-      AC_MSG_RESULT([$SOURCE_DATE, from SOURCE_DATE_EPOCH])
-    else
-      # Tell the makefiles to update at each build
-      SOURCE_DATE=updated
-      AC_MSG_RESULT([determined at build time (default)])
-    fi
-  elif test "x$with_source_date" = xupdated; then
+  elif test "x$with_source_date" = xupdated || test "x$with_source_date" = x; then
+    # Tell the makefiles to update at each build
     SOURCE_DATE=updated
     AC_MSG_RESULT([determined at build time, from 'updated'])
   elif test "x$with_source_date" = xcurrent; then
@@ -701,18 +679,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_REPRODUCIBLE_BUILD],
     fi
   fi
 
-  ISO_8601_FORMAT_STRING="%Y-%m-%dT%H:%M:%SZ"
-  if test "x$SOURCE_DATE" != xupdated; then
-    # If we have a fixed value for SOURCE_DATE, we need to set SOURCE_DATE_EPOCH
-    # for the rest of configure.
-    SOURCE_DATE_EPOCH="$SOURCE_DATE"
-    if test "x$IS_GNU_DATE" = xyes; then
-      SOURCE_DATE_ISO_8601=`$DATE --utc --date="@$SOURCE_DATE" +"$ISO_8601_FORMAT_STRING" 2> /dev/null`
-    else
-      SOURCE_DATE_ISO_8601=`$DATE -u -j -f "%s" "$SOURCE_DATE" +"$ISO_8601_FORMAT_STRING" 2> /dev/null`
-    fi
-  fi
-
   REPRODUCIBLE_BUILD_DEFAULT=$with_source_date_present
 
   if test "x$OPENJDK_BUILD_OS" = xwindows && \
@@ -730,13 +696,11 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_REPRODUCIBLE_BUILD],
   if test "x$OPENJDK_BUILD_OS" = xwindows && \
       test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = xfalse && \
       test "x$ENABLE_REPRODUCIBLE_BUILD" = xfalse; then
-    AC_MSG_NOTICE([On Windows it is not possible to combine  --disable-reproducible-build])
+    AC_MSG_NOTICE([On Windows it is not possible to combine  --disable-reproducible-builds])
     AC_MSG_NOTICE([with --disable-absolute-paths-in-output.])
     AC_MSG_ERROR([Cannot continue])
   fi
 
   AC_SUBST(SOURCE_DATE)
   AC_SUBST(ENABLE_REPRODUCIBLE_BUILD)
-  AC_SUBST(ISO_8601_FORMAT_STRING)
-  AC_SUBST(SOURCE_DATE_ISO_8601)
 ])

make/autoconf/jdk-version.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -69,24 +69,11 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   AC_SUBST(JDK_RC_PLATFORM_NAME)
   AC_SUBST(HOTSPOT_VM_DISTRO)
 
-  # Setup username (for use in adhoc version strings etc)
-  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
   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
+  if test "x$with_jdk_rc_name" = xyes; 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])
@@ -103,7 +90,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   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
+  if test "x$with_vendor_name" = xyes; 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])
@@ -117,7 +104,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   # The vendor URL, if any
   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
+  if test "x$with_vendor_url" = xyes; 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])
@@ -131,7 +118,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   # The vendor bug URL, if any
   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
+  if test "x$with_vendor_bug_url" = xyes; 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])
@@ -145,7 +132,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   # The vendor VM bug URL, if any
   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
+  if test "x$with_vendor_vm_bug_url" = xyes; 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])
@@ -162,7 +149,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   # override parts with more specific flags, since these are processed later.
   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
+  if test "x$with_version_string" = xyes; 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.
@@ -201,10 +188,6 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
           && 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
@@ -256,10 +239,9 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     fi
   else
     if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
-      # Default is to calculate a string like this:
-      # 'adhoc.<username>.<base dir name>'
+      # Default is to calculate a string like this 'adhoc.<username>.<base dir name>'
       # Outer [ ] to quote m4.
-      [ basedirname=`$BASENAME "$WORKSPACE_ROOT" | $TR -d -c '[a-z][A-Z][0-9].-'` ]
+      [ basedirname=`$BASENAME "$TOPDIR" | $TR -d -c '[a-z][A-Z][0-9].-'` ]
       VERSION_OPT="adhoc.$USERNAME.$basedirname"
     fi
   fi
@@ -278,15 +260,13 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
       VERSION_BUILD=
     else
       JDKVER_CHECK_AND_SET_NUMBER(VERSION_BUILD, $with_version_build)
-      if test "x$VERSION_BUILD" = "x0"; then
-        AC_MSG_WARN([--with-version-build=0 is interpreted as --without-version-build])
-        VERSION_BUILD=
-      fi
     fi
   else
     if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
       # Default is to not have a build number.
       VERSION_BUILD=""
+      # FIXME: Until all code can cope with an empty VERSION_BUILD, set it to 0.
+      VERSION_BUILD=0
     fi
   fi
 
@@ -295,7 +275,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
       [with_version_feature_present=true], [with_version_feature_present=false])
 
   if test "x$with_version_feature_present" = xtrue; then
-    if test "x$with_version_feature" = xyes || test "x$with_version_feature" = xno; then
+    if test "x$with_version_feature" = xyes; then
       AC_MSG_ERROR([--with-version-feature must have a value])
     else
       JDKVER_CHECK_AND_SET_NUMBER(VERSION_FEATURE, $with_version_feature)
@@ -459,22 +439,13 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   for i in 1 2 3 4 5 6 ; do stripped_version_number=${stripped_version_number%.0} ; done
   VERSION_NUMBER=$stripped_version_number
 
-  # A build number of "0" is interpreted as "no build number".
-  if test "x$VERSION_BUILD" = x0; then
-    VERSION_BUILD=
-  fi
-
-  # Compute the complete version string, with additional build information
-  version_with_pre=$VERSION_NUMBER${VERSION_PRE:+-$VERSION_PRE}
-  if test "x$VERSION_BUILD" != x || \
-      ( test "x$VERSION_OPT" != x && test "x$VERSION_PRE" = x ); then
-    # As per JEP 223, if build is set, or if opt is set but not pre,
-    # we need a + separator
-    version_with_build=$version_with_pre+$VERSION_BUILD
+  # The complete version string, with additional build information
+  if test "x$VERSION_BUILD$VERSION_OPT" = x; then
+    VERSION_STRING=$VERSION_NUMBER${VERSION_PRE:+-$VERSION_PRE}
   else
-    version_with_build=$version_with_pre
+    # If either build or opt is set, we need a + separator
+    VERSION_STRING=$VERSION_NUMBER${VERSION_PRE:+-$VERSION_PRE}+$VERSION_BUILD${VERSION_OPT:+-$VERSION_OPT}
   fi
-  VERSION_STRING=$version_with_build${VERSION_OPT:+-$VERSION_OPT}
 
   # The short version string, just VERSION_NUMBER and PRE, if present.
   VERSION_SHORT=$VERSION_NUMBER${VERSION_PRE:+-$VERSION_PRE}
@@ -482,7 +453,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   # The version date
   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
+  if test "x$with_version_date" = xyes; 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
@@ -501,10 +472,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     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 ""
+  else
     VENDOR_VERSION_STRING="$with_vendor_version_string"
   fi
 
@@ -512,7 +480,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   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
+  if test "x$with_macosx_bundle_name_base" = xyes; 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])
@@ -526,7 +494,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   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
+  if test "x$with_macosx_bundle_id_base" = xyes; 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])
@@ -547,22 +515,17 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
       [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. Defaults to the build number.])])
-  if test "x$with_macosx_bundle_build_version" = xyes || test "x$with_macosx_bundle_build_version" = xno; then
+  if test "x$with_macosx_bundle_build_version" = xyes; 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
-
+    MACOSX_BUNDLE_BUILD_VERSION="$VERSION_BUILD"
     # 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"
+      MACOSX_BUNDLE_BUILD_VERSION+=".$VERSION_OPT"
     fi
   fi
   AC_SUBST(MACOSX_BUNDLE_BUILD_VERSION)

make/autoconf/jvm-features.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, 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
@@ -45,7 +45,7 @@ m4_define(jvm_features_valid, m4_normalize( \
     ifdef([custom_jvm_features_valid], custom_jvm_features_valid) \
     \
     cds compiler1 compiler2 dtrace epsilongc g1gc jfr jni-check \
-    jvmci jvmti link-time-opt management minimal opt-size parallelgc \
+    jvmci jvmti link-time-opt management minimal nmt opt-size parallelgc \
     serialgc services shenandoahgc static-build vm-structs zero zgc \
 ))
 
@@ -68,6 +68,7 @@ m4_define(jvm_feature_desc_jvmti, [enable Java Virtual Machine Tool Interface (J
 m4_define(jvm_feature_desc_link_time_opt, [enable link time optimization])
 m4_define(jvm_feature_desc_management, [enable java.lang.management API support])
 m4_define(jvm_feature_desc_minimal, [support building variant 'minimal'])
+m4_define(jvm_feature_desc_nmt, [include native memory tracking (NMT)])
 m4_define(jvm_feature_desc_opt_size, [optimize the JVM library for size])
 m4_define(jvm_feature_desc_parallelgc, [include the parallel garbage collector])
 m4_define(jvm_feature_desc_serialgc, [include the serial garbage collector])
@@ -264,6 +265,22 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_DTRACE],
   ])
 ])
 
+###############################################################################
+# Check if the feature 'jfr' is available on this platform.
+#
+AC_DEFUN_ONCE([JVM_FEATURES_CHECK_JFR],
+[
+  JVM_FEATURES_CHECK_AVAILABILITY(jfr, [
+    AC_MSG_CHECKING([if platform is supported by JFR])
+    if test "x$OPENJDK_TARGET_OS" = xaix; then
+      AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
+      AVAILABLE=false
+    else
+      AC_MSG_RESULT([yes])
+    fi
+  ])
+])
+
 ###############################################################################
 # Check if the feature 'jvmci' is available on this platform.
 #
@@ -290,9 +307,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_SHENANDOAHGC],
   JVM_FEATURES_CHECK_AVAILABILITY(shenandoahgc, [
     AC_MSG_CHECKING([if platform is supported by Shenandoah])
     if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86" || \
-        test "x$OPENJDK_TARGET_CPU" = "xaarch64" || \
-        test "x$OPENJDK_TARGET_CPU" = "xppc64le" || \
-        test "x$OPENJDK_TARGET_CPU" = "xriscv64"; then
+        test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
       AC_MSG_RESULT([yes])
     else
       AC_MSG_RESULT([no, $OPENJDK_TARGET_CPU])
@@ -342,8 +357,7 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_ZGC],
         AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
         AVAILABLE=false
       fi
-    elif test "x$OPENJDK_TARGET_CPU" = "xppc64le" || \
-        test "x$OPENJDK_TARGET_CPU" = "xriscv64"; then
+    elif test "x$OPENJDK_TARGET_CPU" = "xppc64le"; then
       if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
         AC_MSG_RESULT([yes])
       else
@@ -385,11 +399,18 @@ AC_DEFUN_ONCE([JVM_FEATURES_PREPARE_PLATFORM],
 
   JVM_FEATURES_CHECK_CDS
   JVM_FEATURES_CHECK_DTRACE
+  JVM_FEATURES_CHECK_JFR
   JVM_FEATURES_CHECK_JVMCI
   JVM_FEATURES_CHECK_SHENANDOAHGC
   JVM_FEATURES_CHECK_STATIC_BUILD
   JVM_FEATURES_CHECK_ZGC
 
+  # Filter out features by default for all variants on certain platforms.
+  # Make sure to just add to JVM_FEATURES_PLATFORM_FILTER, since it could
+  # have a value already from custom extensions.
+  if test "x$OPENJDK_TARGET_OS" = xaix; then
+    JVM_FEATURES_PLATFORM_FILTER="$JVM_FEATURES_PLATFORM_FILTER jfr"
+  fi
 ])
 
 ###############################################################################
@@ -421,7 +442,7 @@ AC_DEFUN([JVM_FEATURES_PREPARE_VARIANT],
     JVM_FEATURES_VARIANT_FILTER="compiler2 jvmci link-time-opt opt-size"
   elif test "x$variant" = "xminimal"; then
     JVM_FEATURES_VARIANT_FILTER="cds compiler2 dtrace epsilongc g1gc \
-        jfr jni-check jvmci jvmti management parallelgc services \
+        jfr jni-check jvmci jvmti management nmt parallelgc services \
         shenandoahgc vm-structs zgc"
     if test "x$OPENJDK_TARGET_CPU" = xarm ; then
       JVM_FEATURES_VARIANT_FILTER="$JVM_FEATURES_VARIANT_FILTER opt-size"
@@ -516,6 +537,10 @@ AC_DEFUN([JVM_FEATURES_VERIFY],
     AC_MSG_ERROR([Specified JVM feature 'jvmti' requires feature 'services' for variant '$variant'])
   fi
 
+  if JVM_FEATURES_IS_ACTIVE(management) && ! JVM_FEATURES_IS_ACTIVE(nmt); then
+    AC_MSG_ERROR([Specified JVM feature 'management' requires feature 'nmt' for variant '$variant'])
+  fi
+
   # For backwards compatibility, disable a feature "globally" if one variant
   # is missing the feature.
   if ! JVM_FEATURES_IS_ACTIVE(cds); then

make/autoconf/lib-bundled.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -166,9 +166,7 @@ AC_DEFUN_ONCE([LIB_SETUP_ZLIB],
 
   DEFAULT_ZLIB=system
   if test "x$OPENJDK_TARGET_OS" = xwindows -o "x$OPENJDK_TARGET_OS" = xaix; then
-    # On windows and aix default is bundled
-    DEFAULT_ZLIB=bundled
-  elif test "x$OPENJDK_TARGET_OS" = xmacosx -a "x$OPENJDK_TARGET_CPU" = xaarch64; then
+    # On windows and aix default is bundled, on others default is system
     DEFAULT_ZLIB=bundled
   fi
 
@@ -219,9 +217,6 @@ AC_DEFUN_ONCE([LIB_SETUP_ZLIB],
   LIBZ_LIBS=""
   if test "x$USE_EXTERNAL_LIBZ" = "xfalse"; then
     LIBZ_CFLAGS="$LIBZ_CFLAGS -I$TOPDIR/src/java.base/share/native/libzip/zlib"
-    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-        LIBZ_CFLAGS="$LIBZ_CFLAGS -DHAVE_UNISTD_H"
-    fi
   else
     LIBZ_LIBS="-lz"
   fi

make/autoconf/lib-ffi.m4

@@ -149,7 +149,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],
           else
             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
+        elif test "x${OPENJDK_TARGET_CPU}" = "xx86_64"; then
           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

make/autoconf/lib-hsdis.m4

@@ -1,336 +0,0 @@
-#
-# 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-#
-# Helper function to setup hsdis using Capstone
-#
-AC_DEFUN([LIB_SETUP_HSDIS_CAPSTONE],
-[
-  AC_ARG_WITH(capstone, [AS_HELP_STRING([--with-capstone],
-      [where to find the Capstone files needed for hsdis/capstone])])
-
-  if test "x$with_capstone" != x; then
-    AC_MSG_CHECKING([for capstone])
-    CAPSTONE="$with_capstone"
-    AC_MSG_RESULT([$CAPSTONE])
-
-    HSDIS_CFLAGS="-I${CAPSTONE}/include/capstone"
-    if test "x$OPENJDK_TARGET_OS" != xwindows; then
-      HSDIS_LDFLAGS="-L${CAPSTONE}/lib"
-      HSDIS_LIBS="-lcapstone"
-    else
-      HSDIS_LDFLAGS="-nodefaultlib:libcmt.lib"
-      HSDIS_LIBS="${CAPSTONE}/capstone.lib"
-    fi
-  else
-    if test "x$OPENJDK_TARGET_OS" = xwindows; then
-      # There is no way to auto-detect capstone on Windows
-      AC_MSG_NOTICE([You must specify capstone location using --with-capstone=<path>])
-      AC_MSG_ERROR([Cannot continue])
-    fi
-
-    PKG_CHECK_MODULES(CAPSTONE, capstone, [CAPSTONE_FOUND=yes], [CAPSTONE_FOUND=no])
-    if test "x$CAPSTONE_FOUND" = xyes; then
-      HSDIS_CFLAGS="$CAPSTONE_CFLAGS"
-      HSDIS_LDFLAGS="$CAPSTONE_LDFLAGS"
-      HSDIS_LIBS="$CAPSTONE_LIBS"
-    else
-      HELP_MSG_MISSING_DEPENDENCY([capstone])
-      AC_MSG_NOTICE([Cannot locate capstone which is needed for hsdis/capstone. Try using --with-capstone=<path>. $HELP_MSG])
-      AC_MSG_ERROR([Cannot continue])
-    fi
-  fi
-])
-
-################################################################################
-#
-# Helper function to setup hsdis using LLVM
-#
-AC_DEFUN([LIB_SETUP_HSDIS_LLVM],
-[
-  AC_ARG_WITH([llvm], [AS_HELP_STRING([--with-llvm],
-      [where to find the LLVM files needed for hsdis/llvm])])
-
-  if test "x$with_llvm" != x; then
-    LLVM_DIR="$with_llvm"
-  fi
-
-  if test "x$OPENJDK_TARGET_OS" != xwindows; then
-    if test "x$LLVM_DIR" = x; then
-      # Macs with homebrew can have llvm in different places
-      UTIL_LOOKUP_PROGS(LLVM_CONFIG, llvm-config, [$PATH:/usr/local/opt/llvm/bin:/opt/homebrew/opt/llvm/bin])
-      if test "x$LLVM_CONFIG" = x; then
-        AC_MSG_NOTICE([Cannot locate llvm-config which is needed for hsdis/llvm. Try using --with-llvm=<LLVM home>.])
-        AC_MSG_ERROR([Cannot continue])
-      fi
-    else
-      UTIL_LOOKUP_PROGS(LLVM_CONFIG, llvm-config, [$LLVM_DIR/bin])
-      if test "x$LLVM_CONFIG" = x; then
-        AC_MSG_NOTICE([Cannot locate llvm-config in $LLVM_DIR. Check your --with-llvm argument.])
-        AC_MSG_ERROR([Cannot continue])
-      fi
-    fi
-
-    # We need the LLVM flags and libs, and llvm-config provides them for us.
-    HSDIS_CFLAGS=`$LLVM_CONFIG --cflags`
-    HSDIS_LDFLAGS=`$LLVM_CONFIG --ldflags`
-    HSDIS_LIBS=`$LLVM_CONFIG --libs $OPENJDK_TARGET_CPU_ARCH ${OPENJDK_TARGET_CPU_ARCH}disassembler`
-  else
-    if test "x$LLVM_DIR" = x; then
-      AC_MSG_NOTICE([--with-llvm is needed on Windows to point out the LLVM home])
-      AC_MSG_ERROR([Cannot continue])
-    fi
-
-    # Official Windows installation of LLVM do not ship llvm-config, and self-built llvm-config
-    # produced unusable output, so just ignore it on Windows.
-    if ! test -e $LLVM_DIR/include/llvm-c/lto.h; then
-      AC_MSG_NOTICE([$LLVM_DIR does not seem like a valid LLVM home; include dir is missing])
-      AC_MSG_ERROR([Cannot continue])
-    fi
-    if ! test -e $LLVM_DIR/include/llvm-c/Disassembler.h; then
-      AC_MSG_NOTICE([$LLVM_DIR does not point to a complete LLVM installation. ])
-      AC_MSG_NOTICE([The official LLVM distribution is missing crucical files; you need to build LLVM yourself or get all include files elsewhere])
-      AC_MSG_ERROR([Cannot continue])
-    fi
-    if ! test -e $LLVM_DIR/lib/llvm-c.lib; then
-      AC_MSG_NOTICE([$LLVM_DIR does not seem like a valid LLVM home; lib dir is missing])
-      AC_MSG_ERROR([Cannot continue])
-    fi
-    HSDIS_CFLAGS="-I$LLVM_DIR/include"
-    HSDIS_LDFLAGS="-libpath:$LLVM_DIR/lib"
-    HSDIS_LIBS="llvm-c.lib"
-  fi
-])
-
-################################################################################
-#
-# Helper function to build binutils from source.
-#
-AC_DEFUN([LIB_BUILD_BINUTILS],
-[
-  BINUTILS_SRC="$with_binutils_src"
-  UTIL_FIXUP_PATH(BINUTILS_SRC)
-
-  if ! test -d $BINUTILS_SRC; then
-    AC_MSG_ERROR([--with-binutils-src is not pointing to a directory])
-  fi
-  if ! test -x $BINUTILS_SRC/configure; then
-    AC_MSG_ERROR([--with-binutils-src does not look like a binutils source directory])
-  fi
-
-  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.
-    if test "x$OPENJDK_BUILD_OS" = xwindows; then
-      if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
-        target_base="i686-w64-mingw32"
-      else
-        target_base="$OPENJDK_TARGET_CPU-w64-mingw32"
-      fi
-      binutils_cc="$target_base-gcc"
-      binutils_target="--host=$target_base --target=$target_base"
-      # Somehow the uint typedef is not included when building with mingw
-      binutils_cflags="-Duint=unsigned"
-      compiler_version=`$binutils_cc --version 2>&1`
-      if ! [ [[ "$compiler_version" =~ GCC ]] ]; then
-        AC_MSG_NOTICE([Could not find correct mingw compiler $binutils_cc.])
-        HELP_MSG_MISSING_DEPENDENCY([$binutils_cc])
-        AC_MSG_ERROR([Cannot continue. $HELP_MSG])
-      else
-        AC_MSG_NOTICE([Using compiler $binutils_cc with version $compiler_version])
-      fi
-    elif test "x$OPENJDK_BUILD_OS" = xmacosx; then
-      if test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
-        binutils_target="--enable-targets=aarch64-darwin"
-      else
-        binutils_target=""
-      fi
-    else
-      binutils_cc="$CC $SYSROOT_CFLAGS"
-      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: ./configure --disable-nls CFLAGS="$binutils_cflags" CC="$binutils_cc" $binutils_target])
-    saved_dir=`pwd`
-    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
-    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
-    cd $saved_dir
-    AC_MSG_NOTICE([Building of binutils done])
-  fi
-
-  BINUTILS_DIR="$BINUTILS_SRC"
-])
-
-################################################################################
-#
-# Helper function to setup hsdis using binutils
-#
-AC_DEFUN([LIB_SETUP_HSDIS_BINUTILS],
-[
-  AC_ARG_WITH([binutils], [AS_HELP_STRING([--with-binutils],
-      [where to find the binutils files needed for hsdis/binutils])])
-
-  AC_ARG_WITH([binutils-src], [AS_HELP_STRING([--with-binutils-src],
-      [where to find the binutils source for building])])
-
-  # 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_DIR.
-    LIB_BUILD_BINUTILS
-  fi
-
-  if test "x$with_binutils" != x; then
-    BINUTILS_DIR="$with_binutils"
-  fi
-
-  binutils_system_error=""
-  HSDIS_LIBS=""
-  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" ])
-    HSDIS_CFLAGS="-DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB"
-  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([for binutils to use with hsdis])
-  case "x$BINUTILS_DIR" in
-    xsystem)
-      if test "x$OPENJDK_TARGET_OS" != xlinux; then
-        AC_MSG_RESULT([invalid])
-        AC_MSG_ERROR([binutils on system is supported for Linux only])
-      elif test "x$binutils_system_error" = x; then
-        AC_MSG_RESULT([system])
-        HSDIS_CFLAGS="$HSDIS_CFLAGS -DSYSTEM_BINUTILS"
-      else
-        AC_MSG_RESULT([invalid])
-        AC_MSG_ERROR([$binutils_system_error])
-      fi
-      ;;
-    x)
-      AC_MSG_RESULT([missing])
-      AC_MSG_NOTICE([--with-hsdis=binutils requires specifying a binutils installation.])
-      AC_MSG_NOTICE([Download binutils from https://www.gnu.org/software/binutils and unpack it,])
-      AC_MSG_NOTICE([and point --with-binutils-src to the resulting directory, or use])
-      AC_MSG_NOTICE([--with-binutils to point to a pre-built binutils installation.])
-      AC_MSG_ERROR([Cannot continue])
-      ;;
-    *)
-      if test "x$HSDIS_LIBS" != x; then
-        AC_MSG_RESULT([$BINUTILS_DIR])
-      else
-        AC_MSG_RESULT([invalid])
-        AC_MSG_ERROR([$BINUTILS_DIR does not contain a proper binutils installation])
-      fi
-      ;;
-  esac
-])
-
-################################################################################
-#
-# Determine if hsdis should be built, and if so, with which backend.
-#
-AC_DEFUN_ONCE([LIB_SETUP_HSDIS],
-[
-  AC_ARG_WITH([hsdis], [AS_HELP_STRING([--with-hsdis],
-      [what hsdis backend to use ('none', 'capstone', 'llvm', 'binutils') @<:@none@:>@])])
-
-  UTIL_ARG_ENABLE(NAME: hsdis-bundling, DEFAULT: false,
-    RESULT: ENABLE_HSDIS_BUNDLING,
-    DESC: [enable bundling of hsdis to allow HotSpot disassembly out-of-the-box])
-
-  AC_MSG_CHECKING([what hsdis backend to use])
-
-  if test "x$with_hsdis" = xyes; then
-    AC_MSG_ERROR([--with-hsdis must have a value])
-  elif test "x$with_hsdis" = xnone || test "x$with_hsdis" = xno || test "x$with_hsdis" = x; then
-    HSDIS_BACKEND=none
-    AC_MSG_RESULT(['none', hsdis will not be built])
-  elif test "x$with_hsdis" = xcapstone; then
-    HSDIS_BACKEND=capstone
-    AC_MSG_RESULT(['capstone'])
-
-    LIB_SETUP_HSDIS_CAPSTONE
-  elif test "x$with_hsdis" = xllvm; then
-    HSDIS_BACKEND=llvm
-    AC_MSG_RESULT(['llvm'])
-
-    LIB_SETUP_HSDIS_LLVM
-  elif test "x$with_hsdis" = xbinutils; then
-    HSDIS_BACKEND=binutils
-    AC_MSG_RESULT(['binutils'])
-
-    LIB_SETUP_HSDIS_BINUTILS
-  else
-    AC_MSG_RESULT([invalid])
-    AC_MSG_ERROR([Incorrect hsdis backend "$with_hsdis"])
-  fi
-
-  AC_SUBST(HSDIS_BACKEND)
-  AC_SUBST(HSDIS_CFLAGS)
-  AC_SUBST(HSDIS_LDFLAGS)
-  AC_SUBST(HSDIS_LIBS)
-
-  AC_MSG_CHECKING([if hsdis should be bundled])
-  if test "x$ENABLE_HSDIS_BUNDLING" = "xtrue"; then
-    if test "x$HSDIS_BACKEND" = xnone; then
-      AC_MSG_RESULT([no, backend missing])
-      AC_MSG_ERROR([hsdis-bundling requires a hsdis backend. Please set --with-hsdis=<backend>]);
-    fi
-    AC_MSG_RESULT([yes])
-    if test "x$HSDIS_BACKEND" = xbinutils; then
-      AC_MSG_WARN([The resulting build might not be redistributable. Seek legal advice before distributing.])
-    fi
-  else
-    AC_MSG_RESULT([no])
-  fi
-  AC_SUBST(ENABLE_HSDIS_BUNDLING)
-])

make/autoconf/lib-std.m4

@@ -31,7 +31,7 @@
 ################################################################################
 AC_DEFUN_ONCE([LIB_SETUP_STD_LIBS],
 [
-  # statically link libstdc++ before C++ ABI is stabilized on Linux unless
+  # statically link libstdc++ before C++ ABI is stablized on Linux unless
   # dynamic build is configured on command line.
   AC_ARG_WITH([stdc++lib], [AS_HELP_STRING([--with-stdc++lib=<static>,<dynamic>,<default>],
       [force linking of the C++ runtime on Linux to either static or dynamic, default is static with dynamic as fallback])],

make/autoconf/libraries.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, 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
@@ -28,12 +28,10 @@ m4_include([lib-alsa.m4])
 m4_include([lib-bundled.m4])
 m4_include([lib-cups.m4])
 m4_include([lib-ffi.m4])
-m4_include([lib-fontconfig.m4])
 m4_include([lib-freetype.m4])
-m4_include([lib-hsdis.m4])
 m4_include([lib-std.m4])
 m4_include([lib-x11.m4])
-
+m4_include([lib-fontconfig.m4])
 m4_include([lib-tests.m4])
 
 ################################################################################
@@ -45,9 +43,11 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
   if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then
     # No X11 support on windows or macosx
     NEEDS_LIB_X11=false
+  elif test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
+    # No X11 support needed when building headless only
+    NEEDS_LIB_X11=false
   else
-    # All other instances need X11, even if building headless only, libawt still
-    # needs X11 headers.
+    # All other instances need X11
     NEEDS_LIB_X11=true
   fi
 
@@ -95,17 +95,14 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
 AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
 [
   LIB_SETUP_STD_LIBS
-
-  LIB_SETUP_ALSA
-  LIB_SETUP_BUNDLED_LIBS
+  LIB_SETUP_X11
   LIB_SETUP_CUPS
   LIB_SETUP_FONTCONFIG
   LIB_SETUP_FREETYPE
-  LIB_SETUP_HSDIS
+  LIB_SETUP_ALSA
   LIB_SETUP_LIBFFI
+  LIB_SETUP_BUNDLED_LIBS
   LIB_SETUP_MISC_LIBS
-  LIB_SETUP_X11
-
   LIB_TESTS_SETUP_GTEST
 
   BASIC_JDKLIB_LIBS=""
@@ -144,18 +141,11 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
          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
+         test "x$OPENJDK_TARGET_CPU" = xsh); 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"

make/autoconf/platform.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, 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
@@ -126,12 +126,6 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU],
       VAR_CPU_BITS=64
       VAR_CPU_ENDIAN=little
       ;;
-    riscv32)
-      VAR_CPU=riscv32
-      VAR_CPU_ARCH=riscv
-      VAR_CPU_BITS=32
-      VAR_CPU_ENDIAN=little
-      ;;
     riscv64)
       VAR_CPU=riscv64
       VAR_CPU_ARCH=riscv
@@ -218,7 +212,7 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_OS],
       VAR_OS=windows
       VAR_OS_ENV=windows.wsl
       ;;
-    *msys* | *mingw*)
+    *msys*)
       VAR_OS=windows
       VAR_OS_ENV=windows.msys2
       ;;
@@ -384,7 +378,7 @@ AC_DEFUN([PLATFORM_EXTRACT_TARGET_AND_BUILD],
   fi
 ])
 
-# Check if a reduced build (32-bit on 64-bit platforms) is requested, and modify behavior
+# Check if a reduced build (32-bit on 64-bit platforms) is requested, and modify behaviour
 # accordingly. Must be done after setting up build and target system, but before
 # doing anything else with these values.
 AC_DEFUN([PLATFORM_SETUP_TARGET_CPU_BITS],
@@ -567,10 +561,6 @@ 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
 
   # The cpu defines below are for zero, we don't support them directly.
   elif test "x$OPENJDK_$1_CPU" = xsparc; then
@@ -581,6 +571,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
     HOTSPOT_$1_CPU_DEFINE=S390
   elif test "x$OPENJDK_$1_CPU" = xs390x; then
     HOTSPOT_$1_CPU_DEFINE=S390
+  elif test "x$OPENJDK_$1_CPU" = xriscv64; then
+    HOTSPOT_$1_CPU_DEFINE=RISCV
   elif test "x$OPENJDK_$1_CPU" != x; then
     HOTSPOT_$1_CPU_DEFINE=$(echo $OPENJDK_$1_CPU | tr a-z A-Z)
   fi
@@ -656,6 +648,9 @@ 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
+
+  # Deprecated in JDK 15
+  UTIL_DEPRECATED_ARG_ENABLE(deprecated-ports)
 ])
 
 AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION],

make/autoconf/spec.gmk.in

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, 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
@@ -38,7 +38,7 @@ 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"
+# Path to autoconf if overriden 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
@@ -54,9 +54,6 @@ 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)
@@ -130,13 +127,6 @@ RELEASE_FILE_LIBC:=@RELEASE_FILE_LIBC@
 
 SOURCE_DATE := @SOURCE_DATE@
 ENABLE_REPRODUCIBLE_BUILD := @ENABLE_REPRODUCIBLE_BUILD@
-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@
@@ -148,7 +138,7 @@ 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
+  # Prohibit msys2 from attemping any path wrangling
   export MSYS2_ARG_CONV_EXCL := "*"
 endif
 
@@ -246,7 +236,7 @@ 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 = \
+VERSION_CFLAGS := \
     -DVERSION_FEATURE=$(VERSION_FEATURE) \
     -DVERSION_INTERIM=$(VERSION_INTERIM) \
     -DVERSION_UPDATE=$(VERSION_UPDATE) \
@@ -366,12 +356,6 @@ 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@
@@ -380,9 +364,6 @@ 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@
@@ -415,7 +396,6 @@ 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@
 
@@ -429,8 +409,6 @@ 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@
@@ -548,7 +526,8 @@ CPP := @CPP@
 # The linker can be gcc or ld on unix systems, or link.exe on windows systems.
 LD := @LD@
 
-SYSROOT := @SYSROOT@
+# Xcode SDK path
+SDKROOT:=@SDKROOT@
 
 # LDFLAGS used to link the jdk native libraries (C-code)
 LDFLAGS_JDKLIB:=@LDFLAGS_JDKLIB@
@@ -590,6 +569,7 @@ AR := @AR@
 ARFLAGS:=@ARFLAGS@
 
 NM:=@NM@
+GNM:=@GNM@
 STRIP:=@STRIP@
 OBJDUMP:=@OBJDUMP@
 CXXFILT:=@CXXFILT@
@@ -622,7 +602,7 @@ 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.
+# Set origin using the linker, ie use the relative path to the dependent library to find the dependees.
 # (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@
@@ -718,7 +698,6 @@ CODESIGN:=@CODESIGN@
 CP:=@CP@
 CUT:=@CUT@
 DATE:=@DATE@
-IS_GNU_DATE:=@IS_GNU_DATE@
 DIFF:=@DIFF@
 DIRNAME:=@DIRNAME@
 DSYMUTIL:=@DSYMUTIL@
@@ -775,6 +754,7 @@ SETFILE:=@SETFILE@
 XATTR:=@XATTR@
 JT_HOME:=@JT_HOME@
 JIB_HOME:=@JIB_HOME@
+XCODEBUILD=@XCODEBUILD@
 DTRACE := @DTRACE@
 FIXPATH := @FIXPATH@
 FIXPATH_BASE := @FIXPATH_BASE@
@@ -936,12 +916,7 @@ 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
-
+BASE_NAME := $(VERSION_SHORT)+$(VERSION_BUILD)_$(OPENJDK_TARGET_BUNDLE_PLATFORM)
 ifeq ($(DEBUG_LEVEL), fastdebug)
   DEBUG_PART := -debug
 else ifneq ($(DEBUG_LEVEL), release)

make/autoconf/toolchain.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, 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
@@ -39,7 +39,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_macosx="gcc clang"
 VALID_TOOLCHAINS_aix="xlc"
 VALID_TOOLCHAINS_windows="microsoft"
 
@@ -51,7 +51,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
 
 # Minimum supported versions, empty means unspecified
 TOOLCHAIN_MINIMUM_VERSION_clang="3.5"
-TOOLCHAIN_MINIMUM_VERSION_gcc="6.0"
+TOOLCHAIN_MINIMUM_VERSION_gcc="5.0"
 TOOLCHAIN_MINIMUM_VERSION_microsoft="19.10.0.0" # VS2017
 TOOLCHAIN_MINIMUM_VERSION_xlc=""
 
@@ -231,8 +231,34 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE],
   toolchain_var_name=VALID_TOOLCHAINS_$OPENJDK_BUILD_OS
   VALID_TOOLCHAINS=${!toolchain_var_name}
 
-  # First toolchain type in the list is the default
-  DEFAULT_TOOLCHAIN=${VALID_TOOLCHAINS%% *}
+  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
+    if test -n "$XCODEBUILD"; then
+      # On Mac OS X, default toolchain to clang after Xcode 5
+      XCODE_VERSION_OUTPUT=`"$XCODEBUILD" -version 2>&1 | $HEAD -n 1`
+      $ECHO "$XCODE_VERSION_OUTPUT" | $GREP "Xcode " > /dev/null
+      if test $? -ne 0; then
+        AC_MSG_NOTICE([xcodebuild output: $XCODE_VERSION_OUTPUT])
+        AC_MSG_ERROR([Failed to determine Xcode version.])
+      fi
+      XCODE_MAJOR_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | \
+          $SED -e 's/^Xcode \(@<:@1-9@:>@@<:@0-9.@:>@*\)/\1/' | \
+          $CUT -f 1 -d .`
+      AC_MSG_NOTICE([Xcode major version: $XCODE_MAJOR_VERSION])
+      if test $XCODE_MAJOR_VERSION -ge 5; then
+          DEFAULT_TOOLCHAIN="clang"
+      else
+          DEFAULT_TOOLCHAIN="gcc"
+      fi
+    else
+      # If Xcode is not installed, but the command line tools are
+      # then we can't run xcodebuild. On these systems we should
+      # default to clang
+      DEFAULT_TOOLCHAIN="clang"
+    fi
+  else
+    # First toolchain type in the list is the default
+    DEFAULT_TOOLCHAIN=${VALID_TOOLCHAINS%% *}
+  fi
 
   if test "x$with_toolchain_type" = xlist; then
     # List all toolchains
@@ -315,19 +341,10 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
   # autoconf magic only relies on PATH, so update it if tools dir is specified
   OLD_PATH="$PATH"
 
-  if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then
-    if test "x$XCODEBUILD" != x; then
-      XCODE_VERSION_OUTPUT=`"$XCODEBUILD" -version 2> /dev/null | $HEAD -n 1`
-      $ECHO "$XCODE_VERSION_OUTPUT" | $GREP "^Xcode " > /dev/null
-      if test $? -ne 0; then
-        AC_MSG_NOTICE([xcodebuild -version output: $XCODE_VERSION_OUTPUT])
-        AC_MSG_ERROR([Failed to determine Xcode version])
-      fi
-
-      # For Xcode, we set the Xcode version as TOOLCHAIN_VERSION
-      TOOLCHAIN_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | $CUT -f 2 -d ' '`
-      TOOLCHAIN_DESCRIPTION="$TOOLCHAIN_DESCRIPTION from Xcode $TOOLCHAIN_VERSION"
-    fi
+  if test "x$XCODE_VERSION_OUTPUT" != x; then
+    # For Xcode, we set the Xcode version as TOOLCHAIN_VERSION
+    TOOLCHAIN_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | $CUT -f 2 -d ' '`
+    TOOLCHAIN_DESCRIPTION="$TOOLCHAIN_DESCRIPTION from Xcode $TOOLCHAIN_VERSION"
   fi
   AC_SUBST(TOOLCHAIN_VERSION)
 
@@ -681,10 +698,10 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
     AS="$CC -c"
   else
     if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
-      # On 64 bit windows, the assembler is "ml64.exe"
+      # On 64 bit windows, the assember is "ml64.exe"
       UTIL_LOOKUP_TOOLCHAIN_PROGS(AS, ml64)
     else
-      # otherwise, the assembler is "ml.exe"
+      # otherwise, the assember is "ml.exe"
       UTIL_LOOKUP_TOOLCHAIN_PROGS(AS, ml)
     fi
   fi
@@ -755,6 +772,8 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA],
     else
       UTIL_LOOKUP_TOOLCHAIN_PROGS(NM, nm)
     fi
+    GNM="$NM"
+    AC_SUBST(GNM)
   fi
 
   # objcopy is used for moving debug symbols to separate files when
@@ -864,13 +883,13 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
       UTIL_REQUIRE_PROGS(BUILD_CC, cl, [$VS_PATH])
       UTIL_REQUIRE_PROGS(BUILD_CXX, cl, [$VS_PATH])
 
-      # On windows, the assembler is "ml.exe". We currently don't need this so
+      # On windows, the assember is "ml.exe". We currently don't need this so
       # do not require.
       if test "x$OPENJDK_BUILD_CPU_BITS" = "x64"; then
-        # On 64 bit windows, the assembler is "ml64.exe"
+        # On 64 bit windows, the assember is "ml64.exe"
         UTIL_LOOKUP_PROGS(BUILD_AS, ml64, [$VS_PATH])
       else
-        # otherwise the assembler is "ml.exe"
+        # otherwise the assember is "ml.exe"
         UTIL_LOOKUP_PROGS(BUILD_AS, ml, [$VS_PATH])
       fi
 
@@ -884,8 +903,8 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
       BUILD_LDCXX="$BUILD_LD"
     else
       if test "x$OPENJDK_BUILD_OS" = xmacosx; then
-        UTIL_REQUIRE_PROGS(BUILD_CC, clang)
-        UTIL_REQUIRE_PROGS(BUILD_CXX, clang++)
+        UTIL_REQUIRE_PROGS(BUILD_CC, clang cc gcc)
+        UTIL_REQUIRE_PROGS(BUILD_CXX, clang++ CC g++)
       else
         UTIL_REQUIRE_PROGS(BUILD_CC, cc gcc)
         UTIL_REQUIRE_PROGS(BUILD_CXX, CC g++)

make/autoconf/toolchain_microsoft.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, 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
@@ -25,7 +25,7 @@
 
 ################################################################################
 # The order of these defines the priority by which we try to find them.
-VALID_VS_VERSIONS="2019 2017 2022"
+VALID_VS_VERSIONS="2019 2017"
 
 VS_DESCRIPTION_2017="Microsoft Visual Studio 2017"
 VS_VERSION_INTERNAL_2017=141
@@ -56,21 +56,6 @@ VS_SDK_PLATFORM_NAME_2019=
 VS_SUPPORTED_2019=true
 VS_TOOLSET_SUPPORTED_2019=true
 
-VS_DESCRIPTION_2022="Microsoft Visual Studio 2022"
-VS_VERSION_INTERNAL_2022=143
-VS_MSVCR_2022=vcruntime140.dll
-VS_VCRUNTIME_1_2022=vcruntime140_1.dll
-VS_MSVCP_2022=msvcp140.dll
-VS_ENVVAR_2022="VS170COMNTOOLS"
-VS_USE_UCRT_2022="true"
-VS_VS_INSTALLDIR_2022="Microsoft Visual Studio/2022"
-VS_EDITIONS_2022="BuildTools Community Professional Enterprise"
-VS_SDK_INSTALLDIR_2022=
-VS_VS_PLATFORM_NAME_2022="v143"
-VS_SDK_PLATFORM_NAME_2022=
-VS_SUPPORTED_2022=true
-VS_TOOLSET_SUPPORTED_2022=true
-
 ################################################################################
 
 AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
@@ -103,7 +88,6 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
             vc/auxiliary/build/vcvarsx86_amd64.bat vc/auxiliary/build/vcvars64.bat"
       elif test "x$TARGET_CPU" = xaarch64; then
         # for host x86-64, target aarch64
-        # aarch64 requires Visual Studio 16.8 or higher
         VCVARSFILES="vc/auxiliary/build/vcvarsamd64_arm64.bat \
             vc/auxiliary/build/vcvarsx86_arm64.bat"
       fi
@@ -317,7 +301,7 @@ AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO],
       eval MSVCP_NAME="\${VS_MSVCP_${VS_VERSION}}"
       eval USE_UCRT="\${VS_USE_UCRT_${VS_VERSION}}"
       eval VS_SUPPORTED="\${VS_SUPPORTED_${VS_VERSION}}"
-      # The rest of the variables are already evaluated while probing
+      # The rest of the variables are already evaled while probing
       AC_MSG_NOTICE([Found $VS_DESCRIPTION])
       break
     fi
@@ -355,7 +339,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_VISUAL_STUDIO_ENV],
   PATH="$OLDPATH"
 
   if test ! -s $VS_ENV_TMP_DIR/set-vs-env.sh; then
-    AC_MSG_NOTICE([Could not successfully extract the environment variables needed for the VS setup.])
+    AC_MSG_NOTICE([Could not succesfully extract the environment variables needed for the VS setup.])
     AC_MSG_NOTICE([Try setting --with-tools-dir to the VC/bin directory within the VS installation.])
     AC_MSG_NOTICE([To analyze the problem, see extract-vs-env.log and extract-vs-env.bat in])
     AC_MSG_NOTICE([$VS_ENV_TMP_DIR.])
@@ -481,7 +465,6 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL],
 AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
 [
   DLL_NAME="$1"
-  DLL_HELP="$2"
   MSVC_DLL=
 
   if test "x$OPENJDK_TARGET_CPU" = xx86; then
@@ -566,7 +549,7 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
   if test "x$MSVC_DLL" = x; then
     AC_MSG_CHECKING([for $DLL_NAME])
     AC_MSG_RESULT([no])
-    AC_MSG_ERROR([Could not find $DLL_NAME. Please specify using ${DLL_HELP}.])
+    AC_MSG_ERROR([Could not find $DLL_NAME. Please specify using --with-msvcr-dll.])
   fi
 ])
 
@@ -589,7 +572,7 @@ AC_DEFUN([TOOLCHAIN_SETUP_VS_RUNTIME_DLLS],
     fi
     MSVCR_DLL="$MSVC_DLL"
   else
-    TOOLCHAIN_SETUP_MSVC_DLL([${MSVCR_NAME}], [--with-msvcr-dll])
+    TOOLCHAIN_SETUP_MSVC_DLL([${MSVCR_NAME}])
     MSVCR_DLL="$MSVC_DLL"
   fi
   AC_SUBST(MSVCR_DLL)
@@ -612,7 +595,7 @@ AC_DEFUN([TOOLCHAIN_SETUP_VS_RUNTIME_DLLS],
       fi
       MSVCP_DLL="$MSVC_DLL"
     else
-      TOOLCHAIN_SETUP_MSVC_DLL([${MSVCP_NAME}], [--with-msvcp-dll])
+      TOOLCHAIN_SETUP_MSVC_DLL([${MSVCP_NAME}])
       MSVCP_DLL="$MSVC_DLL"
     fi
     AC_SUBST(MSVCP_DLL)
@@ -637,7 +620,7 @@ AC_DEFUN([TOOLCHAIN_SETUP_VS_RUNTIME_DLLS],
       fi
       VCRUNTIME_1_DLL="$MSVC_DLL"
     else
-      TOOLCHAIN_SETUP_MSVC_DLL([${VCRUNTIME_1_NAME}], [--with-vcruntime-1-dll])
+      TOOLCHAIN_SETUP_MSVC_DLL([${VCRUNTIME_1_NAME}])
       VCRUNTIME_1_DLL="$MSVC_DLL"
     fi
   fi

make/autoconf/util.m4

@@ -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
@@ -230,25 +230,20 @@ AC_DEFUN([UTIL_GET_MATCHING_VALUES],
 # Converts an ISO-8601 date/time string to a unix epoch timestamp. If no
 # suitable conversion method was found, an empty string is returned.
 #
+# Sets the specified variable to the resulting list.
+#
 # $1: result variable name
 # $2: input date/time string
 AC_DEFUN([UTIL_GET_EPOCH_TIMESTAMP],
 [
-  if test "x$IS_GNU_DATE" = xyes; then
-    # GNU date
-    timestamp=$($DATE --utc --date=$2 +"%s" 2> /dev/null)
-  else
-    # BSD date
-    # ISO-8601 date&time in Zulu 'date'T'time'Z
-    timestamp=$($DATE -u -j -f "%FT%TZ" "$2" "+%s" 2> /dev/null)
+  timestamp=$($DATE --utc --date=$2 +"%s" 2> /dev/null)
+  if test "x$timestamp" = x; then
+    # GNU date format did not work, try BSD date options
+    timestamp=$($DATE -j -f "%F %T" "$2" "+%s" 2> /dev/null)
     if test "x$timestamp" = x; then
-      # BSD date cannot handle trailing milliseconds.
-      # Try again ignoring characters at end
-      timestamp=$($DATE -u -j -f "%Y-%m-%dT%H:%M:%S" "$2" "+%s" 2> /dev/null)
-    fi
-    if test "x$timestamp" = x; then
-      # Perhaps the time was missing.
-      timestamp=$($DATE -u -j -f "%FT%TZ" "$2""T00:00:00Z" "+%s" 2> /dev/null)
+      # Perhaps the time was missing
+      timestamp=$($DATE -j -f "%F %T" "$2 00:00:00" "+%s" 2> /dev/null)
+      # If this did not work, we give up and return the empty string
     fi
   fi
   $1=$timestamp
@@ -328,12 +323,12 @@ AC_DEFUN([UTIL_ALIASED_ARG_ENABLE],
 # Creates a command-line option using the --enable-* pattern. Will return a
 # value of 'true' or 'false' in the RESULT variable, depending on whether the
 # option was enabled or not by the user. The option can not be turned on if it
-# is not available, as specified by AVAILABLE and/or CHECK_AVAILABLE.
+# is not available, as specified by AVAILABLE and/or AVAILABLE_CHECK.
 #
 # Arguments:
 #   NAME: The base name of this option (i.e. what follows --enable-). Required.
 #   RESULT: The name of the variable to set to the result. Defaults to
-#     <NAME in uppercase>_ENABLED.
+#     <NAME in uppercase>_RESULT.
 #   DEFAULT: The default value for this option. Can be true, false or auto.
 #     Defaults to true.
 #   AVAILABLE: If true, this option is allowed to be selected. Defaults to true.
@@ -379,7 +374,7 @@ UTIL_DEFUN_NAMED([UTIL_ARG_ENABLE],
   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(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], ARG_CHECKING_MSG))
 
   # If the code blocks are not given, set them to the empty statements to avoid
   # tripping up bash.
@@ -466,350 +461,3 @@ UTIL_DEFUN_NAMED([UTIL_ARG_ENABLE],
   fi
 ])
 
-###############################################################################
-# Helper functions for ARG_WITH, to validate different types of argument
-
-# Dispatcher to call the correct UTIL_CHECK_TYPE_* function depending on the ARG_TYPE
-AC_DEFUN([UTIL_CHECK_TYPE],
-[
-  UTIL_CHECK_TYPE_$1($2)
-])
-
-AC_DEFUN([UTIL_CHECK_TYPE_string],
-[
-  # All strings always passes
-])
-
-AC_DEFUN([UTIL_CHECK_TYPE_integer],
-[
-  # Check that the argument is an integer
-  # Additional [] needed to keep m4 from mangling shell constructs.
-  [ if [[ ! "$1" =~ ^[0-9]+$ ]] ; then ]
-    FAILURE="Not an integer: $1"
-  fi
-])
-
-AC_DEFUN([UTIL_CHECK_TYPE_file],
-[
-  # Check that the argument is an existing file
-  if test ! -f "$1" ; then
-    FAILURE="File $1 does not exist or is not readable"
-  fi
-])
-
-AC_DEFUN([UTIL_CHECK_TYPE_directory],
-[
-  # Check that the argument is an existing directory
-  if test ! -d "$1" ; then
-    FAILURE="Directory $1 does not exist or is not readable"
-  fi
-
-  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
-        FAILURE="Directory $1 does not contain $file"
-        break
-      elif ! test -e "$found_files"; then
-        FAILURE="Directory $1 contains multiple $file: $found_files"
-        break
-      fi
-    done
-  fi
-])
-
-AC_DEFUN([UTIL_CHECK_TYPE_literal],
-[
-  # Check if it contains a space between non-space characters
-  # Additional [] needed to keep m4 from mangling shell constructs.
-  [ if [[ "$1" =~ [^' ']' '+[^' '] ]] ; then ]
-    FAILURE="Multiple words: $1"
-  fi
-
-  # Check that the selected variants are valid
-  UTIL_GET_NON_MATCHING_VALUES(invalid_value, $1, \
-      ARG_VALID_VALUES)
-  if test "x$invalid_value" != x; then
-    FAILURE="Invalid value: $invalid_value. Valid values are: ARG_VALID_VALUES"
-  fi
-])
-
-AC_DEFUN([UTIL_CHECK_TYPE_multivalue],
-[
-  # We accept either space or comma as separator, but use space internally
-  values=`$ECHO $1 | $SED -e 's/,/ /g'`
-
-  # Check that the selected variants are valid
-  UTIL_GET_NON_MATCHING_VALUES(invalid_value, $values, \
-      ARG_VALID_VALUES)
-  if test "x$invalid_value" != x; then
-    FAILURE="Invalid value(s): $invalid_value. Valid values are: ARG_VALID_VALUES"
-  fi
-
-  # Update to version without comma
-  ARG_RESULT=$($ECHO $values)
-])
-
-AC_DEFUN([UTIL_CHECK_TYPE_features],
-[
-  # We accept either space or comma as separator, but use space internally
-  feature_list=`$ECHO $1 | $SED -e 's/,/ /g'`
-  features_enabled=`$ECHO $feature_list | \
-    $AWK '{ for (i=1; i<=NF; i++) if (!match($i, /^-.*/)) printf("%s ", $i) }'`
-  features_disabled=`$ECHO $feature_list | \
-    $AWK '{ for (i=1; i<=NF; i++) if (match($i, /^-.*/)) printf("%s ", substr($i, 2))}'`
-
-  # Check that the selected features are valid
-  UTIL_GET_NON_MATCHING_VALUES(invalid_features, $features_enabled \
-        $features_disabled, ARG_VALID_VALUES)
-  if test "x$invalid_features" != x; then
-    FAILURE="Invalid feature(s): $invalid_features. Valid values are: ARG_VALID_VALUES"
-  fi
-
-  # Update to version without comma
-  ARG_RESULT=$($ECHO $feature_list)
-])
-
-###############################################################################
-# Creates a command-line option using the --with-* pattern. Will return a
-# string in the RESULT variable with the option provided by the user, or the
-# empty string if the --with-* option was not given. The option can not be given
-# if it is not available, as specified by AVAILABLE and/or CHECK_AVAILABLE.
-#
-# Arguments:
-#   NAME: The base name of this option (i.e. what follows --with-). Required.
-#   TYPE: The type of the value. Can be one of "string", "integer", "file",
-#     "directory", "literal", "multivalue" or "features". Required.
-#   DEFAULT: The default value for this option. Can be any valid string.
-#     Required.
-#   OPTIONAL: If this feature can be disabled. Defaults to false. If true,
-#     the feature can be disabled using --without-FOO, --with-FOO=no, or
-#     --with-FOO=. Check the ENABLED_RESULT variable for the enabled/disabled
-#     state.
-#   RESULT: The name of the variable to set to the result. Defaults to
-#     <NAME in uppercase>. Set to empty if ENABLED_RESULT is false.
-#   ENABLED_DEFAULT: If the value is enabled by default. Defaults to false. Only
-#     relevant if OPTIONAL is true.
-#   ENABLED_RESULT: The name of the variable to set to the enabled/disabled
-#     result state. Defaults to <NAME in uppercase>_ENABLED.
-#   AVAILABLE: If true, this option is allowed to be selected. Defaults to true.
-#   DESC: A description of this option. Defaults to a generic and unhelpful
-#     string.
-#   DEFAULT_DESC: A message describing the default value, for the help. Defaults
-#     to the literal value of DEFAULT, or "<none>" if DEFAULT is empty.
-#   CHECKING_MSG: The message to present to user when checking this option.
-#     Defaults to a generic message.
-#   CHECK_AVAILABLE: An optional code block to execute to determine if the
-#     option should be available. Must set AVAILABLE to 'false' if not.
-#   VALID_VALUES: A list of literals that are the allowed values. Only valid if
-#     TYPE is "literal", "multivalue" or "features".
-#   CHECK_VALUE: An optional code block to execute to determine if the value
-#     is correct. Must set FAILURE to a non-empty string if not. This string
-#     will be displayed. The value is given in $RESULT.
-#   CHECK_FOR_FILES: A list of files to verify the presence for. Only valid if
-#     TYPE is "directory". Paths are relative the directory given as value.
-#     Wildcards are accepted. Exactly one matching file must be found, for each
-#     listed file, or FAILURE is set.
-#   IF_AUTO: An optional code block to execute if the value is "auto", either by
-#     default or given by the command line. Must set RESULT to the calculated
-#     value.
-#   IF_GIVEN:  An optional code block to execute if the option was given on the
-#     command line (regardless of the value).
-#   IF_NOT_GIVEN:  An optional code block to execute if the option was not given
-#     on the command line (regardless of the value).
-#
-UTIL_DEFUN_NAMED([UTIL_ARG_WITH],
-    [*NAME *TYPE *DEFAULT OPTIONAL RESULT ENABLED_DEFAULT ENABLED_RESULT
-    AVAILABLE DESC DEFAULT_DESC CHECKING_MSG CHECK_AVAILABLE VALID_VALUES
-    CHECK_VALUE CHECK_FOR_FILES IF_AUTO IF_GIVEN IF_NOT_GIVEN], [$@],
-[
-  ##########################
-  # Part 1: Set up m4 macros
-  ##########################
-
-  # If ENABLED_DEFAULT is not specified, set it to 'false'.
-  m4_define([ARG_ENABLED_DEFAULT], m4_if(ARG_ENABLED_DEFAULT, , false, ARG_ENABLED_DEFAULT))
-
-  # If AVAILABLE is not specified, set it to 'true'.
-  m4_define([ARG_AVAILABLE], m4_if(ARG_AVAILABLE, , true, ARG_AVAILABLE))
-
-  # If OPTIONAL is not specified, set it to 'false'.
-  m4_define([ARG_OPTIONAL], m4_if(ARG_OPTIONAL, , false, ARG_OPTIONAL))
-
-  # If DEFAULT_DESC is not specified, calculate it from DEFAULT.
-  m4_define([ARG_DEFAULT_DESC], m4_if(ARG_DEFAULT_DESC, , m4_if(ARG_DEFAULT, , <none>, ARG_DEFAULT), ARG_DEFAULT_DESC))
-
-  # If RESULT is not specified, set it to 'ARG_NAME'.
-  m4_define([ARG_RESULT], m4_if(ARG_RESULT, , m4_translit(ARG_NAME, [a-z-], [A-Z_]), ARG_RESULT))
-
-  # If ENABLED_RESULT is not specified, set it to 'ARG_NAME[_ENABLED]'.
-  m4_define([ARG_ENABLED_RESULT], m4_if(ARG_ENABLED_RESULT, , m4_translit(ARG_NAME, [a-z-], [A-Z_])[_ENABLED], ARG_ENABLED_RESULT))
-
-  # Construct shell variable names for the option
-  m4_define(ARG_OPTION, [with_]m4_translit(ARG_NAME, [-], [_]))
-  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(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(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_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
-  ##########################
-
-  # Check that OPTIONAL has a valid value
-  if test "[x]ARG_OPTIONAL" != xtrue && test "[x]ARG_OPTIONAL" != xfalse ; then
-    AC_MSG_ERROR([Internal error: Argument OPTIONAL to [UTIL_ARG_WITH] can only be true or false, was: 'ARG_OPTIONAL'])
-  fi
-
-  # Check that ENABLED_DEFAULT has a valid value
-  if test "[x]ARG_ENABLED_DEFAULT" != xtrue && test "[x]ARG_ENABLED_DEFAULT" != xfalse ; then
-    AC_MSG_ERROR([Internal error: Argument ENABLED_DEFAULT to [UTIL_ARG_WITH] can only be true or false, was: 'ARG_ENABLED_DEFAULT'])
-  fi
-
-  # Check that AVAILABLE has a valid value
-  if test "[x]ARG_AVAILABLE" != xtrue && test "[x]ARG_AVAILABLE" != xfalse; then
-    AC_MSG_ERROR([Internal error: Argument AVAILABLE to [UTIL_ARG_WITH] can only be true or false, was: 'ARG_AVAILABLE'])
-  fi
-
-  # Check that TYPE has a valid value
-  # Need to assign since we can't expand ARG TYPE inside the m4 quoted if statement
-  TEST_TYPE="ARG_TYPE"
-  # Additional [] needed to keep m4 from mangling shell constructs.
-  [ if [[ ! "$TEST_TYPE" =~ ^(string|integer|file|directory|literal|multivalue|features)$ ]] ; then ]
-    AC_MSG_ERROR([Internal error: Argument TYPE to [UTIL_ARG_WITH] must be a valid type, was: 'ARG_TYPE'])
-  fi
-
-  AC_ARG_WITH(ARG_NAME, AS_HELP_STRING([--with-]ARG_NAME,
-      [ARG_DESC [ARG_DEFAULT_DESC]]), [ARG_GIVEN=true], [ARG_GIVEN=false])
-
-  # Check if the option is available
-  AVAILABLE=ARG_AVAILABLE
-  # Run the available check block (if any), which can overwrite AVAILABLE.
-  ARG_CHECK_AVAILABLE
-
-  # Check if the option should be turned on
-  AC_MSG_CHECKING(ARG_CHECKING_MSG)
-
-  if test x$AVAILABLE = xfalse; then
-    ARG_RESULT="$ARG_OPTION"
-    ARG_ENABLED_RESULT=false
-    REASON="not available"
-  else
-    if test x$ARG_GIVEN = xfalse; then
-      ARG_RESULT="ARG_DEFAULT"
-      if test "[x]ARG_OPTIONAL" = xtrue; then
-        ARG_ENABLED_RESULT=ARG_ENABLED_DEFAULT
-      else
-        ARG_ENABLED_RESULT=true
-      fi
-      REASON="default"
-
-    else # ARG_GIVEN is true
-      # Special treatment of "yes" and "no" for "--with-ARG" and "--without-ARG"
-      if test "x$ARG_OPTION" = xyes || test "x$ARG_OPTION" = xno || test "x$ARG_OPTION" = x ; then
-        if test "[x]ARG_OPTIONAL" = xfalse; then
-          if test "x$ARG_OPTION" = x; then
-            # If not optional, the empty string is a valid value
-            ARG_RESULT=""
-            ARG_ENABLED_RESULT=true
-            REASON="from command line"
-          else
-            AC_MSG_RESULT([invalid])
-            AC_MSG_ERROR([Option [--with-]ARG_NAME must have a specified value])
-          fi
-        else
-          if test "x$ARG_OPTION" = xyes; then
-            ARG_RESULT="ARG_DEFAULT"
-            ARG_ENABLED_RESULT=true
-            REASON="default as enabled from command line"
-          else
-            # For optional values, both --without-FOO and --with-FOO= disables
-            ARG_RESULT=""
-            ARG_ENABLED_RESULT=false
-            REASON="from command line"
-          fi
-        fi
-      else
-        # The most common case -- the user gives a value for the option.
-        ARG_RESULT="$ARG_OPTION"
-        ARG_ENABLED_RESULT=true
-        REASON="from command line"
-      fi
-    fi
-  fi
-
-  if test "x$ARG_ENABLED_RESULT" = xfalse; then
-    if test "x$REASON" = "xnot available"; then
-      AC_MSG_RESULT([<invalid>, $REASON])
-      if test "x$ARG_RESULT" != "x" && test "x$ARG_RESULT" != "xno" ; then
-        AC_MSG_WARN([Option [--with-]ARG_NAME is not available for this configuration])
-      fi
-    else
-      AC_MSG_RESULT([<disabled>, $REASON])
-    fi
-    ARG_RESULT=""
-  else
-    if test [x]ARG_HAS_AUTO_BLOCK = xtrue && test "x$ARG_RESULT" = xauto; then
-      # Execute "auto" payload
-      ARG_IF_AUTO
-
-      ARG_RESULT="$RESULT"
-      REASON="$REASON (calculated from 'auto')"
-    fi
-
-    if test "x$ARG_RESULT" = x; then
-      AC_MSG_RESULT([<none>, $REASON])
-    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)
-
-  if test "x$FAILURE" = x; then
-    # Execute custom verification payload, if present
-    RESULT="$ARG_RESULT"
-
-    ARG_CHECK_VALUE
-
-    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
-
-  # Execute result payloads, if present
-  if test x$ARG_GIVEN = xtrue; then
-    ARG_IF_GIVEN
-  else
-    ARG_IF_NOT_GIVEN
-  fi
-])
-
-###############################################################################
-# Helper functions for CHECK_VALUE in ARG_WITH.
-AC_DEFUN([UTIL_CHECK_STRING_NON_EMPTY],
-[
-  if test "x$RESULT" = "x"; then
-    FAILURE="Value cannot be empty"
-  fi
-])

make/common/JarArchive.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -118,7 +118,7 @@ define SetupJarArchiveBody
     $1_JARINDEX = true
   endif
   # When this macro is run in the same makefile as the java compilation, dependencies are
-  # transferred in make variables. When the macro is run in a different makefile than the
+  # transfered in make variables. When the macro is run in a different makefile than the
   # java compilation, the dependencies need to be found in the filesystem.
   $1_ORIG_DEPS := $$($1_DEPENDENCIES)
   ifeq ($$($1_DEPENDENCIES), )
@@ -150,9 +150,9 @@ define SetupJarArchiveBody
   # Capture extra files is the same for both CAPTURE_CONTENTS and SCAPTURE_CONTENTS so
   # only define it once to avoid duplication.
   # The list of extra files might be long, so need to use ListPathsSafely to print
-  # them out to a separate file. Then process the contents of that file to rewrite
+  # them out to a separte file. Then process the contents of that file to rewrite
   # into -C <dir> <file> lines.
-  # The EXTRA_FILES_RESOLVED variable must be set in the macro so that it's evaluated
+  # The EXTRA_FILES_RESOLVED varible must be set in the macro so that it's evaluated
   # in the recipe when the files are guaranteed to exist.
   $1_CAPTURE_EXTRA_FILES=\
       $$(eval $1_EXTRA_FILES_RESOLVED:=$$(call DoubleDollar, \
@@ -193,8 +193,7 @@ define SetupJarArchiveBody
   $1_UPDATE_CONTENTS=\
       if [ "`$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'`" -gt "0" ]; then \
         $(ECHO) "  updating" `$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
-        $(SORT) $$($1_BIN)/_the.$$($1_JARNAME)_contents > $$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted && \
-        $$($1_JAR_CMD) --update $$($1_JAR_OPTIONS) --file $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted; \
+        $$($1_JAR_CMD) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents; \
       fi $$(NEWLINE)
   # The s-variants of the above macros are used when the jar is created from scratch.
   # NOTICE: please leave the parentheses space separated otherwise the AIX build will break!
@@ -213,29 +212,25 @@ define SetupJarArchiveBody
             | $(SED) 's|$$(src)/|-C $$(src) |g' >> \
         $$($1_BIN)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) )
   endif
-  $1_SUPDATE_CONTENTS=\
-      $(SORT) $$($1_BIN)/_the.$$($1_JARNAME)_contents > $$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted && \
-      $$($1_JAR_CMD) --update $$($1_JAR_OPTIONS) --file $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted $$(NEWLINE)
+  $1_SUPDATE_CONTENTS=$$($1_JAR_CMD) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)
 
   # Use a slightly shorter name for logging, but with enough path to identify this jar.
   $1_NAME:=$$(subst $$(OUTPUTDIR)/,,$$($1_JAR))
 
-  # If reproducible build and the boot jdk jar supports --date option
-  # then specify the --date using SOURCE_DATE in ISO-8601
-  $1_JAR_OPTIONS :=
-  ifeq ($$(ENABLE_REPRODUCIBLE_BUILD), true)
-    ifeq ($$(BOOT_JDK_JAR_SUPPORTS_DATE), true)
-      $1_JAR_OPTIONS += --date $(SOURCE_DATE_ISO_8601)
-    endif
-  endif
   ifneq (,$$($1_CHECK_COMPRESS_JAR))
-    ifneq ($(COMPRESS_JARS), true)
-      $1_JAR_OPTIONS += --no-compress
+    $1_JAR_CREATE_OPTIONS := c0fm
+    $1_JAR_UPDATE_OPTIONS := u0f
+    ifeq ($(COMPRESS_JARS), true)
+      $1_JAR_CREATE_OPTIONS := cfm
+      $1_JAR_UPDATE_OPTIONS := uf
     endif
+  else
+    $1_JAR_CREATE_OPTIONS := cfm
+    $1_JAR_UPDATE_OPTIONS := uf
   endif
 
   # Include all variables of significance in the vardeps file
-  $1_VARDEPS := $$($1_JAR_CMD) $$($1_JAR_OPTIONS) $$($1_MANIFEST) \
+  $1_VARDEPS := $$($1_JAR_CMD) $$($1_JAR_CREATE_OPTIONS) $$($1_MANIFEST) \
       $$($1_JARMAIN) $$($1_EXTRA_MANIFEST_ATTR) $$($1_ORIG_DEPS) $$($1_SRCS) \
       $$($1_INCLUDES) $$($1_EXCLUDES) $$($1_EXCLUDE_FILES) $$($1_EXTRA_FILES)
   $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, $$($1_BIN)/_the.$$($1_JARNAME).vardeps)
@@ -260,7 +255,7 @@ define SetupJarArchiveBody
 	  $$(if $$($1_EXTRA_MANIFEST_ATTR), \
 	    $(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE) $$(NEWLINE)) \
 	  $(ECHO) Creating $$($1_NAME) $$(NEWLINE) \
-	  $$($1_JAR_CMD) --create $$($1_JAR_OPTIONS) --file $$@ --manifest $$($1_MANIFEST_FILE) $$(NEWLINE) \
+	  $$($1_JAR_CMD) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \
 	  $$($1_SCAPTURE_CONTENTS) \
 	  $$($1_SCAPTURE_METAINF) \
 	  $$($1_SUPDATE_CONTENTS) \

make/common/JavaCompilation.gmk

@@ -99,7 +99,7 @@ define add_file_to_clean
   $2_TARGET:=$2
   # Remove the source prefix.
   $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
-  # Now we can setup the dependency that will trigger the copying.
+  # Now we can setup the depency that will trigger the copying.
   # To allow for automatic overrides, do not create a rule for a target file that
   # already has one
   ifneq ($$($1_CLEAN_$$($2_TARGET)), 1)
@@ -161,7 +161,7 @@ endef
 #   EXTRA_FILES:=List of extra source files to include in compilation. Can be used to
 #       specify files that need to be generated by other rules first.
 #   HEADERS:=path to directory where all generated c-headers are written.
-#   DEPENDS:=Extra dependency
+#   DEPENDS:=Extra dependecy
 #   KEEP_DUPS:=Do not remove duplicate file names from different source roots.
 #   FAIL_NO_SRC:=Set to false to not fail the build if no source files are found,
 #        default is true.

make/common/MakeIO.gmk

@@ -37,7 +37,7 @@ endif
 
 ################################################################################
 # ListPathsSafely can be used to print command parameters to a file. This is
-# typically done if the command line length risk being too long for the
+# typically done if the command line lenght risk being too long for the
 # OS/shell. In later make versions, the file function can be used for this
 # purpose. For earlier versions, a more complex implementation is provided.
 #

make/common/NativeCompilation.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, 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
@@ -61,7 +61,7 @@ endef
 
 ################################################################################
 # Creates a recipe that creates a compile_commands.json fragment. Remove any
-# occurrences of FIXPATH programs from the command to show the actual invocation.
+# occurences of FIXPATH programs from the command to show the actual invocation.
 #
 # Param 1: Name of file to create
 # Param 2: Working directory
@@ -236,7 +236,7 @@ ifeq ($(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT)-$(FILE_MACRO_CFLAGS), false-)
   # add WORKSPACE_ROOT to any line not starting with /, while allowing for
   # leading spaces. There may also be multiple entries on the same line, so start
   # with splitting such lines.
-  # Non GNU sed (BSD on macosx) cannot substitute in literal \n using regex.
+  # Non GNU sed (BSD on macosx) cannot substitue in literal \n using regex.
   # Instead use a bash escaped literal newline. To avoid having unmatched quotes
   # ruin the ability for an editor to properly syntax highlight this file, define
   # that newline sequence as a separate variable and add the closing quote behind
@@ -358,20 +358,6 @@ define SetupCompileNativeFileBody
       # Compile as preprocessed assembler file
       $1_FLAGS := $(BASIC_ASFLAGS) $$($1_BASE_ASFLAGS)
       $1_COMPILER := $(AS)
-
-      # gcc or clang assembly files must contain an appropriate relative .file
-      # path for reproducible builds.
-      ifneq ($(findstring $(TOOLCHAIN_TYPE), gcc clang), )
-        # If no absolute paths allowed, work out relative source file path
-        # for assembly .file substitution, otherwise use full file path
-        ifeq ($(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT), false)
-          $1_REL_ASM_SRC := $$(call RelativePath, $$($1_FILE), $(WORKSPACE_ROOT))
-        else
-          $1_REL_ASM_SRC := $$($1_FILE)
-        endif
-        $1_FLAGS := $$($1_FLAGS) -DASSEMBLY_SRC_FILE='"$$($1_REL_ASM_SRC)"' \
-            -include $(TOPDIR)/make/data/autoheaders/assemblyprefix.h
-      endif
     else ifneq ($$(filter %.cpp %.cc %.mm, $$($1_FILENAME)), )
       # Compile as a C++ or Objective-C++ file
       $1_FLAGS := $(CFLAGS_CCACHE) $$($1_USE_PCH_FLAGS) $$($1_BASE_CXXFLAGS) \
@@ -403,13 +389,6 @@ define SetupCompileNativeFileBody
     $1_OBJ_DEPS := $$($1_SRC_FILE) $$($$($1_BASE)_COMPILE_VARDEPS_FILE) \
         $$($$($1_BASE)_EXTRA_DEPS) $$($1_VARDEPS_FILE)
     $1_COMPILE_OPTIONS := $$($1_FLAGS) $(CC_OUT_OPTION)$$($1_OBJ) $$($1_SRC_FILE)
-    # For reproducible builds with gcc and clang ensure random symbol generation is
-    # seeded deterministically
-    ifneq ($(findstring $(TOOLCHAIN_TYPE), gcc clang), )
-       ifeq ($$(ENABLE_REPRODUCIBLE_BUILD), true)
-         $1_COMPILE_OPTIONS += -frandom-seed="$$($1_FILENAME)"
-       endif
-    endif
 
     $$($1_OBJ_JSON): $$($1_OBJ_DEPS)
 	$$(call WriteCompileCommandsFragment, $$@, $$(PWD), $$($1_SRC_FILE), \
@@ -676,7 +655,7 @@ define SetupNativeCompilationBody
   ifneq ($$($1_SUPERFLUOUS_OBJS), )
     $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS))
   endif
-  # Sort to remove duplicates and provide a reproducible order on the input files to the linker.
+  # Sort to remove dupliates and provide a reproducable order on the input files to the linker.
   $1_ALL_OBJS := $$(sort $$($1_EXPECTED_OBJS) $$($1_EXTRA_OBJECT_FILES))
 
   # Pickup extra OPENJDK_TARGET_OS_TYPE, OPENJDK_TARGET_OS, and/or OPENJDK_TARGET_OS plus

make/common/ProcessMarkdown.gmk

@@ -103,7 +103,7 @@ define ProcessMarkdown
 	$$(call LogInfo, Post-processing markdown file $2)
 	$$(call MakeDir, $$(SUPPORT_OUTPUTDIR)/markdown $$($1_$2_TARGET_DIR))
 	$$(call ExecuteWithLog, $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_post, \
-	    ( $$($1_POST_PROCESS) $$($1_$2_PANDOC_OUTPUT) > $$($1_$2_OUTPUT_FILE) ) )
+	    ( $$($1_POST_PROCESS) < $$($1_$2_PANDOC_OUTPUT) > $$($1_$2_OUTPUT_FILE) ) )
   endif
 
   $1 += $$($1_$2_OUTPUT_FILE)

make/common/TestFilesCompilation.gmk

@@ -62,7 +62,11 @@ define SetupTestFilesCompilationBody
     $1_OUTPUT_SUBDIR := lib
     $1_BASE_CFLAGS := $(CFLAGS_JDKLIB)
     $1_BASE_CXXFLAGS := $(CXXFLAGS_JDKLIB)
-    $1_LDFLAGS := $(LDFLAGS_JDKLIB) $$(call SET_SHARED_LIBRARY_ORIGIN)
+    ifeq ($(call isTargetOs, windows), false)
+	$1_LDFLAGS := $(LDFLAGS_JDKLIB) $$(call SET_SHARED_LIBRARY_ORIGIN) -pthread
+    else
+	$1_LDFLAGS := $(LDFLAGS_JDKLIB) $$(call SET_SHARED_LIBRARY_ORIGIN)
+    endif
     $1_COMPILATION_TYPE := LIBRARY
   else ifeq ($$($1_TYPE), PROGRAM)
     $1_PREFIX = exe

make/common/TextFileProcessing.gmk

@@ -65,7 +65,7 @@ endef
 #       SOURCE_DIRS)
 #   EXCLUDE_FILES exclude files matching these patterns (used only with
 #       SOURCE_DIRS)
-#   INCLUDES replace the occurrences of a pattern with the contents of a file;
+#   INCLUDES replace the occurances of a pattern with the contents of a file;
 #       one or more such include pattern, using the syntax:
 #       PLACEHOLDER => FILE_TO_INCLUDE ; ...
 #       Each PLACEHOLDER must be on a single, otherwise empty line (whitespace

make/common/Utils.gmk

@@ -146,7 +146,7 @@ RelativePathHelper = \
         $(if $($2_dotdots), $($2_dotdots), .))
 
 ################################################################################
-# Filter out duplicate sub strings while preserving order. Keeps the first occurrence.
+# Filter out duplicate sub strings while preserving order. Keeps the first occurance.
 uniq = \
     $(strip $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1))))
 
@@ -216,21 +216,6 @@ Or = \
   $(strip $(if $(filter-out true false, $1), $(error Non-boolean values: $1)) \
   $(if $(strip $(filter-out false, $1)), true, false))
 
-
-################################################################################
-# Convert an UNIX epoch based timestamp (as an integer) to an ISO 8601 date
-# string.
-# Param 1 - timestamp
-ifeq ($(IS_GNU_DATE), yes)
-  EpochToISO8601 = \
-    $(shell $(DATE) --utc --date="@$(strip $1)" \
-         +"$(ISO_8601_FORMAT_STRING)" 2> /dev/null)
-else
-  EpochToISO8601 = \
-    $(shell $(DATE) -u -j -f "%s" "$(strip $1)" \
-         +"$(ISO_8601_FORMAT_STRING)" 2> /dev/null)
-endif
-
 ################################################################################
 # Parse a multiple-keyword variable, like FOO="KEYWORD1=val1;KEYWORD2=val2;..."
 # These will be converted into a series of variables like FOO_KEYWORD1=val1,

make/common/ZipArchive.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,6 @@
 ifndef _ZIP_ARCHIVE_GMK
 _ZIP_ARCHIVE_GMK := 1
 
-# Depends on build tools for MakeZipReproducible
-include ../ToolsJdk.gmk
-
 ifeq (,$(_MAKEBASE_GMK))
   $(error You must include MakeBase.gmk prior to including ZipArchive.gmk)
 endif
@@ -54,8 +51,6 @@ endif
 #   FOLLOW_SYMLINKS - Set to explicitly follow symlinks. Affects performance of
 #                     finding files.
 #   ZIP_OPTIONS extra options to pass to zip
-#   REPRODUCIBLE override ENABLE_REPRODUCIBLE_BUILD (to make zip reproducible or not)
-
 SetupZipArchive = $(NamedParamsMacroTemplate)
 define SetupZipArchiveBody
 
@@ -129,22 +124,16 @@ define SetupZipArchiveBody
     ) \
   )
 
-  ifeq ($$($1_REPRODUCIBLE), )
-    $1_REPRODUCIBLE := $$(ENABLE_REPRODUCIBLE_BUILD)
-  endif
-
   # Use a slightly shorter name for logging, but with enough path to identify this zip.
   $1_NAME:=$$(subst $$(OUTPUTDIR)/,,$$($1_ZIP))
 
   # Now $1_ALL_SRCS should contain all sources that are going to be put into the zip.
   # I.e. the zip -i and -x options should match the filtering done in the makefile.
   # Explicitly excluded files can be given with absolute path. The patsubst solution
-  # isn't perfect but the likelihood of an absolute path to match something in a src
+  # isn't perfect but the likelyhood of an absolute path to match something in a src
   # dir is very small.
   # If zip has nothing to do, it returns 12 and would fail the build. Check for 12
   # and only fail if it's not.
-  # For reproducible builds set the zip access & modify times to SOURCE_DATE_EPOCH
-  # by using a ziptmp folder to generate final zip from using MakeZipReproducible.
   $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
 	$$(call LogWarn, Updating $$($1_NAME))
 	$$(call MakeTargetDir)
@@ -174,18 +163,7 @@ define SetupZipArchiveBody
 	        $$($1_ZIP_EXCLUDES_$$s) \
 	        || test "$$$$?" = "12" \
 	    ))$$(NEWLINE) \
-	) true
-        ifeq ($$($1_REPRODUCIBLE), true)
-	    $$(call ExecuteWithLog, \
-		$$(SUPPORT_OUTPUTDIR)/makezipreproducible/$$(patsubst $$(OUTPUTDIR)/%,%, $$@), \
-		($(RM) $$(SUPPORT_OUTPUTDIR)/ziptmp/$1/tmp.zip && \
-		 $(MKDIR) -p $$(SUPPORT_OUTPUTDIR)/ziptmp/$1 && \
-		 $(TOOL_MAKEZIPREPRODUCIBLE) -f $$(SUPPORT_OUTPUTDIR)/ziptmp/$1/tmp.zip \
-			 		     -t $(SOURCE_DATE_EPOCH) $$@ && \
-		 $(RM) $$@ && \
-		 $(MV) $$(SUPPORT_OUTPUTDIR)/ziptmp/$1/tmp.zip $$@ \
-		))
-        endif
+	) true \
 	$(TOUCH) $$@
 
   # Add zip to target list

make/common/modules/GensrcCommon.gmk

@@ -1,43 +0,0 @@
-#
-# 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.
-#
-
-include Execute.gmk
-include TextFileProcessing.gmk
-include ToolsJdk.gmk
-
-################################################################################
-# Sets up a rule that creates a version.properties file in the gensrc output
-# directory.
-# Param 1 - Variable to add generated file name to
-# Param 2 - Name of version.properties file including packages from the src
-#           root.
-define SetupVersionProperties
-  $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/$$(strip $2):
-	$$(call MakeTargetDir)
-	$(PRINTF) "jdk=$(VERSION_NUMBER)\nfull=$(VERSION_STRING)\nrelease=$(VERSION_SHORT)\n" \
-	    > $$@
-
-  $$(strip $1) += $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/$$(strip $2)
-endef

make/common/modules/GensrcCommonJdk.gmk

@@ -0,0 +1,30 @@
+#
+# 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+include Execute.gmk
+include JavaCompilation.gmk
+include NativeCompilation.gmk
+include TextFileProcessing.gmk
+include ToolsJdk.gmk

make/common/modules/GensrcCommonLangtools.gmk

@@ -0,0 +1,129 @@
+#
+# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+include JavaCompilation.gmk
+
+################################################################################
+# The compileprops tools compiles a properties file into a resource bundle.
+TOOL_COMPILEPROPS_CMD := $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/langtools_tools_classes \
+    compileproperties.CompileProperties -quiet
+
+################################################################################
+# The compileprops tools compiles a properties file into an enum-like class.
+TOOL_PARSEPROPS_CMD := $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/langtools_tools_classes \
+    propertiesparser.PropertiesParser
+
+
+################################################################################
+# Sets up a rule that creates a version.properties file in the gensrc output
+# directory.
+# Param 1 - Variable to add generated file name to
+# Param 2 - Name of version.properties file including packages from the src
+#           root.
+define SetupVersionProperties
+  $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/$$(strip $2):
+	$$(call MakeTargetDir)
+	$(PRINTF) "jdk=$(VERSION_NUMBER)\nfull=$(VERSION_STRING)\nrelease=$(VERSION_SHORT)\n" \
+	    > $$@
+
+  $$(strip $1) += $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/$$(strip $2)
+endef
+
+################################################################################
+# Finds all properties files in the module source and creates a rule that runs
+# CompileProperties on them into the gensrc dir.
+# Param 1 - Variable to add targets to
+# Param 2 - Extra properties files to process
+define SetupCompileProperties
+  # Lookup the properties that need to be compiled into resource bundles.
+  PROPSOURCES := $2 \
+      $$(call FindFiles, $(TOPDIR)/src/$(MODULE)/share/classes, *.properties)
+
+  # Filter out any excluded translations
+  PROPSOURCES := $$(call FilterExcludedTranslations, $$(PROPSOURCES), .properties)
+
+  # Convert .../src/<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
+  # to .../langtools/gensrc/<module>/com/sun/tools/javac/resources/javac_zh_CN.java
+  # Strip away prefix and suffix, leaving for example only:
+  # "<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN"
+  PROPJAVAS := $$(patsubst $(TOPDIR)/src/%, \
+      $(SUPPORT_OUTPUTDIR)/gensrc/%, \
+      $$(patsubst %.properties, %.java, \
+      $$(subst /share/classes,, $$(PROPSOURCES))))
+
+  # Generate the package dirs for the to be generated java files. Sort to remove
+  # duplicates.
+  PROPDIRS := $$(sort $$(dir $$(PROPJAVAS)))
+
+  # Now generate a sequence of:
+  # "-compile ...javac_zh_CN.properties ...javac_zh_CN.java java.util.ListResourceBundle"
+  # suitable to be fed into the CompileProperties command.
+  PROPCMDLINE := $$(subst _SPACE_, $(SPACE), \
+      $$(join $$(addprefix -compile_SPACE_, $$(PROPSOURCES)), \
+      $$(addsuffix _SPACE_java.util.ListResourceBundle, \
+      $$(addprefix _SPACE_, $$(PROPJAVAS)))))
+
+  # Now setup the rule for the generation of the resource bundles.
+  PROPS_BASE := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the_props
+  $$(PROPS_BASE): $$(PROPSOURCES)
+	$$(call MakeDir, $$(@D) $$(PROPDIRS))
+	$(FIND) $$(@D) -name "*.java" -a ! -name "*Properties.java" $(FIND_DELETE)
+	$(ECHO) Compiling $$(words $$(PROPSOURCES)) properties into resource bundles for $(MODULE)
+	$$(call ExecuteWithLog, $$(PROPS_BASE)_exec, \
+	    $(TOOL_COMPILEPROPS_CMD) $$(PROPCMDLINE))
+	$(TOUCH) $$@
+
+  $$(strip $1) += $$(PROPS_BASE)
+endef
+
+################################################################################
+# Parse property files in given location and generate a Java-like enum in the gensrc folder.
+# Param 1 - Variable to add targets to
+# Param 2 - Extra properties files to process
+define SetupParseProperties
+  # property files to process
+  PARSEPROPSOURCES := $$(addprefix $(TOPDIR)/src/$(MODULE)/share/classes/, $2)
+  PARSEPROPSOURCES := $$(call FilterExcludedTranslations, $$(PARSEPROPSOURCES), .properties)
+
+  PARSEPROPALLDIRS := $$(patsubst $(TOPDIR)/src/$(MODULE)/share/classes/%, \
+      $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/%, \
+      $$(dir $$(PARSEPROPSOURCES)))
+
+  PARSEPROPDIRS := $$(sort $$(PARSEPROPALLDIRS))
+
+  PARSEPROPCMDLINE := $$(subst _SPACE_, $$(SPACE), \
+    $$(join $$(foreach var,$$(PARSEPROPSOURCES),$$(addprefix -compile_SPACE_,$$(var))), \
+    $$(addprefix _SPACE_, $$(PARSEPROPALLDIRS))))
+
+  # Now setup the rule for the generation of the resource bundles.
+  $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the_parsed_props: $$(PARSEPROPSOURCES)
+	$$(call MakeDir, $$(@D) $$(PARSEPROPDIRS))
+	$(FIND) $$(@D) -name "*Properties.java" $(FIND_DELETE)
+	$(ECHO) Parsing $$(words $$(PARSEPROPSOURCES)) properties into enum-like class for $(MODULE)
+	$(TOOL_PARSEPROPS_CMD) $$(PARSEPROPCMDLINE)
+	$(TOUCH) $$@
+
+  $$(strip $1) += $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the_parsed_props
+endef
+

make/common/modules/GensrcProperties.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,6 @@
 # This file defines macros that sets up rules for generating java classes
 # from resource bundle properties files.
 
-include JavaCompilation.gmk
-
 ################################################################################
 # Helper macro for SetupCopy-zh_HK.
 define SetupOneCopy-zh_HK
@@ -58,10 +56,8 @@ endef
 #
 # Remaining parameters are named arguments. These include:
 # SRC_DIRS   Directories containing properties files to process.
-# EXTRA_FILES Also include these specifically named files
 # EXCLUDE   Exclude files matching this pattern.
 # CLASS   The super class for the generated classes.
-# TYPE    Whether to use "langtools" or normal compiler.
 # MODULE_PATH_ROOT   Module path root, defaults to $(TOPDIR)/src.
 # KEEP_ALL_TRANSLATIONS Set to true to skip filtering of excluded translations.
 SetupCompileProperties = $(NamedParamsMacroTemplate)
@@ -74,8 +70,6 @@ define SetupCompilePropertiesBody
   # Locate all properties files in the given source dirs.
   $1_SRC_FILES := $$(call FindFiles, $$($1_SRC_DIRS), *.properties)
 
-  $1_SRC_FILES += $$($1_EXTRA_FILES)
-
   ifneq ($$($1_EXCLUDE), )
     $1_SRC_FILES := $$(filter-out $$($1_EXCLUDE), $$($1_SRC_FILES))
   endif
@@ -108,29 +102,13 @@ define SetupCompilePropertiesBody
 
   $1_TARGET := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the.$1.marker
   $1_CMDLINE_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the.$1.cmdline
-  $1_EXEC_MARKER := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the.$1.exec
-
-  ifeq ($$($1_TYPE), langtools)
-    $1_TOOL := -cp $(BUILDTOOLS_OUTPUTDIR)/langtools_tools_classes \
-    compileproperties.CompileProperties
-    $1_TOOL_DEPS := $(BUILD_TOOLS_LANGTOOLS)
-  else
-    $1_TOOL := -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
-    build.tools.compileproperties.CompileProperties
-    $1_TOOL_DEPS := $(BUILD_TOOLS_JDK)
-  endif
-
-  ifeq ($(findstring $(LOG_LEVEL), debug trace), )
-    $1_QUIET := -quiet
-  endif
 
   # Now setup the rule for the generation of the resource bundles.
-  $$($1_TARGET): $$($1_SRC_FILES) $$($1_JAVAS) $$($1_TOOL_DEPS)
+  $$($1_TARGET): $$($1_SRC_FILES) $$($1_JAVAS) $(BUILD_TOOLS_JDK)
 	$$(call LogWarn, Compiling $$(words $$($1_SRC_FILES)) properties into resource bundles for $(MODULE))
 	$$(call MakeDir, $$(@D) $$($1_DIRS))
 	$$(eval $$(call ListPathsSafely, $1_CMDLINE, $$($1_CMDLINE_FILE)))
-	$$(call ExecuteWithLog, $$($1_EXEC_MARKER), \
-	    $(JAVA_SMALL) $$($1_TOOL) $$($1_QUIET) @$$($1_CMDLINE_FILE))
+	$(TOOL_COMPILEPROPERTIES) -quiet @$$($1_CMDLINE_FILE)
 	$(TOUCH) $$@
 
   $$($1_JAVAS): $$($1_SRC_FILES)
@@ -142,3 +120,5 @@ define SetupCompilePropertiesBody
 
   $1 += $$($1_JAVAS) $$($1_TARGET) $$($1_HK)
 endef
+
+################################################################################

make/common/modules/LauncherCommon.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
@@ -33,14 +33,13 @@ include ToolsJdk.gmk
 # On Mac, we have always exported all symbols, probably due to oversight
 # and/or misunderstanding. To emulate this, don't hide any symbols
 # by default.
+# On AIX/xlc we need at least xlc 13.1 for the symbol hiding (see JDK-8214063)
 # Also provide an override for non-conformant libraries.
 ifeq ($(TOOLCHAIN_TYPE), gcc)
   LAUNCHER_CFLAGS += -fvisibility=hidden
   LDFLAGS_JDKEXE += -Wl,--exclude-libs,ALL
 else ifeq ($(TOOLCHAIN_TYPE), clang)
   LAUNCHER_CFLAGS += -fvisibility=hidden
-else ifeq ($(TOOLCHAIN_TYPE), xlc)
-  LAUNCHER_CFLAGS += -qvisibility=hidden
 endif
 
 LAUNCHER_SRC := $(TOPDIR)/src/java.base/share/native/launcher
@@ -87,8 +86,8 @@ define SetupBuildLauncherBody
     $1_MAIN_MODULE := $(MODULE)
   endif
 
+  $1_JAVA_ARGS += -ms8m
   ifneq ($$($1_MAIN_CLASS), )
-    $1_JAVA_ARGS += -ms8m
     $1_LAUNCHER_CLASS := -m $$($1_MAIN_MODULE)/$$($1_MAIN_CLASS)
   endif
 
@@ -97,12 +96,9 @@ define SetupBuildLauncherBody
       $$(addprefix -J, $$($1_EXTRA_JAVA_ARGS)), "$$a"$(COMMA) )) }'
     $1_CFLAGS += -DEXTRA_JAVA_ARGS=$$($1_EXTRA_JAVA_ARGS_STR)
   endif
-
-  ifneq ($$($1_JAVA_ARGS), )
-    $1_JAVA_ARGS_STR := '{ $$(strip $$(foreach a, \
-        $$(addprefix -J, $$($1_JAVA_ARGS)) $$($1_LAUNCHER_CLASS), "$$a"$(COMMA) )) }'
-    $1_CFLAGS += -DJAVA_ARGS=$$($1_JAVA_ARGS_STR)
-  endif
+  $1_JAVA_ARGS_STR := '{ $$(strip $$(foreach a, \
+      $$(addprefix -J, $$($1_JAVA_ARGS)) $$($1_LAUNCHER_CLASS), "$$a"$(COMMA) )) }'
+  $1_CFLAGS += -DJAVA_ARGS=$$($1_JAVA_ARGS_STR)
 
   ifeq ($(call isTargetOs, macosx), true)
     ifeq ($$($1_MACOSX_PRIVILEGED), true)
@@ -200,11 +196,9 @@ endef
 ################################################################################
 # Create man pages for jmod to pick up. There should be a one-to-one
 # relationship between executables and man pages (even if this is not always
-# the case), so piggyback man page generation on the launcher compilation. This
-# file may be included from other places as well, so only process man pages
-# when called from <module>/Launcher.gmk.
+# the case), so piggyback man page generation on the launcher compilation.
 
-ifeq ($(call isTargetOsType, unix)+$(MAKEFILE_PREFIX), true+Launcher)
+ifeq ($(call isTargetOsType, unix), true)
   # Only build manpages on unix systems.
   # We assume all our man pages should reside in section 1.
 
@@ -248,9 +242,9 @@ ifeq ($(call isTargetOsType, unix)+$(MAKEFILE_PREFIX), true+Launcher)
           FILTER := $(PANDOC_TROFF_MANPAGE_FILTER), \
           POST_PROCESS := $(MAN_POST_PROCESS), \
           REPLACEMENTS := \
-              @@COPYRIGHT_YEAR@@ => $(COPYRIGHT_YEAR) ; \
-              @@VERSION_SHORT@@ => $(VERSION_SHORT) ; \
-              @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION), \
+		@@COPYRIGHT_YEAR@@ => $(COPYRIGHT_YEAR) ; \
+		@@VERSION_SHORT@@ => $(VERSION_SHORT) ; \
+		@@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION), \
           EXTRA_DEPS := $(PANDOC_TROFF_MANPAGE_FILTER) \
               $(PANDOC_TROFF_MANPAGE_FILTER_SOURCE), \
       ))

make/common/modules/LibCommon.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
@@ -36,6 +36,7 @@ WIN_JAVA_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib
 # On Mac, we have always exported all symbols, probably due to oversight
 # and/or misunderstanding. To emulate this, don't hide any symbols
 # by default.
+# On AIX/xlc we need at least xlc 13.1 for the symbol hiding (see JDK-8214063)
 # Also provide an override for non-conformant libraries.
 ifeq ($(TOOLCHAIN_TYPE), gcc)
   CFLAGS_JDKLIB += -fvisibility=hidden
@@ -46,10 +47,6 @@ else ifeq ($(TOOLCHAIN_TYPE), clang)
   CFLAGS_JDKLIB += -fvisibility=hidden
   CXXFLAGS_JDKLIB += -fvisibility=hidden
   EXPORT_ALL_SYMBOLS := -fvisibility=default
-else ifeq ($(TOOLCHAIN_TYPE), xlc)
-  CFLAGS_JDKLIB += -qvisibility=hidden
-  CXXFLAGS_JDKLIB += -qvisibility=hidden
-  EXPORT_ALL_SYMBOLS := -qvisibility=default
 endif
 
 # Put the libraries here.

make/conf/docs-modules.conf

@@ -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
@@ -42,7 +42,6 @@ DOCS_MODULES= \
     jdk.hotspot.agent \
     jdk.httpserver \
     jdk.jpackage \
-    jdk.incubator.concurrent \
     jdk.incubator.vector \
     jdk.jartool \
     jdk.javadoc \
@@ -56,6 +55,7 @@ DOCS_MODULES= \
     jdk.jsobject \
     jdk.jshell \
     jdk.jstatd \
+    jdk.incubator.foreign \
     jdk.localedata \
     jdk.management \
     jdk.management.agent \

make/conf/github-actions.conf

@@ -1,41 +0,0 @@
-#
-# 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
-# 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.
-#
-
-# Versions and download locations for dependencies used by GitHub Actions (GHA)
-
-GTEST_VERSION=1.8.1
-JTREG_VERSION=6.1+2
-
-LINUX_X64_BOOT_JDK_EXT=tar.gz
-LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk18/43f95e8614114aeaa8e8a5fcf20a682d/36/GPL/openjdk-18_linux-x64_bin.tar.gz
-LINUX_X64_BOOT_JDK_SHA256=0f60aef7b8504983d6e374fe94d09a7bedcf05ec559e812d801a33bd4ebd23d0
-
-MACOS_X64_BOOT_JDK_EXT=tar.gz
-MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk18/43f95e8614114aeaa8e8a5fcf20a682d/36/GPL/openjdk-18_macos-x64_bin.tar.gz
-MACOS_X64_BOOT_JDK_SHA256=527b61b4265caf45cdcbacfcf8fbcd0b4b280bede1eff32a5b252d855ff0534b
-
-WINDOWS_X64_BOOT_JDK_EXT=zip
-WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk18/43f95e8614114aeaa8e8a5fcf20a682d/36/GPL/openjdk-18_windows-x64_bin.zip
-WINDOWS_X64_BOOT_JDK_SHA256=a5b91d4c12752d44aa75df70ae3e2311287b3e60c288b07dade106376c688277

make/conf/javadoc.conf

@@ -1,4 +1,4 @@
-# Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,9 @@
 #
 
 # URLs
-JAVADOC_BASE_URL=https://docs.oracle.com/pls/topic/lookup?ctx=javase$(VERSION_FEATURE)&id=homepage
+JAVADOC_BASE_URL=https://docs.oracle.com/pls/topic/lookup?ctx=javase$(VERSION_NUMBER)&id=homepage
 BUG_SUBMIT_URL=https://bugreport.java.com/bugreport/
 COPYRIGHT_URL=legal/copyright.html
-LICENSE_URL=https://www.oracle.com/java/javase/terms/license/java$(VERSION_FEATURE)speclicense.html
+LICENSE_URL=https://www.oracle.com/java/javase/terms/license/java$(VERSION_NUMBER)speclicense.html
 REDISTRIBUTION_URL=https://www.oracle.com/technetwork/java/redist-137594.html
 OTHER_JDK_VERSIONS_URL=https://docs.oracle.com/en/java/javase/index.html

make/conf/jib-profiles.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, 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
@@ -244,7 +244,7 @@ var getJibProfilesCommon = function (input, data) {
         "linux-aarch64", "linux-arm32", "linux-ppc64le", "linux-s390x"
     ];
 
-    // These are the base settings for all the main build profiles.
+    // These are the base setttings for all the main build profiles.
     common.main_profile_base = {
         dependencies: ["boot_jdk", "gnumake", "jtreg", "jib", "autoconf", "jmh", "jcov"],
         default_make_targets: ["product-bundles", "test-bundles", "static-libs-bundles"],
@@ -258,6 +258,7 @@ var getJibProfilesCommon = function (input, data) {
     common.release_profile_base = {
         configure_args: [
             "--enable-reproducible-build",
+            "--with-source-date=current",
         ],
     };
     // Extra settings for debug profiles
@@ -393,8 +394,13 @@ var getJibProfilesCommon = function (input, data) {
         };
     };
 
-    common.boot_jdk_version = "18";
-    common.boot_jdk_build_number = "36";
+    if (input.build_os == 'macosx' && input.build_cpu == 'aarch64') {
+        common.boot_jdk_version = "17";
+        common.boot_jdk_build_number = "24";
+    } else {
+        common.boot_jdk_version = "16";
+        common.boot_jdk_build_number = "36";
+    }
     common.boot_jdk_home = input.get("boot_jdk", "install_path") + "/jdk-"
         + common.boot_jdk_version
         + (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");
@@ -449,8 +455,8 @@ var getJibProfilesProfiles = function (input, common, data) {
         "macosx-aarch64": {
             target_os: "macosx",
             target_cpu: "aarch64",
-            dependencies: ["devkit", "gtest", "pandoc"],
-            configure_args: concat(common.configure_args_64bit,
+            dependencies: ["devkit", "gtest"],
+            configure_args: concat(common.configure_args_64bit, "--with-zlib=system",
                 "--with-macosx-version-max=11.00.00"),
         },
 
@@ -558,7 +564,7 @@ var getJibProfilesProfiles = function (input, common, data) {
             "ANT_HOME": input.get("ant", "home_path")
         }
     };
-    [ "linux-x64", "macosx-x64", "windows-x64", "linux-aarch64"]
+    [ "linux-x64", "macosx-x64", "windows-x64"]
         .forEach(function (name) {
             var maketestName = name + "-testmake";
             profiles[maketestName] = concatObjects(profiles[name], testmakeBase);
@@ -587,17 +593,6 @@ var getJibProfilesProfiles = function (input, common, data) {
             ])
         },
 
-        "linux-aarch64-zero": {
-            target_os: "linux",
-            target_cpu: "aarch64",
-            dependencies: ["devkit", "gtest"],
-            configure_args: concat(common.configure_args_64bit, [
-                "--with-zlib=system",
-                "--with-jvm-variants=zero",
-                "--enable-libffi-bundling"
-            ])
-        },
-
         "linux-x86-zero": {
             target_os: "linux",
             target_cpu: "x86",
@@ -620,7 +615,7 @@ var getJibProfilesProfiles = function (input, common, data) {
     });
 
     // Define a profile with precompiled headers disabled. This is just used for
-    // verification of this build configuration.
+    // verfication of this build configuration.
     var noPchProfiles = {
         "linux-x64-debug-nopch": {
             target_os: "linux",
@@ -643,7 +638,7 @@ var getJibProfilesProfiles = function (input, common, data) {
     // Bootcycle profiles runs the build with itself as the boot jdk. This can
     // be done in two ways. Either using the builtin bootcycle target in the
     // build system. Or by supplying the main jdk build as bootjdk to configure.
-    [ "linux-x64", "macosx-x64", "windows-x64", "linux-aarch64" ]
+    [ "linux-x64", "macosx-x64", "windows-x64" ]
         .forEach(function (name) {
             var bootcycleName = name + "-bootcycle";
             var bootcyclePrebuiltName = name + "-bootcycle-prebuilt";
@@ -837,7 +832,7 @@ var getJibProfilesProfiles = function (input, common, data) {
         [ "", common.open_suffix ].forEach(function (suffix) {
             var cmpBaselineName = name + suffix + "-cmp-baseline";
             profiles[cmpBaselineName] = clone(profiles[name + suffix]);
-            // Only compare the images target. This should presumably be expanded
+            // Only compare the images target. This should pressumably be expanded
             // to include more build targets when possible.
             profiles[cmpBaselineName].default_make_targets = [ "images", "test-image" ];
             if (name == "linux-x64") {
@@ -1022,10 +1017,10 @@ var getJibProfilesProfiles = function (input, common, data) {
     // get src.full as a dependency, and define the work_dir (where make gets
     // run) to be in the src.full install path. By running in the install path,
     // the same cached installation of the full src can be reused for multiple
-    // test tasks. Care must however be taken not to pollute that work dir by
+    // test tasks. Care must however be taken not to polute that work dir by
     // setting the appropriate make variables to control output directories.
     //
-    // Use the existence of the top level README.md as indication of if this is
+    // Use the existance of the top level README.md as indication of if this is
     // the full source or just src.conf.
     if (!new java.io.File(__DIR__, "../../README.md").exists()) {
         var runTestPrebuiltSrcFullExtra = {
@@ -1052,10 +1047,10 @@ var getJibProfilesProfiles = function (input, common, data) {
 var getJibProfilesDependencies = function (input, common) {
 
     var devkit_platform_revisions = {
-        linux_x64: "gcc11.2.0-OL6.4+1.0",
+        linux_x64: "gcc10.3.0-OL6.4+1.0",
         macosx: "Xcode12.4+1.0",
-        windows_x64: "VS2022-17.1.0+1.0",
-        linux_aarch64: "gcc11.2.0-OL7.6+1.0",
+        windows_x64: "VS2019-16.9.3+1.0",
+        linux_aarch64: "gcc10.3.0-OL7.6+1.0",
         linux_arm: "gcc8.2.0-Fedora27+1.0",
         linux_ppc64le: "gcc8.2.0-Fedora27+1.0",
         linux_s390x: "gcc8.2.0-Fedora27+1.0"
@@ -1078,7 +1073,11 @@ var getJibProfilesDependencies = function (input, common) {
     }
     var boot_jdk_os = input.build_os;
     if (input.build_os == "macosx") {
-        boot_jdk_os = "macos";
+        if (input.build_cpu == "aarch64") {
+            boot_jdk_os = "macos";
+        } else {
+            boot_jdk_os = "osx";
+        }
     }
     var boot_jdk_platform = boot_jdk_os + "-" + input.build_cpu;
     var boot_jdk_ext = (input.build_os == "windows" ? ".zip" : ".tar.gz")
@@ -1099,17 +1098,6 @@ var getJibProfilesDependencies = function (input, common) {
         environment_path: common.boot_jdk_home + "/bin"
     }
 
-    var pandoc_version;
-    if (input.build_cpu == "aarch64") {
-        if (input.build_os == "macosx") {
-            pandoc_version = "2.14.0.2+1.0";
-        } else {
-            pandoc_version = "2.5+1.0";
-        }
-    } else {
-        pandoc_version = "2.3.1+1.0";
-    }
-
     var makeBinDir = (input.build_os == "windows"
         ? input.get("gnumake", "install_path") + "/cygwin/bin"
         : input.get("gnumake", "install_path") + "/bin");
@@ -1153,9 +1141,9 @@ var getJibProfilesDependencies = function (input, common) {
         jtreg: {
             server: "jpg",
             product: "jtreg",
-            version: "6.1",
+            version: "6",
             build_number: "1",
-            file: "bundles/jtreg-6.1+1.zip",
+            file: "bundles/jtreg-6+1.zip",
             environment_name: "JT_HOME",
             environment_path: input.get("jtreg", "home_path") + "/bin",
             configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"),
@@ -1164,12 +1152,19 @@ var getJibProfilesDependencies = function (input, common) {
         jmh: {
             organization: common.organization,
             ext: "tar.gz",
-            revision: "1.34+1.0"
+            revision: "1.28+1.0"
         },
 
         jcov: {
+            // Use custom build of JCov
+            // See CODETOOLS-7902734 for more info.
+            // server: "jpg",
+            // product: "jcov",
+            // version: "3.0",
+            // build_number: "b07",
+            // file: "bundles/jcov-3_0.zip",
             organization: common.organization,
-            revision: "3.0-12-jdk-asm+1.0",
+            revision: "3.0-7-jdk-asm+1.0",
             ext: "zip",
             environment_name: "JCOV_HOME",
         },
@@ -1215,7 +1210,7 @@ var getJibProfilesDependencies = function (input, common) {
         pandoc: {
             organization: common.organization,
             ext: "tar.gz",
-            revision: pandoc_version,
+            revision: (input.build_cpu == 'aarch64' ? "2.5+1.0" : "2.3.1+1.0"),
             module: "pandoc-" + input.build_platform,
             configure_args: "PANDOC=" + input.get("pandoc", "install_path") + "/pandoc/pandoc",
             environment_path: input.get("pandoc", "install_path") + "/pandoc"
@@ -1423,10 +1418,7 @@ var getVersion = function (feature, interim, update, patch, extra1, extra2, extr
  * other version inputs
  */
 var versionArgs = function(input, common) {
-    var args = [];
-    if (common.build_number != 0) {
-        args = concat(args, "--with-version-build=" + common.build_number);
-    }
+    var args = ["--with-version-build=" + common.build_number];
     if (input.build_type == "promoted") {
         args = concat(args,
                       "--with-version-pre=" + version_numbers.get("DEFAULT_PROMOTED_VERSION_PRE"),
@@ -1446,14 +1438,6 @@ var versionArgs = function(input, common) {
     } else {
         args = concat(args, "--with-version-opt=" + common.build_id);
     }
-    var sourceDate
-    if (input.build_id_data && input.build_id_data.creationTime) {
-        sourceDate = Math.floor(Date.parse(input.build_id_data.creationTime)/1000);
-    } else {
-        sourceDate = "current";
-    }
-    args = concat(args, "--with-source-date=" + sourceDate);
-
     return args;
 }
 

make/conf/module-loader-map.conf

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -43,7 +43,7 @@ BOOT_MODULES= \
     java.rmi \
     java.security.sasl \
     java.xml \
-    jdk.incubator.concurrent \
+    jdk.incubator.foreign \
     jdk.incubator.vector \
     jdk.internal.vm.ci \
     jdk.jfr \

make/conf/test-dependencies

@@ -0,0 +1,43 @@
+#
+# Copyright (c) 2020, 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
+# 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.
+#
+
+# Versions and download locations for dependencies used by pre-submit testing.
+
+BOOT_JDK_VERSION=16
+JTREG_VERSION=6
+JTREG_BUILD=1
+GTEST_VERSION=1.8.1
+
+LINUX_X64_BOOT_JDK_FILENAME=openjdk-16_linux-x64_bin.tar.gz
+LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk16/7863447f0ab643c585b9bdebf67c69db/36/GPL/openjdk-16_linux-x64_bin.tar.gz
+LINUX_X64_BOOT_JDK_SHA256=e952958f16797ad7dc7cd8b724edd69ec7e0e0434537d80d6b5165193e33b931
+
+WINDOWS_X64_BOOT_JDK_FILENAME=openjdk-16_windows-x64_bin.zip
+WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk16/7863447f0ab643c585b9bdebf67c69db/36/GPL/openjdk-16_windows-x64_bin.zip
+WINDOWS_X64_BOOT_JDK_SHA256=a78bdeaad186297601edac6772d931224d7af6f682a43372e693c37020bd37d6
+
+MACOS_X64_BOOT_JDK_FILENAME=openjdk-16_osx-x64_bin.tar.gz
+MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk16/7863447f0ab643c585b9bdebf67c69db/36/GPL/openjdk-16_osx-x64_bin.tar.gz
+MACOS_X64_BOOT_JDK_SHA256=16f3e39a31e86f3f51b0b4035a37494a47ed3c4ead760eafc6afd7afdf2ad9f2

make/conf/version-numbers.conf

@@ -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
@@ -26,17 +26,17 @@
 # Default version, product, and vendor information to use,
 # unless overridden by configure
 
-DEFAULT_VERSION_FEATURE=20
+DEFAULT_VERSION_FEATURE=17
 DEFAULT_VERSION_INTERIM=0
-DEFAULT_VERSION_UPDATE=0
+DEFAULT_VERSION_UPDATE=2
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2023-03-21
-DEFAULT_VERSION_CLASSFILE_MAJOR=64  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
+DEFAULT_VERSION_DATE=2022-01-18
+DEFAULT_VERSION_CLASSFILE_MAJOR=61  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="18 19 20"
-DEFAULT_JDK_SOURCE_TARGET_VERSION=20
-DEFAULT_PROMOTED_VERSION_PRE=ea
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="16 17"
+DEFAULT_JDK_SOURCE_TARGET_VERSION=17
+DEFAULT_PROMOTED_VERSION_PRE=