8314734: Remove unused field TypeVariableImpl.EMPTY_ANNOTATION_ARRAY

Reviewed-by: bpb, darcy
8308042: [macos] Developer ID Application Certificate not picked up by jpackage if it contains UNICODE characters
2026-01-11 19:11:41 +01:00 · 2023-08-23 20:41:28 +00:00 · 2023-08-23 20:22:12 +00:00 · 2023-08-23 20:11:10 +00:00 · 2023-08-23 19:12:35 +00:00 · 2023-08-23 18:10:11 +00:00
7261 changed files with 338535 additions and 164692 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,10 @@
 *	-text
+*.java	diff=java
+*.c	diff=cpp
+*.h	diff=cpp
+*.cpp	diff=cpp
+*.hpp	diff=cpp
+*.md	diff=markdown
+*.sh	diff=bash
+*.html	diff=html
+*.css	diff=css
--- a/.github/actions/get-jtreg/action.yml
+++ b/.github/actions/get-jtreg/action.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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
@@ -57,7 +57,7 @@ runs:
    - name: 'Build JTReg'
      run: |
        # Build JTReg and move files to the proper locations
-        bash make/build.sh --jdk "$JAVA_HOME_11_X64"
+        bash make/build.sh --jdk "$JAVA_HOME_17_X64"
        mkdir ../installed
        mv build/images/jtreg/* ../installed
      working-directory: jtreg/src
--- a/.github/actions/get-msys2/action.yml
+++ b/.github/actions/get-msys2/action.yml
@@ -30,7 +30,8 @@ runs:
  using: composite
  steps:
    - name: 'Install MSYS2'
-      uses: msys2/setup-msys2@v2
+      # use a specific release of msys2/setup-msys2 to prevent jtreg build failures on newer release
+      uses: msys2/setup-msys2@7efe20baefed56359985e327d329042cde2434ff
      with:
        install: 'autoconf tar unzip zip make'
        path-type: minimal
--- a/.github/workflows/build-cross-compile.yml
+++ b/.github/workflows/build-cross-compile.yml
@@ -31,12 +31,6 @@ on:
      gcc-major-version:
        required: true
        type: string
-      apt-gcc-version:
-        required: true
-        type: string
-      apt-gcc-cross-version:
-        required: true
-        type: string
      extra-conf-options:
        required: false
        type: string
@@ -86,8 +80,7 @@ jobs:
          - target-cpu: riscv64
            gnu-arch: riscv64
            debian-arch: riscv64
-            debian-repository: https://deb.debian.org/debian-ports
-            debian-keyring: /usr/share/keyrings/debian-ports-archive-keyring.gpg
+            debian-repository: https://httpredir.debian.org/debian/
            debian-version: sid

    steps:
@@ -114,10 +107,10 @@ jobs:
          sudo apt-get update
          sudo apt-get install --only-upgrade apt
          sudo apt-get install \
-              gcc-${{ inputs.gcc-major-version }}=${{ inputs.apt-gcc-version }} \
-              g++-${{ inputs.gcc-major-version }}=${{ inputs.apt-gcc-version }} \
-              gcc-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}=${{ inputs.apt-gcc-cross-version }} \
-              g++-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}=${{ inputs.apt-gcc-cross-version }} \
+              gcc-${{ inputs.gcc-major-version }} \
+              g++-${{ inputs.gcc-major-version }} \
+              gcc-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}} \
+              g++-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}} \
              libxrandr-dev libxtst-dev libcups2-dev libasound2-dev \
              debian-ports-archive-keyring
          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }}
@@ -138,8 +131,9 @@ jobs:
          sudo debootstrap
          --arch=${{ matrix.debian-arch }}
          --verbose
-          --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev
+          --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype-dev,libpng-dev
          --resolve-deps
+          --variant=minbase
          $(test -n "${{ matrix.debian-keyring }}" && echo "--keyring=${{ matrix.debian-keyring }}")
          ${{ matrix.debian-version }}
          sysroot
@@ -153,7 +147,8 @@ jobs:
          sudo chown ${USER} -R sysroot
          rm -rf sysroot/{dev,proc,run,sys,var}
          rm -rf sysroot/usr/{sbin,bin,share}
-          rm -rf sysroot/usr/lib/{apt,udev,systemd}
+          rm -rf sysroot/usr/lib/{apt,gcc,udev,systemd}
+          rm -rf sysroot/usr/libexec/gcc
        if: steps.get-cached-sysroot.outputs.cache-hit != 'true'

      - name: 'Configure'
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -49,9 +49,6 @@ on:
        required: false
        type: string
        default: ''
-      apt-gcc-version:
-        required: true
-        type: string
      apt-architecture:
        required: false
        type: string
@@ -114,7 +111,7 @@ jobs:
          fi
          sudo apt-get update
          sudo apt-get install --only-upgrade apt
-          sudo apt-get install gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }}=${{ inputs.apt-gcc-version }} g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }}=${{ inputs.apt-gcc-version }} libxrandr-dev${{ steps.arch.outputs.suffix }} libxtst-dev${{ steps.arch.outputs.suffix }} libcups2-dev${{ steps.arch.outputs.suffix }} libasound2-dev${{ steps.arch.outputs.suffix }} ${{ inputs.apt-extra-packages }}
+          sudo apt-get install gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} libxrandr-dev${{ steps.arch.outputs.suffix }} libxtst-dev${{ steps.arch.outputs.suffix }} libcups2-dev${{ steps.arch.outputs.suffix }} libasound2-dev${{ steps.arch.outputs.suffix }} ${{ inputs.apt-extra-packages }}
          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }}

      - name: 'Configure'
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -98,12 +98,26 @@ jobs:
        id: gtest
        uses: ./.github/actions/get-gtest

+      - name: 'Check toolchain installed'
+        id: toolchain-check
+        run: |
+          set +e
+          '/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
+          if [ $? -eq 0 ]; then
+            echo "Toolchain is already installed"
+            echo "toolchain-installed=true" >> $GITHUB_OUTPUT
+          else
+            echo "Toolchain is not yet installed"
+            echo "toolchain-installed=false" >> $GITHUB_OUTPUT
+          fi
+
      - name: 'Install toolchain and dependencies'
        run: |
          # Run Visual Studio Installer
          '/c/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe' \
-            modify --quiet --installPath 'C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise' \
+            modify --quiet --installPath 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise' \
            --add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
+        if: steps.toolchain-check.outputs.toolchain-installed != 'true'

      - name: 'Configure'
        run: >
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -130,7 +130,6 @@ jobs:
    with:
      platform: linux-x64
      gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
      configure-arguments: ${{ github.event.inputs.configure-arguments }}
      make-arguments: ${{ github.event.inputs.make-arguments }}
    # The linux-x64 jdk bundle is used as buildjdk for the cross-compile job
@@ -144,11 +143,10 @@ jobs:
      platform: linux-x86
      gcc-major-version: '10'
      gcc-package-suffix: '-multilib'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
      apt-architecture: 'i386'
      # Some multilib libraries do not have proper inter-dependencies, so we have to
      # install their dependencies manually.
-      apt-extra-packages: 'libfreetype6-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386'
+      apt-extra-packages: 'libfreetype-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386 libgcc-s1:i386 libstdc++6:i386'
      extra-conf-options: '--with-target-bits=32'
      configure-arguments: ${{ github.event.inputs.configure-arguments }}
      make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -163,7 +161,6 @@ jobs:
      make-target: 'hotspot'
      debug-levels: '[ "debug" ]'
      gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
      extra-conf-options: '--disable-precompiled-headers'
      configure-arguments: ${{ github.event.inputs.configure-arguments }}
      make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -178,7 +175,6 @@ jobs:
      make-target: 'hotspot'
      debug-levels: '[ "debug" ]'
      gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
      extra-conf-options: '--with-jvm-variants=zero --disable-precompiled-headers'
      configure-arguments: ${{ github.event.inputs.configure-arguments }}
      make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -193,7 +189,6 @@ jobs:
      make-target: 'hotspot'
      debug-levels: '[ "debug" ]'
      gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
      extra-conf-options: '--with-jvm-variants=minimal --disable-precompiled-headers'
      configure-arguments: ${{ github.event.inputs.configure-arguments }}
      make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -209,7 +204,6 @@ jobs:
      # Technically this is not the "debug" level, but we can't inject a new matrix state for just this job
      debug-levels: '[ "debug" ]'
      gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
      extra-conf-options: '--with-debug-level=optimized --disable-precompiled-headers'
      configure-arguments: ${{ github.event.inputs.configure-arguments }}
      make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -223,8 +217,6 @@ jobs:
    uses: ./.github/workflows/build-cross-compile.yml
    with:
      gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
-      apt-gcc-cross-version: '10.4.0-4ubuntu1~22.04cross1'
      configure-arguments: ${{ github.event.inputs.configure-arguments }}
      make-arguments: ${{ github.event.inputs.make-arguments }}
    if: needs.select.outputs.linux-cross-compile == 'true'
@@ -290,7 +282,6 @@ jobs:
      # build JDK, and we do not need the additional testing of the graphs.
      extra-conf-options: '--disable-full-docs'
      gcc-major-version: '10'
-      apt-gcc-version: '10.4.0-4ubuntu1~22.04'
      configure-arguments: ${{ github.event.inputs.configure-arguments }}
      make-arguments: ${{ github.event.inputs.make-arguments }}
    if: needs.select.outputs.docs == 'true'
--- a/.jcheck/conf
+++ b/.jcheck/conf
@@ -1,7 +1,7 @@
 [general]
 project=jdk
 jbs=JDK
-version=21
+version=22

 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,3 @@
 # Contributing to the JDK

-Please see <https://openjdk.org/contribute> for how to contribute.
+Please see the [OpenJDK Developers’ Guide](https://openjdk.org/guide/).
--- a/bin/idea.sh
+++ b/bin/idea.sh
@@ -193,17 +193,7 @@ for root in $MODULE_ROOTS; do
      root=`wslpath -am $root`
    fi

-    VM_CI="jdk.internal.vm.ci/share/classes"
-    VM_COMPILER="src/jdk.internal.vm.compiler/share/classes"
-    if test "${root#*$VM_CI}" != "$root" || test "${root#*$VM_COMPILER}" != "$root"; then
-        for subdir in "$root"/*; do
-            if [ -d "$subdir" ]; then
-                SOURCES=$SOURCES" $SOURCE_PREFIX""$subdir"/src"$SOURCE_POSTFIX"
-            fi
-        done
-    else
-        SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
-    fi
+    SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
 done

 add_replacement "###SOURCE_ROOTS###" "$SOURCES"
@@ -274,4 +264,4 @@ $BOOT_JDK/bin/$JAVAC -d $JAVAC_CLASSES -sourcepath $JAVAC_SOURCE_PATH -cp $JAVAC

 if [ "x$WSL_DISTRO_NAME" != "x" ]; then
  rm -rf $ANT_TEMP
-fi
+fi
--- a/doc/building.html
+++ b/doc/building.html
@@ -80,6 +80,7 @@ id="toc-getting-jdk-binaries">Getting JDK binaries</a></li>
 id="toc-external-library-requirements">External Library Requirements</a>
 <ul>
 <li><a href="#freetype" id="toc-freetype">FreeType</a></li>
+<li><a href="#fontconfig" id="toc-fontconfig">Fontconfig</a></li>
 <li><a href="#cups" id="toc-cups">CUPS</a></li>
 <li><a href="#x11" id="toc-x11">X11</a></li>
 <li><a href="#alsa" id="toc-alsa">ALSA</a></li>
@@ -323,6 +324,8 @@ GB of free disk space is required.</p>
 <p>Even for 32-bit builds, it is recommended to use a 64-bit build
 machine, and instead create a 32-bit target using
 <code>--with-target-bits=32</code>.</p>
+<p>Note: The Windows 32-bit x86 port is deprecated and may be removed in
+a future release.</p>
 <h3 id="building-on-aarch64">Building on aarch64</h3>
 <p>At a minimum, a machine with 8 cores is advisable, as well as 8 GB of
 RAM. (The more cores to use, the more memory you need.) At least 6 GB of
@@ -353,22 +356,22 @@ to date at the time of writing.</p>
 <table>
 <thead>
 <tr class="header">
-<th style="text-align: left;">Operating system</th>
-<th style="text-align: left;">Vendor/version used</th>
+<th>Operating system</th>
+<th>Vendor/version used</th>
 </tr>
 </thead>
 <tbody>
 <tr class="odd">
-<td style="text-align: left;">Linux</td>
-<td style="text-align: left;">Oracle Enterprise Linux 6.4 / 7.6</td>
+<td>Linux</td>
+<td>Oracle Enterprise Linux 6.4 / 7.6</td>
 </tr>
 <tr class="even">
-<td style="text-align: left;">macOS</td>
-<td style="text-align: left;">Mac OS X 10.13 (High Sierra)</td>
+<td>macOS</td>
+<td>Mac OS X 10.13 (High Sierra)</td>
 </tr>
 <tr class="odd">
-<td style="text-align: left;">Windows</td>
-<td style="text-align: left;">Windows Server 2012 R2</td>
+<td>Windows</td>
+<td>Windows Server 2012 R2</td>
 </tr>
 </tbody>
 </table>
@@ -399,6 +402,8 @@ to the build system, e.g. in arguments to <code>configure</code>. So,
 use <code>--with-msvcr-dll=/cygdrive/c/msvcr100.dll</code> rather than
 <code>--with-msvcr-dll=c:\msvcr100.dll</code>. For details on this
 conversion, see the section on <a href="#fixpath">Fixpath</a>.</p>
+<p>Note: The Windows 32-bit x86 port is deprecated and may be removed in
+a future release.</p>
 <h4 id="cygwin">Cygwin</h4>
 <p>A functioning <a href="http://www.cygwin.com/">Cygwin</a> environment
 is required for building the JDK on Windows. If you have a 64-bit OS, we
@@ -677,6 +682,19 @@ copy.</p>
 <p>Use <code>--with-freetype-include=&lt;path&gt;</code> and
 <code>--with-freetype-lib=&lt;path&gt;</code> if <code>configure</code>
 does not automatically locate the platform FreeType files.</p>
+<h3 id="fontconfig">Fontconfig</h3>
+<p>Fontconfig from <a href="http://fontconfig.org">freedesktop.org
+Fontconfig</a> is required on all platforms except Windows and
+macOS.</p>
+<ul>
+<li>To install on an apt-based Linux, try running
+<code>sudo apt-get install     libfontconfig-dev</code>.</li>
+<li>To install on an rpm-based Linux, try running
+<code>sudo yum install     fontconfig-devel</code>.</li>
+</ul>
+<p>Use <code>--with-fontconfig-include=&lt;path&gt;</code> and
+<code>--with-fontconfig=&lt;path&gt;</code> if <code>configure</code>
+does not automatically locate the platform Fontconfig files.</p>
 <h3 id="cups">CUPS</h3>
 <p>CUPS, <a href="http://www.cups.org">Common UNIX Printing System</a>
 header files are required on all platforms, except Windows. Often these
@@ -1097,13 +1115,13 @@ just unpacked.</p>
 Test framework. The top directory, which contains both
 <code>googletest</code> and <code>googlemock</code> directories, should
 be specified via <code>--with-gtest</code>. The minimum supported
-version of Google Test is 1.13.0, whose source code can be obtained:</p>
+version of Google Test is 1.14.0, whose source code can be obtained:</p>
 <ul>
 <li>by downloading and unpacking the source bundle from <a
-href="https://github.com/google/googletest/releases/tag/v1.13.0">here</a></li>
-<li>or by checking out <code>v1.13.0</code> tag of
+href="https://github.com/google/googletest/releases/tag/v1.14.0">here</a></li>
+<li>or by checking out <code>v1.14.0</code> tag of
 <code>googletest</code> project:
-<code>git clone -b v1.13.0 https://github.com/google/googletest</code></li>
+<code>git clone -b v1.14.0 https://github.com/google/googletest</code></li>
 </ul>
 <p>To execute the most basic tests (tier 1), use:</p>
 <pre><code>make run-test-tier1</code></pre>
@@ -1195,27 +1213,27 @@ following targets are known to work:</p>
 <table>
 <thead>
 <tr class="header">
-<th style="text-align: left;">Supported devkit targets</th>
+<th>Supported devkit targets</th>
 </tr>
 </thead>
 <tbody>
 <tr class="odd">
-<td style="text-align: left;">x86_64-linux-gnu</td>
+<td>x86_64-linux-gnu</td>
 </tr>
 <tr class="even">
-<td style="text-align: left;">aarch64-linux-gnu</td>
+<td>aarch64-linux-gnu</td>
 </tr>
 <tr class="odd">
-<td style="text-align: left;">arm-linux-gnueabihf</td>
+<td>arm-linux-gnueabihf</td>
 </tr>
 <tr class="even">
-<td style="text-align: left;">ppc64-linux-gnu</td>
+<td>ppc64-linux-gnu</td>
 </tr>
 <tr class="odd">
-<td style="text-align: left;">ppc64le-linux-gnu</td>
+<td>ppc64le-linux-gnu</td>
 </tr>
 <tr class="even">
-<td style="text-align: left;">s390x-linux-gnu</td>
+<td>s390x-linux-gnu</td>
 </tr>
 </tbody>
 </table>
@@ -1417,112 +1435,119 @@ example <code>${sysroot}/usr/lib/${target}/</code></p></li>
 <p>Architectures that are known to successfully cross-compile like this
 are:</p>
 <table>
+<colgroup>
+<col style="width: 13%" />
+<col style="width: 13%" />
+<col style="width: 15%" />
+<col style="width: 27%" />
+<col style="width: 29%" />
+</colgroup>
 <thead>
 <tr class="header">
-<th style="text-align: left;">Target</th>
-<th style="text-align: left;">Debian tree</th>
-<th style="text-align: left;">Debian arch</th>
-<th style="text-align: left;"><code>--openjdk-target=...</code></th>
+<th>Target</th>
+<th>Debian tree</th>
+<th>Debian arch</th>
+<th><code>--openjdk-target=...</code></th>
 <th><code>--with-jvm-variants=...</code></th>
 </tr>
 </thead>
 <tbody>
 <tr class="odd">
-<td style="text-align: left;">x86</td>
-<td style="text-align: left;">buster</td>
-<td style="text-align: left;">i386</td>
-<td style="text-align: left;">i386-linux-gnu</td>
+<td>x86</td>
+<td>buster</td>
+<td>i386</td>
+<td>i386-linux-gnu</td>
 <td>(all)</td>
 </tr>
 <tr class="even">
-<td style="text-align: left;">arm</td>
-<td style="text-align: left;">buster</td>
-<td style="text-align: left;">armhf</td>
-<td style="text-align: left;">arm-linux-gnueabihf</td>
+<td>arm</td>
+<td>buster</td>
+<td>armhf</td>
+<td>arm-linux-gnueabihf</td>
 <td>(all)</td>
 </tr>
 <tr class="odd">
-<td style="text-align: left;">aarch64</td>
-<td style="text-align: left;">buster</td>
-<td style="text-align: left;">arm64</td>
-<td style="text-align: left;">aarch64-linux-gnu</td>
+<td>aarch64</td>
+<td>buster</td>
+<td>arm64</td>
+<td>aarch64-linux-gnu</td>
 <td>(all)</td>
 </tr>
 <tr class="even">
-<td style="text-align: left;">ppc64le</td>
-<td style="text-align: left;">buster</td>
-<td style="text-align: left;">ppc64el</td>
-<td style="text-align: left;">powerpc64le-linux-gnu</td>
+<td>ppc64le</td>
+<td>buster</td>
+<td>ppc64el</td>
+<td>powerpc64le-linux-gnu</td>
 <td>(all)</td>
 </tr>
 <tr class="odd">
-<td style="text-align: left;">s390x</td>
-<td style="text-align: left;">buster</td>
-<td style="text-align: left;">s390x</td>
-<td style="text-align: left;">s390x-linux-gnu</td>
+<td>s390x</td>
+<td>buster</td>
+<td>s390x</td>
+<td>s390x-linux-gnu</td>
 <td>(all)</td>
 </tr>
 <tr class="even">
-<td style="text-align: left;">mipsle</td>
-<td style="text-align: left;">buster</td>
-<td style="text-align: left;">mipsel</td>
-<td style="text-align: left;">mipsel-linux-gnu</td>
+<td>mipsle</td>
+<td>buster</td>
+<td>mipsel</td>
+<td>mipsel-linux-gnu</td>
 <td>zero</td>
 </tr>
 <tr class="odd">
-<td style="text-align: left;">mips64le</td>
-<td style="text-align: left;">buster</td>
-<td style="text-align: left;">mips64el</td>
-<td style="text-align: left;">mips64el-linux-gnueabi64</td>
+<td>mips64le</td>
+<td>buster</td>
+<td>mips64el</td>
+<td>mips64el-linux-gnueabi64</td>
 <td>zero</td>
 </tr>
 <tr class="even">
-<td style="text-align: left;">armel</td>
-<td style="text-align: left;">buster</td>
-<td style="text-align: left;">arm</td>
-<td style="text-align: left;">arm-linux-gnueabi</td>
+<td>armel</td>
+<td>buster</td>
+<td>arm</td>
+<td>arm-linux-gnueabi</td>
 <td>zero</td>
 </tr>
 <tr class="odd">
-<td style="text-align: left;">ppc</td>
-<td style="text-align: left;">sid</td>
-<td style="text-align: left;">powerpc</td>
-<td style="text-align: left;">powerpc-linux-gnu</td>
+<td>ppc</td>
+<td>sid</td>
+<td>powerpc</td>
+<td>powerpc-linux-gnu</td>
 <td>zero</td>
 </tr>
 <tr class="even">
-<td style="text-align: left;">ppc64be</td>
-<td style="text-align: left;">sid</td>
-<td style="text-align: left;">ppc64</td>
-<td style="text-align: left;">powerpc64-linux-gnu</td>
+<td>ppc64be</td>
+<td>sid</td>
+<td>ppc64</td>
+<td>powerpc64-linux-gnu</td>
 <td>(all)</td>
 </tr>
 <tr class="odd">
-<td style="text-align: left;">m68k</td>
-<td style="text-align: left;">sid</td>
-<td style="text-align: left;">m68k</td>
-<td style="text-align: left;">m68k-linux-gnu</td>
+<td>m68k</td>
+<td>sid</td>
+<td>m68k</td>
+<td>m68k-linux-gnu</td>
 <td>zero</td>
 </tr>
 <tr class="even">
-<td style="text-align: left;">alpha</td>
-<td style="text-align: left;">sid</td>
-<td style="text-align: left;">alpha</td>
-<td style="text-align: left;">alpha-linux-gnu</td>
+<td>alpha</td>
+<td>sid</td>
+<td>alpha</td>
+<td>alpha-linux-gnu</td>
 <td>zero</td>
 </tr>
 <tr class="odd">
-<td style="text-align: left;">sh4</td>
-<td style="text-align: left;">sid</td>
-<td style="text-align: left;">sh4</td>
-<td style="text-align: left;">sh4-linux-gnu</td>
+<td>sh4</td>
+<td>sid</td>
+<td>sh4</td>
+<td>sh4-linux-gnu</td>
 <td>zero</td>
 </tr>
 <tr class="even">
-<td style="text-align: left;">riscv64</td>
-<td style="text-align: left;">sid</td>
-<td style="text-align: left;">riscv64</td>
-<td style="text-align: left;">riscv64-linux-gnu</td>
+<td>riscv64</td>
+<td>sid</td>
+<td>riscv64</td>
+<td>riscv64-linux-gnu</td>
 <td>(all)</td>
 </tr>
 </tbody>
@@ -2232,18 +2257,7 @@ However, please bear in mind that the JDK is a massive project, and we
 must ask you to follow our rules and guidelines to be able to accept
 your contribution.</p>
 <p>The official place to start is the <a
-href="http://openjdk.org/contribute/">'How to contribute' page</a>.
-There is also an official (but somewhat outdated and skimpy on details)
-<a href="http://openjdk.org/guide/">Developer's Guide</a>.</p>
-<p>If this seems overwhelming to you, the Adoption Group is there to
-help you! A good place to start is their <a
-href="https://wiki.openjdk.org/display/Adoption/New+Contributor">'New
-Contributor' page</a>, or start reading the comprehensive <a
-href="https://adoptopenjdk.gitbooks.io/adoptopenjdk-getting-started-kit/en/">Getting
-Started Kit</a>. The Adoption Group will also happily answer any
-questions you have about contributing. Contact them by <a
-href="http://mail.openjdk.org/mailman/listinfo/adoption-discuss">mail</a>
-or <a href="http://openjdk.org/irc/">IRC</a>.</p>
+href="https://openjdk.org/guide/">OpenJDK Developers’ Guide</a>.</p>
 <h2 id="editing-this-document">Editing this document</h2>
 <p>If you want to contribute changes to this document, edit
 <code>doc/building.md</code> and then run
--- a/doc/building.md
+++ b/doc/building.md
@@ -126,6 +126,8 @@ space is required.
 Even for 32-bit builds, it is recommended to use a 64-bit build machine, and
 instead create a 32-bit target using `--with-target-bits=32`.

+Note: The Windows 32-bit x86 port is deprecated and may be removed in a future release.
+
 ### Building on aarch64

 At a minimum, a machine with 8 cores is advisable, as well as 8 GB of RAM.
@@ -162,11 +164,11 @@ This table lists the OS versions used by Oracle when building the JDK. Such
 information is always subject to change, but this table is up to date at the
 time of writing.

- Operating system   Vendor/version used
- -----------------  -------------------------------------------------------
- Linux              Oracle Enterprise Linux 6.4 / 7.6
- macOS              Mac OS X 10.13 (High Sierra)
- Windows            Windows Server 2012 R2
+| Operating system  | Vendor/version used                |
+| ----------------- | ---------------------------------- |
+| Linux             | Oracle Enterprise Linux 6.4 / 7.6  |
+| macOS             | Mac OS X 10.13 (High Sierra)       |
+| Windows           | Windows Server 2012 R2             |

 The double version numbers for Linux are due to the hybrid model
 used at Oracle, where header files and external libraries from an older version
@@ -199,6 +201,8 @@ rule also applies to input to the build system, e.g. in arguments to
 `--with-msvcr-dll=c:\msvcr100.dll`. For details on this conversion, see the section
 on [Fixpath](#fixpath).

+Note: The Windows 32-bit x86 port is deprecated and may be removed in a future release.
+
 #### Cygwin

 A functioning [Cygwin](http://www.cygwin.com/) environment is required for
@@ -471,6 +475,19 @@ rather than bundling the JDK's own copy.
 Use `--with-freetype-include=<path>` and `--with-freetype-lib=<path>`
 if `configure` does not automatically locate the platform FreeType files.

+### Fontconfig
+
+Fontconfig from [freedesktop.org Fontconfig](http://fontconfig.org) is required
+on all platforms except Windows and macOS.
+
+  * To install on an apt-based Linux, try running `sudo apt-get install
+    libfontconfig-dev`.
+  * To install on an rpm-based Linux, try running `sudo yum install
+    fontconfig-devel`.
+
+Use `--with-fontconfig-include=<path>` and `--with-fontconfig=<path>`
+if `configure` does not automatically locate the platform Fontconfig files.
+
 ### CUPS

 CUPS, [Common UNIX Printing System](http://www.cups.org) header files are
@@ -867,11 +884,11 @@ Download the latest `.tar.gz` file, unpack it, and point `--with-jtreg` to the
 Building of Hotspot Gtest suite requires the source code of Google
 Test framework.  The top directory, which contains both `googletest`
 and `googlemock` directories, should be specified via `--with-gtest`.
-The minimum supported version of Google Test is 1.13.0, whose source
+The minimum supported version of Google Test is 1.14.0, whose source
 code can be obtained:

- * by downloading and unpacking the source bundle from [here](https://github.com/google/googletest/releases/tag/v1.13.0)
- * or by checking out `v1.13.0` tag of `googletest` project: `git clone -b v1.13.0 https://github.com/google/googletest`
+ * by downloading and unpacking the source bundle from [here](https://github.com/google/googletest/releases/tag/v1.14.0)
+ * or by checking out `v1.14.0` tag of `googletest` project: `git clone -b v1.14.0 https://github.com/google/googletest`

 To execute the most basic tests (tier 1), use:
 ```
@@ -970,14 +987,14 @@ https://sourceware.org/autobook/autobook/autobook_17.html). If no
 targets are given, a native toolchain for the current platform will be
 created. Currently, at least the following targets are known to work:

- Supported devkit targets
- -------------------------
- x86_64-linux-gnu
- aarch64-linux-gnu
- arm-linux-gnueabihf
- ppc64-linux-gnu
- ppc64le-linux-gnu
- s390x-linux-gnu
+| Supported devkit targets |
+| ------------------------ |
+| x86_64-linux-gnu         |
+| aarch64-linux-gnu        |
+| arm-linux-gnueabihf      |
+| ppc64-linux-gnu          |
+| ppc64le-linux-gnu        |
+| s390x-linux-gnu          |

 `BASE_OS` must be one of "OEL6" for Oracle Enterprise Linux 6 or
 "Fedora" (if not specified "OEL6" will be the default). If the base OS
@@ -1204,22 +1221,22 @@ it might require a little nudge with:

 Architectures that are known to successfully cross-compile like this are:

-  Target        Debian tree  Debian arch   `--openjdk-target=...`   `--with-jvm-variants=...`
-  ------------  ------------ ------------- ------------------------ --------------
-  x86           buster       i386          i386-linux-gnu           (all)
-  arm           buster       armhf         arm-linux-gnueabihf      (all)
-  aarch64       buster       arm64         aarch64-linux-gnu        (all)
-  ppc64le       buster       ppc64el       powerpc64le-linux-gnu    (all)
-  s390x         buster       s390x         s390x-linux-gnu          (all)
-  mipsle        buster       mipsel        mipsel-linux-gnu         zero
-  mips64le      buster       mips64el      mips64el-linux-gnueabi64 zero
-  armel         buster       arm           arm-linux-gnueabi        zero
-  ppc           sid          powerpc       powerpc-linux-gnu        zero
-  ppc64be       sid          ppc64         powerpc64-linux-gnu      (all)
-  m68k          sid          m68k          m68k-linux-gnu           zero
-  alpha         sid          alpha         alpha-linux-gnu          zero
-  sh4           sid          sh4           sh4-linux-gnu            zero
-  riscv64       sid          riscv64       riscv64-linux-gnu        (all)
+| Target       | Debian tree  | Debian arch   | `--openjdk-target=...`   | `--with-jvm-variants=...` |
+| ------------ | ------------ | ------------- | ------------------------ | ------------------------- |
+| x86          | buster       | i386          | i386-linux-gnu           | (all)                     |
+| arm          | buster       | armhf         | arm-linux-gnueabihf      | (all)                     |
+| aarch64      | buster       | arm64         | aarch64-linux-gnu        | (all)                     |
+| ppc64le      | buster       | ppc64el       | powerpc64le-linux-gnu    | (all)                     |
+| s390x        | buster       | s390x         | s390x-linux-gnu          | (all)                     |
+| mipsle       | buster       | mipsel        | mipsel-linux-gnu         | zero                      |
+| mips64le     | buster       | mips64el      | mips64el-linux-gnueabi64 | zero                      |
+| armel        | buster       | arm           | arm-linux-gnueabi        | zero                      |
+| ppc          | sid          | powerpc       | powerpc-linux-gnu        | zero                      |
+| ppc64be      | sid          | ppc64         | powerpc64-linux-gnu      | (all)                     |
+| m68k         | sid          | m68k          | m68k-linux-gnu           | zero                      |
+| alpha        | sid          | alpha         | alpha-linux-gnu          | zero                      |
+| sh4          | sid          | sh4           | sh4-linux-gnu            | zero                      |
+| riscv64      | sid          | riscv64       | riscv64-linux-gnu        | (all)                     |

 ### Building for ARM/aarch64

@@ -2015,20 +2032,7 @@ First of all: Thank you! We gladly welcome your contribution.
 However, please bear in mind that the JDK is a massive project, and we must ask
 you to follow our rules and guidelines to be able to accept your contribution.

-The official place to start is the ['How to contribute' page](
-http://openjdk.org/contribute/). There is also an official (but somewhat
-outdated and skimpy on details) [Developer's Guide](
-http://openjdk.org/guide/).
-
-If this seems overwhelming to you, the Adoption Group is there to help you! A
-good place to start is their ['New Contributor' page](
-https://wiki.openjdk.org/display/Adoption/New+Contributor), or start
-reading the comprehensive [Getting Started Kit](
-https://adoptopenjdk.gitbooks.io/adoptopenjdk-getting-started-kit/en/). The
-Adoption Group will also happily answer any questions you have about
-contributing. Contact them by [mail](
-http://mail.openjdk.org/mailman/listinfo/adoption-discuss) or [IRC](
-http://openjdk.org/irc/).
+The official place to start is the [OpenJDK Developers’ Guide](https://openjdk.org/guide/).

 ## Editing this document

--- a/doc/testing.html
+++ b/doc/testing.html
@@ -426,6 +426,14 @@ GB/2</em>.</p>
 <p>Sets the argument <code>-timeoutHandlerTimeout</code> for JTReg. The
 default value is 0. This is only valid if the failure handler is
 built.</p>
+<h4 id="jtreg_test_thread_factory">JTREG_TEST_THREAD_FACTORY</h4>
+<p>Sets the <code>-testThreadFactory</code> for JTReg. It should be the
+fully qualified classname of a class which implements
+<code>java.util.concurrent.ThreadFactory</code>. One such implementation
+class, named Virtual, is currently part of the JDK build in the
+<code>test/jtreg_test_thread_factory/</code> directory. This class gets
+compiled during the test image build. The implementation of the Virtual
+class creates a new virtual thread for executing each test class.</p>
 <h4 id="test_mode">TEST_MODE</h4>
 <p>The test mode (<code>agentvm</code> or <code>othervm</code>).</p>
 <p>Defaults to <code>agentvm</code>.</p>
--- a/doc/testing.md
+++ b/doc/testing.md
@@ -378,6 +378,15 @@ Defaults to 4.
 Sets the argument `-timeoutHandlerTimeout` for JTReg. The default value is 0.
 This is only valid if the failure handler is built.

+#### JTREG_TEST_THREAD_FACTORY
+
+Sets the `-testThreadFactory` for JTReg. It should be the fully qualified classname
+of a class which implements `java.util.concurrent.ThreadFactory`.
+One such implementation class, named Virtual, is currently part of the JDK build
+in the `test/jtreg_test_thread_factory/` directory. This class gets compiled during
+the test image build. The implementation of the Virtual class creates a new virtual
+thread for executing each test class.
+
 #### TEST_MODE

 The test mode (`agentvm` or `othervm`).
--- a/make/CompileInterimLangtools.gmk
+++ b/make/CompileInterimLangtools.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -98,6 +98,7 @@ define SetupInterimModule
      EXCLUDES := sun javax/tools/snippet-files, \
      EXCLUDE_FILES := $(TOPDIR)/src/$1/share/classes/module-info.java \
          $(TOPDIR)/src/$1/share/classes/javax/tools/ToolProvider.java \
+          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/Main.java \
          Standard.java, \
      EXTRA_FILES := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim/module-info.java \
          $($1.interim_EXTRA_FILES), \
@@ -109,7 +110,9 @@ define SetupInterimModule
          $$(INTERIM_LANGTOOLS_ADD_EXPORTS) \
          --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
          --add-exports java.base/jdk.internal.javac=java.compiler.interim \
-          --add-exports java.base/jdk.internal.javac=jdk.compiler.interim, \
+          --add-exports java.base/jdk.internal.javac=jdk.compiler.interim \
+          --add-exports jdk.internal.opt/jdk.internal.opt=jdk.compiler.interim \
+          --add-exports jdk.internal.opt/jdk.internal.opt=jdk.javadoc.interim, \
  ))

  $1_DEPS_INTERIM := $$(addsuffix .interim, $$(filter \
--- a/make/CompileToolsJdk.gmk
+++ b/make/CompileToolsJdk.gmk
@@ -57,7 +57,9 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_JDK, \
    JAVAC_FLAGS := \
        --add-exports java.desktop/sun.awt=ALL-UNNAMED \
        --add-exports java.base/sun.text=ALL-UNNAMED \
-        --add-exports java.base/sun.security.util=ALL-UNNAMED, \
+        --add-exports java.base/sun.security.util=ALL-UNNAMED \
+        --add-exports jdk.internal.opt/jdk.internal.opt=jdk.compiler.interim \
+        --add-exports jdk.internal.opt/jdk.internal.opt=jdk.javadoc.interim, \
 ))

 TARGETS += $(BUILD_TOOLS_JDK)
@@ -90,7 +92,9 @@ $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \
        --add-exports jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
        --add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
        --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
-        --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED, \
+        --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
+        --add-exports jdk.internal.opt/jdk.internal.opt=jdk.compiler.interim \
+        --add-exports jdk.internal.opt/jdk.internal.opt=jdk.javadoc.interim, \
 ))

 DEPEND_SERVICE_PROVIDER := $(BUILDTOOLS_OUTPUTDIR)/depend/META-INF/services/com.sun.source.util.Plugin
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -67,7 +67,6 @@ MODULES_SOURCE_PATH := $(call PathList, $(call GetModuleSrcPath) )
 # ordering of tags as the tags are otherwise ordered in order of definition.
 JAVADOC_TAGS := \
    -tag beaninfo:X \
-    -tag revised:X \
    -tag since.unbundled:X \
    -tag Note:X \
    -tag ToDo:X \
@@ -110,7 +109,6 @@ JAVA_WARNINGS_ARE_ERRORS ?= -Werror
 JAVADOC_OPTIONS := -use -keywords -notimestamp \
    -encoding ISO-8859-1 -docencoding UTF-8 -breakiterator \
    -splitIndex --system none -javafx --expand-requires transitive \
-    --enable-preview -source $(JDK_SOURCE_TARGET_VERSION) \
    --override-methods=summary \
    --no-external-specs-page

@@ -118,7 +116,6 @@ JAVADOC_OPTIONS := -use -keywords -notimestamp \
 # development cycle.
 REFERENCE_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
    -encoding ISO-8859-1 -breakiterator -splitIndex --system none \
-    --enable-preview -source $(JDK_SOURCE_TARGET_VERSION) \
    -html5 -javafx --expand-requires transitive \
    --no-external-specs-page

--- a/make/Global.gmk
+++ b/make/Global.gmk
@@ -125,6 +125,11 @@ test-prebuilt:
 	    $(MAKE) --no-print-directory -r -R -I make/common/ -f make/RunTestsPrebuilt.gmk \
 	    test-prebuilt CUSTOM_MAKE_DIR=$(CUSTOM_MAKE_DIR) TEST="$(TEST)" )

+test-prebuilt-with-exit-code:
+	@( cd $(topdir) && \
+	    $(MAKE) --no-print-directory -r -R -I make/common/ -f make/RunTestsPrebuilt.gmk \
+	    test-prebuilt-with-exit-code CUSTOM_MAKE_DIR=$(CUSTOM_MAKE_DIR) TEST="$(TEST)" )
+
 # Alias for backwards compatibility
 run-test-prebuilt: test-prebuilt

--- a/make/GraalBuilderImage.gmk
+++ b/make/GraalBuilderImage.gmk
@@ -43,10 +43,10 @@ $(eval $(call SetupCopyFiles, COPY_JDK_IMG, \
 TARGETS += $(COPY_JDK_IMG)

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

--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@ include $(SPEC)
 include MakeBase.gmk
 include Execute.gmk
 include Modules.gmk
+include Utils.gmk

 JDK_TARGETS :=
 JRE_TARGETS :=
@@ -39,7 +40,7 @@ $(eval $(call IncludeCustomExtension, Images-pre.gmk))
 ################################################################################

 # All modules for the current target platform.
-ALL_MODULES := $(call FindAllModules)
+ALL_MODULES := $(call FindAllModules) $(EXTRA_MODULES)

 $(eval $(call ReadImportMetaData))

@@ -54,7 +55,10 @@ JDK_MODULES_LIST := $(call CommaList, $(JDK_MODULES))

 BASE_RELEASE_FILE := $(JDK_OUTPUTDIR)/release

-JMODS := $(wildcard $(IMAGES_OUTPUTDIR)/jmods/*.jmod)
+JMODS_DIRS := $(EXTRA_JMODS_DIR) $(IMAGES_OUTPUTDIR)/jmods
+
+JDK_JMODS := $(foreach m, $(JDK_MODULES), $(firstword $(wildcard $(addsuffix /$m.jmod, $(JMODS_DIRS)))))
+JRE_JMODS := $(foreach m, $(JRE_MODULES), $(firstword $(wildcard $(addsuffix /$m.jmod, $(JMODS_DIRS)))))

 JLINK_ORDER_RESOURCES := **module-info.class
 JLINK_JLI_CLASSES :=
@@ -71,7 +75,7 @@ JLINK_ORDER_RESOURCES += \
    #

 JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \
-    --module-path $(IMAGES_OUTPUTDIR)/jmods \
+    --module-path $(call PathList, $(JMODS_DIRS)) \
    --endian $(OPENJDK_TARGET_CPU_ENDIAN) \
    --release-info $(BASE_RELEASE_FILE) \
    --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \
@@ -87,12 +91,15 @@ endif

 JLINK_DISABLE_WARNINGS := | ( $(GREP) -v -e "WARNING: Using incubator module" || test "$$?" = "1" )

+JDK_IMAGE_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jdk
+JRE_IMAGE_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jre
+
 $(eval $(call SetupExecute, jlink_jdk, \
    WARN := Creating jdk image, \
-    DEPS := $(JMODS) $(BASE_RELEASE_FILE) \
-        $(call DependOnVariable, JDK_MODULES_LIST), \
+    DEPS := $(JDK_JMODS) $(BASE_RELEASE_FILE) \
+        $(call DependOnVariable, JDK_MODULES_LIST, $(JDK_IMAGE_SUPPORT_DIR)/_jlink_jdk.vardeps), \
    OUTPUT_DIR := $(JDK_IMAGE_DIR), \
-    SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jdk, \
+    SUPPORT_DIR := $(JDK_IMAGE_SUPPORT_DIR), \
    PRE_COMMAND := $(RM) -r $(JDK_IMAGE_DIR), \
    COMMAND := $(JLINK_TOOL) --add-modules $(JDK_MODULES_LIST) \
        $(JLINK_JDK_EXTRA_OPTS) --output $(JDK_IMAGE_DIR) \
@@ -103,10 +110,10 @@ JLINK_JDK_TARGETS := $(jlink_jdk)

 $(eval $(call SetupExecute, jlink_jre, \
    WARN := Creating legacy jre image, \
-    DEPS := $(JMODS) $(BASE_RELEASE_FILE) \
-        $(call DependOnVariable, JDK_MODULES_LIST), \
+    DEPS := $(JRE_JMODS) $(BASE_RELEASE_FILE) \
+        $(call DependOnVariable, JRE_MODULES_LIST, $(JRE_IMAGE_SUPPORT_DIR)/_jlink_jre.vardeps), \
    OUTPUT_DIR := $(JRE_IMAGE_DIR), \
-    SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jre, \
+    SUPPORT_DIR := $(JRE_IMAGE_SUPPORT_DIR), \
    PRE_COMMAND := $(RM) -r $(JRE_IMAGE_DIR), \
    COMMAND := $(JLINK_TOOL) --add-modules $(JRE_MODULES_LIST) \
        $(JLINK_JRE_EXTRA_OPTS) --output $(JRE_IMAGE_DIR), \
@@ -142,7 +149,7 @@ define CreateCDSArchive
      INFO := Using CDS flags for $1: $$($1_$2_CDS_DUMP_FLAGS), \
      DEPS := $$(jlink_jdk), \
      OUTPUT_FILE := $$(JDK_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE), \
-      SUPPORT_DIR := $$(SUPPORT_OUTPUTDIR)/images/jdk, \
+      SUPPORT_DIR := $$(JDK_IMAGE_SUPPORT_DIR), \
      COMMAND := $$(FIXPATH) $$(JDK_IMAGE_DIR)/bin/java -Xshare:dump \
          -XX:SharedArchiveFile=$$(JDK_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE) \
          -$1 $$($1_$2_DUMP_EXTRA_ARG) $$($1_$2_CDS_DUMP_FLAGS) $$(LOG_INFO), \
@@ -155,7 +162,7 @@ define CreateCDSArchive
      INFO := Using CDS flags for $1: $$($1_$2_CDS_DUMP_FLAGS), \
      DEPS := $$(jlink_jre), \
      OUTPUT_FILE := $$(JRE_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE), \
-      SUPPORT_DIR := $$(SUPPORT_OUTPUTDIR)/images/jre, \
+      SUPPORT_DIR := $$(JRE_IMAGE_SUPPORT_DIR), \
      COMMAND := $$(FIXPATH) $$(JRE_IMAGE_DIR)/bin/java -Xshare:dump \
          -XX:SharedArchiveFile=$$(JRE_IMAGE_DIR)/$$($1_$2_CDS_ARCHIVE) \
          -$1 $$($1_$2_DUMP_EXTRA_ARG) $$($1_$2_CDS_DUMP_FLAGS) $$(LOG_INFO), \
--- a/make/Init.gmk
+++ b/make/Init.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2022, 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
@@ -138,7 +138,10 @@ ifeq ($(HAS_SPEC),)
    # The spec files depend on the autoconf source code. This check makes sure
    # the configuration is up to date after changes to configure.
    $(SPECS): $(wildcard $(topdir)/make/autoconf/*) \
-            $(if $(CUSTOM_CONFIG_DIR), $(wildcard $(CUSTOM_CONFIG_DIR)/*))
+            $(if $(CUSTOM_CONFIG_DIR), $(wildcard $(CUSTOM_CONFIG_DIR)/*)) \
+            $(addprefix $(topdir)/make/conf/, version-numbers.conf branding.conf) \
+            $(if $(CUSTOM_CONF_DIR), $(wildcard $(addprefix $(CUSTOM_CONF_DIR)/, \
+                version-numbers.conf branding.conf)))
        ifeq ($(CONF_CHECK), fail)
 	  @echo Error: The configuration is not up to date for \
 	      "'$(lastword $(subst /, , $(dir $@)))'."
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -233,6 +233,7 @@ ALL_TARGETS += $(LAUNCHER_TARGETS)
 HOTSPOT_VARIANT_TARGETS := $(addprefix hotspot-, $(JVM_VARIANTS))
 HOTSPOT_VARIANT_GENSRC_TARGETS := $(addsuffix -gensrc, $(HOTSPOT_VARIANT_TARGETS))
 HOTSPOT_VARIANT_LIBS_TARGETS := $(addsuffix -libs, $(HOTSPOT_VARIANT_TARGETS))
+HOTSPOT_VARIANT_STATIC_LIBS_TARGETS := $(addsuffix -static-libs, $(HOTSPOT_VARIANT_TARGETS))

 define DeclareHotspotGensrcRecipe
  hotspot-$1-gensrc:
@@ -251,6 +252,14 @@ endef

 $(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v)))

+define DeclareHotspotStaticLibsRecipe
+  hotspot-$1-static-libs:
+	+($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibraries.gmk \
+	    JVM_VARIANT=$1 STATIC_LIBS=true)
+endef
+
+$(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotStaticLibsRecipe,$v)))
+
 $(eval $(call SetupTarget, hotspot-ide-project, \
    MAKEFILE := ide/visualstudio/hotspot/CreateVSProject, \
    DEPS := hotspot exploded-image, \
@@ -298,7 +307,7 @@ $(eval $(call SetupTarget, eclipse-shared-mixed-env, \
 ))

 ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
-    $(HOTSPOT_VARIANT_LIBS_TARGETS)
+    $(HOTSPOT_VARIANT_LIBS_TARGETS) $(HOTSPOT_VARIANT_STATIC_LIBS_TARGETS)

 ################################################################################
 # Help and user support
@@ -462,6 +471,12 @@ $(eval $(call SetupTarget, symbols-image, \

 $(eval $(call SetupTarget, static-libs-image, \
    MAKEFILE := StaticLibsImage, \
+    TARGET := static-libs-image, \
+))
+
+$(eval $(call SetupTarget, static-libs-graal-image, \
+    MAKEFILE := StaticLibsImage, \
+    TARGET := static-libs-graal-image, \
 ))

 $(eval $(call SetupTarget, mac-jdk-bundle, \
@@ -489,7 +504,7 @@ $(eval $(call SetupTarget, exploded-image-optimize, \

 $(eval $(call SetupTarget, graal-builder-image, \
    MAKEFILE := GraalBuilderImage, \
-    DEPS := jdk-image static-libs-image, \
+    DEPS := jdk-image static-libs-graal-image, \
 ))

 ifeq ($(JCOV_ENABLED), true)
@@ -747,6 +762,22 @@ ifeq ($(BUILD_FAILURE_HANDLER), true)
  ))
 endif

+ifeq ($(BUILD_JTREG_TEST_THREAD_FACTORY), true)
+  # Builds the test thread factory jtreg extension
+  $(eval $(call SetupTarget, build-test-test-thread-factory, \
+      MAKEFILE := test/BuildJtregTestThreadFactory, \
+      TARGET := build, \
+      DEPS := interim-langtools exploded-image, \
+  ))
+
+  # Copies the jtreg test thread factory into the test image
+  $(eval $(call SetupTarget, test-image-test-thread-factory, \
+      MAKEFILE := test/BuildJtregTestThreadFactory, \
+      TARGET := images, \
+      DEPS := build-test-test-thread-factory, \
+  ))
+endif
+
 $(eval $(call SetupTarget, build-microbenchmark, \
    MAKEFILE := test/BuildMicrobenchmark, \
    DEPS := interim-langtools exploded-image, \
@@ -873,6 +904,7 @@ else
  $(foreach v, $(JVM_VARIANTS), \
      $(eval hotspot-$v-gensrc: java.base-copy buildtools-hotspot) \
      $(eval hotspot-$v-libs: hotspot-$v-gensrc java.base-copy) \
+      $(eval hotspot-$v-static-libs: hotspot-$v-gensrc java.base-copy) \
  )

  # If not already set, set the JVM variant target so that the JVM will be built.
@@ -935,11 +967,15 @@ else
  jdk.compiler-gendata: $(GENSRC_MODULEINFO_TARGETS)

  # Declare dependencies between jmod targets.
-  # java.base jmod needs jrt-fs.jar and access to the other jmods to be built.
+  # java.base jmod needs jrt-fs.jar and access to the jmods for all non
+  # upgradeable modules and their transitive dependencies.
  # When creating the BUILDJDK, we don't need to add hashes to java.base, thus
  # we don't need to depend on all other jmods
  ifneq ($(CREATING_BUILDJDK), true)
-    java.base-jmod: jrtfs-jar $(filter-out java.base-jmod, $(JMOD_TARGETS))
+    java.base-jmod: jrtfs-jar $(addsuffix -jmod, $(filter-out java.base, $(sort \
+        $(foreach m, $(filter-out $(call FindAllUpgradeableModules), $(JMOD_MODULES)), \
+          $m $(call FindTransitiveDepsForModules, $m) \
+        ))))
  endif

  # If not already set, set the JVM target so that the JVM will be built.
@@ -1031,7 +1067,9 @@ else

  symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS)

-  static-libs-image: $(STATIC_LIBS_TARGETS)
+  static-libs-image: hotspot-static-libs $(STATIC_LIBS_TARGETS)
+
+  static-libs-graal-image: $(STATIC_LIBS_TARGETS)

  bootcycle-images: jdk-image

@@ -1081,6 +1119,7 @@ hotspot: $(HOTSPOT_VARIANT_TARGETS)
 $(foreach v, $(JVM_VARIANTS), \
  $(eval hotspot-libs: hotspot-$v-libs) \
  $(eval hotspot-gensrc: hotspot-$v-gensrc) \
+  $(eval hotspot-static-libs: hotspot-$v-static-libs) \
 )

 gensrc: $(GENSRC_TARGETS)
@@ -1227,6 +1266,10 @@ ifeq ($(BUILD_FAILURE_HANDLER), true)
  test-image: test-image-failure-handler
 endif

+ifeq ($(BUILD_JTREG_TEST_THREAD_FACTORY), true)
+  test-image: test-image-test-thread-factory
+endif
+
 ifneq ($(JMH_CORE_JAR), )
  test-image: build-microbenchmark
 endif
@@ -1239,7 +1282,8 @@ all-images: product-images test-image all-docs-images
 # all-bundles packages all our deliverables as tar.gz bundles.
 all-bundles: product-bundles test-bundles docs-bundles static-libs-bundles

-ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \
+ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-static-libs \
+    hotspot-gensrc gensrc gendata \
    copy java libs static-libs launchers jmods \
    jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \
    exploded-image-base exploded-image runnable-buildjdk \
--- a/make/MainSupport.gmk
+++ b/make/MainSupport.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -38,11 +38,16 @@ _MAINSUPPORT_GMK := 1
 #   TARGET the makefile target
 #   ARGS arguments to the makefile
 #   DEPS the target(s) this new rule depends on
+#   DIR the directory of the makefile (defaults to $(TOPDIR)/make)
 #
 SetupTarget = $(NamedParamsMacroTemplate)
 define SetupTargetBody
+  ifeq ($$($1_DIR), )
+    $1_DIR := $(TOPDIR)/make
+  endif
+
  $1:
-	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f $$($1_MAKEFILE).gmk $$($1_TARGET) $$($1_ARGS))
+	+($(CD) $$($1_DIR) && $(MAKE) $(MAKE_ARGS) -f $$($1_MAKEFILE).gmk $$($1_TARGET) $$($1_ARGS))

  ALL_TARGETS += $1

--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -93,6 +93,9 @@ endif
 JTREG_FAILURE_HANDLER_DIR := $(TEST_IMAGE_DIR)/failure_handler
 JTREG_FAILURE_HANDLER := $(JTREG_FAILURE_HANDLER_DIR)/jtregFailureHandler.jar

+JTREG_TEST_THREAD_FACTORY_DIR := $(TEST_IMAGE_DIR)/jtreg_test_thread_factory
+JTREG_TEST_THREAD_FACTORY_JAR := $(JTREG_TEST_THREAD_FACTORY_DIR)/jtregTestThreadFactory.jar
+
 JTREG_FAILURE_HANDLER_TIMEOUT ?= 0

 ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), )
@@ -200,7 +203,7 @@ $(eval $(call SetTestOpt,REPORT,JTREG))

 $(eval $(call ParseKeywordVariable, JTREG, \
    SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
-        TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS \
+        TEST_MODE ASSERT VERBOSE RETAIN TEST_THREAD_FACTORY MAX_MEM RUN_PROBLEM_LISTS \
        RETRY_COUNT REPEAT_COUNT MAX_OUTPUT REPORT $(CUSTOM_JTREG_SINGLE_KEYWORDS), \
    STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
        EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS \
@@ -592,16 +595,7 @@ define SetupRunMicroTestBody
  endif

  # Set library path for native dependencies
-  $1_JMH_JVM_ARGS := -Djava.library.path=$$(TEST_IMAGE_DIR)/micro/native \
-        --add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.org.objectweb.asm.tree=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile.attribute=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile.constantpool=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile.instruction=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile.java.lang.constant=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile.components=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile.impl=ALL-UNNAMED
+  $1_JMH_JVM_ARGS := -Djava.library.path=$$(TEST_IMAGE_DIR)/micro/native

  ifneq ($$(MICRO_VM_OPTIONS)$$(MICRO_JAVA_OPTIONS), )
    $1_JMH_JVM_ARGS += $$(MICRO_VM_OPTIONS) $$(MICRO_JAVA_OPTIONS)
@@ -752,6 +746,7 @@ define SetupRunJtregTestBody

  JTREG_VERBOSE ?= fail,error,summary
  JTREG_RETAIN ?= fail,error
+  JTREG_TEST_THREAD_FACTORY ?=
  JTREG_RUN_PROBLEM_LISTS ?= false
  JTREG_RETRY_COUNT ?= 0
  JTREG_REPEAT_COUNT ?= 0
@@ -765,6 +760,14 @@ define SetupRunJtregTestBody
    endif
  endif

+  ifneq ($$(JTREG_TEST_THREAD_FACTORY), )
+    $1_JTREG_BASIC_OPTIONS += -testThreadFactoryPath:$$(JTREG_TEST_THREAD_FACTORY_JAR)
+    $1_JTREG_BASIC_OPTIONS += -testThreadFactory:$$(JTREG_TEST_THREAD_FACTORY)
+    $1_JTREG_BASIC_OPTIONS += $$(addprefix $$(JTREG_PROBLEM_LIST_PREFIX), $$(wildcard \
+	$$(addprefix $$($1_TEST_ROOT)/, ProblemList-$$(JTREG_TEST_THREAD_FACTORY).txt) \
+    ))
+  endif
+
  ifneq ($$(JTREG_LAUNCHER_OPTIONS), )
    $1_JTREG_LAUNCHER_OPTIONS += $$(JTREG_LAUNCHER_OPTIONS)
  endif
@@ -797,8 +800,10 @@ define SetupRunJtregTestBody
  $1_JTREG_BASIC_OPTIONS += -e:JIB_DATA_DIR
  # If running on Windows, propagate the _NT_SYMBOL_PATH to enable
  # symbol lookup in hserr files
+  # The minidumps are disabled by default on client Windows, so enable them
  ifeq ($$(call isTargetOs, windows), true)
    $1_JTREG_BASIC_OPTIONS += -e:_NT_SYMBOL_PATH
+    $1_JTREG_BASIC_OPTIONS += -vmoption:-XX:+CreateCoredumpOnCrash
  else ifeq ($$(call isTargetOs, linux), true)
      $1_JTREG_BASIC_OPTIONS += -e:_JVM_DWARF_PATH=$$(SYMBOLS_IMAGE_DIR)
  endif
--- a/make/RunTestsPrebuilt.gmk
+++ b/make/RunTestsPrebuilt.gmk
@@ -295,6 +295,11 @@ test-prebuilt:
 	@cd $(TOPDIR) && $(MAKE) $(MAKE_ARGS) -f make/RunTests.gmk run-test \
 	    TEST="$(TEST)"

+test-prebuilt-with-exit-code: test-prebuilt
+	@if test -f $(MAKESUPPORT_OUTPUTDIR)/exit-with-error ; then \
+	  exit 1 ; \
+	fi
+
 all: test-prebuilt

 .PHONY: default all test-prebuilt
--- a/make/StaticLibsImage.gmk
+++ b/make/StaticLibsImage.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -38,19 +38,43 @@ ALL_MODULES = $(call FindAllModules)

 TARGETS :=

+ifneq ($(filter static-libs-image, $(MAKECMDGOALS)), )
+  IMAGE_DEST_DIR=$(STATIC_LIBS_IMAGE_DIR)/lib
+else ifneq ($(filter static-libs-graal-image, $(MAKECMDGOALS)), )
+  IMAGE_DEST_DIR=$(STATIC_LIBS_GRAAL_IMAGE_DIR)/lib
+endif
+
+# Copy JDK static libs to the image.
 $(foreach m, $(ALL_MODULES), \
  $(eval $(call SetupCopyFiles, COPY_STATIC_LIBS_$m, \
      FLATTEN := true, \
      SRC := $(SUPPORT_OUTPUTDIR)/native/$m, \
-      DEST := $(STATIC_LIBS_IMAGE_DIR)/lib, \
+      DEST := $(IMAGE_DEST_DIR), \
      FILES := $(filter %$(STATIC_LIBRARY_SUFFIX), \
          $(call FindFiles, $(SUPPORT_OUTPUTDIR)/native/$m/*/static)), \
  )) \
  $(eval TARGETS += $$(COPY_STATIC_LIBS_$m)) \
