8370156: Fix jpackage IconTest

Reviewed-by: almatvee

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

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

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

@@ -64,33 +64,33 @@ jobs:
             gnu-arch: aarch64
             debian-arch: arm64
             debian-repository: https://httpredir.debian.org/debian/
-            debian-version: bullseye
+            debian-version: trixie
             tolerate-sysroot-errors: false
           - target-cpu: arm
             gnu-arch: arm
             debian-arch: armhf
             debian-repository: https://httpredir.debian.org/debian/
-            debian-version: bullseye
+            debian-version: trixie
             tolerate-sysroot-errors: false
             gnu-abi: eabihf
           - target-cpu: s390x
             gnu-arch: s390x
             debian-arch: s390x
             debian-repository: https://httpredir.debian.org/debian/
-            debian-version: bullseye
+            debian-version: trixie
             tolerate-sysroot-errors: false
           - target-cpu: ppc64le
             gnu-arch: powerpc64le
             debian-arch: ppc64el
             debian-repository: https://httpredir.debian.org/debian/
-            debian-version: bullseye
+            debian-version: trixie
             tolerate-sysroot-errors: false
           - target-cpu: riscv64
             gnu-arch: riscv64
             debian-arch: riscv64
             debian-repository: https://httpredir.debian.org/debian/
-            debian-version: sid
-            tolerate-sysroot-errors: true
+            debian-version: trixie
+            tolerate-sysroot-errors: false
 
     steps:
       - name: 'Checkout the JDK source'

.github/workflows/main.yml

@@ -327,8 +327,8 @@ jobs:
     uses: ./.github/workflows/build-macos.yml
     with:
       platform: macos-x64
-      runs-on: 'macos-13'
-      xcode-toolset-version: '14.3.1'
+      runs-on: 'macos-15-intel'
+      xcode-toolset-version: '16.4'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
       dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
@@ -340,8 +340,8 @@ jobs:
     uses: ./.github/workflows/build-macos.yml
     with:
       platform: macos-aarch64
-      runs-on: 'macos-14'
-      xcode-toolset-version: '15.4'
+      runs-on: 'macos-15'
+      xcode-toolset-version: '16.4'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
       dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
@@ -432,9 +432,9 @@ jobs:
     with:
       platform: macos-aarch64
       bootjdk-platform: macos-aarch64
-      runs-on: macos-14
+      runs-on: macos-15
       dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-      xcode-toolset-version: '15.4'
+      xcode-toolset-version: '16.4'
       debug-suffix: -debug
 
   test-windows-x64:

bin/generate-symbol-data.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -52,12 +52,39 @@
 #   include the SCM state that was used to build it, which can be found in ${JDK_N_INSTALL}/release,
 #   in property "SOURCE".
 
+source_path="$(dirname ${0})"
+this_script_dir="$(cd -- "${source_path}" > /dev/null && pwd)"
+if test -z "${this_script_dir}"; then
+  echo "Error: Could not determine location of this script"
+  exit 1
+fi
+
+symbols_dir="$(dirname $this_script_dir)/src/jdk.compiler/share/data/symbols"
+if [ ! -d $symbols_dir ] ; then
+    echo "Cannot locate symbols directory: $symbols_dir" >&2
+    exit 1
+fi
+
+generator_dir="$(dirname $this_script_dir)/make/langtools/src/classes/build/tools/symbolgenerator"
+
 if [ "$1x" = "x" ] ; then
     echo "Must provide the target JDK as a parameter:" >&2
     echo "$0 <target-jdk>" >&2
     exit 1
 fi;
 
+if [ ! -d $1 ] ; then
+    echo "Target JDK argument is not a directory:" $1 >&2
+    exit 1
+fi;
+
+if [ ! -x $1/bin/java ] ; then
+    echo "Target JDK argument is not a valid JDK: $1" >&2
+    exit 1
+fi;
+
+cd $symbols_dir
+
 if [ ! -f symbols ] ; then
     echo "Must run inside the src/jdk.compiler/share/data/symbols directory" >&2
     exit 1
@@ -72,5 +99,5 @@ $1/bin/java --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
             --add-exports jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED \
             --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
             --add-modules jdk.jdeps \
-            ../../../../../make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java \
+            $generator_dir/CreateSymbols.java \
             build-description-incremental symbols include.list

bin/idea.sh

@@ -125,7 +125,8 @@ if [ -d "$TOPLEVEL_DIR/.hg" ] ; then
     VCS_TYPE="hg4idea"
 fi
 
-if [ -d "$TOPLEVEL_DIR/.git" ] ; then
+# Git worktrees use a '.git' file rather than directory, so test both.
+if [ -d "$TOPLEVEL_DIR/.git" -o -f "$TOPLEVEL_DIR/.git" ] ; then
     VCS_TYPE="Git"
 fi
 

bin/lic_check.sh

@@ -1,6 +1,6 @@
 #! /bin/sh -f
 #
-# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -62,7 +62,7 @@ B=`basename "${script_directory}"`
 script_dir="`cd \"${D}\" 2>/dev/null && pwd || echo \"${D}\"`/${B}"
 
 # set up a variable for the template directory
-template_dir=${script_dir}/../data/license-templates
+template_dir=${script_dir}/../make/data/license-templates
 
 # Check existence of the template directory.
 if [ ! -d ${template_dir} ] ; then

bin/unshuffle_list.txt

@@ -1,192 +0,0 @@
-#
-# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-src/bsd : jdk/src/bsd
-src/demo : jdk/src/demo
-src/java.activation : jaxws/src/java.activation
-src/java.base : jdk/src/java.base
-src/java.compiler : langtools/src/java.compiler
-src/java.corba : corba/src/java.corba
-src/java.datatransfer : jdk/src/java.datatransfer
-src/java.desktop : jdk/src/java.desktop
-src/java.instrument : jdk/src/java.instrument
-src/java.logging : jdk/src/java.logging
-src/java.management : jdk/src/java.management
-src/java.management.rmi : jdk/src/java.management.rmi
-src/java.naming : jdk/src/java.naming
-src/java.prefs : jdk/src/java.prefs
-src/java.rmi : jdk/src/java.rmi
-src/java.scripting : jdk/src/java.scripting
-src/java.se : jdk/src/java.se
-src/java.security.jgss : jdk/src/java.security.jgss
-src/java.security.sasl : jdk/src/java.security.sasl
-src/java.se.ee : jdk/src/java.se.ee
-src/java.smartcardio : jdk/src/java.smartcardio
-src/java.sql : jdk/src/java.sql
-src/java.sql.rowset : jdk/src/java.sql.rowset
-src/java.transaction : jdk/src/java.transaction
-src/java.xml : jaxp/src/java.xml
-src/java.xml.bind : jaxws/src/java.xml.bind
-src/java.xml.crypto : jdk/src/java.xml.crypto
-src/java.xml.ws : jaxws/src/java.xml.ws
-src/java.xml.ws.annotation : jaxws/src/java.xml.ws.annotation
-src/jdk.accessibility : jdk/src/jdk.accessibility
-src/jdk.aot : hotspot/src/jdk.aot
-src/jdk.attach : jdk/src/jdk.attach
-src/jdk.charsets : jdk/src/jdk.charsets
-src/jdk.compiler : jdk/src/jdk.compiler  langtools/src/jdk.compiler
-src/jdk.crypto.cryptoki : jdk/src/jdk.crypto.cryptoki
-src/jdk.crypto.ec : jdk/src/jdk.crypto.ec
-src/jdk.crypto.mscapi : jdk/src/jdk.crypto.mscapi
-src/jdk.dynalink : nashorn/src/jdk.dynalink
-src/jdk.editpad : jdk/src/jdk.editpad
-src/jdk.hotspot.agent : hotspot/src/jdk.hotspot.agent
-src/jdk.httpserver : jdk/src/jdk.httpserver
-src/jdk.incubator.httpclient : jdk/src/jdk.incubator.httpclient
-src/jdk.internal.ed : jdk/src/jdk.internal.ed
-src/jdk.internal.jvmstat : jdk/src/jdk.internal.jvmstat
-src/jdk.internal.le : jdk/src/jdk.internal.le
-src/jdk.internal.opt : jdk/src/jdk.internal.opt
-src/jdk.internal.vm.ci : hotspot/src/jdk.internal.vm.ci
-src/jdk.internal.vm.compiler : hotspot/src/jdk.internal.vm.compiler
-src/jdk.jartool : jdk/src/jdk.jartool
-src/jdk.javadoc : langtools/src/jdk.javadoc
-src/jdk.jcmd : jdk/src/jdk.jcmd
-src/jdk.jconsole : jdk/src/jdk.jconsole
-src/jdk.jdeps : langtools/src/jdk.jdeps
-src/jdk.jdi : jdk/src/jdk.jdi
-src/jdk.jdwp.agent : jdk/src/jdk.jdwp.agent
-src/jdk.jlink : jdk/src/jdk.jlink
-src/jdk.jshell : langtools/src/jdk.jshell
-src/jdk.jsobject : jdk/src/jdk.jsobject
-src/jdk.jstatd : jdk/src/jdk.jstatd
-src/jdk.localedata : jdk/src/jdk.localedata
-src/jdk.management : jdk/src/jdk.management
-src/jdk.management.agent : jdk/src/jdk.management.agent
-src/jdk.naming.dns : jdk/src/jdk.naming.dns
-src/jdk.naming.rmi : jdk/src/jdk.naming.rmi
-src/jdk.net : jdk/src/jdk.net
-src/jdk.pack : jdk/src/jdk.pack
-src/jdk.scripting.nashorn : nashorn/src/jdk.scripting.nashorn
-src/jdk.scripting.nashorn.shell : nashorn/src/jdk.scripting.nashorn.shell
-src/jdk.sctp : jdk/src/jdk.sctp
-src/jdk.security.auth : jdk/src/jdk.security.auth
-src/jdk.security.jgss : jdk/src/jdk.security.jgss
-src/jdk.unsupported : jdk/src/jdk.unsupported
-src/jdk.xml.bind : jaxws/src/jdk.xml.bind
-src/jdk.xml.dom : jaxp/src/jdk.xml.dom
-src/jdk.xml.ws : jaxws/src/jdk.xml.ws
-src/jdk.zipfs : jdk/src/jdk.zipfs
-src/langtools/sample : langtools/src/sample
-src/linux : jdk/src/linux
-src/sample : jdk/src/sample
-src/hotspot/share : hotspot/src/share/vm
-src/hotspot/cpu/aarch64 : hotspot/src/cpu/aarch64/vm
-src/hotspot/cpu/arm : hotspot/src/cpu/arm/vm
-src/hotspot/cpu/ppc : hotspot/src/cpu/ppc/vm
-src/hotspot/cpu/s390 : hotspot/src/cpu/s390/vm
-src/hotspot/cpu/x86 : hotspot/src/cpu/x86/vm
-src/hotspot/cpu/zero : hotspot/src/cpu/zero/vm
-src/hotspot/os/aix : hotspot/src/os/aix/vm
-src/hotspot/os/bsd : hotspot/src/os/bsd/vm
-src/hotspot/os/linux : hotspot/src/os/linux/vm
-src/hotspot/os/posix/dtrace : hotspot/src/os/posix/dtrace
-src/hotspot/os/posix : hotspot/src/os/posix/vm
-src/hotspot/os/windows : hotspot/src/os/windows/vm
-src/hotspot/os_cpu/aix_ppc : hotspot/src/os_cpu/aix_ppc/vm
-src/hotspot/os_cpu/bsd_x86 : hotspot/src/os_cpu/bsd_x86/vm
-src/hotspot/os_cpu/bsd_zero : hotspot/src/os_cpu/bsd_zero/vm
-src/hotspot/os_cpu/linux_aarch64 : hotspot/src/os_cpu/linux_aarch64/vm
-src/hotspot/os_cpu/linux_arm : hotspot/src/os_cpu/linux_arm/vm
-src/hotspot/os_cpu/linux_ppc : hotspot/src/os_cpu/linux_ppc/vm
-src/hotspot/os_cpu/linux_s390 : hotspot/src/os_cpu/linux_s390/vm
-src/hotspot/os_cpu/linux_x86 : hotspot/src/os_cpu/linux_x86/vm
-src/hotspot/os_cpu/linux_zero : hotspot/src/os_cpu/linux_zero/vm
-src/hotspot/os_cpu/windows_x86 : hotspot/src/os_cpu/windows_x86/vm
-src/hotspot : hotspot/src
-src/utils/IdealGraphVisualizer : hotspot/src/share/tools/IdealGraphVisualizer
-src/utils/LogCompilation : hotspot/src/share/tools/LogCompilation
-src/utils/hsdis : hotspot/src/share/tools/hsdis
-src/utils/reorder : jdk/make/non-build-utils/reorder
-src/utils/src/build : jdk/make/non-build-utils/src/build
-make/BuildNashorn.gmk : nashorn/make/BuildNashorn.gmk
-make/CompileDemos.gmk : jdk/make/CompileDemos.gmk
-make/CompileInterimLangtools.gmk : langtools/make/CompileInterim.gmk
-make/CompileModuleTools.gmk : jdk/make/CompileModuleTools.gmk
-make/CompileToolsHotspot.gmk : hotspot/make/CompileTools.gmk
-make/CompileToolsJdk.gmk : jdk/make/CompileTools.gmk
-make/CopyInterimCLDRConverter.gmk : jdk/make/CopyInterimCLDRConverter.gmk
-make/GenerateModuleSummary.gmk : jdk/make/GenerateModuleSummary.gmk
-make/ModuleTools.gmk : jdk/make/ModuleTools.gmk
-make/ToolsJdk.gmk : jdk/make/Tools.gmk
-make/ToolsLangtools.gmk : langtools/make/Tools.gmk
-make/UnpackSecurity.gmk : jdk/make/UnpackSecurity.gmk
-make/autoconf : common/autoconf
-make/conf : common/conf
-make/copy : jdk/make/copy
-make/copy/Copy-java.corba.gmk : corba/make/copy/Copy-java.corba.gmk
-make/corba : corba/make
-make/data : jdk/make/data
-make/gendata : jdk/make/gendata
-make/gendata/Gendata-jdk.compiler.gmk : langtools/make/gendata/Gendata-jdk.compiler.gmk
-make/gensrc : jdk/make/gensrc
-make/gensrc/Gensrc-java.corba.gmk : corba/make/gensrc/Gensrc-java.corba.gmk
-make/gensrc/Gensrc-jdk.compiler.gmk : langtools/make/gensrc/Gensrc-jdk.compiler.gmk
-make/gensrc/Gensrc-jdk.hotspot.agent.gmk : hotspot/make/gensrc/Gensrc-jdk.hotspot.agent.gmk
-make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk : hotspot/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
-make/gensrc/Gensrc-jdk.javadoc.gmk : langtools/make/gensrc/Gensrc-jdk.javadoc.gmk
-make/gensrc/Gensrc-jdk.jdeps.gmk : langtools/make/gensrc/Gensrc-jdk.jdeps.gmk
-make/gensrc/Gensrc-jdk.jshell.gmk : langtools/make/gensrc/Gensrc-jdk.jshell.gmk
-make/gensrc/GensrcCommonLangtools.gmk : langtools/make/gensrc/GensrcCommon.gmk
-make/hotspot : hotspot/make
-make/jdk : jdk/make
-make/langtools : langtools/make
-make/launcher : jdk/make/launcher
-make/lib : jdk/make/lib
-make/lib/Lib-jdk.hotspot.agent.gmk : hotspot/make/lib/Lib-jdk.hotspot.agent.gmk
-make/mapfiles : jdk/make/mapfiles
-make/mapfiles/libjsig : hotspot/make/mapfiles/libjsig
-make/mapfiles/libjvm_db : hotspot/make/mapfiles/libjvm_db
-make/mapfiles/libjvm_dtrace : hotspot/make/mapfiles/libjvm_dtrace
-make/mapfiles/libsaproc : hotspot/make/mapfiles/libsaproc
-make/nashorn : nashorn/make
-make/nb_native : common/nb_native
-make/scripts/addNotices.sh : jdk/make/scripts/addNotices.sh
-make/scripts/compare.sh : common/bin/compare.sh
-make/scripts/compare_exceptions.sh.incl : common/bin/compare_exceptions.sh.incl
-make/scripts/genExceptions.sh : jdk/make/scripts/genExceptions.sh
-make/scripts/hide_important_warnings_from_javac.sh : common/bin/hide_important_warnings_from_javac.sh
-make/scripts/logger.sh : common/bin/logger.sh
-make/src/native/fixpath.c : common/src/fixpath.c
-make/test/JtregNativeHotspot.gmk : hotspot/make/test/JtregNative.gmk
-make/test/JtregNativeJdk.gmk : jdk/make/test/JtregNative.gmk
-test/jdk : jdk/test
-test/langtools : langtools/test
-test/nashorn : nashorn/test
-test/jaxp : jaxp/test
-test/hotspot/gtest : hotspot/test/native
-test/hotspot/jtreg : hotspot/test
-bin : common/bin
-bin/nashorn : nashorn/bin
-doc : common/doc
-doc/nashorn : nashorn/docs

bin/unshuffle_patch.sh

@@ -1,237 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Script for updating a patch file as per the shuffled/unshuffled source location.
-
-usage() {
-  echo "Usage: $0 [-h|--help] [-v|--verbose] [-to9|-to10] [-r <repo>] <input_patch> <output_patch>"
-  echo "where:"
-  echo "  -to9            create patches appropriate for a JDK 9 source tree"
-  echo "                  When going to 9, the output patches will be suffixed with the"
-  echo "                  repo name"
-  echo "  -to10           create patches appropriate for a JDK 10 source tree"
-  echo "  -r <repo>       specify repo for source patch, set to 'top' for top repo"
-  echo "  <input_patch>   is the input patch file, that needs shuffling/unshuffling"
-  echo "  <output_patch>  is the updated patch file "
-  echo " "
-  exit 1
-}
-
-SCRIPT_DIR=`dirname $0`
-UNSHUFFLE_LIST=$SCRIPT_DIR"/unshuffle_list.txt"
-
-if [ ! -f "$UNSHUFFLE_LIST" ] ; then
-  echo "FATAL: cannot find $UNSHUFFLE_LIST" >&2
-  exit 1
-fi
-
-vflag="false"
-while [ $# -gt 0 ]
-do
-  case $1 in
-    -h | --help )
-      usage
-      ;;
-
-    -v | --verbose )
-      vflag="true"
-      ;;
-
-    -r)
-      repo="$2"
-      shift
-      ;;
-
-    -to9)
-      shuffle_to=9
-      ;;
-
-    -to10)
-      shuffle_to=10
-      ;;
-
-    -*)  # bad option
-      usage
-      ;;
-
-    * )  # non option
-      break
-      ;;
-  esac
-  shift
-done
-
-# Make sure we have the right number of arguments
-if [ ! $# -eq 2 ] ; then
-  echo "ERROR: Invalid number of arguments." >&2
-  usage
-fi
-
-# Check the given repo
-repos="top corba jaxp jaxws jdk langtools nashorn hotspot"
-found="false"
-if [ -n "$repo" ]; then
-  for r in $repos ; do
-    if [ $repo = "$r" ] ; then
-      found="true"
-      break;
-    fi
-  done
-  if [ $found = "false" ] ; then
-    echo "ERROR: Unknown repo: $repo. Should be one of [$repos]." >&2
-    usage
-  fi
-fi
-
-if [ "$shuffle_to" != "9" -a "$shuffle_to" != "10" ]; then
-  echo "ERROR: Must pick either -to9 or -to10"
-  exit 1
-fi
-
-# When going to 10, a repo must be specified for the source patch
-if [ "$shuffle_to" = "10" -a -z "$repo" ]; then
-  echo "ERROR: Must specify src repo for JDK 9 patch"
-  exit 1
-fi
-
-# Check given input/output files
-input="$1"
-if [ "x$input" = "x-" ] ; then
-  input="/dev/stdin"
-fi
-
-if [ ! -f $input -a "x$input" != "x/dev/stdin" ] ; then
-  echo "ERROR: Cannot find input patch file: $input" >&2
-  exit 1
-fi
-
-output="$2"
-if [ "x$output" = "x-" ] ; then
-  output="/dev/stdout"
-fi
-base_output="$output"
-
-if [ "$shuffle_to" = "10" ]; then
-  if [ -f $output -a "x$output" != "x/dev/stdout" ] ; then
-    echo "ERROR: Output patch already exists: $output" >&2
-    exit 1
-  fi
-else
-  for r in $repos; do
-    if [ -f "$output.$r" ]; then
-      echo "ERROR: Output patch already exists: $output.$r" >&2
-      exit 1
-    fi
-  done
-fi
-
-verbose() {
-  if [ ${vflag} = "true" ] ; then
-    echo "$@" >&2
-  fi
-}
-
-unshuffle() {
-  line=$@
-  verbose "Attempting to rewrite: \"$line\""
-
-  # Retrieve the file name
-  path=
-  if echo "$line" | egrep '^diff' > /dev/null ; then
-    if ! echo "$line" | egrep '\-\-git' > /dev/null ; then
-      echo "ERROR: Only git patches supported. Please use 'hg export --git ...'." >&2
-      exit 1
-    fi
-    path="`echo "$line" | sed -e s@'diff --git a/'@@ -e s@' b/.*$'@@`"
-  elif echo "$line" | egrep '^\-\-\-' > /dev/null ; then
-    path="`echo "$line" | sed -e s@'--- a/'@@`"
-  elif echo "$line" | egrep '^\+\+\+' > /dev/null ; then
-    path="`echo "$line" | sed s@'+++ b/'@@`"
-  fi
-  verbose "Extracted path: \"$path\""
-
-  # Find the most specific matches in the shuffle list
-  matches=
-  if [ -n "$repo" -a "$repo" != "top" ]; then
-    matchpath="$repo"/"$path"/x
-  else
-    matchpath="$path"/x
-  fi
-  while [ "$matchpath" != "" ] ; do
-    matchpath="`echo $matchpath | sed s@'\(.*\)/.*$'@'\1'@`"
-
-    if [ "$shuffle_to" =  "10" ] ; then
-      pattern=": $matchpath$"
-    else
-      pattern="^$matchpath :"
-    fi
-    verbose "Attempting to find \"$matchpath\""
-    matches=`egrep "$pattern" "$UNSHUFFLE_LIST"`
-    if ! [ "x${matches}" = "x" ] ; then
-      verbose "Got matches: [$matches]"
-      break;
-    fi
-
-    if ! echo "$matchpath" | egrep '.*/.*' > /dev/null ; then
-      break;
-    fi
-  done
-
-  # Rewrite the line, if we have a match
-  if ! [ "x${matches}" = "x" ] ; then
-    shuffled="${matches%% : *}"
-    unshuffled="${matches#* : }"
-    patch_suffix_9=""
-    for r in $repos; do
-      if [ "$unshuffled" != "${unshuffled#$r}" ]; then
-        unshuffled="${unshuffled#$r\/}"
-        patch_suffix_9=".$r"
-      fi
-    done
-    verbose "shuffled: $shuffled"
-    verbose "unshuffled: $unshuffled"
-    verbose "patch_suffix_9: $patch_suffix_9"
-    if [ "$shuffle_to" =  "10" ] ; then
-      newline="`echo "$line" | sed -e s@"$unshuffled"@"$shuffled"@g`"
-    else
-      newline="`echo "$line" | sed -e s@"$shuffled"@"$unshuffled"@g`"
-      output=$base_output$patch_suffix_9
-      verbose "Writing to $output"
-    fi
-    verbose "Rewriting to \"$newline\""
-    echo "$newline" >> $output
-  else
-    echo "WARNING: no match found for $path"
-    echo "$line" >> $output
-  fi
-}
-
-while IFS= read -r line
-do
-  if echo "$line" | egrep '^diff|^\-\-\-|^\+\+\+' > /dev/null ; then
-    unshuffle "$line"
-  else
-    printf "%s\n" "$line" >> $output
-  fi
-done < "$input"

bin/update_copyright_year.sh

@@ -62,17 +62,22 @@ Help()
   echo "options:"
   echo "-c     Specifies the company. Set to Oracle by default."
   echo "-y     Specifies the copyright year. Set to current year by default."
+  echo "-b     Specifies the base reference for change set lookup."
   echo "-f     Updates the copyright for all change sets in a given year,"
-  echo "       as specified by -y."
+  echo "       as specified by -y. Overrides -b flag."
   echo "-h     Print this help."
   echo
 }
 
 full_year=false
+base_reference=master
 
 # Process options
-while getopts "c:fhy:" option; do
+while getopts "b:c:fhy:" option; do
   case $option in
+    b) # supplied base reference
+      base_reference=${OPTARG}
+      ;;
     c) # supplied company year
       company=${OPTARG}
       ;;
@@ -111,7 +116,7 @@ else
   if [ "$full_year" = "true" ]; then
     vcs_list_changesets=(git log --no-merges --since="${year}-01-01T00:00:00Z" --until="${year}-12-31T23:59:59Z" --pretty=tformat:"%H")
   else
-    vcs_list_changesets=(git log --no-merges 'master..HEAD' --since="${year}-01-01T00:00:00Z" --until="${year}-12-31T23:59:59Z" --pretty=tformat:"%H")
+    vcs_list_changesets=(git log --no-merges "${base_reference}..HEAD" --since="${year}-01-01T00:00:00Z" --until="${year}-12-31T23:59:59Z" --pretty=tformat:"%H")
   fi
   vcs_changeset_message=(git log -1 --pretty=tformat:"%B") # followed by ${changeset}
   vcs_changeset_files=(git diff-tree --no-commit-id --name-only -r) # followed by ${changeset}

bin/update_pch.sh

