fixup! update exclude list on results of 25.40 test runs

Ensure the jmethod_ids array has sufficient initial capacity. This array is not resized since JDK 23.

.editorconfig

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

.gitattributes

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

.github/README.md

@@ -24,10 +24,9 @@ can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntim
 
 | IDE Version | Latest JBR                                                                                              | Date Released |
 |-------------|---------------------------------------------------------------------------------------------------------|---------------|
-| 2025.2      | [21.0.7-b1038.54](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b1038.54)| 17-Jun-2025   |
-| 2025.1      | [21.0.7-b895.130](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b895.130)| 15-May-2025   |
-| 2024.3      | [21.0.6-b631.52](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b631.52)  | 15-May-2025   |
-| 2024.2      | [21.0.4-b509.40](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b509.40)  | 15-May-2025   |
+| 2025.1      | [21.0.6-b895.109](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.6b895.109)| 05-Apr-2025   |
+| 2024.3      | [21.0.6-b631.39](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.6b631.39)  | 10-Feb-2025   |
+| 2024.2      | [21.0.4-b509.30](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.5b509.30)  | 26-Nov-2024   |
 | 2024.1      | [21.0.2-b346.3](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.2b346.3)    | 30-Jan-2024   |
 
 ## Releases based on JDK 17
@@ -161,7 +160,7 @@ Install the necessary tools, libraries, and headers with:
 ```
 $ sudo apt-get install autoconf make build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev \
        libxt-dev libxrandr-dev libcups2-dev libfontconfig1-dev libasound2-dev libspeechd-dev libwayland-dev \
-       wayland-protocols libxkbcommon-x11-0 libdbus-1-dev
+       wayland-protocols libxkbcommon-x11-0
 ```
 Get Java 23 (for instance, [Azul Zulu Builds of OpenJDK 23](https://www.azul.com/downloads/?version=java-23&os=linux&package=jdk#zulu)).
 
@@ -254,7 +253,8 @@ configurations (for example, `release` and `fastdebug`), supply the `--conf <con
 Then open the git root directory as a project in IDEA.
 
 ## Contributing
-Please contribute your changes through [OpenJDK](https://dev.java/contribute/openjdk/).
+We are happy to receive your pull requests! 
+Before you submit one, please sign our [Contributor License Agreement (CLA)](https://www.jetbrains.com/agreements/cla/).
 
 ## Resources
 * [JetBrains Runtime on GitHub](https://github.com/JetBrains/JetBrainsRuntime).

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

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

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

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

.github/workflows/build-linux.yml

@@ -64,9 +64,6 @@ on:
       bundle-suffix:
         required: false
         type: string
-      static-suffix:
-        required: false
-        type: string
 
 jobs:
   build-linux:
@@ -146,4 +143,3 @@ jobs:
           platform: ${{ inputs.platform }}
           debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
           bundle-suffix: ${{ inputs.bundle-suffix }}
-          static-suffix: ${{ inputs.static-suffix }}

.github/workflows/build-windows.yml

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

.github/workflows/main.yml

@@ -30,6 +30,7 @@ on:
     branches-ignore:
       - master
       - pr/*
+      - jdk*
       - main
   workflow_dispatch:
     inputs:
@@ -231,14 +232,16 @@ jobs:
     uses: ./.github/workflows/build-linux.yml
     with:
       platform: linux-x64
-      make-target: 'static-jdk-bundles'
+      make-target: 'static-jdk-image'
       # There are issues with fastdebug static build in GHA due to space limit.
       # Only do release build for now.
       debug-levels: '[ "release" ]'
       gcc-major-version: '10'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      static-suffix: "-static"
+      # It currently doesn't produce any bundles, but probably will do in
+      # the future.
+      bundle-suffix: "-static"
     if: needs.prepare.outputs.linux-x64 == 'true'
 
   build-linux-x64-static-libs:
@@ -310,7 +313,7 @@ jobs:
     uses: ./.github/workflows/build-windows.yml
     with:
       platform: windows-x64
-      msvc-toolset-version: '14.44'
+      msvc-toolset-version: '14.29'
       msvc-toolset-architecture: 'x86.x64'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -322,7 +325,7 @@ jobs:
     uses: ./.github/workflows/build-windows.yml
     with:
       platform: windows-aarch64
-      msvc-toolset-version: '14.44'
+      msvc-toolset-version: '14.29'
       msvc-toolset-architecture: 'arm64'
       make-target: 'hotspot'
       extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
@@ -359,19 +362,6 @@ jobs:
       platform: linux-x64
       bootjdk-platform: linux-x64
       runs-on: ubuntu-22.04
-      debug-suffix: -debug
-
-  test-linux-x64-static:
-    name: linux-x64-static
-    needs:
-      - build-linux-x64
-      - build-linux-x64-static
-    uses: ./.github/workflows/test.yml
-    with:
-      platform: linux-x64
-      bootjdk-platform: linux-x64
-      runs-on: ubuntu-22.04
-      static-suffix: "-static"
 
   test-macos-aarch64:
     name: macos-aarch64
@@ -383,7 +373,6 @@ jobs:
       bootjdk-platform: macos-aarch64
       runs-on: macos-14
       xcode-toolset-version: '15.4'
-      debug-suffix: -debug
 
   test-windows-x64:
     name: windows-x64
@@ -393,5 +382,4 @@ jobs:
     with:
       platform: windows-x64
       bootjdk-platform: windows-x64
-      runs-on: windows-2025
-      debug-suffix: -debug
+      runs-on: windows-2019

.github/workflows/test.yml

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

.gitignore

@@ -23,6 +23,4 @@ NashornProfile.txt
 /.gdbinit
 /.lldbinit
 **/core.[0-9]*
-*.rej
-*.orig
 /jbr-api/

.jcheck/conf

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

doc/building.html

@@ -282,34 +282,9 @@ possible, use an SSD. The build process is very disk intensive, and
 having slow disk access will significantly increase build times. If you
 need to use a network share for the source code, see below for
 suggestions on how to keep the build artifacts on a local disk.</p></li>
-<li><p>UTF-8 support is needed to compile the JDK. On Unix systems, this
-typically means that the <code>C.UTF-8</code> or
-<code>en_US.UTF-8</code> locale needs to be available. For Windows
-users, please see the section on <a href="#locale-requirements">Locale
-Requirements</a> below.</p></li>
-<li><p>On Windows, extra care must be taken to have a smooth building
-experience:</p>
-<ul>
-<li><p>Make sure that all relevant paths have short names. Short names
-are used by the build system to create space-free alternative paths.
-Short name creation is enabled per volume. The default setting can be
-checked with the command: <code>fsutil 8dot3name query</code>. If short
-name creation was turned off when a directory was created, it will not
-have a short name. Whether a short name exists can be checked by running
-<code>dir /X</code> in the containing directory (in cmd.exe). If a short
-path is present you should see something like 'ASDF~1' being displayed
-in one of the columns of the ouput. If a directory is missing a short
-name, the safest way to get one is to enable short names for that
-particular volume with
-<code>fsutil 8dot3name set &lt;drive   letter&gt;: 0</code> (note that
-you need to run as administrator for this), and then re-create the
-particular directory. A short name should be generated automatically
-then. Another option is to manually assign a short name to the directory
-using
-<code>fsutil file setShortName &lt;path&gt; &lt;short name&gt;</code>.</p></li>
-<li><p>If using <a href="#cygwin">Cygwin</a>, you must make sure the
-file permissions and attributes between Windows and Cygwin are
-consistent. It is recommended that you follow this procedure:</p>
+<li><p>On Windows, if using <a href="#cygwin">Cygwin</a>, extra care
+must be taken to make sure the environment is consistent. It is
+recommended that you follow this procedure:</p>
 <ul>
 <li><p>Create the directory that is going to contain the top directory
 of the JDK clone by using the <code>mkdir</code> command in the Cygwin
@@ -319,9 +294,6 @@ it's children will inherit those attributes.</p></li>
 <li><p>Do not put the JDK clone in a path under your Cygwin home
 directory. This is especially important if your user name contains
 spaces and/or mixed upper and lower case letters.</p></li>
-</ul>
-<p>Failure to follow these procedures might result in hard-to-debug
-build problems.</p></li>
 <li><p>You need to install a git client. You have two choices, Cygwin
 git or Git for Windows. Unfortunately there are pros and cons with each
 choice.</p>
@@ -339,7 +311,9 @@ It does work well with the Skara CLI tooling, however. To alleviate the
 line ending problems, make sure you set <code>core.autocrlf</code> to
 <code>false</code> (this is asked during installation).</p></li>
 </ul></li>
-</ul></li>
+</ul>
+<p>Failure to follow this procedure might result in hard-to-debug build
+problems.</p></li>
 </ul>
 <h2 id="build-hardware-requirements">Build Hardware Requirements</h2>
 <p>The JDK is a massive project, and require machines ranging from
@@ -402,7 +376,7 @@ to date at the time of writing.</p>
 </tr>
 <tr class="odd">
 <td>macOS</td>
-<td>macOS 14.x</td>
+<td>macOS 13.x (Ventura)</td>
 </tr>
 <tr class="even">
 <td>Windows</td>
@@ -539,8 +513,8 @@ this makes it difficult for a project such as the JDK to keep pace with
 a continuously updated machine running macOS. See the section on <a
 href="#apple-xcode">Apple Xcode</a> on some strategies to deal with
 this.</p>
-<p>It is recommended that you use at least macOS 14 and Xcode 15.4, but
-earlier versions may also work.</p>
+<p>It is recommended that you use at least macOS 13 (Ventura) and Xcode
+14, but earlier versions may also work.</p>
 <p>The standard macOS environment contains the basic tooling needed to
 build, but for external libraries a package manager is recommended. The
 JDK uses <a href="https://brew.sh/">homebrew</a> in the examples, but
@@ -616,11 +590,11 @@ to compile successfully without issues.</p>
 </tr>
 <tr class="even">
 <td>macOS</td>
-<td>Apple Xcode 15.4 (using clang 15.0.0)</td>
+<td>Apple Xcode 14.3.1 (using clang 14.0.3)</td>
 </tr>
 <tr class="odd">
 <td>Windows</td>
-<td>Microsoft Visual Studio 2022 version 17.13.2</td>
+<td>Microsoft Visual Studio 2022 version 17.6.5</td>
 </tr>
 </tbody>
 </table>

doc/building.md

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

doc/hotspot-style.html

@@ -32,12 +32,11 @@
 <ul>
 <li><a href="#introduction" id="toc-introduction">Introduction</a>
 <ul>
-<li><a href="#changing-this-document"
-id="toc-changing-this-document">Changing this Document</a></li>
 <li><a href="#why-care-about-style" id="toc-why-care-about-style">Why
 Care About Style?</a></li>
-<li><a href="#counterexamples"
-id="toc-counterexamples">Counterexamples</a></li>
+<li><a href="#counterexamples-and-updates"
+id="toc-counterexamples-and-updates">Counterexamples and
+Updates</a></li>
 </ul></li>
 <li><a href="#structure-and-formatting"
 id="toc-structure-and-formatting">Structure and Formatting</a>
@@ -100,21 +99,6 @@ writing HotSpot code. Following these will help new code fit in with
 existing HotSpot code, making it easier to read and maintain. Failure to
 follow these guidelines may lead to discussion during code reviews, if
 not outright rejection of a change.</p>
-<h3 id="changing-this-document">Changing this Document</h3>
-<p>Proposed changes should be discussed on the <a
-href="mailto:hotspot-dev@openjdk.org">HotSpot Developers</a> mailing
-list. Changes are likely to be cautious and incremental, since HotSpot
-coders have been using these guidelines for years.</p>
-<p>Substantive changes are approved by <a
-href="https://www.rfc-editor.org/rfc/rfc7282.html">rough consensus</a>
-of the <a href="https://openjdk.org/census#hotspot">HotSpot Group</a>
-Members. The Group Lead determines whether consensus has been
-reached.</p>
-<p>Editorial changes (changes that only affect the description of
-HotSpot style, not its substance) do not require the full consensus
-gathering process. The normal HotSpot pull request process may be used
-for editorial changes, with the additional requirement that the
-requisite reviewers are also HotSpot Group Members.</p>
 <h3 id="why-care-about-style">Why Care About Style?</h3>
 <p>Some programmers seem to have lexers and even C preprocessors
 installed directly behind their eyeballs. The rest of us require code
@@ -140,7 +124,7 @@ conforms locally to its own peculiar conventions, it is not worth
 reformatting the whole thing. Also consider separating changes that make
 extensive stylistic updates from those which make functional
 changes.</p>
-<h3 id="counterexamples">Counterexamples</h3>
+<h3 id="counterexamples-and-updates">Counterexamples and Updates</h3>
 <p>Many of the guidelines mentioned here have (sometimes widespread)
 counterexamples in the HotSpot code base. Finding a counterexample is
 not sufficient justification for new code to follow the counterexample
@@ -153,6 +137,20 @@ bring it up for discussion and possible change. The architectural rule,
 of course, is "When in Rome do as the Romans". Sometimes in the suburbs
 of Rome the rules are a little different; these differences can be
 pointed out here.</p>
+<p>Proposed changes should be discussed on the <a
+href="mailto:hotspot-dev@openjdk.org">HotSpot Developers</a> mailing
+list. Changes are likely to be cautious and incremental, since HotSpot
+coders have been using these guidelines for years.</p>
+<p>Substantive changes are approved by <a
+href="https://www.rfc-editor.org/rfc/rfc7282.html">rough consensus</a>
+of the <a href="https://openjdk.org/census#hotspot">HotSpot Group</a>
+Members. The Group Lead determines whether consensus has been
+reached.</p>
+<p>Editorial changes (changes that only affect the description of
+HotSpot style, not its substance) do not require the full consensus
+gathering process. The normal HotSpot pull request process may be used
+for editorial changes, with the additional requirement that the
+requisite reviewers are also HotSpot Group Members.</p>
 <h2 id="structure-and-formatting">Structure and Formatting</h2>
 <h3 id="factoring-and-class-design">Factoring and Class Design</h3>
 <ul>

doc/hotspot-style.md

@@ -8,24 +8,6 @@ HotSpot code, making it easier to read and maintain.  Failure to
 follow these guidelines may lead to discussion during code reviews, if
 not outright rejection of a change.
 
-### Changing this Document
-
-Proposed changes should be discussed on the
-[HotSpot Developers](mailto:hotspot-dev@openjdk.org) mailing
-list.  Changes are likely to be cautious and incremental, since HotSpot
-coders have been using these guidelines for years.
-
-Substantive changes are approved by
-[rough consensus](https://www.rfc-editor.org/rfc/rfc7282.html) of
-the [HotSpot Group](https://openjdk.org/census#hotspot) Members.
-The Group Lead determines whether consensus has been reached.
-
-Editorial changes (changes that only affect the description of HotSpot
-style, not its substance) do not require the full consensus gathering
-process.  The normal HotSpot pull request process may be used for
-editorial changes, with the additional requirement that the requisite
-reviewers are also HotSpot Group Members.
-
 ### Why Care About Style?
 
 Some programmers seem to have lexers and even C preprocessors
@@ -56,7 +38,7 @@ reformatting the whole thing.  Also consider separating changes that
 make extensive stylistic updates from those which make functional
 changes.
 
-### Counterexamples
+### Counterexamples and Updates
 
 Many of the guidelines mentioned here have (sometimes widespread)
 counterexamples in the HotSpot code base. Finding a counterexample is
@@ -72,6 +54,22 @@ rule, of course, is "When in Rome do as the Romans". Sometimes in the
 suburbs of Rome the rules are a little different; these differences
 can be pointed out here.
 
+Proposed changes should be discussed on the
+[HotSpot Developers](mailto:hotspot-dev@openjdk.org) mailing
+list.  Changes are likely to be cautious and incremental, since HotSpot
+coders have been using these guidelines for years.
+
+Substantive changes are approved by
+[rough consensus](https://www.rfc-editor.org/rfc/rfc7282.html) of
+the [HotSpot Group](https://openjdk.org/census#hotspot) Members.
+The Group Lead determines whether consensus has been reached.
+
+Editorial changes (changes that only affect the description of HotSpot
+style, not its substance) do not require the full consensus gathering
+process.  The normal HotSpot pull request process may be used for
+editorial changes, with the additional requirement that the requisite
+reviewers are also HotSpot Group Members.
+
 ## Structure and Formatting
 
 ### Factoring and Class Design

doc/hotspot-unit-tests.html

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

doc/starting-next-release.html

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

doc/starting-next-release.md

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

doc/testing.html

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

doc/testing.md

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

jb/project/tools/common/modules.list

@@ -35,6 +35,7 @@ jdk.javadoc,
 jdk.jdi,
 jdk.jdwp.agent,
 jdk.jfr,
+jdk.jsobject,
 jdk.localedata,
 jdk.management,
 jdk.management.agent,

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

@@ -40,6 +40,7 @@ architecture=${3:-x64} # aarch64 or x64
 
 check_bundle_type_maketest
 
+tag_prefix="jdk-"
 VERSION_FEATURE=$(getVersionProp "DEFAULT_VERSION_FEATURE")
 VERSION_INTERIM=$(getVersionProp "DEFAULT_VERSION_INTERIM")
 VERSION_UPDATE=$(getVersionProp "DEFAULT_VERSION_UPDATE")
@@ -47,9 +48,8 @@ VERSION_PATCH=$(getVersionProp "DEFAULT_VERSION_PATCH")
 [[ $VERSION_UPDATE = 0 ]] && JBSDK_VERSION="$VERSION_FEATURE" || JBSDK_VERSION="${VERSION_FEATURE}.${VERSION_INTERIM}.${VERSION_UPDATE}"
 [[ $VERSION_PATCH = 0 ]] || JBSDK_VERSION="${VERSION_FEATURE}.${VERSION_INTERIM}.${VERSION_UPDATE}.${VERSION_PATCH}"
 echo "##teamcity[setParameter name='env.JBSDK_VERSION' value='${JBSDK_VERSION}']"
-tag_prefix="jbr-"
-OPENJDK_TAG=$(git log --simplify-by-decoration --decorate=short --pretty=short | grep "${tag_prefix}${JBSDK_VERSION}" | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -V -f | tail -n 1 | tr -d ",")
-JDK_BUILD_NUMBER=$(echo $OPENJDK_TAG | awk -F "-|[+]" '{print $3}')
+OPENJDK_TAG=$(git tag -l | grep "$tag_prefix$JBSDK_VERSION" | grep -v ga | sort -t "-" -k 2 -g | tail -n 1)
+JDK_BUILD_NUMBER=${JDK_BUILD_NUMBER:=$(echo $OPENJDK_TAG | awk -F "-|[+]" '{print $3}')}
 [ -z $JDK_BUILD_NUMBER ] && JDK_BUILD_NUMBER=1
 re='^[0-9]+$'
 if ! [[ $JDK_BUILD_NUMBER =~ $re ]] ; then
@@ -132,20 +132,6 @@ function zip_native_debug_symbols() {
     tar --no-recursion --null -T - -czf ../"$jbr_diz_name".tar.gz) || do_exit $?
 }
 
-function zip_native_debug_symbols_win() {
-  image_bundle_path=$(echo $1 | cut -d"/" -f-4)
-  jdk_name=$(echo $1 | cut -d"/" -f5)
-  jbr_pdb_name=$2
-
-  [ -d "$jbr_pdb_name" ] && rm -rf $jbr_pdb_name
-  mkdir $jbr_pdb_name
-
-  rsync_target="../../../../"$jbr_pdb_name
-  (cd $image_bundle_path && find . -name '*' -exec rsync -R {} $rsync_target \;)
-
-  (/usr/bin/zip -r $jbr_pdb_name.zip $jbr_pdb_name) || do_exit $?
-}
-
 function do_exit() {
   exit_code=$1
   [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java

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

@@ -27,12 +27,6 @@ JCEF_PATH=${JCEF_PATH:=./jcef_linux_aarch64}
 function do_configure {
 
   GTK_SHELL_PATH=/gtk-shell.xml
-  WAYLAND_PROTOCOLS_PATH=/opt/wayland-protocols
-  WITH_WAYLAND_PROTOCOLS=
-
-  if [ -e "$WAYLAND_PROTOCOLS_PATH" ]; then
-    WITH_WAYLAND_PROTOCOLS="--with-wayland-protocols=$WAYLAND_PROTOCOLS_PATH"
-  fi
 
   if [ ! -e $GTK_SHELL_PATH ]; then
     echo $GTK_SHELL_PATH" does not exist"
@@ -60,7 +54,6 @@ function do_configure {
     $REPRODUCIBLE_BUILD_OPTS \
     $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
     $WITH_BUNDLED_FREETYPE \
-    $WITH_WAYLAND_PROTOCOLS \
     || do_exit $?
 }
 
@@ -102,7 +95,7 @@ function create_image_bundle {
     mv release "$IMAGES_DIR"/"$__root_dir"/release
     cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
     copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
-    zip_native_debug_symbols $IMAGES_DIR/symbols "${JBR}_diz"
+    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
   fi
 
   # jmod does not preserve file permissions (JDK-8173610)

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

@@ -34,12 +34,6 @@ function do_configure {
   fi
 
   GTK_SHELL_PATH=/gtk-shell.xml
-  WAYLAND_PROTOCOLS_PATH=/opt/wayland-protocols
-  WITH_WAYLAND_PROTOCOLS=
-
-  if [ -e "$WAYLAND_PROTOCOLS_PATH" ]; then
-    WITH_WAYLAND_PROTOCOLS="--with-wayland-protocols=$WAYLAND_PROTOCOLS_PATH"
-  fi
 
   if [ ! -e $GTK_SHELL_PATH ]; then
     echo $GTK_SHELL_PATH" does not exist"
@@ -50,11 +44,6 @@ function do_configure {
     fi
   fi
 
-  if [ -n "${JCEF_BUILD_LEGACY:-}" ]; then
-    WITH_VULKAN=""
-  else
-    WITH_VULKAN="--with-vulkan"
-  fi
 
   sh configure \
     $WITH_DEBUG_LEVEL \
@@ -67,14 +56,13 @@ function do_configure {
     --with-boot-jdk="$BOOT_JDK" \
     --enable-cds=yes \
     --with-gtk-shell1-protocol=$GTK_SHELL_PATH \
-    $WITH_VULKAN \
+    --with-vulkan \
     $LINUX_TARGET \
     $DISABLE_WARNINGS_AS_ERRORS \
     $STATIC_CONF_ARGS \
     $REPRODUCIBLE_BUILD_OPTS \
     $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
     $WITH_BUNDLED_FREETYPE \
-    $WITH_WAYLAND_PROTOCOLS \
     || do_exit $?
 }
 
@@ -122,14 +110,12 @@ function create_image_bundle {
     mv release "$IMAGES_DIR"/"$__root_dir"/release
     cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
     copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
-    zip_native_debug_symbols $IMAGES_DIR/symbols "${JBR}_diz"
+    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
   fi
 
   # jmod does not preserve file permissions (JDK-8173610)
   [ -f "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper
-  if [ ! -n "${JCEF_BUILD_LEGACY:-}" ]; then
-    [ -f "$IMAGES_DIR"/"$__root_dir"/lib/cef_server ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/cef_server
-  fi
+  [ -f "$IMAGES_DIR"/"$__root_dir"/lib/cef_server ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/cef_server
 
   echo Creating "$JBR".tar.gz ...
 

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

@@ -69,7 +69,7 @@ function create_image_bundle {
     mv release "$IMAGES_DIR"/"$__root_dir"/release
     cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
     copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
-    zip_native_debug_symbols $IMAGES_DIR/symbols "${JBR}_diz"
+    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
   fi
 
   # jmod does not preserve file permissions (JDK-8173610)

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

@@ -3,7 +3,7 @@
 <plist version="1.0">
     <dict>
         <key>com.apple.security.cs.allow-jit</key>
-        <true/>
+        <false/>
         <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
         <false/>
         <key>com.apple.security.cs.allow-dyld-environment-variables</key>

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

@@ -96,7 +96,7 @@ function create_image_bundle {
     mv release $JRE_CONTENTS/Home/release
     cp $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home/lib/src.zip $JRE_CONTENTS/Home/lib
     copy_jmods "$__modules" "$__modules_path" "$JRE_CONTENTS"/Home/jmods
-    zip_native_debug_symbols $IMAGES_DIR/symbols "${JBR}_diz"
+    zip_native_debug_symbols $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk "${JBR}_diz"
   fi
 
   if [ "$bundle_type" == "jcef" ]; then

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

@@ -60,9 +60,9 @@ fi
 
 log "Signing jmod files"
 JMODS_DIR="$APPLICATION_PATH/Contents/Home/jmods"
-JMOD_EXE="$APPLICATION_PATH/Contents/Home/bin/jmod"
+JMOD_EXE="$BOOT_JDK/bin/jmod"
 if [ -d "$JMODS_DIR" ]; then
-  log "processing jmods"
+  log "processing jmods"  
 
   for jmod_file in "$JMODS_DIR"/*.jmod; do
     log "Processing $jmod_file"

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

@@ -67,7 +67,7 @@ function create_image_bundle {
   __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-aarch64-${fastdebug_infix}b${build_number}
 
   echo Running jlink ...
-  ${BUILD_JDK}/bin/jlink.exe \
+  ${BUILD_JDK}/bin/jlink \
     --module-path $__modules_path --no-man-pages --compress=2 \
     --add-modules $__modules --output $__root_dir || do_exit $?
 
@@ -80,7 +80,6 @@ function create_image_bundle {
       rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
     done
     copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
-    zip_native_debug_symbols_win $IMAGES_DIR/symbols "${__root_dir}_pdb"
   fi
 }
 
@@ -124,7 +123,8 @@ JSDK=$IMAGES_DIR/jdk
 JSDK_MODS_DIR=$IMAGES_DIR/jmods
 JBRSDK_BUNDLE=jbrsdk
 
-if where.exe cygpath; then
+where cygpath
+if [ $? -eq 0 ]; then
   JCEF_PATH="$(cygpath -w $JCEF_PATH | sed 's/\\/\//g')"
 fi
 

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

@@ -60,7 +60,7 @@ function create_image_bundle {
   __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
 
   echo Running jlink ...
-  ${JSDK}/bin/jlink.exe \
+  ${JSDK}/bin/jlink \
     --module-path $__modules_path --no-man-pages --compress=2 \
     $__cds_opt --add-modules $__modules --output $__root_dir || do_exit $?
 
@@ -73,7 +73,6 @@ function create_image_bundle {
       rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
     done
     copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
-    zip_native_debug_symbols_win $IMAGES_DIR/symbols "${__root_dir}_pdb"
   fi
 }
 
@@ -117,7 +116,8 @@ JSDK=$IMAGES_DIR/jdk
 JSDK_MODS_DIR=$IMAGES_DIR/jmods
 JBRSDK_BUNDLE=jbrsdk
 
-if where.exe cygpath; then
+where cygpath
+if [ $? -eq 0 ]; then
   JCEF_PATH="$(cygpath -w $JCEF_PATH | sed 's/\\/\//g')"
 fi
 

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

@@ -56,7 +56,7 @@ function create_image_bundle {
   __root_dir=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
 
   echo Running jlink ...
-  ${JSDK}/bin/jlink.exe \
+  ${JSDK}/bin/jlink \
     --module-path $__modules_path --no-man-pages --compress=2 \
     $__cds_opt --add-modules $__modules --output $__root_dir || do_exit $?
 
@@ -69,7 +69,6 @@ function create_image_bundle {
       rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
     done
     copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
-    zip_native_debug_symbols_win $IMAGES_DIR/symbols "${__root_dir}_pdb"
   fi
 }
 

make/Bundles.gmk

@@ -174,11 +174,9 @@ else
   JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR)
   JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER)
   JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)
-  STATIC_JDK_BUNDLE_SUBDIR := static-jdk-$(VERSION_NUMBER)
   ifneq ($(DEBUG_LEVEL), release)
     JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
     JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
-    STATIC_JDK_BUNDLE_SUBDIR := $(STATIC_JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
   endif
   # In certain situations, the JDK_IMAGE_DIR points to an image without the
   # the symbols and demos. If so, the symobls and demos can be found in a
@@ -502,21 +500,6 @@ ifneq ($(filter static-libs-graal-bundles, $(MAKECMDGOALS)), )
   STATIC_LIBS_GRAAL_TARGETS += $(BUILD_STATIC_LIBS_GRAAL_BUNDLE)
 endif
 
-#################################################################################
-
-ifneq ($(filter static-jdk-bundles, $(MAKECMDGOALS)), )
-  STATIC_JDK_BUNDLE_FILES := $(call FindFiles, $(STATIC_JDK_IMAGE_DIR))
-
-  $(eval $(call SetupBundleFile, BUILD_STATIC_JDK_BUNDLE, \
-      BUNDLE_NAME := $(STATIC_JDK_BUNDLE_NAME), \
-      FILES := $(STATIC_JDK_BUNDLE_FILES), \
-      BASE_DIRS := $(STATIC_JDK_IMAGE_DIR), \
-      SUBDIR := $(STATIC_JDK_BUNDLE_SUBDIR), \
-  ))
-
-  STATIC_JDK_TARGETS += $(BUILD_STATIC_JDK_BUNDLE)
-endif
-
 ################################################################################
 
 product-bundles: $(PRODUCT_TARGETS)
@@ -527,12 +510,11 @@ docs-javase-bundles: $(DOCS_JAVASE_TARGETS)
 docs-reference-bundles: $(DOCS_REFERENCE_TARGETS)
 static-libs-bundles: $(STATIC_LIBS_TARGETS)
 static-libs-graal-bundles: $(STATIC_LIBS_GRAAL_TARGETS)
-static-jdk-bundles: $(STATIC_JDK_TARGETS)
 jcov-bundles: $(JCOV_TARGETS)
 
 .PHONY: product-bundles test-bundles \
     docs-jdk-bundles docs-javase-bundles docs-reference-bundles \
-    static-libs-bundles static-libs-graal-bundles static-jdk-bundles jcov-bundles
+    static-libs-bundles static-libs-graal-bundles jcov-bundles
 
 ################################################################################
 

make/CompileInterimLangtools.gmk

@@ -95,16 +95,14 @@ define SetupInterimModule
       SRC := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim \
           $$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$1) \
           $(TOPDIR)/src/$1/share/classes, \
-      EXCLUDES := sun, \
+      EXCLUDES := sun javax/tools/snippet-files, \
       EXCLUDE_FILES := $(TOPDIR)/src/$1/share/classes/module-info.java \
           $(TOPDIR)/src/$1/share/classes/javax/tools/ToolProvider.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/Main.java \
-          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryClassLoader.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryContext.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryModuleFinder.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java \
           Standard.java, \
-      EXCLUDE_PATTERNS := -files, \
       EXTRA_FILES := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim/module-info.java \
           $($1.interim_EXTRA_FILES), \
       COPY := .gif .png .xml .css .svg .js .js.template .txt .woff .woff2 javax.tools.JavaCompilerTool, \

make/CompileJavaModules.gmk

@@ -114,7 +114,6 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
     DISABLED_WARNINGS := $(DISABLED_WARNINGS_java), \
     EXCLUDES := $(EXCLUDES), \
     EXCLUDE_FILES := $(EXCLUDE_FILES), \
-    EXCLUDE_PATTERNS := -files, \
     KEEP_ALL_TRANSLATIONS := $(KEEP_ALL_TRANSLATIONS), \
     JAVAC_FLAGS := \
         $(DOCLINT) \

make/Coverage.gmk

@@ -34,28 +34,21 @@ else
   JCOV_INPUT_IMAGE_DIR := $(JDK_IMAGE_DIR)
 endif
 
-JCOV_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/jcov
-
 #moving instrumented jdk image in and out of jcov_temp because of CODETOOLS-7902299
-JCOV_TEMP := $(JCOV_SUPPORT_DIR)/temp
-
-ifneq ($(JCOV_MODULES), )
-  JCOV_MODULES_FILTER := $(foreach m, $(JCOV_MODULES), -include_module $m)
-endif
+JCOV_TEMP := $(SUPPORT_OUTPUTDIR)/jcov_temp
 
 $(JCOV_IMAGE_DIR)/release: $(JCOV_INPUT_IMAGE_DIR)/release
 	$(call LogWarn, Creating instrumented jdk image with JCov)
 	$(call MakeDir, $(JCOV_TEMP) $(IMAGES_OUTPUTDIR))
 	$(RM) -r $(JCOV_IMAGE_DIR) $(JCOV_TEMP)/*
 	$(CP) -r $(JCOV_INPUT_IMAGE_DIR) $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)
-	$(call ExecuteWithLog, $(JCOV_SUPPORT_DIR)/run-jcov, \
-	    $(JAVA) -Xmx3g -jar $(JCOV_HOME)/lib/jcov.jar JREInstr \
+	$(JAVA) -Xmx3g -jar $(JCOV_HOME)/lib/jcov.jar JREInstr \
 	    -t $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)/template.xml \
 	    -rt $(JCOV_HOME)/lib/jcov_network_saver.jar \
 	    -exclude 'java.lang.Object' \
 	    -exclude jdk.test.Main -exclude '**\$Proxy*' \
-	    $(JCOV_MODULES_FILTER) $(JCOV_FILTERS) \
-	    $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR))
+	    $(JCOV_FILTERS) \
+	    $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR)
 	$(MV) $(JCOV_TEMP)/$(JCOV_IMAGE_SUBDIR) $(JCOV_IMAGE_DIR)
 	$(RMDIR) $(JCOV_TEMP)
 

make/Docs.gmk

@@ -79,6 +79,8 @@ JAVADOC_TAGS := \
     -tag see \
     -taglet build.tools.taglet.ExtLink \
     -taglet build.tools.taglet.Incubating \
+    -taglet build.tools.taglet.PreviewNote \
+    --preview-note-tag previewNote \
     -tagletpath $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     $(CUSTOM_JAVADOC_TAGS) \
     #
@@ -94,14 +96,14 @@ JAVADOC_DISABLED_DOCLINT_PACKAGES := org.w3c.* javax.smartcardio
 
 # The initial set of options for javadoc
 JAVADOC_OPTIONS := -use -keywords -notimestamp \
-    -serialwarn -encoding utf-8 -docencoding utf-8 -breakiterator \
+    -serialwarn -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
     -splitIndex --system none -javafx --expand-requires transitive \
     --override-methods=summary
 
 # The reference options must stay stable to allow for comparisons across the
 # development cycle.
 REFERENCE_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
-    -serialwarn -encoding utf-8 -breakiterator -splitIndex --system none \
+    -serialwarn -encoding ISO-8859-1 -breakiterator -splitIndex --system none \
     -html5 -javafx --expand-requires transitive
 
 # Should we add DRAFT stamps to the generated javadoc?
@@ -260,7 +262,7 @@ define create_overview_file
   $$($1_OVERVIEW): $$($1_OVERVIEW_VARDEPS_FILE)
 	$$(call LogInfo, Creating overview.html for $1)
 	$$(call MakeDir, $$(@D))
-	$$(PRINTF) "%s" '$$($1_OVERVIEW_TEXT)' > $$@
+	$$(ECHO) -n '$$($1_OVERVIEW_TEXT)' > $$@
 endef
 
 ################################################################################
@@ -540,9 +542,7 @@ $(eval $(call SetupApiDocsGeneration, REFERENCE_API, \
 # Format: space-delimited list of names, including at most one '%' as a
 # wildcard. Spec source files match if their filename or any enclosing folder
 # name matches one of the items in SPEC_FILTER.
-ifeq ($(SPEC_FILTER), )
-  SPEC_FILTER := %
-endif
+SPEC_FILTER := %
 
 ApplySpecFilter = \
     $(strip $(foreach file, $(1), \

make/GenerateLinkOptData.gmk

@@ -76,14 +76,10 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	$(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \
 	    $(CLASSLIST_FILE_VM_OPTS) \
-	    -Xlog:aot=off \
-	    -Xlog:cds=off \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
-	    build.tools.classlist.HelloClasslist jdk/src/classes/build/tools/classlist/clear.classlist $(LOG_DEBUG)
+	    build.tools.classlist.HelloClasslist $(LOG_DEBUG)
 	$(GREP) -v HelloClasslist $@.raw > $@.interim
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -Xshare:dump \
-	    -Xlog:aot=off \
-	    -Xlog:cds=off \
 	    -XX:SharedClassListFile=$@.interim -XX:SharedArchiveFile=$@.jsa \
 	    -Xmx128M -Xms128M $(LOG_INFO)
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw.2 \
@@ -91,10 +87,8 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	    -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
 	    $(CLASSLIST_FILE_VM_OPTS) \
 	    --module-path $(SUPPORT_OUTPUTDIR)/classlist.jar \
-	    -Xlog:aot=off \
-	    -Xlog:cds=off \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
-	    build.tools.classlist.HelloClasslist jdk/src/classes/build/tools/classlist/clear.classlist \
+	    build.tools.classlist.HelloClasslist \
 	    2> $(LINK_OPT_DIR)/stderr > $(JLI_TRACE_FILE) \
 	    || ( \
 	        exitcode=$$? ; \
@@ -106,8 +100,6 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	$(GREP) -v HelloClasslist $@.raw.2 > $@.raw.3
 	$(GREP) -v @cp $@.raw.3 > $@.raw.4
 	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java \
-	    -Xlog:aot=off \
-	    -Xlog:cds=off \
 	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
 	    build.tools.classlist.SortClasslist $@.raw.4 > $@
 

make/Images.gmk

@@ -162,7 +162,7 @@ define CreateCDSArchive
   endif
 
   ifeq ($(DEBUG_CDS_ARCHIVE), true)
-    $1_$2_CDS_DUMP_FLAGS += -Xlog:aot+map*=trace:file=$$(JDK_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE).cdsmap:none:filesize=0
+    $1_$2_CDS_DUMP_FLAGS += -Xlog:cds+map*=trace:file=$$(JDK_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE).cdsmap:none:filesize=0
   endif
 
   $$(eval $$(call SetupExecute, $1_$2_gen_cds_archive_jdk, \

make/Init.gmk

@@ -37,6 +37,10 @@ include MakeFileStart.gmk
 include $(TOPDIR)/make/InitSupport.gmk
 include LogUtils.gmk
 
+# Force early generation of module-deps.gmk
+GENERATE_MODULE_DEPS_FILE := true
+include Modules.gmk
+
 # Inclusion of this pseudo-target will cause make to execute this file
 # serially, regardless of -j.
 .NOTPARALLEL:
@@ -110,18 +114,7 @@ reconfigure:
 	    CUSTOM_CONFIG_DIR="$(CUSTOM_CONFIG_DIR)" \
 	    $(RECONFIGURE_COMMAND) )
 
-# Create files that are needed to run most targets in Main.gmk
-create-make-helpers:
-	( cd $(TOPDIR) && \
-	    $(MAKE) $(MAKE_ARGS) -j 1 -f make/GenerateFindTests.gmk \
-	    $(USER_MAKE_VARS) )
-	( cd $(TOPDIR) && \
-	    $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
-	    UPDATE_MODULE_DEPS=true NO_RECIPES=true \
-	    create-main-targets-include )
-
-.PHONY: print-modules print-targets print-tests print-configuration \
-    reconfigure create-make-helpers
+.PHONY: print-modules print-targets print-tests print-configuration reconfigure
 
 ##############################################################################
 # The main target. This will delegate all other targets into Main.gmk.
@@ -141,7 +134,7 @@ TARGET_DESCRIPTION := target$(if $(word 2, $(MAIN_TARGETS)),s) \
 # variables are explicitly propagated using $(USER_MAKE_VARS).
 main: MAKEOVERRIDES :=
 
-main: $(INIT_TARGETS) create-make-helpers
+main: $(INIT_TARGETS)
         ifneq ($(SEQUENTIAL_TARGETS)$(PARALLEL_TARGETS), )
 	  $(call RotateLogFiles)
 	  $(ECHO) "Building $(TARGET_DESCRIPTION)" $(BUILD_LOG_PIPE_SIMPLE)
@@ -151,9 +144,6 @@ main: $(INIT_TARGETS) create-make-helpers
 	    ( cd $(TOPDIR) && \
 	        $(MAKE) $(MAKE_ARGS) -j 1 -f make/Main.gmk $(USER_MAKE_VARS) \
 	        $(SEQUENTIAL_TARGETS) )
-            # We might have cleaned away essential files, recreate them.
-	    ( cd $(TOPDIR) && \
-	        $(MAKE) $(MAKE_ARGS) -j 1 -f make/Init.gmk create-make-helpers )
           endif
           ifneq ($(PARALLEL_TARGETS), )
 	    $(call PrepareFailureLogs)

make/JBRApi.gmk

@@ -40,13 +40,13 @@ else ifeq ($(call isBuildOsEnv, windows.wsl1 windows.wsl2), true)
 else
     M2_REPO := $(HOME)/.m2/repository
 endif
-M2_ARTIFACT := $(M2_REPO)/org/jetbrains/runtime/jbr-api/SNAPSHOT
+M2_ARTIFACT := $(M2_REPO)/com/jetbrains/jbr-api/SNAPSHOT
 M2_POM_CONTENT := \
     <?xml version="1.0" encoding="UTF-8"?> \
     <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" \
         xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> \
       <modelVersion>4.0.0</modelVersion> \
-      <groupId>org.jetbrains.runtime</groupId> \
+      <groupId>com.jetbrains</groupId> \
       <artifactId>jbr-api</artifactId> \
       <version>SNAPSHOT</version> \
     </project> \
@@ -63,10 +63,9 @@ jbr-api:
 	$(BASH) "$(JBR_API_DIR)/tools/build.sh" dev "$(BOOT_JDK)"
 	if [ -d "$(M2_REPO)" ]; then \
 	    $(MKDIR) -p $(M2_ARTIFACT); \
-	    $(ECHO) '$(M2_POM_CONTENT)' > $(M2_ARTIFACT)/$(ARTIFACT_NAME).pom; \
+	    $(ECHO) "$(M2_POM_CONTENT)" > $(M2_ARTIFACT)/$(ARTIFACT_NAME).pom; \
 	    $(CP) "$(JBR_API_DIR)/out/$(ARTIFACT_NAME).jar" "$(M2_ARTIFACT)"; \
-	    $(ECHO) "Installed into local Maven repository as org.jetbrains.runtime:jbr-api:SNAPSHOT"; \
-	    cd "$(M2_ARTIFACT)" && sha256sum --binary "$(ARTIFACT_NAME).jar"; \
+	    $(ECHO) "Installed into local Maven repository as com.jetbrains:jbr-api:SNAPSHOT"; \
 	else \
 	    $(ECHO) "No Maven repository found at $(M2_REPO) - skipping local installation"; \
 	fi

make/Main.gmk

@@ -42,12 +42,6 @@ include MakeFileStart.gmk
 include $(TOPDIR)/make/MainSupport.gmk
 
 include FindTests.gmk
-
-ifeq ($(UPDATE_MODULE_DEPS), true)
-  # Update module-deps.gmk if requested. This is read in Modules.gmk.
-  GENERATE_MODULE_DEPS_FILE := true
-endif
-
 include Modules.gmk
 
 # Are we requested to ignore dependencies?
@@ -417,14 +411,12 @@ $(eval $(call SetupTarget, create-source-revision-tracker, \
 ))
 
 BOOTCYCLE_TARGET := product-images
-BOOTCYCLE_SPEC := $(dir $(SPEC))bootcycle-spec.gmk
-
 bootcycle-images:
         ifneq ($(COMPILE_TYPE), cross)
 	  $(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
 	  $(call MakeDir, $(OUTPUTDIR)/bootcycle-build)
 	  +$(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
-	      LOG_PREFIX="[bootcycle] " JOBS= SPEC=$(BOOTCYCLE_SPEC) main
+	      LOG_PREFIX="[bootcycle] " JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
         else
 	  $(call LogWarn, Boot cycle build disabled when cross compiling)
         endif
@@ -883,12 +875,6 @@ $(eval $(call SetupTarget, static-libs-graal-bundles, \
     DEPS := static-libs-graal-image, \
 ))
 
-$(eval $(call SetupTarget, static-jdk-bundles, \
-    MAKEFILE := Bundles, \
-    TARGET := static-jdk-bundles, \
-    DEPS := static-jdk-image, \
-))
-
 ifeq ($(JCOV_ENABLED), true)
   $(eval $(call SetupTarget, jcov-bundles, \
       MAKEFILE := Bundles, \

make/MainSupport.gmk

@@ -57,7 +57,7 @@ define SetupTargetBody
 endef
 
 define CleanDocs
-	@$(PRINTF) "Cleaning docs ..."
+	@$(ECHO) -n "Cleaning docs ..."
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/docs
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/javadoc
@@ -67,28 +67,28 @@ endef
 
 # Cleans the dir given as $1
 define CleanDir
-	@$(PRINTF) "Cleaning %s build artifacts ..." "$(strip $1)"
+	@$(ECHO) -n "Cleaning $(strip $1) build artifacts ..."
 	@$(ECHO) "" $(LOG_DEBUG)
 	($(CD) $(OUTPUTDIR) && $(RM) -r $1)
 	@$(ECHO) " done"
 endef
 
 define CleanSupportDir
-	@$(PRINTF) "Cleaning %s build artifacts ..." "$(strip $1)"
+	@$(ECHO) -n "Cleaning$(strip $1) build artifacts ..."
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/$(strip $1)
 	@$(ECHO) " done"
 endef
 
 define CleanMakeSupportDir
-	@$(PRINTF) "Cleaning %s make support artifacts ..." "$(strip $1)"
+	@$(ECHO) -n "Cleaning $(strip $1) make support artifacts ..."
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(MAKESUPPORT_OUTPUTDIR)/$(strip $1)
 	@$(ECHO) " done"
 endef
 
 define CleanTest
-	@$(PRINTF) "Cleaning test %s ..." "$(strip $1)"
+	@$(ECHO) -n "Cleaning test $(strip $1) ..."
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/test/$(strip $(subst -,/,$1))
         # Remove as much of the test directory structure as is empty
@@ -97,25 +97,25 @@ define CleanTest
 endef
 
 define Clean-gensrc
-	@$(PRINTF) "Cleaning gensrc %s..." "$(if $1,for $(strip $1) )"
+	@$(ECHO) -n "Cleaning gensrc $(if $1,for $(strip $1) )..."
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/gensrc/$(strip $1)
 	@$(ECHO) " done"
 endef
 
 define Clean-java
-	@$(PRINTF) "Cleaning java %s..." "$(if $1,for $(strip $1) )"
+	@$(ECHO) -n "Cleaning java $(if $1,for $(strip $1) )..."
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(JDK_OUTPUTDIR)/modules/$(strip $1)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/special_classes/$(strip $1)
 	$(ECHO) " done"
-	$(PRINTF) "Cleaning headers %s..." "$(if $1,for $(strip $1) )"
+	$(ECHO) -n "Cleaning headers $(if $1,for $(strip $1) )..."
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/headers/$(strip $1)
 	@$(ECHO) " done"
 endef
 
 define Clean-native
-	@$(PRINTF) "Cleaning native %s..." "$(if $1,for $(strip $1) )"
+	@$(ECHO) -n "Cleaning native $(if $1,for $(strip $1) )..."
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/native/$(strip $1)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
@@ -124,7 +124,7 @@ define Clean-native
 endef
 
 define Clean-include
-	@$(PRINTF) "Cleaning include %s..." "$(if $1,for $(strip $1) )"
+	@$(ECHO) -n "Cleaning include $(if $1,for $(strip $1) )..."
 	@$(ECHO) "" $(LOG_DEBUG)
 	$(RM) -r $(SUPPORT_OUTPUTDIR)/modules_include/$(strip $1)
 	@$(ECHO) " done"

make/PreInit.gmk

@@ -50,8 +50,7 @@ include $(TOPDIR)/make/Global.gmk
 
 # Targets provided by Init.gmk.
 ALL_INIT_TARGETS := print-modules print-targets print-configuration \
-    print-tests reconfigure pre-compare-build post-compare-build \
-    create-make-helpers
+    print-tests reconfigure pre-compare-build post-compare-build
 
 # CALLED_TARGETS is the list of targets that the user provided,
 # or "default" if unspecified.
@@ -162,19 +161,19 @@ ifneq ($(SKIP_SPEC), true)
 	  ( cd $(TOPDIR) && \
 	  $(foreach spec, $(SPECS), \
 	    $(MAKE) $(MAKE_INIT_ARGS) -j 1 -f $(TOPDIR)/make/Init.gmk \
-	        SPEC=$(spec) TOPDIR_ALT=$(TOPDIR) \
-	        $(MAKE_INIT_MAIN_TARGET_ARGS) main && \
+	        SPEC=$(spec) $(MAKE_INIT_MAIN_TARGET_ARGS) \
+	        main && \
 	    $(if $(and $(COMPARE_BUILD), $(PARALLEL_TARGETS)), \
 	      $(MAKE) $(MAKE_INIT_ARGS) -f $(TOPDIR)/make/Init.gmk \
-	          SPEC=$(spec) TOPDIR_ALT=$(TOPDIR) \
+	          SPEC=$(spec) \
 	          COMPARE_BUILD="$(COMPARE_BUILD)" \
 	          pre-compare-build && \
 	      $(MAKE) $(MAKE_INIT_ARGS) -j 1 -f $(TOPDIR)/make/Init.gmk \
-	          SPEC=$(spec) TOPDIR_ALT=$(TOPDIR) \
+	          SPEC=$(spec) $(MAKE_INIT_MAIN_TARGET_ARGS) \
 	          COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" \
-	          $(MAKE_INIT_MAIN_TARGET_ARGS) main && \
+	          main && \
 	      $(MAKE) $(MAKE_INIT_ARGS) -f $(TOPDIR)/make/Init.gmk \
-	          SPEC=$(spec) TOPDIR_ALT=$(TOPDIR) \
+	          SPEC=$(spec) \
 	          COMPARE_BUILD="$(COMPARE_BUILD):NODRYRUN=true" \
 	          post-compare-build && \
 	    ) \

make/PreInitSupport.gmk

@@ -250,14 +250,13 @@ endef
 # Param 1: FORCE = force generation of main-targets.gmk or LAZY = do not force.
 # Param 2: The SPEC file to use.
 define DefineMainTargets
-  SPEC_FILE := $(strip $2)
 
   # We will start by making sure the main-targets.gmk file is removed, if
   # make has not been restarted. By the -include, we will trigger the
   # rule for generating the file (which is never there since we removed it),
   # thus generating it fresh, and make will restart, incrementing the restart
   # count.
-  main_targets_file := $$(dir $$(SPEC_FILE))make-support/main-targets.gmk
+  main_targets_file := $$(dir $(strip $2))make-support/main-targets.gmk
 
   ifeq ($$(MAKE_RESTARTS), )
     # Only do this if make has not been restarted, and if we do not force it.
@@ -268,12 +267,11 @@ define DefineMainTargets
 
   $$(main_targets_file):
 	@( cd $$(TOPDIR) && \
-	$$(MAKE) $$(MAKE_LOG_FLAGS) -s -r -R -f $$(TOPDIR)/make/GenerateFindTests.gmk \
-	    -I $$(TOPDIR)/make/common SPEC=$$(SPEC_FILE) TOPDIR_ALT=$$(TOPDIR))
+	$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(TOPDIR)/make/GenerateFindTests.gmk \
+	    -I $$(TOPDIR)/make/common SPEC=$(strip $2) )
 	@( cd $$(TOPDIR) && \
-	$$(MAKE) $$(MAKE_LOG_FLAGS) -s -r -R -f $$(TOPDIR)/make/Main.gmk \
-	    -I $$(TOPDIR)/make/common SPEC=$$(SPEC_FILE) TOPDIR_ALT=$$(TOPDIR) \
-	    UPDATE_MODULE_DEPS=true NO_RECIPES=true \
+	$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(TOPDIR)/make/Main.gmk \
+	    -I $$(TOPDIR)/make/common SPEC=$(strip $2) NO_RECIPES=true \
 	    $$(MAKE_LOG_VARS) \
 	    create-main-targets-include )
 

make/RunTests.gmk

@@ -115,7 +115,6 @@ JTREG_COV_OPTIONS :=
 
 ifeq ($(TEST_OPTS_JCOV), true)
   JCOV_OUTPUT_DIR := $(TEST_RESULTS_DIR)/jcov-output
-  JCOV_SUPPORT_DIR := $(TEST_SUPPORT_DIR)/jcov-support
   JCOV_GRABBER_LOG := $(JCOV_OUTPUT_DIR)/grabber.log
   JCOV_RESULT_FILE := $(JCOV_OUTPUT_DIR)/result.xml
   JCOV_REPORT := $(JCOV_OUTPUT_DIR)/report
@@ -583,8 +582,6 @@ define SetMicroValue
   else
     ifneq ($3, )
       $1_$2 := $3
-    else
-      $1_$2 :=
     endif
   endif
 endef
@@ -711,8 +708,6 @@ define SetJtregValue
     else
       ifneq ($3, )
         $1_$2 := $3
-      else
-        $1_$2 :=
       endif
     endif
   endif
@@ -725,7 +720,6 @@ endef
 # Parameter 1 is the name of the rule.
 #
 # Remaining parameters are named arguments.
-#   TRAINING    The AOT training mode: onestep or twostep
 #   VM_OPTIONS  List of JVM arguments to use when creating AOT cache
 #
 #  After calling this, the following variables are defined
@@ -754,39 +748,23 @@ define SetupAOTBody
   $$($1_AOT_JDK_CACHE): $$(JDK_IMAGE_DIR)/release
 	$$(call MakeDir, $$($1_AOT_JDK_OUTPUT_DIR))
 
-        ifeq ($$($1_TRAINING), onestep)
+	$$(call LogWarn, AOT: Create cache configuration) \
+	$$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), ( \
+            cd $$($1_AOT_JDK_OUTPUT_DIR); \
+	    $(JAR) --extract --file $(TEST_IMAGE_DIR)/setup_aot/TestSetupAOT.jar; \
+	    $$(FIXPATH) $(JDK_UNDER_TEST)/bin/java $$($1_VM_OPTIONS) \
+	        -Xlog:class+load,cds,cds+class=debug:file=$$($1_AOT_JDK_CONF).log  -Xlog:cds*=error \
+	        -XX:AOTMode=record -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) \
+	        TestSetupAOT $$($1_AOT_JDK_OUTPUT_DIR) > $$($1_AOT_JDK_LOG) \
+	))
 
-	  $$(call LogWarn, AOT: Create AOT cache $$($1_AOT_JDK_CACHE) in one step with flags: $$($1_VM_OPTIONS)) \
-	  $$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), ( \
-	      cd $$($1_AOT_JDK_OUTPUT_DIR); \
-	      $(JAR) --extract --file $(TEST_IMAGE_DIR)/setup_aot/TestSetupAOT.jar; \
-	      $$(FIXPATH) $(JDK_UNDER_TEST)/bin/java $$($1_VM_OPTIONS) \
-	          -Xlog:class+load,aot,aot+class=debug:file=$$($1_AOT_JDK_CACHE).log  -Xlog:cds*=error -Xlog:aot*=error  \
-	          -XX:AOTMode=record -XX:AOTCacheOutput=$$($1_AOT_JDK_CACHE) \
-	          TestSetupAOT $$($1_AOT_JDK_OUTPUT_DIR) > $$($1_AOT_JDK_LOG) \
-	  ))
-
-        else
-
-	  $$(call LogWarn, AOT: Create cache configuration) \
-	  $$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), ( \
-	      cd $$($1_AOT_JDK_OUTPUT_DIR); \
-	      $(JAR) --extract --file $(TEST_IMAGE_DIR)/setup_aot/TestSetupAOT.jar; \
-	      $$(FIXPATH) $(JDK_UNDER_TEST)/bin/java $$($1_VM_OPTIONS) \
-	          -Xlog:class+load,aot,aot+class=debug:file=$$($1_AOT_JDK_CONF).log  -Xlog:cds*=error -Xlog:aot*=error \
-	          -XX:AOTMode=record -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) \
-	          TestSetupAOT $$($1_AOT_JDK_OUTPUT_DIR) > $$($1_AOT_JDK_LOG) \
-	  ))
-
-	  $$(call LogWarn, AOT: Generate AOT cache $$($1_AOT_JDK_CACHE) with flags: $$($1_VM_OPTIONS))
-	  $$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), ( \
-	      $$(FIXPATH) $(JDK_UNDER_TEST)/bin/java \
-	          $$($1_VM_OPTIONS) -Xlog:aot,aot+class=debug:file=$$($1_AOT_JDK_CACHE).log -Xlog:cds*=error -Xlog:aot*=error \
-	          -XX:ExtraSharedClassListFile=$(JDK_UNDER_TEST)/lib/classlist \
-	          -XX:AOTMode=create -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) -XX:AOTCache=$$($1_AOT_JDK_CACHE) \
-	  ))
-
-        endif
+	$$(call LogWarn, AOT: Generate AOT cache $$($1_AOT_JDK_CACHE) with flags: $$($1_VM_OPTIONS))
+	$$(call ExecuteWithLog, $$($1_AOT_JDK_OUTPUT_DIR), ( \
+	    $$(FIXPATH) $(JDK_UNDER_TEST)/bin/java \
+	        $$($1_VM_OPTIONS) -Xlog:cds,cds+class=debug:file=$$($1_AOT_JDK_CACHE).log -Xlog:cds*=error \
+	        -XX:ExtraSharedClassListFile=$(JDK_UNDER_TEST)/lib/classlist \
+	        -XX:AOTMode=create -XX:AOTConfiguration=$$($1_AOT_JDK_CONF) -XX:AOTCache=$$($1_AOT_JDK_CACHE) \
+	))
 
   $1_AOT_TARGETS += $$($1_AOT_JDK_CACHE)
 
@@ -852,7 +830,7 @@ define SetupRunJtregTestBody
   JTREG_RETRY_COUNT ?= 0
   JTREG_REPEAT_COUNT ?= 0
   JTREG_REPORT ?= files
-  JTREG_AOT_JDK ?= none
+  JTREG_AOT_JDK ?= false
 
   ifneq ($$(JTREG_RETRY_COUNT), 0)
     ifneq ($$(JTREG_REPEAT_COUNT), 0)
@@ -862,12 +840,6 @@ define SetupRunJtregTestBody
     endif
   endif
 
-  ifeq ($$(JTREG_RUN_PROBLEM_LISTS), true)
-    JTREG_PROBLEM_LIST_PREFIX := -match:
-  else
-    JTREG_PROBLEM_LIST_PREFIX := -exclude:
-  endif
-
   ifneq ($$(JTREG_TEST_THREAD_FACTORY), )
     $1_JTREG_BASIC_OPTIONS += -testThreadFactoryPath:$$(JTREG_TEST_THREAD_FACTORY_JAR)
     $1_JTREG_BASIC_OPTIONS += -testThreadFactory:$$(JTREG_TEST_THREAD_FACTORY)
@@ -896,7 +868,7 @@ define SetupRunJtregTestBody
   # version of the JDK.
   $1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \
       -verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \
-      -concurrency:$$($1_JTREG_JOBS) \
+      -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR) \
       -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE) \
       -vmoption:-Dtest.boot.jdk="$$(BOOT_JDK)" \
       -vmoption:-Djava.io.tmpdir="$$($1_TEST_TMP_DIR)"
@@ -929,6 +901,12 @@ define SetupRunJtregTestBody
     $1_JTREG_BASIC_OPTIONS += -nativepath:$$($1_JTREG_NATIVEPATH)
   endif
 
+  ifeq ($$(JTREG_RUN_PROBLEM_LISTS), true)
+    JTREG_PROBLEM_LIST_PREFIX := -match:
+  else
+    JTREG_PROBLEM_LIST_PREFIX := -exclude:
+  endif
+
   ifneq ($$($1_JTREG_PROBLEM_LIST), )
     $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$($1_JTREG_PROBLEM_LIST))
   endif
@@ -992,12 +970,12 @@ define SetupRunJtregTestBody
     endif
   endif
 
-  ifneq ($$(filter $$(JTREG_AOT_JDK), onestep twostep), )
+  ifeq ($$(JTREG_AOT_JDK), true)
     $$(call LogWarn, Add AOT target for $1)
-    $$(eval $$(call SetupAOT, $1, \
-        TRAINING := $$(JTREG_AOT_JDK), \
-        VM_OPTIONS := $$(JTREG_ALL_OPTIONS) ))
+    $$(eval $$(call SetupAOT, $1, VM_OPTIONS := $$(JTREG_ALL_OPTIONS) ))
+
     $$(call LogWarn, AOT_JDK_CACHE=$$($1_AOT_JDK_CACHE))
+
     $1_JTREG_BASIC_OPTIONS += -vmoption:-XX:AOTCache="$$($1_AOT_JDK_CACHE)"
   endif
 
@@ -1015,7 +993,6 @@ define SetupRunJtregTestBody
   endif
 
   JTREG_TIMEOUT_FACTOR ?= $$(JTREG_AUTO_TIMEOUT_FACTOR)
-  $1_JTREG_BASIC_OPTIONS += -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR)
 
   clean-outputdirs-$1:
 	$$(call LogWarn, Clean up dirs for $1)
@@ -1366,14 +1343,12 @@ TARGETS += run-all-tests pre-run-test post-run-test run-test-report run-test
 
 ifeq ($(TEST_OPTS_JCOV), true)
 
-  JCOV_VM_OPTS := -Xmx4g -Djdk.xml.totalEntitySizeLimit=0 -Djdk.xml.maxGeneralEntitySizeLimit=0
-
   jcov-do-start-grabber:
 	$(call MakeDir, $(JCOV_OUTPUT_DIR))
 	if $(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -status 1>/dev/null 2>&1 ; then \
 	  $(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -stop -stoptimeout 3600 ; \
 	fi
-	$(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar Grabber -v -t \
+	$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar Grabber -v -t \
 	    $(JCOV_IMAGE_DIR)/template.xml -o $(JCOV_RESULT_FILE) \
 	    1>$(JCOV_GRABBER_LOG) 2>&1 &
 
@@ -1386,10 +1361,6 @@ ifeq ($(TEST_OPTS_JCOV), true)
 	$(JAVA) -jar $(JCOV_HOME)/lib/jcov.jar GrabberManager -stop -stoptimeout 3600
 
   JCOV_REPORT_TITLE := JDK code coverage report<br/>
-  ifneq ($(JCOV_MODULES), )
-    JCOV_MODULES_FILTER := $(foreach m, $(JCOV_MODULES), -include_module $m)
-    JCOV_REPORT_TITLE += Included modules: $(JCOV_MODULES)<br>
-  endif
   ifneq ($(JCOV_FILTERS), )
     JCOV_REPORT_TITLE += Code filters: $(JCOV_FILTERS)<br>
   endif
@@ -1397,12 +1368,11 @@ ifeq ($(TEST_OPTS_JCOV), true)
 
   jcov-gen-report: jcov-stop-grabber
 	$(call LogWarn, Generating JCov report ...)
-	$(call ExecuteWithLog, $(JCOV_SUPPORT_DIR)/run-jcov-repgen, \
-	    $(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \
+	$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar RepGen -sourcepath \
 	    `$(ECHO) $(TOPDIR)/src/*/share/classes/ | $(TR) ' ' ':'` -fmt html \
-	    $(JCOV_MODULES_FILTER) $(JCOV_FILTERS) \
+	    $(JCOV_FILTERS) \
 	    -mainReportTitle "$(JCOV_REPORT_TITLE)" \
-	    -o $(JCOV_REPORT) $(JCOV_RESULT_FILE))
+	    -o $(JCOV_REPORT) $(JCOV_RESULT_FILE)
 
   TARGETS += jcov-do-start-grabber jcov-start-grabber jcov-stop-grabber \
       jcov-gen-report
@@ -1422,7 +1392,7 @@ ifeq ($(TEST_OPTS_JCOV), true)
     jcov-gen-diffcoverage: jcov-stop-grabber
 	$(call LogWarn, Generating diff coverage with changeset $(TEST_OPTS_JCOV_DIFF_CHANGESET) ... )
 	$(DIFF_COMMAND)
-	$(JAVA) $(JCOV_VM_OPTS) -jar $(JCOV_HOME)/lib/jcov.jar \
+	$(JAVA) -Xmx4g -jar $(JCOV_HOME)/lib/jcov.jar \
 	  DiffCoverage -replaceDiff "src/.*/classes/:" -all \
 	    $(JCOV_RESULT_FILE) $(JCOV_SOURCE_DIFF) > \
 	    $(JCOV_DIFF_COVERAGE_REPORT)

make/RunTestsPrebuilt.gmk

@@ -217,9 +217,9 @@ else ifeq ($(OPENJDK_TARGET_OS), macosx)
 else ifeq ($(OPENJDK_TARGET_OS), windows)
   NUM_CORES := $(NUMBER_OF_PROCESSORS)
   MEMORY_SIZE := $(shell \
-      $(EXPR) `powershell -Command \
-          "(Get-CimInstance Win32_ComputerSystem).TotalPhysicalMemory" \
-          | $(SED) 's/\\r//g' ` / 1024 / 1024 \
+      $(EXPR) `wmic computersystem get totalphysicalmemory -value \
+          | $(GREP) = | $(SED) 's/\\r//g' \
+          | $(CUT) -d "=" -f 2-` / 1024 / 1024 \
   )
 endif
 ifeq ($(NUM_CORES), )

make/autoconf/basic.m4

@@ -134,33 +134,17 @@ AC_DEFUN_ONCE([BASIC_SETUP_BUILD_ENV],
   )
   AC_SUBST(BUILD_ENV)
 
-  AC_MSG_CHECKING([for locale to use])
   if test "x$LOCALE" != x; then
     # Check if we actually have C.UTF-8; if so, use it
     if $LOCALE -a | $GREP -q -E "^C\.(utf8|UTF-8)$"; then
       LOCALE_USED=C.UTF-8
-      AC_MSG_RESULT([C.UTF-8 (recommended)])
-    elif $LOCALE -a | $GREP -q -E "^en_US\.(utf8|UTF-8)$"; then
-      LOCALE_USED=en_US.UTF-8
-      AC_MSG_RESULT([en_US.UTF-8 (acceptable fallback)])
     else
-      # As a fallback, check if users locale is UTF-8. USER_LOCALE was saved
-      # by the wrapper configure script before autconf messed up LC_ALL.
-      if $ECHO $USER_LOCALE | $GREP -q -E "\.(utf8|UTF-8)$"; then
-        LOCALE_USED=$USER_LOCALE
-        AC_MSG_RESULT([$USER_LOCALE (untested fallback)])
-        AC_MSG_WARN([Could not find C.UTF-8 or en_US.UTF-8 locale. This is not supported, and the build might fail unexpectedly.])
-      else
-        AC_MSG_RESULT([no UTF-8 locale found])
-        AC_MSG_WARN([No UTF-8 locale found. This is not supported. Proceeding with the C locale, but the build might fail unexpectedly.])
-        LOCALE_USED=C
-      fi
-      AC_MSG_NOTICE([The recommended locale is C.UTF-8, but en_US.UTF-8 is also accepted.])
+      AC_MSG_WARN([C.UTF-8 locale not found, using C locale])
+      LOCALE_USED=C
     fi
   else
-    LOCALE_USED=C.UTF-8
-    AC_MSG_RESULT([C.UTF-8 (default)])
-    AC_MSG_WARN([locale command not not found, using C.UTF-8 locale])
+    AC_MSG_WARN([locale command not not found, using C locale])
+    LOCALE_USED=C
   fi
 
   export LC_ALL=$LOCALE_USED
@@ -415,21 +399,11 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
       [ CONF_NAME=${with_conf_name} ])
 
   # Test from where we are running configure, in or outside of src root.
-  if test "x$OPENJDK_BUILD_OS" = xwindows || test "x$OPENJDK_BUILD_OS" = "xmacosx"; then
-    # These systems have case insensitive paths, so convert them to lower case.
-    [ cmp_configure_start_dir=`$ECHO $CONFIGURE_START_DIR | $TR '[:upper:]' '[:lower:]'` ]
-    [ cmp_topdir=`$ECHO $TOPDIR | $TR '[:upper:]' '[:lower:]'` ]
-    [ cmp_custom_root=`$ECHO $CUSTOM_ROOT | $TR '[:upper:]' '[:lower:]'` ]
-  else
-    cmp_configure_start_dir="$CONFIGURE_START_DIR"
-    cmp_topdir="$TOPDIR"
-    cmp_custom_root="$CUSTOM_ROOT"
-  fi
   AC_MSG_CHECKING([where to store configuration])
-  if test "x$cmp_configure_start_dir" = "x$cmp_topdir" \
-      || test "x$cmp_configure_start_dir" = "x$cmp_custom_root" \
-      || test "x$cmp_configure_start_dir" = "x$cmp_topdir/make/autoconf" \
-      || test "x$cmp_configure_start_dir" = "x$cmp_topdir/make" ; then
+  if test "x$CONFIGURE_START_DIR" = "x$TOPDIR" \
+      || test "x$CONFIGURE_START_DIR" = "x$CUSTOM_ROOT" \
+      || test "x$CONFIGURE_START_DIR" = "x$TOPDIR/make/autoconf" \
+      || test "x$CONFIGURE_START_DIR" = "x$TOPDIR/make" ; then
     # We are running configure from the src root.
     # Create a default ./build/target-variant-debuglevel output root.
     if test "x${CONF_NAME}" = x; then
@@ -450,12 +424,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
     # If configuration is situated in normal build directory, just use the build
     # directory name as configuration name, otherwise use the complete path.
     if test "x${CONF_NAME}" = x; then
-      [ if [[ "$cmp_configure_start_dir" =~ ^${cmp_topdir}/build/[^/]+$ ||
-          "$cmp_configure_start_dir" =~ ^${cmp_custom_root}/build/[^/]+$ ]]; then ]
-          CONF_NAME="${CONFIGURE_START_DIR##*/}"
-      else
-          CONF_NAME="$CONFIGURE_START_DIR"
-      fi
+      CONF_NAME=`$ECHO $CONFIGURE_START_DIR | $SED -e "s!^${TOPDIR}/build/!!"`
     fi
     OUTPUTDIR="$CONFIGURE_START_DIR"
     AC_MSG_RESULT([in current directory])

make/autoconf/basic_windows.m4

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

make/autoconf/boot-jdk.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -180,13 +180,11 @@ AC_DEFUN([BOOTJDK_CHECK_JAVA_HOME],
 # Test: Is there a java or javac in the PATH, which is a symlink to the JDK?
 AC_DEFUN([BOOTJDK_CHECK_JAVA_IN_PATH_IS_SYMLINK],
 [
-  UTIL_LOOKUP_PROGS(JAVAC_CHECK, javac)
-  UTIL_GET_EXECUTABLE(JAVAC_CHECK) # Will setup JAVAC_CHECK_EXECUTABLE
-  UTIL_LOOKUP_PROGS(JAVA_CHECK, java)
-  UTIL_GET_EXECUTABLE(JAVA_CHECK) # Will setup JAVA_CHECK_EXECUTABLE
-  BINARY="$JAVAC_CHECK_EXECUTABLE"
-  if test "x$JAVAC_CHECK_EXECUTABLE" = x; then
-    BINARY="$JAVA_CHECK_EXECUTABLE"
+  UTIL_LOOKUP_PROGS(JAVAC_CHECK, javac, , NOFIXPATH)
+  UTIL_LOOKUP_PROGS(JAVA_CHECK, java, , NOFIXPATH)
+  BINARY="$JAVAC_CHECK"
+  if test "x$JAVAC_CHECK" = x; then
+    BINARY="$JAVA_CHECK"
   fi
   if test "x$BINARY" != x; then
     # So there is a java(c) binary, it might be part of a JDK.

make/autoconf/build-performance.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -75,8 +75,7 @@ AC_DEFUN([BPERF_CHECK_MEMORY_SIZE],
     FOUND_MEM=yes
   elif test "x$OPENJDK_BUILD_OS" = xwindows; then
     # Windows, but without cygwin
-    MEMORY_SIZE=`powershell -Command \
-        "(Get-CimInstance Win32_ComputerSystem).TotalPhysicalMemory" | $SED 's/\\r//g' `
+    MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-`
     MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
     FOUND_MEM=yes
   fi

make/autoconf/configure

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

make/autoconf/flags-cflags.m4

@@ -573,20 +573,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     TOOLCHAIN_CFLAGS_JDK="$TOOLCHAIN_CFLAGS_JDK -fvisibility=hidden -fstack-protector"
 
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -MP"
-    TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -Zc:wchar_t-"
+    # The -utf-8 option sets source and execution character sets to UTF-8 to enable correct
+    # compilation of all source files regardless of the active code page on Windows.
+    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -utf-8 -MP"
+    TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:inline -Zc:throwingNew -permissive- -utf-8 -Zc:wchar_t-"
   fi
 
-  # Set character encoding in source
-  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-    CHARSET_CFLAGS="-finput-charset=utf-8"
-  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    # The -utf-8 option sets both source and execution character sets
-    CHARSET_CFLAGS="-utf-8 -validate-charset"
-  fi
-  TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM $CHARSET_CFLAGS"
-  TOOLCHAIN_CFLAGS_JDK="$TOOLCHAIN_CFLAGS_JDK $CHARSET_CFLAGS"
-
   # CFLAGS C language level for JDK sources (hotspot only uses C++)
   if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
     LANGSTD_CFLAGS="-std=c11"
@@ -732,7 +724,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
       $1_CFLAGS_CPU_JVM="-mno-multiple -mno-string"
       if test "x$FLAGS_CPU" = xppc64; then
         # -mminimal-toc fixes `relocation truncated to fit' error for gcc 4.1.
-        $1_CFLAGS_CPU="-mcpu=power8 -mtune=power8"
+        # Use ppc64 instructions, but schedule for power5
+        $1_CFLAGS_CPU="-mcpu=powerpc64 -mtune=power5"
         $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -mminimal-toc"
       elif test "x$FLAGS_CPU" = xppc64le; then
         # Little endian machine uses ELFv2 ABI.

make/autoconf/help.m4

@@ -292,12 +292,12 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
   $ECHO "* Debug level:    $DEBUG_LEVEL"
   $ECHO "* HS debug level: $HOTSPOT_DEBUG_LEVEL"
   $ECHO "* JVM variants:   $JVM_VARIANTS"
-  $PRINTF "* JVM features:   "
+  $ECHO -n "* JVM features:   "
 
   for variant in $JVM_VARIANTS; do
     features_var_name=JVM_FEATURES_$variant
     JVM_FEATURES_FOR_VARIANT=${!features_var_name}
-    $PRINTF "%s: \'%s\' " "$variant" "$JVM_FEATURES_FOR_VARIANT"
+    $ECHO -n "$variant: '$JVM_FEATURES_FOR_VARIANT' "
   done
   $ECHO ""
 

make/autoconf/jdk-options.m4

@@ -430,19 +430,10 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_CODE_COVERAGE],
       JCOV_FILTERS="$with_jcov_filters"
     fi
   fi
-
-  UTIL_ARG_WITH(NAME: jcov-modules, TYPE: string,
-      DEFAULT: [], RESULT: JCOV_MODULES_COMMMA_SEPARATED,
-      DESC: [which modules to include in jcov (comma-separated)],
-      OPTIONAL: true)
-
-  # Replace ","  with " ".
-  JCOV_MODULES=${JCOV_MODULES_COMMMA_SEPARATED//,/ }
   AC_SUBST(JCOV_ENABLED)
   AC_SUBST(JCOV_HOME)
   AC_SUBST(JCOV_INPUT_JDK)
   AC_SUBST(JCOV_FILTERS)
-  AC_SUBST(JCOV_MODULES)
 ])
 
 ################################################################################
@@ -554,21 +545,8 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER],
   # Silence them for now.
   UBSAN_CHECKS="-fsanitize=undefined -fsanitize=float-divide-by-zero -fno-sanitize=shift-base -fno-sanitize=alignment \
       $ADDITIONAL_UBSAN_CHECKS"
-  UBSAN_CFLAGS="$UBSAN_CHECKS -Wno-array-bounds -fno-omit-frame-pointer -DUNDEFINED_BEHAVIOR_SANITIZER"
-  if test "x$TOOLCHAIN_TYPE" = "xgcc"; then
-    UBSAN_CFLAGS="$UBSAN_CFLAGS -Wno-format-overflow -Wno-stringop-overflow -Wno-stringop-truncation"
-  fi
+  UBSAN_CFLAGS="$UBSAN_CHECKS -Wno-stringop-truncation -Wno-format-overflow -Wno-array-bounds -Wno-stringop-overflow -fno-omit-frame-pointer -DUNDEFINED_BEHAVIOR_SANITIZER"
   UBSAN_LDFLAGS="$UBSAN_CHECKS"
-  # On AIX, the llvm_symbolizer is not found out of the box, so we have to provide the
-  # full qualified llvm_symbolizer path in the __ubsan_default_options() function in
-  # make/data/ubsan/ubsan_default_options.c. To get it there we compile our sources
-  # 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.
-  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"
-  fi
   UTIL_ARG_ENABLE(NAME: ubsan, DEFAULT: false, RESULT: UBSAN_ENABLED,
       DESC: [enable UndefinedBehaviorSanitizer],
       CHECK_AVAILABLE: [

make/autoconf/lib-vulkan.m4

@@ -89,7 +89,7 @@ AC_DEFUN_ONCE([LIB_SETUP_VULKAN],
     if (test "x${with_vulkan_shader_compiler}" = x || test "x${with_vulkan_shader_compiler}" = xglslc); then
       UTIL_LOOKUP_PROGS(GLSLC, glslc)
       SHADER_COMPILER="$GLSLC"
-      VULKAN_SHADER_COMPILER="glslc --target-env=vulkan1.2 -mfmt=num"
+      VULKAN_SHADER_COMPILER="glslc --target-env=vulkan1.2 -mfmt=num -o"
     fi
 
     # Check glslangValidator
@@ -97,8 +97,7 @@ AC_DEFUN_ONCE([LIB_SETUP_VULKAN],
         test "x$SHADER_COMPILER" = x; then
       UTIL_LOOKUP_PROGS(GLSLANG, glslangValidator)
       SHADER_COMPILER="$GLSLANG"
-      # Newer glslangValidator could use -P\"\#extension GL_GOOGLE_include_directive: require\"
-      VULKAN_SHADER_COMPILER="glslangValidator --target-env vulkan1.2 -x"
+      VULKAN_SHADER_COMPILER="glslangValidator --target-env vulkan1.2 -x -o"
     fi
 
     if test "x$SHADER_COMPILER" = x; then

make/autoconf/lib-wayland.m4

@@ -40,23 +40,12 @@ AC_DEFUN_ONCE([LIB_SETUP_WAYLAND],
       [specify the root directory for the wayland protocols xml files])])
   AC_ARG_WITH(gtk-shell1-protocol, [AS_HELP_STRING([--with-gtk-shell1-protocol],
       [specify the path to the gtk-shell1 Wayland protocol xml file])])
-  AC_ARG_WITH(xkbcommon, [AS_HELP_STRING([--with-xkbcommon],
-      [specify prefix directory for the xkbcommon package
-      (expecting the headers under PATH/include)])])
-  AC_ARG_WITH(xkbcommon-include, [AS_HELP_STRING([--with-xkbcommon-include],
-      [specify directory for the xkbcommon include files])])
-  AC_ARG_WITH(xkbcommon-lib, [AS_HELP_STRING([--with-xkbcommon-lib],
-      [specify directory for the xkbcommon library files])])
 
   if test "x$NEEDS_LIB_WAYLAND" = xfalse; then
     if (test "x${with_wayland}" != x && test "x${with_wayland}" != xno) || \
         (test "x${with_wayland_include}" != x && test "x${with_wayland_include}" != xno); then
       AC_MSG_WARN([[wayland not used, so --with-wayland[-*] is ignored]])
     fi
-    if (test "x${with_xkbcommon}" != x && test "x${with_xkbcommon}" != xno) || \
-        (test "x${with_xkbcommon_include}" != x && test "x${with_xkbcommon_include}" != xno); then
-      AC_MSG_WARN([[wayland not used, so --with-xkbcommon[-*] is ignored]])
-    fi
     WAYLAND_CFLAGS=
     WAYLAND_LIBS=
   else
@@ -66,9 +55,6 @@ AC_DEFUN_ONCE([LIB_SETUP_WAYLAND],
     if test "x${with_wayland}" = xno || test "x${with_wayland_include}" = xno; then
       AC_MSG_ERROR([It is not possible to disable the use of wayland. Remove the --without-wayland option.])
     fi
-    if test "x${with_xkbcommon}" = xno || test "x${with_xkbcommon_include}" = xno; then
-      AC_MSG_ERROR([It is not possible to disable the use of xkbcommon. Remove the --without-xkbcommon option.])
-    fi
 
     if test "x${with_wayland}" != x; then
       AC_MSG_CHECKING([for wayland headers])
@@ -135,52 +121,7 @@ AC_DEFUN_ONCE([LIB_SETUP_WAYLAND],
       HELP_MSG_MISSING_DEPENDENCY([wayland])
       AC_MSG_ERROR([Could not find wayland! $HELP_MSG ])
     fi
-
-    XKBCOMMON_FOUND=no
-    XKBCOMMON_INCLUDES=
-    XKBCOMMON_LIBS=-lxkbcommon
-    if test "x${with_xkbcommon}" != x; then
-      AC_MSG_CHECKING([for xkbcommon headers])
-      if test -s "${with_xkbcommon}/include/xkbcommon/xkbcommon.h" &&
-         test -s "${with_xkbcommon}/include/xkbcommon/xkbcommon-compose.h"; then
-        XKBCOMMON_INCLUDES="-I${with_xkbcommon}/include"
-        XKBCOMMON_LIBS="-L${with_xkbcommon}/lib ${XKBCOMMON_LIBS}"
-
-        XKBCOMMON_FOUND=yes
-        AC_MSG_RESULT([$XKBCOMMON_FOUND])
-      else
-        AC_MSG_ERROR([Can't find 'include/xkbcommon/xkbcommon.h' and 'include/xkbcommon/xkbcommon-compose.h' under ${with_xkbcommon} given with the --with-xkbcommon option.])
-      fi
-    fi
-    if test "x${with_xkbcommon_include}" != x; then
-      AC_MSG_CHECKING([for xkbcommon headers])
-      if test -s "${with_xkbcommon_include}/xkbcommon/xkbcommon.h" &&
-         test -s "${with_xkbcommon_include}/xkbcommon/xkbcommon-compose.h"; then
-        XKBCOMMON_INCLUDES="-I${with_xkbcommon_include}"
-        XKBCOMMON_FOUND=yes
-        AC_MSG_RESULT([$XKBCOMMON_FOUND])
-      else
-        AC_MSG_ERROR([Can't find 'include/xkbcommon/xkbcommon.h' and 'include/xkbcommon/xkbcommon-compose.h' under ${with_xkbcommon_include} given with the --with-xkbcommon-include option.])
-      fi
-    fi
-    if test "x${with_xkbcommon_lib}" != x; then
-      XKBCOMMON_LIBS="-L${with_xkbcommon_lib} ${XKBCOMMON_LIBS}"
-    fi
-
-    if test "x${XKBCOMMON_FOUND}" != xyes; then
-      AC_CHECK_HEADERS([xkbcommon/xkbcommon.h xkbcommon/xkbcommon-compose.h],
-          [ XKBCOMMON_FOUND=yes ],
-          [ XKBCOMMON_FOUND=no; break ]
-      )
-    fi
-
-    if test "x$XKBCOMMON_FOUND" != xyes; then
-      HELP_MSG_MISSING_DEPENDENCY([xkbcommon])
-      AC_MSG_ERROR([Could not find xkbcommon! $HELP_MSG ])
-    fi
-
-    WAYLAND_LIBS="${WAYLAND_LIBS} ${XKBCOMMON_LIBS}"
-    WAYLAND_CFLAGS="${WAYLAND_INCLUDES} ${XKBCOMMON_INCLUDES} ${WAYLAND_DEFINES}"
+    WAYLAND_CFLAGS="${WAYLAND_INCLUDES} ${WAYLAND_DEFINES}"
   fi
   AC_SUBST(WAYLAND_CFLAGS)
   AC_SUBST(WAYLAND_LIBS)

make/autoconf/spec.gmk.template

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -454,7 +454,6 @@ JCOV_ENABLED := @JCOV_ENABLED@
 JCOV_HOME := @JCOV_HOME@
 JCOV_INPUT_JDK := @JCOV_INPUT_JDK@
 JCOV_FILTERS := @JCOV_FILTERS@
-JCOV_MODULES := @JCOV_MODULES@
 
 # AddressSanitizer
 ASAN_ENABLED := @ASAN_ENABLED@
@@ -874,12 +873,10 @@ SVE_CFLAGS := @SVE_CFLAGS@
 JDK_IMAGE_SUBDIR := jdk
 JRE_IMAGE_SUBDIR := jre
 JCOV_IMAGE_SUBDIR := jdk-jcov
-STATIC_JDK_IMAGE_SUBDIR := static-jdk
 
 # Colon left out to be able to override output dir for bootcycle-images
 JDK_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR)
 JRE_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR)
-STATIC_JDK_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(STATIC_JDK_IMAGE_SUBDIR)
 JCOV_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(JCOV_IMAGE_SUBDIR)
 
 # Test image, as above
@@ -959,7 +956,6 @@ DOCS_JAVASE_BUNDLE_NAME := javase-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
 DOCS_REFERENCE_BUNDLE_NAME := jdk-reference-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
 STATIC_LIBS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-static-libs$(DEBUG_PART).tar.gz
 STATIC_LIBS_GRAAL_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-static-libs-graal$(DEBUG_PART).tar.gz
-STATIC_JDK_BUNDLE_NAME := static-jdk-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
 JCOV_BUNDLE_NAME := jdk-jcov-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)
 
 JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
@@ -970,7 +966,6 @@ TEST_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
 DOCS_JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_JDK_BUNDLE_NAME)
 DOCS_JAVASE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_JAVASE_BUNDLE_NAME)
 DOCS_REFERENCE_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(DOCS_REFERENCE_BUNDLE_NAME)
-STATIC_JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(STATIC_JDK_BUNDLE_NAME)
 JCOV_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JCOV_BUNDLE_NAME)
 
 # This macro is called to allow inclusion of closed source counterparts.

make/autoconf/util_paths.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -58,32 +58,21 @@ AC_DEFUN([UTIL_PREPEND_TO_PATH],
 # 2) The path will be absolute, and it will be in unix-style (on
 #     cygwin).
 # $1: The name of the variable to fix
-# $2: if NOFAIL, if the path cannot be resolved then errors will not be
-#     reported and an empty path will be set
+# $2: if NOFAIL, errors will be silently ignored
 AC_DEFUN([UTIL_FIXUP_PATH],
 [
   # Only process if variable expands to non-empty
   path="[$]$1"
   if test "x$path" != x; then
     if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
-      imported_path=`$FIXPATH_BASE -q import "$path"`
-      if test $? -ne 0 || test ! -e $imported_path; then
-        if test "x$2" != "xNOFAIL"; then
-          AC_MSG_NOTICE([The path of $1, which is given as "$path", can not be properly resolved.])
-          AC_MSG_NOTICE([Please see the section "Special Considerations" in building.md.])
-          AC_MSG_NOTICE([This is the error message given by fixpath:])
-          # Rerun fixpath without -q to get an error message
-          $FIXPATH_BASE import "$path"
-          AC_MSG_ERROR([Cannot continue])
-        else
-          imported_path=""
-        fi
+      if test "x$2" = "xNOFAIL"; then
+        quiet_option="-q"
       fi
-
-      $FIXPATH_BASE -q verify "$imported_path"
+      imported_path=`$FIXPATH_BASE $quiet_option import "$path"`
+      $FIXPATH_BASE verify "$imported_path"
       if test $? -ne 0; then
         if test "x$2" != "xNOFAIL"; then
-          AC_MSG_ERROR([The path of $1, which resolves as "$path", could not be verified.])
+          AC_MSG_ERROR([The path of $1, which resolves as "$path", could not be imported.])
         else
           imported_path=""
         fi
@@ -94,7 +83,7 @@ AC_DEFUN([UTIL_FIXUP_PATH],
       if test "x$imported_path_lower" != "x$orig_path_lower"; then
         $1="$imported_path"
       fi
-    else # non-Windows
+    else
       [ if [[ "$path" =~ " " ]]; then ]
         if test "x$2" != "xNOFAIL"; then
           AC_MSG_NOTICE([The path of $1, which resolves as "$path", is invalid.])
@@ -197,6 +186,7 @@ AC_DEFUN([UTIL_CHECK_WINENV_EXEC_TYPE],
 # it need to be in the PATH.
 # $1: The name of the variable to fix
 # $2: Where to look for the command (replaces $PATH)
+# $3: set to NOFIXPATH to skip prefixing FIXPATH, even if needed on platform
 AC_DEFUN([UTIL_FIXUP_EXECUTABLE],
 [
   input="[$]$1"
@@ -243,19 +233,15 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE],
       # This is a path with slashes, don't look at $PATH
       if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
         # fixpath.sh import will do all heavy lifting for us
-        new_path=`$FIXPATH_BASE -q import "$path"`
+        new_path=`$FIXPATH_BASE import "$path"`
 
-        if test $? -ne 0 || test ! -e $new_path; then
+        if test ! -e $new_path; then
           # It failed, but maybe spaces were part of the path and not separating
           # the command and argument. Retry using that assumption.
-          new_path=`$FIXPATH_BASE -q import "$input"`
-          if test $? -ne 0 || test ! -e $new_path; then
-            AC_MSG_NOTICE([The command for $1, which is given as "$input", can not be properly resolved.])
-            AC_MSG_NOTICE([Please see the section "Special Considerations" in building.md.])
-            AC_MSG_NOTICE([This is the error message given by fixpath:])
-            # Rerun fixpath without -q to get an error message
-            $FIXPATH_BASE import "$input"
-            AC_MSG_ERROR([Cannot continue])
+          new_path=`$FIXPATH_BASE import "$input"`
+          if test ! -e $new_path; then
+            AC_MSG_NOTICE([The command for $1, which resolves as "$input", can not be found.])
+            AC_MSG_ERROR([Cannot locate $input])
           fi
           # It worked, clear all "arguments"
           arguments=""
@@ -296,6 +282,10 @@ AC_DEFUN([UTIL_FIXUP_EXECUTABLE],
       fi
     fi
 
+    if test "x$3" = xNOFIXPATH; then
+      fixpath_prefix=""
+    fi
+
     # Now join together the path and the arguments once again
     new_complete="$fixpath_prefix$new_path$arguments"
     $1="$new_complete"
@@ -363,15 +353,7 @@ AC_DEFUN([UTIL_SETUP_TOOL],
         else
           # Otherwise we believe it is a complete path. Use it as it is.
           if test ! -x "$tool_command" && test ! -x "${tool_command}.exe"; then
-            # Maybe the path had spaces in it; try again with the entire argument
-            if test ! -x "$tool_override" && test ! -x "${tool_override}.exe"; then
-              AC_MSG_ERROR([User supplied tool $1="$tool_override" does not exist or is not executable])
-            else
-              # We successfully located the executable assuming the spaces were part of the path.
-              # We can't combine using paths with spaces and arguments, so assume tool_args is empty.
-              tool_command="$tool_override"
-              tool_args=""
-            fi
+            AC_MSG_ERROR([User supplied tool $1="$tool_command" does not exist or is not executable])
           fi
           if test ! -x "$tool_command"; then
             tool_command="${tool_command}.exe"
@@ -397,6 +379,7 @@ AC_DEFUN([UTIL_SETUP_TOOL],
 # $1: variable to set
 # $2: executable name (or list of names) to look for
 # $3: [path]
+# $4: set to NOFIXPATH to skip prefixing FIXPATH, even if needed on platform
 AC_DEFUN([UTIL_LOOKUP_PROGS],
 [
   UTIL_SETUP_TOOL($1, [
@@ -438,8 +421,10 @@ AC_DEFUN([UTIL_LOOKUP_PROGS],
 
             # If we have FIXPATH enabled, strip all instances of it and prepend
             # a single one, to avoid double fixpath prefixing.
-            [ if [[ $FIXPATH != "" && $result =~ ^"$FIXPATH " ]]; then ]
-              result="\$FIXPATH ${result#"$FIXPATH "}"
+            if test "x$4" != xNOFIXPATH; then
+              [ if [[ $FIXPATH != "" && $result =~ ^"$FIXPATH " ]]; then ]
+                result="\$FIXPATH ${result#"$FIXPATH "}"
+              fi
             fi
             AC_MSG_RESULT([$result])
             break 2;
@@ -530,24 +515,6 @@ AC_DEFUN([UTIL_ADD_FIXPATH],
   fi
 ])
 
-################################################################################
-# Return a path to the executable binary from a command line, stripping away
-# any FIXPATH prefix or arguments. The resulting value can be checked for
-# existence using "test -e". The result is returned in a variable named
-# "$1_EXECUTABLE".
-#
-# $1: variable describing the command to get the binary for
-AC_DEFUN([UTIL_GET_EXECUTABLE],
-[
-  # Strip the FIXPATH prefix, if any
-  fixpath_stripped="[$]$1"
-  [ if [[ $FIXPATH != "" && $fixpath_stripped =~ ^"$FIXPATH " ]]; then ]
-      fixpath_stripped="${fixpath_stripped#"$FIXPATH "}"
-  fi
-  # Remove any arguments following the binary
-  $1_EXECUTABLE="${fixpath_stripped%% *}"
-])
-
 ################################################################################
 AC_DEFUN([UTIL_REMOVE_SYMBOLIC_LINKS],
 [

make/common/FindTests.gmk

@@ -59,14 +59,14 @@ ifeq ($(GENERATE_FIND_TESTS_FILE), true)
 	$(call MakeTargetDir)
 	( $(foreach root, $(JTREG_TESTROOTS), \
 	    $(ECHO) ""; \
-	    $(PRINTF) "\n%s_JTREG_TEST_GROUPS := " "$(root)"; \
+	    $(ECHO) -n "$(root)_JTREG_TEST_GROUPS := "; \
 	    $(SED) -n -e 's/^\#.*//g' -e 's/\([^ ]*\)\w*=.*/\1/gp' \
 	      $($(root)_JTREG_GROUP_FILES) \
 	      | $(SORT) -u | $(TR) '\n' ' ' ; \
 	  ) \
 	) > $@
 	$(ECHO) "" >> $@
-	$(PRINTF) "MAKE_TEST_TARGETS := " >> $@
+	$(ECHO) -n "MAKE_TEST_TARGETS := " >> $@
 	$(MAKE) -s --no-print-directory $(MAKE_ARGS) \
 	    SPEC=$(SPEC) -f $(TOPDIR)/test/make/TestMake.gmk print-targets \
 	    TARGETS_FILE=$@

make/common/JavaCompilation.gmk

@@ -80,13 +80,15 @@ endef
 #
 # The sed expression does this:
 # 1. Add a backslash before any :, = or ! that do not have a backslash already.
-# 2. Delete all lines starting with #.
-# 3. Delete empty lines.
-# 4. Append lines ending with \ with the next line.
-# 5. Remove leading and trailing white space. Note that tabs must be explicit
+# 2. Apply the file unicode2x.sed which does a whole bunch of \u00XX to \xXX
+#    conversions.
+# 3. Delete all lines starting with #.
+# 4. Delete empty lines.
+# 5. Append lines ending with \ with the next line.
+# 6. Remove leading and trailing white space. Note that tabs must be explicit
 #    as sed on macosx does not understand '\t'.
-# 6. Replace the first \= with just =.
-# 7. Finally it's all sorted to create a stable output.
+# 7. Replace the first \= with just =.
+# 8. Finally it's all sorted to create a stable output.
 #
 # It is assumed that = is the character used for separating names and values.
 define add_file_to_clean
@@ -106,6 +108,7 @@ define add_file_to_clean
 	( $(CAT) $$< && $(ECHO) "" ) \
 	    | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' \
 	        -e 's/\([^\\]\)!/\1\\!/g' -e 's/^[ 	]*#.*/#/g' \
+	    | $(SED) -f "$$(TOPDIR)/make/common/support/unicode2x.sed" \
 	    | $(SED) -e '/^#/d' -e '/^$$$$/d' \
 	        -e :a -e '/\\$$$$/N; s/\\\n//; ta' \
 	        -e 's/^[ 	]*//;s/[ 	]*$$$$//' \
@@ -152,7 +155,6 @@ endef
 #   INCLUDE_FILES "com/sun/SolarisFoobar.java" means only compile this file!
 #   EXCLUDE_FILES "com/sun/SolarisFoobar.java" means do not compile this particular file!
 #       "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
-#   EXCLUDE_PATTERNS Exclude files matching any of these substrings
 #   EXTRA_FILES List of extra source files to include in compilation. Can be used to
 #       specify files that need to be generated by other rules first.
 #   HEADERS path to directory where all generated c-headers are written.
@@ -264,12 +266,10 @@ define SetupJavaCompilationBody
   endif
 
   # Tell javac to do exactly as told and no more
-  PARANOIA_FLAGS := -implicit:none -Xprefer:source -XDignore.symbol.file=true
+  PARANOIA_FLAGS := -implicit:none -Xprefer:source -XDignore.symbol.file=true -encoding ascii
 
   $1_FLAGS += -g -Xlint:all $$($1_TARGET_RELEASE) $$(PARANOIA_FLAGS)
   $1_FLAGS += $$($1_JAVAC_FLAGS)
-  # Set character encoding in source
-  $1_FLAGS += -encoding utf-8
 
   ifeq ($$(JAVA_WARNINGS_AS_ERRORS), true)
     $1_FLAGS += -Werror
@@ -343,20 +343,6 @@ define SetupJavaCompilationBody
     $1_INCLUDE_PATTERN += $$(foreach i, $$($1_SRC), $$(addprefix $$i/, $$(addsuffix /%, $$($1_INCLUDES))))
   endif
 
-  ifneq ($$($1_EXCLUDE_PATTERNS), )
-    # We must not match the exclude pattern against the src roots, so first
-    # strip the src prefixes from the absolute file paths in SRCS.
-    $1_SRCS_WITHOUT_ROOTS := $$(foreach i, $$($1_SRC), \
-        $$(patsubst $$i/%,%, $$(filter $$i/%, $$($1_SRCS))))
-    $1_EXCLUDE_PATTERNS_WITHOUT_ROOTS := $$(call containing, \
-        $$($1_EXCLUDE_PATTERNS), $$($1_SRCS_WITHOUT_ROOTS))
-    # The add back all possible src prefixes; this will generate more paths
-    # than really exists, but it does not matter since we will use this as
-    # input to filter-out.
-    $1_EXCLUDE_PATTERN += $$(foreach i, $$($1_SRC), $$(addprefix $$i/, \
-        $$($1_EXCLUDE_PATTERNS_WITHOUT_ROOTS)))
-  endif
-
   # Apply include/exclude patterns to java sources
   ifneq ($$($1_EXCLUDE_PATTERN), )
     $1_SRCS := $$(filter-out $$($1_EXCLUDE_PATTERN), $$($1_SRCS))

make/common/JdkNativeCompilation.gmk

@@ -227,8 +227,6 @@ endef
 
 GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc
 
-# \xA9 is the copyright symbol in ANSI encoding (Windows-1252), which rc.exe
-# assumes the resource file is in.
 JDK_RCFLAGS=$(RCFLAGS) \
     -D"JDK_VERSION_STRING=$(VERSION_STRING)" \
     -D"JDK_COMPANY=$(JDK_RC_COMPANY_NAME)" \

make/common/MakeFileStart.gmk

@@ -47,7 +47,7 @@ endif
 # We need spec.gmk to get $(TOPDIR)
 include $(SPEC)
 
-THIS_MAKEFILE := $(patsubst make/%,%,$(patsubst $(TOPDIR_ALT)/make/%,%,$(patsubst $(TOPDIR)/%,%,$(THIS_MAKEFILE_PATH))))
+THIS_MAKEFILE := $(patsubst make/%,%,$(patsubst $(TOPDIR)/%,%,$(THIS_MAKEFILE_PATH)))
 
 ifeq ($(LOG_FLOW), true)
   $(info :Enter $(THIS_MAKEFILE))

make/common/MakeIncludeStart.gmk

@@ -29,7 +29,7 @@
 
 # Get the next to last word (by prepending a padding element)
 THIS_INCLUDE_PATH := $(word $(words ${MAKEFILE_LIST}),padding ${MAKEFILE_LIST})
-THIS_INCLUDE := $(patsubst $(TOPDIR_ALT)/make/%,%,$(patsubst $(TOPDIR)/make/%,%,$(THIS_INCLUDE_PATH)))
+THIS_INCLUDE := $(patsubst $(TOPDIR)/make/%,%,$(THIS_INCLUDE_PATH))
 
 # Print an indented message, also counting the top-level makefile as a level
 ifneq ($(INCLUDE_GUARD_$(THIS_INCLUDE)), true)

make/common/Modules.gmk

@@ -180,7 +180,7 @@ ifeq ($(GENERATE_MODULE_DEPS_FILE), true)
 	$(call MakeTargetDir)
 	$(RM) $@
 	$(foreach m, $(MODULE_INFOS), \
-	    ( $(PRINTF) "DEPS_%s := " "$(call GetModuleNameFromModuleInfo, $m)" && \
+	    ( $(ECHO) -n "DEPS_$(call GetModuleNameFromModuleInfo, $m) := " && \
 	      $(AWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) ' \
 	          BEGIN      { if (MODULE != "java.base") printf(" java.base"); } \
 	          /^ *requires/ { sub(/;/, ""); \
@@ -194,7 +194,7 @@ ifeq ($(GENERATE_MODULE_DEPS_FILE), true)
 	                          gsub(/\r/, ""); \
 	                          printf(" %s", $$0) } \
 	          END           { printf("\n") }' $m && \
-	      $(PRINTF) "TRANSITIVE_MODULES_%s := " "$(call GetModuleNameFromModuleInfo, $m)" && \
+	      $(ECHO) -n "TRANSITIVE_MODULES_$(call GetModuleNameFromModuleInfo, $m) := " && \
 	      $(AWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) ' \
 	          BEGIN      { if (MODULE != "java.base") printf(" java.base"); } \
 	          /^ *requires  *transitive/ { \

make/common/native/Paths.gmk

@@ -128,9 +128,10 @@ define SetupSourceFiles
   # Extract the C/C++ files.
   ifneq ($$($1_EXCLUDE_PATTERNS), )
     # We must not match the exclude pattern against the src root(s).
-    $1_SRCS_WITHOUT_ROOTS := $$(foreach i, $$($1_SRC), \
-        $$(patsubst $$i/%,%, $$(filter $$i/%, $$($1_SRCS))))
-    $1_ALL_EXCLUDE_FILES := $$(call containing, $$($1_EXCLUDE_PATTERNS), \
+    $1_SRCS_WITHOUT_ROOTS := $$($1_SRCS)
+    $$(foreach i, $$($1_SRC), $$(eval $1_SRCS_WITHOUT_ROOTS := $$(patsubst \
+        $$i/%,%, $$($1_SRCS_WITHOUT_ROOTS))))
+    $1_ALL_EXCLUDE_FILES :=  $$(call containing, $$($1_EXCLUDE_PATTERNS), \
         $$($1_SRCS_WITHOUT_ROOTS))
   endif
   ifneq ($$($1_EXCLUDE_FILES), )

make/common/support/unicode2x.sed

@@ -0,0 +1,100 @@
+s/\\u0020/\x20/g
+s/\\u003A/\x3A/g
+s/\\u006B/\x6B/g
+s/\\u0075/\x75/g
+s/\\u00A0/\xA0/g
+s/\\u00A3/\xA3/g
+s/\\u00B0/\xB0/g
+s/\\u00B7/\xB7/g
+s/\\u00BA/\xBA/g
+s/\\u00BF/\xBF/g
+s/\\u00C0/\xC0/g
+s/\\u00C1/\xC1/g
+s/\\u00C2/\xC2/g
+s/\\u00C4/\xC4/g
+s/\\u00C5/\xC5/g
+s/\\u00C8/\xC8/g
+s/\\u00C9/\xC9/g
+s/\\u00CA/\xCA/g
+s/\\u00CD/\xCD/g
+s/\\u00CE/\xCE/g
+s/\\u00D3/\xD3/g
+s/\\u00D4/\xD4/g
+s/\\u00D6/\xD6/g
+s/\\u00DA/\xDA/g
+s/\\u00DC/\xDC/g
+s/\\u00DD/\xDD/g
+s/\\u00DF/\xDF/g
+s/\\u00E0/\xE0/g
+s/\\u00E1/\xE1/g
+s/\\u00E2/\xE2/g
+s/\\u00E3/\xE3/g
+s/\\u00E4/\xE4/g
+s/\\u00E5/\xE5/g
+s/\\u00E6/\xE6/g
+s/\\u00E7/\xE7/g
+s/\\u00E8/\xE8/g
+s/\\u00E9/\xE9/g
+s/\\u00EA/\xEA/g
+s/\\u00EB/\xEB/g
+s/\\u00EC/\xEC/g
+s/\\u00ED/\xED/g
+s/\\u00EE/\xEE/g
+s/\\u00EF/\xEF/g
+s/\\u00F1/\xF1/g
+s/\\u00F2/\xF2/g
+s/\\u00F3/\xF3/g
+s/\\u00F4/\xF4/g
+s/\\u00F5/\xF5/g
+s/\\u00F6/\xF6/g
+s/\\u00F9/\xF9/g
+s/\\u00FA/\xFA/g
+s/\\u00FC/\xFC/g
+s/\\u0020/\x20/g
+s/\\u003f/\x3f/g
+s/\\u006f/\x6f/g
+s/\\u0075/\x75/g
+s/\\u00a0/\xa0/g
+s/\\u00a3/\xa3/g
+s/\\u00b0/\xb0/g
+s/\\u00ba/\xba/g
+s/\\u00bf/\xbf/g
+s/\\u00c1/\xc1/g
+s/\\u00c4/\xc4/g
+s/\\u00c5/\xc5/g
+s/\\u00c8/\xc8/g
+s/\\u00c9/\xc9/g
+s/\\u00ca/\xca/g
+s/\\u00cd/\xcd/g
+s/\\u00d6/\xd6/g
+s/\\u00dc/\xdc/g
+s/\\u00dd/\xdd/g
+s/\\u00df/\xdf/g
+s/\\u00e0/\xe0/g
+s/\\u00e1/\xe1/g
+s/\\u00e2/\xe2/g
+s/\\u00e3/\xe3/g
+s/\\u00e4/\xe4/g
+s/\\u00e5/\xe5/g
+s/\\u00e7/\xe7/g
+s/\\u00e8/\xe8/g
+s/\\u00e9/\xe9/g
+s/\\u00ea/\xea/g
+s/\\u00eb/\xeb/g
+s/\\u00ec/\xec/g
+s/\\u00ed/\xed/g
+s/\\u00ee/\xee/g
+s/\\u00ef/\xef/g
+s/\\u00f0/\xf0/g
+s/\\u00f1/\xf1/g
+s/\\u00f2/\xf2/g
+s/\\u00f3/\xf3/g
+s/\\u00f4/\xf4/g
+s/\\u00f5/\xf5/g
+s/\\u00f6/\xf6/g
+s/\\u00f7/\xf7/g
+s/\\u00f8/\xf8/g
+s/\\u00f9/\xf9/g
+s/\\u00fa/\xfa/g
+s/\\u00fc/\xfc/g
+s/\\u00ff/\xff/g

make/conf/jib-profiles.js

@@ -241,10 +241,10 @@ var getJibProfilesCommon = function (input, data) {
 
     // List of the main profile names used for iteration
     common.main_profile_names = [
-        "macosx-x64", "macosx-aarch64",
+        "linux-x64", "linux-x86", "macosx-x64", "macosx-aarch64",
         "windows-x64", "windows-aarch64",
-        "linux-x64", "linux-aarch64",
-        "linux-arm32", "linux-ppc64le", "linux-s390x", "linux-riscv64"
+        "linux-aarch64", "linux-arm32", "linux-ppc64le", "linux-s390x",
+        "linux-riscv64"
     ];
 
     // These are the base settings for all the main build profiles.
@@ -254,6 +254,7 @@ var getJibProfilesCommon = function (input, data) {
         configure_args: concat(
             "--with-exclude-translations=es,fr,it,ko,pt_BR,sv,ca,tr,cs,sk,ja_JP_A,ja_JP_HA,ja_JP_HI,ja_JP_I,zh_TW,zh_HK",
             "--disable-jvm-feature-shenandoahgc",
+            "--disable-cds-archive-coh",
             versionArgs(input, common))
     };
 
@@ -282,6 +283,9 @@ var getJibProfilesCommon = function (input, data) {
         labels: "open"
     };
 
+    common.configure_args_64bit = ["--with-target-bits=64"];
+    common.configure_args_32bit = ["--with-target-bits=32"];
+
     /**
      * Define common artifacts template for all main profiles
      * @param o - Object containing data for artifacts
@@ -408,34 +412,58 @@ var getJibProfilesProfiles = function (input, common, data) {
 
     // Main SE profiles
     var profiles = {
+
+        "linux-x64": {
+            target_os: "linux",
+            target_cpu: "x64",
+            dependencies: ["devkit", "gtest", "build_devkit", "graphviz", "pandoc", "tidy"],
+            configure_args: concat(
+                (input.build_cpu == "x64" ? common.configure_args_64bit
+                 : "--openjdk-target=x86_64-linux-gnu"),
+                "--with-zlib=system", "--disable-dtrace",
+                (isWsl(input) ? [ "--host=x86_64-unknown-linux-gnu",
+                    "--build=x86_64-unknown-linux-gnu" ] : [])),
+        },
+
+        "linux-x86": {
+            target_os: "linux",
+            target_cpu: "x86",
+            build_cpu: "x64",
+            dependencies: ["devkit", "gtest", "libffi"],
+            configure_args: concat(common.configure_args_32bit, [
+                "--with-jvm-variants=minimal,server",
+                "--with-zlib=system",
+                "--with-libffi=" + input.get("libffi", "home_path"),
+                "--enable-libffi-bundling",
+                "--enable-fallback-linker"
+            ])
+        },
+
         "macosx-x64": {
             target_os: "macosx",
             target_cpu: "x64",
             dependencies: ["devkit", "gtest", "graphviz", "pandoc", "tidy"],
-            configure_args: [
-                "--with-zlib=system",
+            configure_args: concat(common.configure_args_64bit, "--with-zlib=system",
                 "--with-macosx-version-max=11.00.00",
                 "--enable-compatible-cds-alignment",
                 // Use system SetFile instead of the one in the devkit as the
                 // devkit one may not work on Catalina.
-                "SETFILE=/usr/bin/SetFile"
-            ],
+                "SETFILE=/usr/bin/SetFile"),
         },
 
         "macosx-aarch64": {
             target_os: "macosx",
             target_cpu: "aarch64",
             dependencies: ["devkit", "gtest", "graphviz", "pandoc", "tidy"],
-            configure_args: [
-                "--with-macosx-version-max=11.00.00"
-            ],
+            configure_args: concat(common.configure_args_64bit,
+                "--with-macosx-version-max=11.00.00"),
         },
 
         "windows-x64": {
             target_os: "windows",
             target_cpu: "x64",
             dependencies: ["devkit", "gtest", "pandoc"],
-            configure_args: [],
+            configure_args: concat(common.configure_args_64bit),
         },
 
         "windows-aarch64": {
@@ -447,19 +475,7 @@ var getJibProfilesProfiles = function (input, common, data) {
             ],
         },
 
-        "linux-x64": {
-          target_os: "linux",
-          target_cpu: "x64",
-          dependencies: ["devkit", "gtest", "build_devkit", "graphviz", "pandoc", "tidy"],
-          configure_args: concat(
-              "--with-zlib=system",
-              "--disable-dtrace",
-              (cross_compiling ? [ "--openjdk-target=x86_64-linux-gnu" ] : []),
-              (isWsl(input) ? [ "--host=x86_64-unknown-linux-gnu",
-                  "--build=x86_64-unknown-linux-gnu" ] : [])),
-        },
-
-       "linux-aarch64": {
+        "linux-aarch64": {
             target_os: "linux",
             target_cpu: "aarch64",
             dependencies: ["devkit", "gtest", "build_devkit", "graphviz", "pandoc", "tidy"],
@@ -476,10 +492,8 @@ var getJibProfilesProfiles = function (input, common, data) {
             build_cpu: "x64",
             dependencies: ["devkit", "gtest", "build_devkit"],
             configure_args: [
-                "--openjdk-target=arm-linux-gnueabihf",
-                "--with-freetype=bundled",
-                "--with-abi-profile=arm-vfp-hflt",
-                "--disable-warnings-as-errors"
+                "--openjdk-target=arm-linux-gnueabihf", "--with-freetype=bundled",
+                "--with-abi-profile=arm-vfp-hflt", "--disable-warnings-as-errors"
             ],
         },
 
@@ -489,8 +503,7 @@ var getJibProfilesProfiles = function (input, common, data) {
             build_cpu: "x64",
             dependencies: ["devkit", "gtest", "build_devkit"],
             configure_args: [
-                "--openjdk-target=ppc64le-linux-gnu",
-                "--with-freetype=bundled",
+                "--openjdk-target=ppc64le-linux-gnu", "--with-freetype=bundled",
                 "--disable-warnings-as-errors"
             ],
         },
@@ -501,8 +514,7 @@ var getJibProfilesProfiles = function (input, common, data) {
             build_cpu: "x64",
             dependencies: ["devkit", "gtest", "build_devkit"],
             configure_args: [
-                "--openjdk-target=s390x-linux-gnu",
-                "--with-freetype=bundled",
+                "--openjdk-target=s390x-linux-gnu", "--with-freetype=bundled",
                 "--disable-warnings-as-errors"
             ],
         },
@@ -513,8 +525,7 @@ var getJibProfilesProfiles = function (input, common, data) {
             build_cpu: "x64",
             dependencies: ["devkit", "gtest", "build_devkit"],
             configure_args: [
-                "--openjdk-target=riscv64-linux-gnu",
-                "--with-freetype=bundled",
+                "--openjdk-target=riscv64-linux-gnu", "--with-freetype=bundled",
                 "--disable-warnings-as-errors"
             ],
         },
@@ -575,24 +586,24 @@ var getJibProfilesProfiles = function (input, common, data) {
             target_os: "linux",
             target_cpu: "x64",
             dependencies: ["devkit", "gtest", "libffi"],
-            configure_args: [
+            configure_args: concat(common.configure_args_64bit, [
                 "--with-zlib=system",
                 "--with-jvm-variants=zero",
                 "--with-libffi=" + input.get("libffi", "home_path"),
                 "--enable-libffi-bundling",
-            ]
+            ])
         },
 
         "linux-aarch64-zero": {
             target_os: "linux",
             target_cpu: "aarch64",
             dependencies: ["devkit", "gtest", "libffi"],
-            configure_args: [
+            configure_args: concat(common.configure_args_64bit, [
                 "--with-zlib=system",
                 "--with-jvm-variants=zero",
                 "--with-libffi=" + input.get("libffi", "home_path"),
                 "--enable-libffi-bundling"
-            ]
+            ])
         },
 
         "linux-x86-zero": {
@@ -600,13 +611,12 @@ var getJibProfilesProfiles = function (input, common, data) {
             target_cpu: "x86",
             build_cpu: "x64",
             dependencies: ["devkit", "gtest", "libffi"],
-            configure_args: [
-                "--with-target-bits=32",
+            configure_args:  concat(common.configure_args_32bit, [
                 "--with-zlib=system",
                 "--with-jvm-variants=zero",
                 "--with-libffi=" + input.get("libffi", "home_path"),
                 "--enable-libffi-bundling"
-            ]
+            ])
         }
     }
     profiles = concatObjects(profiles, zeroProfiles);
@@ -625,10 +635,8 @@ var getJibProfilesProfiles = function (input, common, data) {
             target_os: "linux",
             target_cpu: "x64",
             dependencies: ["devkit", "gtest"],
-            configure_args: [
-                "--with-zlib=system",
-                "--disable-precompiled-headers"
-            ],
+            configure_args: concat(common.configure_args_64bit,
+                "--with-zlib=system", "--disable-precompiled-headers"),
         },
     };
     profiles = concatObjects(profiles, noPchProfiles);
@@ -685,6 +693,9 @@ var getJibProfilesProfiles = function (input, common, data) {
         "linux-x64": {
             platform: "linux-x64",
         },
+        "linux-x86": {
+            platform: "linux-x86",
+        },
         "macosx-x64": {
             platform: "macos-x64",
             jdk_subdir: "jdk-" + data.version +  ".jdk/Contents/Home",
@@ -861,8 +872,7 @@ var getJibProfilesProfiles = function (input, common, data) {
             profiles[cmpBaselineName].configure_args = concat(
                 profiles[cmpBaselineName].configure_args,
                 "--with-hotspot-build-time=n/a",
-                "--disable-precompiled-headers",
-                "--with-source-date=version");
+                "--disable-precompiled-headers");
             // Do not inherit artifact definitions from base profile
             delete profiles[cmpBaselineName].artifacts;
         });
@@ -1079,8 +1089,8 @@ var getJibProfilesDependencies = function (input, common) {
 
     var devkit_platform_revisions = {
         linux_x64: "gcc14.2.0-OL6.4+1.0",
-        macosx: "Xcode15.4+1.0",
-        windows_x64: "VS2022-17.13.2+1.0",
+        macosx: "Xcode14.3.1+1.0",
+        windows_x64: "VS2022-17.6.5+1.0",
         linux_aarch64: "gcc14.2.0-OL7.6+1.0",
         linux_arm: "gcc8.2.0-Fedora27+1.0",
         linux_ppc64le: "gcc14.2.0-Fedora_41+1.0",
@@ -1151,7 +1161,10 @@ var getJibProfilesDependencies = function (input, common) {
             organization: common.organization,
             ext: "tar.gz",
             module: "devkit-" + devkit_cross_prefix + devkit_platform,
-            revision: devkit_platform_revisions[devkit_platform]
+            revision: devkit_platform_revisions[devkit_platform],
+            environment: {
+                "DEVKIT_HOME": input.get("devkit", "home_path"),
+            }
         },
 
         build_devkit: {

make/conf/version-numbers.conf

@@ -28,15 +28,15 @@
 
 DEFAULT_VERSION_FEATURE=25
 DEFAULT_VERSION_INTERIM=0
-DEFAULT_VERSION_UPDATE=1
+DEFAULT_VERSION_UPDATE=0
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2025-10-21
+DEFAULT_VERSION_DATE=2025-09-16
 DEFAULT_VERSION_CLASSFILE_MAJOR=69  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="24 25"
 DEFAULT_JDK_SOURCE_TARGET_VERSION=25
-DEFAULT_PROMOTED_VERSION_PRE=
+DEFAULT_PROMOTED_VERSION_PRE=ea

make/data/ubsan/ubsan_default_options.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,18 +43,6 @@
 #define ATTRIBUTE_USED
 #endif
 
-// On AIX, the llvm_symbolizer is not found out of the box, so we have to provide the
-// full qualified llvm_symbolizer path in the __ubsan_default_options() function.
-// To get it here we compile our sources with an additional define LLVM_SYMBOLIZER
-// containing the path, which we set in make/autoconf/jdk-options.m4.
-#ifdef LLVM_SYMBOLIZER
-#define _LLVM_SYMBOLIZER(X) ",external_symbolizer_path=" X_LLVM_SYMBOLIZER(X)
-#define X_LLVM_SYMBOLIZER(X) #X
-#else
-#define LLVM_SYMBOLIZER
-#define _LLVM_SYMBOLIZER(X)
-#endif
-
 // Override weak symbol exposed by UBSan to override default options. This is called by UBSan
 // extremely early during library loading, before main is called. We need to override the default
 // options because by default UBSan only prints a warning for each occurrence. We want jtreg tests
@@ -62,5 +50,5 @@
 // thread so it is easier to track down. You can override these options by setting the environment
 // variable UBSAN_OPTIONS.
 ATTRIBUTE_DEFAULT_VISIBILITY ATTRIBUTE_USED const char* __ubsan_default_options() {
-  return "halt_on_error=1,print_stacktrace=1" _LLVM_SYMBOLIZER(LLVM_SYMBOLIZER);
+  return "halt_on_error=1,print_stacktrace=1";
 }

make/devkit/createAutoconfBundle.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,21 +24,10 @@
 # questions.
 #
 
-# Create a bundle in OpenJDK build folder, containing what's needed to run
+# Create a bundle in the current directory, containing what's needed to run
 # the 'autoconf' program by the OpenJDK build. To override TARGET_PLATFORM
 # just set the variable before running this script.
 
-# This script fetches sources from network so make sure your proxy is setup appropriately.
-
-# colored print to highlight some of the logs
-function print_log()
-{
-  Color_Cyan='\033[1;36m'   # Cyan
-  Color_Off='\033[0m'       # Reset color
-  printf "${Color_Cyan}> $1${Color_Off}\n"
-}
-
-
 # Autoconf depends on m4, so download and build that first.
 AUTOCONF_VERSION=2.69
 M4_VERSION=1.4.18
@@ -69,12 +58,11 @@ MODULE_NAME=autoconf-$TARGET_PLATFORM-$AUTOCONF_VERSION+$PACKAGE_VERSION
 BUNDLE_NAME=$MODULE_NAME.tar.gz
 
 SCRIPT_DIR="$(cd "$(dirname $0)" > /dev/null && pwd)"
-BASEDIR="$(cd "$SCRIPT_DIR/../.."  > /dev/null && pwd)"
-OUTPUT_ROOT="$BASEDIR/build/autoconf"
+OUTPUT_ROOT="${SCRIPT_DIR}/../../build/autoconf"
 
+cd $OUTPUT_ROOT
 IMAGE_DIR=$OUTPUT_ROOT/$MODULE_NAME
 mkdir -p $IMAGE_DIR/usr
-cd $OUTPUT_ROOT
 
 # Download and build m4
 
@@ -88,7 +76,7 @@ elif test "x$TARGET_PLATFORM" = xcygwin_x86; then
   cp /usr/bin/m4 $IMAGE_DIR/usr/bin
 elif test "x$TARGET_PLATFORM" = xlinux_x64; then
   M4_VERSION=1.4.13-5
-  wget https://yum.oracle.com/repo/OracleLinux/OL6/latest/x86_64/getPackage/m4-$M4_VERSION.el6.x86_64.rpm
+  wget http://yum.oracle.com/repo/OracleLinux/OL6/latest/x86_64/getPackage/m4-$M4_VERSION.el6.x86_64.rpm
   cd $IMAGE_DIR
   rpm2cpio $OUTPUT_ROOT/m4-$M4_VERSION.el6.x86_64.rpm | cpio -d -i
 elif test "x$TARGET_PLATFORM" = xlinux_x86; then
@@ -97,38 +85,27 @@ elif test "x$TARGET_PLATFORM" = xlinux_x86; then
   cd $IMAGE_DIR
   rpm2cpio $OUTPUT_ROOT/m4-$M4_VERSION.el6.i686.rpm | cpio -d -i
 else
-  print_log "m4: download"
   wget https://ftp.gnu.org/gnu/m4/m4-$M4_VERSION.tar.gz
-  tar -xzf m4-$M4_VERSION.tar.gz
+  tar xzf m4-$M4_VERSION.tar.gz
   cd m4-$M4_VERSION
-  print_log "m4: configure"
   ./configure --prefix=$IMAGE_DIR/usr CFLAGS="-w -Wno-everything"
-  print_log "m4: make"
   make
-  print_log "m4: make install"
   make install
   cd ..
 fi
 
 # Download and build autoconf
 
-print_log "autoconf: download"
 wget https://ftp.gnu.org/gnu/autoconf/autoconf-$AUTOCONF_VERSION.tar.gz
-tar -xzf autoconf-$AUTOCONF_VERSION.tar.gz
+tar xzf autoconf-$AUTOCONF_VERSION.tar.gz
 cd autoconf-$AUTOCONF_VERSION
-print_log "autoconf: configure"
 ./configure --prefix=$IMAGE_DIR/usr M4=$IMAGE_DIR/usr/bin/m4
-print_log "autoconf: make"
 make
-print_log "autoconf: make install"
 make install
 cd ..
 
-# The resulting scripts from installation folder use absolute paths to reference other files within installation folder
-print_log "replace absolue paths from installation files with a relative ."
 perl -pi -e "s!$IMAGE_DIR/!./!" $IMAGE_DIR/usr/bin/auto* $IMAGE_DIR/usr/share/autoconf/autom4te.cfg
 
-print_log "creating $IMAGE_DIR/autoconf wrapper script"
 cat > $IMAGE_DIR/autoconf << EOF
 #!/bin/bash
 # Get an absolute path to this script
@@ -146,9 +123,6 @@ PREPEND_INCLUDE="--prepend-include \$this_script_dir/usr/share/autoconf"
 
 exec \$this_script_dir/usr/bin/autoconf \$PREPEND_INCLUDE "\$@"
 EOF
-
 chmod +x $IMAGE_DIR/autoconf
-
-print_log "archiving $IMAGE_DIR directory as $OUTPUT_ROOT/$BUNDLE_NAME"
 cd $IMAGE_DIR
 tar -cvzf $OUTPUT_ROOT/$BUNDLE_NAME *

make/devkit/createWindowsDevkit.sh

@@ -56,22 +56,16 @@ BUILD_DIR="${SCRIPT_DIR}/../../build/devkit"
 
 UNAME_SYSTEM=`uname -s`
 UNAME_RELEASE=`uname -r`
-UNAME_OS=`uname -o`
 
 # Detect cygwin or WSL
 IS_CYGWIN=`echo $UNAME_SYSTEM | grep -i CYGWIN`
 IS_WSL=`echo $UNAME_RELEASE | grep Microsoft`
-IS_MSYS=`echo $UNAME_OS | grep -i Msys`
-MSYS2_ARG_CONV_EXCL="*"          # make "cmd.exe /c" work for msys2
-CMD_EXE="cmd.exe /c"
 if test "x$IS_CYGWIN" != "x"; then
     BUILD_ENV="cygwin"
-elif test "x$IS_MSYS" != "x"; then
-    BUILD_ENV="cygwin"
 elif test "x$IS_WSL" != "x"; then
     BUILD_ENV="wsl"
 else
-    echo "Unknown environment; only Cygwin/MSYS2/WSL are supported."
+    echo "Unknown environment; only Cygwin and WSL are supported."
     exit 1
 fi
 
@@ -82,7 +76,7 @@ elif test "x$BUILD_ENV" = "xwsl"; then
 fi
 
 # Work around the insanely named ProgramFiles(x86) env variable
-PROGRAMFILES_X86="$($WINDOWS_PATH_TO_UNIX_PATH "$(${CMD_EXE} set | sed -n 's/^ProgramFiles(x86)=//p' | tr -d '\r')")"
+PROGRAMFILES_X86="$($WINDOWS_PATH_TO_UNIX_PATH "$(cmd.exe /c set | sed -n 's/^ProgramFiles(x86)=//p' | tr -d '\r')")"
 PROGRAMFILES="$($WINDOWS_PATH_TO_UNIX_PATH "$PROGRAMFILES")"
 
 case $VS_VERSION in
@@ -105,15 +99,13 @@ esac
 
 
 # Find Visual Studio installation dir
-VSNNNCOMNTOOLS=`${CMD_EXE} echo %VS${VS_VERSION_NUM_NODOT}COMNTOOLS% | tr -d '\r'`
-VSNNNCOMNTOOLS="$($WINDOWS_PATH_TO_UNIX_PATH "$VSNNNCOMNTOOLS")"
+VSNNNCOMNTOOLS=`cmd.exe /c echo %VS${VS_VERSION_NUM_NODOT}COMNTOOLS% | tr -d '\r'`
 if [ -d "$VSNNNCOMNTOOLS" ]; then
-    VS_INSTALL_DIR="$VSNNNCOMNTOOLS/../.."
+    VS_INSTALL_DIR="$($WINDOWS_PATH_TO_UNIX_PATH "$VSNNNCOMNTOOLS/../..")"
 else
     VS_INSTALL_DIR="${MSVC_PROGRAMFILES_DIR}/Microsoft Visual Studio/$VS_VERSION"
     VS_INSTALL_DIR="$(ls -d "${VS_INSTALL_DIR}/"{Community,Professional,Enterprise} 2>/dev/null | head -n1)"
 fi
-echo "VSNNNCOMNTOOLS: $VSNNNCOMNTOOLS"
 echo "VS_INSTALL_DIR: $VS_INSTALL_DIR"
 
 # Extract semantic version
@@ -188,11 +180,7 @@ cp $DEVKIT_ROOT/VC/redist/arm64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/arm64
 ################################################################################
 # Copy SDK files
 
-SDK_INSTALL_DIR=`${CMD_EXE} echo %WindowsSdkDir% | tr -d '\r'`
-SDK_INSTALL_DIR="$($WINDOWS_PATH_TO_UNIX_PATH "$SDK_INSTALL_DIR")"
-if [ ! -d "$SDK_INSTALL_DIR" ]; then
-    SDK_INSTALL_DIR="$PROGRAMFILES_X86/Windows Kits/$SDK_VERSION"
-fi
+SDK_INSTALL_DIR="$PROGRAMFILES_X86/Windows Kits/$SDK_VERSION"
 echo "SDK_INSTALL_DIR: $SDK_INSTALL_DIR"
 
 SDK_FULL_VERSION="$(ls "$SDK_INSTALL_DIR/bin" | sort -r -n | head -n1)"

make/hotspot/lib/JvmFeatures.gmk

@@ -125,11 +125,9 @@ endif
 ifneq ($(call check-jvm-feature, cds), true)
   JVM_CFLAGS_FEATURES += -DINCLUDE_CDS=0
   JVM_EXCLUDE_FILES += \
-      aotCodeCache.cpp \
       classLoaderDataShared.cpp \
       classLoaderExt.cpp \
-      systemDictionaryShared.cpp \
-      trainingData.cpp
+      systemDictionaryShared.cpp
   JVM_EXCLUDE_PATTERNS += cds/
 endif
 

make/jdk/src/classes/build/tools/classlist/HelloClasslist.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,8 +37,6 @@ import java.lang.invoke.MethodType;
 import java.net.InetAddress;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -61,7 +59,6 @@ public class HelloClasslist {
 
     private static final Logger LOGGER = Logger.getLogger("Hello");
 
-    @SuppressWarnings("restricted")
     public static void main(String ... args) throws Throwable {
 
         FileSystems.getDefault();
@@ -144,7 +141,6 @@ public class HelloClasslist {
         HelloClasslist.class.getMethod("staticMethod_V").invoke(null);
         var obj = HelloClasslist.class.getMethod("staticMethod_L_L", Object.class).invoke(null, instance);
         HelloClasslist.class.getField("field").get(instance);
-        MethodHandles.Lookup.ClassOption.class.getEnumConstants();
 
         // A selection of trivial and relatively common MH operations
         invoke(MethodHandles.identity(double.class), 1.0);
@@ -164,9 +160,6 @@ public class HelloClasslist {
             case B b -> b.b;
             default -> 17;
         };
-        // record run-time methods
-        o.equals(new B(5));
-        o.hashCode();
         LOGGER.log(Level.FINE, "Value: " + value);
 
         // The Striped64$Cell is loaded rarely only when there's a contention among
@@ -174,20 +167,6 @@ public class HelloClasslist {
         // an inconsistency in the classlist between builds (see JDK-8295951).
         // To avoid the problem, load the class explicitly.
         Class<?> striped64Class = Class.forName("java.util.concurrent.atomic.Striped64$Cell");
-        Files.lines(Path.of(args[0])).forEach(line -> {
-                if (line.isEmpty() || line.charAt(0) == '#') {
-                    return;
-                }
-                try {
-                    int index = line.indexOf(' ');
-                    if (index <= 0) {
-                        return;
-                    }
-                    String className = line.substring(0, index).replace('/', '.');
-                    Class.forName(className);
-                } catch (Exception e) {
-                }
-            });
     }
 
     public HelloClasslist() {}

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

@@ -542,10 +542,10 @@ class Bundle {
                     if (pattern != null) {
                         // Perform date-time format pattern conversion which is
                         // applicable to both SimpleDateFormat and j.t.f.DateTimeFormatter.
-                        String transPattern = translateDateFormatLetters(calendarType, key, pattern, this::convertDateTimePatternLetter);
+                        String transPattern = translateDateFormatLetters(calendarType, pattern, this::convertDateTimePatternLetter);
                         dateTimePatterns.add(i, transPattern);
                         // Additionally, perform SDF specific date-time format pattern conversion
-                        sdfPatterns.add(i, translateDateFormatLetters(calendarType, key, transPattern, this::convertSDFLetter));
+                        sdfPatterns.add(i, translateDateFormatLetters(calendarType, transPattern, this::convertSDFLetter));
                     } else {
                         dateTimePatterns.add(i, null);
                         sdfPatterns.add(i, null);
@@ -568,7 +568,7 @@ class Bundle {
         }
     }
 
-    private String translateDateFormatLetters(CalendarType calendarType, String patternKey, String cldrFormat, ConvertDateTimeLetters converter) {
+    private String translateDateFormatLetters(CalendarType calendarType, String cldrFormat, ConvertDateTimeLetters converter) {
         String pattern = cldrFormat;
         int length = pattern.length();
         boolean inQuote = false;
@@ -587,7 +587,7 @@ class Bundle {
                     if (nextc == '\'') {
                         i++;
                         if (count != 0) {
-                            converter.convert(calendarType, patternKey, lastLetter, count, jrePattern);
+                            converter.convert(calendarType, lastLetter, count, jrePattern);
                             lastLetter = 0;
                             count = 0;
                         }
@@ -597,7 +597,7 @@ class Bundle {
                 }
                 if (!inQuote) {
                     if (count != 0) {
-                        converter.convert(calendarType, patternKey, lastLetter, count, jrePattern);
+                        converter.convert(calendarType, lastLetter, count, jrePattern);
                         lastLetter = 0;
                         count = 0;
                     }
@@ -614,7 +614,7 @@ class Bundle {
             }
             if (!(c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z')) {
                 if (count != 0) {
-                    converter.convert(calendarType, patternKey, lastLetter, count, jrePattern);
+                    converter.convert(calendarType, lastLetter, count, jrePattern);
                     lastLetter = 0;
                     count = 0;
                 }
@@ -627,7 +627,7 @@ class Bundle {
                 count++;
                 continue;
             }
-            converter.convert(calendarType, patternKey, lastLetter, count, jrePattern);
+            converter.convert(calendarType, lastLetter, count, jrePattern);
             lastLetter = c;
             count = 1;
         }
@@ -637,7 +637,7 @@ class Bundle {
         }
 
         if (count != 0) {
-            converter.convert(calendarType, patternKey, lastLetter, count, jrePattern);
+            converter.convert(calendarType, lastLetter, count, jrePattern);
         }
         if (cldrFormat.contentEquals(jrePattern)) {
             return cldrFormat;
@@ -661,7 +661,7 @@ class Bundle {
      * on the support given by the SimpleDateFormat and the j.t.f.DateTimeFormatter
      * for date-time formatting.
      */
-    private void convertDateTimePatternLetter(CalendarType calendarType, String patternKey, char cldrLetter, int count, StringBuilder sb) {
+    private void convertDateTimePatternLetter(CalendarType calendarType, char cldrLetter, int count, StringBuilder sb) {
         switch (cldrLetter) {
             case 'u':
             case 'U':
@@ -683,7 +683,7 @@ class Bundle {
      * Perform a conversion of CLDR date-time format pattern letter which is
      * specific to the SimpleDateFormat.
      */
-    private void convertSDFLetter(CalendarType calendarType, String patternKey, char cldrLetter, int count, StringBuilder sb) {
+    private void convertSDFLetter(CalendarType calendarType, char cldrLetter, int count, StringBuilder sb) {
         switch (cldrLetter) {
             case 'G':
                 if (calendarType != CalendarType.GREGORIAN) {
@@ -722,17 +722,6 @@ class Bundle {
                 appendN('z', count, sb);
                 break;
 
-            case 'y':
-                // If the style is FULL/LONG for a Japanese Calendar, make the
-                // count == 4 for Gan-nen
-                if (calendarType == CalendarType.JAPANESE &&
-                        (patternKey.contains("full-") ||
-                         patternKey.contains("long-"))) {
-                    count = 4;
-                }
-                appendN(cldrLetter, count, sb);
-                break;
-
             case 'Z':
                 if (count == 4 || count == 5) {
                     sb.append("XXX");
@@ -778,7 +767,6 @@ class Bundle {
             .collect(Collectors.toMap(
                 e -> calendarPrefix + e.getKey(),
                 e -> translateDateFormatLetters(calendarType,
-                        e.getKey(),
                         (String)e.getValue(),
                         this::convertDateTimePatternLetter)
             ))
@@ -787,7 +775,7 @@ class Bundle {
 
     @FunctionalInterface
     private interface ConvertDateTimeLetters {
-        void convert(CalendarType calendarType, String patternKey, char cldrLetter, int count, StringBuilder sb);
+        void convert(CalendarType calendarType, char cldrLetter, int count, StringBuilder sb);
     }
 
     /**

make/jdk/src/classes/build/tools/generatecharacter/GenerateCharacter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1190,7 +1190,7 @@ OUTER:  for (int i = 0; i < n; i += m) {
         if (Csyntax)
             result.append("  static ");
         else
-            result.append("  @Stable static final ");
+            result.append("  static final ");
         result.append(atype);
         result.append(" ").append(name).append("[");
         if (Csyntax)
@@ -1347,7 +1347,7 @@ OUTER:  for (int i = 0; i < n; i += m) {
     }
 
     static void genCaseMapTableDeclaration(StringBuffer result) {
-        result.append("    @Stable static final char[][][] charMap;\n");
+        result.append("    static final char[][][] charMap;\n");
     }
 
     static void genCaseMapTable(StringBuffer result, SpecialCaseMap[] specialCaseMaps){

make/jdk/src/classes/build/tools/pandocfilter/PandocFilter.java

@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * 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.
- */
-
 package build.tools.pandocfilter;
 
 import build.tools.pandocfilter.json.JSON;

make/jdk/src/classes/build/tools/taglet/PreviewNote.java

@@ -0,0 +1,127 @@
+/*
+ * 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.taglet;
+
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+
+
+import javax.lang.model.element.Element;
+import javax.tools.Diagnostic;
+
+
+import com.sun.source.doctree.DocTree;
+import com.sun.source.doctree.UnknownInlineTagTree;
+import jdk.javadoc.doclet.Doclet;
+import jdk.javadoc.doclet.DocletEnvironment;
+import jdk.javadoc.doclet.Reporter;
+import jdk.javadoc.doclet.StandardDoclet;
+import jdk.javadoc.doclet.Taglet;
+
+import static com.sun.source.doctree.DocTree.Kind.UNKNOWN_INLINE_TAG;
+
+/**
+ * An inline tag to insert a note formatted as preview note.
+ * The tag can be used as follows:
+ *
+ * <pre>
+ * {&commat;previewNote jep-number [Preview note heading]}
+ * Preview note content
+ * {&commat;previewNote}
+ * </pre>
+ *
+ */
+public class PreviewNote implements Taglet {
+
+    static final String TAG_NAME = "previewNote";
+    Reporter reporter = null;
+
+    @Override
+    public void init(DocletEnvironment env, Doclet doclet) {
+        if (doclet instanceof StandardDoclet stdoclet) {
+            reporter = stdoclet.getReporter();
+        }
+    }
+
+    /**
+     * Returns the set of locations in which the tag may be used.
+     */
+    @Override
+    public Set<Location> getAllowedLocations() {
+        return EnumSet.allOf(Taglet.Location.class);
+    }
+
+    @Override
+    public boolean isInlineTag() {
+        return true;
+    }
+
+    @Override
+    public String getName() {
+        return TAG_NAME;
+    }
+
+    @Override
+    public String toString(List<? extends DocTree> tags, Element elem) {
+
+        for (DocTree tag : tags) {
+            if (tag.getKind() == UNKNOWN_INLINE_TAG) {
+                UnknownInlineTagTree inlineTag = (UnknownInlineTagTree) tag;
+                String[] content = inlineTag.getContent().toString().trim().split("\\s+", 2);
+                if (!content[0].isBlank()) {
+                    StringBuilder sb = new StringBuilder("""
+                       <div class="preview-block" style="margin-top:10px; display:block; max-width:max-content;">
+                       """);
+                    if (content.length == 2) {
+                        sb.append("""
+                                <div class="preview-label">
+                                """)
+                          .append(content[1])
+                          .append("""
+                                </div>
+                                """);
+                    }
+                    sb.append("""
+                            <div class="preview-comment">
+                            """);
+                    return sb.toString();
+                } else {
+                    return """
+                             </div>
+                             </div>
+                            """;
+                }
+            }
+        }
+
+        if (reporter == null) {
+            throw new IllegalArgumentException("@" + TAG_NAME + " taglet content must be begin or end");
+        }
+        reporter.print(Diagnostic.Kind.ERROR, "@" + TAG_NAME + " taglet content must be begin or end");
+        return "";
+    }
+}

make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java

@@ -46,8 +46,6 @@ import java.io.OutputStream;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.lang.classfile.*;
-import java.lang.classfile.TypeAnnotation.TargetInfo;
-import java.lang.classfile.TypeAnnotation.TypePathComponent;
 import java.lang.classfile.attribute.*;
 import java.lang.classfile.constantpool.ClassEntry;
 import java.lang.classfile.constantpool.ConstantPoolBuilder;
@@ -66,9 +64,6 @@ import java.nio.file.FileVisitor;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.attribute.BasicFileAttributes;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.util.stream.Stream;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -106,7 +101,10 @@ import javax.tools.StandardLocation;
 
 import com.sun.source.util.JavacTask;
 import com.sun.tools.javac.api.JavacTool;
+import com.sun.tools.javac.jvm.Target;
+import com.sun.tools.javac.util.Assert;
 import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.Pair;
 import java.nio.file.DirectoryStream;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -306,18 +304,13 @@ public class CreateSymbols {
             "Ljdk/internal/ValueBased;";
     private static final String VALUE_BASED_ANNOTATION_INTERNAL =
             "Ljdk/internal/ValueBased+Annotation;";
-    private static final String REQUIRES_IDENTITY_ANNOTATION =
-            "Ljdk/internal/RequiresIdentity;";
-    private static final String REQUIRES_IDENTITY_ANNOTATION_INTERNAL =
-            "Ljdk/internal/RequiresIdentity+Annotation;";
     public static final Set<String> HARDCODED_ANNOTATIONS = new HashSet<>(
             List.of("Ljdk/Profile+Annotation;",
                     "Lsun/Proprietary+Annotation;",
                     PREVIEW_FEATURE_ANNOTATION_OLD,
                     PREVIEW_FEATURE_ANNOTATION_NEW,
                     VALUE_BASED_ANNOTATION,
-                    RESTRICTED_ANNOTATION,
-                    REQUIRES_IDENTITY_ANNOTATION));
+                    RESTRICTED_ANNOTATION));
 
     private void stripNonExistentAnnotations(LoadDescriptions data) {
         Set<String> allClasses = data.classes.name2Class.keySet();
@@ -346,10 +339,10 @@ public class CreateSymbols {
                                         !allClasses.contains(ann.annotationType.substring(1, ann.annotationType.length() - 1)));
     }
 
-    private ZipEntry createZipEntry(String name, long timeMillisSinceEpoch) {
-        Instant time = Instant.ofEpochMilli(timeMillisSinceEpoch);
+    private ZipEntry createZipEntry(String name, long timestamp) {
         ZipEntry ze = new ZipEntry(name);
-        ze.setTimeLocal(LocalDateTime.ofInstant(time, ZoneOffset.UTC));
+
+        ze.setTime(timestamp);
         return ze;
     }
 
@@ -993,12 +986,6 @@ public class CreateSymbols {
         if (desc.runtimeAnnotations != null && !desc.runtimeAnnotations.isEmpty()) {
             builder.accept(RuntimeVisibleAnnotationsAttribute.of(createAnnotations(desc.runtimeAnnotations)));
         }
-        if (desc.classTypeAnnotations != null && !desc.classTypeAnnotations.isEmpty()) {
-            builder.accept(RuntimeInvisibleTypeAnnotationsAttribute.of(createTypeAnnotations(desc.classTypeAnnotations)));
-        }
-        if (desc.runtimeTypeAnnotations != null && !desc.runtimeTypeAnnotations.isEmpty()) {
-            builder.accept(RuntimeVisibleTypeAnnotationsAttribute.of(createTypeAnnotations(desc.runtimeTypeAnnotations)));
-        }
     }
 
     private List<Annotation> createAnnotations(List<AnnotationDescription> desc) {
@@ -1034,12 +1021,6 @@ public class CreateSymbols {
             annotationType = VALUE_BASED_ANNOTATION_INTERNAL;
         }
 
-        if (REQUIRES_IDENTITY_ANNOTATION.equals(annotationType)) {
-            //the non-public RequiresIdentity annotation will not be available in ct.sym,
-            //replace with purely synthetic javac-internal annotation:
-            annotationType = REQUIRES_IDENTITY_ANNOTATION_INTERNAL;
-        }
-
         if (RESTRICTED_ANNOTATION.equals(annotationType)) {
             //the non-public Restricted annotation will not be available in ct.sym,
             //replace with purely synthetic javac-internal annotation:
@@ -1074,44 +1055,6 @@ public class CreateSymbols {
             default -> throw new IllegalArgumentException(value.getClass().getName());
         };
     }
-
-    private List<TypeAnnotation> createTypeAnnotations(List<TypeAnnotationDescription> desc) {
-        return desc.stream().map(this::createTypeAnnotation).collect(Collectors.toList());
-    }
-
-    private TypeAnnotation createTypeAnnotation(TypeAnnotationDescription desc) {
-        Annotation baseAnn = createAnnotation(desc.annotation);
-        TargetInfo targetInfo = switch ((String) desc.targetInfo.get("targetType")) {
-            case "CLASS_TYPE_PARAMETER" -> //TODO: test!
-                TargetInfo.ofClassTypeParameter((int) desc.targetInfo.get("typeParameterIndex"));
-            case "METHOD_TYPE_PARAMETER" ->
-                TargetInfo.ofMethodTypeParameter((int) desc.targetInfo.get("typeParameterIndex"));
-            case "CLASS_EXTENDS" ->
-                TargetInfo.ofClassExtends((int) desc.targetInfo.get("supertypeIndex"));
-            case "CLASS_TYPE_PARAMETER_BOUND" ->
-                TargetInfo.ofClassTypeParameterBound((int) desc.targetInfo.get("typeParameterIndex"),
-                                                     (int) desc.targetInfo.get("boundIndex"));
-            case "METHOD_TYPE_PARAMETER_BOUND" ->
-                TargetInfo.ofMethodTypeParameterBound((int) desc.targetInfo.get("typeParameterIndex"),
-                                                      (int) desc.targetInfo.get("boundIndex"));
-            case "METHOD_RETURN" ->
-                TargetInfo.ofMethodReturn();
-            case "METHOD_RECEIVER" ->
-                TargetInfo.ofMethodReceiver();
-            case "METHOD_FORMAL_PARAMETER" ->
-                TargetInfo.ofMethodFormalParameter((int) desc.targetInfo.get("formalParameterIndex"));
-            case "THROWS" ->
-                TargetInfo.ofThrows((int) desc.targetInfo.get("throwsTargetIndex"));
-            case "FIELD" ->
-                TargetInfo.ofField();
-            case String targetType ->
-                throw new IllegalStateException("Unsupported targetType: " + targetType);
-        };
-
-        List<TypePathComponent> typePath = desc.typePath.stream().map(d -> TypePathComponent.of(TypePathComponent.Kind.valueOf(d.tag()), d.index())).toList();
-
-        return TypeAnnotation.of(targetInfo, typePath, baseAnn);
-    }
     //</editor-fold>
     //</editor-fold>
 
@@ -2259,10 +2202,6 @@ public class CreateSymbols {
                 chd.permittedSubclasses = a.permittedSubclasses().stream().map(ClassEntry::asInternalName).collect(Collectors.toList());
             }
             case ModuleMainClassAttribute a -> ((ModuleHeaderDescription) feature).moduleMainClass = a.mainClass().asInternalName();
-            case RuntimeInvisibleTypeAnnotationsAttribute a ->
-                feature.classTypeAnnotations = typeAnnotations2Descriptions(a.annotations());
-            case RuntimeVisibleTypeAnnotationsAttribute a ->
-                feature.runtimeTypeAnnotations = typeAnnotations2Descriptions(a.annotations());
             default -> throw new IllegalArgumentException("Unhandled attribute: " + attr.attributeName()); // Do nothing
         }
 
@@ -2319,31 +2258,6 @@ public class CreateSymbols {
 
         return new AnnotationDescription(annotationType, values);
     }
-
-    private List<TypeAnnotationDescription> typeAnnotations2Descriptions(List<TypeAnnotation> annos) {
-        return annos.stream().map(ta -> {
-            TypeAnnotationDescription desc = new TypeAnnotationDescription();
-            desc.annotation = annotation2Description(ta.annotation());
-            desc.targetInfo = new HashMap<>();
-            desc.targetInfo.put("targetType", ta.targetInfo().targetType().name());
-            switch (ta.targetInfo()) {
-                case TypeAnnotation.TypeParameterTarget tpt -> desc.targetInfo.put("typeParameterIndex", tpt.typeParameterIndex());
-                case TypeAnnotation.SupertypeTarget st -> desc.targetInfo.put("supertypeIndex", st.supertypeIndex());
-                case TypeAnnotation.TypeParameterBoundTarget tpbt -> {
-                    desc.targetInfo.put("typeParameterIndex", tpbt.typeParameterIndex());
-                    desc.targetInfo.put("boundIndex", tpbt.boundIndex());
-                }
-                case TypeAnnotation.EmptyTarget _ -> {
-                    // nothing to write
-                }
-                case TypeAnnotation.FormalParameterTarget fpt -> desc.targetInfo.put("formalParameterIndex", fpt.formalParameterIndex());
-                case TypeAnnotation.ThrowsTarget tt -> desc.targetInfo.put("throwsTargetIndex", tt.throwsTargetIndex());
-                default -> throw new IllegalStateException(ta.targetInfo().targetType().name());
-            }
-            desc.typePath = ta.targetPath().stream().map(tpc -> new TypeAnnotationDescription.TypePathComponentDesc(tpc.typePathKind().name(), tpc.typeArgumentIndex())).toList();
-            return desc;
-        }).toList();
-    }
     //</editor-fold>
 
     protected boolean includeEffectiveAccess(ClassList classes, ClassDescription clazz) {
@@ -2465,8 +2379,6 @@ public class CreateSymbols {
         String versions = "";
         List<AnnotationDescription> classAnnotations;
         List<AnnotationDescription> runtimeAnnotations;
-        List<TypeAnnotationDescription> classTypeAnnotations;
-        List<TypeAnnotationDescription> runtimeTypeAnnotations;
 
         protected void writeAttributes(Appendable output) throws IOException {
             if (flags != 0)
@@ -2489,18 +2401,6 @@ public class CreateSymbols {
                     output.append(quote(a.toString(), false));
                 }
             }
-            if (classTypeAnnotations != null && !classTypeAnnotations.isEmpty()) {
-                output.append(" classTypeAnnotations ");
-                for (TypeAnnotationDescription a : classTypeAnnotations) {
-                    output.append(quote(a.toString(), false));
-                }
-            }
-            if (runtimeTypeAnnotations != null && !runtimeTypeAnnotations.isEmpty()) {
-                output.append(" runtimeTypeAnnotations ");
-                for (TypeAnnotationDescription a : runtimeTypeAnnotations) {
-                    output.append(quote(a.toString(), false));
-                }
-            }
         }
 
         protected boolean shouldIgnore(String baselineVersion, String version) {
@@ -2530,14 +2430,6 @@ public class CreateSymbols {
             if (inRuntimeAnnotations != null) {
                 runtimeAnnotations = parseAnnotations(inRuntimeAnnotations, new int[1]);
             }
-            String inClassTypeAnnotations = reader.attributes.get("classTypeAnnotations");
-            if (inClassTypeAnnotations != null) {
-                classTypeAnnotations = parseTypeAnnotations(inClassTypeAnnotations, new int[1]);
-            }
-            String inRuntimeTypeAnnotations = reader.attributes.get("runtimeTypeAnnotations");
-            if (inRuntimeTypeAnnotations != null) {
-                runtimeTypeAnnotations = parseTypeAnnotations(inRuntimeTypeAnnotations, new int[1]);
-            }
         }
 
         public abstract boolean read(LineBasedReader reader) throws IOException;
@@ -2550,8 +2442,6 @@ public class CreateSymbols {
             hash = 89 * hash + Objects.hashCode(this.signature);
             hash = 89 * hash + listHashCode(this.classAnnotations);
             hash = 89 * hash + listHashCode(this.runtimeAnnotations);
-            hash = 89 * hash + listHashCode(this.classTypeAnnotations);
-            hash = 89 * hash + listHashCode(this.runtimeTypeAnnotations);
             return hash;
         }
 
@@ -2579,12 +2469,6 @@ public class CreateSymbols {
             if (!listEquals(this.runtimeAnnotations, other.runtimeAnnotations)) {
                 return false;
             }
-            if (!listEquals(this.classTypeAnnotations, other.classTypeAnnotations)) {
-                return false;
-            }
-            if (!listEquals(this.runtimeTypeAnnotations, other.runtimeTypeAnnotations)) {
-                return false;
-            }
             return true;
         }
 
@@ -3389,8 +3273,6 @@ public class CreateSymbols {
             hash = 59 * hash + Objects.hashCode(this.descriptor);
             hash = 59 * hash + Objects.hashCode(this.thrownTypes);
             hash = 59 * hash + Objects.hashCode(this.annotationDefaultValue);
-            hash = 59 * hash + Objects.hashCode(this.classParameterAnnotations);
-            hash = 59 * hash + Objects.hashCode(this.runtimeParameterAnnotations);
             return hash;
         }
 
@@ -3415,12 +3297,6 @@ public class CreateSymbols {
             if (!Objects.equals(this.annotationDefaultValue, other.annotationDefaultValue)) {
                 return false;
             }
-            if (!Objects.equals(this.classParameterAnnotations, other.classParameterAnnotations)) {
-                return false;
-            }
-            if (!Objects.equals(this.runtimeParameterAnnotations, other.runtimeParameterAnnotations)) {
-                return false;
-            }
             return true;
         }
 
@@ -3748,40 +3624,6 @@ public class CreateSymbols {
         }
     }
 
-    static final class TypeAnnotationDescription {
-        AnnotationDescription annotation;
-        Map<String, Object> targetInfo;
-        List<TypePathComponentDesc> typePath;
-
-        public TypeAnnotationDescription() {
-        }
-
-        public TypeAnnotationDescription(AnnotationDescription annotation, Map<String, Object> targetInfo, List<TypePathComponentDesc> typePath) {
-            this.annotation = annotation;
-            this.targetInfo = targetInfo;
-            this.typePath = typePath;
-        }
-
-        @Override
-        public String toString() {
-            return annotation.toString() + "{" + targetInfo.entrySet().stream().map(e -> e.getKey() + "=" + quote(printValue(e.getValue()), false)).collect(Collectors.joining(",")) + "}" +
-                                           (!typePath.isEmpty() ? "[" + typePath.stream().map(desc -> desc.tag + ":" + desc.index).collect(Collectors.joining(",")) + "]" : "");
-        }
-
-        private String printValue(Object obj) {
-            if (obj instanceof String s) {
-                return "\"" + s + "\"";
-            } else if (obj instanceof Integer i) {
-                return "I" + String.valueOf(i);
-            } else {
-                throw new IllegalStateException("Unsupported value: " + obj.getClass());
-            }
-        }
-
-        //TODO: path
-        record TypePathComponentDesc(String tag, int index) {}
-    }
-
     static final class EnumConstant {
         String type;
         String constant;
@@ -4121,69 +3963,23 @@ public class CreateSymbols {
 
     private static AnnotationDescription parseAnnotation(String value, int[] valuePointer) {
         String className = className(value, valuePointer);
-        Map<String, Object> attribute2Value = Map.of();
-
-        if (valuePointer[0] < value.length() && value.charAt(valuePointer[0]) == '(') {
-            attribute2Value = parseMap(value, valuePointer, ')');
-        }
-
-        return new AnnotationDescription(className, attribute2Value);
-    }
-
-    private static Map<String, Object> parseMap(String value, int[] valuePointer, char endBracket) {
         Map<String, Object> attribute2Value = new HashMap<>();
 
-        while (value.charAt(valuePointer[0]) != endBracket) {
-            int nameStart = ++valuePointer[0];
-
-            while (value.charAt(valuePointer[0]++) != '=');
-
-            String name = value.substring(nameStart, valuePointer[0] - 1);
-
-            attribute2Value.put(name, parseAnnotationValue(value, valuePointer));
-        }
-
-        valuePointer[0]++;
-
-        return attribute2Value;
-    }
-
-    public static List<TypeAnnotationDescription> parseTypeAnnotations(String encoded, int[] pointer) {
-        List<TypeAnnotationDescription> result = new ArrayList<>();
-
-        while (pointer[0] < encoded.length() && encoded.charAt(pointer[0]) == '@') {
-            pointer[0]++;
-            result.add(parseTypeAnnotation(encoded, pointer));
-        }
-
-        return result;
-    }
-
-    private static TypeAnnotationDescription parseTypeAnnotation(String value, int[] valuePointer) {
-        AnnotationDescription ann = parseAnnotation(value, valuePointer);
-        Map<String, Object> targetInfo = Map.of();
-
-        if (valuePointer[0] < value.length() && value.charAt(valuePointer[0]) == '{') {
-            targetInfo = parseMap(value, valuePointer, '}');
-        }
-
-        List<TypeAnnotationDescription.TypePathComponentDesc> typePath = new ArrayList<>();
-
-        if (valuePointer[0] < value.length() && value.charAt(valuePointer[0]) == '[') {
-            while (value.charAt(valuePointer[0]) != ']') {
+        if (valuePointer[0] < value.length() && value.charAt(valuePointer[0]) == '(') {
+            while (value.charAt(valuePointer[0]) != ')') {
                 int nameStart = ++valuePointer[0];
 
-                while (value.charAt(valuePointer[0]++) != ':');
+                while (value.charAt(valuePointer[0]++) != '=');
 
                 String name = value.substring(nameStart, valuePointer[0] - 1);
 
-                typePath.add(new TypeAnnotationDescription.TypePathComponentDesc(name, Integer.parseInt(readDigits(value, valuePointer))));
+                attribute2Value.put(name, parseAnnotationValue(value, valuePointer));
             }
 
             valuePointer[0]++;
         }
 
-        return new TypeAnnotationDescription(ann, targetInfo, typePath);
+        return new AnnotationDescription(className, attribute2Value);
     }
     //</editor-fold>
 

make/modules/java.base/Java.gmk

@@ -41,6 +41,11 @@ CLEAN += intrinsic.properties
 EXCLUDE_FILES += \
   $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
 
+EXCLUDES += java/lang/doc-files \
+    java/lang/classfile/snippet-files \
+    java/lang/classfile/components/snippet-files \
+    java/lang/foreign/snippet-files
+
 # Exclude BreakIterator classes that are just used in compile process to generate
 # data files and shouldn't go in the product
 EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java

make/modules/java.base/Lib.gmk

@@ -158,7 +158,6 @@ endif
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBSYSLOOKUP, \
     NAME := syslookup, \
-    EXTRA_HEADER_DIRS := java.base:libjava, \
     LD_SET_ORIGIN := false, \
     LDFLAGS_linux := -Wl$(COMMA)--no-as-needed, \
     LDFLAGS_aix := -brtl -bexpfull, \

make/modules/java.compiler/Java.gmk

@@ -32,4 +32,6 @@
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'
 
+EXCLUDES += javax/tools/snippet-files
+
 ################################################################################

make/modules/java.desktop/Java.gmk

@@ -31,6 +31,15 @@ DOCLINT += -Xdoclint:all/protected \
 COPY += .gif .png .wav .txt .xml .css .pf
 CLEAN += iio-plugin.properties cursors.properties
 
+EXCLUDES += \
+    java/awt/doc-files \
+    javax/swing/doc-files \
+    javax/swing/text/doc-files \
+    javax/swing/plaf/synth/doc-files \
+    javax/swing/undo/doc-files \
+    sun/awt/X11/doc-files \
+    #
+
 EXCLUDE_FILES += \
     javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
     javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
@@ -120,8 +129,7 @@ ifeq ($(call isTargetOs, windows macosx), false)
 endif
 
 ifneq ($(VULKAN_ENABLED), true)
-  EXCLUDE_FILES += $(filter-out $(TOPDIR)/src/java.desktop/share/classes/sun/java2d/vulkan/VKEnv.java, \
-                                $(wildcard $(TOPDIR)/src/java.desktop/*/classes/sun/java2d/vulkan/*.java))
+  EXCLUDES += sun/java2d/vulkan
 endif
 
 # These files do not appear in the build result of the old build. This

make/modules/java.desktop/Lib.gmk

@@ -65,7 +65,6 @@ ifeq ($(call isTargetOs, aix), false)
       CXXFLAGS := $(LIBJSOUND_CFLAGS), \
       DISABLED_WARNINGS_gcc := undef unused-variable, \
       DISABLED_WARNINGS_clang := undef unused-variable, \
-      DISABLED_WARNINGS_clang_PLATFORM_API_MacOSX_Ports.cpp := vla-cxx-extension, \
       DISABLED_WARNINGS_clang_PLATFORM_API_MacOSX_MidiUtils.c := \
           unused-but-set-variable, \
       DISABLED_WARNINGS_clang_DirectAudioDevice.c := unused-function, \

make/modules/java.desktop/gensrc/GensrcWayland.gmk

@@ -33,12 +33,8 @@ WAYLAND_BASIC_PROTOCOL_FILES := \
         $(WAYLAND_PROTOCOLS_ROOT)/stable/viewporter/viewporter.xml \
         $(WAYLAND_PROTOCOLS_ROOT)/stable/xdg-shell/xdg-shell.xml \
         $(WAYLAND_PROTOCOLS_ROOT)/staging/xdg-activation/xdg-activation-v1.xml \
-        $(WAYLAND_PROTOCOLS_ROOT)/staging/xdg-toplevel-icon/xdg-toplevel-icon-v1.xml \
         $(WAYLAND_PROTOCOLS_ROOT)/unstable/primary-selection/primary-selection-unstable-v1.xml \
         $(WAYLAND_PROTOCOLS_ROOT)/unstable/xdg-output/xdg-output-unstable-v1.xml \
-        $(WAYLAND_PROTOCOLS_ROOT)/unstable/relative-pointer/relative-pointer-unstable-v1.xml \
-        $(WAYLAND_PROTOCOLS_ROOT)/unstable/text-input/text-input-unstable-v3.xml \
-        $(WAYLAND_PROTOCOLS_ROOT)/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml \
         $(GTK_SHELL1_PROTOCOL_PATH) \
         #
 

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

@@ -58,6 +58,7 @@ ifeq ($(call isTargetOs, windows), true)
       $(TOPDIR)/src/$(MODULE)/share/native/common/font \
       $(TOPDIR)/src/$(MODULE)/share/native/common/java2d/opengl \
       $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt/systemscale \
+      $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/launcher \
       #
 endif
 
@@ -101,7 +102,6 @@ ifeq ($(call isTargetOs, windows), true)
   LIBAWT_RCFLAGS ?= -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
   LIBAWT_VERSIONINFO_RESOURCE := \
       $(TOPDIR)/src/$(MODULE)/windows/native/libawt/windows/awt.rc
-  LIBAWT_EXTRA_HEADER_DIRS += $(TOPDIR)/src/java.base/windows/native/launcher
 endif
 
 # This is the object file to provide the dladdr API, which is not
@@ -150,9 +150,6 @@ ifeq ($(VULKAN_ENABLED), true)
   LIBAWT_EXTRA_HEADER_DIRS += common/font common/java2d/vulkan common/java2d
   LIBAWT_CFLAGS += $(VULKAN_FLAGS)
   LIBAWT_EXTRA_FILES += $(TOPDIR)/src/$(MODULE)/share/native/common/java2d/AccelTexturePool.c
-  VULKAN_EXCLUDES := vulkan
-else
-  VULKAN_EXCLUDES := vulkan java2d/vulkan
 endif
 
 # -fgcse-after-reload improves performance of MaskFill in Java2D by 20% for
@@ -199,7 +196,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
         -framework OpenGL, \
     LIBS_windows := advapi32.lib comctl32.lib comdlg32.lib delayimp.lib \
         gdi32.lib gdiplus.lib imm32.lib kernel32.lib ole32.lib shell32.lib shlwapi.lib \
-        user32.lib uuid.lib winmm.lib winspool.lib dwmapi.lib $(A11Y_NVDA_ANNOUNCING_LIBS) oleacc.lib, \
+        user32.lib uuid.lib winmm.lib winspool.lib dwmapi.lib $(A11Y_NVDA_ANNOUNCING_LIBS), \
     VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
     EXTRA_RCFLAGS := $(LIBAWT_RCFLAGS), \
     STATIC_LIB_EXCLUDE_OBJS := $(LIBAWT_STATIC_EXCLUDE_OBJS), \
@@ -220,7 +217,7 @@ endif
 # Compile Vulkan shaders
 define compile-spirv
   $(call MakeTargetDir)
-  $(VULKAN_SHADER_COMPILER) -D$(call uppercase,$(patsubst .%,STAGE_%,$(suffix $<))) -o '$(call DecodeSpace, $@)' '$(call DecodeSpace, $<)'
+  $(VULKAN_SHADER_COMPILER) '$(call DecodeSpace, $@)' '$(call DecodeSpace, $<)'
 endef
 spirv-name = $(strip $1).h
 
@@ -283,7 +280,7 @@ ifeq ($(call isTargetOs, windows macosx), false)
   $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \
       NAME := awt_headless, \
       EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \
-      EXCLUDES := medialib wl $(VULKAN_EXCLUDES), \
+      EXCLUDES := medialib wl vulkan, \
       ONLY_EXPORTED := $(LIBAWT_HEADLESS_ONLY_EXPORTED), \
       OPTIMIZATION := LOW, \
       CFLAGS := -DHEADLESS=true $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) \
@@ -364,7 +361,7 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
       NAME := awt_xawt, \
       EXTRA_SRC := $(LIBAWT_XAWT_EXTRA_SRC), \
       EXTRA_HEADER_DIRS := $(LIBAWT_XAWT_EXTRA_HEADER_DIRS), \
-      EXCLUDES := medialib debug wl $(VULKAN_EXCLUDES), \
+      EXCLUDES := medialib debug wl vulkan, \
       OPTIMIZATION := LOW, \
       CFLAGS := -DXAWT -DXAWT_HACK $(LIBAWT_XAWT_CFLAGS) $(DBUS_CFLAGS) \
           $(FONTCONFIG_CFLAGS) $(CUPS_CFLAGS) $(X_CFLAGS), \
@@ -386,6 +383,7 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
       DISABLED_WARNINGS_gcc_X11TextRenderer_md.c := unused-but-set-variable, \
       DISABLED_WARNINGS_gcc_XlibWrapper.c := type-limits pointer-to-int-cast, \
       DISABLED_WARNINGS_gcc_XRBackendNative.c := maybe-uninitialized, \
+      DISABLED_WARNINGS_gcc_XToolkit.c := unused-result, \
       DISABLED_WARNINGS_gcc_XWindow.c := unused-function, \
       DISABLED_WARNINGS_gcc_awt_InputMethod.c := unused-label, \
       DISABLED_WARNINGS_clang_awt_Taskbar.c := parentheses, \
@@ -427,7 +425,7 @@ ifeq ($(call isTargetOs, windows macosx), false)
         $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/wayland \
         #
 
-    LIBAWT_WLAWT_EXCLUDES := medialib debug opengl x11 $(VULKAN_EXCLUDES)
+    LIBAWT_WLAWT_EXCLUDES := medialib debug opengl vulkan x11
     LIBAWT_WLAWT_EXCLUDE_FILES := common/awt/X11Color.c common/awt/awt_Font.c
 
     LIBAWT_WLAWT_EXTRA_HEADER_DIRS := \
@@ -531,7 +529,7 @@ ifeq ($(call isTargetOs, macosx), true)
       #
 
   LIBAWT_LWAWT_EXCLUDE_FILES := fontpath.c awt_Font.c X11Color.c
-  LIBAWT_LWAWT_EXCLUDES := $(VULKAN_EXCLUDES) \
+  LIBAWT_LWAWT_EXCLUDES := vulkan \
         $(TOPDIR)/src/$(MODULE)/unix/native/common/awt/medialib \
         #
 

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

@@ -87,7 +87,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
         libawt/java2d \
         java.base:libjvm, \
     HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
-    DISABLED_WARNINGS_gcc := format-nonliteral stringop-truncation \
+    DISABLED_WARNINGS_gcc := format-nonliteral stringop-truncation type-limits \
         unused-variable, \
     DISABLED_WARNINGS_clang := format-nonliteral, \
     JDK_LIBS := libawt java.base:libjava, \

make/modules/jdk.jdi/Java.gmk

@@ -31,6 +31,7 @@ EXCLUDES += \
     com/sun/tools/example/debug/bdi \
     com/sun/tools/example/debug/event \
     com/sun/tools/example/debug/gui \
+    com/sun/jdi/doc-files \
     #
 
 EXCLUDE_FILES += jdi-overview.html

make/modules/jdk.jdwp.agent/Lib.gmk

@@ -68,7 +68,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \
     DISABLED_WARNINGS_clang_threadControl.c := unused-but-set-variable \
         unused-variable, \
     DISABLED_WARNINGS_clang_utf_util.c := unused-but-set-variable, \
-    DISABLED_WARNINGS_microsoft_debugInit.c := 5287, \
     LDFLAGS := $(ICONV_LDFLAGS), \
     EXTRA_HEADER_DIRS := \
         include \

make/scripts/fixpath.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -157,21 +157,11 @@ function import_path() {
     if [[ $? -eq 0 && -e "$unixpath" ]]; then
       if [[ ! "$winpath" =~ ^"$ENVROOT"\\.*$ ]] ; then
         # If it is not in envroot, it's a generic windows path
-        if [[ ! $winpath =~ ^[-_.:~+\\a-zA-Z0-9]*$ ]] ; then
+        if [[ ! $winpath =~ ^[-_.:\\a-zA-Z0-9]*$ ]] ; then
           # Path has forbidden characters, rewrite as short name
           # This monster of a command uses the %~s support from cmd.exe to
           # reliably convert to short paths on all winenvs.
           shortpath="$($CMD /q /c for %I in \( "$winpath" \) do echo %~sI 2>/dev/null | tr -d \\n\\r)"
-          if [[ ! $shortpath =~ ^[-_.:~+\\a-zA-Z0-9]*$ ]] ; then
-            if [[ $QUIET != true ]]; then
-              echo fixpath: failure: Path "'"$path"'" could not be converted to short path >&2
-            fi
-            if [[ $IGNOREFAILURES != true ]]; then
-              exit 1
-            else
-              shortpath=""
-            fi
-          fi
           unixpath="$($PATHTOOL -u "$shortpath")"
           # unixpath is based on short name
         fi

make/test/BuildMicrobenchmark.gmk

@@ -119,6 +119,7 @@ $(JMH_UNPACKED_JARS_DONE): $(JMH_RUNTIME_JARS)
 	$(foreach jar, $(JMH_RUNTIME_JARS), \
             $$($(UNZIP) -oq $(jar) -d $(JMH_UNPACKED_DIR)))
 	$(RM) -r $(JMH_UNPACKED_DIR)/META-INF
+	$(RM) $(JMH_UNPACKED_DIR)/*.xml
 	$(TOUCH) $@
 
 # Copy dependency files for inclusion in the benchmark JARs

src/demo/share/jfc/CodePointIM/README.html

@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>README - CodePointIM</title>
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
 </head>
 <body>
 <h1>Code Point Input Method</h1>

src/demo/share/jfc/Metalworks/resources/HelpFiles/metal.html

@@ -1,6 +1,6 @@
 <HTML>
 <HEAD>
-  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
   <META NAME="GENERATOR" CONTENT="Mozilla/4.02 [en] (X11; U; SunOS 5.6 sun4u) [Netscape]">
   <TITLE>Java L&amp;F</TITLE>
 </HEAD>
@@ -39,7 +39,7 @@ icons used by the L&amp;F.</P>
 <P>The theme mechanism is designed to allow developers to create
 their own themes. For an example of this, see the themes
 which are included with Metalworks. Note, like all of the L&amp;F packages,
-the metal package is not yet frozen and the theme mechanism may change as
+the metal package is not yet frozen and the theme mechanism may change as 
 we get developer feedback on how to improve it.</P>
 
 <H1>
@@ -53,7 +53,7 @@ is an example:</P>
 
 <PRE>
 JSlider slider = new JSlider();<BR>
-slider.putClientProperty("JSlider.isFilled",
+slider.putClientProperty("JSlider.isFilled", 
                          Boolean.TRUE);<BR> <BR>
 </PRE>
 
@@ -64,7 +64,7 @@ to a different L&amp;F.</P>
 
 <H1>
 ToolBars</H1>
-<P>Many popular applications support "roll-over" effects on buttons in toolbars.
+<P>Many popular applications support "roll-over" effects on buttons in toolbars. 
 The Java L&amp;F provides an easy way to do this. Here is a code snippit:</P>
 
 <PRE>
@@ -72,7 +72,7 @@ JToolBar toolbar = new JToolBar();<BR>
 
 // add your buttons here<BR>
 
-toolbar.putClientProperty("JToolBar.isRollover",
+toolbar.putClientProperty("JToolBar.isRollover", 
                           Boolean.TRUE);<BR>
 </PRE>
 
@@ -98,7 +98,7 @@ myTree.putClientProperty("JTree.lineStyle",
 // This will provide lines separating root notes
 // it is the default setting
 myTree.putClientProperty("JTree.lineStyle",
-                         "Horizontal");
+                         "Horizontal"); 
 </PRE>
 
 <P><A HREF="toc.html"><IMG alt="Back"  SRC="back.gif" BORDER=0 HEIGHT=22 WIDTH=42 ALIGN=BOTTOM>Back</A>

src/demo/share/jfc/Metalworks/resources/HelpFiles/metalworks.html

@@ -1,6 +1,6 @@
 <HTML>
 <HEAD>
-   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
    <META NAME="GENERATOR" CONTENT="Mozilla/4.02 [en] (X11; U; SunOS 5.6 sun4u) [Netscape]">
    <TITLE>Metalworks</TITLE>
 </HEAD>

src/demo/share/jfc/SwingSet2/resources/ant.html

@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
@@ -10,106 +10,106 @@
 </h1>
 <p align="center"><img src="images/Octavo/ant.jpg" width="481" height="325"></p>
 <p align="center">&nbsp;</p>
-<blockquote>
+<blockquote> 
   <blockquote>
-   <p><font size="4">This was a creature, more troublesom to be drawn, then any
-      of the rest, for I could not, for a good while, think of a way to make it
+   <p><font size="4">This was a creature, more troublesom to be drawn, then any 
+      of the rest, for I could not, for a good while, think of a way to make it 
       suffer its body to ly quiet in a natural posture; but whil'st it was alive,
-      if its feet were fetter'd in Wax or Glew, it would so twist and wind its body,
-      that I could not any wayes get a good view of it; and if I killed it, its
-      body was so little, that I did often spoile the shape of it, before I could
-      throughly view it: for this is the nature of these minute Bodies, that as
-      soon, almost, as ever their life is destroy'd, their parts immediately shrivel,
-      and lose their beauty; and so is it also with small Plants, as I instanced
+      if its feet were fetter'd in Wax or Glew, it would so twist and wind its body, 
+      that I could not any wayes get a good view of it; and if I killed it, its 
+      body was so little, that I did often spoile the shape of it, before I could 
+      throughly view it: for this is the nature of these minute Bodies, that as 
+      soon, almost, as ever their life is destroy'd, their parts immediately shrivel, 
+      and lose their beauty; and so is it also with small Plants, as I instanced 
       before, in the description of Moss. </font></p>
-    <p><font size="4">And thence also is the reason of the variations in the beards
-      of wild Oats, and in those of Muskgrass seed, that their bodies, being exceeding
-      small, those small variations which are made in the surfaces of all bodies,
-      almost upon every change of Air, especially if the body be porous, do here
-      become sensible, where the whole body is so small, that it is almost nothing
-      but surface; for as in vegetable substances, I see no great reason to think,
-      that the moisture of the Aire (that, sticking to a wreath'd beard, does make
-      it untwist) should evaporate, or exhale away, any faster then the moisture
-      of other bodies, but rather that the avolation from, or access of moisture
-      to, the surfaces of bodies being much the same, those bodies become most
-      sensible of it, which have the least proportion of body to their surface.
+    <p><font size="4">And thence also is the reason of the variations in the beards 
+      of wild Oats, and in those of Muskgrass seed, that their bodies, being exceeding 
+      small, those small variations which are made in the surfaces of all bodies, 
+      almost upon every change of Air, especially if the body be porous, do here 
+      become sensible, where the whole body is so small, that it is almost nothing 
+      but surface; for as in vegetable substances, I see no great reason to think, 
+      that the moisture of the Aire (that, sticking to a wreath'd beard, does make 
+      it untwist) should evaporate, or exhale away, any faster then the moisture 
+      of other bodies, but rather that the avolation from, or access of moisture 
+      to, the surfaces of bodies being much the same, those bodies become most 
+      sensible of it, which have the least proportion of body to their surface. 
       </font></p>
-    <p><font size="4">So is it also with Animal substances; the dead body of an
-      Ant, or such little creature, does almost instantly shrivel and dry, and
-      your object shall be quite another thing, before you can half delineate
-      it, which proceeds not from the extraordinary exhalation, but from the small
-      proportion of body and juices, to the usual drying of bodies in the Air,
+    <p><font size="4">So is it also with Animal substances; the dead body of an 
+      Ant, or such little creature, does almost instantly shrivel and dry, and 
+      your object shall be quite another thing, before you can half delineate 
+      it, which proceeds not from the extraordinary exhalation, but from the small 
+      proportion of body and juices, to the usual drying of bodies in the Air, 
       especially if warm. </font></p>
-    <p><font size="4">For which inconvenience, where I could not otherwise remove
-      it, I thought of this expedient. I took the creature, I had design'd to delineate,
-      and put it into a drop of very well rectified spirit of Wine, this I found
-      would presently dispatch, as it were, the Animal, and being taken out of
-      it, and lay'd on a paper,the spirit of Wine would immediately fly away,
-      and leave the Animal dry, in its natural posture, or at least, in a constitution,
-      that it might easily with a pin be plac'd, in what posture you desired to
-      draw it, and the limbs would so remain, without either moving, or shriveling.
+    <p><font size="4">For which inconvenience, where I could not otherwise remove 
+      it, I thought of this expedient. I took the creature, I had design'd to delineate, 
+      and put it into a drop of very well rectified spirit of Wine, this I found 
+      would presently dispatch, as it were, the Animal, and being taken out of 
+      it, and lay'd on a paper,the spirit of Wine would immediately fly away, 
+      and leave the Animal dry, in its natural posture, or at least, in a constitution, 
+      that it might easily with a pin be plac'd, in what posture you desired to 
+      draw it, and the limbs would so remain, without either moving, or shriveling. 
       </font></p>
-    <p><font size="4">And thus I dealt with this Ant, which I have here delineated,
-      which was one of many, of a very large kind, that inhabited under the Roots
-      of a Tree, from whence they would sally out in great parties, and make most
-      grievous havock of the Flowers and Fruits, in the ambient Garden, and return back
+    <p><font size="4">And thus I dealt with this Ant, which I have here delineated, 
+      which was one of many, of a very large kind, that inhabited under the Roots 
+      of a Tree, from whence they would sally out in great parties, and make most 
+      grievous havock of the Flowers and Fruits, in the ambient Garden, and return back 
       again very expertly, by the same wayes and paths they went. </font></p>
-    <p><font size="4">It was more then half the bigness of an Earwig, of a dark
-      brown, or reddish colour, with long legs, on the hinder of which it would
-      stand up, and raise its head as high as it could above the ground, that it
-      might stare the further about it, just after the same manner as I have also
-      observ'd a hunting Spider to do: and putting my finger towards them, they
-      have at first all run towards it, till almost at it; and then they would stand
-      round about it, at a certain distance, and smell, as it were, and consider
-      whether they should any of them venture any further, till one more bold then
-      the rest venturing to climb it, all the rest, if I would have suffered them,
-      would have immediately followed : much such other seemingly rational actions
-      I have observ'd in this little Vermine with much pleasure, which would be
-      too long to be here related; those that desire more of them may satisfie
+    <p><font size="4">It was more then half the bigness of an Earwig, of a dark 
+      brown, or reddish colour, with long legs, on the hinder of which it would 
+      stand up, and raise its head as high as it could above the ground, that it 
+      might stare the further about it, just after the same manner as I have also 
+      observ'd a hunting Spider to do: and putting my finger towards them, they 
+      have at first all run towards it, till almost at it; and then they would stand 
+      round about it, at a certain distance, and smell, as it were, and consider 
+      whether they should any of them venture any further, till one more bold then 
+      the rest venturing to climb it, all the rest, if I would have suffered them, 
+      would have immediately followed : much such other seemingly rational actions 
+      I have observ'd in this little Vermine with much pleasure, which would be 
+      too long to be here related; those that desire more of them may satisfie 
       their curiosity in Ligons History of the Barbadoes. </font></p>
-    <p><font size="4">Having insnar'd several of these into a small Box, I made
-      choice of the tallest grown among them, and separating it from the rest,
-      I gave it a Gill of Brandy, or Spirit of Wine, which after a while e'en knock'd
-      him down dead drunk, so that he became moveless, though at first putting
-      in he struggled for a pretty while very much, till at last, certain bubbles
-      issuing out of his mouth, it ceased to move; this (because I had before found
-      them quickly to recover again, if they were taken out presently) I suffered
-      to lye above an hour in the Spirit; and after I had taken it out, and put
-      its body and legs into a natural posture, remained moveless about an hour;
-      but then, upon a sudden, as if it had been awaken out of a drunken sleep,
-      it suddenly reviv'd and ran away; being caught, and serv'd as before, he
-      for a while continued struggling and striving, till at last there issued
-      several bubbles out of its mouth, and then, tanquam animam expirasset, he
-      remained moveless for a good while ; but at length again recovering, it was
-      again redipt, and suffered to lye some hours in the Spirit; notwithstanding
-      which, after it had layen dry some three or four hours, it again recovered
-      life and motion: Which kind of Experiments, if prosecuted, which they highly
-      deserve, seem to me of no inconsiderable use towards the invention of the
-      Latent Scheme, (as the Noble Ve rulam calls it) or the hidden, unknown Texture
+    <p><font size="4">Having insnar'd several of these into a small Box, I made 
+      choice of the tallest grown among them, and separating it from the rest, 
+      I gave it a Gill of Brandy, or Spirit of Wine, which after a while e'en knock'd 
+      him down dead drunk, so that he became moveless, though at first putting 
+      in he struggled for a pretty while very much, till at last, certain bubbles 
+      issuing out of his mouth, it ceased to move; this (because I had before found 
+      them quickly to recover again, if they were taken out presently) I suffered 
+      to lye above an hour in the Spirit; and after I had taken it out, and put 
+      its body and legs into a natural posture, remained moveless about an hour; 
+      but then, upon a sudden, as if it had been awaken out of a drunken sleep, 
+      it suddenly reviv'd and ran away; being caught, and serv'd as before, he 
+      for a while continued struggling and striving, till at last there issued 
+      several bubbles out of its mouth, and then, tanquam animam expirasset, he 
+      remained moveless for a good while ; but at length again recovering, it was 
+      again redipt, and suffered to lye some hours in the Spirit; notwithstanding 
+      which, after it had layen dry some three or four hours, it again recovered 
+      life and motion: Which kind of Experiments, if prosecuted, which they highly 
+      deserve, seem to me of no inconsiderable use towards the invention of the 
+      Latent Scheme, (as the Noble Ve rulam calls it) or the hidden, unknown Texture 
       of Bodies. </font></p>
-    <p><font size="4">Of what Figure this Creature appear'd through the Microscope,
-      the 32. Scheme (though not so carefully graven as it ought) will represent
-      to the eye, namely, That it had a large head A A, at the upper end of which
-      were two protuberant eyes, pearl'd like those of a Fly, but smaller B B;
-      of the Nose, or foremost part, issued two horns C C, of a shape sufficiently
-      differing from those of a blew Fly, though indeed they seem to be both the
-      same kind of Organ, and to serve for a kind of smelling; beyond these were
-      two indented jaws D D, which he open'd sideways, and was able to gape them
-      asunder very wide; and the ends of them being armed with teeth, which meeting
-      went between each other, it was able to grasp and hold a heavy body, three
-      or four times the bulk and weight of its own body: It had only six legs,
-      shap'd like those of a Fly, which, as I shewed before, is an Argument that
-      it is a winged Insect, and though I could not perceive any sign of them in
-      the middle part of its body (which seem'd to consist of three joints or pieces
-      E F G, out of which sprung two legs, yet 'tis known that there are of them
+    <p><font size="4">Of what Figure this Creature appear'd through the Microscope, 
+      the 32. Scheme (though not so carefully graven as it ought) will represent 
+      to the eye, namely, That it had a large head A A, at the upper end of which 
+      were two protuberant eyes, pearl'd like those of a Fly, but smaller B B; 
+      of the Nose, or foremost part, issued two horns C C, of a shape sufficiently 
+      differing from those of a blew Fly, though indeed they seem to be both the 
+      same kind of Organ, and to serve for a kind of smelling; beyond these were 
+      two indented jaws D D, which he open'd sideways, and was able to gape them 
+      asunder very wide; and the ends of them being armed with teeth, which meeting 
+      went between each other, it was able to grasp and hold a heavy body, three 
+      or four times the bulk and weight of its own body: It had only six legs, 
+      shap'd like those of a Fly, which, as I shewed before, is an Argument that 
+      it is a winged Insect, and though I could not perceive any sign of them in 
+      the middle part of its body (which seem'd to consist of three joints or pieces 
+      E F G, out of which sprung two legs, yet 'tis known that there are of them 
       that have long wings, and fly up and down in the air. </font></p>
-    <p><font size="4">The third and last part of its body I I I was bigger and
-      larger then the other two, unto which it was joyn'd by a very small middle,
-      and had a kind of loose shell, or another distinct part of its body H, which
-      seem'd to be interpos'd, and to keep the thorax and belly from touching.
-      The whole body was cas'd over with a very strong armour, and the belly I
-      I I was covered likewise with multitudes of small white shining brisles;
-      the legs, horns, head, and middle parts of its body were bestruck with hairs
+    <p><font size="4">The third and last part of its body I I I was bigger and 
+      larger then the other two, unto which it was joyn'd by a very small middle, 
+      and had a kind of loose shell, or another distinct part of its body H, which 
+      seem'd to be interpos'd, and to keep the thorax and belly from touching. 
+      The whole body was cas'd over with a very strong armour, and the belly I 
+      I I was covered likewise with multitudes of small white shining brisles; 
+      the legs, horns, head, and middle parts of its body were bestruck with hairs 
       also, but smaller and darker. </font></p>
   </blockquote>
   <p>&nbsp;</p>

src/demo/share/jfc/SwingSet2/resources/bug.html

@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
@@ -10,113 +10,113 @@
 </h1>
 <p align="center"><img src="images/Octavo/bug.jpg" width="516" height="445"></p>
 <p align="center">&nbsp;</p>
-<blockquote>
-  <blockquote>
-    <p><font size="4">This is a Creature so officious, that 'twill be known to
-      every one at one time or other, so busie, and so impudent, that it will
-      be intruding it self in every ones company, and so proud and aspiring withall,
-      that it fears not to trample on the best, and affects nothing so much as
-      a Crown; feeds and lives very high, and that makes it so saucy, as to pull
-      any one by the ears that comes in its way, and will never be quiet till
-      it has drawn blood: it is troubled at nothing so much as at a man that scratches
-      his head, as knowing that man is plotting and contriving some mischief against
-      it, and that makes it oftentime sculk into some meaner and lower place, and
-      run behind a mans back, though it go very much against the hair; which ill
-      conditions of it having made it better known then trusted, would exempt me
-      from making any further description of it, did not my faithful Mercury, my
+<blockquote> 
+  <blockquote> 
+    <p><font size="4">This is a Creature so officious, that 'twill be known to 
+      every one at one time or other, so busie, and so impudent, that it will 
+      be intruding it self in every ones company, and so proud and aspiring withall, 
+      that it fears not to trample on the best, and affects nothing so much as 
+      a Crown; feeds and lives very high, and that makes it so saucy, as to pull 
+      any one by the ears that comes in its way, and will never be quiet till 
+      it has drawn blood: it is troubled at nothing so much as at a man that scratches 
+      his head, as knowing that man is plotting and contriving some mischief against 
+      it, and that makes it oftentime sculk into some meaner and lower place, and 
+      run behind a mans back, though it go very much against the hair; which ill 
+      conditions of it having made it better known then trusted, would exempt me 
+      from making any further description of it, did not my faithful Mercury, my 
       Microscope, bring me other information of it. </font></p>
-    <p><font size="4">For this has discovered to me, by means of a very bright light
-      cast on it, that it is a Creature of a very odd shape ; it has a head shap'd
-      like that exprest in 35. Scheme marked with A, which seems almost Conical,
-      but is a little flatted on the upper and under sides, at the biggest part
-      of which, on either side behind the head (as it were, being the place where
-      other Creatures ears stand) are placed its two black shining goggle eyes
-      B B, looking backwards, and fenced round with several small cilia or hairs
-      that incompass it, so that it seems this Creature has no very good foresight:
-      It does not seem to have any eyelids, and therefore perhaps its eyes were
-      so placed, that it might the better cleanse them with its forelegs; and perhaps
-      this may be the reason, why they so much avoid and run from the light behind
-      them, for being made to live in the shady and dark recesses of the hair,
-      and thence probably their eye having a great aperture, the open and clear
-      light, especially that of the Sun, must needs very much offend them; to secure
-      these eyes from receiving any injury from the hairs through which it passes,
-      it has two horns that grow before it, in the place where one would have thought
-      the eyes should be; each of these C C have four joynts, which are fringed,
-      as 'twere, with small brisles, from which to the tip of its snout D, the
-      head seems very round and tapering, ending in a very sharp nose D, which
-      seems to have a small hole, and to be the passage through which he sucks
+    <p><font size="4">For this has discovered to me, by means of a very bright light 
+      cast on it, that it is a Creature of a very odd shape ; it has a head shap'd 
+      like that exprest in 35. Scheme marked with A, which seems almost Conical, 
+      but is a little flatted on the upper and under sides, at the biggest part 
+      of which, on either side behind the head (as it were, being the place where 
+      other Creatures ears stand) are placed its two black shining goggle eyes 
+      B B, looking backwards, and fenced round with several small cilia or hairs 
+      that incompass it, so that it seems this Creature has no very good foresight: 
+      It does not seem to have any eyelids, and therefore perhaps its eyes were 
+      so placed, that it might the better cleanse them with its forelegs; and perhaps 
+      this may be the reason, why they so much avoid and run from the light behind 
+      them, for being made to live in the shady and dark recesses of the hair, 
+      and thence probably their eye having a great aperture, the open and clear 
+      light, especially that of the Sun, must needs very much offend them; to secure 
+      these eyes from receiving any injury from the hairs through which it passes, 
+      it has two horns that grow before it, in the place where one would have thought 
+      the eyes should be; each of these C C have four joynts, which are fringed, 
+      as 'twere, with small brisles, from which to the tip of its snout D, the 
+      head seems very round and tapering, ending in a very sharp nose D, which 
+      seems to have a small hole, and to be the passage through which he sucks 
       the blood. </font></p>
     <p>&nbsp;</p>
     <p><img src="images/Octavo/bug2.jpg" width="537" height="348"></p>
-    <p><font size="4">Now whereas it if be plac'd on its back, with its belly
-      upwards, as it is in the 35. Scheme, it seems in several Positions to have
-      a resemblance of chaps, or jaws, as is represented in the Figure by E E,
-      yet in other postures those dark strokes disappear; and having kept several
-      of them in a box for two or three dayes, so that for all that time they had
-      nothing to feed on, I found, upon letting onecreep on my hand, that it immediately
-      fell to sucking, and did neither seem to thrust its nose very deep into the
-      skin, nor to open any kind of mouth, but I could plainly perceive a small
-      current of blood, which came directly from its snout, and past into its belly;
-      and about A there seem'd a contrivance, somewhat resembling a Pump, pair
-      of Bellows, or Heart, for by a very swift systole and diastole the blood
+    <p><font size="4">Now whereas it if be plac'd on its back, with its belly 
+      upwards, as it is in the 35. Scheme, it seems in several Positions to have 
+      a resemblance of chaps, or jaws, as is represented in the Figure by E E, 
+      yet in other postures those dark strokes disappear; and having kept several 
+      of them in a box for two or three dayes, so that for all that time they had 
+      nothing to feed on, I found, upon letting onecreep on my hand, that it immediately 
+      fell to sucking, and did neither seem to thrust its nose very deep into the 
+      skin, nor to open any kind of mouth, but I could plainly perceive a small 
+      current of blood, which came directly from its snout, and past into its belly; 
+      and about A there seem'd a contrivance, somewhat resembling a Pump, pair 
+      of Bellows, or Heart, for by a very swift systole and diastole the blood 
       seem'd drawn from the nose, and forced into the body. </font></p>
-    <p><font size="4">It did not seem at all, though I viewed it a good while as
-      it was sucking, to thrust more of its nose into the skin then the very snout
-      D, nor did it cause the least discernable pain, and yet the blood seem'd
-      to run through its head very quick and freely, so that it seems there is
-      no part of the skin but the blood is dispers'd into, nay, even into the
-      cuticula; for had it thrust its whole nose in from D to C C, it would not
-      have amounted to the supposed thickness of that tegument, the length of
+    <p><font size="4">It did not seem at all, though I viewed it a good while as 
+      it was sucking, to thrust more of its nose into the skin then the very snout 
+      D, nor did it cause the least discernable pain, and yet the blood seem'd 
+      to run through its head very quick and freely, so that it seems there is 
+      no part of the skin but the blood is dispers'd into, nay, even into the 
+      cuticula; for had it thrust its whole nose in from D to C C, it would not 
+      have amounted to the supposed thickness of that tegument, the length of 
       the nose being not more then a three hundredth part of an inch. </font></p>
-    <p><font size="4">It has six legs, covered with a very transparent shell,
-      and joynted exactly like a Crab's, or Lobster's; each leg is divided into
-      six parts by these joynts, and those have here and there several small hairs;
-      and at the end of each leg it has two claws, very properly adapted for its
-      peculiar use, being thereby inabled to walk very securely both on the skin
-      and hair; and indeed this contrivance of the feet is very curious, and could
-      not be made more commodiously and compendiously, for performing both these
-      requisite motions, of walking and climbing up the hair of a mans head, then
-      it is : for, by having the lesser claw (a) set so much short of the bigger
-      (b) when it walks on the skin the shorter touches not, and then the feet
-      are the same with those of a Mite, and several other small Insects, but by
-      means of the small joynts of the longer claw it can bend it round, and so
-      with both claws take hold of a hair, in the manner represented in the Figure,
+    <p><font size="4">It has six legs, covered with a very transparent shell, 
+      and joynted exactly like a Crab's, or Lobster's; each leg is divided into 
+      six parts by these joynts, and those have here and there several small hairs; 
+      and at the end of each leg it has two claws, very properly adapted for its 
+      peculiar use, being thereby inabled to walk very securely both on the skin 
+      and hair; and indeed this contrivance of the feet is very curious, and could 
+      not be made more commodiously and compendiously, for performing both these 
+      requisite motions, of walking and climbing up the hair of a mans head, then 
+      it is : for, by having the lesser claw (a) set so much short of the bigger 
+      (b) when it walks on the skin the shorter touches not, and then the feet 
+      are the same with those of a Mite, and several other small Insects, but by 
+      means of the small joynts of the longer claw it can bend it round, and so 
+      with both claws take hold of a hair, in the manner represented in the Figure, 
       the long transparent Cylinder F F F, being a Man's hair held by it. </font></p>
-    <p><font size="4">The Thorax seem'd cas'd with another kind of substance then
-      the belly, namely, with a thin transparent horny substance, which upon the fasting
-      of the Creature did not grow flaccid; through this I could plainly see the
-      blood, suck'd from my hand, to be variously distributed, and mov'd to and
-      fro; and about G there seem'd a pretty big white substance, which seem'd
-      to be moved within its thorax; besides, there appear'd very many small milk-white
-      vessels, which crost over the breast between the legs, out of which, on
-      either side, are many small branchings, these seem'd to be the veins and
-      arteries, for that which is analogus to blood in all Insects is milk-white.
+    <p><font size="4">The Thorax seem'd cas'd with another kind of substance then 
+      the belly, namely, with a thin transparent horny substance, which upon the fasting 
+      of the Creature did not grow flaccid; through this I could plainly see the 
+      blood, suck'd from my hand, to be variously distributed, and mov'd to and 
+      fro; and about G there seem'd a pretty big white substance, which seem'd 
+      to be moved within its thorax; besides, there appear'd very many small milk-white 
+      vessels, which crost over the breast between the legs, out of which, on 
+      either side, are many small branchings, these seem'd to be the veins and 
+      arteries, for that which is analogus to blood in all Insects is milk-white. 
       </font></p>
-    <p><font size="4">The belly is covered with a transparent substance likewise,
-      but more resembling a skin then a shell, for 'tis grain'd all over the belly
-      just like the skin in the palms of a man's hand, and when the belly is empty,
-      grows very flaccid and wrinkled ; at the upper end of this is placed the
-      stomach H H, and perhaps also the white spot I I may be the liver, or pancreas,
-      which by the peristaltick motion of the guts, is a little mov'd to and fro,
-      not with a systole and diastole, but rather with a thronging or justling
+    <p><font size="4">The belly is covered with a transparent substance likewise, 
+      but more resembling a skin then a shell, for 'tis grain'd all over the belly 
+      just like the skin in the palms of a man's hand, and when the belly is empty, 
+      grows very flaccid and wrinkled ; at the upper end of this is placed the 
+      stomach H H, and perhaps also the white spot I I may be the liver, or pancreas, 
+      which by the peristaltick motion of the guts, is a little mov'd to and fro, 
+      not with a systole and diastole, but rather with a thronging or justling 
       motion. </font></p>
-    <p><font size="4">Viewing one of these Creatures, after it had fasted two
-      dayes, all the hinder part was lank and flaccid, and the white spot I I
-      hardly mov'd, most of the white branchings disappear'd, and most also of
-      the redness or sucked blood in the guts, the peristaltick motion of which
-      was scarce discernable; but upon the suffering it to suck, it presently
-      fill'd the skin of the belly, and of the six scolop'd embosments on either side,
-      as full as it could be stuft ; the stomach and guts were as full as they
-      could hold; the peristaltick motion of the gut grew quick, and the justling
-      motion of I I accordingly ; multitudes of milk-white vessels seem'd quickly
-      filled, and turgid, which were perhaps the veins and arteries, and the Creature
-      was so greedy, that though it could not contain more, yet it continued sucking
-      as fast as ever, and as fast emptying it self behind : the digestion of this
-      Creature must needs be very quick, for though I perceiv'd the blood thicker
-      and blacker when suck'd, yet, when in the guts, it was of a very lovely
-      ruby colour, and that part of it, which was digested into the veins, seemed
-      white; whence it appears, that a further digestion of blood may make it
-      milk, at least of a resembling colour : What is else observable in the figure
+    <p><font size="4">Viewing one of these Creatures, after it had fasted two 
+      dayes, all the hinder part was lank and flaccid, and the white spot I I 
+      hardly mov'd, most of the white branchings disappear'd, and most also of 
+      the redness or sucked blood in the guts, the peristaltick motion of which 
+      was scarce discernable; but upon the suffering it to suck, it presently 
+      fill'd the skin of the belly, and of the six scolop'd embosments on either side, 
+      as full as it could be stuft ; the stomach and guts were as full as they 
+      could hold; the peristaltick motion of the gut grew quick, and the justling 
+      motion of I I accordingly ; multitudes of milk-white vessels seem'd quickly 
+      filled, and turgid, which were perhaps the veins and arteries, and the Creature 
+      was so greedy, that though it could not contain more, yet it continued sucking 
+      as fast as ever, and as fast emptying it self behind : the digestion of this 
+      Creature must needs be very quick, for though I perceiv'd the blood thicker 
+      and blacker when suck'd, yet, when in the guts, it was of a very lovely 
+      ruby colour, and that part of it, which was digested into the veins, seemed 
+      white; whence it appears, that a further digestion of blood may make it 
+      milk, at least of a resembling colour : What is else observable in the figure 
       of this Creature, maybe seen by the 35. Scheme.</font></p>
     </blockquote>
   <p>&nbsp;</p>

src/demo/share/jfc/SwingSet2/resources/index.html

@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
@@ -20,21 +20,21 @@
     <br>
     <br>
   </h3>
-  <p><font color="#990000" size="4">Images and text used by permission of Octavo
+  <p><font color="#990000" size="4">Images and text used by permission of Octavo 
     Corporation (www.octavo.com),<br>
-    </font><font color="#990000" size="4">(c) 1999 Octavo Corporation. All
+    </font><font color="#990000" size="4">(c) 1999 Octavo Corporation. All 
     rights reserved.</font> <br>
     <br>
     <br>
-    <font size="2">Octavo Corporation is a publisher of rare
-    books and manuscripts with digital tools and formats through partnerships
-    with libraries, museums, and individuals. Using high-resolution digital imaging
-    technology, Octavo releases digital rare books on CD-ROM as Adobe PDF files
-    which can be viewed on and printed from almost any computing platform. You
-    can view each page and the binding on your computer screen, zoom in to view
-    detail up to 800% in some cases, and search, copy and paste the "live" text
-    placed invisibly behind the page images which is available for selected Editions.
-    Also included in each edition is the work's collation and provenance, as well
+    <font size="2">Octavo Corporation is a publisher of rare 
+    books and manuscripts with digital tools and formats through partnerships 
+    with libraries, museums, and individuals. Using high-resolution digital imaging 
+    technology, Octavo releases digital rare books on CD-ROM as Adobe PDF files 
+    which can be viewed on and printed from almost any computing platform. You 
+    can view each page and the binding on your computer screen, zoom in to view 
+    detail up to 800% in some cases, and search, copy and paste the "live" text 
+    placed invisibly behind the page images which is available for selected Editions. 
+    Also included in each edition is the work's collation and provenance, as well 
     as commentary by a noted expert in its field. </font></p>
 </blockquote>
 <p>&nbsp;</p>

src/demo/share/jfc/SwingSet2/resources/king.html

@@ -1,34 +1,34 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
-<p align="center"><font size="5"><img src="images/Octavo/king.jpg" width="420" height="290">
+<p align="center"><font size="5"><img src="images/Octavo/king.jpg" width="420" height="290"> 
   </font></p>
 <p align="center">&nbsp;</p>
-<blockquote> <font size="4">Do here most humbly lay this small Present at Your
-  Majesties Royal feet. And though it comes accompany'd with two disadvantages,
-  the meanness of the Author, and of the Subject; yet in both I am incouraged
+<blockquote> <font size="4">Do here most humbly lay this small Present at Your 
+  Majesties Royal feet. And though it comes accompany'd with two disadvantages, 
+  the meanness of the Author, and of the Subject; yet in both I am incouraged 
   by the greatness of your Mercy and your Knowledge. </font>
-<p><font size="4">By the one I am taught , that you can forgive the most presumptuous
-    Offendors: And by the other, that you will not esteem the least work of Nature,
+<p><font size="4">By the one I am taught , that you can forgive the most presumptuous 
+    Offendors: And by the other, that you will not esteem the least work of Nature, 
     or Art, unworthy your Observation. </font></p>
-  <p><font size="4">Amidst the many felicities that have accompani'd your Majesties
-    happy Restauration and Government, it is none of the least considerable, that
+  <p><font size="4">Amidst the many felicities that have accompani'd your Majesties 
+    happy Restauration and Government, it is none of the least considerable, that 
     Philosophy and Experimental Learning have prosper'd under your Royal Patronage.</font></p>
-  <p><font size="4">And as the calm prosperity of your Reign has given us the
-    leisure to follow these Studies of quiet and retirement, so it is just, that
-    the Fruits of them should, by way of acknowledgement, be return'd to your
-    Majesty. There are, Sir, several other of your Subjects, of your Royal Society,
-    now busie about Nobler matters: The Improvement of Manufactures and Agriculture,
-    the Increase of Commerce, the Advantage of Navigation: In all which they are
+  <p><font size="4">And as the calm prosperity of your Reign has given us the 
+    leisure to follow these Studies of quiet and retirement, so it is just, that 
+    the Fruits of them should, by way of acknowledgement, be return'd to your 
+    Majesty. There are, Sir, several other of your Subjects, of your Royal Society, 
+    now busie about Nobler matters: The Improvement of Manufactures and Agriculture, 
+    the Increase of Commerce, the Advantage of Navigation: In all which they are 
     assisted by your Majesties Incouragement and Example. </font></p>
-  <p><font size="4">Amidst all those greater Designs, I here presume to bring
-    in that which is more proportionable to the smalness of my Abilities, and
-    to offer some of the least of all visible things, to that Mighty King, that
-    has establisht an Empire over the best of all Invisible things of this World,
+  <p><font size="4">Amidst all those greater Designs, I here presume to bring 
+    in that which is more proportionable to the smalness of my Abilities, and 
+    to offer some of the least of all visible things, to that Mighty King, that 
+    has establisht an Empire over the best of all Invisible things of this World, 
     the Minds o f Men.</font></p>
   <blockquote>
     <p align="right">&nbsp;</p>

src/demo/share/jfc/SwingSet2/resources/preface.html

@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
@@ -9,101 +9,101 @@
   <p>&nbsp;</p>
   <h1 align="center">THE PREFACE</h1>
   <img src="images/Octavo/micro.jpg" width="381" height="384"> </div>
-<div align="right">
+<div align="right"> 
   <p align="left">&nbsp;</p>
   <p>&nbsp;</p>
 </div>
-<blockquote>
+<blockquote> 
   <div align="left">
-    <p><font size="5"> <font size="4">It is the great prerogative of Mankind above
-      other Creatures, that we are not only able to behold the works of Nature,
-      or barely to sustein our lives by them, but we have also the power of considering,
+    <p><font size="5"> <font size="4">It is the great prerogative of Mankind above 
+      other Creatures, that we are not only able to behold the works of Nature, 
+      or barely to sustein our lives by them, but we have also the power of considering, 
       comparing, altering, assisting, and improving them to various uses. </font></font></p>
-    <p><font size="4">And as this is the peculiar priviledge of humane Nature
-      in general, so is it capable of being so far advanced by the helps of Art,
-      and Experience, as to make some Men excel others in their Observations,
+    <p><font size="4">And as this is the peculiar priviledge of humane Nature 
+      in general, so is it capable of being so far advanced by the helps of Art, 
+      and Experience, as to make some Men excel others in their Observations, 
       and Deductions, almost as much as they do Beasts. </font></p>
-    <p><font size="4">By the addition of such artificial Instruments and methods,
-      there may be, in some manner, a reparation made for the mischiefs, and imperfection,
-      mankind has drawn upon itself, by negligence, and intemperance, and a wilful
-      and superstitious deserting the Prescripts and Rules of Nature, whereby
-      every man, both from a deriv'd corruption, innate and born with him, and
-      from his breeding and converse with men, is very subject to slip into all
+    <p><font size="4">By the addition of such artificial Instruments and methods, 
+      there may be, in some manner, a reparation made for the mischiefs, and imperfection, 
+      mankind has drawn upon itself, by negligence, and intemperance, and a wilful 
+      and superstitious deserting the Prescripts and Rules of Nature, whereby 
+      every man, both from a deriv'd corruption, innate and born with him, and 
+      from his breeding and converse with men, is very subject to slip into all 
       sorts of errors. </font></p>
-    <p><font size="4">The only way which now remains for us to recover some degree
-      of those former perfections, seems to be, by rectifying the operations of
-      the Sense, the Memory, and Reason, since upon the evidence, the strength,
-      the integrity, and the right correspondence of all these, all the light,
-      by which our actions are to be guided, is to be renewed, and all our command
+    <p><font size="4">The only way which now remains for us to recover some degree 
+      of those former perfections, seems to be, by rectifying the operations of 
+      the Sense, the Memory, and Reason, since upon the evidence, the strength, 
+      the integrity, and the right correspondence of all these, all the light, 
+      by which our actions are to be guided, is to be renewed, and all our command 
       over things is to be establisht.</font></p>
-    <p><font size="4"> It is therefore most worthy of our consideration, to recollect
-      their several defects, that so we may the better understand how to supply
-      them, and by what assistances we may inlarge their power, and secure them
+    <p><font size="4"> It is therefore most worthy of our consideration, to recollect 
+      their several defects, that so we may the better understand how to supply 
+      them, and by what assistances we may inlarge their power, and secure them 
       in performing their particular duties.</font></p>
-    <p><font size="4">As for the actions of our Senses, we cannot but observe
-      them to be in many particulars much outdone by those of other Creatures,
-      and when at best, to be far short of the perfection they seem capable of
-      : And these infirmities of the Senses arise from a double cause, either
-      from the disproportion of the Object to the Organ, whereby an infinite number
-      of things can never enter into them, or else from error in the Perception,
-      that many things, which come within their reach, are not received in a right
+    <p><font size="4">As for the actions of our Senses, we cannot but observe 
+      them to be in many particulars much outdone by those of other Creatures, 
+      and when at best, to be far short of the perfection they seem capable of 
+      : And these infirmities of the Senses arise from a double cause, either 
+      from the disproportion of the Object to the Organ, whereby an infinite number 
+      of things can never enter into them, or else from error in the Perception, 
+      that many things, which come within their reach, are not received in a right 
       manner. </font></p>
-    <p><font size="4">The like frailties are to be found in the Memory; we often
-      let many things slip away from us, which deserve to be retain'd; and of
-      those which we treasure up, a great part is either frivolous or false ;
-      and if good, and substantial, either in tract of time obliterated, or at
-      best so overwhelmed and buried under more frothy notions, that when there
+    <p><font size="4">The like frailties are to be found in the Memory; we often 
+      let many things slip away from us, which deserve to be retain'd; and of 
+      those which we treasure up, a great part is either frivolous or false ; 
+      and if good, and substantial, either in tract of time obliterated, or at 
+      best so overwhelmed and buried under more frothy notions, that when there 
       is need of them, they are in vain sought for. </font></p>
-    <p><font size="4">The two main foundations being so deceivable, it is no wonder,
-      that all the succeeding works which we build upon them, of arguing, concluding,
-      defining, judging, and all the other degrees of Reason, are lyable to the
-      same imperfection, being, at best, either vain, or uncertain: So that the
-      errors of the understanding are answerable to the two other, being defective
-      both in the quantity and goodness of its knowledge; for the limits, to which
-      our thoughts are confind, are small in respect of the vast extent of Nature
-      it self; some parts of it are too large to be comprehended, and some too
+    <p><font size="4">The two main foundations being so deceivable, it is no wonder, 
+      that all the succeeding works which we build upon them, of arguing, concluding, 
+      defining, judging, and all the other degrees of Reason, are lyable to the 
+      same imperfection, being, at best, either vain, or uncertain: So that the 
+      errors of the understanding are answerable to the two other, being defective 
+      both in the quantity and goodness of its knowledge; for the limits, to which 
+      our thoughts are confind, are small in respect of the vast extent of Nature 
+      it self; some parts of it are too large to be comprehended, and some too 
       little to be perceived. </font></p>
-    <p><font size="4">And from thence it must follow, that not having a full sensation
-      of the Object, we must be very lame and imperfect in our conceptions about
-      it, and in all the propositions which we build upon it; hence we often take
-      the shadow of things for the substance, small appearances for good similitudes,
-      similitudes for definitions; and even many of those, which we think to be
-      the most solid definitions, are rather expressions of our own misguided
+    <p><font size="4">And from thence it must follow, that not having a full sensation 
+      of the Object, we must be very lame and imperfect in our conceptions about 
+      it, and in all the propositions which we build upon it; hence we often take 
+      the shadow of things for the substance, small appearances for good similitudes, 
+      similitudes for definitions; and even many of those, which we think to be 
+      the most solid definitions, are rather expressions of our own misguided 
       apprehensions then of the true nature of the things themselves. </font></p>
-    <p><font size="4">The effects of these imperfections are manifested in different
-      ways, according to the temper and disposition of the several minds of men,
-      some they incline to gross ignorance and stupidity, and others to a presumptuous
-      imposing on other mens Opinions, and a confident dogmatizing on matters,
+    <p><font size="4">The effects of these imperfections are manifested in different 
+      ways, according to the temper and disposition of the several minds of men, 
+      some they incline to gross ignorance and stupidity, and others to a presumptuous 
+      imposing on other mens Opinions, and a confident dogmatizing on matters, 
       whereof there is no assurance to be given. </font></p>
-    <p><font size="4">Thus all the uncertainty, and mistakes of humane actions,
-      proceed either from the narrowness and wandring of our Senses, from the
-      slipperiness or delusion of our Memory, from the confinement or rashness
-      of our Understanding, so that 'tis no wonder, that our power over natural
-      causes and effects is so slowly improvd, seeing we are not only to contend
-      with the obscurity and difficulty of the things whereon we work and think,
+    <p><font size="4">Thus all the uncertainty, and mistakes of humane actions, 
+      proceed either from the narrowness and wandring of our Senses, from the 
+      slipperiness or delusion of our Memory, from the confinement or rashness 
+      of our Understanding, so that 'tis no wonder, that our power over natural 
+      causes and effects is so slowly improvd, seeing we are not only to contend 
+      with the obscurity and difficulty of the things whereon we work and think, 
       but even the forces of our own minds conspire to betray us. </font></p>
-    <p><font size="4">These being the dangers in the process of humane Reason,
-      the remedies of them all can only proceed from the real, the mechanical,
-      the experimental Philosophy, which has this advantage over the Philosophy
-      of discourse and disputation, that whereas that chiefly aims at the subtilty
-      of its Deductions and Conclusions, without much regard to the first groundwork,
-      which ought to be well laid on the Sense and Memory ; so this intends the
-      right ordering of them all, and the making them serviceable to each other.
+    <p><font size="4">These being the dangers in the process of humane Reason, 
+      the remedies of them all can only proceed from the real, the mechanical, 
+      the experimental Philosophy, which has this advantage over the Philosophy 
+      of discourse and disputation, that whereas that chiefly aims at the subtilty 
+      of its Deductions and Conclusions, without much regard to the first groundwork, 
+      which ought to be well laid on the Sense and Memory ; so this intends the 
+      right ordering of them all, and the making them serviceable to each other. 
       </font></p>
-    <p><font size="4">The first thing to be undertaken in this weighty work, is
-      a watchfulness over the failings and an inlargement of the dominion, of
-      the Senses. To which end it is requisite, first, That there should be a
-      scrupulous choice, and a strict examination, of the reality, constancy,
-      and certainty of the Particulars that we admit: This is the first rise whereon
-      truth is to begin, and here the most severe, and most impartial diligence,
-      must be imployed ; the storing up of all, without any regard to evidence
+    <p><font size="4">The first thing to be undertaken in this weighty work, is 
+      a watchfulness over the failings and an inlargement of the dominion, of 
+      the Senses. To which end it is requisite, first, That there should be a 
+      scrupulous choice, and a strict examination, of the reality, constancy, 
+      and certainty of the Particulars that we admit: This is the first rise whereon 
+      truth is to begin, and here the most severe, and most impartial diligence, 
+      must be imployed ; the storing up of all, without any regard to evidence 
       or use, will only tend to darkness and confusion. </font></p>
-    <p><font size="4">We must not therefore esteem the riches of our Philosophical
-      treasure by the number only, but chiefly by the weight; the most vulgar
-      Instances are not to be neglected, but above all, the most instructive are
-      to be entertain'd: the footsteps of Nature are to be trac'd, not only in
-      her ordinary course,but when she seems to be put to her shifts, to make
-      many doublings and turnings, and to use some kind of art in indeavouring
+    <p><font size="4">We must not therefore esteem the riches of our Philosophical 
+      treasure by the number only, but chiefly by the weight; the most vulgar 
+      Instances are not to be neglected, but above all, the most instructive are 
+      to be entertain'd: the footsteps of Nature are to be trac'd, not only in 
+      her ordinary course,but when she seems to be put to her shifts, to make 
+      many doublings and turnings, and to use some kind of art in indeavouring 
       to avoid our discovery. </font></p>
     <p>&nbsp;</p>
     <p><a href="king.html"><img src="images/htmldemo/back.jpg" width="146" height="40" align="left" border="0"></a><a href="seaweed.html"><img src="images/htmldemo/forward.jpg" width="196" height="40" align="right" border="0"></a></p>

src/demo/share/jfc/SwingSet2/resources/seaweed.html

@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
@@ -11,47 +11,47 @@
 <p align="center"><img src="images/Octavo/seaweed.jpg" width="316" height="498"></p>
 <p align="center">&nbsp;</p>
 <blockquote>
-  <p><font size="4">For curiosity and beauty, I have not among all the Plants
-    or Vegetables I have yet observ'd, seen any one comparable to this Sea-weed
-    I have here describ'd, of which I am able to say very little more then what
-    is represented by the second Figure of the ninth Scheme: Namely, that it is
-    a Plant which grows upon the Rocks under the water, and increases and spreads
-    it self into a great tuft, which is not onely handsomely branch'd into several
-    leaves, but the whole surface of the Plant is cover'd over with a most curious
-    kind of carv'd work, which consists of a texture much resembling a Honeycomb;
-    for the whole surface on both sides is cover'd over with a multitude of very
-    small holes, being no bigger then so many holes made with the point of a small
-    Pinn, and rang'd in the neatest and most delicate order imaginable, they being
-    plac'd in the manner of a Quincunx, or very much like the rows of the eyes
-    of a Fly, the rows or orders being very regular, which way soever they are
-    observ'd: what the texture was, as it appear'd through a pretty bigg Magnifying
-    Microscope, I have here adjoin'd in the first Figure of the 14. Scheme. which
-    round Area A B C D represents a part of the surface about one eighth part
-    of an Inch in Diameter: Those little holes, which to the eye look'd round,
-    like so many little spots, here appear'd very regularly shap'd holes, representing
-    almost the shape of the sole of a round toed shoe, the hinder part of which,
-    is, as it were, trod on or cover'd by the toe of that next below it; these
-    holes seem'd wall'd about with a very thin and transparent substance, looking
-    of a pale straw-colour; from the edge of which, against the middle of each
-    hole, were sprouted out four small transparent straw-colour'd Thorns, which
-    seem'd to protect and cover those cavities, from either side two; neer the
-    root of this Plant, were sprouted out several small branches of a kind of
+  <p><font size="4">For curiosity and beauty, I have not among all the Plants 
+    or Vegetables I have yet observ'd, seen any one comparable to this Sea-weed 
+    I have here describ'd, of which I am able to say very little more then what 
+    is represented by the second Figure of the ninth Scheme: Namely, that it is 
+    a Plant which grows upon the Rocks under the water, and increases and spreads 
+    it self into a great tuft, which is not onely handsomely branch'd into several 
+    leaves, but the whole surface of the Plant is cover'd over with a most curious 
+    kind of carv'd work, which consists of a texture much resembling a Honeycomb; 
+    for the whole surface on both sides is cover'd over with a multitude of very 
+    small holes, being no bigger then so many holes made with the point of a small 
+    Pinn, and rang'd in the neatest and most delicate order imaginable, they being 
+    plac'd in the manner of a Quincunx, or very much like the rows of the eyes 
+    of a Fly, the rows or orders being very regular, which way soever they are 
+    observ'd: what the texture was, as it appear'd through a pretty bigg Magnifying 
+    Microscope, I have here adjoin'd in the first Figure of the 14. Scheme. which 
+    round Area A B C D represents a part of the surface about one eighth part 
+    of an Inch in Diameter: Those little holes, which to the eye look'd round, 
+    like so many little spots, here appear'd very regularly shap'd holes, representing 
+    almost the shape of the sole of a round toed shoe, the hinder part of which, 
+    is, as it were, trod on or cover'd by the toe of that next below it; these 
+    holes seem'd wall'd about with a very thin and transparent substance, looking 
+    of a pale straw-colour; from the edge of which, against the middle of each 
+    hole, were sprouted out four small transparent straw-colour'd Thorns, which 
+    seem'd to protect and cover those cavities, from either side two; neer the 
+    root of this Plant, were sprouted out several small branches of a kind of 
     bastard Coralline, curiously branch'd, though small. </font></p>
-  <p><font size="4">And to confirm this, having lately the opportunity of viewing
-    the large Plant (if I may so call it) of a Sponge petrify'd, of which I made
-    mention in the last Observation, I found, that each of the Branches or Figures
-    of it, did, by the range of its pores, exhibit just such a texture, the rows
-    of pores crossing one another, much after the manner as the rows of eyes do
-    which are describ'd in the 26. Scheme : Coralline also, and several sorts of
-    white Coral, I have with a Microscope observ'd very curiously shap'd. And
-    I doubt not, but that he that shall observe these several kinds of Plants that
-    grow upon Rocks, which the Sea sometimes overflows, and those heaps of others
-    which are vomited out of it upon the shore, may find multitudes of little
-    Plants, and other bodies, which like this will afford very beautifull objects
-    for the Microscope ; and this Specimen here is adjoin'd onely to excite their
-    curiosities who have opportunity of observing to examine and collect what
-    they find worthy their notice; for the Sea, among terrestrial bodies, is also
-    a prolifick mother, and affords as many Instances of spontaneous generations
+  <p><font size="4">And to confirm this, having lately the opportunity of viewing 
+    the large Plant (if I may so call it) of a Sponge petrify'd, of which I made 
+    mention in the last Observation, I found, that each of the Branches or Figures 
+    of it, did, by the range of its pores, exhibit just such a texture, the rows 
+    of pores crossing one another, much after the manner as the rows of eyes do 
+    which are describ'd in the 26. Scheme : Coralline also, and several sorts of 
+    white Coral, I have with a Microscope observ'd very curiously shap'd. And 
+    I doubt not, but that he that shall observe these several kinds of Plants that 
+    grow upon Rocks, which the Sea sometimes overflows, and those heaps of others 
+    which are vomited out of it upon the shore, may find multitudes of little 
+    Plants, and other bodies, which like this will afford very beautifull objects 
+    for the Microscope ; and this Specimen here is adjoin'd onely to excite their 
+    curiosities who have opportunity of observing to examine and collect what 
+    they find worthy their notice; for the Sea, among terrestrial bodies, is also 
+    a prolifick mother, and affords as many Instances of spontaneous generations 
     as either the Air or Earth.</font></p>
   <p>&nbsp;</p>
   <p><a href="preface.html"><img src="images/htmldemo/back.jpg" width="146" height="40" align="left" border="0"></a><a href="ant.html"><img src="images/htmldemo/forward.jpg" width="196" height="40" align="right" border="0"></a></p>