+  $(eval STATIC_LIBS_TARGETS += $$(COPY_STATIC_LIBS_$m)) \
 )

+ifneq ($(filter static-libs-image, $(MAKECMDGOALS)), )
+  # Copy libjvm static library to the image.
+  $(foreach v, $(JVM_VARIANTS), \
+    $(eval $(call SetupCopyFiles, COPY_STATIC_LIBS_$v, \
+        SRC := $(HOTSPOT_OUTPUTDIR)/variant-$v/libjvm/objs/static, \
+        DEST := $(IMAGE_DEST_DIR)/$v, \
+        FILES := $(wildcard $(HOTSPOT_OUTPUTDIR)/variant-$v/libjvm/objs/static/*$(STATIC_LIBRARY_SUFFIX)), \
+    )) \
+    $(eval TARGETS += $$(COPY_STATIC_LIBS_$v)) \
+    $(eval HOTSPOT_VARIANT_STATIC_LIBS_TARGETS += $$(COPY_STATIC_LIBS_$v)) \
+  )
+endif
+
 ################################################################################

+static-libs-image: $(HOTSPOT_VARIANT_STATIC_LIBS_TARGETS) $(STATIC_LIBS_TARGETS)
+static-libs-graal-image: $(STATIC_LIBS_TARGETS)
+
 all: $(TARGETS)

 .PHONY: all
--- a/make/ZipSecurity.gmk
+++ b/make/ZipSecurity.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,6 @@ $(eval $(call SetupZipArchive,BUILD_SEC_BIN_ZIP, \
        modules/java.base/sun/security/internal/interfaces \
        modules/java.base/sun/security/internal/spec \
        modules/java.base/com/sun/crypto/provider \
-        modules/jdk.crypto.ec/sun/security/ec \
        modules/jdk.crypto.mscapi/sun/security/mscapi \
        modules/jdk.crypto.cryptoki/sun/security/pkcs11 \
        modules/jdk.crypto.cryptoki/sun/security/pkcs11/wrapper \
--- a/make/autoconf/basic.m4
+++ b/make/autoconf/basic.m4
@@ -60,6 +60,7 @@ AC_DEFUN([BASIC_CHECK_LEFTOVER_OVERRIDDEN],

 ###############################################################################
 # Setup basic configuration paths, and platform-specific stuff related to PATHs.
+# Make sure to only use tools set up in BASIC_SETUP_FUNDAMENTAL_TOOLS.
 AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
 [
  # Save the current directory this script was started from
@@ -405,9 +406,9 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
    # WARNING: This might be a bad thing to do. You need to be sure you want to
    # have a configuration in this directory. Do some sanity checks!

-    if test ! -e "$OUTPUTDIR/spec.gmk"; then
-      # If we have a spec.gmk, we have run here before and we are OK. Otherwise, check for
-      # other files
+    if test ! -e "$OUTPUTDIR/spec.gmk" && test ! -e "$OUTPUTDIR/configure-support/generated-configure.sh"; then
+      # If we have a spec.gmk or configure-support/generated-configure.sh,
+      # we have run here before and we are OK. Otherwise, check for other files
      files_present=`$LS $OUTPUTDIR`
      # Configure has already touched config.log and confdefs.h in the current dir when this check
      # is performed.
@@ -422,8 +423,9 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
        AC_MSG_NOTICE([Current directory is $CONFIGURE_START_DIR.])
        AC_MSG_NOTICE([Since this is not the source root, configure will output the configuration here])
        AC_MSG_NOTICE([(as opposed to creating a configuration in <src_root>/build/<conf-name>).])
-        AC_MSG_NOTICE([However, this directory is not empty. This is not allowed, since it could])
-        AC_MSG_NOTICE([seriously mess up just about everything.])
+        AC_MSG_NOTICE([However, this directory is not empty, additionally to some allowed files])
+        AC_MSG_NOTICE([it contains $filtered_files.])
+        AC_MSG_NOTICE([This is not allowed, since it could seriously mess up just about everything.])
        AC_MSG_NOTICE([Try 'cd $TOPDIR' and restart configure])
        AC_MSG_NOTICE([(or create a new empty directory and cd to it).])
        AC_MSG_ERROR([Will not continue creating configuration in $CONFIGURE_START_DIR])
--- a/make/autoconf/basic_tools.m4
+++ b/make/autoconf/basic_tools.m4
@@ -29,8 +29,8 @@
 RECOMMENDED_PANDOC_VERSION=2.19.2

 ###############################################################################
-# Setup the most fundamental tools that relies on not much else to set up,
-# but is used by much of the early bootstrap code.
+# Setup the most fundamental tools, used for setting up build platform and
+# path handling.
 AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
 [
  # Bootstrapping: These tools are needed by UTIL_LOOKUP_PROGS
@@ -42,7 +42,28 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
  UTIL_CHECK_NONEMPTY(FILE)
  AC_PATH_PROGS(LDD, ldd)

-  # First are all the fundamental required tools.
+  # Required tools
+  UTIL_REQUIRE_PROGS(ECHO, echo)
+  UTIL_REQUIRE_PROGS(TR, tr)
+  UTIL_REQUIRE_PROGS(UNAME, uname)
+  UTIL_REQUIRE_PROGS(WC, wc)
+
+  # Required tools with some special treatment
+  UTIL_REQUIRE_SPECIAL(GREP, [AC_PROG_GREP])
+  UTIL_REQUIRE_SPECIAL(EGREP, [AC_PROG_EGREP])
+  UTIL_REQUIRE_SPECIAL(SED, [AC_PROG_SED])
+
+  # Tools only needed on some platforms
+  UTIL_LOOKUP_PROGS(PATHTOOL, cygpath wslpath)
+  UTIL_LOOKUP_PROGS(CMD, cmd.exe, $PATH:/cygdrive/c/windows/system32:/mnt/c/windows/system32:/c/windows/system32)
+])
+
+###############################################################################
+# Setup further tools that should be resolved early but after setting up
+# build platform and path handling.
+AC_DEFUN_ONCE([BASIC_SETUP_TOOLS],
+[
+  # Required tools
  UTIL_REQUIRE_PROGS(BASH, bash)
  UTIL_REQUIRE_PROGS(CAT, cat)
  UTIL_REQUIRE_PROGS(CHMOD, chmod)
@@ -50,7 +71,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
  UTIL_REQUIRE_PROGS(CUT, cut)
  UTIL_REQUIRE_PROGS(DATE, date)
  UTIL_REQUIRE_PROGS(DIFF, gdiff diff)
-  UTIL_REQUIRE_PROGS(ECHO, echo)
  UTIL_REQUIRE_PROGS(EXPR, expr)
  UTIL_REQUIRE_PROGS(FIND, find)
  UTIL_REQUIRE_PROGS(GUNZIP, gunzip)
@@ -72,16 +92,10 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
  UTIL_REQUIRE_PROGS(TAR, gtar tar)
  UTIL_REQUIRE_PROGS(TEE, tee)
  UTIL_REQUIRE_PROGS(TOUCH, touch)
-  UTIL_REQUIRE_PROGS(TR, tr)
-  UTIL_REQUIRE_PROGS(UNAME, uname)
-  UTIL_REQUIRE_PROGS(WC, wc)
  UTIL_REQUIRE_PROGS(XARGS, xargs)

-  # Then required tools that require some special treatment.
-  UTIL_REQUIRE_SPECIAL(GREP, [AC_PROG_GREP])
-  UTIL_REQUIRE_SPECIAL(EGREP, [AC_PROG_EGREP])
+  # Required tools with some special treatment
  UTIL_REQUIRE_SPECIAL(FGREP, [AC_PROG_FGREP])
-  UTIL_REQUIRE_SPECIAL(SED, [AC_PROG_SED])

  # Optional tools, we can do without them
  UTIL_LOOKUP_PROGS(DF, df)
@@ -90,10 +104,8 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
  UTIL_LOOKUP_PROGS(READLINK, greadlink readlink)
  UTIL_LOOKUP_PROGS(WHOAMI, whoami)

-  # These are only needed on some platforms
-  UTIL_LOOKUP_PROGS(PATHTOOL, cygpath wslpath)
+  # Tools only needed on some platforms
  UTIL_LOOKUP_PROGS(LSB_RELEASE, lsb_release)
-  UTIL_LOOKUP_PROGS(CMD, cmd.exe, $PATH:/cygdrive/c/windows/system32:/mnt/c/windows/system32:/c/windows/system32)

  # For compare.sh only
  UTIL_LOOKUP_PROGS(CMP, cmp)
--- a/make/autoconf/buildjdk-spec.gmk.in
+++ b/make/autoconf/buildjdk-spec.gmk.in
@@ -103,3 +103,7 @@ JVM_FEATURES_server := cds compiler1 compiler2 g1gc serialgc
 override EXTRA_CFLAGS :=
 override EXTRA_CXXFLAGS :=
 override EXTRA_LDFLAGS :=
+
+# hsdis is not needed
+HSDIS_BACKEND := none
+ENABLE_HSDIS_BUNDLING := false
--- a/make/autoconf/configure.ac
+++ b/make/autoconf/configure.ac
@@ -86,6 +86,7 @@ PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET

 # Continue setting up basic stuff. Most remaining code require fundamental tools.
 BASIC_SETUP_PATHS
+BASIC_SETUP_TOOLS
 BASIC_SETUP_BUILD_ENV

 # Check if it's a pure open build or if custom sources are to be used.
@@ -222,6 +223,10 @@ JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER
 # LeakSanitizer
 JDKOPT_SETUP_LEAK_SANITIZER

+# Fallback linker
+# This needs to go before 'LIB_DETERMINE_DEPENDENCIES'
+JDKOPT_SETUP_FALLBACK_LINKER
+
 ###############################################################################
 #
 # Check dependencies for external and internal libraries.
@@ -249,6 +254,7 @@ HOTSPOT_SETUP_MISC
 ###############################################################################

 LIB_TESTS_ENABLE_DISABLE_FAILURE_HANDLER
+LIB_TESTS_ENABLE_DISABLE_JTREG_TEST_THREAD_FACTORY

 JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST
 JDKOPT_EXCLUDE_TRANSLATIONS
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -51,6 +51,14 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
      SET_SHARED_LIBRARY_NAME='-Wl,-install_name,@rpath/[$]1'
      SET_SHARED_LIBRARY_MAPFILE='-Wl,-exported_symbols_list,[$]1'

+    elif test "x$OPENJDK_TARGET_OS" = xaix; then
+      # Linking is different on aix
+      SHARED_LIBRARY_FLAGS="-shared -Wl,-bM:SRE -Wl,-bnoentry"
+      SET_EXECUTABLE_ORIGIN=""
+      SET_SHARED_LIBRARY_ORIGIN=''
+      SET_SHARED_LIBRARY_NAME=''
+      SET_SHARED_LIBRARY_MAPFILE=''
+
    else
      # Default works for linux, might work on other platforms as well.
      SHARED_LIBRARY_FLAGS='-shared'
@@ -206,7 +214,6 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
      WARNINGS_ENABLE_ALL="-Wall -Wextra -Wformat=2 $WARNINGS_ENABLE_ADDITIONAL"

      DISABLED_WARNINGS="unknown-warning-option unused-parameter unused"
-
      ;;

    xlc)
@@ -284,9 +291,15 @@ AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],
      C_O_FLAG_NONE="${C_O_FLAG_NONE} ${DISABLE_FORTIFY_CFLAGS}"
    fi
  elif test "x$TOOLCHAIN_TYPE" = xclang; then
-    C_O_FLAG_HIGHEST_JVM="-O3"
-    C_O_FLAG_HIGHEST="-O3"
-    C_O_FLAG_HI="-O3"
+    if test "x$OPENJDK_TARGET_OS" = xaix; then
+      C_O_FLAG_HIGHEST_JVM="-O3 -finline-functions"
+      C_O_FLAG_HIGHEST="-O3 -finline-functions"
+      C_O_FLAG_HI="-O3 -finline-functions"
+    else
+      C_O_FLAG_HIGHEST_JVM="-O3"
+      C_O_FLAG_HIGHEST="-O3"
+      C_O_FLAG_HI="-O3"
+    fi
    C_O_FLAG_NORM="-O2"
    C_O_FLAG_DEBUG_JVM="-O0"
    C_O_FLAG_SIZE="-Os"
@@ -458,6 +471,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
      # so for debug we build with '-qpic=large -bbigtoc'.
      DEBUG_CFLAGS_JVM="-qpic=large"
    fi
+    if test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
+      DEBUG_CFLAGS_JVM="-fpic -mcmodel=large"
+    fi
  fi

  if test "x$DEBUG_LEVEL" != xrelease; then
@@ -493,8 +509,14 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
        -fvisibility=hidden -fno-strict-aliasing -fno-omit-frame-pointer"
  fi

+  if test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
+    # clang compiler on aix needs -ffunction-sections
+    TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -ffunction-sections -ftls-model -fno-math-errno -fstack-protector"
+    TOOLCHAIN_CFLAGS_JDK="-ffunction-sections -fsigned-char -fstack-protector"
+  fi
+
  if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -fcheck-new -fstack-protector"
+    TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -fstack-protector"
    TOOLCHAIN_CFLAGS_JDK="-pipe -fstack-protector"
    # reduce lib size on linux in link step, this needs also special compile flags
    # do this on s390x also for libjvm (where serviceability agent is not supported)
@@ -538,8 +560,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
    TOOLCHAIN_CFLAGS_JVM="-qtbtable=full -qtune=balanced -fno-exceptions \
        -qalias=noansi -qstrict -qtls=default -qnortti -qnoeh -qignerrno -qstackprotect"
  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:strictStrings -MP"
-    TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:strictStrings -Zc:wchar_t-"
+    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:strictStrings -Zc:inline -MP"
+    TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:strictStrings -Zc:inline -Zc:wchar_t-"
  fi

  # CFLAGS C language level for JDK sources (hotspot only uses C++)
@@ -601,6 +623,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
    PICFLAG="-fPIC"
    PIEFLAG="-fPIE"
+  elif test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
+    JVM_PICFLAG="-fpic -mcmodel=large -Wl,-bbigtoc
+    JDK_PICFLAG="-fpic
  elif test "x$TOOLCHAIN_TYPE" = xxlc; then
    # '-qpic' defaults to 'qpic=small'. This means that the compiler generates only
    # one instruction for accessing the TOC. If the TOC grows larger than 64K, the linker
@@ -746,6 +771,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
        $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer"
      fi
    fi
+    if test "x$OPENJDK_TARGET_OS" = xaix; then
+      $1_CFLAGS_CPU="-mcpu=pwr8"
+    fi

  elif test "x$TOOLCHAIN_TYPE" = xxlc; then
    if test "x$FLAGS_CPU" = xppc64; then
--- a/make/autoconf/flags-ldflags.m4
+++ b/make/autoconf/flags-ldflags.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -72,10 +72,19 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],

    BASIC_LDFLAGS_JVM_ONLY=""

+    LDFLAGS_CXX_PARTIAL_LINKING="$MACHINE_FLAG -r"
+
  elif test "x$TOOLCHAIN_TYPE" = xclang; then
    BASIC_LDFLAGS_JVM_ONLY="-mno-omit-leaf-frame-pointer -mstack-alignment=16 \
        -fPIC"

+    LDFLAGS_CXX_PARTIAL_LINKING="$MACHINE_FLAG -r"
+
+    if test "x$OPENJDK_TARGET_OS" = xaix; then
+      BASIC_LDFLAGS="-Wl,-b64 -Wl,-brtl -Wl,-bnorwexec -Wl,-bnolibpath -Wl,-bnoexpall \
+        -Wl,-bernotok -Wl,-bdatapsize:64k -Wl,-btextpsize:64k -Wl,-bstackpsize:64k"
+      BASIC_LDFLAGS_JVM_ONLY="$BASIC_LDFLAGS_JVM_ONLY -Wl,-lC_r -Wl,-bbigtoc"
+    fi
  elif test "x$TOOLCHAIN_TYPE" = xxlc; then
    BASIC_LDFLAGS="-b64 -brtl -bnorwexec -bnolibpath -bnoexpall -bernotok -btextpsize:64K \
        -bdatapsize:64K -bstackpsize:64K"
@@ -88,7 +97,8 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
    BASIC_LDFLAGS_JVM_ONLY="-opt:icf,8 -subsystem:windows"
  fi

-  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+  if (test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang) \
+      && test "x$OPENJDK_TARGET_OS" != xaix; then
    if test -n "$HAS_NOEXECSTACK"; then
      BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,-z,noexecstack"
    fi
@@ -116,6 +126,14 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
    if test "x$DEBUG_LEVEL" != xrelease; then
      DEBUGLEVEL_LDFLAGS_JVM_ONLY="$DEBUGLEVEL_LDFLAGS_JVM_ONLY -bbigtoc"
    fi
+
+  elif test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
+    # We need '-fpic' or '-fpic -mcmodel=large -Wl,-bbigtoc' if the TOC overflows.
+    # Hotspot now overflows its 64K TOC (currently only for debug),
+    # so we build with '-fpic -mcmodel=large -Wl,-bbigtoc'.
+    if test "x$DEBUG_LEVEL" != xrelease; then
+      DEBUGLEVEL_LDFLAGS_JVM_ONLY="$DEBUGLEVEL_LDFLAGS_JVM_ONLY -Wl,-bbigtoc"
+    fi
  fi

  # Setup LDFLAGS for linking executables
@@ -148,6 +166,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
  # Export some intermediate variables for compatibility
  LDFLAGS_CXX_JDK="$BASIC_LDFLAGS_ONLYCXX $BASIC_LDFLAGS_ONLYCXX_JDK_ONLY $DEBUGLEVEL_LDFLAGS_JDK_ONLY"
  AC_SUBST(LDFLAGS_CXX_JDK)
+  AC_SUBST(LDFLAGS_CXX_PARTIAL_LINKING)
 ])

 ################################################################################
--- a/make/autoconf/flags-other.m4
+++ b/make/autoconf/flags-other.m4
@@ -88,6 +88,16 @@ AC_DEFUN([FLAGS_SETUP_RCFLAGS],
  AC_SUBST(RCFLAGS)
 ])

+AC_DEFUN([FLAGS_SETUP_NMFLAGS],
+[
+  # On AIX, we need to set NM flag -X64 for processing 64bit object files
+  if test "x$OPENJDK_TARGET_OS" = xaix; then
+    NMFLAGS="-X64"
+  fi
+
+  AC_SUBST(NMFLAGS)
+])
+
 ################################################################################
 # platform independent
 AC_DEFUN([FLAGS_SETUP_ASFLAGS],
--- a/make/autoconf/flags.m4
+++ b/make/autoconf/flags.m4
@@ -301,6 +301,7 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
  EXTRA_LDFLAGS="$MACHINE_FLAG $USER_LDFLAGS"
  EXTRA_ASFLAGS="$USER_ASFLAGS"

+  AC_SUBST(MACHINE_FLAG)
  AC_SUBST(EXTRA_CFLAGS)
  AC_SUBST(EXTRA_CXXFLAGS)
  AC_SUBST(EXTRA_LDFLAGS)
@@ -428,6 +429,7 @@ AC_DEFUN([FLAGS_SETUP_FLAGS],
  FLAGS_SETUP_ARFLAGS
  FLAGS_SETUP_STRIPFLAGS
  FLAGS_SETUP_RCFLAGS
+  FLAGS_SETUP_NMFLAGS

  FLAGS_SETUP_ASFLAGS
  FLAGS_SETUP_ASFLAGS_CPU_DEP([TARGET])
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -822,6 +822,9 @@ AC_DEFUN([JDKOPT_CHECK_CODESIGN_PARAMS],
  $RM "$CODESIGN_TESTFILE"
  $TOUCH "$CODESIGN_TESTFILE"
  CODESIGN_SUCCESS=false
+
+  $ECHO "check codesign, calling $CODESIGN $PARAMS $CODESIGN_TESTFILE" >&AS_MESSAGE_LOG_FD
+
  eval \"$CODESIGN\" $PARAMS \"$CODESIGN_TESTFILE\" 2>&AS_MESSAGE_LOG_FD \
      >&AS_MESSAGE_LOG_FD && CODESIGN_SUCCESS=true
  $RM "$CODESIGN_TESTFILE"
@@ -903,3 +906,22 @@ AC_DEFUN([JDKOPT_SETUP_MACOSX_SIGNING],
    AC_SUBST(MACOSX_CODESIGN_MODE)
  fi
 ])
+
+################################################################################
+#
+# fallback linker
+#
+AC_DEFUN_ONCE([JDKOPT_SETUP_FALLBACK_LINKER],
+[
+  FALLBACK_LINKER_DEFAULT=false
+
+  if HOTSPOT_CHECK_JVM_VARIANT(zero); then
+    FALLBACK_LINKER_DEFAULT=true
+  fi
+
+  UTIL_ARG_ENABLE(NAME: fallback-linker, DEFAULT: $FALLBACK_LINKER_DEFAULT,
+      RESULT: ENABLE_FALLBACK_LINKER,
+      DESC: [enable libffi-based fallback implementation of java.lang.foreign.Linker],
+      CHECKING_MSG: [if fallback linker enabled])
+  AC_SUBST(ENABLE_FALLBACK_LINKER)
+])
--- a/make/autoconf/lib-cups.m4
+++ b/make/autoconf/lib-cups.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -68,12 +68,20 @@ AC_DEFUN_ONCE([LIB_SETUP_CUPS],
      fi
    fi
    if test "x$CUPS_FOUND" = xno; then
-      # Are the cups headers installed in the default /usr/include location?
-      AC_CHECK_HEADERS([cups/cups.h cups/ppd.h], [
-          CUPS_FOUND=yes
-          CUPS_CFLAGS=
-          DEFAULT_CUPS=yes
-      ])
+      # Are the cups headers installed in the default AIX or /usr/include location?
+      if test "x$OPENJDK_TARGET_OS" = "xaix"; then
+        AC_CHECK_HEADERS([/opt/freeware/include/cups/cups.h /opt/freeware/include/cups/ppd.h], [
+            CUPS_FOUND=yes
+            CUPS_CFLAGS="-I/opt/freeware/include"
+            DEFAULT_CUPS=yes
+        ])
+      else
+        AC_CHECK_HEADERS([cups/cups.h cups/ppd.h], [
+            CUPS_FOUND=yes
+            CUPS_CFLAGS=
+            DEFAULT_CUPS=yes
+        ])
+      fi
    fi
    if test "x$CUPS_FOUND" = xno; then
      HELP_MSG_MISSING_DEPENDENCY([cups])
--- a/make/autoconf/lib-ffi.m4
+++ b/make/autoconf/lib-ffi.m4
@@ -57,7 +57,11 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],

    if test "x${with_libffi}" != x; then
      LIBFFI_LIB_PATH="${with_libffi}/lib"
-      LIBFFI_LIBS="-L${with_libffi}/lib -lffi"
+      if test "x${OPENJDK_TARGET_OS}" != "xwindows"; then
+        LIBFFI_LIBS="-L${with_libffi}/lib -lffi"
+      else
+        LIBFFI_LIBS="${with_libffi}/lib/libffi.lib"
+      fi
      LIBFFI_CFLAGS="-I${with_libffi}/include"
      LIBFFI_FOUND=yes
    fi
@@ -67,7 +71,11 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],
    fi
    if test "x${with_libffi_lib}" != x; then
      LIBFFI_LIB_PATH="${with_libffi_lib}"
-      LIBFFI_LIBS="-L${with_libffi_lib} -lffi"
+      if test "x${OPENJDK_TARGET_OS}" != "xwindows"; then
+        LIBFFI_LIBS="-L${with_libffi_lib} -lffi"
+      else
+        LIBFFI_LIBS="${with_libffi_lib}/libffi.lib"
+      fi
      LIBFFI_FOUND=yes
    fi
    # Do not try pkg-config if we have a sysroot set.
@@ -106,12 +114,13 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],
      AC_MSG_ERROR([Could not find libffi! $HELP_MSG])
    fi

-    AC_MSG_CHECKING([if libffi works])
    AC_LANG_PUSH(C)
    OLD_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS $LIBFFI_CFLAGS"
    OLD_LIBS="$LIBS"
    LIBS="$LIBS $LIBFFI_LIBS"
+
+    AC_MSG_CHECKING([if libffi works])
    AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <ffi.h>],
        [
          ffi_call(NULL, NULL, NULL, NULL);
@@ -120,9 +129,6 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],
        [LIBFFI_WORKS=yes],
        [LIBFFI_WORKS=no]
    )
-    CFLAGS="$OLD_CFLAGS"
-    LIBS="$OLD_LIBS"
-    AC_LANG_POP(C)
    AC_MSG_RESULT([$LIBFFI_WORKS])

    if test "x$LIBFFI_WORKS" = xno; then
@@ -130,39 +136,71 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],
      AC_MSG_ERROR([Found libffi but could not link and compile with it. $HELP_MSG])
    fi

+    # Check if FFI_GO_CLOSURES is properly defined. On some distributions, notably MacOS AArch64,
+    # ffitarget.h (included from ffi.h) does not explicitly define FFI_GO_CLOSURES. This makes the
+    # further include of ffi.h trigger the "FFI_GO_CLOSURES is undefined" warning, which fails
+    # the build when warnings are fatal.
+    AC_MSG_CHECKING([for FFI_GO_CLOSURES definition])
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+      #include <ffi.h>
+      #ifndef FFI_GO_CLOSURES
+      #error "FFI_GO_CLOSURES is not defined"
+      #endif
+      ][])],
+      [
+        AC_MSG_RESULT([yes])
+      ],
+      [
+        AC_MSG_RESULT([no, defining])
+        LIBFFI_CFLAGS="$LIBFFI_CFLAGS -DFFI_GO_CLOSURES=0"
+      ]
+    )
+
+    CFLAGS="$OLD_CFLAGS"
+    LIBS="$OLD_LIBS"
+    AC_LANG_POP(C)
+
    # Find the libffi.so.X to bundle
    if test "x${ENABLE_LIBFFI_BUNDLING}" = "xtrue"; then
+      if test "x${OPENJDK_TARGET_OS}" = "xmacosx"; then
+        LIBFFI_LIB_FILE_NAME=libffi.?.dylib
+      elif test "x${OPENJDK_TARGET_OS}" = "xwindows"; then
+        LIBFFI_LIB_FILE_NAME=libffi.dll
+      else
+        LIBFFI_LIB_FILE_NAME=libffi.so.?
+      fi
+
      AC_MSG_CHECKING([for libffi lib file location])
      if test "x${LIBFFI_LIB_PATH}" != x; then
-        if test -e ${LIBFFI_LIB_PATH}/libffi.so.?; then
-          LIBFFI_LIB_FILE="${LIBFFI_LIB_PATH}/libffi.so.?"
+        if test -e ${LIBFFI_LIB_PATH}/${LIBFFI_LIB_FILE_NAME}; then
+          LIBFFI_LIB_FILE="${LIBFFI_LIB_PATH}/${LIBFFI_LIB_FILE_NAME}"
        else
-          AC_MSG_ERROR([Could not locate libffi.so.? for bundling in ${LIBFFI_LIB_PATH}])
+          AC_MSG_ERROR([Could not locate ${LIBFFI_LIB_FILE_NAME} for bundling in ${LIBFFI_LIB_PATH}])
        fi
      else
        # If we don't have an explicit path, look in a few obvious places
        if test "x${OPENJDK_TARGET_CPU}" = "xx86"; then
-          if test -e ${SYSROOT}/usr/lib/libffi.so.? ; then
-            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/libffi.so.?"
-          elif test -e ${SYSROOT}/usr/lib/i386-linux-gnu/libffi.so.? ; then
-            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/i386-linux-gnu/libffi.so.?"
+          if test -e ${SYSROOT}/usr/lib/${LIBFFI_LIB_FILE_NAME} ; then
+            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/${LIBFFI_LIB_FILE_NAME}"
+          elif test -e ${SYSROOT}/usr/lib/i386-linux-gnu/${LIBFFI_LIB_FILE_NAME} ; then
+            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/i386-linux-gnu/${LIBFFI_LIB_FILE_NAME}"
          else
-            AC_MSG_ERROR([Could not locate libffi.so.? for bundling])
+            AC_MSG_ERROR([Could not locate ${LIBFFI_LIB_FILE_NAME} for bundling])
          fi
        elif test "x${OPENJDK_TARGET_CPU}" = "xx86_64" || test "x${OPENJDK_TARGET_CPU}" = "xaarch64"; then
-          if test -e ${SYSROOT}/usr/lib64/libffi.so.? ; then
-            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib64/libffi.so.?"
-          elif test -e ${SYSROOT}/usr/lib/x86_64-linux-gnu/libffi.so.? ; then
-            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/x86_64-linux-gnu/libffi.so.?"
+          if test -e ${SYSROOT}/usr/lib64/${LIBFFI_LIB_FILE_NAME} ; then
+            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib64/${LIBFFI_LIB_FILE_NAME}"
+          elif test -e ${SYSROOT}/usr/lib/x86_64-linux-gnu/${LIBFFI_LIB_FILE_NAME} ; then
+            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/x86_64-linux-gnu/${LIBFFI_LIB_FILE_NAME}"
          else
-            AC_MSG_ERROR([Could not locate libffi.so.? for bundling])
+            AC_MSG_ERROR([Could not locate ${LIBFFI_LIB_FILE_NAME} for bundling])
          fi
        else
          # Fallback on the default /usr/lib dir
-          if test -e ${SYSROOT}/usr/lib/libffi.so.? ; then
-            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/libffi.so.?"
+          if test -e ${SYSROOT}/usr/lib/${LIBFFI_LIB_FILE_NAME} ; then
+            LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/${LIBFFI_LIB_FILE_NAME}"
          else
-            AC_MSG_ERROR([Could not locate libffi.so.? for bundling])
+            AC_MSG_ERROR([Could not locate ${LIBFFI_LIB_FILE_NAME} for bundling])
          fi
        fi
      fi
--- a/make/autoconf/lib-tests.m4
+++ b/make/autoconf/lib-tests.m4
@@ -28,8 +28,8 @@
 ################################################################################

 # Minimum supported versions
-JTREG_MINIMUM_VERSION=7.1.1
-GTEST_MINIMUM_VERSION=1.13.0
+JTREG_MINIMUM_VERSION=7.3.1
+GTEST_MINIMUM_VERSION=1.14.0

 ###############################################################################
 #
@@ -301,3 +301,22 @@ AC_DEFUN_ONCE([LIB_TESTS_ENABLE_DISABLE_FAILURE_HANDLER],
      ])
  AC_SUBST(BUILD_FAILURE_HANDLER)
 ])
+
+AC_DEFUN_ONCE([LIB_TESTS_ENABLE_DISABLE_JTREG_TEST_THREAD_FACTORY],
+[
+  UTIL_ARG_ENABLE(NAME: jtreg-test-thread-factory, DEFAULT: auto,
+      RESULT: BUILD_JTREG_TEST_THREAD_FACTORY,
+      DESC: [enable building of the jtreg test thread factory],
+      DEFAULT_DESC: [enabled if jtreg is present],
+      CHECKING_MSG: [if the jtreg test thread factory should be built],
+      CHECK_AVAILABLE: [
+        AC_MSG_CHECKING([if the jtreg test thread factory is available])
+        if test "x$JT_HOME" != "x"; then
+          AC_MSG_RESULT([yes])
+        else
+          AVAILABLE=false
+          AC_MSG_RESULT([no (jtreg not present)])
+        fi
+      ])
+  AC_SUBST(BUILD_JTREG_TEST_THREAD_FACTORY)
+])
--- a/make/autoconf/libraries.m4
+++ b/make/autoconf/libraries.m4
@@ -82,7 +82,7 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
  fi

  # Check if ffi is needed
-  if HOTSPOT_CHECK_JVM_VARIANT(zero); then
+  if HOTSPOT_CHECK_JVM_VARIANT(zero) || test "x$ENABLE_FALLBACK_LINKER" = "xtrue"; then
    NEEDS_LIB_FFI=true
  else
    NEEDS_LIB_FFI=false
--- a/make/autoconf/platform.m4
+++ b/make/autoconf/platform.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -640,6 +640,7 @@ AC_DEFUN([PLATFORM_SET_MODULE_TARGET_OS_VALUES],
 ])

 #%%% Build and target systems %%%
+# Make sure to only use tools set up in BASIC_SETUP_FUNDAMENTAL_TOOLS.
 AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET],
 [
  # Figure out the build and target systems. # Note that in autoconf terminology, "build" is obvious, but "target"
@@ -656,6 +657,21 @@ AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET],
  PLATFORM_SET_MODULE_TARGET_OS_VALUES
  PLATFORM_SET_RELEASE_FILE_OS_VALUES
  PLATFORM_SETUP_LEGACY_VARS
+  PLATFORM_CHECK_DEPRECATION
+])
+
+AC_DEFUN([PLATFORM_CHECK_DEPRECATION],
+[
+  AC_ARG_ENABLE(deprecated-ports, [AS_HELP_STRING([--enable-deprecated-ports@<:@=yes/no@:>@],
+       [Suppress the error when configuring for a deprecated port @<:@no@:>@])])
+  if test "x$OPENJDK_TARGET_OS" = xwindows && test "x$OPENJDK_TARGET_CPU" = xx86; then
+    if test "x$enable_deprecated_ports" = "xyes"; then
+      AC_MSG_WARN([The Windows 32-bit x86 port is deprecated and may be removed in a future release.])
+    else
+      AC_MSG_ERROR(m4_normalize([The Windows 32-bit x86 port is deprecated and may be removed in a future release.
+        Use --enable-deprecated-ports=yes to suppress this error.]))
+    fi
+  fi
 ])

 AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_BUILD_OS_VERSION],
@@ -723,7 +739,7 @@ AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_TARGET_ENDIANNESS],
 [
  ###############################################################################
  #
-  # Is the target little of big endian?
+  # Is the target little or big endian?
  #
  AC_C_BIGENDIAN([ENDIAN="big"],[ENDIAN="little"],[ENDIAN="unknown"],[ENDIAN="universal_endianness"])

--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -358,6 +358,8 @@ BUILDJDK_OUTPUTDIR=$(OUTPUTDIR)/buildjdk

 BUILD_FAILURE_HANDLER := @BUILD_FAILURE_HANDLER@

+BUILD_JTREG_TEST_THREAD_FACTORY := @BUILD_JTREG_TEST_THREAD_FACTORY@
+
 ENABLE_GENERATE_CLASSLIST := @ENABLE_GENERATE_CLASSLIST@

 EXCLUDE_TRANSLATIONS := @EXCLUDE_TRANSLATIONS@
@@ -407,6 +409,9 @@ TEST_JOBS?=@TEST_JOBS@
 DEFAULT_MAKE_TARGET:=@DEFAULT_MAKE_TARGET@
 DEFAULT_LOG:=@DEFAULT_LOG@

+# Fallback linker
+ENABLE_FALLBACK_LINKER:=@ENABLE_FALLBACK_LINKER@
+
 FREETYPE_TO_USE:=@FREETYPE_TO_USE@
 FREETYPE_LIBS:=@FREETYPE_LIBS@
 FREETYPE_CFLAGS:=@FREETYPE_CFLAGS@
@@ -541,6 +546,8 @@ JVM_LIBS := @JVM_LIBS@

 BASIC_ASFLAGS := @BASIC_ASFLAGS@

+MACHINE_FLAG := @MACHINE_FLAG@
+
 # These flags might contain variables set by a custom extension that is included later.
 EXTRA_CFLAGS = @EXTRA_CFLAGS@
 EXTRA_CXXFLAGS = @EXTRA_CXXFLAGS@
@@ -567,6 +574,9 @@ JDKEXE_LIBS:=@JDKEXE_LIBS@
 # LDFLAGS specific to C++ linking.
 LDFLAGS_CXX_JDK:=@LDFLAGS_CXX_JDK@

+# LDFLAGS specific to partial linking.
+LDFLAGS_CXX_PARTIAL_LINKING:=@LDFLAGS_CXX_PARTIAL_LINKING@
+
 # Sometimes a different linker is needed for c++ libs
 LDCXX := @LDCXX@
 # The flags for linking libstdc++ linker.
@@ -596,6 +606,7 @@ AR := @AR@
 ARFLAGS:=@ARFLAGS@

 NM:=@NM@
+NMFLAGS:=@NMFLAGS@
 STRIP:=@STRIP@
 OBJDUMP:=@OBJDUMP@
 CXXFILT:=@CXXFILT@
@@ -690,6 +701,8 @@ INTERIM_LANGTOOLS_ADD_EXPORTS := \
    --add-exports java.base/sun.invoke.util=jdk.compiler.interim \
    --add-exports java.base/jdk.internal.javac=java.compiler.interim \
    --add-exports java.base/jdk.internal.javac=jdk.compiler.interim \
+    --add-exports jdk.internal.opt/jdk.internal.opt=jdk.compiler.interim \
+    --add-exports jdk.internal.opt/jdk.internal.opt=jdk.javadoc.interim \
    #
 INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \
    $(INTERIM_LANGTOOLS_MODULES))))
@@ -921,6 +934,10 @@ DOCS_OUTPUTDIR := $(DOCS_JDK_IMAGE_DIR)
 STATIC_LIBS_IMAGE_SUBDIR := static-libs
 STATIC_LIBS_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(STATIC_LIBS_IMAGE_SUBDIR)

+# Graal static libs image
+STATIC_LIBS_GRAAL_IMAGE_SUBDIR := static-libs-graal
+STATIC_LIBS_GRAAL_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(STATIC_LIBS_GRAAL_IMAGE_SUBDIR)
+
 # Graal builder image
 GRAAL_BUILDER_IMAGE_SUBDIR := graal-builder-jdk
 GRAAL_BUILDER_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(GRAAL_BUILDER_IMAGE_SUBDIR)
--- a/make/autoconf/toolchain.m4
+++ b/make/autoconf/toolchain.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@ VALID_TOOLCHAINS_all="gcc clang xlc microsoft"
 # These toolchains are valid on different platforms
 VALID_TOOLCHAINS_linux="gcc clang"
 VALID_TOOLCHAINS_macosx="clang"
-VALID_TOOLCHAINS_aix="xlc"
+VALID_TOOLCHAINS_aix="xlc clang"
 VALID_TOOLCHAINS_windows="microsoft"

 # Toolchain descriptions
@@ -53,7 +53,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
 TOOLCHAIN_MINIMUM_VERSION_clang="3.5"
 TOOLCHAIN_MINIMUM_VERSION_gcc="6.0"
 TOOLCHAIN_MINIMUM_VERSION_microsoft="19.28.0.0" # VS2019 16.8, aka MSVC 14.28
-TOOLCHAIN_MINIMUM_VERSION_xlc=""
+TOOLCHAIN_MINIMUM_VERSION_xlc="16.1.0.0011"

 # Minimum supported linker versions, empty means unspecified
 TOOLCHAIN_MINIMUM_LD_VERSION_gcc="2.18"
@@ -234,6 +234,25 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE],
  # First toolchain type in the list is the default
  DEFAULT_TOOLCHAIN=${VALID_TOOLCHAINS%% *}

+  # On AIX the default toolchain depends on the installed (found) compiler
+  #   xlclang++     -> xlc toolchain
+  #   ibm-clang++_r -> clang toolchain
+  # The compiler is searched on the PATH and TOOLCHAIN_PATH
+  # xlclang++ has precedence over ibm-clang++_r if both are installed
+  if test "x$OPENJDK_TARGET_OS" = xaix; then
+    DEFAULT_TOOLCHAIN="clang"
+    if test "x$TOOLCHAIN_PATH" != x; then
+      if test -e ${TOOLCHAIN_PATH}/xlclang++; then
+        DEFAULT_TOOLCHAIN="xlc"
+      fi
+    else
+      UTIL_LOOKUP_PROGS(XLCLANG_TEST_PATH, xlclang++)
+      if test "x$XLCLANG_TEST_PATH" != x; then
+        DEFAULT_TOOLCHAIN="xlc"
+      fi
+    fi
+  fi
+
  if test "x$with_toolchain_type" = xlist; then
    # List all toolchains
    AC_MSG_NOTICE([The following toolchains are valid on this platform:])
@@ -263,22 +282,40 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE],
    if test "x$TOOLCHAIN_PATH" != x; then
      XLC_TEST_PATH=${TOOLCHAIN_PATH}/
    fi
-
-    XLCLANG_VERSION_OUTPUT=`${XLC_TEST_PATH}xlclang++ -qversion 2>&1 | $HEAD -n 1`
-    $ECHO "$XLCLANG_VERSION_OUTPUT" | $GREP "IBM XL C/C++ for AIX" > /dev/null
-    if test $? -eq 0; then
-      AC_MSG_NOTICE([xlclang++ output: $XLCLANG_VERSION_OUTPUT])
+    if test "x$TOOLCHAIN_TYPE" = xclang; then
+      TOOLCHAIN_DESCRIPTION_clang="IBM Open XL C/C++"
+      XLCLANG_VERSION_OUTPUT=`${XLC_TEST_PATH}ibm-clang++_r --version 2>&1 | $HEAD -n 1`
+      $ECHO "$XLCLANG_VERSION_OUTPUT" | $GREP "IBM Open XL C/C++ for AIX" > /dev/null
+      if test $? -eq 0; then
+        AC_MSG_NOTICE([ibm-clang++_r output: $XLCLANG_VERSION_OUTPUT])
+      else
+        AC_MSG_ERROR([ibm-clang++_r version output check failed, output: $XLCLANG_VERSION_OUTPUT])
+      fi
    else
-      AC_MSG_ERROR([xlclang++ version output check failed, output: $XLCLANG_VERSION_OUTPUT])
+      XLCLANG_VERSION_OUTPUT=`${XLC_TEST_PATH}xlclang++ -qversion 2>&1 | $HEAD -n 1`
+      $ECHO "$XLCLANG_VERSION_OUTPUT" | $GREP "IBM XL C/C++ for AIX" > /dev/null
+      if test $? -eq 0; then
+        AC_MSG_NOTICE([xlclang++ output: $XLCLANG_VERSION_OUTPUT])
+      else
+        AC_MSG_ERROR([xlclang++ version output check failed, output: $XLCLANG_VERSION_OUTPUT])
+      fi
    fi
  fi

-  TOOLCHAIN_CC_BINARY_clang="clang"
+  if test "x$OPENJDK_TARGET_OS" = xaix; then
+    TOOLCHAIN_CC_BINARY_clang="ibm-clang_r"
+  else
+    TOOLCHAIN_CC_BINARY_clang="clang"
+  fi
  TOOLCHAIN_CC_BINARY_gcc="gcc"
  TOOLCHAIN_CC_BINARY_microsoft="cl"
  TOOLCHAIN_CC_BINARY_xlc="xlclang"

-  TOOLCHAIN_CXX_BINARY_clang="clang++"
+  if test "x$OPENJDK_TARGET_OS" = xaix; then
+    TOOLCHAIN_CXX_BINARY_clang="ibm-clang++_r"
+  else
+    TOOLCHAIN_CXX_BINARY_clang="clang++"
+  fi
  TOOLCHAIN_CXX_BINARY_gcc="g++"
  TOOLCHAIN_CXX_BINARY_microsoft="cl"
  TOOLCHAIN_CXX_BINARY_xlc="xlclang++"
@@ -384,7 +421,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
    # Collapse compiler output into a single line
    COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT`
    COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
-        $SED -e 's/^.*, V\(@<:@1-9@:>@@<:@0-9.@:>@*\).*$/\1/'`
+        $SED -e 's/^.*Version: \(@<:@1-9@:>@@<:@0-9.@:>@*\).*$/\1/'`
  elif test  "x$TOOLCHAIN_TYPE" = xmicrosoft; then
    # There is no specific version flag, but all output starts with a version string.
    # First line typically looks something like:
@@ -632,7 +669,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
  if test "x$TOOLCHAIN_MINIMUM_VERSION" != x; then
    TOOLCHAIN_CHECK_COMPILER_VERSION(VERSION: $TOOLCHAIN_MINIMUM_VERSION,
        IF_OLDER_THAN: [
-          AC_MSG_WARN([You are using $TOOLCHAIN_TYPE older than $TOOLCHAIN_MINIMUM_VERSION. This is not a supported configuration.])
+          AC_MSG_WARN([You are using $TOOLCHAIN_TYPE $CC_VERSION_NUMBER which is older than $TOOLCHAIN_MINIMUM_VERSION. This is not a supported configuration.])
        ]
    )
  fi
@@ -767,7 +804,11 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA],

  case $TOOLCHAIN_TYPE in
    gcc|clang)
-      UTIL_REQUIRE_TOOLCHAIN_PROGS(CXXFILT, c++filt)
+      if test "x$OPENJDK_TARGET_OS" = xaix; then
+        UTIL_REQUIRE_TOOLCHAIN_PROGS(CXXFILT, ibm-llvm-cxxfilt)
+      else
+        UTIL_REQUIRE_TOOLCHAIN_PROGS(CXXFILT, c++filt)
+      fi
      ;;
  esac
 ])
@@ -966,7 +1007,11 @@ AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
  # Setup hotspot lecagy names for toolchains
  HOTSPOT_TOOLCHAIN_TYPE=$TOOLCHAIN_TYPE
  if test "x$TOOLCHAIN_TYPE" = xclang; then
-    HOTSPOT_TOOLCHAIN_TYPE=gcc
+    if test "x$OPENJDK_TARGET_OS" = xaix; then
+      HOTSPOT_TOOLCHAIN_TYPE=xlc
+    else
+      HOTSPOT_TOOLCHAIN_TYPE=gcc
+    fi
  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
    HOTSPOT_TOOLCHAIN_TYPE=visCPP
  fi
--- a/make/autoconf/util.m4
+++ b/make/autoconf/util.m4
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -509,7 +509,7 @@ AC_DEFUN([UTIL_CHECK_TYPE_directory],
    FAILURE="Directory $1 does not exist or is not readable"
  fi

-  if test "[x]ARG_CHECK_FOR_FILES" != x; then
+  if test "[x]ARG_CHECK_FOR_FILES" != "x:"; then
    for file in ARG_CHECK_FOR_FILES; do
      found_files=$($ECHO $(ls $1/$file 2> /dev/null))
      if test "x$found_files" = x; then
@@ -781,25 +781,25 @@ UTIL_DEFUN_NAMED([UTIL_ARG_WITH],
    else
      AC_MSG_RESULT([$ARG_RESULT, $REASON])
    fi
-  fi

-  # Verify value
-  # First use our dispatcher to verify that type requirements are satisfied
-  UTIL_CHECK_TYPE(ARG_TYPE, $ARG_RESULT)
+    # Verify value
+    # First use our dispatcher to verify that type requirements are satisfied
+    UTIL_CHECK_TYPE(ARG_TYPE, $ARG_RESULT)

-  if test "x$FAILURE" = x; then
-    # Execute custom verification payload, if present
-    RESULT="$ARG_RESULT"
+    if test "x$FAILURE" = x; then
+      # Execute custom verification payload, if present
+      RESULT="$ARG_RESULT"

-    ARG_CHECK_VALUE
+      ARG_CHECK_VALUE

-    ARG_RESULT="$RESULT"
-  fi
+      ARG_RESULT="$RESULT"
+    fi

-  if test "x$FAILURE" != x; then
-    AC_MSG_NOTICE([Invalid value for [--with-]ARG_NAME: "$ARG_RESULT"])
-    AC_MSG_NOTICE([$FAILURE])
-    AC_MSG_ERROR([Cannot continue])
+    if test "x$FAILURE" != x; then
+      AC_MSG_NOTICE([Invalid value for [--with-]ARG_NAME: "$ARG_RESULT"])
+      AC_MSG_NOTICE([$FAILURE])
+      AC_MSG_ERROR([Cannot continue])
+    fi
  fi

  # Execute result payloads, if present
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -48,12 +48,12 @@ define GetSymbols
        $(SED) -e 's/#.*//;s/global://;s/local://;s/\;//;s/^[ 	]*/_/;/^_$$$$/d' | \
        $(EGREP) -v "JNI_OnLoad|JNI_OnUnload|Agent_OnLoad|Agent_OnUnload|Agent_OnAttach" > \
        $$(@D)/$$(basename $$(@F)).symbols || true; \
-    $(NM) $$($1_TARGET) | $(GREP)  " T " | \
+    $(NM) $(NMFLAGS) $$($1_TARGET) | $(GREP)  " T " | \
        $(EGREP) "JNI_OnLoad|JNI_OnUnload|Agent_OnLoad|Agent_OnUnload|Agent_OnAttach" | \
        $(CUT) -d ' ' -f 3 >>  $$(@D)/$$(basename $$(@F)).symbols || true;\
  else \
    $(ECHO) "Getting symbols from nm"; \
-    $(NM) -m $$($1_TARGET) | $(GREP)  "__TEXT" | \
+    $(NM) $(NMFLAGS) -m $$($1_TARGET) | $(GREP)  "__TEXT" | \
        $(EGREP) -v "non-external|private extern|__TEXT,__eh_frame" | \
        $(SED) -e  's/.* //' > $$(@D)/$$(basename $$(@F)).symbols; \
  fi
@@ -215,7 +215,21 @@ DEPENDENCY_TARGET_SED_PATTERN := \
 # The fix-deps-file macro is used to adjust the contents of the generated make
 # dependency files to contain paths compatible with make.
 #
+REWRITE_PATHS_RELATIVE = false
 ifeq ($(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT)-$(FILE_MACRO_CFLAGS), false-)
+  REWRITE_PATHS_RELATIVE = true
+endif
+
+# CCACHE_BASEDIR needs fix-deps-file as makefiles use absolute filenames for
+# object files while CCACHE_BASEDIR will make ccache relativize all paths for
+# its compiler. The compiler then produces relative dependency files.
+# make does not know a relative and absolute filename is the same so it will
+# ignore such dependencies.
+ifneq ($(CCACHE), )
+  REWRITE_PATHS_RELATIVE = true
+endif
+
+ifeq ($(REWRITE_PATHS_RELATIVE), true)
  # Need to handle -I flags as both '-Ifoo' and '-I foo'.
  MakeCommandRelative = \
      $(CD) $(WORKSPACE_ROOT) && \
@@ -500,7 +514,7 @@ endef
 #       used both for C and C++.
 #   LIBS_<toolchain> the libraries to link to for the specified toolchain,
 #       used both for C and C++.
-#   LIBS_<OS>_<toolchain> the libraries to link to for the specified target
+#   LIBS_<toolchain>_<OS> the libraries to link to for the specified target
 #       OS and toolchain, used both for C and C++.
 #   ARFLAGS the archiver flags to be used
 #   OBJECT_DIR the directory where we store the object files
@@ -548,6 +562,7 @@ endef
 #   PRECOMPILED_HEADER Header file to use as precompiled header
 #   PRECOMPILED_HEADER_EXCLUDE List of source files that should not use PCH
 #   BUILD_INFO_LOG_MACRO Overrides log level of the build info log message, default LogWarn
+#   STATIC_LIB_EXCLUDE_OBJS exclude objects that matches from static library
 #
 # After being called, some variables are exported from this macro, all prefixed
 # with parameter 1 followed by a '_':
@@ -726,6 +741,12 @@ define SetupNativeCompilationBody
  endif
  # Sort to remove duplicates and provide a reproducible order on the input files to the linker.
  $1_ALL_OBJS := $$(sort $$($1_EXPECTED_OBJS) $$($1_EXTRA_OBJECT_FILES))
+  ifeq ($(STATIC_LIBS), true)
+    # Exclude the object files that match with $1_STATIC_LIB_EXCLUDE_OBJS.
+    ifneq ($$($1_STATIC_LIB_EXCLUDE_OBJS), )
+      $1_ALL_OBJS := $$(call not-containing, $$($1_STATIC_LIB_EXCLUDE_OBJS), $$($1_ALL_OBJS))
+    endif
+  endif

  # Pickup extra OPENJDK_TARGET_OS_TYPE, OPENJDK_TARGET_OS, TOOLCHAIN_TYPE and
  # OPENJDK_TARGET_OS plus OPENJDK_TARGET_CPU pair dependent variables for CFLAGS.
@@ -1024,12 +1045,11 @@ define SetupNativeCompilationBody

  # Pickup extra OPENJDK_TARGET_OS_TYPE, OPENJDK_TARGET_OS and TOOLCHAIN_TYPE
  # dependent variables for LDFLAGS and LIBS, and additionally the pair dependent
-  # TOOLCHAIN_TYPE plus OPENJDK_TARGET_OS for LDFLAGS, or OPENJDK_TARGET_OS plus
-  # TOOLCHAIN_TYPE for LIBS
+  # TOOLCHAIN_TYPE plus OPENJDK_TARGET_OS
  $1_EXTRA_LDFLAGS += $$($1_LDFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS)) \
      $$($1_LDFLAGS_$(TOOLCHAIN_TYPE)) $$($1_LDFLAGS_$(TOOLCHAIN_TYPE)_$(OPENJDK_TARGET_OS))
  $1_EXTRA_LIBS += $$($1_LIBS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_LIBS_$(OPENJDK_TARGET_OS)) \
-      $$($1_LIBS_$(OPENJDK_TARGET_OS)_$(TOOLCHAIN_TYPE)) $$($1_LIBS_$(TOOLCHAIN_TYPE))
+      $$($1_LIBS_$(TOOLCHAIN_TYPE)) $$($1_LIBS_$(TOOLCHAIN_TYPE)_$(OPENJDK_TARGET_OS))

  ifneq ($$($1_REAL_MAPFILE), )
    $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
@@ -1130,9 +1150,60 @@ define SetupNativeCompilationBody
    endif
  endif

+  $1_LD_OBJ_ARG := $$($1_ALL_OBJS)
+
+  # If there are many object files, use an @-file...
+  ifneq ($$(word 17, $$($1_ALL_OBJS)), )
+    $1_OBJ_FILE_LIST := $$($1_OBJECT_DIR)/_$1_objectfilenames.txt
+    ifneq ($(COMPILER_COMMAND_FILE_FLAG), )
+      $1_LD_OBJ_ARG := $(COMPILER_COMMAND_FILE_FLAG)$$($1_OBJ_FILE_LIST)
+    else
+      # ...except for toolchains which don't support them.
+      $1_LD_OBJ_ARG := `cat $$($1_OBJ_FILE_LIST)`
+    endif
+
+    # If we are building static library, 'AR' on macosx may not support @-file.
+    ifeq ($$($1_TYPE), STATIC_LIBRARY)
+      ifeq ($(call isTargetOs, macosx), true)
+        $1_LD_OBJ_ARG := `cat $$($1_OBJ_FILE_LIST)`
+      endif
+    endif
+  endif
+
+  # Unfortunately the @-file trick does not work reliably when using clang.
+  # Clang does not propagate the @-file parameter to the ld sub process, but
+  # instead puts the full content on the command line. At least the llvm ld
+  # does not even support an @-file.
+  #
+  # When linking a large amount of object files, we risk hitting the limit
+  # of the command line length even on posix systems if the path length of
+  # the output dir is very long due to our use of absolute paths. To
+  # mitigate this, use paths relative to the output dir when linking over
+  # 500 files with clang and the output dir path is deep.
+  ifneq ($$(word 500, $$($1_ALL_OBJS)), )
+    ifeq ($$(TOOLCHAIN_TYPE), clang)
+      # There is no strlen function in make, but checking path depth is a
+      # reasonable approximation.
+      ifneq ($$(word 10, $$(subst /, ,$$(OUTPUTDIR))), )
+        $1_LINK_OBJS_RELATIVE := true
+        $1_ALL_OBJS_RELATIVE := $$(patsubst $$(OUTPUTDIR)/%, %, $$($1_ALL_OBJS))
+      endif
+    endif
+  endif
+
  ifeq ($$($1_TYPE), STATIC_LIBRARY)
+    # Include partial linking when building the static library with clang on linux.
+    ifeq ($(call isTargetOs, linux), true)
+      ifneq ($(findstring $(TOOLCHAIN_TYPE), clang), )
+        $1_ENABLE_PARTIAL_LINKING := true
+      endif
+    endif
+
    $1_VARDEPS := $$($1_AR) $$(ARFLAGS) $$($1_ARFLAGS) $$($1_LIBS) \
        $$($1_EXTRA_LIBS)
+    ifeq ($$($1_ENABLE_PARTIAL_LINKING), true)
+      $1_VARDEPS += $$($1_LD) $$($1_SYSROOT_LDFLAGS)
+    endif
    $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
        $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)

@@ -1145,11 +1216,35 @@ define SetupNativeCompilationBody

    $1_TARGET_DEPS := $$($1_ALL_OBJS) $$($1_RES) $$($1_VARDEPS_FILE) $$(STATIC_MAPFILE_DEP)

+    $1_AR_OBJ_ARG := $$($1_LD_OBJ_ARG)
+    # With clang on linux, partial linking is enabled and 'AR' takes the output
+    # object from the partial linking step.
+    ifeq ($$($1_ENABLE_PARTIAL_LINKING), true)
+      $1_TARGET_RELOCATABLE := $$($1_OBJECT_DIR)/$$($1_PREFIX)$$($1_NAME)_relocatable$(OBJ_SUFFIX)
+      $1_AR_OBJ_ARG := $$($1_TARGET_RELOCATABLE)
+    endif
+
    $$($1_TARGET): $$($1_TARGET_DEPS)
+        ifneq ($$($1_OBJ_FILE_LIST), )
+          ifeq ($$($1_LINK_OBJS_RELATIVE), true)
+	    $$(eval $$(call ListPathsSafely, $1_ALL_OBJS_RELATIVE, $$($1_OBJ_FILE_LIST)))
+          else
+	    $$(eval $$(call ListPathsSafely, $1_ALL_OBJS, $$($1_OBJ_FILE_LIST)))
+          endif
+        endif
 	$$(call LogInfo, Building static library $$($1_BASENAME))
 	$$(call MakeDir, $$($1_OUTPUT_DIR) $$($1_SYMBOLS_DIR))
+        # Do partial linking.
+        ifeq ($$($1_ENABLE_PARTIAL_LINKING), true)
+	  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_partial_link, \
+	    $(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \
+	      $$($1_LD) $(LDFLAGS_CXX_PARTIAL_LINKING) $$($1_SYSROOT_LDFLAGS) \
+	        $(LD_OUT_OPTION)$$($1_TARGET_RELOCATABLE) \
+                $$($1_LD_OBJ_ARG))
+        endif
 	$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_link, \
-	    $$($1_AR) $$(ARFLAGS) $$($1_ARFLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_ALL_OBJS) \
+	  $(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \
+	    $$($1_AR) $$(ARFLAGS) $$($1_ARFLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_AR_OBJ_ARG) \
 	        $$($1_RES))
        ifeq ($(STATIC_BUILD), true)
          ifeq ($$($1_USE_MAPFILE_FOR_SYMBOLS), true)
@@ -1201,40 +1296,6 @@ define SetupNativeCompilationBody
    $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
        $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).vardeps)