@@ -0,0 +1,111 @@
+#!/bin/sh
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+
+# The output of this script may require some degree of human curation:
+# - Redundant headers, e.g. both x.hpp, x.inline.hpp are included;
+# - Headers relative to a non-default feature should be protected by an
+#   appropriate 'if' clause to make sure all variants can build without
+#   errors.
+
+source_path="$(dirname ${0})"
+this_script_dir="$(cd -- "${source_path}" > /dev/null && pwd)"
+if test -z "${this_script_dir}"; then
+  echo "Error: Could not determine location of this script"
+  exit 1
+fi
+
+# Work in top directory
+cd $this_script_dir/..
+
+# Time threshold for header compilation, if the time exceeds the
+# threshold the header will be precompiled.
+if [ -z "$MIN_MS" ]; then
+  MIN_MS=100000
+fi
+
+if [ -z "$CLEAN" ]; then
+  CLEAN=true
+elif [ "$CLEAN" != "true" ] && [ "$CLEAN" != "false" ]; then
+  echo "Expected either 'true' or 'false' for CLEAN"
+fi
+
+# CBA_PATH should point to a valid ClangBuildAnalyzer executable.
+# Build steps:
+# git clone --depth 1 git@github.com:aras-p/ClangBuildAnalyzer.git
+# cd ClangBuildAnalyzer
+# make -f projects/make/Makefile
+if [ -z "$CBA_PATH" ]; then
+  CBA_PATH="./ClangBuildAnalyzer/build/ClangBuildAnalyzer"
+fi
+
+set -eux
+
+PRECOMPILED_HPP="src/hotspot/share/precompiled/precompiled.hpp"
+CBA_CONFIG="ClangBuildAnalyzer.ini"
+TIMESTAMP="$(date +%Y%m%d-%H%M)"
+RUN_NAME="pch_update_$TIMESTAMP"
+CBA_OUTPUT="cba_out_$TIMESTAMP"
+
+if [ "$CLEAN" = "true" ]; then
+  trap 'rm -rf "build/'"$RUN_NAME"'" "$CBA_OUTPUT" "$CBA_CONFIG"' EXIT
+fi
+
+sh configure --with-toolchain-type=clang \
+             --with-conf-name="$RUN_NAME" \
+             --disable-precompiled-headers \
+             --with-extra-cxxflags="-ftime-trace" \
+             --with-extra-cflags="-ftime-trace"
+
+make clean CONF_NAME="$RUN_NAME"
+make hotspot CONF_NAME="$RUN_NAME"
+"$CBA_PATH" --all "./build/$RUN_NAME/hotspot/variant-server/libjvm/objs" \
+  "$CBA_OUTPUT"
+
+# Preserve license and comments on top
+cat "$PRECOMPILED_HPP" | awk '/^#include/ {exit} {print}' > "$PRECOMPILED_HPP.tmp"
+
+if [ ! -f "$CBA_CONFIG" ]; then
+cat <<EOF > "$CBA_CONFIG"
+[counts]
+header=100
+headerChain=0
+template=0
+function=0
+fileCodegen=0
+fileParse=0
+
+[misc]
+onlyRootHeaders=true
+EOF
+fi
+
+"$CBA_PATH" --analyze "$CBA_OUTPUT" | \
+  grep " ms: " | \
+  # Keep the headers more expensive than ${1}ms
+  awk -v x="$MIN_MS" '$1 < x { exit } { print $3 }' | \
+  # Filter away non-hotspot headers
+  grep hotspot/share | \
+  awk -F "hotspot/share/" '{ printf "#include \"%s\"\n", $2 }' \
+  >> "$PRECOMPILED_HPP.tmp"
+mv "$PRECOMPILED_HPP.tmp" "$PRECOMPILED_HPP"
+
+java test/hotspot/jtreg/sources/SortIncludes.java --update "$PRECOMPILED_HPP"

doc/building.html

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

doc/building.md

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

doc/hotspot-style.html

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

doc/hotspot-style.md

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

doc/starting-next-release.html

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

doc/testing.html

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

doc/testing.md

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

make/Bundles.gmk

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

make/CompileJavaModules.gmk

@@ -85,7 +85,7 @@ CreateHkTargets = \
 ################################################################################
 # Include module specific build settings
 
-THIS_SNIPPET := modules/$(MODULE)/Java.gmk
+THIS_SNIPPET := $(call GetModuleSnippetName, Java)
 
 ifneq ($(wildcard $(THIS_SNIPPET)), )
   include MakeSnippetStart.gmk
@@ -115,6 +115,7 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
     EXCLUDE_FILES := $(EXCLUDE_FILES), \
     EXCLUDE_PATTERNS := -files, \
     KEEP_ALL_TRANSLATIONS := $(KEEP_ALL_TRANSLATIONS), \
+    TARGET_RELEASE := $(TARGET_RELEASE), \
     JAVAC_FLAGS := \
         $(DOCLINT) \
         $(JAVAC_FLAGS) \

make/CreateJmods.gmk

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

make/Docs.gmk

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

make/Hsdis.gmk

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

make/Images.gmk

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

make/Main.gmk

@@ -1407,7 +1407,7 @@ CLEAN_SUPPORT_DIRS += demos
 CLEAN_SUPPORT_DIR_TARGETS := $(addprefix clean-, $(CLEAN_SUPPORT_DIRS))
 CLEAN_TESTS += hotspot-jtreg-native jdk-jtreg-native lib
 CLEAN_TEST_TARGETS += $(addprefix clean-test-, $(CLEAN_TESTS))
-CLEAN_PHASES := gensrc java native include
+CLEAN_PHASES += gensrc java native include
 CLEAN_PHASE_TARGETS := $(addprefix clean-, $(CLEAN_PHASES))
 CLEAN_MODULE_TARGETS := $(addprefix clean-, $(ALL_MODULES))
 # Construct targets of the form clean-$module-$phase

make/MainSupport.gmk

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

make/ModuleWrapper.gmk

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

make/RunTests.gmk

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

make/RunTestsPrebuiltSpec.gmk

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

make/StaticLibs.gmk

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

make/ToolsJdk.gmk

@@ -130,6 +130,9 @@ TOOL_PUBLICSUFFIXLIST = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_clas
 TOOL_FIXUPPANDOC = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.fixuppandoc.Main
 
+TOOL_VARHANDLEGUARDMETHODGENERATOR = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    build.tools.methodhandle.VarHandleGuardMethodGenerator
+
 ################################################################################
 
 # Executable javascript filter for man page generation using pandoc.

make/ToolsLangtools.gmk

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

make/UpdateSleefSource.gmk

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

make/autoconf/basic.m4

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

make/autoconf/basic_tools.m4

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

make/autoconf/boot-jdk.m4

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

make/autoconf/bootcycle-spec.gmk.template

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

make/autoconf/build-performance.m4

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

make/autoconf/compare.sh.template

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

make/autoconf/configure.ac

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

make/autoconf/flags-cflags.m4

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

make/autoconf/flags-ldflags.m4

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

make/autoconf/flags-other.m4

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

make/autoconf/flags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -319,13 +319,11 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
 AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL],
 [
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    CC_OUT_OPTION=-Fo
-  else
-    # The option used to specify the target .o,.a or .so file.
-    # When compiling, how to specify the to be created object file.
-    CC_OUT_OPTION='-o$(SPACE)'
+    if test "x$OPENJDK_TARGET_CPU" != xaarch64; then
+      AS_NON_ASM_EXTENSION_OPTION=-Ta
+    fi
   fi
-  AC_SUBST(CC_OUT_OPTION)
+  AC_SUBST(AS_NON_ASM_EXTENSION_OPTION)
 
   # Generate make dependency files
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
@@ -370,6 +368,7 @@ AC_DEFUN([FLAGS_SETUP_FLAGS],
   FLAGS_SETUP_RCFLAGS
   FLAGS_SETUP_NMFLAGS
 
+  FLAGS_SETUP_SVE
   FLAGS_SETUP_ASFLAGS
   FLAGS_SETUP_ASFLAGS_CPU_DEP([TARGET])
   FLAGS_SETUP_ASFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])

make/autoconf/jdk-options.m4

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

make/autoconf/jvm-features.m4

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

make/autoconf/lib-tests.m4

@@ -28,7 +28,7 @@
 ################################################################################
 
 # Minimum supported versions
-JTREG_MINIMUM_VERSION=7.5.2
+JTREG_MINIMUM_VERSION=8.1
 GTEST_MINIMUM_VERSION=1.14.0
 
 ################################################################################

make/autoconf/libraries.m4

@@ -136,12 +136,8 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS $LIBPTHREAD"
   fi
 
-  # librt for legacy clock_gettime
+  # librt - for timers (timer_* functions)
   if test "x$OPENJDK_TARGET_OS" = xlinux; then
-    # Hotspot needs to link librt to get the clock_* functions.
-    # But once our supported minimum build and runtime platform
-    # has glibc 2.17, this can be removed as the functions are
-    # in libc.
     BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lrt"
   fi
 

make/autoconf/spec.gmk.template

@@ -386,16 +386,28 @@ CAPSTONE_ARCH_AARCH64_NAME := @CAPSTONE_ARCH_AARCH64_NAME@
 # it in sync.
 BOOT_JDK := @BOOT_JDK@
 
-BUILD_JDK := @BUILD_JDK@
-CREATE_BUILDJDK := @CREATE_BUILDJDK@
-EXTERNAL_BUILDJDK := @EXTERNAL_BUILDJDK@
+EXTERNAL_BUILDJDK_PATH := @EXTERNAL_BUILDJDK_PATH@
+
+ifneq ($(EXTERNAL_BUILDJDK_PATH), )
+  EXTERNAL_BUILDJDK := true
+  CREATE_BUILDJDK := false
+  BUILD_JDK := $(EXTERNAL_BUILDJDK_PATH)
+else
+  EXTERNAL_BUILDJDK := false
+  ifeq ($(COMPILE_TYPE), cross)
+    CREATE_BUILDJDK := true
+    BUILD_JDK := $(BUILDJDK_OUTPUTDIR)/jdk
+  else
+    CREATE_BUILDJDK := false
+    BUILD_JDK := $(JDK_OUTPUTDIR)
+  endif
+endif
 
 # 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@
+# The oldest supported boot jdk version
+OLDEST_BOOT_JDK_VERSION := @OLDEST_BOOT_JDK_VERSION@
 
 # Information about the build system
 NUM_CORES := @NUM_CORES@
@@ -492,7 +504,7 @@ CXX_VERSION_NUMBER := @CXX_VERSION_NUMBER@
 # Legacy support
 HOTSPOT_TOOLCHAIN_TYPE := @HOTSPOT_TOOLCHAIN_TYPE@
 
-CC_OUT_OPTION := @CC_OUT_OPTION@
+AS_NON_ASM_EXTENSION_OPTION := @AS_NON_ASM_EXTENSION_OPTION@
 
 # Flags used for overriding the default opt setting for a C/C++ source file.
 C_O_FLAG_HIGHEST_JVM := @C_O_FLAG_HIGHEST_JVM@
@@ -624,17 +636,8 @@ ASFLAGS_DEBUG_SYMBOLS := @ASFLAGS_DEBUG_SYMBOLS@
 # Compress (or not) jars
 COMPRESS_JARS := @COMPRESS_JARS@
 
-# Options to linker to specify the library name.
-# (Note absence of := assignment, because we do not want to evaluate the macro body here)
-SET_SHARED_LIBRARY_NAME = @SET_SHARED_LIBRARY_NAME@
-
 SHARED_LIBRARY_FLAGS := @SHARED_LIBRARY_FLAGS@
 
-# Set origin using the linker, ie use the relative path to the dependent library to find the dependencies.
-# (Note absence of := assignment, because we do not want to evaluate the macro body here)
-SET_SHARED_LIBRARY_ORIGIN = @SET_SHARED_LIBRARY_ORIGIN@
-SET_EXECUTABLE_ORIGIN = @SET_EXECUTABLE_ORIGIN@
-
 LIBRARY_PREFIX := @LIBRARY_PREFIX@
 SHARED_LIBRARY_SUFFIX := @SHARED_LIBRARY_SUFFIX@
 STATIC_LIBRARY_SUFFIX := @STATIC_LIBRARY_SUFFIX@
@@ -657,8 +660,8 @@ JAVA_CMD := @JAVA@
 JAVAC_CMD := @JAVAC@
 JAVADOC_CMD := @JAVADOC@
 JAR_CMD := @JAR@
-JLINK_CMD := @JLINK@
-JMOD_CMD := @JMOD@
+JLINK_CMD := @FIXPATH@ $(BUILD_JDK)/bin/jlink
+JMOD_CMD := @FIXPATH@ $(BUILD_JDK)/bin/jmod
 # These variables are meant to be used. They are defined with = instead of := to make
 # it possible to override only the *_CMD variables.
 JAVA = $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
@@ -898,12 +901,14 @@ JDK_MACOSX_BUNDLE_DIR = $(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR)
 JRE_MACOSX_BUNDLE_DIR = $(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR)
 JDK_MACOSX_BUNDLE_DIR_SIGNED = $(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR_SIGNED)
 JRE_MACOSX_BUNDLE_DIR_SIGNED = $(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR_SIGNED)
-JDK_MACOSX_BUNDLE_TOP_DIR = jdk-$(VERSION_NUMBER).jdk
-JRE_MACOSX_BUNDLE_TOP_DIR = jre-$(VERSION_NUMBER).jre
-JDK_MACOSX_CONTENTS_SUBDIR = $(JDK_MACOSX_BUNDLE_TOP_DIR)/Contents
-JRE_MACOSX_CONTENTS_SUBDIR = $(JRE_MACOSX_BUNDLE_TOP_DIR)/Contents
+JDK_MACOSX_BUNDLE_TOP_SUBDIR = jdk-$(VERSION_NUMBER).jdk
+JRE_MACOSX_BUNDLE_TOP_SUBDIR = jre-$(VERSION_NUMBER).jre
+JDK_MACOSX_CONTENTS_SUBDIR = $(JDK_MACOSX_BUNDLE_TOP_SUBDIR)/Contents
+JRE_MACOSX_CONTENTS_SUBDIR = $(JRE_MACOSX_BUNDLE_TOP_SUBDIR)/Contents
 JDK_MACOSX_CONTENTS_DIR = $(JDK_MACOSX_BUNDLE_DIR)/$(JDK_MACOSX_CONTENTS_SUBDIR)
 JRE_MACOSX_CONTENTS_DIR = $(JRE_MACOSX_BUNDLE_DIR)/$(JRE_MACOSX_CONTENTS_SUBDIR)
+JDK_MACOSX_BUNDLE_TOP_DIR = $(JDK_MACOSX_BUNDLE_DIR)/$(JDK_MACOSX_BUNDLE_TOP_SUBDIR)
+JRE_MACOSX_BUNDLE_TOP_DIR = $(JRE_MACOSX_BUNDLE_DIR)/$(JRE_MACOSX_BUNDLE_TOP_SUBDIR)
 
 # Bundle names
 ifneq ($(VERSION_BUILD), )

make/autoconf/toolchain.m4

@@ -276,9 +276,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
   ORG_CFLAGS="$CFLAGS"
   ORG_CXXFLAGS="$CXXFLAGS"
 
-  # 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`
@@ -300,9 +297,10 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
   fi
   AC_SUBST(TOOLCHAIN_VERSION)
 
-  # Finally prepend TOOLCHAIN_PATH to the PATH, to allow --with-tools-dir to
-  # override all other locations.
-  if test "x$TOOLCHAIN_PATH" != x; then
+  # For the microsoft toolchain the toolchain path needs to be added to the
+  # normal path, or the compiler will not work in some situations in later
+  # configure checks.
+  if test "x$TOOLCHAIN_TYPE" = "xmicrosoft" && test "x$TOOLCHAIN_PATH" != x; then
     export PATH=$TOOLCHAIN_PATH:$PATH
   fi
 ])
@@ -310,13 +308,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION],
 # Restore path, etc
 AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION],
 [
-  # Restore old path, except for the microsoft toolchain, which requires the
-  # toolchain path to remain in place. Otherwise the compiler will not work in
-  # some situations in later configure checks.
-  if test "x$TOOLCHAIN_TYPE" != "xmicrosoft"; then
-    PATH="$OLD_PATH"
-  fi
-
   # Restore the flags to the user specified values.
   # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
   CFLAGS="$ORG_CFLAGS"
@@ -655,8 +646,11 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
   if test "x$TOOLCHAIN_TYPE" != xmicrosoft; then
     AS="$CC -c"
   else
-    if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
-      # On 64 bit windows, the assembler is "ml64.exe"
+    if test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
+      # On Windows aarch64, the assembler is "armasm64.exe"
+      UTIL_LOOKUP_TOOLCHAIN_PROGS(AS, armasm64)
+    elif test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
+      # On Windows x64, the assembler is "ml64.exe"
       UTIL_LOOKUP_TOOLCHAIN_PROGS(AS, ml64)
     else
       # otherwise, the assembler is "ml.exe"

make/autoconf/util_paths.m4

@@ -458,17 +458,18 @@ AC_DEFUN([UTIL_LOOKUP_PROGS],
 
 ################################################################################
 # Call UTIL_SETUP_TOOL with AC_CHECK_TOOLS to locate the tool. This will look
-# first for cross-compilation tools.
+# first for tools using the cross-compilation prefix, and then for tools without
+# this prefix. For each of these name variants, it will look first in the
+# toolchain path, and then in the normal path.
 # $1: variable to set
 # $2: executable name (or list of names) to look for
-# $3: [path]
 AC_DEFUN([UTIL_LOOKUP_TOOLCHAIN_PROGS],
 [
   if test "x$ac_tool_prefix" = x; then
-    UTIL_LOOKUP_PROGS($1, $2, $3)
+    UTIL_LOOKUP_PROGS($1, $2, [$TOOLCHAIN_PATH:$PATH])
   else
     prefixed_names=$(for name in $2; do echo ${ac_tool_prefix}${name} $name; done)
-    UTIL_LOOKUP_PROGS($1, $prefixed_names, $3)
+    UTIL_LOOKUP_PROGS($1, $prefixed_names, [$TOOLCHAIN_PATH:$PATH])
   fi
 ])
 
@@ -497,10 +498,9 @@ AC_DEFUN([UTIL_REQUIRE_PROGS],
 # Like UTIL_LOOKUP_PROGS but fails if no tool was found.
 # $1: variable to set
 # $2: executable name (or list of names) to look for
-# $3: [path]
 AC_DEFUN([UTIL_REQUIRE_TOOLCHAIN_PROGS],
 [
-  UTIL_LOOKUP_TOOLCHAIN_PROGS($1, $2, $3)
+  UTIL_LOOKUP_TOOLCHAIN_PROGS($1, $2)
   UTIL_CHECK_NONEMPTY($1)
 ])
 

make/common/Execute.gmk

@@ -45,6 +45,9 @@ ifeq ($(INCLUDE), true)
 # e.g. a simple sed replacement on the input file. If the operations are
 # unrelated to the main COMMAND, this is not a suitable solution.
 #
+# Before execution, the current working directory is changed to SUPPORT_DIR.
+# This can be overridden with WORKING_DIR.
+#
 # If your command outputs a variety of files, or if it's really a single file
 # but you don't really care about the output from the perspective, you can just
 # supply an OUTPUT_DIR. You are supposed to make sure the command creates files
@@ -75,9 +78,12 @@ ifeq ($(INCLUDE), true)
 #   OUTPUT_DIR  : The directory that will contain the result from the command
 #   OUTPUT_FILE : Use this if the command results in a single output file
 #   SUPPORT_DIR : Where to store generated support files
+#   WORKING_DIR : Directory to cd to before executing the command
 #   INFO        : Message to display at LOG=info level when running command (optional)
 #   WARN        : Message to display at LOG=warn level when running command (optional)
 #   DEPS        : Dependencies for the execution to take place
+#   DRYRUN      : Set to true to perform everything but executing the command \
+#                 (defaults to false, primarily intended for debugging)
 #
 
 # Setup make rules for copying files, with an option to do more complex
@@ -133,44 +139,61 @@ define SetupExecuteBody
 
   endif
 
+  ifeq ($$($1_WORKING_DIR), )
+    $1_WORKING_DIR := $$($1_SUPPORT_DIR)
+  endif
+
   ifeq ($$($1_INFO)$$($1_WARN), )
     # If neither info nor warn is provided, add basic info text.
     $1_INFO := Running commands for $1
   endif
 
+  $1_VARDEPS := $$($1_COMMAND) $$($1_PRE_COMMAND) $$($1_POST_COMMAND)
+  $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, $$($1_BASE)_exec.vardeps)
+
   ifneq ($$($1_PRE_COMMAND), )
 
-    $$($1_PRE_MARKER): $$($1_DEPS)
+    $$($1_PRE_MARKER): $$($1_DEPS) $$($1_VARDEPS_FILE)
         ifneq ($$($1_WARN), )
 	  $$(call LogWarn, $$($1_WARN))
         endif
         ifneq ($$($1_INFO), )
 	  $$(call LogInfo, $$($1_INFO))
         endif
-	$$(call MakeDir, $$($1_SUPPORT_DIR) $$($1_OUTPUT_DIR))
+	$$(call MakeDir, $$(call EncodeSpace, $$($1_WORKING_DIR)) $$(call EncodeSpace, $$($1_SUPPORT_DIR)) $$(call EncodeSpace, $$($1_OUTPUT_DIR)))
 	$$(call ExecuteWithLog, $$($1_BASE)_pre, \
-	    $$($1_PRE_COMMAND))
+	    cd $$($1_WORKING_DIR) && $$($1_PRE_COMMAND))
 	$$(TOUCH) $$@
 
     $$($1_EXEC_RESULT): $$($1_PRE_MARKER)
-	$$(call ExecuteWithLog, $$($1_BASE)_exec, \
-	    $$($1_COMMAND))
+        ifneq ($$($1_DRYRUN), true)
+	  $$(call ExecuteWithLog, $$($1_BASE)_exec, \
+	      cd $$($1_WORKING_DIR) && $$($1_COMMAND))
+        else
+	  $$(call LogWarn, DRYRUN enabled for $1, not actually running command)
+	  $$(TOUCH) $$@
+        endif
         ifeq ($$($1_EXEC_RESULT), $$($1_EXEC_MARKER))
 	  $$(TOUCH) $$@
         endif
 
     $1 := $$($1_PRE_MARKER) $$($1_EXEC_RESULT)
   else
-    $$($1_EXEC_RESULT): $$($1_DEPS)
+    $$($1_EXEC_RESULT): $$($1_DEPS) $$($1_VARDEPS_FILE)
         ifneq ($$($1_WARN), )
 	  $$(call LogWarn, $$($1_WARN))
         endif
         ifneq ($$($1_INFO), )
 	  $$(call LogInfo, $$($1_INFO))
         endif
-	$$(call MakeDir, $$(call EncodeSpace, $$($1_SUPPORT_DIR)) $$(call EncodeSpace, $$($1_OUTPUT_DIR)))
-	$$(call ExecuteWithLog, $$($1_BASE)_exec, \
-	    $$($1_COMMAND))
+	$$(call MakeDir, $$(call EncodeSpace, $$($1_WORKING_DIR)) $$(call EncodeSpace, $$($1_SUPPORT_DIR)) $$(call EncodeSpace, $$($1_OUTPUT_DIR)))
+        ifneq ($$($1_DRYRUN), true)
+	  $$(call ExecuteWithLog, $$($1_BASE)_exec, \
+	      cd $$($1_WORKING_DIR) && $$($1_COMMAND))
+        else
+	  $$(call LogWarn, DRYRUN enabled for $1, not actually running command)
+	  $$(TOUCH) $$@
+        endif
         ifeq ($$($1_EXEC_RESULT), $$($1_EXEC_MARKER))
 	  $$(TOUCH) $$@
         endif
@@ -182,7 +205,7 @@ define SetupExecuteBody
 
     $$($1_FINAL_RESULT): $$($1_EXEC_RESULT)
 	$$(call ExecuteWithLog, $$($1_BASE)_post, \
-	    $$($1_POST_COMMAND))
+	    cd $$($1_WORKING_DIR) && $$($1_POST_COMMAND))
 	$$(TOUCH) $$@
 
     $1 += $$($1_FINAL_RESULT)

make/common/JavaCompilation.gmk

@@ -38,10 +38,15 @@ include JarArchive.gmk
 ###
 
 # Create classes that can run on the bootjdk
-TARGET_RELEASE_BOOTJDK := $(BOOT_JDK_SOURCETARGET)
+# -Xlint:-options is added to avoid the warning
+# "system modules path not set in conjunction with -source"
+TARGET_RELEASE_BOOTJDK := -source $(OLDEST_BOOT_JDK_VERSION) \
+    -target $(OLDEST_BOOT_JDK_VERSION) -Xlint:-options
 
-# Create classes that can be used in (or be a part of) the new jdk we're building
-TARGET_RELEASE_NEWJDK := -source $(JDK_SOURCE_TARGET_VERSION) -target $(JDK_SOURCE_TARGET_VERSION)
+# Create classes that can be used in (or be a part of) the new jdk we're
+# building
+TARGET_RELEASE_NEWJDK := -source $(JDK_SOURCE_TARGET_VERSION) \
+    -target $(JDK_SOURCE_TARGET_VERSION)
 
 # Create classes that can be used in JDK 8, for legacy support
 TARGET_RELEASE_JDK8 := --release 8
@@ -178,6 +183,10 @@ define SetupJavaCompilationBody
 
   $1_SAFE_NAME := $$(strip $$(subst /,_, $1))
 
+  ifeq ($$($1_LOG_ACTION), )
+    $1_LOG_ACTION := Compiling
+  endif
+
   ifeq ($$($1_SMALL_JAVA), )
     # If unspecified, default to true
     $1_SMALL_JAVA := true
@@ -472,7 +481,7 @@ define SetupJavaCompilationBody
     # list of files.
     $$($1_FILELIST): $$($1_SRCS) $$($1_VARDEPS_FILE)
 		$$(call MakeDir, $$(@D))
-		$$(call LogWarn, Compiling up to $$(words $$($1_SRCS)) files for $1)
+		$$(call LogWarn, $$($1_LOG_ACTION) up to $$(words $$($1_SRCS)) files for $1)
 		$$(eval $$(call ListPathsSafely, $1_SRCS, $$($1_FILELIST)))
 
     # Create a $$($1_MODFILELIST) file with significant modified dependencies

make/common/JdkNativeCompilation.gmk

@@ -30,6 +30,47 @@ ifeq ($(INCLUDE), true)
 
 include NativeCompilation.gmk
 
+ifeq ($(call isCompiler, gcc), true)
+  # --disable-new-dtags forces use of RPATH instead of RUNPATH for rpaths.
+  # This protects internal library dependencies within the JDK from being
+  # overridden using LD_LIBRARY_PATH. See JDK-8326891 for more information.
+  SetExecutableOrigin = \
+      -Wl,-rpath,\$(DOLLAR)ORIGIN$1 -Wl,--disable-new-dtags
+  SetSharedLibraryOrigin = \
+      -Wl,-z,origin -Wl,-rpath,\$(DOLLAR)ORIGIN$1 -Wl,--disable-new-dtags
+else ifeq ($(call isCompiler, clang), true)
+  ifeq ($(call isTargetOs, macosx), true)
+    SetExecutableOrigin = \
+        -Wl,-rpath,@loader_path$(or $1,/.)
+    SetSharedLibraryOrigin = \
+        -Wl,-rpath,@loader_path$(or $1,/.)
+  else ifeq ($(call isTargetOs, aix), true)
+    SetExecutableOrigin =
+    SetSharedLibraryOrigin =
+  else
+    ifeq ($(call isTargetOs, linux), true)
+      SetExecutableOrigin = \
+          -Wl,-rpath,\$(DOLLAR)ORIGIN$1 -Wl,--disable-new-dtags
+    else
+      SetExecutableOrigin = \
+          -Wl,-rpath,\$(DOLLAR)ORIGIN$1
+    endif
+
+    ifeq ($(call isTargetOs, arm), true)
+      SetSharedLibraryOrigin = \
+          -Wl,-rpath,\$(DOLLAR)ORIGIN$1
+    else
+      SetSharedLibraryOrigin = \
+          -Wl,-z,origin -Wl,-rpath,\$(DOLLAR)ORIGIN$1
+    endif
+  endif
+else ifeq ($(call isCompiler, microsoft), true)
+  SetExecutableOrigin =
+  SetSharedLibraryOrigin =
+else
+  $(error Unknown toolchain)
+endif
+
 FindSrcDirsForComponent += \
   $(call uniq, $(wildcard \
       $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/$(strip $2) \
@@ -444,9 +485,9 @@ define SetupJdkNativeCompilationBody
 
   ifneq ($$($1_LD_SET_ORIGIN), false)
     ifeq ($$($1_TYPE), EXECUTABLE)
-      $1_LDFLAGS += $$(call SET_EXECUTABLE_ORIGIN)
+      $1_LDFLAGS += $$(call SetExecutableOrigin)
     else
-      $1_LDFLAGS += $$(call SET_SHARED_LIBRARY_ORIGIN)
+      $1_LDFLAGS += $$(call SetSharedLibraryOrigin)
     endif
   endif
   # APPEND_LDFLAGS, if it exists, must be set after the origin flags

make/common/MakeBase.gmk

@@ -284,6 +284,12 @@ else
   LogCmdlines =
 endif
 
+# Check if the command line contains redirection, that is <, > or >>,
+# and if so, return a value that is interpreted as true in a make $(if)
+# construct.
+is_redirect = \
+    $(if $(filter < > >>, $1), true)
+
 ################################################################################
 # ExecuteWithLog will run a command and log the output appropriately. This is
 # meant to be used by commands that do "real" work, like a compilation.
@@ -291,21 +297,23 @@ endif
 # of the build in case of failure. The  command line itself is stored in a file,
 # and also logged to stdout if the LOG=cmdlines option has been given.
 #
-# NOTE: If the command redirects stdout, the caller needs to wrap it in a
-# subshell (by adding parentheses around it), otherwise the redirect to the
-# subshell tee process will create a race condition where the target file may
-# not be fully written when the make recipe is done.
-#
 # Param 1 - The path to base the name of the log file / command line file on
 # Param 2 - The command to run
 ExecuteWithLog = \
-  $(call LogCmdlines, Executing: [$(strip $2)]) \
+  $(call LogCmdlines, Executing: \
+      [$(if $(call is_redirect, $2),$(LEFT_PAREN) )$(strip $2)$(if $(call \
+      is_redirect, $2), $(RIGHT_PAREN))]) \
   $(call MakeDir, $(dir $(strip $1)) $(MAKESUPPORT_OUTPUTDIR)/failure-logs) \
   $(call WriteFile, $2, $(strip $1).cmdline) \
-  ( $(RM) $(strip $1).log && $(strip $2) > >($(TEE) -a $(strip $1).log) 2> >($(TEE) -a $(strip $1).log >&2) || \
+  ( $(RM) $(strip $1).log && \
+      $(if $(call is_redirect, $2),$(LEFT_PAREN) )$(strip $2)$(if $(call \
+      is_redirect, $2), $(RIGHT_PAREN)) \
+      > >($(TEE) -a $(strip $1).log) 2> >($(TEE) -a $(strip $1).log >&2) || \
       ( exitcode=$(DOLLAR)? && \
-      $(CP) $(strip $1).log $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(subst /,_,$(patsubst $(OUTPUTDIR)/%,%,$(strip $1))).log && \
-      $(CP) $(strip $1).cmdline $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(subst /,_,$(patsubst $(OUTPUTDIR)/%,%,$(strip $1))).cmdline && \
+      $(CP) $(strip $1).log $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(subst \
+      /,_,$(patsubst $(OUTPUTDIR)/%,%,$(strip $1))).log && \
+      $(CP) $(strip $1).cmdline $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(subst \
+      /,_,$(patsubst $(OUTPUTDIR)/%,%,$(strip $1))).cmdline && \
       exit $(DOLLAR)exitcode ) )
 
 ################################################################################

make/common/MakeIncludeEnd.gmk

@@ -27,10 +27,15 @@
 # MakeIncludeEnd.gmk should be included last of all in all include files
 ################################################################################
 
-# Hook to include the corresponding custom file, if present.
-ifneq ($(NO_CUSTOM_EXTENSIONS), true)
-  CUSTOM_POST_NAME := $(subst .gmk,-post.gmk, $(THIS_INCLUDE))
-  $(eval $(call IncludeCustomExtension, $(CUSTOM_POST_NAME)))
+ifneq ($(INCLUDE_GUARD_$(THIS_INCLUDE)), true)
+  # This was the first time this file was included. Prevent future inclusion.
+  INCLUDE_GUARD_$(THIS_INCLUDE) := true
+
+  # Hook to include the corresponding custom file, if present.
+  ifneq ($(NO_CUSTOM_EXTENSIONS), true)
+    CUSTOM_POST_NAME := $(subst .gmk,-post.gmk, $(THIS_INCLUDE))
+    $(eval $(call IncludeCustomExtension, $(CUSTOM_POST_NAME)))
+  endif
 endif
 
 # Pop our helper name off the stack

make/common/MakeIncludeStart.gmk

@@ -70,7 +70,6 @@ INCLUDE_STACK := $(THIS_INCLUDE) $(INCLUDE_STACK)
 
 # Setup an automatic include guard
 ifneq ($(INCLUDE_GUARD_$(THIS_INCLUDE)), true)
-  INCLUDE_GUARD_$(THIS_INCLUDE) := true
   INCLUDE := true
 
   # Hook to include the corresponding custom file, if present.

make/common/Modules.gmk

@@ -33,7 +33,7 @@ include $(TOPDIR)/make/conf/module-loader-map.conf
 
 # Append platform-specific and upgradeable modules
 PLATFORM_MODULES += $(PLATFORM_MODULES_$(OPENJDK_TARGET_OS)) \
-    $(UPGRADEABLE_PLATFORM_MODULES)
+    $(UPGRADEABLE_PLATFORM_MODULES) $(CUSTOM_UPGRADEABLE_PLATFORM_MODULES)
 
 ################################################################################
 # Setup module sets for docs
@@ -216,7 +216,7 @@ endif
 # Find dependencies ("requires") for a given module.
 # Param 1: Module to find dependencies for.
 FindDepsForModule = \
-  $(DEPS_$(strip $1))
+  $(filter-out $(IMPORT_MODULES), $(DEPS_$(strip $1)))
 
 # Find dependencies ("requires") transitively in 3 levels for a given module.
 # Param 1: Module to find dependencies for.
@@ -254,7 +254,8 @@ FindTransitiveIndirectDepsForModules = \
 # Upgradeable modules are those that are either defined as upgradeable or that
 # require an upradeable module.
 FindAllUpgradeableModules = \
-    $(sort $(filter-out $(MODULES_FILTER), $(UPGRADEABLE_PLATFORM_MODULES)))
+    $(sort $(filter-out $(MODULES_FILTER), \
+    $(UPGRADEABLE_PLATFORM_MODULES) $(CUSTOM_UPGRADEABLE_PLATFORM_MODULES)))
 
 ################################################################################
 
@@ -316,6 +317,19 @@ define ReadImportMetaData
       $$(eval $$(call ReadSingleImportMetaData, $$m)))
 endef
 
+################################################################################
+# Get a full snippet path for the current module and a given base name.
+#
+# Param 1 - The base name of the snippet file to include
+GetModuleSnippetName = \
+  $(if $(CUSTOM_MODULE_MAKE_ROOT), \
+    $(if $(wildcard $(CUSTOM_MODULE_MAKE_ROOT)/$(MODULE)/$(strip $1).gmk), \
+      $(CUSTOM_MODULE_MAKE_ROOT)/$(MODULE)/$(strip $1).gmk, \
+      $(wildcard modules/$(MODULE)/$(strip $1).gmk) \
+    ), \
+    $(wildcard modules/$(MODULE)/$(strip $1).gmk) \
+  )
+
 ################################################################################
 
 endif # include guard

make/common/ProcessMarkdown.gmk

@@ -109,7 +109,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/Utils.gmk

@@ -55,6 +55,42 @@ uppercase = \
     $(uppercase_result) \
   )
 
+lowercase_table := A,a B,b C,c D,d E,e F,f G,g H,h I,i J,j K,k L,l M,m N,n O,o \
+    P,p Q,q R,r S,s T,t U,u V,v W,w X,x Y,y Z,z
+
+lowercase_internal = \
+  $(if $(strip $1), $$(subst $(firstword $1), $(call lowercase_internal, \
+      $(wordlist 2, $(words $1), $1), $2)), $2)
+
+# Convert a string to lower case. Works only on a-z.
+# $1 - The string to convert
+lowercase = \
+  $(strip \
+    $(eval lowercase_result := $(call lowercase_internal, $(lowercase_table), $1)) \
+    $(lowercase_result) \
+  )
+
+lowercase_letters := a b c d e f g h i j k l m n o p q r s t u v w x y z
+uppercase_letters := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
+
+titlecase_internal = \
+  $(strip $(or \
+    $(strip $(foreach l, $(lowercase_letters) $(uppercase_letters), \
+      $(if $(filter $l%, $1), \
+        $(call uppercase, $l)$(call lowercase, $(patsubst $l%,%,$1))))), \
+    $1))
+
+# Convert a string to Title Case. Works only on a-z.
+# $1 - The string to convert
+titlecase = \
+  $(strip $(foreach w, $1, $(call titlecase_internal, $w)))
+
+# Returns the first character of a string. Works only on a-z.
+# $1 - The string to extract the first character from
+firstchar = \
+  $(strip $(foreach l, $(lowercase_letters) $(uppercase_letters), \
+    $(if $(filter $l%, $(firstword $1)), $l)))
+
 ################################################################################
 # Creates a sequence of increasing numbers (inclusive).
 # Param 1 - starting number

make/common/modules/GensrcStreamPreProcessing.gmk

@@ -0,0 +1,228 @@
+#
+# Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+include MakeIncludeStart.gmk
+ifeq ($(INCLUDE), true)
+
+################################################################################
+# This file defines macros that sets up rules for running the spp.Spp build tool
+################################################################################
+
+include Execute.gmk
+include $(TOPDIR)/make/ToolsJdk.gmk
+
+NON_BYTE_NUMBER_TYPES := char short int long float double
+NUMBER_TYPES := byte $(NON_BYTE_NUMBER_TYPES)
+PRIMITIVE_TYPES := boolean $(NUMBER_TYPES)
+
+################################################################################
+# The Conv function converts a type given as first argument (as a normal Java
+# native type name), into one of several corresponding strings, depending on
+# the aspect given in the second argument
+#
+# The implementation dispatches the call to one of several Conv_<aspect> macros.
+#
+# arg $1: the type to convert
+# arg $2: the aspect to convert for
+# arg $3: byte order (only needed for certain aspects)
+#
+Conv = \
+  $(strip $(call Conv_$(strip $2),$(strip $1),$(strip $3)))
+
+################################################################################
+# Conv_<aspect> implementations
+
+# Return a single letter representing the type (lowercase first letter)
+Conv_x = \
+  $(call firstchar, $1)
+
+# Return capitalized type name
+Conv_Type = \
+  $(call titlecase, $1)
+
+# Return the full descriptive name of the type, e.g. int -> integer
+Conv_fulltype = \
+  $(if $(filter char, $1), \
+    character, \
+    $(if $(filter int, $1), \
+      integer, \
+      $1 \
+    ) \
+  )
+
+# Return the capitalized full descriptive name of the type, e.g. int -> Integer
+Conv_Fulltype = \
+  $(call titlecase, $(call Conv_fulltype, $1))
+
+# Return log2 bits per value (0-3)
+Conv_LBPV = \
+  $(if $(filter byte, $1), \
+    0, \
+    $(if $(filter char short, $1), \
+      1, \
+      $(if $(filter int float, $1), \
+        2, \
+        $(if $(filter long double, $1), \
+          3))))
+
+# Return float or int category
+Conv_category = \
+    $(if $(filter float double, $1), \
+      floatingPointType, \
+      integralType \
+    )
+
+# Return stream information for char
+Conv_streams = \
+  $(if $(filter char, $1), streamableType)
+
+# Return stream type information for char
+Conv_streamtype = \
+  $(if $(filter char, $1), int)
+
+# Return capitalized stream type information for char
+Conv_Streamtype = \
+  $(if $(filter char, $1), Int)
+
+# Return article to use for type in English text
+Conv_a = \
+  $(if $(filter int, $1), an, a)
+
+# Return capitalized article to use for type in English text
+Conv_A = \
+  $(if $(filter int, $1), An, A)
+
+# Return integer type with same size as the type
+Conv_memtype = \
+  $(if $(filter float, $1), int, $(if $(filter double, $1), long, $1))
+
+# Return capitalized integer type with same size as the type
+Conv_Memtype = \
+  $(call titlecase, $(call Conv, $1, memtype))
+
+# Return capitalized full descriptive name for integer type with same size as the type
+Conv_FullMemtype = \
+  $(call Conv, $(call Conv, $1, memtype), Fulltype)
+
+# Return Type or Memtype depending on byte order
+# arg $2: BYTE_ORDER
+Conv_Swaptype = \
+  $(if $(filter U, $2), \
+      $(call Conv, $1, Type), \
+      $(call Conv, $1, Memtype))
+
+# Return fromBits method name for floating types, depending on byte order
+# arg $2: BYTE_ORDER
+Conv_fromBits = \
+  $(if $(filter float double, $1), \
+    $(if $(filter U, $2), , \
+      $(call Conv, $1, Type).$(call Conv, $1, memtype)BitsTo$(call Conv, $1, Type)))
+
+# Return toBits method name for floating types, depending on byte order
+# arg $2: BYTE_ORDER
+Conv_toBits = \
+  $(if $(filter float double, $1), \
+    $(if $(filter U, $2), , \
+      $(call Conv, $1, Type).$1ToRaw$(call Conv, $(call Conv, $1, memtype), Type)Bits))
+
+# Return swap method name, depending on byte order
+# arg $2: BYTE_ORDER
+Conv_swap = \
+  $(if $(filter S, $2), Bits.swap)
+
+# Return word describing the number of bytes required by type
+Conv_nbytes = \
+  $(if $(filter 0, $(call Conv, $1, LBPV)), one, \
+    $(if $(filter 1, $(call Conv, $1, LBPV)), two, \
+      $(if $(filter 2, $(call Conv, $1, LBPV)), four, \
+        $(if $(filter 3, $(call Conv, $1, LBPV)), eight))))
+
+# Return word describing the number of bytes required by type, minus one
+Conv_nbytesButOne = \
+  $(if $(filter 0, $(call Conv, $1, LBPV)), zero, \
+    $(if $(filter 1, $(call Conv, $1, LBPV)), one, \
+      $(if $(filter 2, $(call Conv, $1, LBPV)), three, \
+        $(if $(filter 3, $(call Conv, $1, LBPV)), seven))))
+
+################################################################################
+# Setup make rules that runs the spp.Spp build tool on an input file.
+#
+# Parameter 1 is the name of the rule. This name is used as variable prefix,
+# and the targets generated are listed in a variable by that name.
+#
+# Remaining parameters are named arguments. These include:
+#   BEGIN_END Set to true to exclude everything outside #begin/#end (default: false)
+#   SUBST_EMPTY_LINES Set to false to not generate empty lines for removed lines (default: true)
+#   SOURCE_FILE The input file to process (required)
+#   OUTPUT_FILE The output file (required)
+#   INFO Override default message to print (optional)
+#   KEYS One or more keys to control the generation (optional)
+#   REPLACEMENTS one or more text replacement patterns, using the syntax:
+#       VAR=VALUE [VAR=VALUE] ...
+#
+SetupStreamPreProcessing = $(NamedParamsMacroTemplate)
+define SetupStreamPreProcessingBody
+  # Verify arguments
+  ifeq ($$($1_SOURCE_FILE), )
+    $$(error Must specify SOURCE_FILE (in $1))
+  endif
+  ifeq ($$($1_OUTPUT_FILE), )
+    $$(error Must specify OUTPUT_FILE (in $1))
+  endif
+
+  $1_COMMAND_LINE :=
+  ifeq ($$($1_BEGIN_END), true)
+    $1_COMMAND_LINE += -be
+  endif
+
+  ifeq ($$($1_SUBST_EMPTY_LINES), false)
+    $1_COMMAND_LINE += -nel
+  endif
+
+  $1_COMMAND_LINE += $$(foreach k, $$($1_KEYS), -K$$k)
+  $1_COMMAND_LINE += $$(subst $$$$(SPACE), ,$$(foreach d, $$($1_REPLACEMENTS), -D$$d))
+
+  $1_COMMAND_LINE += -i$$($1_SOURCE_FILE) -o$$($1_OUTPUT_FILE).tmp
+
+  ifeq ($$($1_INFO), )
+    $1_INFO := Preprocessing $$(notdir $$($1_SOURCE_FILE)) for $(MODULE)
+  endif
+
+  $$(eval $$(call SetupExecute, RUN_SPP_$1, \
+      INFO := $$($1_INFO), \
+      DEPS := $$($1_SOURCE_FILE) $$(BUILD_TOOLS_JDK), \
+      OUTPUT_FILE := $$($1_OUTPUT_FILE), \
+      COMMAND := $$(TOOL_SPP) $$($1_COMMAND_LINE), \
+      PRE_COMMAND := $$(RM) $$($1_OUTPUT_FILE).tmp $$($1_OUTPUT_FILE), \
+      POST_COMMAND := $$(MV) $$($1_OUTPUT_FILE).tmp $$($1_OUTPUT_FILE), \
+))
+
+  $1 += $$(RUN_SPP_$1)
+endef
+
+################################################################################
+
+endif # include guard
+include MakeIncludeEnd.gmk

make/common/modules/LauncherCommon.gmk

@@ -156,8 +156,8 @@ define SetupBuildLauncherBody
       DISABLED_WARNINGS_gcc := unused-function unused-variable, \
       DISABLED_WARNINGS_clang := unused-function, \
       LDFLAGS := $$($1_LDFLAGS), \
-      LDFLAGS_linux := $$(call SET_EXECUTABLE_ORIGIN,/../lib), \
-      LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN,/../lib), \
+      LDFLAGS_linux := $$(call SetExecutableOrigin,/../lib), \
+      LDFLAGS_macosx := $$(call SetExecutableOrigin,/../lib), \
       LDFLAGS_FILTER_OUT := $$($1_LDFLAGS_FILTER_OUT), \
       JDK_LIBS := $$($1_JDK_LIBS), \
       JDK_LIBS_windows := $$($1_JDK_LIBS_windows), \

make/common/native/CompileFile.gmk

@@ -93,6 +93,14 @@ DEPENDENCY_TARGET_SED_PATTERN := \
     -e 's/$$$$/ :/' \
     #
 
+################################################################################
+# Setup compiler-specific argument to specify output file
+ifeq ($(call isCompiler, microsoft), true)
+  CC_OUT_OPTION := -Fo
+else
+  CC_OUT_OPTION := -o$(SPACE)
+endif
+
 ################################################################################
 # Create the recipe needed to compile a single native source file.
 #
@@ -236,7 +244,7 @@ define CreateCompiledNativeFileBody
             # For assembler calls just create empty dependency lists
 	    $$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
 	        $$($1_COMPILER) $$($1_FLAGS) \
-	        $(CC_OUT_OPTION)$$($1_OBJ) -Ta $$($1_SRC_FILE))) \
+	        $(CC_OUT_OPTION)$$($1_OBJ) $(AS_NON_ASM_EXTENSION_OPTION) $$($1_SRC_FILE))) \
 	        | $(TR) -d '\r' | $(GREP) -v -e "Assembling:" || test "$$$$?" = "1" ; \
 	    $(ECHO) > $$($1_DEPS_FILE) ; \
 	    $(ECHO) > $$($1_DEPS_TARGETS_FILE)
@@ -334,7 +342,7 @@ define CreateWindowsResourceFile
 		$$(call LogInfo, Compiling resource $$(notdir $$($1_VERSIONINFO_RESOURCE)) (for $$($1_BASENAME)))
 		$$(call MakeDir, $$(@D) $$($1_OBJECT_DIR))
 		$$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
-		    $$($1_RC) $$($1_RCFLAGS) $$($1_SYSROOT_CFLAGS) $(CC_OUT_OPTION)$$@ \
+		    $$($1_RC) $$($1_RCFLAGS) $$($1_SYSROOT_CFLAGS) -Fo$$@ \
 		    $$($1_VERSIONINFO_RESOURCE) 2>&1 ))
                 # Windows RC compiler does not support -showIncludes, so we mis-use CL
                 # for this. Filter out RC specific arguments that are unknown to CL.
@@ -344,7 +352,7 @@ define CreateWindowsResourceFile
 		$$(call ExecuteWithLog, $$($1_RES_DEPS_FILE)$(OBJ_SUFFIX), \
 		    $$($1_CC) $$(filter-out -l%, $$($1_RCFLAGS)) \
 		        $$($1_SYSROOT_CFLAGS) -showIncludes -nologo -TC \
-		        $(CC_OUT_OPTION)$$($1_RES_DEPS_FILE)$(OBJ_SUFFIX) -P -Fi$$($1_RES_DEPS_FILE).pp \
+		        -Fo$$($1_RES_DEPS_FILE)$(OBJ_SUFFIX) -P -Fi$$($1_RES_DEPS_FILE).pp \
 		        $$($1_VERSIONINFO_RESOURCE)) 2>&1 \
 		    | $(TR) -d '\r' | $(GREP) -v -e "^Note: including file:" \
 		        -e "^$$(notdir $$($1_VERSIONINFO_RESOURCE))$$$$" || test "$$$$?" = "1" ; \

make/common/native/Link.gmk

@@ -50,6 +50,26 @@ GetEntitlementsFile = \
       $(if $(wildcard $f), $f, $(DEFAULT_ENTITLEMENTS_FILE)) \
     )
 
+ifeq ($(call isCompiler, gcc), true)
+  SetSharedLibraryName = \
+      -Wl,-soname=$1
+else ifeq ($(call isCompiler, clang), true)
+  ifeq ($(call isTargetOs, macosx), true)
+    SetSharedLibraryName = \
+        -Wl,-install_name,@rpath/$1
+  else ifeq ($(call isTargetOs, aix), true)
+    SetSharedLibraryName =
+  else
+    # Default works for linux, might work on other platforms as well.
+    SetSharedLibraryName = \
+        -Wl,-soname=$1
+  endif
+else ifeq ($(call isCompiler, microsoft), true)
+  SetSharedLibraryName =
+else
+  $(error Unknown toolchain)
+endif
+
 ################################################################################
 define SetupLinking
   # Unless specifically set, stripping should only happen if symbols are also
@@ -131,7 +151,7 @@ define CreateDynamicLibraryOrExecutable
   # A shared dynamic library or an executable binary has been specified
   ifeq ($$($1_TYPE), LIBRARY)
     # Generating a dynamic library.
-    $1_EXTRA_LDFLAGS += $$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))
+    $1_EXTRA_LDFLAGS += $$(call SetSharedLibraryName,$$($1_BASENAME))
   endif
 
   ifeq ($(MACOSX_CODESIGN_MODE), hardened)

make/common/native/LinkMicrosoft.gmk

@@ -113,9 +113,10 @@ define CreateDynamicLibraryOrExecutableMicrosoft
 	  $$(CHMOD) +x $$($1_TARGET)
         endif
         ifneq ($$($1_MANIFEST), )
-	  $$($1_MT) -nologo -manifest $$($1_MANIFEST) \
-	      -identity:"$$($1_NAME).exe, version=$$($1_MANIFEST_VERSION)" \
-	      -outputresource:$$@;#1
+	  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_run_mt, \
+	      $$($1_MT) -nologo -manifest $$($1_MANIFEST) \
+	          -identity:"$$($1_NAME).exe$$(COMMA) version=$$($1_MANIFEST_VERSION)" \
+	          '-outputresource:$$($1_TARGET);$$(HASH)1')
         endif
         ifneq ($(SIGNING_HOOK), )
 	  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_call_signing_hook, \

make/conf/docs-modules.conf

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -51,7 +51,6 @@ DOCS_MODULES= \
     jdk.jdwp.agent \
     jdk.jfr \
     jdk.jlink \
-    jdk.jsobject \
     jdk.jshell \
     jdk.jstatd \
     jdk.localedata \

make/conf/github-actions.conf

@@ -26,24 +26,24 @@
 # Versions and download locations for dependencies used by GitHub Actions (GHA)
 
 GTEST_VERSION=1.14.0
-JTREG_VERSION=7.5.2+1
+JTREG_VERSION=8.1+1
 
 LINUX_X64_BOOT_JDK_EXT=tar.gz
-LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_linux-x64_bin.tar.gz
-LINUX_X64_BOOT_JDK_SHA256=88b090fa80c6c1d084ec9a755233967458788e2c0777ae2e172230c5c692d7ef
+LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk25/bd75d5f9689641da8e1daabeccb5528b/36/GPL/openjdk-25_linux-x64_bin.tar.gz
+LINUX_X64_BOOT_JDK_SHA256=59cdcaf255add4721de38eb411d4ecfe779356b61fb671aee63c7dec78054c2b
 
 ALPINE_LINUX_X64_BOOT_JDK_EXT=tar.gz
-ALPINE_LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_x64_alpine-linux_hotspot_24_36.tar.gz
-ALPINE_LINUX_X64_BOOT_JDK_SHA256=a642608f0da78344ee6812fb1490b8bc1d7ad5a18064c70994d6f330568c51cb
+ALPINE_LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_x64_alpine-linux_hotspot_25_36.tar.gz
+ALPINE_LINUX_X64_BOOT_JDK_SHA256=637e47474d411ed86134f413af7d5fef4180ddb0bf556347b7e74a88cf8904c8
 
 MACOS_AARCH64_BOOT_JDK_EXT=tar.gz