-    $1_LD_OBJ_ARG := $$($1_ALL_OBJS)
-
-    # If there are many object files, use an @-file...
-    ifneq ($$(word 17, $$($1_ALL_OBJS)), )
-      $1_OBJ_FILE_LIST := $$($1_OBJECT_DIR)/_$1_objectfilenames.txt
-      ifneq ($(COMPILER_COMMAND_FILE_FLAG), )
-        $1_LD_OBJ_ARG := $(COMPILER_COMMAND_FILE_FLAG)$$($1_OBJ_FILE_LIST)
-      else
-        # ...except for toolchains which don't support them.
-        $1_LD_OBJ_ARG := `cat $$($1_OBJ_FILE_LIST)`
-      endif
-    endif
-
-    # Unfortunately the @-file trick does not work reliably when using clang.
-    # Clang does not propagate the @-file parameter to the ld sub process, but
-    # instead puts the full content on the command line. At least the llvm ld
-    # does not even support an @-file.
-    #
-    # When linking a large amount of object files, we risk hitting the limit
-    # of the command line length even on posix systems if the path length of
-    # the output dir is very long due to our use of absolute paths. To
-    # mitigate this, use paths relative to the output dir when linking over
-    # 500 files with clang and the output dir path is deep.
-    ifneq ($$(word 500, $$($1_ALL_OBJS)), )
-      ifeq ($$(TOOLCHAIN_TYPE), clang)
-        # There is no strlen function in make, but checking path depth is a
-        # reasonable approximation.
-        ifneq ($$(word 10, $$(subst /, ,$$(OUTPUTDIR))), )
-          $1_LINK_OBJS_RELATIVE := true
-          $1_ALL_OBJS_RELATIVE := $$(patsubst $$(OUTPUTDIR)/%, %, $$($1_ALL_OBJS))
-        endif
-      endif
-    endif
-
    $1_TARGET_DEPS := $$($1_ALL_OBJS) $$($1_RES) $$($1_MANIFEST) \
        $$($1_REAL_MAPFILE) $$($1_VARDEPS_FILE)