-MACOS_AARCH64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_macos-aarch64_bin.tar.gz
-MACOS_AARCH64_BOOT_JDK_SHA256=f7133238a12714a62c5ad2bd4da6741130be1a82512065da9ca23dee26b2d3d3
+MACOS_AARCH64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk25/bd75d5f9689641da8e1daabeccb5528b/36/GPL/openjdk-25_macos-aarch64_bin.tar.gz
+MACOS_AARCH64_BOOT_JDK_SHA256=2006337bf326fdfdf6117081751ba38c1c8706d63419ecac7ff102ff7c776876
 
 MACOS_X64_BOOT_JDK_EXT=tar.gz
-MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_macos-x64_bin.tar.gz
-MACOS_X64_BOOT_JDK_SHA256=6bbfb1d01741cbe55ab90299cb91464b695de9a3ace85c15131aa2f50292f321
+MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk25/bd75d5f9689641da8e1daabeccb5528b/36/GPL/openjdk-25_macos-x64_bin.tar.gz
+MACOS_X64_BOOT_JDK_SHA256=47482ad9888991ecac9b2bcc131e2b53ff78aff275104cef85f66252308e8a09
 
 WINDOWS_X64_BOOT_JDK_EXT=zip
-WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_windows-x64_bin.zip
-WINDOWS_X64_BOOT_JDK_SHA256=11d1d9f6ac272d5361c8a0bef01894364081c7fb1a6914c2ad2fc312ae83d63b
+WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk25/bd75d5f9689641da8e1daabeccb5528b/36/GPL/openjdk-25_windows-x64_bin.zip
+WINDOWS_X64_BOOT_JDK_SHA256=85bcc178461e2cb3c549ab9ca9dfa73afd54c09a175d6510d0884071867137d3

make/conf/jib-profiles.js

@@ -387,8 +387,8 @@ var getJibProfilesCommon = function (input, data) {
         };
     };
 
-    common.boot_jdk_version = "24";
-    common.boot_jdk_build_number = "36";
+    common.boot_jdk_version = "25";
+    common.boot_jdk_build_number = "37";
     common.boot_jdk_home = input.get("boot_jdk", "install_path") + "/jdk-"
         + common.boot_jdk_version
         + (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");
@@ -1174,9 +1174,9 @@ var getJibProfilesDependencies = function (input, common) {
         jtreg: {
             server: "jpg",
             product: "jtreg",
-            version: "7.5.2",
+            version: "8.1",
             build_number: "1",
-            file: "bundles/jtreg-7.5.2+1.zip",
+            file: "bundles/jtreg-8.1+1.zip",
             environment_name: "JT_HOME",
             environment_path: input.get("jtreg", "home_path") + "/bin",
             configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"),

make/conf/module-loader-map.conf

@@ -62,7 +62,6 @@ UPGRADEABLE_PLATFORM_MODULES= \
     java.compiler \
     jdk.graal.compiler \
     jdk.graal.compiler.management \
-    jdk.jsobject \
     #
 
 PLATFORM_MODULES= \

make/conf/version-numbers.conf

@@ -37,6 +37,6 @@ DEFAULT_VERSION_DATE=2026-03-17
 DEFAULT_VERSION_CLASSFILE_MAJOR=70  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="24 25 26"
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="25 26"
 DEFAULT_JDK_SOURCE_TARGET_VERSION=26
 DEFAULT_PROMOTED_VERSION_PRE=ea

make/data/charsetmapping/IBM930.c2b

@@ -32,11 +32,6 @@
 547d    92ca
 53da    9b7e
 446e    f86f
-#
-# we should use this one instead of the 4260<-ff0d
-#4260	2212  
-4260	ff0d
-#
 426A	00A6
 43A1	301C
 444A	2014

make/data/charsetmapping/IBM930.map

@@ -25,13 +25,6 @@
 #      4260 <--> 2212
 #      426A <--> 00A6
 #
-#      Warning:
-#      "our old" implementation seems agree with above "new" mappings
-#      except the entries   4260 <-> 2212. To keep the "compatbility"
-#      with the "old" implementation, I changed the entries "temporarily"
-#      4260 <-> 2212
-#      4260 <-  ff0d
-#
 00	0000
 01	0001
 02	0002
@@ -407,8 +400,7 @@ FF	009F
 425D	FF09
 425E	FF1B
 425F	FFE2
-#4260	FF0D
-4260	2212
+4260	FF0D
 4261	FF0F
 426A	FFE4
 426B	FF0C

make/devkit/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@
 #
 # make TARGETS="aarch64-linux-gnu" BASE_OS=Fedora
 # or
-# make TARGETS="arm-linux-gnueabihf ppc64-linux-gnu" BASE_OS=Fedora BASE_OS_VERSION=17
+# make TARGETS="arm-linux-gnueabihf ppc64le-linux-gnu" BASE_OS=Fedora BASE_OS_VERSION=17
 #
 # to build several devkits for a specific OS version at once.
 # You can find the final results under ../../build/devkit/result/<host>-to-<target>
@@ -50,68 +50,68 @@
 # makefile again for cross compilation. Ex:
 #
 # PATH=$PWD/../../build/devkit/result/x86_64-linux-gnu-to-x86_64-linux-gnu/bin:$PATH \
-#    make TARGETS="arm-linux-gnueabihf,ppc64-linux-gnu" BASE_OS=Fedora
+#    make TARGETS="arm-linux-gnueabihf ppc64le-linux-gnu" BASE_OS=Fedora
 #
 # This is the makefile which iterates over all host and target platforms.
 #
 
 COMMA := ,
 
-os := $(shell uname -o)
-cpu := $(shell uname -p)
+OS := $(shell uname -o)
+CPU := $(shell uname -m)
 
 # Figure out what platform this is building on.
-me := $(cpu)-$(if $(findstring Linux,$(os)),linux-gnu)
+ME := $(CPU)-$(if $(findstring Linux,$(OS)),linux-gnu)
 
-$(info Building on platform $(me))
+$(info Building on platform $(ME))
 
 #
 # By default just build for the current platform, which is assumed to be Linux
 #
 ifeq ($(TARGETS), )
-  platforms := $(me)
-  host_platforms := $(platforms)
+  PLATFORMS := $(ME)
+  HOST_PLATFORMS := $(PLATFORMS)
 else
-  platforms := $(subst $(COMMA), , $(TARGETS))
-  host_platforms := $(me)
+  PLATFORMS := $(subst $(COMMA), , $(TARGETS))
+  HOST_PLATFORMS := $(ME)
 endif
-target_platforms := $(platforms)
-$(info host_platforms $(host_platforms))
-$(info target_platforms $(target_platforms))
+TARGET_PLATFORMS := $(PLATFORMS)
+$(info HOST_PLATFORMS $(HOST_PLATFORMS))
+$(info TARGET_PLATFORMS $(TARGET_PLATFORMS))
 
-all compile : $(platforms)
+all compile : $(PLATFORMS)
 
 ifeq ($(SKIP_ME), )
-  $(foreach p,$(filter-out $(me),$(platforms)),$(eval $(p) : $$(me)))
+  $(foreach p,$(filter-out $(ME),$(PLATFORMS)),$(eval $(p) : $$(ME)))
 endif
 
 OUTPUT_ROOT = $(abspath ../../build/devkit)
 RESULT = $(OUTPUT_ROOT)/result
 
-submakevars = HOST=$@ BUILD=$(me) RESULT=$(RESULT) OUTPUT_ROOT=$(OUTPUT_ROOT)
+SUBMAKEVARS = HOST=$@ BUILD=$(ME) RESULT=$(RESULT) OUTPUT_ROOT=$(OUTPUT_ROOT)
 
-$(host_platforms) :
+$(HOST_PLATFORMS) :
 	@echo 'Building compilers for $@'
-	@echo 'Targets: $(target_platforms)'
-	for p in $(filter $@, $(target_platforms)) $(filter-out $@, $(target_platforms)); do \
-	  $(MAKE) -f Tools.gmk download-rpms $(submakevars) \
+	@echo 'Targets: $(TARGET_PLATFORMS)'
+	for p in $(filter $@, $(TARGET_PLATFORMS)) $(filter-out $@, $(TARGET_PLATFORMS)); do \
+	  $(MAKE) -f Tools.gmk download-rpms $(SUBMAKEVARS) \
               TARGET=$$p PREFIX=$(RESULT)/$@-to-$$p && \
-	  $(MAKE) -f Tools.gmk all $(submakevars) \
+	  $(MAKE) -f Tools.gmk all $(SUBMAKEVARS) \
               TARGET=$$p PREFIX=$(RESULT)/$@-to-$$p && \
-	  $(MAKE) -f Tools.gmk ccache $(submakevars) \
+	  $(MAKE) -f Tools.gmk ccache $(SUBMAKEVARS) \
               TARGET=$@ PREFIX=$(RESULT)/$@-to-$$p || exit 1 ; \
 	done
 	@echo 'All done"'
 
-today := $(shell date +%Y%m%d)
+TODAY := $(shell date +%Y%m%d)
 
 define Mktar
-  $(1)-to-$(2)_tar = $$(RESULT)/sdk-$(1)-to-$(2)-$$(today).tar.gz
+  $(1)-to-$(2)_tar = $$(RESULT)/sdk-$(1)-to-$(2)-$$(TODAY).tar.gz
   $$($(1)-to-$(2)_tar) : PLATFORM = $(1)-to-$(2)
   TARFILES += $$($(1)-to-$(2)_tar)
 endef
 
-$(foreach p,$(host_platforms),$(foreach t,$(target_platforms),$(eval $(call Mktar,$(p),$(t)))))
+$(foreach p,$(HOST_PLATFORMS),$(foreach t,$(TARGET_PLATFORMS),$(eval $(call Mktar,$(p),$(t)))))
 
 tars : all $(TARFILES)
 onlytars : $(TARFILES)
@@ -119,9 +119,9 @@ onlytars : $(TARFILES)
 	$(MAKE) -r -f Tars.gmk SRC_DIR=$(RESULT)/$(PLATFORM) TAR_FILE=$@
 
 clean :
-	rm -rf $(addprefix ../../build/devkit/, result $(host_platforms))
+	rm -rf $(addprefix ../../build/devkit/, result $(HOST_PLATFORMS))
 dist-clean: clean
 	rm -rf $(addprefix ../../build/devkit/, src download)
 
 FORCE :
-.PHONY : all compile tars $(configs) $(host_platforms) clean dist-clean
+.PHONY : all compile tars $(HOST_PLATFORMS) clean dist-clean

make/devkit/Tools.gmk

@@ -39,7 +39,7 @@
 # Fix this...
 #
 
-uppercase = $(shell echo $1 | tr a-z A-Z)
+lowercase = $(shell echo $1 | tr A-Z a-z)
 
 $(info TARGET=$(TARGET))
 $(info HOST=$(HOST))
@@ -69,15 +69,26 @@ else ifeq ($(BASE_OS), Fedora)
   ifeq ($(BASE_OS_VERSION), )
     BASE_OS_VERSION := $(DEFAULT_OS_VERSION)
   endif
+  ifeq ($(filter aarch64 armhfp ppc64le riscv64 s390x x86_64, $(ARCH)), )
+    $(error Only "aarch64 armhfp ppc64le riscv64 s390x x86_64" architectures are supported for Fedora, but "$(ARCH)" was requested)
+  endif
   ifeq ($(ARCH), riscv64)
+    ifeq ($(filter 38 39 40 41, $(BASE_OS_VERSION)), )
+      $(error Only Fedora 38-41 are supported for "$(ARCH)", but Fedora $(BASE_OS_VERSION) was requested)
+    endif
     BASE_URL := http://fedora.riscv.rocks/repos-dist/f$(BASE_OS_VERSION)/latest/$(ARCH)/Packages/
   else
-    LATEST_ARCHIVED_OS_VERSION := 35
-    ifeq ($(filter x86_64 armhfp, $(ARCH)), )
+    LATEST_ARCHIVED_OS_VERSION := 36
+    ifeq ($(filter aarch64 armhfp x86_64, $(ARCH)), )
       FEDORA_TYPE := fedora-secondary
     else
       FEDORA_TYPE := fedora/linux
     endif
+    ifeq ($(ARCH), armhfp)
+      ifneq ($(BASE_OS_VERSION), 36)
+        $(error Fedora 36 is the last release supporting "armhfp", but $(BASE_OS) was requested)
+      endif
+    endif
     NOT_ARCHIVED := $(shell [ $(BASE_OS_VERSION) -gt $(LATEST_ARCHIVED_OS_VERSION) ] && echo true)
     ifeq ($(NOT_ARCHIVED),true)
       BASE_URL := https://dl.fedoraproject.org/pub/$(FEDORA_TYPE)/releases/$(BASE_OS_VERSION)/Everything/$(ARCH)/os/Packages/
@@ -93,26 +104,48 @@ endif
 ################################################################################
 # Define external dependencies
 
-gcc_ver_only := 14.2.0
-binutils_ver_only := 2.43
-ccache_ver_only := 4.10.2
+GNU_BASE_URL := https://ftp.gnu.org/pub/gnu
+
+BINUTILS_VER_ONLY := 2.43
+BINUTILS_BASE_URL := $(GNU_BASE_URL)/binutils
+BINUTILS_SHA512 := 93e063163e54d6a6ee2bd48dc754270bf757a3635b49a702ed6b310e929e94063958512d191e66beaf44275f7ea60865dbde138b624626739679fcc306b133bb
+
+CCACHE_VER_ONLY := 4.10.2
+CCACHE_BASE_URL := https://github.com/ccache/ccache/releases/download
 CCACHE_CMAKE_BASED := 1
-mpfr_ver_only := 4.2.1
-gmp_ver_only := 6.3.0
-mpc_ver_only := 1.3.1
-gdb_ver_only := 15.2
+CCACHE_SHA512 := 3815c71d7266c32839acb306763268018acc58b3bbbd9ec79fc101e4217c1720d2ad2f01645bf69168c1c61d27700b6f3bb755cfa82689cca69824f015653f3c
 
-dependencies := gcc binutils ccache mpfr gmp mpc gdb
+GCC_VER_ONLY := 14.2.0
+GCC_BASE_URL := $(GNU_BASE_URL)/gcc
+GCC_SHA512 := 932bdef0cda94bacedf452ab17f103c0cb511ff2cec55e9112fc0328cbf1d803b42595728ea7b200e0a057c03e85626f937012e49a7515bc5dd256b2bf4bc396
 
-$(foreach dep,$(dependencies),$(eval $(dep)_ver := $(dep)-$($(dep)_ver_only)))
+GDB_VER_ONLY := 15.2
+GDB_BASE_URL := $(GNU_BASE_URL)/gdb
+GDB_SHA512 := 624007deceb5b15ba89c0725883d1a699fa46714ef30887f3d0165e17c5d65d634671740a135aa69e437d916218abb08cfa2a38ed309ff19d48f51da56b2a8ba
 
-GCC := http://ftp.gnu.org/pub/gnu/gcc/$(gcc_ver)/$(gcc_ver).tar.xz
-BINUTILS := http://ftp.gnu.org/pub/gnu/binutils/$(binutils_ver).tar.gz
-CCACHE := https://github.com/ccache/ccache/releases/download/v$(ccache_ver_only)/$(ccache_ver).tar.xz
-MPFR := https://www.mpfr.org/$(mpfr_ver)/$(mpfr_ver).tar.bz2
-GMP := http://ftp.gnu.org/pub/gnu/gmp/$(gmp_ver).tar.bz2
-MPC := http://ftp.gnu.org/pub/gnu/mpc/$(mpc_ver).tar.gz
-GDB := http://ftp.gnu.org/gnu/gdb/$(gdb_ver).tar.xz
+GMP_VER_ONLY := 6.3.0
+GMP_BASE_URL := $(GNU_BASE_URL)/gmp
+GMP_SHA512 := e85a0dab5195889948a3462189f0e0598d331d3457612e2d3350799dba2e244316d256f8161df5219538eb003e4b5343f989aaa00f96321559063ed8c8f29fd2
+
+MPC_VER_ONLY := 1.3.1
+MPC_BASE_URL := $(GNU_BASE_URL)/mpc
+MPC_SHA512 := 4bab4ef6076f8c5dfdc99d810b51108ced61ea2942ba0c1c932d624360a5473df20d32b300fc76f2ba4aa2a97e1f275c9fd494a1ba9f07c4cb2ad7ceaeb1ae97
+
+MPFR_VER_ONLY := 4.2.1
+MPFR_BASE_URL := https://www.mpfr.org
+MPFR_SHA512 := bc68c0d755d5446403644833ecbb07e37360beca45f474297b5d5c40926df1efc3e2067eecffdf253f946288bcca39ca89b0613f545d46a9e767d1d4cf358475
+
+DEPENDENCIES := BINUTILS CCACHE GCC GDB GMP MPC MPFR
+
+$(foreach dep,$(DEPENDENCIES),$(eval $(dep)_VER := $(call lowercase,$(dep)-$($(dep)_VER_ONLY))))
+
+BINUTILS_URL := $(BINUTILS_BASE_URL)/$(BINUTILS_VER).tar.xz
+CCACHE_URL := $(CCACHE_BASE_URL)/v$(CCACHE_VER_ONLY)/$(CCACHE_VER).tar.xz
+GCC_URL := $(GCC_BASE_URL)/$(GCC_VER)/$(GCC_VER).tar.xz
+GDB_URL := $(GDB_BASE_URL)/$(GDB_VER).tar.xz
+GMP_URL := $(GMP_BASE_URL)/$(GMP_VER).tar.xz
+MPC_URL := $(MPC_BASE_URL)/$(MPC_VER).tar.gz
+MPFR_URL := $(MPFR_BASE_URL)/$(MPFR_VER)/$(MPFR_VER).tar.xz
 
 REQUIRED_MIN_MAKE_MAJOR_VERSION := 4
 ifneq ($(REQUIRED_MIN_MAKE_MAJOR_VERSION),)
@@ -169,10 +202,10 @@ DOWNLOAD_RPMS := $(DOWNLOAD)/rpms/$(TARGET)-$(LINUX_VERSION)
 SRCDIR := $(OUTPUT_ROOT)/src
 
 # Marker file for unpacking rpms
-rpms := $(SYSROOT)/rpms_unpacked
+RPMS := $(SYSROOT)/rpms_unpacked
 
 # Need to patch libs that are linker scripts to use non-absolute paths
-libs := $(SYSROOT)/libs_patched
+LIBS := $(SYSROOT)/libs_patched
 
 ################################################################################
 # Download RPMs
@@ -187,10 +220,10 @@ download-rpms:
 ################################################################################
 # Unpack source packages
 
-# Generate downloading + unpacking of sources.
-define Download
+# Generate downloading + checksum verification of sources.
+define DownloadVerify
   # Allow override
-  $(1)_DIRNAME ?= $(basename $(basename $(notdir $($(1)))))
+  $(1)_DIRNAME ?= $(basename $(basename $(notdir $($(1)_URL))))
   $(1)_DIR = $(abspath $(SRCDIR)/$$($(1)_DIRNAME))
   ifeq ($$($(1)_CMAKE_BASED),)
     $(1)_CFG = $$($(1)_DIR)/configure
@@ -201,7 +234,7 @@ define Download
     $(1)_SRC_MARKER = $$($(1)_DIR)/CMakeLists.txt
     $(1)_CONFIG = $$(CMAKE_CONFIG) $$($(1)_DIR)
   endif
-  $(1)_FILE = $(DOWNLOAD)/$(notdir $($(1)))
+  $(1)_FILE = $(DOWNLOAD)/$(notdir $($(1)_URL))
 
   $$($(1)_SRC_MARKER) : $$($(1)_FILE)
 	mkdir -p $$(SRCDIR)
@@ -213,11 +246,20 @@ define Download
 	touch $$@
 
   $$($(1)_FILE) :
-	wget -P $(DOWNLOAD) $$($(1))
+	mkdir -p $$(@D)
+	wget -O - $$($(1)_URL) > $$@.tmp
+	sha512_actual="$$$$(sha512sum $$@.tmp | awk '{ print $$$$1; }')"; \
+	if [ x"$$$${sha512_actual}" != x"$$($(1)_SHA512)" ]; then \
+	    echo "Checksum mismatch for $$@.tmp"; \
+	    echo "    Expected: $$($(1)_SHA512)"; \
+	    echo "    Actual:   $$$${sha512_actual}"; \
+	    exit 1; \
+	fi
+	mv $$@.tmp $$@
 endef
 
 # Download and unpack all source packages
-$(foreach dep,$(dependencies),$(eval $(call Download,$(call uppercase,$(dep)))))
+$(foreach dep,$(DEPENDENCIES),$(eval $(call DownloadVerify,$(dep))))
 
 ################################################################################
 # Unpack RPMS
@@ -239,7 +281,7 @@ RPM_FILE_LIST := $(sort $(foreach a, $(RPM_ARCHS), \
 # Note. For building linux you should install rpm2cpio.
 define unrpm
   $(SYSROOT)/$(notdir $(1)).unpacked : $(1)
-  $$(rpms) : $(SYSROOT)/$(notdir $(1)).unpacked
+  $$(RPMS) : $(SYSROOT)/$(notdir $(1)).unpacked
 endef
 
 %.unpacked :
@@ -266,7 +308,7 @@ $(foreach p,$(RPM_FILE_LIST),$(eval $(call unrpm,$(p))))
 # have it anyway, but just to make sure...
 # Patch libc.so and libpthread.so to force linking against libraries in sysroot
 # and not the ones installed on the build machine.
-$(libs) : $(rpms)
+$(LIBS) : $(RPMS)
 	@echo Patching libc and pthreads
 	@(for f in `find $(SYSROOT) -name libc.so -o -name libpthread.so`; do \
 	  (cat $$f | sed -e 's|/usr/lib64/||g' \
@@ -282,10 +324,10 @@ $(libs) : $(rpms)
 # Create links for ffi header files so that they become visible by default when using the
 # devkit.
 ifeq ($(ARCH), x86_64)
-  $(SYSROOT)/usr/include/ffi.h: $(rpms)
+  $(SYSROOT)/usr/include/ffi.h: $(RPMS)
 	cd $(@D) && rm -f $(@F) && ln -s ../lib/libffi-*/include/$(@F) .
 
-  $(SYSROOT)/usr/include/ffitarget.h: $(rpms)
+  $(SYSROOT)/usr/include/ffitarget.h: $(RPMS)
 	cd $(@D) && rm -f $(@F) && ln -s ../lib/libffi-*/include/$(@F) .
 
   SYSROOT_LINKS += $(SYSROOT)/usr/include/ffi.h $(SYSROOT)/usr/include/ffitarget.h
@@ -294,7 +336,7 @@ endif
 ################################################################################
 
 # Define marker files for each source package to be compiled
-$(foreach dep,$(dependencies),$(eval $(dep) = $(TARGETDIR)/$($(dep)_ver).done))
+$(foreach dep,$(DEPENDENCIES),$(eval $(dep) = $(TARGETDIR)/$($(dep)_VER).done))
 
 ################################################################################
 
@@ -334,48 +376,48 @@ TOOLS ?= $(call declare_tools,_FOR_TARGET,$(TARGET)-)
 # CFLAG_<name> to most likely -m32.
 define mk_bfd
   $$(info Libs for $(1))
-  $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile \
+  $$(BUILDDIR)/$$(BINUTILS_VER)-$(subst /,-,$(1))/Makefile \
       : CFLAGS += $$(CFLAGS_$(1))
-  $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile \
+  $$(BUILDDIR)/$$(BINUTILS_VER)-$(subst /,-,$(1))/Makefile \
       : LIBDIRS = --libdir=$(TARGETDIR)/$(1)
 
-  bfdlib += $$(TARGETDIR)/$$(binutils_ver)-$(subst /,-,$(1)).done
-  bfdmakes += $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile
+  BFDLIB += $$(TARGETDIR)/$$(BINUTILS_VER)-$(subst /,-,$(1)).done
+  BFDMAKES += $$(BUILDDIR)/$$(BINUTILS_VER)-$(subst /,-,$(1))/Makefile
 endef
 
 # Create one set of bfds etc for each multilib arch
 $(foreach l,$(LIBDIRS),$(eval $(call mk_bfd,$(l))))
 
 # Only build these two libs.
-$(bfdlib) : MAKECMD = all-libiberty all-bfd
-$(bfdlib) : INSTALLCMD = install-libiberty install-bfd
+$(BFDLIB) : MAKECMD = all-libiberty all-bfd
+$(BFDLIB) : INSTALLCMD = install-libiberty install-bfd
 
 # Building targets libbfd + libiberty. HOST==TARGET, i.e not
 # for a cross env.
-$(bfdmakes) : CONFIG = --target=$(TARGET) \
+$(BFDMAKES) : CONFIG = --target=$(TARGET) \
     --host=$(TARGET) --build=$(BUILD) \
     --prefix=$(TARGETDIR) \
     --with-sysroot=$(SYSROOT) \
     $(LIBDIRS)
 
-$(bfdmakes) : TOOLS = $(call declare_tools,_FOR_TARGET,$(TARGET)-) $(call declare_tools,,$(TARGET)-)
+$(BFDMAKES) : TOOLS = $(call declare_tools,_FOR_TARGET,$(TARGET)-) $(call declare_tools,,$(TARGET)-)
 
 ################################################################################
 
-$(gcc) \
-    $(binutils) \
-    $(gmp) \
-    $(mpfr) \
-    $(mpc) \
-    $(bfdmakes) \
-    $(ccache) : ENVS += $(TOOLS)
+$(GCC) \
+    $(BINUTILS) \
+    $(GMP) \
+    $(MPFR) \
+    $(MPC) \
+    $(BFDMAKES) \
+    $(CCACHE) : ENVS += $(TOOLS)
 
 # libdir to work around hateful bfd stuff installing into wrong dirs...
 # ensure we have 64 bit bfd support in the HOST library. I.e our
 # compiler on i686 will know 64 bit symbols, BUT later
 # we build just the libs again for TARGET, then with whatever the arch
 # wants.
-$(BUILDDIR)/$(binutils_ver)/Makefile : CONFIG += --enable-64-bit-bfd --libdir=$(PREFIX)/$(word 1,$(LIBDIRS))
+$(BUILDDIR)/$(BINUTILS_VER)/Makefile : CONFIG += --enable-64-bit-bfd --libdir=$(PREFIX)/$(word 1,$(LIBDIRS))
 
 ifeq ($(filter $(ARCH), s390x riscv64 ppc64le), )
   # gold compiles but cannot link properly on s390x @ gcc 13.2 and Fedore 41
@@ -386,8 +428,8 @@ endif
 
 # Makefile creation. Simply run configure in build dir.
 # Setting CFLAGS to -O2 generates a much faster ld.
-$(bfdmakes) \
-$(BUILDDIR)/$(binutils_ver)/Makefile \
+$(BFDMAKES) \
+$(BUILDDIR)/$(BINUTILS_VER)/Makefile \
     : $(BINUTILS_CFG)
 	$(info Configuring $@. Log in $(@D)/log.config)
 	@mkdir -p $(@D)
@@ -406,7 +448,7 @@ $(BUILDDIR)/$(binutils_ver)/Makefile \
 	) > $(@D)/log.config 2>&1
 	@echo 'done'
 
-$(BUILDDIR)/$(mpfr_ver)/Makefile \
+$(BUILDDIR)/$(MPFR_VER)/Makefile \
     : $(MPFR_CFG)
 	$(info Configuring $@. Log in $(@D)/log.config)
 	@mkdir -p $(@D)
@@ -421,7 +463,7 @@ $(BUILDDIR)/$(mpfr_ver)/Makefile \
 	) > $(@D)/log.config 2>&1
 	@echo 'done'
 
-$(BUILDDIR)/$(gmp_ver)/Makefile \
+$(BUILDDIR)/$(GMP_VER)/Makefile \
     : $(GMP_CFG)
 	$(info Configuring $@. Log in $(@D)/log.config)
 	@mkdir -p $(@D)
@@ -438,7 +480,7 @@ $(BUILDDIR)/$(gmp_ver)/Makefile \
 	) > $(@D)/log.config 2>&1
 	@echo 'done'
 
-$(BUILDDIR)/$(mpc_ver)/Makefile \
+$(BUILDDIR)/$(MPC_VER)/Makefile \
     : $(MPC_CFG)
 	$(info Configuring $@. Log in $(@D)/log.config)
 	@mkdir -p $(@D)
@@ -457,14 +499,14 @@ $(BUILDDIR)/$(mpc_ver)/Makefile \
 # Only valid if glibc target -> linux
 # proper destructor handling for c++
 ifneq (,$(findstring linux,$(TARGET)))
-  $(BUILDDIR)/$(gcc_ver)/Makefile : CONFIG += --enable-__cxa_atexit
+  $(BUILDDIR)/$(GCC_VER)/Makefile : CONFIG += --enable-__cxa_atexit
 endif
 
 ifeq ($(ARCH), armhfp)
-  $(BUILDDIR)/$(gcc_ver)/Makefile : CONFIG +=  --with-float=hard
+  $(BUILDDIR)/$(GCC_VER)/Makefile : CONFIG +=  --with-float=hard
 endif
 
-ifneq ($(filter riscv64 ppc64 ppc64le s390x, $(ARCH)), )
+ifneq ($(filter riscv64 ppc64le s390x, $(ARCH)), )
   # We only support 64-bit on these platforms anyway
   CONFIG += --disable-multilib
 endif
@@ -476,7 +518,7 @@ endif
 # skip native language.
 # and link and assemble with the binutils we created
 # earlier, so --with-gnu*
-$(BUILDDIR)/$(gcc_ver)/Makefile \
+$(BUILDDIR)/$(GCC_VER)/Makefile \
     : $(GCC_CFG)
 	$(info Configuring $@. Log in $(@D)/log.config)
 	mkdir -p $(@D)
@@ -498,17 +540,17 @@ $(BUILDDIR)/$(gcc_ver)/Makefile \
 	@echo 'done'
 
 # need binutils for gcc
-$(gcc) : $(binutils)
+$(GCC) : $(BINUTILS)
 
 # as of 4.3 or so need these for doing config
-$(BUILDDIR)/$(gcc_ver)/Makefile : $(gmp) $(mpfr) $(mpc)
-$(mpfr) : $(gmp)
-$(mpc) : $(gmp) $(mpfr)
+$(BUILDDIR)/$(GCC_VER)/Makefile : $(GMP) $(MPFR) $(MPC)
+$(MPFR) : $(GMP)
+$(MPC) : $(GMP) $(MPFR)
 
 ################################################################################
 # Build gdb but only where host and target match
 ifeq ($(HOST), $(TARGET))
-  $(BUILDDIR)/$(gdb_ver)/Makefile: $(GDB_CFG)
+  $(BUILDDIR)/$(GDB_VER)/Makefile: $(GDB_CFG)
 	$(info Configuring $@. Log in $(@D)/log.config)
 	mkdir -p $(@D)
 	( \
@@ -521,9 +563,9 @@ ifeq ($(HOST), $(TARGET))
 	) > $(@D)/log.config 2>&1
 	@echo 'done'
 
-  $(gdb): $(gcc)
+  $(GDB): $(GCC)
 else
-  $(BUILDDIR)/$(gdb_ver)/Makefile:
+  $(BUILDDIR)/$(GDB_VER)/Makefile:
 	$(info Faking $@, not used when cross-compiling)
 	mkdir -p $(@D)
 	echo "install:" > $@
@@ -532,7 +574,7 @@ endif
 
 ################################################################################
 # very straightforward. just build a ccache. it is only for host.
-$(BUILDDIR)/$(ccache_ver)/Makefile \
+$(BUILDDIR)/$(CCACHE_VER)/Makefile \
     : $(CCACHE_SRC_MARKER)
 	$(info Configuring $@. Log in $(@D)/log.config)
 	@mkdir -p $(@D)
@@ -543,12 +585,12 @@ $(BUILDDIR)/$(ccache_ver)/Makefile \
 	) > $(@D)/log.config 2>&1
 	@echo 'done'
 
-gccpatch = $(TARGETDIR)/gcc-patched
+GCC_PATCHED = $(TARGETDIR)/gcc-patched
 
 ################################################################################
 # For some reason cpp is not created as a target-compiler
 ifeq ($(HOST),$(TARGET))
-  $(gccpatch) : $(gcc) link_libs
+  $(GCC_PATCHED) : $(GCC) link_libs
 	@echo -n 'Creating compiler symlinks...'
 	@for f in cpp; do \
 	  if [ ! -e $(PREFIX)/bin/$(TARGET)-$$f ]; \
@@ -576,7 +618,7 @@ ifeq ($(HOST),$(TARGET))
 	done;)
 	@echo 'done'
 else
-  $(gccpatch) :
+  $(GCC_PATCHED) :
 	@echo 'done'
 endif
 
@@ -604,7 +646,7 @@ $(PREFIX)/devkit.info:
 	echo '# This file describes to configure how to interpret the contents of this' >> $@
 	echo '# devkit' >> $@
 	echo '' >> $@
-	echo 'DEVKIT_NAME="$(gcc_ver) - $(LINUX_VERSION)"' >> $@
+	echo 'DEVKIT_NAME="$(GCC_VER) - $(LINUX_VERSION)"' >> $@
 	echo 'DEVKIT_TOOLCHAIN_PATH="$$DEVKIT_ROOT/bin"' >> $@
 	echo 'DEVKIT_SYSROOT="$$DEVKIT_ROOT/$(TARGET)/sysroot"' >> $@
 	echo 'DEVKIT_EXTRA_PATH="$$DEVKIT_ROOT/bin"' >> $@
@@ -640,32 +682,32 @@ ifeq ($(TARGET), $(HOST))
 	@echo 'Creating missing $* soft link'
 	ln -s $(TARGET)-$* $@
 
-  missing-links := $(addprefix $(PREFIX)/bin/, \
-      addr2line ar as c++ c++filt dwp elfedit g++ gcc gcc-$(gcc_ver_only) gprof ld ld.bfd \
+  MISSING_LINKS := $(addprefix $(PREFIX)/bin/, \
+      addr2line ar as c++ c++filt dwp elfedit g++ gcc gcc-$(GCC_VER_ONLY) gprof ld ld.bfd \
       ld.gold nm objcopy objdump ranlib readelf size strings strip)
 endif
 
 # Add link to work around "plugin needed to handle lto object" (JDK-8344272)
-$(PREFIX)/lib/bfd-plugins/liblto_plugin.so: $(PREFIX)/libexec/gcc/$(TARGET)/$(gcc_ver_only)/liblto_plugin.so
+$(PREFIX)/lib/bfd-plugins/liblto_plugin.so: $(PREFIX)/libexec/gcc/$(TARGET)/$(GCC_VER_ONLY)/liblto_plugin.so
 	@echo 'Creating missing $(@F) soft link'
 	@mkdir -p $(@D)
 	ln -s $$(realpath -s --relative-to=$(@D) $<) $@
 
-missing-links += $(PREFIX)/lib/bfd-plugins/liblto_plugin.so
+MISSING_LINKS += $(PREFIX)/lib/bfd-plugins/liblto_plugin.so
 
 ################################################################################
 
-bfdlib : $(bfdlib)
-binutils : $(binutils)
-rpms : $(rpms)
-libs : $(libs)
+bfdlib : $(BFDLIB)
+binutils : $(BINUTILS)
+rpms : $(RPMS)
+libs : $(LIBS)
 sysroot : rpms libs
-gcc : sysroot $(gcc) $(gccpatch)
-gdb : $(gdb)
-all : binutils gcc bfdlib $(PREFIX)/devkit.info $(missing-links) $(SYSROOT_LINKS) \
+gcc : sysroot $(GCC) $(GCC_PATCHED)
+gdb : $(GDB)
+all : binutils gcc bfdlib $(PREFIX)/devkit.info $(MISSING_LINKS) $(SYSROOT_LINKS) \
     $(THESE_MAKEFILES) gdb
 
 # this is only built for host. so separate.
-ccache : $(ccache)
+ccache : $(CCACHE)
 
 .PHONY : gcc all binutils bfdlib link_libs rpms libs sysroot

make/devkit/createAutoconfBundle.sh

@@ -93,7 +93,7 @@ elif test "x$TARGET_PLATFORM" = xlinux_x64; then
   rpm2cpio $OUTPUT_ROOT/m4-$M4_VERSION.el6.x86_64.rpm | cpio -d -i
 elif test "x$TARGET_PLATFORM" = xlinux_x86; then
   M4_VERSION=1.4.13-5
-  wget http://yum.oracle.com/repo/OracleLinux/OL6/latest/i386/getPackage/m4-$M4_VERSION.el6.i686.rpm
+  wget https://yum.oracle.com/repo/OracleLinux/OL6/latest/i386/getPackage/m4-$M4_VERSION.el6.i686.rpm
   cd $IMAGE_DIR
   rpm2cpio $OUTPUT_ROOT/m4-$M4_VERSION.el6.i686.rpm | cpio -d -i
 else

make/hotspot/gensrc/GensrcDtrace.gmk

@@ -47,8 +47,9 @@ ifeq ($(call check-jvm-feature, dtrace), true)
 	$(call LogInfo, Generating dtrace header file $(@F))
 	$(call MakeDir, $(@D) $(DTRACE_SUPPORT_DIR))
 	$(call ExecuteWithLog, $(DTRACE_SUPPORT_DIR)/$(@F).d, \
-	    ($(CPP) $(DTRACE_CPP_FLAGS) $(SYSROOT_CFLAGS) $< > $(DTRACE_SUPPORT_DIR)/$(@F).d))
-	$(call ExecuteWithLog, $@, $(DTRACE) $(DTRACE_FLAGS) -h -o $@ -s $(DTRACE_SUPPORT_DIR)/$(@F).d)
+	    $(CPP) $(DTRACE_CPP_FLAGS) $(SYSROOT_CFLAGS) $< > $(DTRACE_SUPPORT_DIR)/$(@F).d)
+	$(call ExecuteWithLog, $@, \
+	    $(DTRACE) $(DTRACE_FLAGS) -h -o $@ -s $(DTRACE_SUPPORT_DIR)/$(@F).d)
 
   # Process all .d files in DTRACE_SOURCE_DIR. They are:
   # hotspot_jni.d hotspot.d hs_private.d

make/hotspot/lib/CompileGtest.gmk

@@ -62,13 +62,13 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBGTEST, \
     DISABLED_WARNINGS_gcc := format-nonliteral maybe-uninitialized undef \
         unused-result zero-as-null-pointer-constant, \
     DISABLED_WARNINGS_clang := format-nonliteral undef unused-result, \
+    DISABLED_WARNINGS_microsoft := 4530, \
     DEFAULT_CFLAGS := false, \
     CFLAGS := $(JVM_CFLAGS) \
         -I$(GTEST_FRAMEWORK_SRC)/googletest \
         -I$(GTEST_FRAMEWORK_SRC)/googletest/include \
         -I$(GTEST_FRAMEWORK_SRC)/googlemock \
         -I$(GTEST_FRAMEWORK_SRC)/googlemock/include, \
-    CFLAGS_windows := -EHsc, \
     CFLAGS_macosx := -DGTEST_OS_MAC=1, \
     OPTIMIZATION := $(JVM_OPTIMIZATION), \
     COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \
@@ -98,7 +98,6 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBJVM, \
         -I$(GTEST_FRAMEWORK_SRC)/googletest/include \
         -I$(GTEST_FRAMEWORK_SRC)/googlemock/include \
         $(addprefix -I, $(GTEST_TEST_SRC)), \
-    CFLAGS_windows := -EHsc, \
     CFLAGS_macosx := -DGTEST_OS_MAC=1, \
     DISABLED_WARNINGS_gcc := $(DISABLED_WARNINGS_gcc) \
         undef stringop-overflow, \
@@ -110,7 +109,7 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBJVM, \
         self-assign-overloaded, \
     DISABLED_WARNINGS_clang_test_g1ServiceThread.cpp := delete-abstract-non-virtual-dtor, \
     DISABLED_WARNINGS_clang_test_logDecorations.cpp := missing-field-initializers, \
-    DISABLED_WARNINGS_microsoft := $(DISABLED_WARNINGS_microsoft), \
+    DISABLED_WARNINGS_microsoft := $(DISABLED_WARNINGS_microsoft) 4530, \
     LD_SET_ORIGIN := false, \
     DEFAULT_LDFLAGS := false, \
     LDFLAGS := $(JVM_LDFLAGS), \
@@ -153,7 +152,7 @@ $(eval $(call SetupJdkExecutable, BUILD_GTEST_LAUNCHER, \
         -I$(GTEST_FRAMEWORK_SRC)/googlemock \
         -I$(GTEST_FRAMEWORK_SRC)/googlemock/include, \
     LD_SET_ORIGIN := false, \
-    LDFLAGS_unix := $(call SET_SHARED_LIBRARY_ORIGIN), \
+    LDFLAGS_unix := $(call SetSharedLibraryOrigin), \
     JDK_LIBS := gtest:libjvm, \
     COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \
     ZIP_EXTERNAL_DEBUG_SYMBOLS := false, \

make/hotspot/lib/CompileJvm.gmk

@@ -97,11 +97,13 @@ CFLAGS_VM_VERSION := \
 
 DISABLED_WARNINGS_gcc := array-bounds comment delete-non-virtual-dtor \
     empty-body format-zero-length implicit-fallthrough int-in-bool-context \
+    invalid-offsetof \
     maybe-uninitialized missing-field-initializers \
     shift-negative-value unknown-pragmas unused-but-set-variable \
     unused-local-typedefs unused-variable
 
-DISABLED_WARNINGS_clang := delete-non-abstract-non-virtual-dtor missing-braces \
+DISABLED_WARNINGS_clang := delete-non-abstract-non-virtual-dtor \
+    invalid-offsetof missing-braces \
     sometimes-uninitialized unknown-pragmas unused-but-set-variable \
     unused-function unused-local-typedef unused-private-field unused-variable
 
@@ -187,7 +189,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
     DISABLED_WARNINGS_gcc_c1_Runtime1_aarch64.cpp := unused-const-variable, \
     DISABLED_WARNINGS_gcc_cgroupV1Subsystem_linux.cpp := address, \
     DISABLED_WARNINGS_gcc_cgroupV2Subsystem_linux.cpp := address, \
-    DISABLED_WARNINGS_gcc_g1FreeIdSet.cpp := unused-const-variable, \
     DISABLED_WARNINGS_gcc_handshake.cpp := stringop-overflow, \
     DISABLED_WARNINGS_gcc_interp_masm_x86.cpp := uninitialized, \
     DISABLED_WARNINGS_gcc_javaClasses.cpp := unused-const-variable, \

make/hotspot/lib/JvmFeatures.gmk

@@ -57,7 +57,7 @@ ifeq ($(call check-jvm-feature, zero), true)
       -DZERO_LIBARCH='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' $(LIBFFI_CFLAGS)
   JVM_LIBS_FEATURES += $(LIBFFI_LIBS)
   ifeq ($(ENABLE_LIBFFI_BUNDLING), true)
-    JVM_LDFLAGS_FEATURES += $(call SET_EXECUTABLE_ORIGIN,/..)
+    JVM_LDFLAGS_FEATURES += $(call SetExecutableOrigin,/..)
   endif
 else
   JVM_EXCLUDE_PATTERNS += /zero/

make/ide/vscode/hotspot/indexers/ccls-settings.txt

@@ -1,7 +1,7 @@
 		// Configure cpptools IntelliSense
 		"C_Cpp.intelliSenseCachePath": "{{OUTPUTDIR}}/.vscode",
 		"C_Cpp.default.compileCommands": "{{OUTPUTDIR}}/compile_commands.json",
-		"C_Cpp.default.cppStandard": "c++14",
+		"C_Cpp.default.cppStandard": "c++17",
 		"C_Cpp.default.compilerPath": "{{COMPILER}}",
 
 		// Configure ccls

make/ide/vscode/hotspot/indexers/clangd-settings.txt

@@ -1,7 +1,7 @@
 		// Configure cpptools IntelliSense
 		"C_Cpp.intelliSenseCachePath": "{{OUTPUTDIR}}/.vscode",
 		"C_Cpp.default.compileCommands": "{{OUTPUTDIR}}/compile_commands.json",
-		"C_Cpp.default.cppStandard": "c++14",
+		"C_Cpp.default.cppStandard": "c++17",
 		"C_Cpp.default.compilerPath": "{{COMPILER}}",
 
 		// Configure clangd

make/ide/vscode/hotspot/indexers/cpptools-settings.txt

@@ -1,5 +1,5 @@
 		// Configure cpptools IntelliSense
 		"C_Cpp.intelliSenseCachePath": "{{OUTPUTDIR}}/.vscode",
 		"C_Cpp.default.compileCommands": "{{OUTPUTDIR}}/compile_commands.json",
-		"C_Cpp.default.cppStandard": "c++14",
+		"C_Cpp.default.cppStandard": "c++17",
 		"C_Cpp.default.compilerPath": "{{COMPILER}}",

make/ide/vscode/hotspot/indexers/rtags-settings.txt

@@ -1,7 +1,7 @@
 		// Configure cpptools IntelliSense
 		"C_Cpp.intelliSenseCachePath": "{{OUTPUTDIR}}/.vscode",
 		"C_Cpp.default.compileCommands": "{{OUTPUTDIR}}/compile_commands.json",
-		"C_Cpp.default.cppStandard": "c++14",
+		"C_Cpp.default.cppStandard": "c++17",
 		"C_Cpp.default.compilerPath": "{{COMPILER}}",
 
 		// Configure RTags

make/ide/vscode/hotspot/template-workspace.jsonc

@@ -12,12 +12,18 @@
 	],
 	"extensions": {
 		"recommendations": [
+			"oracle.oracle-java",
 			// {{INDEXER_EXTENSIONS}}
 		]
 	},
 	"settings": {
 		// {{INDEXER_SETTINGS}}
 
+		// Java extension
+		"jdk.project.jdkhome": "{{OUTPUTDIR}}/jdk",
+		"jdk.java.onSave.organizeImports": false, // prevents unnecessary changes
+		"jdk.serverVmOptions": ["-Xmx2G"], // prevent out of memory
+
 		// Additional conventions
 		"files.associations": {
 			"*.gmk": "makefile"

make/jdk/src/classes/build/tools/cldrconverter/Bundle.java

@@ -79,6 +79,7 @@ class Bundle {
         "NumberElements/nan",
         "NumberElements/currencyDecimal",
         "NumberElements/currencyGroup",
+        "NumberElements/lenientMinusSigns",
     };
 
     private static final String[] TIME_PATTERN_KEYS = {

make/jdk/src/classes/build/tools/cldrconverter/LDMLParseHandler.java

@@ -844,6 +844,26 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
                 });
             break;
 
+        // Lenient parsing
+        case "parseLenients":
+            if ("lenient".equals(attributes.getValue("level"))) {
+                pushKeyContainer(qName, attributes, attributes.getValue("scope"));
+            } else {
+                pushIgnoredContainer(qName);
+            }
+            break;
+
+        case "parseLenient":
+            // Use only the lenient minus sign for now
+            if (currentContainer instanceof KeyContainer kc
+                && kc.getKey().equals("number")
+                && attributes.getValue("sample").equals("-")) {
+                pushStringEntry(qName, attributes, currentNumberingSystem + "NumberElements/lenientMinusSigns");
+            } else {
+                pushIgnoredContainer(qName);
+            }
+            break;
+
         default:
             // treat anything else as a container
             pushContainer(qName, attributes);
@@ -1150,6 +1170,14 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
             currentStyle = "";
             putIfEntry();
             break;
+        case "parseLenient":
+            if (currentContainer instanceof StringEntry se) {
+                // Convert to a simple concatenation of lenient minuses
+                // e.g. "[\-－﹣ ‐‑ ‒ – −⁻₋ ➖]" -> "-－﹣‐‑‒–−⁻₋➖" for the root locale
+                put(se.getKey(), se.getValue().replaceAll("[\\[\\]\\\\ ]", ""));
+            }
+            break;
+
         default:
             putIfEntry();
         }

make/jdk/src/classes/build/tools/methodhandle/VarHandleGuardMethodGenerator.java

@@ -0,0 +1,325 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package build.tools.methodhandle;
+
+import java.io.PrintWriter;
+import java.lang.classfile.TypeKind;
+import java.lang.invoke.MethodType;
+import java.lang.invoke.VarHandle;
+import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * A helper program to generate the VarHandleGuards class with a set of
+ * static guard methods each of which corresponds to a particular shape and
+ * performs a type check of the symbolic type descriptor with the VarHandle
+ * type descriptor before linking/invoking to the underlying operation as
+ * characterized by the operation member name on the VarForm of the
+ * VarHandle.
+ * <p>
+ * The generated class essentially encapsulates pre-compiled LambdaForms,
+ * one for each method, for the most common set of method signatures.
+ * This reduces static initialization costs, footprint costs, and circular
+ * dependencies that may arise if a class is generated per LambdaForm.
+ * <p>
+ * A maximum of L*T*S methods will be generated where L is the number of
+ * access modes kinds (or unique operation signatures) and T is the number
+ * of variable types and S is the number of shapes (such as instance field,
+ * static field, or array access).
+ * If there are 4 unique operation signatures, 5 basic types (Object, int,
+ * long, float, double), and 3 shapes then a maximum of 60 methods will be
+ * generated.  However, the number is likely to be less since there may
+ * be duplicate signatures.
+ * <p>
+ * Each method is annotated with @LambdaForm.Compiled to inform the runtime
+ * that such methods should be treated as if a method of a class that is the
+ * result of compiling a LambdaForm.  Annotation of such methods is
+ * important for correct evaluation of certain assertions and method return
+ * type profiling in HotSpot.
+ *
+ * @see java.lang.invoke.GenerateJLIClassesHelper
+ */
+public final class VarHandleGuardMethodGenerator {
+
+    static final String CLASS_HEADER = """
+            /*
+             * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
+             * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+             *
+             * This code is free software; you can redistribute it and/or modify it
+             * under the terms of the GNU General Public License version 2 only, as
+             * published by the Free Software Foundation.  Oracle designates this
+             * particular file as subject to the "Classpath" exception as provided
+             * by Oracle in the LICENSE file that accompanied this code.
+             *
+             * This code is distributed in the hope that it will be useful, but WITHOUT
+             * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+             * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+             * version 2 for more details (a copy is included in the LICENSE file that
+             * accompanied this code).
+             *
+             * You should have received a copy of the GNU General Public License version
+             * 2 along with this work; if not, write to the Free Software Foundation,
+             * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+             *
+             * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+             * or visit www.oracle.com if you need additional information or have any
+             * questions.
+             */
+            package java.lang.invoke;
+
+            import jdk.internal.vm.annotation.AOTSafeClassInitializer;
+            import jdk.internal.vm.annotation.ForceInline;
+            import jdk.internal.vm.annotation.Hidden;
+
+            // This file is generated by build.tools.methodhandle.VarHandleGuardMethodGenerator.
+            // Do not edit!
+            @AOTSafeClassInitializer
+            final class VarHandleGuards {
+            """;
+
+    static final String GUARD_METHOD_SIG_TEMPLATE = "<RETURN> <NAME>_<SIGNATURE>(<PARAMS>)";
+
+    static final String GUARD_METHOD_TEMPLATE =
+            """
+                    @ForceInline
+                    @LambdaForm.Compiled
+                    @Hidden
+                    static final <METHOD> throws Throwable {
+                        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+                        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+                            <RESULT_ERASED>MethodHandle.linkToStatic(<LINK_TO_STATIC_ARGS>);<RETURN_ERASED>
+                        } else {
+                            MethodHandle mh = handle.getMethodHandle(ad.mode);
+                            <RETURN>mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(<LINK_TO_INVOKER_ARGS>);
+                        }
+                    }""";
+
+    static final String GUARD_METHOD_TEMPLATE_V =
+            """
+                    @ForceInline
+                    @LambdaForm.Compiled
+                    @Hidden
+                    static final <METHOD> throws Throwable {
+                        boolean direct = handle.checkAccessModeThenIsDirect(ad);
+                        if (direct && handle.vform.methodType_table[ad.type] == ad.symbolicMethodTypeErased) {
+                            MethodHandle.linkToStatic(<LINK_TO_STATIC_ARGS>);
+                        } else if (direct && handle.vform.getMethodType_V(ad.type) == ad.symbolicMethodTypeErased) {
+                            MethodHandle.linkToStatic(<LINK_TO_STATIC_ARGS>);
+                        } else {
+                            MethodHandle mh = handle.getMethodHandle(ad.mode);
+                            mh.asType(ad.symbolicMethodTypeInvoker).invokeBasic(<LINK_TO_INVOKER_ARGS>);
+                        }
+                    }""";
+
+    // A template for deriving the operations
+    // could be supported by annotating VarHandle directly with the
+    // operation kind and shape
+    interface VarHandleTemplate {
+        Object get();
+
+        void set(Object value);
+
+        boolean compareAndSet(Object actualValue, Object expectedValue);
+
+        Object compareAndExchange(Object actualValue, Object expectedValue);
+
+        Object getAndUpdate(Object value);
+    }
+
+    record HandleType(Class<?> receiver, Class<?>... intermediates) {
+    }
+
+    public static void main(String... args) throws Throwable {
+        if (args.length != 1) {
+            System.err.println("Usage: java VarHandleGuardMethodGenerator VarHandleGuards.java");
+            System.exit(1);
+        }
+
+        Path outputFile = Path.of(args[0]);
+
+        try (PrintWriter pw = new PrintWriter(Files.newBufferedWriter(
+                outputFile,
+                StandardCharsets.UTF_8,
+                StandardOpenOption.CREATE,
+                StandardOpenOption.TRUNCATE_EXISTING))) {
+            print(pw);
+        }
+    }
+
+    public static void print(PrintWriter pw) {
+        pw.println(CLASS_HEADER);
+
+        // Declare the stream of shapes
+        List<HandleType> hts = List.of(
+                // Object->T
+                new HandleType(Object.class),
+
+                // <static>->T
+                new HandleType(null),
+
+                // Array[index]->T
+                new HandleType(Object.class, int.class),
+
+                // MS[base]->T
+                new HandleType(Object.class, long.class),
+
+                // MS[base][offset]->T
+                new HandleType(Object.class, long.class, long.class)
+        );
+
+        // The 5 JVM calling convention types
+        List<Class<?>> basicTypes = List.of(Object.class, int.class, long.class, float.class, double.class);
+
+        Stream.of(VarHandleTemplate.class.getMethods()).<MethodType>
+                        mapMulti((m, sink) -> {
+                    for (var ht : hts) {
+                        for (var bt : basicTypes) {
+                            sink.accept(generateMethodType(m, ht.receiver, bt, ht.intermediates));
+                        }
+                    }
+                }).
+                distinct().
+                map(VarHandleGuardMethodGenerator::generateMethod).
+                forEach(pw::println);
+
+        pw.println("}");
+    }
+
+    static MethodType generateMethodType(Method m, Class<?> receiver, Class<?> value, Class<?>... intermediates) {
+        Class<?> returnType = m.getReturnType() == Object.class
+                ? value : m.getReturnType();
+
+        List<Class<?>> params = new ArrayList<>();
+        if (receiver != null)
+            params.add(receiver);
+        Collections.addAll(params, intermediates);
+        for (var p : m.getParameters()) {
+            params.add(value);
+        }
+        return MethodType.methodType(returnType, params);
+    }
+
+    static String generateMethod(MethodType mt) {
+        Class<?> returnType = mt.returnType();
+
+        var params = new LinkedHashMap<String, String>();
+        params.put("handle", className(VarHandle.class));
+        for (int i = 0; i < mt.parameterCount(); i++) {
+            params.put("arg" + i, className(mt.parameterType(i)));
+        }
+        params.put("ad", "VarHandle.AccessDescriptor");
+
+        // Generate method signature line
+        String RETURN = className(returnType);
+        String NAME = "guard";
+        String SIGNATURE = getSignature(mt);
+        String PARAMS = params.entrySet().stream().
+                map(e -> e.getValue() + " " + e.getKey()).
+                collect(Collectors.joining(", "));
+        String METHOD = GUARD_METHOD_SIG_TEMPLATE.
+                replace("<RETURN>", RETURN).
+                replace("<NAME>", NAME).
+                replace("<SIGNATURE>", SIGNATURE).
+                replace("<PARAMS>", PARAMS);
+
+        // Generate method
+        params.remove("ad");
+
+        List<String> LINK_TO_STATIC_ARGS = new ArrayList<>(params.keySet());
+        LINK_TO_STATIC_ARGS.add("handle.vform.getMemberName(ad.mode)");
+
+        List<String> LINK_TO_INVOKER_ARGS = new ArrayList<>(params.keySet());
+        LINK_TO_INVOKER_ARGS.set(0, LINK_TO_INVOKER_ARGS.get(0) + ".asDirect()");
+
+        RETURN = returnType == void.class
+                ? ""
+                : returnType == Object.class
+                ? "return "
+                : "return (" + returnType.getName() + ") ";
+
+        String RESULT_ERASED = returnType == void.class
+                ? ""
+                : returnType != Object.class
+                ? "return (" + returnType.getName() + ") "
+                : "Object r = ";
+
+        String RETURN_ERASED = returnType != Object.class
+                ? ""
+                : "\n        return ad.returnType.cast(r);";
+
+        String template = returnType == void.class
+                ? GUARD_METHOD_TEMPLATE_V
+                : GUARD_METHOD_TEMPLATE;
+        return template.
+                replace("<METHOD>", METHOD).
+                replace("<NAME>", NAME).
+                replaceAll("<RETURN>", RETURN).
+                replace("<RESULT_ERASED>", RESULT_ERASED).
+                replace("<RETURN_ERASED>", RETURN_ERASED).
+                replaceAll("<LINK_TO_STATIC_ARGS>", String.join(", ", LINK_TO_STATIC_ARGS)).
+                replace("<LINK_TO_INVOKER_ARGS>", String.join(", ", LINK_TO_INVOKER_ARGS))
+                .indent(4);
+    }
+
+    static String className(Class<?> c) {
+        String n = c.getCanonicalName();
+        if (n == null)
+            throw new IllegalArgumentException("Not representable in source code: " + c);
+        if (!c.isPrimitive() && c.getPackageName().equals("java.lang")) {
+            n = n.substring("java.lang.".length());
+        } else if (c.getPackageName().equals("java.lang.invoke")) {
+            n = n.substring("java.lang.invoke.".length());
+        }
+        return n;
+    }
+
+    static String getSignature(MethodType m) {
+        StringBuilder sb = new StringBuilder(m.parameterCount() + 1);
+
+        for (int i = 0; i < m.parameterCount(); i++) {
+            Class<?> pt = m.parameterType(i);
+            sb.append(getCharType(pt));
+        }
+
+        sb.append('_').append(getCharType(m.returnType()));
+
+        return sb.toString();
+    }
+
+    static char getCharType(Class<?> pt) {
+        return TypeKind.from(pt).upperBound().descriptorString().charAt(0);
+    }
+}

make/langtools/tools/flagsgenerator/FlagsGenerator.java

@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package flagsgenerator;
+
+import com.sun.source.tree.CompilationUnitTree;
+import com.sun.source.util.JavacTask;
+import com.sun.source.util.TreePath;
+import com.sun.source.util.Trees;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.util.ElementFilter;
+import javax.tools.ToolProvider;
+
+public class FlagsGenerator {
+    public static void main(String... args) throws IOException {
+        var compiler = ToolProvider.getSystemJavaCompiler();
+
+        try (var fm = compiler.getStandardFileManager(null, null, null)) {
+            JavacTask task = (JavacTask) compiler.getTask(null, null, d -> {}, null, null, fm.getJavaFileObjects(args[0]));
+            Trees trees = Trees.instance(task);
+            CompilationUnitTree cut = task.parse().iterator().next();
+
+            task.analyze();
+
+            TypeElement clazz = (TypeElement) trees.getElement(new TreePath(new TreePath(cut), cut.getTypeDecls().get(0)));
+            Map<Integer, List<String>> flag2Names = new TreeMap<>();
+            Map<FlagTarget, Map<Integer, List<String>>> target2FlagBit2Fields = new EnumMap<>(FlagTarget.class);
+            Map<String, String> customToString = new HashMap<>();
+            Set<String> noToString = new HashSet<>();
+
+            for (VariableElement field : ElementFilter.fieldsIn(clazz.getEnclosedElements())) {
+                String flagName = field.getSimpleName().toString();
+                for (AnnotationMirror am : field.getAnnotationMirrors()) {
+                    switch (am.getAnnotationType().toString()) {
+                        case "com.sun.tools.javac.code.Flags.Use" -> {
+                            long flagValue = ((Number) field.getConstantValue()).longValue();
+                            int flagBit = 63 - Long.numberOfLeadingZeros(flagValue);
+
+                            flag2Names.computeIfAbsent(flagBit, _ -> new ArrayList<>())
+                                      .add(flagName);
+
+                            List<?> originalTargets = (List<?>) valueOfValueAttribute(am);
+                            originalTargets.stream()
+                                           .map(value -> FlagTarget.valueOf(value.toString()))
+                                           .forEach(target -> target2FlagBit2Fields.computeIfAbsent(target, _ -> new HashMap<>())
+                                                                                   .computeIfAbsent(flagBit, _ -> new ArrayList<>())
+                                                                                   .add(flagName));
+                        }
+                        case "com.sun.tools.javac.code.Flags.CustomToStringValue" -> {
+                            customToString.put(flagName, (String) valueOfValueAttribute(am));
+                        }
+                        case "com.sun.tools.javac.code.Flags.NoToStringValue" -> {
+                            noToString.add(flagName);
+                        }
+                    }
+                }
+            }
+
+            //verify there are no flag overlaps:
+            for (Entry<FlagTarget, Map<Integer, List<String>>> targetAndFlag : target2FlagBit2Fields.entrySet()) {
+                for (Entry<Integer, List<String>> flagAndFields : targetAndFlag.getValue().entrySet()) {
+                    if (flagAndFields.getValue().size() > 1) {
+                        throw new AssertionError("duplicate flag for target: " + targetAndFlag.getKey() +
+                                                 ", flag: " + flagAndFields.getKey() +
+                                                 ", flags fields: " + flagAndFields.getValue());
+                    }
+                }
+            }
+
+            try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(Paths.get(args[1])))) {
+                out.println("""
+                            package com.sun.tools.javac.code;
+
+                            public enum FlagsEnum {
+                            """);
+                for (Entry<Integer, List<String>> e : flag2Names.entrySet()) {
+                    String constantName = e.getValue().stream().collect(Collectors.joining("_OR_"));
+                    String toString = e.getValue()
+                                       .stream()
+                                       .filter(n -> !noToString.contains(n))
+                                       .map(n -> customToString.getOrDefault(n, n.toLowerCase(Locale.US)))
+                                       .collect(Collectors.joining(" or "));
+                    out.println("    " + constantName + "(1L<<" + e.getKey() + ", \"" + toString + "\"),");
+                }
+                out.println("""
+                                ;
+
+                                private final long value;
+                                private final String toString;
+                                private FlagsEnum(long value, String toString) {
+                                    this.value = value;
+                                    this.toString = toString;
+                                }
+                                public long value() {
+                                    return value;
+                                }
+                                public String toString() {
+                                    return toString;
+                                }
+                            }
+                            """);
+            }
+        }
+    }
+
+    private static Object valueOfValueAttribute(AnnotationMirror am) {
+        return am.getElementValues()
+                 .values()
+                 .iterator()
+                 .next()
+                 .getValue();
+    }
+
+    private enum FlagTarget {
+        BLOCK,
+        CLASS,
+        METHOD,
+        MODULE,
+        PACKAGE,
+        TYPE_VAR,
+        VARIABLE;
+    }
+}

make/langtools/tools/propertiesparser/parser/MessageType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,7 +76,7 @@ public interface MessageType {
         ANNOTATION("annotation", "Compound", "com.sun.tools.javac.code.Attribute"),
         BOOLEAN("boolean", "boolean", null),
         COLLECTION("collection", "Collection", "java.util"),
-        FLAG("flag", "Flag", "com.sun.tools.javac.code.Flags"),
+        FLAG("flag", "FlagsEnum", "com.sun.tools.javac.code"),
         FRAGMENT("fragment", "Fragment", null),
         DIAGNOSTIC("diagnostic", "JCDiagnostic", "com.sun.tools.javac.util"),
         MODIFIER("modifier", "Modifier", "javax.lang.model.element"),

make/modules/java.base/Gensrc.gmk

@@ -26,12 +26,13 @@
 ################################################################################
 
 include GensrcCommon.gmk
+include GensrcProperties.gmk
+include GensrcStreamPreProcessing.gmk
 
 include gensrc/GensrcBuffer.gmk
 include gensrc/GensrcCharacterData.gmk
 include gensrc/GensrcCharsetCoder.gmk
 include gensrc/GensrcCharsetMapping.gmk
-include gensrc/GensrcExceptions.gmk
 include gensrc/GensrcMisc.gmk
 include gensrc/GensrcModuleLoaderMap.gmk
 include gensrc/GensrcRegex.gmk
@@ -71,8 +72,6 @@ TARGETS += $(CLDR_GEN_DONE)
 
 ################################################################################
 
-include GensrcProperties.gmk
-
 $(eval $(call SetupCompileProperties, LIST_RESOURCE_BUNDLE, \
     SRC_DIRS := $(MODULE_SRC)/share/classes/sun/launcher/resources, \
     CLASS := ListResourceBundle, \

make/modules/java.base/Lib.gmk

@@ -154,6 +154,8 @@ endif
 
 ################################################################################
 ## Build libsyslookup
+## The LIBDL dependency on Linux is needed to dynamically access libdl symbols,
+## which may be needed as part of resolving some standard symbols
 ################################################################################
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBSYSLOOKUP, \
@@ -196,7 +198,7 @@ ifeq ($(call isTargetOs, linux)+$(call isTargetCpu, x86_64)+$(INCLUDE_COMPILER2)
       OPTIMIZATION := HIGH, \
       CXXFLAGS := -std=c++17, \
       DISABLED_WARNINGS_gcc := unused-variable, \
-      LIBS_linux := $(LIBDL) $(LIBM), \
+      LIBS_linux := $(LIBM), \
   ))
 
   TARGETS += $(BUILD_LIBSIMD_SORT)

make/modules/java.base/gensrc/GensrcBuffer.gmk

@@ -28,363 +28,222 @@ ifeq ($(INCLUDE), true)
 
 ################################################################################
 
-GENSRC_BUFFER :=
+BUFFER_INPUT_DIR := $(MODULE_SRC)/share/classes/java/nio
+BUFFER_OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/nio
 
-GENSRC_BUFFER_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/nio
+################################################################################
+# Helper method to setup generation of bin snippets.
+# Will add the generated snippet file name to $1_BIN_SNIPPET_FILES.
+#
+# arg $1: $1 as passed into SetupGenBuffer
+# arg $2: type for this bin snippet
+define SetupGenBufferBinSnippets
+  $1_$2_TMP := $$(BUFFER_OUTPUT_DIR)/$1.java.bin-snippet.$2
 
-GENSRC_BUFFER_SRC := $(MODULE_SRC)/share/classes/java/nio
-
-###
-
-$(GENSRC_BUFFER_DST)/_the.buffer.dir:
-	$(call LogInfo, Generating buffer classes)
-	$(call MakeDir, $(@D))
-	$(TOUCH) $@
-
-define fixRw
-  $1_RW := $2
-  $1_rwkey := rw
-  ifeq (R, $2)
-    $1_rwkey := ro
-  endif
-endef
-
-define typesAndBits
-  # param 1 target
-  # param 2 type
-  # param 3 BO
-  $1_a := a
-  $1_A := A
-
-  $1_type := $2
-
-  ifeq ($2, byte)
-    $1_x        := b
-    $1_Type     := Byte
-    $1_fulltype := byte
-    $1_Fulltype := Byte
-    $1_category := integralType
-    $1_LBPV     := 0
-  endif
-
-  ifeq ($2, char)
-    $1_x        := c
-    $1_Type     := Char
-    $1_fulltype := character
-    $1_Fulltype := Character
-    $1_category := integralType
-    $1_streams  := streamableType
-    $1_streamtype := int
-    $1_Streamtype := Int
-    $1_LBPV     := 1
-  endif
-
-  ifeq ($2, short)
-    $1_x        := s
-    $1_Type     := Short
-    $1_fulltype := short
-    $1_Fulltype := Short
-    $1_category := integralType
-    $1_LBPV     := 1
-  endif
-
-  ifeq ($2, int)
-    $1_a        := an
-    $1_A        := An
-    $1_x        := i
-    $1_Type     := Int
-    $1_fulltype := integer
-    $1_Fulltype := Integer
-    $1_category := integralType
-    $1_LBPV     := 2
-  endif
-
-  ifeq ($2, long)
-    $1_x        := l
-    $1_Type     := Long
-    $1_fulltype := long
-    $1_Fulltype := Long
-    $1_category := integralType
-    $1_LBPV     := 3
-  endif
-
-  ifeq ($2, float)
-    $1_x        := f
-    $1_Type     := Float
-    $1_fulltype := float
-    $1_Fulltype := Float
-    $1_category := floatingPointType
-    $1_LBPV     := 2
-  endif
-
-  ifeq ($2, double)
-    $1_x        := d
-    $1_Type     := Double
-    $1_fulltype := double
-    $1_Fulltype := Double
-    $1_category := floatingPointType
-    $1_LBPV     := 3
-  endif
-
-  $1_Swaptype := $$($1_Type)
-  $1_memtype := $2
-  $1_Memtype := $$($1_Type)
-
-  ifeq ($2, float)
-    $1_memtype := int
-    $1_Memtype := Int
-    ifneq ($3, U)
-      $1_Swaptype := Int
-      $1_fromBits := Float.intBitsToFloat
-      $1_toBits   := Float.floatToRawIntBits
-    endif
-  endif
-
-  ifeq ($2, double)
-    $1_memtype := long
-    $1_Memtype := Long
-    ifneq ($3, U)
-      $1_Swaptype := Long
-      $1_fromBits := Double.longBitsToDouble
-      $1_toBits   := Double.doubleToRawLongBits
-    endif
-  endif
-
-  ifeq ($3, S)
-    $1_swap := Bits.swap
-  endif
-endef
-
-define genBinOps
-  # param 1 target
-  # param 2 type
-  # param 3 BO
-  # param 4 RW
-  # param 5 nbytes
-  # param 6 nbytesButOne
-  $(call typesAndBits,$1,$2,$3)
-  $(call fixRw,$1,$4)
-  $1_nbytes := $5
-  $1_nbytesButOne := $6
-  $1_CMD := $(TOOL_SPP) \
-    -Dtype=$$($1_type) \
-    -DType=$$($1_Type) \
-    -Dfulltype=$$($1_fulltype) \
-    -Dmemtype=$$($1_memtype) \
-    -DMemtype=$$($1_Memtype) \
-    -DfromBits=$$($1_fromBits) \
-    -DtoBits=$$($1_toBits) \
-    -DLG_BYTES_PER_VALUE=$$($1_LBPV) \
-    -DBYTES_PER_VALUE="(1 << $$($1_LBPV))" \
-    -Dnbytes=$$($1_nbytes) \
-    -DnbytesButOne=$$($1_nbytesButOne) \
-    -DRW=$$($1_RW) \
-    -K$$($1_rwkey) \
-    -Da=$$($1_a) \
-    -be
-endef
-
-define SetupGenBuffer
-  # param 1 is for output file
-  # param 2 is template dependency
-  # param 3-9 are named args.
-  #   type :=
-  #   BIN :=
-  #   RW := Mutability (R)ead-only (W)ritable
-  #   BO := (U)nswapped/(S)wapped/(L)ittle/(B)ig
-  #
-  $(if $3,$1_$(strip $3))
-  $(if $4,$1_$(strip $4))
-  $(if $5,$1_$(strip $5))
-  $(if $6,$1_$(strip $6))
-  $(if $7,$1_$(strip $7))
-  $(if $8,$1_$(strip $8))
-  $(if $9,$1_$(strip $9))
-  $(if $(10),$1_$(strip $(10)))
-  $(if $(11),$1_$(strip $(11)))
-  $(if $(12),$1_$(strip $(12)))
-  $(if $(13),$1_$(strip $(13)))
-  $(if $(14),$1_$(strip $(14)))
-  $(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15,$(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupGenBuffer($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupGenBuffer, please update GensrcBuffer.gmk))
-
-  $(call fixRw,$1,$$($1_RW))
-  $(call typesAndBits,$1,$$($1_type),$$($1_BO))
-
-  $1_DST := $(GENSRC_BUFFER_DST)/$1.java
-  $1_SRC := $(GENSRC_BUFFER_SRC)/$(strip $2).java.template
-  $1_SRC_BIN := $(GENSRC_BUFFER_SRC)/$(strip $2)-bin.java.template
-
-  $1_DEP := $$($1_SRC)
-  ifneq ($$($1_BIN), 1)
-    $1_DEP := $$($1_SRC)
-    $1_OUT := $$($1_DST)
+  $1_$2_LBPV :=  $$(call Conv, $2, LBPV)
+  ifeq ($$($1_READ_ONLY), true)
+    $1_$2_RW_KEYS := ro
+    $1_$2_RW_REPLACEMENT := R
   else
-    $1_DEP += $$($1_SRC) $$($1_SRC_BIN)
-    $1_OUT := $(GENSRC_BUFFER_DST)/$1.binop.0.java
+    $1_$2_RW_KEYS := rw
+    $1_$2_RW_REPLACEMENT :=
   endif
 
-  ifeq ($$($1_BIN), 1)
-    $(call genBinOps,$1_char,char,$$($1_BO),$$($1_RW),two,one)
-    $(call genBinOps,$1_short,short,$$($1_BO),$$($1_RW),two,one)
-    $(call genBinOps,$1_int,int,$$($1_BO),$$($1_RW),four,three)
-    $(call genBinOps,$1_long,long,$$($1_BO),$$($1_RW),eight,seven)
-    $(call genBinOps,$1_float,float,$$($1_BO),$$($1_RW),four,three)
-    $(call genBinOps,$1_double,double,$$($1_BO),$$($1_RW),eight,seven)
-  endif
-
-  $$($1_DST): $$($1_DEP) $(GENSRC_BUFFER_DST)/_the.buffer.dir
-	$(RM) $$($1_OUT).tmp
-	$(TOOL_SPP) -i$$($1_SRC) -o$$($1_OUT).tmp \
-	    -K$$($1_type) \
-	    -K$$($1_category) \
-	    -K$$($1_streams) \
-	    -Dtype=$$($1_type) \
-	    -DType=$$($1_Type) \
-	    -Dfulltype=$$($1_fulltype) \
-	    -DFulltype=$$($1_Fulltype) \
-	    -Dstreamtype=$$($1_streamtype) \
-	    -DStreamtype=$$($1_Streamtype) \
-	    -Dx=$$($1_x) \
-	    -Dmemtype=$$($1_memtype) \
-	    -DMemtype=$$($1_Memtype) \
-	    -DSwaptype=$$($1_Swaptype) \
-	    -DfromBits=$$($1_fromBits) \
-	    -DtoBits=$$($1_toBits) \
-	    -DLG_BYTES_PER_VALUE=$$($1_LBPV) \
-	    -DBYTES_PER_VALUE="(1 << $$($1_LBPV))" \
-	    -DBO=$$($1_BO) \
-	    -Dswap=$$($1_swap) \
-	    -DRW=$$($1_RW) \
-	    -K$$($1_rwkey) \
-	    -Da=$$($1_a) \
-	    -DA=$$($1_A) \
-	    -Kbo$$($1_BO)
-	$(MV) $$($1_OUT).tmp $$($1_OUT)
-        # Do the extra bin thing
-        ifeq ($$($1_BIN), 1)
-	  $(SED) -e '/#BIN/,$$$$d' < $$($1_OUT) > $$($1_DST).tmp
-	  $(RM) $$($1_OUT)
-	  $$($1_char_CMD) -i$$($1_SRC_BIN) -o$$($1_DST).tmp
-	  $$($1_short_CMD) -i$$($1_SRC_BIN) -o$$($1_DST).tmp
-	  $$($1_int_CMD) -i$$($1_SRC_BIN) -o$$($1_DST).tmp
-	  $$($1_long_CMD) -i$$($1_SRC_BIN) -o$$($1_DST).tmp
-	  $$($1_float_CMD) -i$$($1_SRC_BIN) -o$$($1_DST).tmp
-	  $$($1_double_CMD) -i$$($1_SRC_BIN) -o$$($1_DST).tmp
-	  $(ECHO) "}" >> $$($1_DST).tmp
-	  mv $$($1_DST).tmp $$($1_DST)
-        endif
-
-  GENSRC_BUFFER += $$($1_DST)
+  $$(eval $$(call SetupStreamPreProcessing, GEN_BUFFER_BIN_$1_$2, \
+      SOURCE_FILE := $$(BUFFER_INPUT_DIR)/$$($1_TEMPLATE)-bin.java.template, \
+      OUTPUT_FILE := $$($1_$2_TMP), \
+      INFO := Generating buffer class bin snippets for $1 ($2), \
+      BEGIN_END := true, \
+      KEYS := \
+          $$($1_$2_RW_KEYS), \
+      REPLACEMENTS := \
+          type=$2 \
+          RW=$$($1_$2_RW_REPLACEMENT) \
+          LG_BYTES_PER_VALUE=$$($1_$2_LBPV) \
+          BYTES_PER_VALUE="(1$$$$(SPACE)<<$$$$(SPACE)$$($1_$2_LBPV))" \
+          a=$$(call Conv, $2, a) \
+          fulltype=$$(call Conv, $2, fulltype) \
+          memtype=$$(call Conv, $2, memtype) \
+          Memtype=$$(call Conv, $2, Memtype) \
+          nbytes=$$(call Conv, $2, nbytes) \
+          nbytesButOne=$$(call Conv, $2, nbytesButOne) \
+          Type=$$(call Conv, $2, Type) \
+          fromBits=$$(call Conv, $2, fromBits, $$($1_BYTE_ORDER)) \
+          toBits=$$(call Conv, $2, toBits, $$($1_BYTE_ORDER)), \
+  ))
+  TARGETS += $$(GEN_BUFFER_$1_$2)
 
+  $1_BIN_SNIPPET_FILES += $$($1_$2_TMP)
 endef
 
-###
-
-X_BUF := X-Buffer
-
-$(eval $(call SetupGenBuffer,ByteBuffer,  $(X_BUF), type := byte, BIN := 1))
-$(eval $(call SetupGenBuffer,CharBuffer,  $(X_BUF), type := char))
-$(eval $(call SetupGenBuffer,ShortBuffer, $(X_BUF), type := short))
-$(eval $(call SetupGenBuffer,IntBuffer,   $(X_BUF), type := int))
-$(eval $(call SetupGenBuffer,LongBuffer,  $(X_BUF), type := long))
-$(eval $(call SetupGenBuffer,FloatBuffer, $(X_BUF), type := float))
-$(eval $(call SetupGenBuffer,DoubleBuffer,$(X_BUF), type := double))
-
-# Buffers whose contents are heap-allocated
+################################################################################
+# Setup make rules that creates a generated buffer class java source file,
+# according to specifications provided.
 #
-HEAP_X_BUF := Heap-X-Buffer
-
-$(eval $(call SetupGenBuffer,HeapByteBuffer,   $(HEAP_X_BUF), type := byte))
-$(eval $(call SetupGenBuffer,HeapByteBufferR,  $(HEAP_X_BUF), type := byte, RW := R))
-$(eval $(call SetupGenBuffer,HeapCharBuffer,   $(HEAP_X_BUF), type := char))
-$(eval $(call SetupGenBuffer,HeapCharBufferR,  $(HEAP_X_BUF), type := char, RW := R))
-$(eval $(call SetupGenBuffer,HeapShortBuffer,  $(HEAP_X_BUF), type := short))
-$(eval $(call SetupGenBuffer,HeapShortBufferR, $(HEAP_X_BUF), type := short, RW := R))
-$(eval $(call SetupGenBuffer,HeapIntBuffer,    $(HEAP_X_BUF), type := int))
-$(eval $(call SetupGenBuffer,HeapIntBufferR,   $(HEAP_X_BUF), type := int, RW := R))
-$(eval $(call SetupGenBuffer,HeapLongBuffer,   $(HEAP_X_BUF), type := long))
-$(eval $(call SetupGenBuffer,HeapLongBufferR,  $(HEAP_X_BUF), type := long, RW := R))
-$(eval $(call SetupGenBuffer,HeapFloatBuffer,  $(HEAP_X_BUF), type := float))
-$(eval $(call SetupGenBuffer,HeapFloatBufferR, $(HEAP_X_BUF), type := float, RW := R))
-$(eval $(call SetupGenBuffer,HeapDoubleBuffer, $(HEAP_X_BUF), type := double))
-$(eval $(call SetupGenBuffer,HeapDoubleBufferR,$(HEAP_X_BUF), type := double, RW := R))
-
-# Direct byte buffer
+# Parameter 1 is the name of the rule. This name is used as variable prefix,
+# and the targets generated are listed in a variable by that name. The output
+# file name is also based on this.
 #
-DIRECT_X_BUF := Direct-X-Buffer
-
-$(eval $(call SetupGenBuffer,DirectByteBuffer, $(DIRECT_X_BUF), type := byte, BIN := 1))
-$(eval $(call SetupGenBuffer,DirectByteBufferR,$(DIRECT_X_BUF), type := byte, BIN := 1, RW := R))
-
-# Unswapped views of direct byte buffers
+# Remaining parameters are named arguments. These include:
+#   TYPE          The native type
+#   TEMPLATE      The base file name of the template to use
+#   BYTE_ORDER    (U)nswapped/(S)wapped/(L)ittle/(B)ig
+#   READ_ONLY     Set to true to generate read-only buffers (default: false)
+#   GENERATE_BIN  Set to true to generate bin snippets (default: false)
 #
-$(eval $(call SetupGenBuffer,DirectCharBufferU,   $(DIRECT_X_BUF), type := char, BO := U))
-$(eval $(call SetupGenBuffer,DirectCharBufferRU,  $(DIRECT_X_BUF), type := char, RW := R, BO := U))
-$(eval $(call SetupGenBuffer,DirectShortBufferU,  $(DIRECT_X_BUF), type := short, BO := U))
-$(eval $(call SetupGenBuffer,DirectShortBufferRU, $(DIRECT_X_BUF), type := short, RW := R, BO := U))
-$(eval $(call SetupGenBuffer,DirectIntBufferU,    $(DIRECT_X_BUF), type := int, BO := U))
-$(eval $(call SetupGenBuffer,DirectIntBufferRU,   $(DIRECT_X_BUF), type := int, RW := R, BO := U))
-$(eval $(call SetupGenBuffer,DirectLongBufferU,   $(DIRECT_X_BUF), type := long, BO := U))
-$(eval $(call SetupGenBuffer,DirectLongBufferRU,  $(DIRECT_X_BUF), type := long, RW := R, BO := U))
-$(eval $(call SetupGenBuffer,DirectFloatBufferU,  $(DIRECT_X_BUF), type := float, BO := U))
-$(eval $(call SetupGenBuffer,DirectFloatBufferRU, $(DIRECT_X_BUF), type := float, RW := R, BO := U))
-$(eval $(call SetupGenBuffer,DirectDoubleBufferU, $(DIRECT_X_BUF), type := double, BO := U))
-$(eval $(call SetupGenBuffer,DirectDoubleBufferRU,$(DIRECT_X_BUF), type := double, RW := R, BO := U))
+SetupGenBuffer = $(NamedParamsMacroTemplate)
+define SetupGenBufferBody
+  $1_OUTPUT := $$(BUFFER_OUTPUT_DIR)/$1.java
+  ifeq ($$($1_GENERATE_BIN), true)
+    # After generating the buffer class, we need to do further post processing,
+    # so output to a temporary file
+    $1_REAL_OUTPUT := $$($1_OUTPUT)
+    $1_OUTPUT := $$($1_OUTPUT).bin-snippet.tmp
+  endif
 
-# Swapped views of direct byte buffers
+  $1_LBPV := $$(call Conv, $$($1_TYPE), LBPV)
+  ifeq ($$($1_READ_ONLY), true)
+    $1_RW_KEYS := ro
+    $1_RW_REPLACEMENT := R
+  else
+    $1_RW_KEYS := rw
+    $1_RW_REPLACEMENT :=
+  endif
+
+  $$(eval $$(call SetupStreamPreProcessing, GEN_BUFFER_$1, \
+      SOURCE_FILE := $$(BUFFER_INPUT_DIR)/$$($1_TEMPLATE).java.template, \
+      OUTPUT_FILE := $$($1_OUTPUT), \
+      INFO := Generating buffer class $1.java, \
+      KEYS := \
+          $$($1_TYPE) \
+          $$($1_RW_KEYS) \
+          bo$$($1_BYTE_ORDER) \
+          $$(call Conv, $$($1_TYPE), category) \
+          $$(call Conv, $$($1_TYPE), streams), \
+      REPLACEMENTS := \
+          type=$$($1_TYPE) \
+          BO=$$($1_BYTE_ORDER) \
+          RW=$$($1_RW_REPLACEMENT) \
+          LG_BYTES_PER_VALUE=$$($1_LBPV) \
+          BYTES_PER_VALUE="(1$$$$(SPACE)<<$$$$(SPACE)$$($1_$2_LBPV))" \
+          a=$$(call Conv, $$($1_TYPE), a) \
+          A=$$(call Conv, $$($1_TYPE), A) \
+          fulltype=$$(call Conv, $$($1_TYPE), fulltype) \
+          Fulltype=$$(call Conv, $$($1_TYPE), Fulltype) \
+          memtype=$$(call Conv, $$($1_TYPE), memtype) \
+          Memtype=$$(call Conv, $$($1_TYPE), Memtype) \
+          streamtype=$$(call Conv, $$($1_TYPE), streamtype) \
+          Streamtype=$$(call Conv, $$($1_TYPE), Streamtype) \
+          Type=$$(call Conv, $$($1_TYPE), Type) \
+          x=$$(call Conv, $$($1_TYPE), x) \
+          fromBits=$$(call Conv, $$($1_TYPE), fromBits, $$($1_BYTE_ORDER)) \
+          toBits=$$(call Conv, $$($1_TYPE), toBits, $$($1_BYTE_ORDER)) \
+          swap=$$(call Conv, $$($1_TYPE), swap, $$($1_BYTE_ORDER)) \
+          Swaptype=$$(call Conv, $$($1_TYPE), Swaptype, $$($1_BYTE_ORDER)), \
+  ))
+  TARGETS += $$(GEN_BUFFER_$1)
+  $1 += $$(GEN_BUFFER_$1)
+
+  ifeq ($$($1_GENERATE_BIN), true)
+    # Setup generation of snippet files, one for each non-byte type. This will
+    # populate $1_BIN_SNIPPET_FILES.
+    $1_BIN_SNIPPET_FILES :=
+    $$(foreach t, $$(NON_BYTE_NUMBER_TYPES), \
+      $$(eval $$(call SetupGenBufferBinSnippets,$1,$$t)) \
+    )
+
+    # Inject these snippets in the file generated by GEN_BUFFER_$1
+    $$($1_REAL_OUTPUT): $$($1_OUTPUT) $$($1_BIN_SNIPPET_FILES)
+	$$(call LogInfo, Concatenating buffer class bin snippets for $1)
+        # Delete everything from the line containing #BIN and below
+	$$(SED) -e '/#BIN/,$$$$d' < $$($1_OUTPUT) > $$($1_REAL_OUTPUT).tmp
+	$$(CAT) $$($1_BIN_SNIPPET_FILES) >> $$($1_REAL_OUTPUT).tmp
+	$$(ECHO) "}" >> $$($1_REAL_OUTPUT).tmp
+	$$(MV) $$($1_REAL_OUTPUT).tmp $$($1_REAL_OUTPUT)
+
+    TARGETS += $$($1_REAL_OUTPUT)
+    $1 += $$($1_REAL_OUTPUT)
+  endif
+endef
+
+################################################################################
+# Helper method to setup generation of all buffer classes, for a given
+# modifiability state (read-only or not)
 #
-$(eval $(call SetupGenBuffer,DirectCharBufferS,   $(DIRECT_X_BUF), type := char, BO := S))
-$(eval $(call SetupGenBuffer,DirectCharBufferRS,  $(DIRECT_X_BUF), type := char, RW := R, BO := S))
-$(eval $(call SetupGenBuffer,DirectShortBufferS,  $(DIRECT_X_BUF), type := short, BO := S))
-$(eval $(call SetupGenBuffer,DirectShortBufferRS, $(DIRECT_X_BUF), type := short, RW := R, BO := S))
-$(eval $(call SetupGenBuffer,DirectIntBufferS,    $(DIRECT_X_BUF), type := int, BO := S))
-$(eval $(call SetupGenBuffer,DirectIntBufferRS,   $(DIRECT_X_BUF), type := int, RW := R, BO := S))
-$(eval $(call SetupGenBuffer,DirectLongBufferS,   $(DIRECT_X_BUF), type := long, BO := S))
-$(eval $(call SetupGenBuffer,DirectLongBufferRS,  $(DIRECT_X_BUF), type := long, RW := R, BO := S))
-$(eval $(call SetupGenBuffer,DirectFloatBufferS,  $(DIRECT_X_BUF), type := float, BO := S))
-$(eval $(call SetupGenBuffer,DirectFloatBufferRS, $(DIRECT_X_BUF), type := float, RW := R, BO := S))
-$(eval $(call SetupGenBuffer,DirectDoubleBufferS, $(DIRECT_X_BUF), type := double, BO := S))
-$(eval $(call SetupGenBuffer,DirectDoubleBufferRS,$(DIRECT_X_BUF), type := double, RW := R, BO := S))
+# arg $1: READ_ONLY argument, true or false
+# arg $2: Modifiability marker for class name (R or empty)
+define SetupGenerateBuffersWithRO
+  ifeq ($1, false)
+    # The basic buffer classes are not generated in READ_ONLY versions
+    $$(eval $$(call SetupGenBuffer, ByteBuffer, \
+        TYPE := byte, \
+        TEMPLATE := X-Buffer, \
+        GENERATE_BIN := true, \
+    ))
+    TARGETS += $$(ByteBuffer)
 
-# Big-endian views of byte buffers
-#
-BYTE_X_BUF := ByteBufferAs-X-Buffer
+    $$(foreach t, $$(NON_BYTE_NUMBER_TYPES), \
+      $$(eval $$(call SetupGenBuffer, $$(call titlecase, $$t)Buffer, \
+          TYPE := $$t, \
+          TEMPLATE := X-Buffer, \
+      )) \
+      $$(eval TARGETS += $$($$(call titlecase, $$t)Buffer)) \
+    )
+  endif
 
-$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferB,   $(BYTE_X_BUF), type := char, BO := B))
-$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferRB,  $(BYTE_X_BUF), type := char, RW := R, BO := B))
-$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferB,  $(BYTE_X_BUF), type := short, BO := B))
-$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferRB, $(BYTE_X_BUF), type := short, RW := R, BO := B))
-$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferB,    $(BYTE_X_BUF), type := int, BO := B))
-$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferRB,   $(BYTE_X_BUF), type := int, RW := R, BO := B))
-$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferB,   $(BYTE_X_BUF), type := long, BO := B))
-$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferRB,  $(BYTE_X_BUF), type := long, RW := R, BO := B))
-$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferB,  $(BYTE_X_BUF), type := float, BO := B))
-$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferRB, $(BYTE_X_BUF), type := float, RW := R, BO := B))
-$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferB, $(BYTE_X_BUF), type := double, BO := B))
-$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferRB,$(BYTE_X_BUF), type := double, RW := R, BO := B))
+  # Buffers whose contents are heap-allocated, one for every type
+  $$(foreach t, $$(NUMBER_TYPES), \
+    $$(eval $$(call SetupGenBuffer, Heap$$(call titlecase, $$t)Buffer$2, \
+        TYPE := $$t, \
+        TEMPLATE := Heap-X-Buffer, \
+        READ_ONLY := $1, \
+    )) \
+    $$(eval TARGETS += $$(Heap$$(call titlecase, $$t)Buffer$2)) \
+  )
 