--- a/make/common/TestFilesCompilation.gmk
+++ b/make/common/TestFilesCompilation.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -106,7 +106,7 @@ define SetupTestFilesCompilationBody
        LIBS := $$($1_LIBS_$$(name)), \
        TOOLCHAIN := $(if $$(filter %.cpp, $$(file)), TOOLCHAIN_LINK_CXX, TOOLCHAIN_DEFAULT), \
        OPTIMIZATION := $$(if $$($1_OPTIMIZATION_$$(name)),$$($1_OPTIMIZATION_$$(name)),LOW), \
-        COPY_DEBUG_SYMBOLS := false, \
+        COPY_DEBUG_SYMBOLS := $$(if $$($1_COPY_DEBUG_SYMBOLS_$$(name)),$$($1_COPY_DEBUG_SYMBOLS_$$(name)),false), \
        STRIP_SYMBOLS := $$(if $$($1_STRIP_SYMBOLS_$$(name)),$$($1_STRIP_SYMBOLS_$$(name)),false), \
        BUILD_INFO_LOG_MACRO := LogInfo, \
    )) \
--- a/make/conf/docs-modules.conf
+++ b/make/conf/docs-modules.conf
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -36,13 +36,11 @@ DOCS_MODULES= \
    jdk.charsets \
    jdk.compiler \
    jdk.crypto.cryptoki \