-# Little-endian views of byte buffers
-#
-$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferL,   $(BYTE_X_BUF), type := char, BO := L))
-$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferRL,  $(BYTE_X_BUF), type := char, RW := R, BO := L))
-$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferL,  $(BYTE_X_BUF), type := short, BO := L))
-$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferRL, $(BYTE_X_BUF), type := short, RW := R, BO := L))
-$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferL,    $(BYTE_X_BUF), type := int, BO := L))
-$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferRL,   $(BYTE_X_BUF), type := int, RW := R, BO := L))
-$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferL,   $(BYTE_X_BUF), type := long, BO := L))
-$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferRL,  $(BYTE_X_BUF), type := long, RW := R, BO := L))
-$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferL,  $(BYTE_X_BUF), type := float, BO := L))
-$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferRL, $(BYTE_X_BUF), type := float, RW := R, BO := L))
-$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferL, $(BYTE_X_BUF), type := double, BO := L))
-$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferRL,$(BYTE_X_BUF), type := double, RW := R, BO := L))
+  # Treat byte special for DirectByteBuffer classes
+  $$(eval $$(call SetupGenBuffer, DirectByteBuffer$2, \
+      TEMPLATE := Direct-X-Buffer, \
+      TYPE := byte, \
+      GENERATE_BIN := true, \
+      READ_ONLY := $1, \
+  ))
+  TARGETS += $$(DirectByteBuffer$2)
 
-###
+  # Generate Swapped and Unswapped views of the direct byte buffers, each for
+  # every non-byte type
+  $$(foreach b, U S, \
+    $$(foreach t, $$(NON_BYTE_NUMBER_TYPES), \
+      $$(eval $$(call SetupGenBuffer, Direct$$(call titlecase, $$t)Buffer$2$$b, \
+          TYPE := $$t, \
+          TEMPLATE := Direct-X-Buffer, \
+          BYTE_ORDER := $$b, \
+          READ_ONLY := $1, \
+      )) \
+      $$(eval TARGETS += $$(Direct$$(call titlecase, $$t)Buffer$2$$b)) \
+    ) \
+  )
 
-$(GENSRC_BUFFER): $(BUILD_TOOLS_JDK)
+  # Generate Big and Little endian views of the direct byte buffers, each for
+  # every non-byte type
+  $$(foreach b, B L, \
+    $$(foreach t, $$(NON_BYTE_NUMBER_TYPES), \
+      $$(eval $$(call SetupGenBuffer, ByteBufferAs$$(call titlecase, $$t)Buffer$2$$b, \
+          TYPE := $$t, \
+          TEMPLATE := ByteBufferAs-X-Buffer, \
+          BYTE_ORDER := $$b, \
+          READ_ONLY := $1, \
+      )) \
+      $$(eval TARGETS += $$(ByteBufferAs$$(call titlecase, $$t)Buffer$2$$b)) \
+    ) \
+  )
+endef
 
-TARGETS += $(GENSRC_BUFFER)
+################################################################################
+# Generate buffers in both read-write and read-only variants for all buffers
+
+$(eval $(call SetupGenerateBuffersWithRO,false,))
+$(eval $(call SetupGenerateBuffersWithRO,true,R))
 
 ################################################################################
 

make/modules/java.base/gensrc/GensrcCharsetCoder.gmk

@@ -28,91 +28,74 @@ ifeq ($(INCLUDE), true)
 
 ################################################################################
 
-GENSRC_CHARSETCODER :=
-
-GENSRC_CHARSETCODER_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/nio/charset
-
-GENSRC_CHARSETCODER_SRC := $(MODULE_SRC)/share/classes/java/nio
-
-GENSRC_CHARSETCODER_TEMPLATE := $(GENSRC_CHARSETCODER_SRC)/charset/Charset-X-Coder.java.template
+CHARSETCODER_INPUT := $(MODULE_SRC)/share/classes/java/nio/charset/Charset-X-Coder.java.template
+CHARSETCODER_OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/nio/charset
 
 ################################################################################
 