-    jdk.crypto.ec \
    jdk.dynalink \
    jdk.editpad \
    jdk.hotspot.agent \
    jdk.httpserver \
    jdk.jpackage \
-    jdk.incubator.concurrent \
    jdk.incubator.vector \
    jdk.jartool \
    jdk.javadoc \
--- a/make/conf/github-actions.conf
+++ b/make/conf/github-actions.conf
@@ -25,17 +25,17 @@

 # Versions and download locations for dependencies used by GitHub Actions (GHA)

-GTEST_VERSION=1.13.0
-JTREG_VERSION=7.1.1+1
+GTEST_VERSION=1.14.0
+JTREG_VERSION=7.3.1+1

 LINUX_X64_BOOT_JDK_EXT=tar.gz
-LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/36/GPL/openjdk-19_linux-x64_bin.tar.gz
-LINUX_X64_BOOT_JDK_SHA256=f47aba585cfc9ecff1ed8e023524e8309f4315ed8b80100b40c7dcc232c12f96
+LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz
+LINUX_X64_BOOT_JDK_SHA256=bb863b2d542976d1ae4b7b81af3e78b1e4247a64644350b552d298d8dc5980dc

 MACOS_X64_BOOT_JDK_EXT=tar.gz
-MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/36/GPL/openjdk-19_macos-x64_bin.tar.gz
-MACOS_X64_BOOT_JDK_SHA256=bfd33f5b2590fd552ae2d9231340c6b4704a872f927dce1c52860b78c49a5a11
+MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_macos-x64_bin.tar.gz
+MACOS_X64_BOOT_JDK_SHA256=47cf960d9bb89dbe987535a389f7e26c42de7c984ef5108612d77c81aa8cc6a4

 WINDOWS_X64_BOOT_JDK_EXT=zip
-WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/36/GPL/openjdk-19_windows-x64_bin.zip
-WINDOWS_X64_BOOT_JDK_SHA256=8fabcee7c4e8d3b53486777ecd27bb906d67d7c1efd1bf22a8290cf659afa487
+WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_windows-x64_bin.zip
+WINDOWS_X64_BOOT_JDK_SHA256=c92fae5e42b9aecf444a66c8ec563c652f60b1e231dfdd33a4f5a3e3603058fb
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -390,7 +390,7 @@ var getJibProfilesCommon = function (input, data) {
        };
    };

-    common.boot_jdk_version = "19";
+    common.boot_jdk_version = "20";
    common.boot_jdk_build_number = "36";
    common.boot_jdk_home = input.get("boot_jdk", "install_path") + "/jdk-"
        + common.boot_jdk_version
@@ -463,7 +463,8 @@ var getJibProfilesProfiles = function (input, common, data) {
            target_cpu: "x86",
            build_cpu: "x64",
            dependencies: ["devkit", "gtest"],
-            configure_args: concat(common.configure_args_32bit),
+            configure_args: concat(common.configure_args_32bit,
+                "--enable-deprecated-ports"),
        },

        "windows-aarch64": {
@@ -587,21 +588,23 @@ var getJibProfilesProfiles = function (input, common, data) {
        "linux-x64-zero": {
            target_os: "linux",
            target_cpu: "x64",
-            dependencies: ["devkit", "gtest"],
+            dependencies: ["devkit", "gtest", "libffi"],
            configure_args: concat(common.configure_args_64bit, [
                "--with-zlib=system",
                "--with-jvm-variants=zero",
-                "--enable-libffi-bundling"
+                "--with-libffi=" + input.get("libffi", "home_path"),
+                "--enable-libffi-bundling",
            ])
        },

        "linux-aarch64-zero": {
            target_os: "linux",
            target_cpu: "aarch64",
-            dependencies: ["devkit", "gtest"],
+            dependencies: ["devkit", "gtest", "libffi"],
            configure_args: concat(common.configure_args_64bit, [
                "--with-zlib=system",
                "--with-jvm-variants=zero",
+                "--with-libffi=" + input.get("libffi", "home_path"),
                "--enable-libffi-bundling"
            ])
        },
@@ -610,10 +613,11 @@ var getJibProfilesProfiles = function (input, common, data) {
            target_os: "linux",
            target_cpu: "x86",
            build_cpu: "x64",
-            dependencies: ["devkit", "gtest"],
+            dependencies: ["devkit", "gtest", "libffi"],
            configure_args:  concat(common.configure_args_32bit, [
                "--with-zlib=system",
                "--with-jvm-variants=zero",
+                "--with-libffi=" + input.get("libffi", "home_path"),
                "--enable-libffi-bundling"
            ])
        }
@@ -744,6 +748,40 @@ var getJibProfilesProfiles = function (input, common, data) {
            common.debug_profile_artifacts(artifactData[name]));
    });