-$(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java: $(GENSRC_CHARSETCODER_TEMPLATE)
-	$(call MakeTargetDir)
-	$(RM) $@.tmp
-	$(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/gensrc/java.base/_charset_decoder, \
-	    $(TOOL_SPP) -i$< -o$@.tmp \
-	    -Kdecoder \
-	    -DA='A' \
-	    -Da='a' \
-	    -DCode='Decode' \
-	    -Dcode='decode' \
-	    -DitypesPhrase='bytes in a specific charset' \
-	    -DotypesPhrase='sixteen-bit Unicode characters' \
-	    -Ditype='byte' \
-	    -Dotype='character' \
-	    -DItype='Byte' \
-	    -DOtype='Char' \
-	    -Dcoder='decoder' \
-	    -DCoder='Decoder' \
-	    -Dcoding='decoding' \
-	    -DOtherCoder='Encoder' \
-	    -DreplTypeName='string' \
-	    -DdefaultRepl='"\\uFFFD"' \
-	    -DdefaultReplName='<code>"\&#92;uFFFD"<\/code>' \
-	    -DreplType='String' \
-	    -DreplFQType='java.lang.String' \
-	    -DreplLength='length()' \
-	    -DItypesPerOtype='CharsPerByte' \
-	    -DnotLegal='not legal for this charset' \
-	    -Dotypes-per-itype='chars-per-byte' \
-	    -DoutSequence='Unicode character')
-	$(MV) $@.tmp $@
+$(eval $(call SetupStreamPreProcessing, GEN_CHARSETDECODER, \
+    SOURCE_FILE := $(CHARSETCODER_INPUT), \
+    OUTPUT_FILE := $(CHARSETCODER_OUTPUT_DIR)/CharsetDecoder.java, \
+    INFO := Generating CharsetDecoder.java, \
+    KEYS := decoder, \
+    REPLACEMENTS := \
+        A='A' \
+        a='a' \
+        Code='Decode' \
+        code='decode' \
+        itypesPhrase='bytes$$(SPACE)in$$(SPACE)a$$(SPACE)specific$$(SPACE)charset' \
+        otypesPhrase='sixteen-bit$$(SPACE)Unicode$$(SPACE)characters' \
+        itype='byte' \
+        otype='character' \
+        Itype='Byte' \
+        Otype='Char' \
+        coder='decoder' \
+        Coder='Decoder' \
+        coding='decoding' \
+        OtherCoder='Encoder' \
+        replTypeName='string' \
+        replType='String' \
+        replFQType='java.lang.String' \
+        replLength='length()' \
+        ItypesPerOtype='CharsPerByte' \
+        notLegal='not$$(SPACE)legal$$(SPACE)for$$(SPACE)this$$(SPACE)charset' \
+        otypes-per-itype='chars-per-byte' \
+        outSequence='Unicode$$(SPACE)character', \
+))
 
-GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java
+TARGETS += $(GEN_CHARSETDECODER)
 
-################################################################################
+$(eval $(call SetupStreamPreProcessing, GEN_CHARSETENCODER, \
+    SOURCE_FILE := $(CHARSETCODER_INPUT), \
+    OUTPUT_FILE := $(CHARSETCODER_OUTPUT_DIR)/CharsetEncoder.java, \
+    INFO := Generating CharsetEncoder.java, \
+    KEYS := encoder, \
+    REPLACEMENTS := \
+        A='An' \
+        a='an' \
+        Code='Encode' \
+        code='encode' \
+        itypesPhrase='sixteen-bit$$(SPACE)Unicode$$(SPACE)characters' \
+        otypesPhrase='bytes$$(SPACE)in$$(SPACE)a$$(SPACE)specific$$(SPACE)charset' \
+        itype='character' \
+        otype='byte' \
+        Itype='Char' \
+        Otype='Byte' \
+        coder='encoder' \
+        Coder='Encoder' \
+        coding='encoding' \
+        OtherCoder='Decoder' \
+        replTypeName='byte$$(SPACE)array' \
+        replType='byte[]' \
+        replFQType='byte[]' \
+        replLength='length' \
+        ItypesPerOtype='BytesPerChar' \
+        notLegal='not$$(SPACE)a$$(SPACE)legal$$(SPACE)sixteen-bit$$(SPACE)Unicode$$(SPACE)sequence' \
+        otypes-per-itype='bytes-per-char' \
+        outSequence='byte$$(SPACE)sequence$$(SPACE)in$$(SPACE)the$$(SPACE)given$$(SPACE)charset', \
+))
 
-$(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java: $(GENSRC_CHARSETCODER_TEMPLATE)
-	$(call MakeTargetDir)
-	$(RM) $@.tmp
-	$(call ExecuteWithLog, $(SUPPORT_OUTPUTDIR)/gensrc/java.base/_charset_encoder, \
-	    $(TOOL_SPP) -i$< -o$@.tmp \
-	    -Kencoder \
-	    -DA='An' \
-	    -Da='an' \
-	    -DCode='Encode' \
-	    -Dcode='encode' \
-	    -DitypesPhrase='sixteen-bit Unicode characters' \
-	    -DotypesPhrase='bytes in a specific charset' \
-	    -Ditype='character' \
-	    -Dotype='byte' \
-	    -DItype='Char' \
-	    -DOtype='Byte' \
-	    -Dcoder='encoder' \
-	    -DCoder='Encoder' \
-	    -Dcoding='encoding' \
-	    -DOtherCoder='Decoder' \
-	    -DreplTypeName='byte array' \
-	    -DdefaultRepl='new byte[] { (byte)'"'"\\?"'"' }' \
-	    -DdefaultReplName='<code>{<\/code>\&nbsp;<code>(byte)'"'"\\?"'"'<\/code>\&nbsp;<code>}<\/code>' \
-	    -DreplType='byte[]' \
-	    -DreplFQType='byte[]' \
-	    -DreplLength='length' \
-	    -DItypesPerOtype='BytesPerChar' \
-	    -DnotLegal='not a legal sixteen-bit Unicode sequence' \
-	    -Dotypes-per-itype='bytes-per-char' \
-	    -DoutSequence='byte sequence in the given charset')
-	$(MV) $@.tmp $@
-
-GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java
-
-################################################################################
-
-$(GENSRC_CHARSETCODER): $(BUILD_TOOLS_JDK)
-
-TARGETS += $(GENSRC_CHARSETCODER)
+TARGETS += $(GEN_CHARSETENCODER)
 
 ################################################################################
 

make/modules/java.base/gensrc/GensrcExceptions.gmk

@@ -1,57 +0,0 @@
-#
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include MakeIncludeStart.gmk
-ifeq ($(INCLUDE), true)
-
-################################################################################
-
-GENSRC_EXCEPTIONS :=
-
-GENSRC_EXCEPTIONS_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/nio
-
-GENSRC_EXCEPTIONS_SRC := $(MODULE_SRC)/share/classes/java/nio
-GENSRC_EXCEPTIONS_CMD := $(TOPDIR)/make/scripts/genExceptions.sh
-
-GENSRC_EXCEPTIONS_SRC_DIRS := . charset channels
-
-$(GENSRC_EXCEPTIONS_DST)/_the.%.marker: $(GENSRC_EXCEPTIONS_SRC)/%/exceptions \
-    $(GENSRC_EXCEPTIONS_CMD)
-	$(call LogInfo, Generating exceptions java.nio $*)
-	$(call MakeDir, $(@D)/$*)
-	SCRIPTS="$(TOPDIR)/make/scripts" AWK="$(AWK)" SH="$(SH)" $(SH) \
-	    $(GENSRC_EXCEPTIONS_CMD) $< $(@D)/$* $(LOG_DEBUG)
-	$(TOUCH) $@
-
-GENSRC_EXCEPTIONS += $(foreach D, $(GENSRC_EXCEPTIONS_SRC_DIRS), $(GENSRC_EXCEPTIONS_DST)/_the.$(D).marker)
-
-$(GENSRC_EXCEPTIONS): $(BUILD_TOOLS_JDK)
-
-TARGETS += $(GENSRC_EXCEPTIONS)
-
-################################################################################
-
-endif # include guard
-include MakeIncludeEnd.gmk

make/modules/java.base/gensrc/GensrcScopedMemoryAccess.gmk

@@ -28,144 +28,77 @@ ifeq ($(INCLUDE), true)
 
 ################################################################################
 
-SCOPED_MEMORY_ACCESS_GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/misc
-SCOPED_MEMORY_ACCESS_SRC_DIR := $(MODULE_SRC)/share/classes/jdk/internal/misc
-SCOPED_MEMORY_ACCESS_TEMPLATE := $(SCOPED_MEMORY_ACCESS_SRC_DIR)/X-ScopedMemoryAccess.java.template
-SCOPED_MEMORY_ACCESS_BIN_TEMPLATE := $(SCOPED_MEMORY_ACCESS_SRC_DIR)/X-ScopedMemoryAccess-bin.java.template
-SCOPED_MEMORY_ACCESS_DEST := $(SCOPED_MEMORY_ACCESS_GENSRC_DIR)/ScopedMemoryAccess.java
+SCOPED_INPUT_DIR := $(MODULE_SRC)/share/classes/jdk/internal/misc
+SCOPED_INPUT := $(SCOPED_INPUT_DIR)/X-ScopedMemoryAccess.java.template
+SCOPED_OUTPUT := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/misc/ScopedMemoryAccess.java
 
 ################################################################################
-# Setup a rule for generating the ScopedMemoryAccess java class
-# Param 1 - Variable declaration prefix
-# Param 2 - Type with first letter capitalized
-define GenerateScopedOp
+# Helper method to setup generation of scoped snippets.
+# Will add the generated snippet file name to SCOPED_SNIPPET_FILES.
+#
+# arg $1: type for this snippet
+define SetupGenScopedSnippets
+  $1_SCOPED_SNIPPET_FILE := $$(SCOPED_OUTPUT).snippet.$1
 
-  $1_Type := $2
-
-  ifeq ($$($1_Type), Boolean)
-    $1_type := boolean
-    $1_BoxType := $$($1_Type)
-
-    $1_rawType := $$($1_type)
-    $1_RawType := $$($1_Type)
-    $1_RawBoxType := $$($1_BoxType)
-
-    $1_ARGS += -KCAS
+  $1_KEYS := $1 CAS
+  ifneq ($$(filter byte, $1),)
+    $1_KEYS += byte
+  endif
+  ifneq ($$(filter float double, $1),)
+    $1_KEYS += floatingPoint
+  endif
+  ifneq ($$(filter char short int long, $1),)
+    $1_KEYS += Unaligned
+  endif
+  ifneq ($$(filter boolean byte char short, $1),)
+    $1_KEYS += ShorterThanInt
+  endif
+  ifeq ($$(filter boolean, $1),)
+    $1_KEYS += AtomicAdd
+  endif
+  ifeq ($$(filter float double, $1),)
+    $1_KEYS += Bitwise
   endif
 
-  ifeq ($$($1_Type), Byte)
-    $1_type := byte
-    $1_BoxType := $$($1_Type)
+  $$(eval $$(call SetupStreamPreProcessing, GEN_SCOPED_SNIPPET_$1, \
+      SOURCE_FILE := $$(SCOPED_INPUT_DIR)/X-ScopedMemoryAccess-bin.java.template, \
+      OUTPUT_FILE := $$($1_SCOPED_SNIPPET_FILE), \
+      INFO := Generating snippets for ScopedMemoryAccess ($1), \
+      SUBST_EMPTY_LINES := false, \
+      KEYS := $$($1_KEYS), \
+      REPLACEMENTS := \
+          type=$1 \
+          Type=$$(call Conv, $1, Type), \
+  ))
+  TARGETS += $$(GEN_SCOPED_SNIPPET_$1)
 
-    $1_rawType := $$($1_type)
-    $1_RawType := $$($1_Type)
-    $1_RawBoxType := $$($1_BoxType)
-
-    $1_ARGS += -KCAS
-    $1_ARGS += -Kbyte
-  endif
-
-  ifeq ($$($1_Type), Short)
-    $1_type := short
-    $1_BoxType := $$($1_Type)
-
-    $1_rawType := $$($1_type)
-    $1_RawType := $$($1_Type)
-    $1_RawBoxType := $$($1_BoxType)
-
-    $1_ARGS += -KCAS
-    $1_ARGS += -KUnaligned
-  endif
-
-  ifeq ($$($1_Type), Char)
-    $1_type := char
-    $1_BoxType := Character
-
-    $1_rawType := $$($1_type)
-    $1_RawType := $$($1_Type)
-    $1_RawBoxType := $$($1_BoxType)
-
-    $1_ARGS += -KCAS
-    $1_ARGS += -KUnaligned
-  endif
-
-  ifeq ($$($1_Type), Int)
-    $1_type := int
-    $1_BoxType := Integer
-
-    $1_rawType := $$($1_type)
-    $1_RawType := $$($1_Type)
-    $1_RawBoxType := $$($1_BoxType)
-
-    $1_ARGS += -KCAS
-    $1_ARGS += -KUnaligned
-  endif
-
-  ifeq ($$($1_Type), Long)
-    $1_type := long
-    $1_BoxType := $$($1_Type)
-
-    $1_rawType := $$($1_type)
-    $1_RawType := $$($1_Type)
-    $1_RawBoxType := $$($1_BoxType)
-
-    $1_ARGS += -KCAS
-    $1_ARGS += -KUnaligned
-  endif
-
-  ifeq ($$($1_Type), Float)
-    $1_type := float
-    $1_BoxType := $$($1_Type)
-
-    $1_rawType := int
-    $1_RawType := Int
-    $1_RawBoxType := Integer
-
-    $1_ARGS += -KCAS
-    $1_ARGS += -KfloatingPoint
-  endif
-
-  ifeq ($$($1_Type), Double)
-    $1_type := double
-    $1_BoxType := $$($1_Type)
-
-    $1_rawType := long
-    $1_RawType := Long
-    $1_RawBoxType := Long
-
-    $1_ARGS += -KCAS
-    $1_ARGS += -KfloatingPoint
-  endif
-
-  ifneq ($$(findstring $$($1_Type), Byte Short Char Int Long Float Double), )
-    $1_ARGS += -KAtomicAdd
-  endif
-
-  ifneq ($$(findstring $$($1_Type), Boolean Byte Short Char Int Long), )
-    $1_ARGS += -KBitwise
-  endif
-
-  ifneq ($$(findstring $$($1_Type), Boolean Byte Short Char), )
-    $1_ARGS += -KShorterThanInt
-  endif
+  SCOPED_SNIPPET_FILES += $$($1_SCOPED_SNIPPET_FILE)
 endef
 
 ################################################################################
-# Setup a rule for generating the ScopedMemoryAccess java class
+# Setup generation of snippet files, one for each primitive type. This will
+# populate SCOPED_SNIPPET_FILES.
 
-SCOPE_MEMORY_ACCESS_TYPES := Boolean Byte Short Char Int Long Float Double
-$(foreach t, $(SCOPE_MEMORY_ACCESS_TYPES), \
-  $(eval $(call GenerateScopedOp,BIN_$t,$t)))
+# SCOPED_TYPES is identical to PRIMITIVE_TYPES, but with a slightly different
+# order. Keep the original SCOPED_TYPES order for now to not change the
+# generated file.
+SCOPED_TYPES := boolean byte short char int long float double
 
-$(SCOPED_MEMORY_ACCESS_DEST): $(BUILD_TOOLS_JDK) $(SCOPED_MEMORY_ACCESS_TEMPLATE) $(SCOPED_MEMORY_ACCESS_BIN_TEMPLATE)
-	$(call MakeDir, $(SCOPED_MEMORY_ACCESS_GENSRC_DIR))
-	$(CAT) $(SCOPED_MEMORY_ACCESS_TEMPLATE) > $(SCOPED_MEMORY_ACCESS_DEST)
-	$(foreach t, $(SCOPE_MEMORY_ACCESS_TYPES), \
-	  $(TOOL_SPP) -nel -K$(BIN_$t_type) -Dtype=$(BIN_$t_type) -DType=$(BIN_$t_Type) $(BIN_$t_ARGS) \
-	  -i$(SCOPED_MEMORY_ACCESS_BIN_TEMPLATE) -o$(SCOPED_MEMORY_ACCESS_DEST) ;)
-	$(ECHO) "}" >> $(SCOPED_MEMORY_ACCESS_DEST)
+SCOPED_SNIPPET_FILES :=
+$(foreach t, $(SCOPED_TYPES), \
+  $(eval $(call SetupGenScopedSnippets,$t)) \
+)
 
-TARGETS += $(SCOPED_MEMORY_ACCESS_DEST)
+# Setup a rule for generating the ScopedMemoryAccess java class by incorporating
+# those snippets
+$(SCOPED_OUTPUT): $(SCOPED_INPUT) $(SCOPED_SNIPPET_FILES)
+	$(call LogInfo, Concatenating snippets for ScopedMemoryAccess.java)
+	$(CAT) $(SCOPED_INPUT) > $(SCOPED_OUTPUT).tmp
+	$(CAT) $(SCOPED_SNIPPET_FILES) >> $(SCOPED_OUTPUT).tmp
+	$(ECHO) "}" >> $(SCOPED_OUTPUT).tmp
+	$(MV) $(SCOPED_OUTPUT).tmp $(SCOPED_OUTPUT)
+
+TARGETS += $(SCOPED_OUTPUT)
 
 ################################################################################
 

make/modules/java.base/gensrc/GensrcVarHandles.gmk

@@ -28,277 +28,144 @@ ifeq ($(INCLUDE), true)
 
 ################################################################################
 
-GENSRC_VARHANDLES :=
-
-VARHANDLES_GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/invoke
-VARHANDLES_SRC_DIR := $(MODULE_SRC)/share/classes/java/lang/invoke
+VARHANDLES_INPUT_DIR := $(MODULE_SRC)/share/classes/java/lang/invoke
+VARHANDLES_OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/invoke
 
 ################################################################################
 # Setup a rule for generating a VarHandle java class
-# Param 1 - Variable declaration prefix
-# Param 2 - Type with first letter capitalized
+#
+# arg $1: type for this varhandle
 define GenerateVarHandle
+  VARHANDLE_$1_type := $$(strip $$(if $$(filter reference, $1), Object, $1))
+  VARHANDLE_$1_Type := $$(call Conv, $1, Type)
 
-  $1_Type := $2
-
-  $1_FILENAME := $(VARHANDLES_GENSRC_DIR)/VarHandle$$($1_Type)s.java
-
-  $1_ARGS += -KCAS
-
-  ifneq ($$(findstring $$($1_Type), Byte Short Char Int Long Float Double), )
-    $1_ARGS += -KAtomicAdd
+  $1_KEYS := $$(VARHANDLE_$1_type) CAS
+  ifneq ($$(filter byte short char, $1),)
+    $1_KEYS += ShorterThanInt
+  endif
+  ifeq ($$(filter boolean reference, $1),)
+    $1_KEYS += AtomicAdd
+  endif
+  ifeq ($$(filter float double reference, $1),)
+    $1_KEYS += Bitwise
   endif
 
-  ifneq ($$(findstring $$($1_Type), Boolean Byte Short Char Int Long), )
-    $1_ARGS += -KBitwise
-  endif
-
-  ifneq ($$(findstring $$($1_Type), Byte Short Char), )
-    $1_ARGS += -KShorterThanInt
-  endif
-
-  $$($1_FILENAME): $(VARHANDLES_SRC_DIR)/X-VarHandle.java.template $(BUILD_TOOLS_JDK)
-        ifeq ($$($1_Type), Reference)
-	  $$(eval $1_type := Object)
-        else
-	  $$(eval $1_type := $$$$(shell $(TR) '[:upper:]' '[:lower:]' <<< $$$$($1_Type)))
-        endif
-	$$(call MakeDir, $$(@D))
-	$(RM) $$@
-	$(TOOL_SPP) -nel -K$$($1_type) -Dtype=$$($1_type) -DType=$$($1_Type) \
-	    $$($1_ARGS) -i$$< -o$$@
-
-  GENSRC_VARHANDLES += $$($1_FILENAME)
+  $$(eval $$(call SetupStreamPreProcessing, GEN_VARHANDLE_$1, \
+      SOURCE_FILE := $$(VARHANDLES_INPUT_DIR)/X-VarHandle.java.template, \
+      OUTPUT_FILE := $$(VARHANDLES_OUTPUT_DIR)/VarHandle$$(VARHANDLE_$1_Type)s.java, \
+      INFO := Generating VarHandle class for $1, \
+      SUBST_EMPTY_LINES := false, \
+      KEYS := $$($1_KEYS), \
+      REPLACEMENTS := \
+          type=$$(VARHANDLE_$1_type) \
+          Type=$$(VARHANDLE_$1_Type), \
+  ))
+  TARGETS += $$(GEN_VARHANDLE_$1)
 endef
 
-################################################################################
-
 ################################################################################
 # Setup a rule for generating a VarHandleByteArray java class
-# Param 1 - Variable declaration prefix
-# Param 2 - Type with first letter capitalized
+#
+# arg $1: type for this varhandle
 define GenerateVarHandleByteArray
+  VARHANDLE_BYTEARRAY_$1_Type := $$(call Conv, $1, Type)
 
-  $1_Type := $2
-
-  $1_FILENAME := $(VARHANDLES_GENSRC_DIR)/VarHandleByteArrayAs$$($1_Type)s.java
-
-  ifeq ($$($1_Type), Short)
-    $1_type := short
-    $1_BoxType := $$($1_Type)
-
-    $1_rawType := $$($1_type)
-    $1_RawType := $$($1_Type)
-    $1_RawBoxType := $$($1_BoxType)
+  $1_KEYS := $1
+  ifneq ($$(filter int long float double, $1),)
+    $1_KEYS += CAS
+  endif
+  ifneq ($$(filter float double, $1),)
+    $1_KEYS += floatingPoint
+  endif
+  ifneq ($$(filter int long, $1),)
+    $1_KEYS += AtomicAdd Bitwise
   endif
 
-  ifeq ($$($1_Type), Char)
-    $1_type := char
-    $1_BoxType := Character
-
-    $1_rawType := $$($1_type)
-    $1_RawType := $$($1_Type)
-    $1_RawBoxType := $$($1_BoxType)
-  endif
-
-  ifeq ($$($1_Type), Int)
-    $1_type := int
-    $1_BoxType := Integer
-
-    $1_rawType := $$($1_type)
-    $1_RawType := $$($1_Type)
-    $1_RawBoxType := $$($1_BoxType)
-
-    $1_ARGS += -KCAS
-    $1_ARGS += -KAtomicAdd
-    $1_ARGS += -KBitwise
-  endif
-
-  ifeq ($$($1_Type), Long)
-    $1_type := long
-    $1_BoxType := $$($1_Type)
-
-    $1_rawType := $$($1_type)
-    $1_RawType := $$($1_Type)
-    $1_RawBoxType := $$($1_BoxType)
-
-    $1_ARGS += -KCAS
-    $1_ARGS += -KAtomicAdd
-    $1_ARGS += -KBitwise
-  endif
-
-  ifeq ($$($1_Type), Float)
-    $1_type := float
-    $1_BoxType := $$($1_Type)
-
-    $1_rawType := int
-    $1_RawType := Int
-    $1_RawBoxType := Integer
-
-    $1_ARGS += -KCAS
-    $1_ARGS += -KfloatingPoint
-  endif
-
-  ifeq ($$($1_Type), Double)
-    $1_type := double
-    $1_BoxType := $$($1_Type)
-
-    $1_rawType := long
-    $1_RawType := Long
-    $1_RawBoxType := Long
-
-    $1_ARGS += -KCAS
-    $1_ARGS += -KfloatingPoint
-  endif
-
-  $$($1_FILENAME): $(VARHANDLES_SRC_DIR)/X-VarHandleByteArrayView.java.template $(BUILD_TOOLS_JDK)
-	$$(call MakeDir, $$(@D))
-	$(RM) $$@
-	$(TOOL_SPP) -nel -K$$($1_type) \
-	    -Dtype=$$($1_type) -DType=$$($1_Type) -DBoxType=$$($1_BoxType) \
-	    -DrawType=$$($1_rawType) -DRawType=$$($1_RawType) -DRawBoxType=$$($1_RawBoxType) \
-	    $$($1_ARGS) -i$$< -o$$@
-
-  GENSRC_VARHANDLES += $$($1_FILENAME)
+  $$(eval $$(call SetupStreamPreProcessing, GEN_VARHANDLE_BYTEARRAY_$1, \
+      SOURCE_FILE := $$(VARHANDLES_INPUT_DIR)/X-VarHandleByteArrayView.java.template, \
+      OUTPUT_FILE := $$(VARHANDLES_OUTPUT_DIR)/VarHandleByteArrayAs$$(VARHANDLE_BYTEARRAY_$1_Type)s.java, \
+      INFO := Generating VarHandleByteArray class for $1, \
+      SUBST_EMPTY_LINES := false, \
+      KEYS := $$($1_KEYS), \
+      REPLACEMENTS := \
+          type=$1 \
+          Type=$$(VARHANDLE_BYTEARRAY_$1_Type) \
+          BoxType=$$(call Conv, $1, Fulltype) \
+          rawType=$$(call Conv, $1, memtype) \
+          RawType=$$(call Conv, $1, Memtype) \
+          RawBoxType=$$(call Conv, $1, FullMemtype), \
+  ))
+  TARGETS += $$(GEN_VARHANDLE_BYTEARRAY_$1)
 endef
 
 ################################################################################
-
-################################################################################
-# Setup a rule for generating a memory segment var handle view class
-# Param 1 - Variable declaration prefix
-# Param 2 - Type with first letter capitalized
+# Setup a rule for generating a VarHandleMemorySegment java class
+#
+# arg $1: type for this varhandle
 define GenerateVarHandleMemorySegment
+  VARHANDLE_SEGMENT_$1_Type := $$(call Conv, $1, Type)
 
-  $1_Type := $2
 
-  $1_FILENAME := $(VARHANDLES_GENSRC_DIR)/VarHandleSegmentAs$$($1_Type)s.java
-
-  ifeq ($$($1_Type), Boolean)
-    $1_type := boolean
-    $1_BoxType := $$($1_Type)
-
-    $1_rawType := $$($1_type)
-    $1_RawType := $$($1_Type)
-    $1_RawBoxType := $$($1_BoxType)
-
-    $1_ARGS += -Kbyte
-    $1_ARGS += -KShorterThanInt
+  $1_KEYS := $1
+  ifneq ($$(filter int long float double, $1),)
+    $1_KEYS += CAS
+  endif
+  ifneq ($$(filter boolean byte, $1),)
+    $1_KEYS += byte
+  endif
+  ifneq ($$(filter float double, $1),)
+    $1_KEYS += floatingPoint
+  endif
+  ifneq ($$(filter boolean byte short char, $1),)
+    $1_KEYS += ShorterThanInt
+  endif
+  ifneq ($$(filter int long, $1),)
+    $1_KEYS += AtomicAdd Bitwise
   endif
 
-  ifeq ($$($1_Type), Byte)
-    $1_type := byte
-    $1_BoxType := $$($1_Type)
-
-    $1_rawType := $$($1_type)
-    $1_RawType := $$($1_Type)
-    $1_RawBoxType := $$($1_BoxType)
-
-    $1_ARGS += -Kbyte
-    $1_ARGS += -KShorterThanInt
-  endif
-
-  ifeq ($$($1_Type), Short)
-    $1_type := short
-    $1_BoxType := $$($1_Type)
-
-    $1_rawType := $$($1_type)
-    $1_RawType := $$($1_Type)
-    $1_RawBoxType := $$($1_BoxType)
-
-    $1_ARGS += -KShorterThanInt
-  endif
-
-  ifeq ($$($1_Type), Char)
-    $1_type := char
-    $1_BoxType := Character
-
-    $1_rawType := $$($1_type)
-    $1_RawType := $$($1_Type)
-    $1_RawBoxType := $$($1_BoxType)
-
-    $1_ARGS += -KShorterThanInt
-  endif
-
-  ifeq ($$($1_Type), Int)
-    $1_type := int
-    $1_BoxType := Integer
-
-    $1_rawType := $$($1_type)
-    $1_RawType := $$($1_Type)
-    $1_RawBoxType := $$($1_BoxType)
-
-    $1_ARGS += -KCAS
-    $1_ARGS += -KAtomicAdd
-    $1_ARGS += -KBitwise
-  endif
-
-  ifeq ($$($1_Type), Long)
-    $1_type := long
-    $1_BoxType := $$($1_Type)
-
-    $1_rawType := $$($1_type)
-    $1_RawType := $$($1_Type)
-    $1_RawBoxType := $$($1_BoxType)
-
-    $1_ARGS += -KCAS
-    $1_ARGS += -KAtomicAdd
-    $1_ARGS += -KBitwise
-  endif
-
-  ifeq ($$($1_Type), Float)
-    $1_type := float
-    $1_BoxType := $$($1_Type)
-
-    $1_rawType := int
-    $1_RawType := Int
-    $1_RawBoxType := Integer
-
-    $1_ARGS += -KCAS
-    $1_ARGS += -KfloatingPoint
-  endif
-
-  ifeq ($$($1_Type), Double)
-    $1_type := double
-    $1_BoxType := $$($1_Type)
-
-    $1_rawType := long
-    $1_RawType := Long
-    $1_RawBoxType := Long
-
-    $1_ARGS += -KCAS
-    $1_ARGS += -KfloatingPoint
-  endif
-
-  $$($1_FILENAME): $(VARHANDLES_SRC_DIR)/X-VarHandleSegmentView.java.template $(BUILD_TOOLS_JDK)
-	$$(call MakeDir, $$(@D))
-	$(RM) $$@
-	$(TOOL_SPP) -nel -K$$($1_type) \
-	    -Dtype=$$($1_type) -DType=$$($1_Type) -DBoxType=$$($1_BoxType) \
-	    -DrawType=$$($1_rawType) -DRawType=$$($1_RawType) -DRawBoxType=$$($1_RawBoxType) \
-	    $$($1_ARGS) -i$$< -o$$@
-
-  GENSRC_VARHANDLES += $$($1_FILENAME)
+  $$(eval $$(call SetupStreamPreProcessing, GEN_VARHANDLE_SEGMENT_$1, \
+      SOURCE_FILE := $$(VARHANDLES_INPUT_DIR)/X-VarHandleSegmentView.java.template, \
+      OUTPUT_FILE := $$(VARHANDLES_OUTPUT_DIR)/VarHandleSegmentAs$$(VARHANDLE_SEGMENT_$1_Type)s.java, \
+      INFO := Generating VarHandleSegment class for $1, \
+      SUBST_EMPTY_LINES := false, \
+      KEYS := $$($1_KEYS), \
+      REPLACEMENTS := \
+          type=$1 \
+          Type=$$(VARHANDLE_SEGMENT_$1_Type) \
+          BoxType=$$(call Conv, $1, Fulltype) \
+          rawType=$$(call Conv, $1, memtype) \
+          RawType=$$(call Conv, $1, Memtype) \
+          RawBoxType=$$(call Conv, $1, FullMemtype), \
+  ))
+  TARGETS += $$(GEN_VARHANDLE_SEGMENT_$1)
 endef
 
 ################################################################################
+# Generate all VarHandle related classes
 
-# List the types to generate source for, with capitalized first letter
-VARHANDLES_TYPES := Boolean Byte Short Char Int Long Float Double Reference
-$(foreach t, $(VARHANDLES_TYPES), \
-  $(eval $(call GenerateVarHandle,VAR_HANDLE_$t,$t)))
+$(foreach t, $(PRIMITIVE_TYPES) reference, \
+  $(eval $(call GenerateVarHandle,$t)) \
+)
 
-# List the types to generate source for, with capitalized first letter
-VARHANDLES_BYTE_ARRAY_TYPES := Short Char Int Long Float Double
-$(foreach t, $(VARHANDLES_BYTE_ARRAY_TYPES), \
-  $(eval $(call GenerateVarHandleByteArray,VAR_HANDLE_BYTE_ARRAY_$t,$t)))
+$(foreach t, $(NON_BYTE_NUMBER_TYPES), \
+  $(eval $(call GenerateVarHandleByteArray,$t)) \
+)
 
-# List the types to generate source for, with capitalized first letter
-VARHANDLES_MEMORY_SEGMENT_TYPES := Boolean Byte Short Char Int Long Float Double
-$(foreach t, $(VARHANDLES_MEMORY_SEGMENT_TYPES), \
-  $(eval $(call GenerateVarHandleMemorySegment,VAR_HANDLE_MEMORY_SEGMENT_$t,$t)))
+$(foreach t, $(PRIMITIVE_TYPES), \
+  $(eval $(call GenerateVarHandleMemorySegment,$t)) \
+)
 
-TARGETS += $(GENSRC_VARHANDLES)
+################################################################################
+
+GENSRC_VARHANDLEGUARDS := $(VARHANDLES_OUTPUT_DIR)/VarHandleGuards.java
+
+$(GENSRC_VARHANDLEGUARDS): $(BUILD_TOOLS_JDK)
+	$(call LogInfo, Generating $@)
+	$(call MakeTargetDir)
+	$(TOOL_VARHANDLEGUARDMETHODGENERATOR) \
+	    $(GENSRC_VARHANDLEGUARDS)
+
+TARGETS += $(GENSRC_VARHANDLEGUARDS)
 
 ################################################################################
 

make/modules/java.desktop/lib/ClientLibraries.gmk

@@ -51,7 +51,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE, \
         $(LIBMLIB_IMAGE_CFLAGS), \
     DISABLED_WARNINGS_gcc := unused-function, \
     DISABLED_WARNINGS_clang_mlib_ImageCreate.c := unused-function, \
-    LIBS_unix := $(LIBDL) $(LIBM), \
+    LIBS_unix := $(LIBM), \
 ))
 
 TARGETS += $(BUILD_LIBMLIB_IMAGE)
@@ -177,7 +177,8 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
   endif
 
   LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
-      -DPNG_ARM_NEON_OPT=0 -DPNG_ARM_NEON_IMPLEMENTATION=0
+      -DPNG_ARM_NEON_OPT=0 -DPNG_ARM_NEON_IMPLEMENTATION=0 \
+      -DPNG_LOONGARCH_LSX_OPT=0
 
   ifeq ($(call isTargetOs, linux)+$(call isTargetCpuArch, ppc), true+true)
     LIBSPLASHSCREEN_CFLAGS += -DPNG_POWERPC_VSX_OPT=0
@@ -263,7 +264,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
       JDK_LIBS_macosx := libosxapp, \
       LIBS := $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(LIBZ_LIBS) $(PNG_LIBS) $(ICONV_LIBS), \
       LIBS_unix := $(LIBM) $(LIBPTHREAD), \
-      LIBS_linux := $(LIBDL) $(X_LIBS) -lX11 -lXext, \
+      LIBS_linux := $(X_LIBS) -lX11 -lXext, \
       LIBS_macosx := \
           -framework ApplicationServices \
           -framework Cocoa \

make/modules/java.instrument/Lib.gmk

@@ -43,8 +43,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \
     JDK_LIBS := java.base:libjava java.base:libjli java.base:libjvm, \
     LIBS := $(ICONV_LIBS), \
     LIBS_unix := $(LIBZ_LIBS), \
-    LIBS_linux := $(LIBDL), \
-    LIBS_aix := $(LIBDL), \
     LIBS_macosx := \
         -framework ApplicationServices \
         -framework Cocoa \

make/modules/java.scripting/Java.gmk

@@ -27,7 +27,5 @@
 
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'
-COPY += .js
-CLEAN += .properties
 
 ################################################################################

make/modules/java.scripting/Launcher.gmk

@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################################
-
-include LauncherCommon.gmk
-
-################################################################################
-## Build jrunscript
-################################################################################
-
-$(eval $(call SetupBuildLauncher, jrunscript, \
-    MAIN_CLASS := com.sun.tools.script.shell.Main, \
-    JAVA_ARGS := --add-modules ALL-DEFAULT, \
-))
-
-################################################################################