+    // Define artifact just for linux-x64-zero, which is the only one we test on
+    ["linux-x64"].forEach(function (name) {
+        var o = artifactData[name]
+        var pf = o.platform
+        var jdk_subdir = (o.jdk_subdir != null ? o.jdk_subdir : "jdk-" + data.version);
+        var jdk_suffix = (o.jdk_suffix != null ? o.jdk_suffix : "tar.gz");
+        var zeroName = name + "-zero";
+        profiles[zeroName].artifacts = {
+            jdk: {
+                local: "bundles/\\(jdk.*bin." + jdk_suffix + "\\)",
+                remote: [
+                    "bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-zero." + jdk_suffix,
+                ],
+                subdir: jdk_subdir,
+                exploded: "images/jdk",
+            },
+            test: {
+                    local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
+                    remote: [
+                        "bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-zero-tests.tar.gz",
+                    ],
+                    exploded: "images/test"
+            },
+            jdk_symbols: {
+                    local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
+                    remote: [
+                        "bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-zero-symbols.tar.gz",
+                    ],
+                    subdir: jdk_subdir,
+                    exploded: "images/jdk"
+                },
+            };
+    });
+
    buildJdkDep = input.build_os + "-" + input.build_cpu + ".jdk";
    docsProfiles = {
        "docs": {
@@ -1150,9 +1188,9 @@ var getJibProfilesDependencies = function (input, common) {
        jtreg: {
            server: "jpg",
            product: "jtreg",
-            version: "7.1.1",
+            version: "7.3.1",
            build_number: "1",
-            file: "bundles/jtreg-7.1.1+1.zip",
+            file: "bundles/jtreg-7.3.1+1.zip",
            environment_name: "JT_HOME",
            environment_path: input.get("jtreg", "home_path") + "/bin",
            configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"),
@@ -1161,12 +1199,12 @@ var getJibProfilesDependencies = function (input, common) {
        jmh: {
            organization: common.organization,
            ext: "tar.gz",
-            revision: "1.35+1.0"
+            revision: "1.37+1.0"
        },

        jcov: {
            organization: common.organization,
-            revision: "3.0-14-jdk-asm+1.0",
+            revision: "3.0-15-jdk-asm+1.0",
            ext: "zip",
            environment_name: "JCOV_HOME",
        },
@@ -1232,7 +1270,14 @@ var getJibProfilesDependencies = function (input, common) {
        gtest: {
            organization: common.organization,
            ext: "tar.gz",
-            revision: "1.13.0+1.0"
+            revision: "1.14.0+1.0"
+        },
+
+        libffi: {
+            organization: common.organization,
+            module: "libffi-" + input.target_platform,
+            ext: "tar.gz",
+            revision: "3.4.2+1.0"
        },
    };

@@ -1475,7 +1520,7 @@ var getVersionNumbers = function () {
 var isWsl = function (input) {
    return ( input.build_osenv == "wsl"
             || (input.build_os == "linux"
-                 && java.lang.System.getProperty("os.version").contains("Microsoft")));
+                 && java.lang.System.getProperty("os.version").toLowerCase().contains("microsoft")));
 }

 var error = function (s) {
--- a/make/conf/module-loader-map.conf
+++ b/make/conf/module-loader-map.conf
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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,7 +43,6 @@ BOOT_MODULES= \
    java.rmi \
    java.security.sasl \
    java.xml \
-    jdk.incubator.concurrent \
    jdk.incubator.vector \
    jdk.internal.vm.ci \
    jdk.jfr \
@@ -78,7 +77,6 @@ PLATFORM_MODULES= \
    jdk.accessibility \
    jdk.charsets \
    jdk.crypto.cryptoki \
-    jdk.crypto.ec \
    jdk.dynalink \
    jdk.httpserver \
    jdk.jsobject \
--- a/make/conf/version-numbers.conf
+++ b/make/conf/version-numbers.conf
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,17 +26,17 @@
 # Default version, product, and vendor information to use,
 # unless overridden by configure

-DEFAULT_VERSION_FEATURE=21
+DEFAULT_VERSION_FEATURE=22
 DEFAULT_VERSION_INTERIM=0
 DEFAULT_VERSION_UPDATE=0
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2023-09-19
-DEFAULT_VERSION_CLASSFILE_MAJOR=65  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
+DEFAULT_VERSION_DATE=2024-03-19
+DEFAULT_VERSION_CLASSFILE_MAJOR=66  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="19 20 21"
-DEFAULT_JDK_SOURCE_TARGET_VERSION=21
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="20 21 22"
+DEFAULT_JDK_SOURCE_TARGET_VERSION=22
 DEFAULT_PROMOTED_VERSION_PRE=ea
--- a/make/data/charsetmapping/DoubleByte-X.java.template
+++ b/make/data/charsetmapping/DoubleByte-X.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -56,10 +56,10 @@ public class $NAME_CLZ$ extends Charset
        return new DoubleByte.Encoder$ENCTYPE$(this, $ENC_REPLACEMENT$ EncodeHolder.c2b, EncodeHolder.c2bIndex, $ASCIICOMPATIBLE$);
    }

-    static class DecodeHolder {
+    public static class DecodeHolder {
        $B2C$
-        static final char[][] b2c = new char[b2cStr.length][];
-        static final char[] b2cSB;
+        public static final char[][] b2c = new char[b2cStr.length][];
+        public static final char[] b2cSB;

        static {
            for (int i = 0; i < b2cStr.length; i++) {
@@ -72,9 +72,9 @@ public class $NAME_CLZ$ extends Charset
        }
    }

-    static class EncodeHolder {
-        static final char[] c2b = new char[$C2BLENGTH$];
-        static final char[] c2bIndex = new char[0x100];
+    public static class EncodeHolder {
+        public static final char[] c2b = new char[$C2BLENGTH$];
+        public static final char[] c2bIndex = new char[0x100];

        static {
            $NONROUNDTRIP_B2C$
--- a/make/data/charsetmapping/SingleByte-X.java.template
+++ b/make/data/charsetmapping/SingleByte-X.java.template
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -40,7 +40,7 @@ public class $NAME_CLZ$ extends Charset implements HistoricallyNamedCharset
    }

    public String historicalName() {
-        return "$NAME_HIS$";
+        return "$NAME_HIST$";
    }

    public boolean contains(Charset cs) {
--- a/make/data/charsetmapping/charsets
+++ b/make/data/charsetmapping/charsets
--- a/make/data/charsetmapping/list_old
+++ b/make/data/charsetmapping/list_old
@@ -3,7 +3,7 @@
 # used in jdk8.
 ############################### sbcs #########################################
 #
-# clzName	csName		hisName		containASCII	pkg
+# clzName	csName		histName	containASCII	pkg
 #
 IBM437		IBM437		Cp437		false		sun.nio.cs
 IBM737		x-IBM737	Cp737		false		sun.nio.cs	
@@ -46,7 +46,7 @@ IBM1112		x-IBM1112	Cp1112		false		sun.nio.cs.ext
 IBM1122		x-IBM1122	Cp1122		false		sun.nio.cs.ext
 IBM1123		x-IBM1123	Cp1123		false		sun.nio.cs.ext
 IBM1124		x-IBM1124	Cp1124		false		sun.nio.cs.ext
-# map tables for 1140-1149 are updated manualy with the u+20ac entry          
+# map tables for 1140-1149 are updated manually with the u+20ac entry
 IBM1140		IBM01140	Cp1140		false		sun.nio.cs.ext
 IBM1141		IBM01141	Cp1141		false		sun.nio.cs.ext
 IBM1142		IBM01142	Cp1142		false		sun.nio.cs.ext
@@ -85,7 +85,7 @@ IBM875		x-IBM875	Cp875		false		sun.nio.cs.ext
 IBM918		IBM918		Cp918		false		sun.nio.cs.ext
 IBM921		x-IBM921	Cp921		false		sun.nio.cs.ext
 IBM922		x-IBM922	Cp922		false		sun.nio.cs.ext
-# use name as hisname as well, cs did not support hisname prevously           
+# use name as histname as well, cs did not support histname previously
 ISO_8859_11	x-iso-8859-11	x-iso-8859-11	true		sun.nio.cs.ext
 ISO_8859_3	ISO-8859-3	ISO8859_3	true		sun.nio.cs.ext
 ISO_8859_6	ISO-8859-6	ISO8859_6	true		sun.nio.cs.ext
@@ -113,7 +113,7 @@ TIS_620		TIS-620		TIS620		true		sun.nio.cs.ext
 #
 ############################### dbcs #########################################
 #
-#clzName  csName     hisName  dbtype    pkg               ascii   b1min  b1max  b2min b2max
+#clzName  csName     histName dbtype    pkg               ascii   b1min  b1max  b2min b2max
 #
 Big5      Big5       Big5     basic     sun.nio.cs.ext    true    0xa1   0xf9   0x40  0xfe
 Johab     x-Johab    x-Johab  basic     sun.nio.cs.ext    true    0x84   0xf9   0x31  0xfe
--- a/make/data/charsetmapping/stdcs-linux
+++ b/make/data/charsetmapping/stdcs-linux
@@ -2,13 +2,11 @@
 #   generate these charsets into sun.nio.cs
 #
 Big5
-Big5_Solaris
 Big5_HKSCS
 EUC_CN
 EUC_KR
 EUC_JP
 EUC_JP_LINUX
-EUC_JP_Open
 EUC_TW
 GBK
 ISO_8859_11
@@ -16,12 +14,9 @@ ISO_8859_3
 ISO_8859_6
 ISO_8859_8
 Johab
-PCK
 TIS_620
 JIS_X_0201
 JIS_X_0208
 JIS_X_0212
-JIS_X_0208_Solaris
-JIS_X_0212_Solaris
 MS932
 SJIS
--- a/make/data/hotspot-symbols/symbols-shared
+++ b/make/data/hotspot-symbols/symbols-shared
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -30,5 +30,6 @@ jio_vsnprintf
 JNI_CreateJavaVM
 JNI_GetCreatedJavaVMs
 JNI_GetDefaultJavaVMInitArgs
+JVM_IsForeignLinkerSupported
 JVM_FindClassFromBootLoader
 JVM_InitAgentProperties
--- a/make/data/hotspot-symbols/symbols-unix
+++ b/make/data/hotspot-symbols/symbols-unix
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -181,6 +181,7 @@ JVM_NewArray
 JVM_NewInstanceFromConstructor
 JVM_NewMultiArray
 JVM_PhantomReferenceRefersTo
+JVM_PrintWarningAtDynamicAgentLoad
 JVM_RaiseSignal
 JVM_RawMonitorCreate
 JVM_RawMonitorDestroy
@@ -199,7 +200,7 @@ JVM_SetNativeThreadName
 JVM_SetPrimitiveArrayElement
 JVM_SetStackWalkContinuation
 JVM_SetThreadPriority
-JVM_Sleep
+JVM_SleepNanos
 JVM_StartThread
 JVM_SupportsCX8
 JVM_TotalMemory
@@ -217,6 +218,8 @@ JVM_DefineModule
 JVM_SetBootLoaderUnnamedModule

 # Virtual thread notifications for JVMTI
+JVM_VirtualThreadStart
+JVM_VirtualThreadEnd
 JVM_VirtualThreadMount
 JVM_VirtualThreadUnmount
 JVM_VirtualThreadHideFrames
--- a/make/devkit/createJMHBundle.sh
+++ b/make/devkit/createJMHBundle.sh
@@ -26,8 +26,8 @@
 # Create a bundle in the build directory, containing what's needed to
 # build and run JMH microbenchmarks from the OpenJDK build.

-JMH_VERSION=1.36
-COMMONS_MATH3_VERSION=3.2
+JMH_VERSION=1.37
+COMMONS_MATH3_VERSION=3.6.1
 JOPT_SIMPLE_VERSION=5.0.4

 BUNDLE_NAME=jmh-$JMH_VERSION.tar.gz
--- a/make/devkit/createLibffiBundle.sh
+++ b/make/devkit/createLibffiBundle.sh
@@ -0,0 +1,170 @@
+#!/bin/bash
+#
+# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This script generates a libffi bundle. On linux by building it from source
+# using a devkit, which should match the devkit used to build the JDK.
+#
+# Set MAKE_ARGS to add parameters to make. Ex:
+#
+# $ MAKE_ARGS=-j32 bash createLibffiBundle.sh
+#
+# The script tries to behave well on multiple invocations, only performing steps
+# not already done. To redo a step, manually delete the target files from that
+# step.
+#
+# Note that the libtool and texinfo packages are needed to build libffi
+# $ sudo apt install libtool texinfo
+
+# Note that while the build system supports linking against libffi on Windows (x64),
+# I couldn't get this script working with a Windows devkit, and instead had to manually create
+# a libffi bundle for Windows. The steps I took were as follows:
+#
+# 1. run 'x64 Native Tools Command Prompt for VS 2022'. After that, cl.exe and link.exe should be on path
+#
+# 2. in the same shell, run `ucrt64` (this is one of the shell environments that comes with MSYS2).
+#    This should carry over the environment set up by the VS dev prompt into the ucrt64 prompt.
+#
+# 3. then, in the libffi repo root folder:
+#   3.a run `autogen.sh`
+#   3.b run:
+# ```
+# bash configure \
+#   CC="/path/to/libffi/msvcc.sh -m64" \
+#   CXX="/path/to/libffi/msvcc.sh -m64" \
+#   CPPFLAGS="-DFFI_BUILDING_DLL" \
+#   --disable-docs \
+#   --prefix=<install dest>
+# ```
+# (`<install dest>` can be whatever you like. That's what you point `--with-libffi` to).
+#
+# 4. run `make install`. This should create the `<install dest>` directory with the files:
+#    `include/ffi.h`, `include/ffitarget.h`, `lib/libffi.dll`. It also creates a `lib/libffi.lib` file,
+#    but it is of the wrong file type, `DLL` rather than `LIBRARY`.
+#
+# 5. Manually create a working `.lib` file (in the <install dest>/lib dir):
+#   5.a use `dumpbin /exports libffi.dll` to get a list of exported symbols
+#   5.b put them in a `libffi.def` file: `EXPORTS` on the first line, then a symbol on each line following
+#   5.c run `lib /def:libffi.def /machine:x64 /out:libffi.lib` to create the right `.lib` file (`lib` is a visual studio tool)
+#
+
+LIBFFI_VERSION=3.4.2
+
+BUNDLE_NAME=libffi-$LIBFFI_VERSION.tar.gz
+
+SCRIPT_FILE="$(basename $0)"
+SCRIPT_DIR="$(cd "$(dirname $0)" > /dev/null && pwd)"
+OUTPUT_DIR="${SCRIPT_DIR}/../../build/libffi"
+SRC_DIR="$OUTPUT_DIR/src"
+DOWNLOAD_DIR="$OUTPUT_DIR/download"
+INSTALL_DIR="$OUTPUT_DIR/install"
+IMAGE_DIR="$OUTPUT_DIR/image"
+OS_NAME=$(uname -s)
+
+USAGE="$0 <devkit dir>"
+
+if [ "$1" = "" ]; then
+    echo $USAGE
+    exit 1
+fi
+DEVKIT_DIR="$1"
+
+# Download source distros
+mkdir -p $DOWNLOAD_DIR
+cd $DOWNLOAD_DIR
+SOURCE_TAR=v$LIBFFI_VERSION.tar.gz
+if [ ! -f $SOURCE_TAR ]; then
+    wget https://github.com/libffi/libffi/archive/refs/tags/v$LIBFFI_VERSION.tar.gz
+fi
+
+# Unpack src
+mkdir -p $SRC_DIR
+cd $SRC_DIR
+LIBFFI_DIRNAME=libffi-$LIBFFI_VERSION
+LIBFFI_DIR=$SRC_DIR/$LIBFFI_DIRNAME
+if [ ! -d $LIBFFI_DIRNAME ]; then
+    echo "Unpacking $SOURCE_TAR"
+    tar xf $DOWNLOAD_DIR/$SOURCE_TAR
+fi
+
+# Build
+cd $LIBFFI_DIR
+if [ ! -e $LIBFFI_DIR/configure ]; then
+  bash ./autogen.sh
+fi
+
+case $OS_NAME in
+  Linux)
+    CC=$DEVKIT_DIR/bin/gcc
+    CXX=$DEVKIT_DIR/bin/g++
+    # For Linux/x86 it's under /lib/ instead of /lib64/
+    LIB_FOLDER=lib64
+    LIB_NAME=libffi.so*
+    ;;
+  Darwin)
+    CC=$DEVKIT_DIR/Xcode/Contents/Developer/usr/bin/gcc
+    CXX=$DEVKIT_DIR/Xcode/Contents/Developer/usr/bin/gcc
+    LIB_FOLDER=lib
+    LIB_NAME=libffi.*.dylib
+    ;;
+  *)
+    echo " Unsupported OS: $OS_NAME"
+    exit 1
+    ;;
+esac
+
+# For Linux/x86, add --build=i686-pc-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32
+bash ./configure \
+  --disable-docs \
+  --prefix=$INSTALL_DIR \
+  CC=$CC \
+  CXX=$CXX
+
+# Run with nice to keep system usable during build.
+nice make $MAKE_ARGS install
+
+mkdir -p $IMAGE_DIR
+# Extract what we need into an image
+if [ ! -e $IMAGE_DIR/lib/libffi.so ]; then
+  echo "Copying ${LIB_NAME} to image"
+  mkdir -p $IMAGE_DIR/lib
+  cp -a $INSTALL_DIR/${LIB_FOLDER}/${LIB_NAME} $IMAGE_DIR/lib/
+fi
+if [ ! -e $IMAGE_DIR/include/ ]; then
+  echo "Copying include to image"
+  mkdir -p $IMAGE_DIR/include
+  cp -a $INSTALL_DIR/include/. $IMAGE_DIR/include/
+fi
+if [ ! -e $IMAGE_DIR/$SCRIPT_FILE ]; then
+  echo "Copying this script to image"
+  cp -a $SCRIPT_DIR/$SCRIPT_FILE $IMAGE_DIR/
+fi
+
+# Create bundle
+if [ ! -e $OUTPUT_DIR/$BUNDLE_NAME ]; then
+  echo "Creating $OUTPUT_DIR/$BUNDLE_NAME"
+  cd $IMAGE_DIR
+  tar zcf $OUTPUT_DIR/$BUNDLE_NAME *
+fi
--- a/make/hotspot/gensrc/GensrcAdlc.gmk
+++ b/make/hotspot/gensrc/GensrcAdlc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -37,8 +37,13 @@ ifeq ($(call check-jvm-feature, compiler2), true)
  ifeq ($(call isBuildOs, linux), true)
    ADLC_CFLAGS := -fno-exceptions -DLINUX
  else ifeq ($(call isBuildOs, aix), true)
-    ADLC_LDFLAGS += -q64
-    ADLC_CFLAGS := -qnortti -qeh -q64 -DAIX
+    ifeq ($(TOOLCHAIN_TYPE), clang)
+      ADLC_LDFLAGS += -m64
+      ADLC_CFLAGS := -fno-rtti -fexceptions -ffunction-sections -m64 -DAIX -mcpu=pwr8
+    else
+      ADLC_LDFLAGS += -q64
+      ADLC_CFLAGS := -qnortti -qeh -q64 -DAIX
+    endif
  else ifeq ($(call isBuildOs, windows), true)
    ADLC_LDFLAGS += -nologo
    ADLC_CFLAGS := -nologo -EHsc
@@ -167,6 +172,8 @@ ifeq ($(call check-jvm-feature, compiler2), true)

  ifeq ($(call check-jvm-feature, zgc), true)
    AD_SRC_FILES += $(call uniq, $(wildcard $(foreach d, $(AD_SRC_ROOTS), \
+        $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/gc/x/x_$(HOTSPOT_TARGET_CPU).ad \
+        $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/gc/x/x_$(HOTSPOT_TARGET_CPU_ARCH).ad \
        $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/gc/z/z_$(HOTSPOT_TARGET_CPU).ad \
        $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/gc/z/z_$(HOTSPOT_TARGET_CPU_ARCH).ad \
      )))
--- a/make/hotspot/lib/CompileJvm.gmk
+++ b/make/hotspot/lib/CompileJvm.gmk
@@ -84,11 +84,11 @@ CFLAGS_VM_VERSION := \
 # Disabled warnings

 DISABLED_WARNINGS_gcc := array-bounds comment delete-non-virtual-dtor \
-    empty-body ignored-qualifiers implicit-fallthrough int-in-bool-context \
+    empty-body implicit-fallthrough int-in-bool-context \
    maybe-uninitialized missing-field-initializers parentheses \
    shift-negative-value unknown-pragmas

-DISABLED_WARNINGS_clang := ignored-qualifiers sometimes-uninitialized \
+DISABLED_WARNINGS_clang := sometimes-uninitialized \
    missing-braces delete-non-abstract-non-virtual-dtor unknown-pragmas

 ifneq ($(DEBUG_LEVEL), release)
@@ -139,6 +139,13 @@ JVM_STRIPFLAGS ?= $(STRIPFLAGS)
 # This source set is reused so save in cache.
 $(call FillFindCache, $(JVM_SRC_DIRS))

+# The global operator new functions defined in operator_new.cpp are intended
+# to detect and prevent the VM code from calling them. See more details in
+# operator_new.cpp. Exclude operator_new.o when statically linking the VM
+# code with JDK natives, as the JDK natives might need to call the global
+# operator new.
+LIBJVM_STATIC_EXCLUDE_OBJS := operator_new.o
+
 ################################################################################
 # Now set up the actual compilation of the main hotspot native library

@@ -168,10 +175,14 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
    DISABLED_WARNINGS_clang_management.cpp := missing-field-initializers, \
    DISABLED_WARNINGS_clang_notificationThread.cpp := bitwise-instead-of-logical, \
    DISABLED_WARNINGS_clang_os_posix.cpp := mismatched-tags missing-field-initializers, \
+    DISABLED_WARNINGS_clang_aix_os_posix.cpp := format-nonliteral, \
    DISABLED_WARNINGS_clang_postaloc.cpp := tautological-undefined-compare, \
    DISABLED_WARNINGS_clang_serviceThread.cpp := bitwise-instead-of-logical, \
    DISABLED_WARNINGS_clang_vm_version_x86.cpp := missing-field-initializers, \
    DISABLED_WARNINGS_clang_zTracer.cpp := undefined-var-template, \
+    DISABLED_WARNINGS_clang_aix_debug.cpp := format-nonliteral, \
+    DISABLED_WARNINGS_clang_aix_jvm.cpp := format-nonliteral, \
+    DISABLED_WARNINGS_clang_aix_osThread_aix.cpp := tautological-undefined-compare, \
    DISABLED_WARNINGS_xlc := $(DISABLED_WARNINGS_xlc), \
    DISABLED_WARNINGS_microsoft := $(DISABLED_WARNINGS_microsoft), \
    ASFLAGS := $(JVM_ASFLAGS), \
@@ -186,6 +197,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
    RC_FILEDESC := $(HOTSPOT_VM_DISTRO) $(OPENJDK_TARGET_CPU_BITS)-Bit $(JVM_VARIANT) VM, \
    PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \
    PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
+    STATIC_LIB_EXCLUDE_OBJS := $(LIBJVM_STATIC_EXCLUDE_OBJS), \
 ))

 # Always recompile abstract_vm_version.cpp if libjvm needs to be relinked. This ensures
@@ -272,10 +284,10 @@ ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
    define SetupOperatorNewDeleteCheck
        $1.op_check: $1
 	  $$(call ExecuteWithLog, $1.op_check, \
-	      $$(NM) $$<  2>&1 | $$(GREP) $$(addprefix -e , $$(MANGLED_SYMS)) | $$(GREP) $$(UNDEF_PATTERN) > $1.op_check || true)
+	      $$(NM) $$(NMFLAGS) $$<  2>&1 | $$(GREP) $$(addprefix -e , $$(MANGLED_SYMS)) | $$(GREP) $$(UNDEF_PATTERN) > $1.op_check || true)
 	  if [ -s $1.op_check ]; then \
 	    $$(ECHO) "$$(notdir $$<): Error: Use of global operators new and delete is not allowed in Hotspot:"; \
-	    $$(NM) $$< | $$(CXXFILT) | $$(EGREP) '$$(DEMANGLED_REGEXP)' | $$(GREP) $$(UNDEF_PATTERN); \
+	    $$(NM) $$(NMFLAGS) $$< | $$(CXXFILT) | $$(EGREP) '$$(DEMANGLED_REGEXP)' | $$(GREP) $$(UNDEF_PATTERN); \
 	    $$(ECHO) "See: $$(TOPDIR)/make/hotspot/lib/CompileJvm.gmk"; \
 	    exit 1; \
 	  fi
--- a/make/hotspot/lib/JvmFeatures.gmk
+++ b/make/hotspot/lib/JvmFeatures.gmk
@@ -149,6 +149,7 @@ endif
 ifneq ($(call check-jvm-feature, zgc), true)
  JVM_CFLAGS_FEATURES += -DINCLUDE_ZGC=0
  JVM_EXCLUDE_PATTERNS += gc/z
+  JVM_EXCLUDE_PATTERNS += gc/x
 endif

 ifneq ($(call check-jvm-feature, shenandoahgc), true)
--- a/make/hotspot/lib/JvmMapfile.gmk
+++ b/make/hotspot/lib/JvmMapfile.gmk
@@ -53,7 +53,7 @@ endif
 # platform dependent.

 ifeq ($(call isTargetOs, linux), true)
-  DUMP_SYMBOLS_CMD := $(NM) --defined-only *$(OBJ_SUFFIX)
+  DUMP_SYMBOLS_CMD := $(NM) $(NMFLAGS) --defined-only *$(OBJ_SUFFIX)
  ifneq ($(FILTER_SYMBOLS_PATTERN), )
    FILTER_SYMBOLS_PATTERN := $(FILTER_SYMBOLS_PATTERN)|
  endif
@@ -67,7 +67,7 @@ ifeq ($(call isTargetOs, linux), true)
 else ifeq ($(call isTargetOs, macosx), true)
  # nm on macosx prints out "warning: nm: no name list" to stderr for
  # files without symbols. Hide this, even at the expense of hiding real errors.
-  DUMP_SYMBOLS_CMD := $(NM) -Uj *$(OBJ_SUFFIX) 2> /dev/null
+  DUMP_SYMBOLS_CMD := $(NM) $(NMFLAGS) -Uj *$(OBJ_SUFFIX) 2> /dev/null
  ifneq ($(FILTER_SYMBOLS_PATTERN), )
    FILTER_SYMBOLS_PATTERN := $(FILTER_SYMBOLS_PATTERN)|
  endif
@@ -89,7 +89,7 @@ else ifeq ($(call isTargetOs, aix), true)
  # which may be installed under /opt/freeware/bin. So better use an absolute path here!
  # NM=/usr/bin/nm

-  DUMP_SYMBOLS_CMD := $(NM) -X64 -B -C *$(OBJ_SUFFIX)
+  DUMP_SYMBOLS_CMD := $(NM) $(NMFLAGS) -B -C *$(OBJ_SUFFIX)
  FILTER_SYMBOLS_AWK_SCRIPT := \
      '{ \
        if (($$2="d" || $$2="D") && ($$3 ~ /^__vft/ || $$3 ~ /^gHotSpotVM/)) print $$3; \
--- a/make/hotspot/lib/JvmOverrideFiles.gmk
+++ b/make/hotspot/lib/JvmOverrideFiles.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -109,7 +109,11 @@ else ifeq ($(call isTargetOs, macosx), true)
  endif

 else ifeq ($(call isTargetOs, aix), true)
-  BUILD_LIBJVM_synchronizer.cpp_CXXFLAGS := -qnoinline
+  ifeq ($(TOOLCHAIN_TYPE), clang)
+    BUILD_LIBJVM_synchronizer.cpp_CXXFLAGS := -fno-inline
+  else
+    BUILD_LIBJVM_synchronizer.cpp_CXXFLAGS := -qnoinline
+  endif
  BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
  # Disable aggressive optimizations for functions in sharedRuntimeTrig.cpp
  # and sharedRuntimeTrans.cpp on ppc64.
--- a/make/ide/netbeans/langtools/build.xml
+++ b/make/ide/netbeans/langtools/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.

 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -242,7 +242,7 @@
                </nbjpdastart>
                <property
                    name="@{jpda.jvmargs.property}"
-                    value="-Xdebug -Xnoagent -Djava.compiler=none -Xrunjdwp:transport=dt_socket,address=${jpda.address}"
+                    value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"
                />
            </sequential>
        </macrodef>
--- a/make/jdk/src/classes/build/tools/charsetmapping/Charset.java
+++ b/make/jdk/src/classes/build/tools/charsetmapping/Charset.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ class Charset {
    String   pkgName;
    String   clzName;
    String   csName;
-    String   hisName;
+    String   histName;
    String   type;
    String   os;
    boolean  isASCII;
--- a/make/jdk/src/classes/build/tools/charsetmapping/DBCS.java
+++ b/make/jdk/src/classes/build/tools/charsetmapping/DBCS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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,7 +43,7 @@ public class DBCS {
    {
        String clzName = cs.clzName;
        String csName  = cs.csName;
-        String hisName = cs.hisName;
+        String histName = cs.histName;
        String pkgName = cs.pkgName;
        boolean isASCII = cs.isASCII;
        int b1Min = cs.b1Min;
@@ -152,8 +152,8 @@ public class DBCS {
        Scanner s = new Scanner(new File(srcDir, template));
        PrintStream ops = new PrintStream(new FileOutputStream(
                             new File(dstDir, clzName + ".java")));
-        if (hisName == null)
-            hisName = "";
+        if (histName == null)
+            histName = "";

        // (5) c2b replacement, only used for JIs0208/0212, which
        // are two pure db charsets so default '3f' does not work
@@ -174,7 +174,7 @@ public class DBCS {
                continue;
            }
            line = line.replace("$PACKAGE$" , pkgName)
-                       .replace("$IMPLEMENTS$", (hisName == null)?
+                       .replace("$IMPLEMENTS$", (histName == null)?
                                "" : "implements HistoricallyNamedCharset")
                       .replace("$NAME_CLZ$", clzName)
                       .replace("$NAME_ALIASES$",
@@ -189,8 +189,8 @@ public class DBCS {
                                 "return ((cs.name().equals(\"US-ASCII\")) || (cs instanceof " + clzName + "));":
                                 "return (cs instanceof " + clzName + ");"))
                       .replace("$HISTORICALNAME$",
-                                (hisName == null)? "" :
-                                "    public String historicalName() { return \"" + hisName + "\"; }")
+                                (histName == null)? "" :
+                                "    public String historicalName() { return \"" + histName + "\"; }")
                       .replace("$DECTYPE$", type)
                       .replace("$ENCTYPE$", type)
                       .replace("$B1MIN$"   , "0x" + Integer.toString(b1Min, 16))
--- a/make/jdk/src/classes/build/tools/charsetmapping/Main.java
+++ b/make/jdk/src/classes/build/tools/charsetmapping/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -155,7 +155,7 @@ public class Main {
                        throw new RuntimeException("Error: incorrect charset line [" + line + "]");
                    }
                    if ((cs = charsets.get(tokens[2])) != null) {
-                        throw new RuntimeException("Error: deplicate charset line [" + line + "]");
+                        throw new RuntimeException("Error: duplicate charset line [" + line + "]");
                    }
                    cs = new Charset();
                    cs.csName = tokens[1];
@@ -179,8 +179,8 @@ public class Main {
                    case "os":
                        cs.os = tokens[2];
                        break;
-                    case "hisname":
-                        cs.hisName = tokens[2];
+                    case "histname":
+                        cs.histName = tokens[2];
                        break;
                    case "ascii":
                        cs.isASCII = Boolean.parseBoolean(tokens[2]);
@@ -229,7 +229,7 @@ public class Main {

    static void verbose(Charset cs) {
         System.out.printf("%s, %s, %s, %s, %s  %b%n",
-                           cs.clzName, cs.csName, cs.hisName, cs.pkgName, cs.type, cs.isASCII);
+                           cs.clzName, cs.csName, cs.histName, cs.pkgName, cs.type, cs.isASCII);
    }

    static int toInteger(String s) {
--- a/make/jdk/src/classes/build/tools/charsetmapping/SBCS.java
+++ b/make/jdk/src/classes/build/tools/charsetmapping/SBCS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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,7 +43,7 @@ public class SBCS {
    {
        String clzName = cs.clzName;
        String csName  = cs.csName;
-        String hisName = cs.hisName;
+        String histName = cs.histName;
        String pkgName = cs.pkgName;
        boolean isASCII = cs.isASCII;
        boolean isLatin1Decodable = true;
@@ -170,8 +170,8 @@ public class SBCS {
                    line = line.replace("$NAME_ALIASES$",
                                        "ExtendedCharsets.aliasesFor(\"" + csName + "\")");
            }
-            if (line.indexOf("$NAME_HIS$", i) != -1) {
-                line = line.replace("$NAME_HIS$", hisName);
+            if (line.indexOf("$NAME_HIST$", i) != -1) {
+                line = line.replace("$NAME_HIST$", histName);
            }
            if (line.indexOf("$CONTAINS$", i) != -1) {
                if (isASCII)
--- a/make/jdk/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java
+++ b/make/jdk/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, 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
@@ -39,7 +39,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.TreeMap;
-import java.util.stream.Collectors;
+import java.util.regex.Pattern;

 /**
 * This tool reads the IANA Language Subtag Registry data file downloaded from
@@ -60,7 +60,9 @@ public class EquivMapsGenerator {
        }
        copyrightYear = Integer.parseInt(args[2]);
        readLSRfile(args[0]);
+        // Builds the maps from the IANA data
        generateEquivalentMap();
+        // Writes the maps out to LocaleEquivalentMaps.java
        generateSourceCode(args[1]);
    }

@@ -136,10 +138,29 @@ public class EquivMapsGenerator {
            }
        } else { // language, extlang, legacy, and redundant
            if (!initialLanguageMap.containsKey(preferred)) {
-                sb = new StringBuilder(preferred);
-                sb.append(',');
-                sb.append(tag);
-                initialLanguageMap.put(preferred, sb);
+                // IANA update 4/13 introduced case where a preferred value
+                // can have a preferred value itself.
+                // eg: ar-ajp has pref ajp which has pref apc
+                boolean foundInOther = false;
+                Pattern pattern = Pattern.compile(","+preferred+"(,|$)");
+                // Check if current pref exists inside a value for another pref
+                List<StringBuilder> doublePrefs = initialLanguageMap
+                        .values()
+                        .stream()
+                        .filter(e -> pattern.matcher(e.toString()).find())
+                        .toList();
+                for (StringBuilder otherPrefVal : doublePrefs) {
+                    otherPrefVal.append(",");
+                    otherPrefVal.append(tag);
+                    foundInOther = true;
+                }
+                if (!foundInOther) {
+                    // does not exist in any other pref's values, so add as new entry
+                    sb = new StringBuilder(preferred);
+                    sb.append(',');
+                    sb.append(tag);
+                    initialLanguageMap.put(preferred, sb);
+                }
            } else {
                sb = initialLanguageMap.get(preferred);
                sb.append(',');
@@ -156,7 +177,7 @@ public class EquivMapsGenerator {
            // "yue" is defined both as extlang and redundant. Remove the dup.
            subtags = Arrays.stream(initialLanguageMap.get(preferred).toString().split(","))
                    .distinct()
-                    .collect(Collectors.toList())
+                    .toList()
                    .toArray(new String[0]);

            if (subtags.length == 2) {
@@ -194,63 +215,6 @@ public class EquivMapsGenerator {
        return list.toArray(new String[list.size()]);
    }

-    private static String generateValuesString(String[] values) {
-        String outputStr = "";
-        for (int i = 0; i < values.length; i++) {
-            if (i != values.length - 1) {
-                outputStr = outputStr + "\"" + values[i] + "\", ";
-            } else {
-                outputStr = outputStr + "\"" + values[i] + "\"";
-            }
-
-        }
-        return outputStr;
-    }
-
-    private static final String COPYRIGHT = "/*\n"
-        + " * Copyright (c) 2012, %d, Oracle and/or its affiliates. All rights reserved.\n"
-        + " * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n"
-        + " *\n"
-        + " * This code is free software; you can redistribute it and/or modify it\n"
-        + " * under the terms of the GNU General Public License version 2 only, as\n"
-        + " * published by the Free Software Foundation.  Oracle designates this\n"
-        + " * particular file as subject to the \"Classpath\" exception as provided\n"
-        + " * by Oracle in the LICENSE file that accompanied this code.\n"
-        + " *\n"
-        + " * This code is distributed in the hope that it will be useful, but WITHOUT\n"
-        + " * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n"
-        + " * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License\n"
-        + " * version 2 for more details (a copy is included in the LICENSE file that\n"
-        + " * accompanied this code).\n"
-        + " *\n"
-        + " * You should have received a copy of the GNU General Public License version\n"
-        + " * 2 along with this work; if not, write to the Free Software Foundation,\n"
-        + " * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.\n"
-        + " *\n"
-        + " * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA\n"
-        + " * or visit www.oracle.com if you need additional information or have any\n"
-        + " * questions.\n"
-        + "*/\n\n";
-
-    private static final String headerText =
-        "package sun.util.locale;\n\n"
-        + "import java.util.HashMap;\n"
-        + "import java.util.Map;\n\n"
-        + "final class LocaleEquivalentMaps {\n\n"
-        + "    static final Map<String, String> singleEquivMap;\n"
-        + "    static final Map<String, String[]> multiEquivsMap;\n"
-        + "    static final Map<String, String> regionVariantEquivMap;\n\n"
-        + "    static {\n"
-        + "        singleEquivMap = new HashMap<>(";
-
-    private static final String footerText =
-        "    }\n\n"
-        + "}";
-
-    private static String getOpenJDKCopyright() {
-        return String.format(Locale.US, COPYRIGHT, copyrightYear);
-    }
-
    /**
     * The input lsr data file is in UTF-8, so theoretically for the characters
     * beyond US-ASCII, the generated Java String literals need to be Unicode
@@ -258,53 +222,132 @@ public class EquivMapsGenerator {
     * the case since we don't use "description", "comment" or alike.
     */
    private static void generateSourceCode(String fileName) {
-
        try (BufferedWriter writer = Files.newBufferedWriter(
                Paths.get(fileName))) {
            writer.write(getOpenJDKCopyright());
-            writer.write(headerText
-                + (int)(sortedLanguageMap1.size() / 0.75f + 1) + ");\n"
-                + "        multiEquivsMap = new HashMap<>("
-                + (int)(sortedLanguageMap2.size() / 0.75f + 1) + ");\n"
-                + "        regionVariantEquivMap = new HashMap<>("
-                + (int)(sortedRegionVariantMap.size() / 0.75f + 1) + ");\n\n"
-                + "        // This is an auto-generated file and should not be manually edited.\n"
-                + "        //   LSR Revision: " + LSRrevisionDate);
+            writer.write(HEADER_TEXT);
+            writer.write(getMapsText());
+            writer.write(getLSRText());
+            writeEquiv(writer, "singleEquivMap", sortedLanguageMap1);
            writer.newLine();
-
-            for (String key : sortedLanguageMap1.keySet()) {
-                String value = sortedLanguageMap1.get(key);
-                writer.write("        singleEquivMap.put(\""
-                    + key + "\", \"" + value + "\");");
-                writer.newLine();
-            }
-
+            writeMultiEquiv(writer);
            writer.newLine();
-            for (String key : sortedLanguageMap2.keySet()) {
-                String[] values = sortedLanguageMap2.get(key);
-
-                if (values.length >= 2) {
-                    writer.write("        multiEquivsMap.put(\""
-                        + key + "\", new String[] {"
-                        + generateValuesString(values) + "});");
-                    writer.newLine();
-                }
-            }
-
-            writer.newLine();
-            for (String key : sortedRegionVariantMap.keySet()) {
-                String value = sortedRegionVariantMap.get(key);
-                writer.write("        regionVariantEquivMap.put(\""
-                    + key + "\", \"" + value + "\");");
-                writer.newLine();
-            }
-
-            writer.write(footerText);
+            writeEquiv(writer, "regionVariantEquivMap", sortedRegionVariantMap);
+            writer.write(FOOTER_TEXT);
        } catch (IOException ex) {
            ex.printStackTrace(System.err);
            System.exit(1);
        }
-
    }

+    private static String getOpenJDKCopyright() {
+        return String.format(Locale.US, COPYRIGHT, copyrightYear);
+    }
+
+    private static final String COPYRIGHT =
+            """
+            /*
+             * Copyright (c) 2012, %d, 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.
+            */
+
+            """;
+
+    private static final String HEADER_TEXT =
+            """
+            package sun.util.locale;
+
+            import java.util.HashMap;
+            import java.util.Map;
+
+            final class LocaleEquivalentMaps {
+
+                static final Map<String, String> singleEquivMap;
+                static final Map<String, String[]> multiEquivsMap;
+                static final Map<String, String> regionVariantEquivMap;
+
+            """;
+
+    private static final String FOOTER_TEXT =
+            """
+                }
+
+            }
+            """;
+
+    private static String getMapsText() {
+        return  """
+                    static {
+                        singleEquivMap = HashMap.newHashMap(%s);
+                        multiEquivsMap = HashMap.newHashMap(%s);
+                        regionVariantEquivMap = HashMap.newHashMap(%s);
+
+                """.formatted(
+                sortedLanguageMap1.size(),
+                sortedLanguageMap2.size(),
+                sortedRegionVariantMap.size());
+    }
+
+    private static final String getLSRText(){
+        return  """
+                        // This is an auto-generated file and should not be manually edited.
+                        //   LSR Revision: %s
+                """.formatted(LSRrevisionDate);
+    }
+
+    private static void writeMultiEquiv(BufferedWriter writer) throws IOException {
+        for (String key : sortedLanguageMap2.keySet()) {
+            String[] values = sortedLanguageMap2.get(key);
+            if (values.length >= 2) {
+                writer.write(String.format(
+                        "        multiEquivsMap.put(\"%s\", new String[] {%s});"
+                        , key, generateValuesString(values)));
+                writer.newLine();
+            }
+        }
+    }
+
+    // Use for writing an equivlancy map with one value
+    private static void writeEquiv(BufferedWriter writer, String name, Map<String, String> map) throws IOException {
+        for (String key : map.keySet()) {
+            String value = map.get(key);
+            writer.write(String.format(
+                    "        %s.put(\"%s\", \"%s\");"
+                    , name, key, value));
+            writer.newLine();
+        }
+    }
+
+    private static String generateValuesString(String[] values) {
+        String outputStr = "";
+        for (int i = 0; i < values.length; i++) {
+            if (i != values.length - 1) {
+                outputStr = String.format("%s\"%s\", ", outputStr, values[i]);
+            } else {
+                outputStr = String.format("%s\"%s\"", outputStr, values[i]);
+            }
+
+        }
+        return outputStr;
+    }
 }
--- a/make/jdk/src/classes/build/tools/taglet/SealedGraph.java
+++ b/make/jdk/src/classes/build/tools/taglet/SealedGraph.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, 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
@@ -145,11 +145,15 @@ public final class SealedGraph implements Taglet {

        static void traverse(State state, TypeElement node, Set<String> exports) {
            state.addNode(node);
-            for (TypeElement subNode : permittedSubclasses(node, exports)) {
-                if (isInPublicApi(node, exports) && isInPublicApi(subNode, exports)) {
-                    state.addEdge(node, subNode);
+            if (!(node.getModifiers().contains(Modifier.SEALED) || node.getModifiers().contains(Modifier.FINAL))) {
+                state.addNonSealedEdge(node);
+            } else {
+                for (TypeElement subNode : permittedSubclasses(node, exports)) {
+                    if (isInPublicApi(node, exports) && isInPublicApi(subNode, exports)) {
+                        state.addEdge(node, subNode);
+                    }
+                    traverse(state, subNode, exports);
                }
-                traverse(state, subNode, exports);
            }
        }

@@ -158,13 +162,31 @@ public final class SealedGraph implements Taglet {
            private static final String LABEL = "label";
            private static final String TOOLTIP = "tooltip";
            private static final String LINK = "href";
-            private static final String STYLE = "style";

            private final TypeElement rootNode;

            private final StringBuilder builder;

-            private final Map<String, Map<String, String>> nodeStyleMap;
+            private final Map<String, Map<String, StyleItem>> nodeStyleMap;
+
+            private int nonSealedHierarchyCount = 0;
+
+            private sealed interface StyleItem {
+                String valueString();
+
+                record PlainString(String text) implements StyleItem {
+                    @Override
+                    public String valueString() {
+                        return "\"" + text + "\"";
+                    }
+                }
+                record HtmlString(String text) implements StyleItem {
+                    @Override
+                    public String valueString() {
+                        return "<" + text + ">";
+                    }
+                }
+            }

            public State(TypeElement rootNode) {
                this.rootNode = rootNode;
@@ -188,13 +210,9 @@ public final class SealedGraph implements Taglet {

            public void addNode(TypeElement node) {
                var styles = nodeStyleMap.computeIfAbsent(id(node), n -> new LinkedHashMap<>());
-                styles.put(LABEL, node.getSimpleName().toString());
-                styles.put(TOOLTIP, node.getQualifiedName().toString());
-                styles.put(LINK, relativeLink(node));
-                if (!(node.getModifiers().contains(Modifier.SEALED) || node.getModifiers().contains(Modifier.FINAL))) {
-                    // This indicates that the hierarchy is not closed
-                    styles.put(STYLE, "dashed");
-                }
+                styles.put(LABEL, new StyleItem.PlainString(node.getSimpleName().toString()));
+                styles.put(TOOLTIP, new StyleItem.PlainString(node.getQualifiedName().toString()));
+                styles.put(LINK, new StyleItem.PlainString(relativeLink(node)));
            }

            // A permitted class must be in the same package or in the same module.
@@ -223,12 +241,32 @@ public final class SealedGraph implements Taglet {
                        .append(lineSeparator());
            }

+            public void addNonSealedEdge(TypeElement node) {
+                // prepare open node
+                var openNodeId = "open node #" + nonSealedHierarchyCount++;
+                var styles = nodeStyleMap.computeIfAbsent(openNodeId, n -> new LinkedHashMap<>());
+                styles.put(LABEL, new StyleItem.HtmlString("<I>&lt;any&gt;</I>"));
+                styles.put(TOOLTIP, new StyleItem.PlainString("Non-sealed Hierarchy"));
+
+                // add link to parent node
+                builder.append("  ")
+                        .append('"')
+                        .append(openNodeId)
+                        .append('"')
+                        .append(" -> ")
+                        .append(quotedId(node))
+                        .append(" ")
+                        .append("[style=\"dashed\"]")
+                        .append(";")
+                        .append(lineSeparator());
+            }
+
            public String render() {
                nodeStyleMap.forEach((nodeName, styles) -> {
                    builder.append("  ")
                            .append('"').append(nodeName).append("\" ")
                            .append(styles.entrySet().stream()
-                                    .map(e -> e.getKey() + "=\"" + e.getValue() + "\"")
+                                    .map(e -> e.getKey() + "=" + e.getValue().valueString())
                                    .collect(joining(" ", "[", "]")))
                            .append(lineSeparator());
                });
@@ -265,16 +303,17 @@ public final class SealedGraph implements Taglet {
        }

        private static boolean isInPublicApi(TypeElement typeElement, Set<String> exports) {
-           return (exports.contains(packageName(typeElement.getQualifiedName().toString())) ||
-                   exports.contains(packageName(typeElement.getSuperclass().toString()))) &&
-                   typeElement.getModifiers().contains(Modifier.PUBLIC);
+            var packageName = packageName(typeElement);
+            return packageName.isPresent() && exports.contains(packageName.get()) &&
+                    typeElement.getModifiers().contains(Modifier.PUBLIC);
        }

-        private static String packageName(String name) {
-            int lastDot = name.lastIndexOf('.');
-            return lastDot < 0
-                    ? ""
-                    : name.substring(0, lastDot);
+        private static Optional<String> packageName(TypeElement element) {
+            return switch (element.getNestingKind()) {
+                case TOP_LEVEL -> Optional.of(((PackageElement) element.getEnclosingElement()).getQualifiedName().toString());
+                case ANONYMOUS, LOCAL -> Optional.empty();
+                case MEMBER -> packageName((TypeElement) element.getEnclosingElement());
+            };
        }
    }
 }
--- a/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
+++ b/make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -2384,7 +2384,8 @@ public class CreateSymbols {
                MethodDescription method = (MethodDescription) feature;
                method.methodParameters = new ArrayList<>();
                for (MethodParameters_attribute.Entry e : params.method_parameter_table) {
-                    String name = cf.constant_pool.getUTF8Value(e.name_index);
+                    String name = e.name_index == 0 ? null
+                            : cf.constant_pool.getUTF8Value(e.name_index);
                    MethodDescription.MethodParam param =
                            new MethodDescription.MethodParam(e.flags, name);
                    method.methodParameters.add(param);
@@ -3699,8 +3700,8 @@ public class CreateSymbols {
                Function<String, MethodParam> string2Param =
                        p -> {
                            int sep = p.indexOf(':');
-                            return new MethodParam(Integer.parseInt(p.substring(0, sep)),
-                                                    p.substring(sep + 1));
+                            return new MethodParam(Integer.parseInt(p.substring(0, sep), 16),
+                                                   p.substring(sep + 1));
                        };
                methodParameters =
                        deserializeList(inMethodParameters).stream()
--- a/make/modules/java.base/Java.gmk
+++ b/make/modules/java.base/Java.gmk
@@ -27,9 +27,7 @@ DISABLED_WARNINGS_java += this-escape

 DOCLINT += -Xdoclint:all/protected \
    '-Xdoclint/package:java.*,javax.*'
-JAVAC_FLAGS += -XDstringConcat=inline \
-    --enable-preview
-DISABLED_WARNINGS_java += preview
+JAVAC_FLAGS += -XDstringConcat=inline
 COPY += .icu .dat .spp .nrm content-types.properties \
    hijrah-config-Hijrah-umalqura_islamic-umalqura.properties
 CLEAN += intrinsic.properties
--- a/make/modules/java.base/Lib.gmk
+++ b/make/modules/java.base/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -46,6 +46,8 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBNET, \
    DISABLED_WARNINGS_gcc_net_util_md.c := format-nonliteral, \
    DISABLED_WARNINGS_gcc_NetworkInterface.c := unused-function, \
    DISABLED_WARNINGS_clang_net_util_md.c := format-nonliteral, \
+    DISABLED_WARNINGS_clang_aix_DefaultProxySelector.c := deprecated-non-prototype, \
+    DISABLED_WARNINGS_clang_aix_NetworkInterface.c := gnu-pointer-arith, \
    DISABLED_WARNINGS_microsoft_InetAddress.c := 4244, \
    DISABLED_WARNINGS_microsoft_ResolverConfigurationImpl.c := 4996, \
    LDFLAGS := $(LDFLAGS_JDKLIB) \
@@ -215,3 +217,19 @@ $(eval $(call SetupJdkLibrary, BUILD_SYSLOOKUPLIB, \
 ))

 TARGETS += $(BUILD_SYSLOOKUPLIB)
+
+################################################################################
+# Create fallback linker lib
+
+ifeq ($(ENABLE_FALLBACK_LINKER), true)
+  $(eval $(call SetupJdkLibrary, BUILD_LIBFALLBACKLINKER, \
+      NAME := fallbackLinker, \
+      CFLAGS := $(CFLAGS_JDKLIB) $(LIBFFI_CFLAGS), \
+      LDFLAGS := $(LDFLAGS_JDKLIB) \
+                 $(call SET_SHARED_LIBRARY_ORIGIN), \
+      LIBS := $(LIBFFI_LIBS), \
+      LIBS_windows := $(LIBFFI_LIBS) ws2_32.lib, \
+  ))
+
+  TARGETS += $(BUILD_LIBFALLBACKLINKER)
+endif
--- a/make/modules/java.base/gensrc/GensrcMisc.gmk
+++ b/make/modules/java.base/gensrc/GensrcMisc.gmk
@@ -50,11 +50,31 @@ $(eval $(call SetupTextFileProcessing, BUILD_VERSION_JAVA, \
        @@VENDOR_URL_VM_BUG@@ => $(VENDOR_URL_VM_BUG), \
 ))

+
+# Normalize OPENJDK_TARGET_CPU name to match jdk.internal.util.Architecture enum
+ifneq ($(filter $(OPENJDK_TARGET_CPU), s390x), )
+  OPENJDK_TARGET_ARCH_CANONICAL = s390
+else ifneq ($(filter $(OPENJDK_TARGET_CPU), x86_64 amd64), )
+  OPENJDK_TARGET_ARCH_CANONICAL = x64
+else
+  OPENJDK_TARGET_ARCH_CANONICAL := $(OPENJDK_TARGET_CPU)
+endif
+
+# Normalize OPENJDK_TARGET_OS operating system name to match jdk.internal.util.OperatingSystem enum
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+  OPENJDK_TARGET_OS_CANONICAL = macos
+else
+  OPENJDK_TARGET_OS_CANONICAL := $(OPENJDK_TARGET_OS)
+endif
+
 $(eval $(call SetupTextFileProcessing, BUILD_PLATFORMPROPERTIES_JAVA, \
-    SOURCE_FILES := $(TOPDIR)/src/java.base/share/classes/jdk/internal/util/OperatingSystemProps.java.template, \
-    OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/util/OperatingSystemProps.java, \
+    SOURCE_FILES := $(TOPDIR)/src/java.base/share/classes/jdk/internal/util/PlatformProps.java.template, \
+    OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/util/PlatformProps.java, \
    REPLACEMENTS := \
-        @@OPENJDK_TARGET_OS@@ => $(OPENJDK_TARGET_OS), \
+        @@OPENJDK_TARGET_OS@@ => $(OPENJDK_TARGET_OS_CANONICAL) ; \
+        @@OPENJDK_TARGET_CPU@@ => $(OPENJDK_TARGET_ARCH_CANONICAL) ; \
+        @@OPENJDK_TARGET_CPU_ENDIAN@@ => $(OPENJDK_TARGET_CPU_ENDIAN) ; \
+        @@OPENJDK_TARGET_CPU_BITS@@ => $(OPENJDK_TARGET_CPU_BITS), \
 ))

 TARGETS += $(BUILD_VERSION_JAVA) $(BUILD_PLATFORMPROPERTIES_JAVA)
--- a/make/modules/java.base/lib/CoreLibraries.gmk
+++ b/make/modules/java.base/lib/CoreLibraries.gmk
@@ -153,15 +153,19 @@ endif
 LIBJLI_CFLAGS += $(LIBZ_CFLAGS)

 ifneq ($(USE_EXTERNAL_LIBZ), true)
+  # Extra files from the zlib.
+  LIBJLI_EXTRA_FILE_LIST := inflate.c inftrees.c inffast.c zadler32.c zcrc32.c zutil.c
+
  LIBJLI_EXTRA_FILES += \
      $(addprefix $(TOPDIR)/src/java.base/share/native/libzip/zlib/, \
-          inflate.c \
-          inftrees.c \
-          inffast.c \
-          zadler32.c \
-          zcrc32.c \
-          zutil.c \
-      )
+          $(LIBJLI_EXTRA_FILE_LIST))
+
+  # Do not include these libz objects in the static libjli library.
+  # When statically linking the java launcher with all JDK and VM
+  # static libraries, we use the --whole-archive linker option.
+  # The duplicate objects in different static libraries cause linking
+  # errors due to duplicate symbols.
+  LIBJLI_STATIC_EXCLUDE_OBJS := $(subst .c,$(OBJ_SUFFIX),$(LIBJLI_EXTRA_FILE_LIST))
 endif

 $(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \
@@ -180,6 +184,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \
    LIBS_aix := $(LIBDL),\
    LIBS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \
    LIBS_windows := advapi32.lib comctl32.lib user32.lib, \
+    STATIC_LIB_EXCLUDE_OBJS := $(LIBJLI_STATIC_EXCLUDE_OBJS), \
 ))

 TARGETS += $(BUILD_LIBJLI)
@@ -198,6 +203,7 @@ ifeq ($(call isTargetOs, aix), true)
      OPTIMIZATION := HIGH, \
      CFLAGS := $(STATIC_LIBRARY_FLAGS) $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS) \
          $(addprefix -I, $(LIBJLI_SRC_DIRS)), \
+      DISABLED_WARNINGS_clang_aix := format-nonliteral deprecated-non-prototype, \
      ARFLAGS := $(ARFLAGS), \
      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjli_static))

--- a/make/modules/java.desktop/Java.gmk
+++ b/make/modules/java.desktop/Java.gmk
@@ -68,6 +68,7 @@ EXCLUDE_FILES += \
 ifeq ($(call isTargetOs, macosx), true)
  # exclude all X11 on Mac.
  EXCLUDES += \
+      sun/awt/screencast \
      sun/awt/X11 \
      sun/java2d/x11 \
      sun/java2d/jules \
@@ -140,8 +141,7 @@ endif
 # pick them up since they aren't generated when the source dirs are
 # searched and they aren't referenced by any other classes so they won't
 # be picked up by implicit compilation. On a rebuild, they are picked up
-# and compiled. Exclude them here to produce the same rt.jar as the old
-# build does when building just once.
+# and compiled.
 EXCLUDE_FILES += \
    javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
    javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
--- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk
+++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
@@ -132,6 +132,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
    EXCLUDE_FILES := $(LIBAWT_EXFILES), \
    OPTIMIZATION := HIGHEST, \
    CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
+    CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
    EXTRA_HEADER_DIRS := $(LIBAWT_EXTRA_HEADER_DIRS), \
    DISABLED_WARNINGS_gcc_awt_LoadLibrary.c := unused-result, \
    DISABLED_WARNINGS_gcc_debug_mem.c := format-nonliteral, \
@@ -191,6 +192,9 @@ ifeq ($(call isTargetOs, windows macosx), false)

    LIBAWT_XAWT_EXCLUDES := medialib debug

+    LIBPIPEWIRE_HEADER_DIRS := \
+        $(TOPDIR)/src/$(MODULE)/unix/native/libpipewire/include
+
    LIBAWT_XAWT_EXTRA_HEADER_DIRS := \
        $(LIBAWT_DEFAULT_HEADER_DIRS) \
        libawt_xawt/awt \
@@ -200,7 +204,7 @@ ifeq ($(call isTargetOs, windows macosx), false)
        common/font \
        common/java2d/opengl \
        common/java2d/x11 \
-        #
+        $(LIBPIPEWIRE_HEADER_DIRS)

    LIBAWT_XAWT_CFLAGS += -DXAWT -DXAWT_HACK \
        $(FONTCONFIG_CFLAGS) \
@@ -218,6 +222,14 @@ ifeq ($(call isTargetOs, windows macosx), false)
      LIBAWT_XAWT_LIBS += -lpthread
    endif

+    # These are the object files provided by the awt native
+    # library. Do not include these external (non-awt_xawt library)
+    # objects in the static library. When statically linking the java
+    # launcher with all JDK and VM static libraries, we use the
+    # --whole-archive linker option. The duplicate objects in different
+    # static libraries cause linking errors due to duplicate symbols.
+    LIBAWT_XAWT_STATIC_EXCLUDE_OBJS := systemScale.o
+
    $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \
        NAME := awt_xawt, \
        EXTRA_SRC := $(LIBAWT_XAWT_EXTRA_SRC), \
@@ -234,16 +246,34 @@ ifeq ($(call isTargetOs, windows macosx), false)
        DISABLED_WARNINGS_gcc_gtk3_interface.c := parentheses type-limits unused-function, \
        DISABLED_WARNINGS_gcc_OGLBufImgOps.c := format-nonliteral, \
        DISABLED_WARNINGS_gcc_OGLPaints.c := format-nonliteral, \
+        DISABLED_WARNINGS_gcc_screencast_pipewire.c := undef, \
+        DISABLED_WARNINGS_gcc_screencast_portal.c := undef, \
        DISABLED_WARNINGS_gcc_sun_awt_X11_GtkFileDialogPeer.c := parentheses, \
        DISABLED_WARNINGS_gcc_X11SurfaceData.c := implicit-fallthrough pointer-to-int-cast, \
        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_clang_awt_Taskbar.c := parentheses, \
+        DISABLED_WARNINGS_clang_gtk2_interface.c := parentheses, \
+        DISABLED_WARNINGS_clang_gtk3_interface.c := parentheses, \
+        DISABLED_WARNINGS_clang_OGLBufImgOps.c := format-nonliteral, \
+        DISABLED_WARNINGS_clang_OGLPaints.c := format-nonliteral, \
+        DISABLED_WARNINGS_clang_screencast_pipewire.c := format-nonliteral, \
+        DISABLED_WARNINGS_clang_sun_awt_X11_GtkFileDialogPeer.c := parentheses, \
+        DISABLED_WARNINGS_clang_aix := deprecated-non-prototype, \
+        DISABLED_WARNINGS_clang_aix_awt_Taskbar.c := parentheses, \
+        DISABLED_WARNINGS_clang_aix_OGLPaints.c := format-nonliteral, \
+        DISABLED_WARNINGS_clang_aix_OGLBufImgOps.c := format-nonliteral, \
+        DISABLED_WARNINGS_clang_aix_gtk2_interface.c := parentheses logical-op-parentheses, \
+        DISABLED_WARNINGS_clang_aix_gtk3_interface.c := parentheses logical-op-parentheses, \
+        DISABLED_WARNINGS_clang_aix_sun_awt_X11_GtkFileDialogPeer.c := parentheses, \
+        DISABLED_WARNINGS_clang_aix_awt_InputMethod.c := sign-compare, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
            $(call SET_SHARED_LIBRARY_ORIGIN) \
            -L$(INSTALL_LIBRARIES_HERE), \
        LIBS :=  $(X_LIBS) $(LIBAWT_XAWT_LIBS), \
+        STATIC_LIB_EXCLUDE_OBJS := $(LIBAWT_XAWT_STATIC_EXCLUDE_OBJS), \
    ))

    $(BUILD_LIBAWT_XAWT): $(call FindLib, java.base, java)
@@ -367,6 +397,14 @@ ifeq ($(call isTargetOs, windows macosx), false)
  LIBAWT_HEADLESS_CFLAGS := $(CUPS_CFLAGS) $(FONTCONFIG_CFLAGS) $(X_CFLAGS) \
      -DHEADLESS=true

+  # These are the object files provided by the awt native
+  # library. Do not include these external (non-awt_headless library)
+  # objects in the static library. When statically linking the java
+  # launcher with all JDK and VM static libraries, we use the
+  # --whole-archive linker option. The duplicate objects in different
+  # static libraries cause linking errors due to duplicate symbols.
+  LIBAWT_HEADLESS_STATIC_EXCLUDE_OBJS := systemScale.o
+
  $(eval $(call SetupJdkLibrary, BUILD_LIBAWT_HEADLESS, \
      NAME := awt_headless, \
      EXTRA_SRC := $(LIBAWT_HEADLESS_EXTRA_SRC), \
@@ -382,6 +420,7 @@ ifeq ($(call isTargetOs, windows macosx), false)
      LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
      LIBS_unix := -lawt -ljvm -ljava, \
      LIBS_linux := $(LIBM) $(LIBDL), \
+      STATIC_LIB_EXCLUDE_OBJS := $(LIBAWT_HEADLESS_STATIC_EXCLUDE_OBJS), \
  ))

  $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
@@ -410,6 +449,7 @@ else
    LIBFREETYPE_LIBS := -lfreetype
  endif

+  # gcc_ftobjs.c := maybe-uninitialized required for GCC 7 builds.
  $(eval $(call SetupJdkLibrary, BUILD_LIBFREETYPE, \
      NAME := freetype, \
      OPTIMIZATION := HIGHEST, \
@@ -418,6 +458,7 @@ else
      EXTRA_HEADER_DIRS := $(BUILD_LIBFREETYPE_HEADER_DIRS), \
      DISABLED_WARNINGS_microsoft := 4267 4244 4996, \
      DISABLED_WARNINGS_gcc := dangling-pointer stringop-overflow, \
+      DISABLED_WARNINGS_gcc_ftobjs.c := maybe-uninitialized, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
  ))
@@ -446,16 +487,19 @@ else
   # Early re-canonizing has to be disabled to workaround an internal XlC compiler error
   # when building libharfbuzz
   ifeq ($(call isTargetOs, aix), true)
+    ifneq ($(TOOLCHAIN_TYPE), clang)
     HARFBUZZ_CFLAGS += -qdebug=necan
+    endif
   endif

   # hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later.
   LIBFONTMANAGER_EXCLUDE_FILES += libharfbuzz/hb-ft.cc

   HARFBUZZ_DISABLED_WARNINGS_gcc := missing-field-initializers strict-aliasing \
-       unused-result
+       unused-result array-bounds parentheses
   # noexcept-type required for GCC 7 builds. Not required for GCC 8+.
-   HARFBUZZ_DISABLED_WARNINGS_CXX_gcc := class-memaccess noexcept-type
+   # expansion-to-defined required for GCC 9 builds. Not required for GCC 10+.
+   HARFBUZZ_DISABLED_WARNINGS_CXX_gcc := class-memaccess noexcept-type expansion-to-defined dangling-reference
   HARFBUZZ_DISABLED_WARNINGS_clang := missing-field-initializers range-loop-analysis
   HARFBUZZ_DISABLED_WARNINGS_microsoft := 4267 4244

@@ -570,7 +614,9 @@ ifeq ($(call isTargetOs, windows), true)
  $(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \
      NAME := jawt, \
      OPTIMIZATION := LOW, \
-      CFLAGS := $(CXXFLAGS_JDKLIB) \
+      CFLAGS := $(CFLAGS_JDKLIB) \
+          $(LIBJAWT_CFLAGS), \
+      CXXFLAGS := $(CXXFLAGS_JDKLIB) \
          $(LIBJAWT_CFLAGS), \
      EXTRA_HEADER_DIRS := $(LIBJAWT_EXTRA_HEADER_DIRS), \
      LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
@@ -692,6 +738,20 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
    endif
  endif

+  # The external libpng submitted in the jdk is a reduced version
+  # which does not contain .png_init_filter_functions_vsx.
+  # Therefore we need to disable PNG_POWERPC_VSX_OPT explicitly by setting
+  # it to 0. If this define is not set, it would be automatically set to 2,
+  # because
+  #   "#if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)"
+  # expands to true. This would results in the fact that
+  # .png_init_filter_functions_vsx is needed in libpng.
+  ifeq ($(call isTargetOs, aix), true)
+    ifeq ($(TOOLCHAIN_TYPE), clang)
+      LIBSPLASHSCREEN_CFLAGS += -DPNG_POWERPC_VSX_OPT=0
+    endif
+  endif
+
  ifeq ($(call isTargetOs, macosx), true)
    LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX

@@ -739,6 +799,8 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
      OPTIMIZATION := LOW, \
      CFLAGS := $(CFLAGS_JDKLIB) $(LIBSPLASHSCREEN_CFLAGS) \
          $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
+      CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBSPLASHSCREEN_CFLAGS) \
+          $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
      EXTRA_HEADER_DIRS := $(LIBSPLASHSCREEN_HEADER_DIRS), \
      DISABLED_WARNINGS_gcc_dgif_lib.c := sign-compare, \
      DISABLED_WARNINGS_gcc_jcmaster.c := implicit-fallthrough, \
--- a/make/modules/java.security.jgss/Lib.gmk
+++ b/make/modules/java.security.jgss/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,8 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJ2GSS, \
    OPTIMIZATION := LOW, \
    CFLAGS := $(CFLAGS_JDKLIB), \
    DISABLED_WARNINGS_gcc := undef, \
+    DISABLED_WARNINGS_clang_aix := undef, \
+    DISABLED_WARNINGS_clang := undef, \
    LDFLAGS := $(LDFLAGS_JDKLIB) \
        $(call SET_SHARED_LIBRARY_ORIGIN), \
    LIBS := $(LIBDL), \
@@ -43,8 +45,9 @@ ifeq ($(call isTargetOs, windows), true)
  $(eval $(call SetupJdkLibrary, BUILD_LIBSSPI_BRIDGE, \
      NAME := sspi_bridge, \
      OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) \
-          -I$(TOPDIR)/src/java.security.jgss/share/native/libj2gss, \
+      EXTRA_HEADER_DIRS := libj2gss, \
+      CFLAGS := $(CFLAGS_JDKLIB), \
+      CXXFLAGS := $(CXXFLAGS_JDKLIB), \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS := Secur32.lib, \
--- a/make/modules/java.xml/Copy.gmk
+++ b/make/modules/java.xml/Copy.gmk
@@ -0,0 +1,37 @@
+#
+# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+include CopyCommon.gmk
+
+################################################################################
+
+XML_LIB_SRC := $(TOPDIR)/src/java.xml/share/conf
+
+$(CONF_DST_DIR)/jaxp.properties: $(XML_LIB_SRC)/jaxp.properties
+	$(call install-file)
+
+TARGETS := $(CONF_DST_DIR)/jaxp.properties
+
+################################################################################
--- a/make/modules/jdk.accessibility/Launcher.gmk
+++ b/make/modules/jdk.accessibility/Launcher.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,9 @@ ifeq ($(call isTargetOs, windows), true)
      CFLAGS := $(filter-out -Zc:wchar_t-, $(CFLAGS_JDKEXE)) -Zc:wchar_t \
          -analyze- -Od -Gd -D_WINDOWS \
          -D_UNICODE -DUNICODE -RTC1 -EHsc, \
+      CXXFLAGS := $(filter-out -Zc:wchar_t-, $(CXXFLAGS_JDKEXE)) -Zc:wchar_t \
+          -analyze- -Od -Gd -D_WINDOWS \
+          -D_UNICODE -DUNICODE -RTC1 -EHsc, \
      DISABLED_WARNINGS_microsoft_jabswitch.cpp := 4267 4996, \
      LDFLAGS := $(LDFLAGS_JDKEXE), \
      LIBS := advapi32.lib version.lib user32.lib, \
@@ -65,6 +68,7 @@ ifeq ($(call isTargetOs, windows), true)
      SRC := $(ACCESSIBILITY_SRCDIR)/jaccessinspector $(ACCESSIBILITY_SRCDIR)/common \
          $(ACCESSIBILITY_SRCDIR)/toolscommon $(ACCESSIBILITY_SRCDIR)/bridge, \
      CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
+      CXXFLAGS := $$(CXXFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
      LDFLAGS := $$(LDFLAGS_JDKEXE) -stack:655360, \
      LIBS := advapi32.lib user32.lib, \
      VERSIONINFO_RESOURCE := $(ACCESSIBILITY_SRCDIR)/jaccessinspector/jaccessinspectorWindow.rc, \
@@ -86,6 +90,7 @@ ifeq ($(call isTargetOs, windows), true)
      SRC := $(ACCESSIBILITY_SRCDIR)/jaccesswalker $(ACCESSIBILITY_SRCDIR)/common \
          $(ACCESSIBILITY_SRCDIR)/toolscommon $(ACCESSIBILITY_SRCDIR)/bridge, \
      CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
+      CXXFLAGS := $$(CXXFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \
      LDFLAGS := $$(LDFLAGS_JDKEXE) -stack:655360, \
      LIBS := advapi32.lib comctl32.lib gdi32.lib user32.lib, \
      VERSIONINFO_RESOURCE := $(ACCESSIBILITY_SRCDIR)/jaccesswalker/jaccesswalkerWindow.rc, \
--- a/make/modules/jdk.accessibility/Lib.gmk
+++ b/make/modules/jdk.accessibility/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,8 @@ ifeq ($(call isTargetOs, windows), true)
        DISABLED_WARNINGS_microsoft := 4311 4302 4312, \
        CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \
            -DACCESSBRIDGE_ARCH_$2, \
+        CXXFLAGS := $(filter-out -MD, $(CXXFLAGS_JDKLIB)) -MT \
+            -DACCESSBRIDGE_ARCH_$2, \
        EXTRA_HEADER_DIRS := \
            include/bridge \
            java.desktop:include, \
@@ -70,6 +72,8 @@ ifeq ($(call isTargetOs, windows), true)
        DISABLED_WARNINGS_microsoft_WinAccessBridge.cpp := 4302 4311, \
        CFLAGS := $(CFLAGS_JDKLIB) \
            -DACCESSBRIDGE_ARCH_$2, \
+        CXXFLAGS := $(CXXFLAGS_JDKLIB) \
+            -DACCESSBRIDGE_ARCH_$2, \
        EXTRA_HEADER_DIRS := \
            include/bridge, \
        LDFLAGS := $(LDFLAGS_JDKLIB) \
--- a/make/modules/jdk.compiler/Gendata.gmk
+++ b/make/modules/jdk.compiler/Gendata.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -45,6 +45,7 @@ CT_DATA_DESCRIPTION += $(MODULE_SRC)/share/data/symbols/symbols

 COMPILECREATESYMBOLS_ADD_EXPORTS := \
    --add-exports java.base/jdk.internal.javac=java.compiler.interim,jdk.compiler.interim \
+    --add-exports jdk.internal.opt/jdk.internal.opt=jdk.compiler.interim,jdk.javadoc.interim \
    --add-exports jdk.compiler.interim/com.sun.tools.javac.api=ALL-UNNAMED \
    --add-exports jdk.compiler.interim/com.sun.tools.javac.code=ALL-UNNAMED \
    --add-exports jdk.compiler.interim/com.sun.tools.javac.util=ALL-UNNAMED \
--- a/make/modules/jdk.crypto.mscapi/Lib.gmk
+++ b/make/modules/jdk.crypto.mscapi/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ ifeq ($(call isTargetOs, windows), true)
      NAME := sunmscapi, \
      OPTIMIZATION := LOW, \
      CFLAGS := $(CFLAGS_JDKLIB), \
+      CXXFLAGS := $(CXXFLAGS_JDKLIB), \
      LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS := crypt32.lib advapi32.lib ncrypt.lib, \
--- a/make/modules/jdk.hotspot.agent/Lib.gmk
+++ b/make/modules/jdk.hotspot.agent/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
    OPTIMIZATION := HIGH, \
    DISABLED_WARNINGS_gcc := sign-compare, \
    DISABLED_WARNINGS_gcc_ps_core.c := pointer-arith, \
+    DISABLED_WARNINGS_clang_ps_core.c := pointer-arith, \
    DISABLED_WARNINGS_clang := sign-compare, \
    DISABLED_WARNINGS_clang_libproc_impl.c := format-nonliteral, \
    DISABLED_WARNINGS_clang_sadis.c := format-nonliteral, \
--- a/make/modules/jdk.internal.le/Lib.gmk
+++ b/make/modules/jdk.internal.le/Lib.gmk
@@ -27,14 +27,16 @@ include LibCommon.gmk

 ################################################################################

-ifeq ($(call isTargetOs, windows), true)
+ifeq ($(call isTargetOs, linux macosx windows), true)

  $(eval $(call SetupJdkLibrary, BUILD_LIBLE, \
      NAME := le, \
+      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
      OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB), \
+      CFLAGS := $(CXXFLAGS_JDKLIB), \
      LDFLAGS := $(LDFLAGS_JDKLIB), \
-      LIBS := $(JDKLIB_LIBS) user32.lib, \
+      LIBS_unix := $(JDKLIB_LIBS) $(LIBCXX), \
+      LIBS_windows := $(JDKLIB_LIBS) user32.lib, \
  ))

  TARGETS += $(BUILD_LIBLE)
--- a/make/modules/jdk.jartool/Java.gmk
+++ b/make/modules/jdk.jartool/Java.gmk
@@ -25,5 +25,3 @@

 DISABLED_WARNINGS_java += missing-explicit-ctor
 JAVAC_FLAGS += -XDstringConcat=inline
-JAVAC_FLAGS += --enable-preview
-DISABLED_WARNINGS_java += preview
--- a/make/modules/jdk.javadoc/Gendata.gmk
+++ b/make/modules/jdk.javadoc/Gendata.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -43,6 +43,7 @@ CT_DATA_DESCRIPTION += $(TOPDIR)/src/jdk.compiler/share/data/symbols/symbols

 COMPILECREATESYMBOLS_ADD_EXPORTS := \
    --add-exports java.base/jdk.internal=java.compiler.interim,jdk.compiler.interim \
+    --add-exports jdk.internal.opt/jdk.internal.opt=jdk.compiler.interim,jdk.javadoc.interim \
    --add-exports jdk.compiler.interim/com.sun.tools.javac.api=ALL-UNNAMED \
    --add-exports jdk.compiler.interim/com.sun.tools.javac.code=ALL-UNNAMED \
    --add-exports jdk.compiler.interim/com.sun.tools.javac.util=ALL-UNNAMED \
--- a/make/modules/jdk.jdwp.agent/Lib.gmk
+++ b/make/modules/jdk.jdwp.agent/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ include LibCommon.gmk
 $(eval $(call SetupJdkLibrary, BUILD_LIBDT_SOCKET, \
    NAME := dt_socket, \
    OPTIMIZATION := LOW, \
+    DISABLED_WARNINGS_clang_aix := missing-braces, \
    CFLAGS := $(CFLAGS_JDKLIB) $(LIBDT_SOCKET_CPPFLAGS), \
    EXTRA_HEADER_DIRS := \
        include \
--- a/make/modules/jdk.jfr/Java.gmk
+++ b/make/modules/jdk.jfr/Java.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 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
@@ -24,5 +24,5 @@
 #

 DISABLED_WARNINGS_java += exports
-COPY := .xsd .xml .dtd
+COPY := .xsd .xml .dtd .ini
 JAVAC_FLAGS := -XDstringConcat=inline
--- a/make/modules/jdk.jpackage/Lib.gmk
+++ b/make/modules/jdk.jpackage/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 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
@@ -65,6 +65,8 @@ $(eval $(call SetupJdkExecutable, BUILD_JPACKAGE_APPLAUNCHEREXE, \
    INCLUDE_FILES := $(JPACKAGE_APPLAUNCHER_INCLUDE_FILES), \
    TOOLCHAIN := $(JPACKAGE_APPLAUNCHER_TOOLCHAIN), \
    OPTIMIZATION := LOW, \
+    DISABLED_WARNINGS_clang_LinuxPackage.c := format-nonliteral, \
+    DISABLED_WARNINGS_clang_JvmLauncherLib.c := format-nonliteral, \
    CXXFLAGS := $(call JpackageWithStaticCrt, $(CXXFLAGS_JDKEXE)) \
        $(JPACKAGE_APPLAUNCHER_INCLUDES), \
    CFLAGS := $(call JpackageWithStaticCrt, $(CFLAGS_JDKEXE)) \
@@ -103,6 +105,8 @@ ifeq ($(call isTargetOs, linux), true)
      EXCLUDE_FILES := LinuxLauncher.c LinuxPackage.c, \
      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
      OPTIMIZATION := LOW, \
+      DISABLED_WARNINGS_clang_JvmLauncherLib.c := format-nonliteral, \
+      DISABLED_WARNINGS_clang_tstrings.cpp := format-nonliteral, \
      CXXFLAGS := $(CXXFLAGS_JDKLIB) $(JPACKAGE_LIBAPPLAUNCHER_INCLUDES), \
      CFLAGS := $(CFLAGS_JDKLIB) $(JPACKAGE_LIBAPPLAUNCHER_INCLUDES), \
      LDFLAGS := $(LDFLAGS_JDKLIB), \
--- a/make/modules/jdk.management/Lib.gmk
+++ b/make/modules/jdk.management/Lib.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -44,6 +44,7 @@ endif
 $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT_EXT, \
    NAME := management_ext, \
    OPTIMIZATION := $(LIBMANAGEMENT_EXT_OPTIMIZATION), \
+    DISABLED_WARNINGS_clang_UnixOperatingSystem.c := format-nonliteral, \
    CFLAGS := $(CFLAGS_JDKLIB) $(LIBMANAGEMENT_EXT_CFLAGS), \
    LDFLAGS := $(LDFLAGS_JDKLIB) \
        $(call SET_SHARED_LIBRARY_ORIGIN), \
--- a/make/test/BuildJtregTestThreadFactory.gmk
+++ b/make/test/BuildJtregTestThreadFactory.gmk
@@ -0,0 +1,65 @@
+#
+# 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: build
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+
+TARGETS :=
+
+################################################################################
+
+TTF_BASEDIR := $(TOPDIR)/test/jtreg_test_thread_factory
+TTF_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/jtreg_test_thread_factory
+TTF_JAR := $(TTF_SUPPORT)/jtregTestThreadFactory.jar
+
+$(eval $(call SetupJavaCompilation, BUILD_JTREG_TEST_THREAD_FACTORY, \
+    TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
+    SRC := $(TTF_BASEDIR)/src/share/classes, \
+    BIN := $(TTF_SUPPORT)/classes, \
+    JAR := $(TTF_JAR), \
+))
+
+TARGETS += $(BUILD_JTREG_TEST_THREAD_FACTORY)
+
+################################################################################
+# Targets for building test-image.
+################################################################################
+
+# Copy to hotspot jtreg test image
+$(eval $(call SetupCopyFiles, COPY_TTF, \
+    SRC := $(TTF_SUPPORT), \
+    DEST := $(TEST_IMAGE_DIR)/jtreg_test_thread_factory, \
+    FILES := $(TTF_JAR), \
+))
+
+IMAGES_TARGETS += $(COPY_TTF)
+
+build: $(TARGETS)
+images: $(IMAGES_TARGETS)
+
+.PHONY: all images
--- a/make/test/BuildMicrobenchmark.gmk
+++ b/make/test/BuildMicrobenchmark.gmk
@@ -100,7 +100,6 @@ $(eval $(call SetupJavaCompilation, BUILD_JDK_MICROBENCHMARK, \
        --add-exports java.base/jdk.internal.classfile.attribute=ALL-UNNAMED \
        --add-exports java.base/jdk.internal.classfile.constantpool=ALL-UNNAMED \
        --add-exports java.base/jdk.internal.classfile.instruction=ALL-UNNAMED \
-        --add-exports java.base/jdk.internal.classfile.java.lang.constant=ALL-UNNAMED \
        --add-exports java.base/jdk.internal.classfile.components=ALL-UNNAMED \
        --add-exports java.base/jdk.internal.classfile.impl=ALL-UNNAMED \
        --add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \
--- a/make/test/BuildTestLib.gmk
+++ b/make/test/BuildTestLib.gmk
@@ -36,7 +36,7 @@ TEST_LIB_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/lib

 $(eval $(call SetupJavaCompilation, BUILD_WB_JAR, \
    TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
-    SRC := $(TEST_LIB_SOURCE_DIR)/jdk/test/whitebox/parser, \
+    SRC := $(TEST_LIB_SOURCE_DIR)/jdk/test/whitebox/, \
    BIN := $(TEST_LIB_SUPPORT)/wb_classes, \
    JAR := $(TEST_LIB_SUPPORT)/wb.jar, \
    DISABLED_WARNINGS := deprecation removal preview, \
@@ -53,7 +53,12 @@ $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
    HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \
    JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
    DISABLED_WARNINGS := try deprecation rawtypes unchecked serial cast removal preview, \
-    JAVAC_FLAGS := --enable-preview, \
+    JAVAC_FLAGS := --add-exports java.base/sun.security.util=ALL-UNNAMED \
+        --add-exports java.base/jdk.internal.classfile=ALL-UNNAMED \
+        --add-exports java.base/jdk.internal.classfile.attribute=ALL-UNNAMED \
+        --add-exports java.base/jdk.internal.classfile.constantpool=ALL-UNNAMED \
+        --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
+        --enable-preview, \
 ))

 TARGETS += $(BUILD_TEST_LIB_JAR)
--- a/make/test/JtregNativeHotspot.gmk
+++ b/make/test/JtregNativeHotspot.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -94,16 +94,6 @@ MLVM_STRESS_INCLUDES := \
    -I$(VM_TESTBASE_DIR)/nsk/share/native \
    -I$(VM_TESTBASE_DIR)/nsk/share/jni

-NSK_GC_LOCK_JVMTI_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/share/gc/lock/jvmti \
-    -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni
-
-NSK_GC_LOCK_MALLOC_INCLUDES := \
-    -I$(VM_TESTBASE_DIR)/nsk/share/gc/lock/malloc \
-    -I$(VM_TESTBASE_DIR)/nsk/share/native \
-    -I$(VM_TESTBASE_DIR)/nsk/share/jni
-
 NSK_GC_LOCK_JNI_INCLUDES := \
    -I$(VM_TESTBASE_DIR)/nsk/share/gc/lock/jni \
    -I$(VM_TESTBASE_DIR)/nsk/share/native \
@@ -177,10 +167,6 @@ BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libIndyRedefineClass := $(MLVM_JVMTI_INCLUD

 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libnativeAndMH := $(MLVM_STRESS_INCLUDES)

-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libJVMTIAllocLocker := $(NSK_GC_LOCK_JVMTI_INCLUDES)
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libMallocLocker := $(NSK_GC_LOCK_MALLOC_INCLUDES)
-
 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libBooleanArrayCriticalLocker := $(NSK_GC_LOCK_JNI_INCLUDES)
 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libByteArrayCriticalLocker := $(NSK_GC_LOCK_JNI_INCLUDES)
 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libCharArrayCriticalLocker := $(NSK_GC_LOCK_JNI_INCLUDES)
@@ -874,8 +860,10 @@ BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exesigtest := -ljvm

 ifeq ($(call isTargetOs, windows), true)
  BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
-  BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c libTestJNI.c libCompleteExit.c libTestPsig.c libnativeStack.c
+  BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c libTestJNI.c libCompleteExit.c libTestPsig.c exeGetCreatedJavaVMs.c
  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libatExit := jvm.lib
+  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativeStack := jvm.lib
+  BUILD_HOTSPOT_JTREG_LIBRARIES_COPY_DEBUG_SYMBOLS_libnativeStack := true
  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exedaemonDestroy := jvm.lib
 else
  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exedaemonDestroy := -ljvm
@@ -1516,6 +1504,7 @@ else
  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libatExit += -ljvm
  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libCompleteExit += -lpthread
  BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libnativeStack += -lpthread
+  BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeGetCreatedJavaVMs := -ljvm -lpthread
 endif

 ifeq ($(ASAN_ENABLED), true)
--- a/src/demo/share/jfc/Metalworks/BigContrastMetalTheme.java
+++ b/src/demo/share/jfc/Metalworks/BigContrastMetalTheme.java
@@ -125,7 +125,7 @@ public class BigContrastMetalTheme extends ContrastMetalTheme {
        table.put("TextField.border", textBorder);
        table.put("PasswordField.border", textBorder);
        table.put("TextArea.border", textBorder);
-        table.put("TextPane.font", textBorder);
+        table.put("TextPane.font", controlFont);

        table.put("ScrollPane.border", blackLineBorder);

--- a/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties
+++ b/src/demo/share/nbproject/jfc/FileChooserDemo/build.properties
@@ -1,6 +1,6 @@
 main.dir=${basedir}/../../../jfc/FileChooserDemo

-src.dir=${main.dir}/src
+src.dir=${main.dir}/

 build.dir=build
 classes.dir=${build.dir}/classes
--- a/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml
+++ b/src/demo/share/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--
- Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2023, Oracle and/or its affiliates. All rights reserved.

 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -41,10 +41,7 @@
        </nbjpdastart>
        <java classname="${main.class}" failonerror="true" fork="true">
            <classpath path="${run.cp}"/>
-            <jvmarg value="-Xdebug"/>
-            <jvmarg value="-Xnoagent"/>
-            <jvmarg value="-Djava.compiler=none"/>
-            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+            <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,suspend=n,address=${jpda.address}"/>
        </java>
    </target>
    
--- a/Show More
+++ b/Show More