update exclude list on results of 25.72.1 test runs

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

.github/README.md

@@ -5,35 +5,27 @@
 JetBrains Runtime is a fork of [OpenJDK](https://github.com/openjdk/jdk) available for Windows, Mac OS X, and Linux.
 It supports enhanced class redefinition ([DCEVM](https://ssw.jku.at/dcevm/)),
 features optional [JCEF](https://github.com/JetBrains/jcef), a framework for embedding Chromium-based browsers,
-includes a number of improvements in font rendering, keyboards support,
+includes a number of improvements in font rendering, keyboards support, 
 windowing/focus subsystems, HiDPI, accessibility, and performance, provides better desktop integration
 and bugfixes not yet present in OpenJDK.
 
-> **_NOTE_**: This is a **development** branch that is periodically synchronized with
+> **_NOTE_**: This is a **development** branch that is periodically synchronized with 
 > the [OpenJDK master](https://github.com/openjdk/jdk/tree/master) branch.
->
+> 
  Release builds are based on these branches:
- * [jbr25](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr25) (JDK 25)
- * [jbr21](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr21) (JDK 21)
- * [jbr17](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr17) (JDK 17)
  * [jbr11](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr11) (JDK 11)
- 
+ * [jbr17](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr17) (JDK 17)
+ * [jbr21](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr21) (JDK 21)
+
 Download the latest releases of JetBrains Runtime to use with JetBrains IDEs. The full list
 can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntime/releases).
 
-## Releases based on JDK 25
-
-| IDE Version | Latest JBR                                                                                              | Date Released |
-|-------------|---------------------------------------------------------------------------------------------------------|---------------|
-| 2025.3      | [25-b176.4](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-25b176.4)            | 23-Oct-2025   |
-
 ## Releases based on JDK 21
 
 | IDE Version | Latest JBR                                                                                              | Date Released |
 |-------------|---------------------------------------------------------------------------------------------------------|---------------|
-| 2025.3      | [21.0.8-b1163.69](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.8b1163.69)| 27-Oct-2025   |
-| 2025.2      | [21.0.9-b1038.75](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.9b1038.75)| 02-Nov-2025   |
-| 2025.1      | [21.0.9-b895.147](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.9b895.147)| 02-Nov-2025   |
+| 2025.2      | [21.0.7-b1038.54](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b1038.54)| 17-Jun-2025   |
+| 2025.1      | [21.0.7-b895.130](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b895.130)| 15-May-2025   |
 | 2024.3      | [21.0.6-b631.52](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b631.52)  | 15-May-2025   |
 | 2024.2      | [21.0.4-b509.40](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.7b509.40)  | 15-May-2025   |
 | 2024.1      | [21.0.2-b346.3](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr-release-21.0.2b346.3)    | 30-Jan-2024   |
@@ -93,7 +85,7 @@ There are many kinds of JBR bundles available on the [Releases page](https://git
 
 ## Why Use JetBrains Runtime?
 * **Embedded browser**: JetBrains Runtime includes the Java Chromium Embedded Framework ([JCEF](https://github.com/JetBrains/jcef)), which
-  enables you to embed a Chromium-based browsers in your JVM-based application.
+  enables you to embed a Chromium-based browsers in your JVM-based application. 
  To use it, [download a build with JCEF](https://github.com/JetBrains/JetBrainsRuntime/releases).
 * **Enhanced class re-definition** with the [DCEVM](https://ssw.jku.at/dcevm/) technology that makes it easier to reload
   changed code without restarting JVM; this feature needs to be explicitly enabled with `-XX:+AllowEnhancedClassRedefinition`.
@@ -135,11 +127,11 @@ git clone git@github.com:JetBrains/JetBrainsRuntime.git
 ```
 
 ## Configuring the Build Environment
-Here are quick per-platform instructions for those who can't wait to get started.
+Here are quick per-platform instructions for those who can't wait to get started. 
 Please refer to [OpenJDK build docs](https://openjdk.java.net/groups/build/doc/building.html) for in-depth
 coverage of all the details.
 
-> **_TIP:_**  To get a preliminary report of what's missing, run `./configure` and check its output.
+> **_TIP:_**  To get a preliminary report of what's missing, run `./configure` and check its output. 
 > It would usually have meaningful advice on how to solve the problem.
 
 ### Linux (Docker)
@@ -169,7 +161,7 @@ Install the necessary tools, libraries, and headers with:
 ```
 $ sudo apt-get install autoconf make build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev \
        libxt-dev libxrandr-dev libcups2-dev libfontconfig1-dev libasound2-dev libspeechd-dev libwayland-dev \
-       wayland-protocols libxkbcommon-x11-0 libdbus-1-dev
+       wayland-protocols libxkbcommon-x11-0
 ```
 Get Java 23 (for instance, [Azul Zulu Builds of OpenJDK 23](https://www.azul.com/downloads/?version=java-23&os=linux&package=jdk#zulu)).
 
@@ -186,7 +178,7 @@ This will build the release configuration under `./build/linux-x86_64-server-rel
 <a name="build-windows"></a>
 Install the following:
 * [Cygwin x64](http://www.cygwin.com/).
-  Required packages: `autoconf`, `binutils`, `cpio`, `diffutils`, `file`, `gawk`, `gcc-core`, `make`, `m4`, `unzip`, `zip`.
+  Required packages: `autoconf`, `binutils`, `cpio`, `diffutils`, `file`, `gawk`, `gcc-core`, `make`, `m4`, `unzip`, `zip`.  
   Install those together with Cygwin.
 * [Visual Studio compiler toolset](https://visualstudio.microsoft.com/downloads/).
   Install with the desktop development kit, which includes Windows SDK and compilers.
@@ -194,14 +186,14 @@ Install the following:
 * Java 21 (for instance, [Azul Zulu Builds of OpenJDK 21](https://www.azul.com/downloads/?version=java-21-lts&os=windows&package=jdk#zulu)).
   If you have problems while configuring, read [Java tips on Cygwin](http://horstmann.com/articles/cygwin-tips.html).
 
-From the command line:
+From the command line: 
 ```
 "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
 "c:\Program_Files\cygwin64\bin\mintty.exe" /bin/bash -l
 ```
-The first command sets up environment variables, the second starts a Cygwin shell with the proper environment.
+The first command sets up environment variables, the second starts a Cygwin shell with the proper environment.  
 
-In the Cygwin shell:
+In the Cygwin shell: 
 ```
 $ cd JetBrainsRuntime
 $ git checkout main
@@ -262,7 +254,8 @@ configurations (for example, `release` and `fastdebug`), supply the `--conf <con
 Then open the git root directory as a project in IDEA.
 
 ## Contributing
-Please contribute your changes through [OpenJDK](https://dev.java/contribute/openjdk/).
+We are happy to receive your pull requests! 
+Before you submit one, please sign our [Contributor License Agreement (CLA)](https://www.jetbrains.com/agreements/cla/).
 
 ## Resources
 * [JetBrains Runtime on GitHub](https://github.com/JetBrains/JetBrainsRuntime).

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

@@ -65,4 +65,4 @@ runs:
       with:
         name: bundles-jtreg-${{ steps.version.outputs.value }}
         path: jtreg/installed
-        retention-days: 5
+        retention-days: 1

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

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

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

@@ -91,5 +91,5 @@ runs:
       with:
         name: bundles-${{ inputs.platform }}${{ inputs.debug-suffix }}${{ inputs.static-suffix }}${{ inputs.bundle-suffix }}
         path: bundles
-        retention-days: 5
+        retention-days: 1
       if: steps.bundles.outputs.bundles-found == 'true'

.github/workflows/build-alpine-linux.yml

@@ -51,10 +51,6 @@ on:
       make-arguments:
         required: false
         type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false
 
 jobs:
   build-linux:
@@ -108,11 +104,9 @@ jobs:
           make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
           platform: ${{ inputs.platform }}
           debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}
 
       - name: 'Upload bundles'
         uses: ./.github/actions/upload-bundles
         with:
           platform: ${{ inputs.platform }}
           debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}

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

@@ -40,10 +40,6 @@ on:
       make-arguments:
         required: false
         type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false
 
 jobs:
   build-cross-compile:
@@ -64,33 +60,33 @@ jobs:
             gnu-arch: aarch64
             debian-arch: arm64
             debian-repository: https://httpredir.debian.org/debian/
-            debian-version: trixie
+            debian-version: bullseye
             tolerate-sysroot-errors: false
           - target-cpu: arm
             gnu-arch: arm
             debian-arch: armhf
             debian-repository: https://httpredir.debian.org/debian/
-            debian-version: trixie
+            debian-version: bullseye
             tolerate-sysroot-errors: false
             gnu-abi: eabihf
           - target-cpu: s390x
             gnu-arch: s390x
             debian-arch: s390x
             debian-repository: https://httpredir.debian.org/debian/
-            debian-version: trixie
+            debian-version: bullseye
             tolerate-sysroot-errors: false
           - target-cpu: ppc64le
             gnu-arch: powerpc64le
             debian-arch: ppc64el
             debian-repository: https://httpredir.debian.org/debian/
-            debian-version: trixie
+            debian-version: bullseye
             tolerate-sysroot-errors: false
           - target-cpu: riscv64
             gnu-arch: riscv64
             debian-arch: riscv64
             debian-repository: https://httpredir.debian.org/debian/
-            debian-version: trixie
-            tolerate-sysroot-errors: false
+            debian-version: sid
+            tolerate-sysroot-errors: true
 
     steps:
       - name: 'Checkout the JDK source'
@@ -193,4 +189,4 @@ jobs:
         with:
           make-target: 'hotspot ${{ inputs.make-arguments }}'
           platform: linux-${{ matrix.target-cpu }}
-        if: ((steps.create-sysroot.outcome == 'success' || steps.get-cached-sysroot.outputs.cache-hit == 'true') && inputs.dry-run == false)
+        if: steps.create-sysroot.outcome == 'success' || steps.get-cached-sysroot.outputs.cache-hit == 'true'

.github/workflows/build-linux.yml

@@ -61,10 +61,6 @@ on:
       make-arguments:
         required: false
         type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false
       bundle-suffix:
         required: false
         type: string
@@ -143,7 +139,6 @@ jobs:
           make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
           platform: ${{ inputs.platform }}
           debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
-        if: ${{ inputs.dry-run == false }}
 
       - name: 'Upload bundles'
         uses: ./.github/actions/upload-bundles
@@ -152,4 +147,3 @@ jobs:
           debug-suffix: "${{ matrix.debug-level == 'debug' && '-debug' || '' }}"
           bundle-suffix: ${{ inputs.bundle-suffix }}
           static-suffix: ${{ inputs.static-suffix }}
-        if: ${{ inputs.dry-run == false }}

.github/workflows/build-macos.yml

@@ -54,10 +54,6 @@ on:
       make-arguments:
         required: false
         type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false
 
 jobs:
   build-macos:
@@ -122,11 +118,9 @@ jobs:
           make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
           platform: ${{ inputs.platform }}
           debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}
 
       - name: 'Upload bundles'
         uses: ./.github/actions/upload-bundles
         with:
           platform: ${{ inputs.platform }}
           debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}

.github/workflows/build-windows.yml

@@ -54,10 +54,6 @@ on:
       make-arguments:
         required: false
         type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false
 
 env:
   # These are needed to make the MSYS2 bash work properly
@@ -143,7 +139,6 @@ jobs:
           # Set PATH to "", so just GITHUB_PATH is included
           PATH: ''
         shell: env /usr/bin/bash --login -eo pipefail {0}
-        if: ${{ inputs.dry-run == false }}
 
       - name: 'Build'
         id: build
@@ -152,11 +147,9 @@ jobs:
           make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
           platform: ${{ inputs.platform }}
           debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}
 
       - name: 'Upload bundles'
         uses: ./.github/actions/upload-bundles
         with:
           platform: ${{ inputs.platform }}
           debug-suffix: '${{ matrix.suffix }}'
-        if: ${{ inputs.dry-run == false }}

.github/workflows/main.yml

@@ -28,7 +28,9 @@ name: 'OpenJDK GHA Sanity Checks'
 on:
   push:
     branches-ignore:
+      - master
       - pr/*
+      - jdk*
       - main
   workflow_dispatch:
     inputs:
@@ -42,9 +44,6 @@ on:
       make-arguments:
         description: 'Additional make arguments'
         required: false
-      dry-run:
-        description: 'Dry run: skip actual builds and tests'
-        required: false
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -72,7 +71,6 @@ jobs:
       windows-x64: ${{ steps.include.outputs.windows-x64 }}
       windows-aarch64: ${{ steps.include.outputs.windows-aarch64 }}
       docs: ${{ steps.include.outputs.docs }}
-      dry-run: ${{ steps.include.outputs.dry-run }}
 
     steps:
       - name: 'Checkout the scripts'
@@ -146,35 +144,6 @@ jobs:
             echo 'false'
           }
 
-          function check_dry_run() {
-            if [[ $GITHUB_EVENT_NAME == workflow_dispatch ]]; then
-              # Take the user-specified one.
-              echo '${{ github.event.inputs.dry-run }}'
-              return
-            elif [[ $GITHUB_EVENT_NAME == push ]]; then
-              # Cut out the real branch name
-              BRANCH=${GITHUB_REF##*/}
-
-              # Dry run rebuilds the caches in current branch, so they can be reused
-              # for any child PR branches. Because of this, we want to trigger this
-              # workflow in master branch, so that actual PR branches can use the cache.
-              # This workflow would trigger every time contributors sync their master
-              # branches in their personal forks.
-              if [[ $BRANCH == "master" ]]; then
-                echo 'true'
-                return
-              fi
-
-              # ...same for stabilization branches
-              if [[ $BRANCH =~ "jdk(.*)" ]]; then
-                echo 'true'
-                return
-              fi
-            fi
-
-            echo 'false'
-          }
-
           echo "linux-x64=$(check_platform linux-x64 linux x64)" >> $GITHUB_OUTPUT
           echo "linux-x64-variants=$(check_platform linux-x64-variants variants)" >> $GITHUB_OUTPUT
           echo "linux-cross-compile=$(check_platform linux-cross-compile cross-compile)" >> $GITHUB_OUTPUT
@@ -184,7 +153,6 @@ jobs:
           echo "windows-x64=$(check_platform windows-x64 windows x64)" >> $GITHUB_OUTPUT
           echo "windows-aarch64=$(check_platform windows-aarch64 windows aarch64)" >> $GITHUB_OUTPUT
           echo "docs=$(check_platform docs)" >> $GITHUB_OUTPUT
-          echo "dry-run=$(check_dry_run)" >> $GITHUB_OUTPUT
 
   ###
   ### Build jobs
@@ -199,7 +167,6 @@ jobs:
       gcc-major-version: '10'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.linux-x64 == 'true'
 
   build-linux-x64-hs-nopch:
@@ -214,7 +181,6 @@ jobs:
       extra-conf-options: '--disable-precompiled-headers'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.linux-x64-variants == 'true'
 
   build-linux-x64-hs-zero:
@@ -229,7 +195,6 @@ jobs:
       extra-conf-options: '--with-jvm-variants=zero --disable-precompiled-headers'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.linux-x64-variants == 'true'
 
   build-linux-x64-hs-minimal:
@@ -244,7 +209,6 @@ jobs:
       extra-conf-options: '--with-jvm-variants=minimal --disable-precompiled-headers'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.linux-x64-variants == 'true'
 
   build-linux-x64-hs-optimized:
@@ -260,7 +224,6 @@ jobs:
       extra-conf-options: '--with-debug-level=optimized --disable-precompiled-headers'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.linux-x64-variants == 'true'
 
   build-linux-x64-static:
@@ -276,7 +239,6 @@ jobs:
       gcc-major-version: '10'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
       static-suffix: "-static"
     if: needs.prepare.outputs.linux-x64 == 'true'
 
@@ -293,7 +255,6 @@ jobs:
       gcc-major-version: '10'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
       # Upload static libs bundles separately to avoid interference with normal linux-x64 bundle.
       # This bundle is not used by testing jobs, but downstreams use it to check that
       # dependent projects, e.g. libgraal, builds fine.
@@ -308,7 +269,6 @@ jobs:
       gcc-major-version: '10'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.linux-cross-compile == 'true'
 
   build-alpine-linux-x64:
@@ -319,7 +279,6 @@ jobs:
       platform: alpine-linux-x64
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.alpine-linux-x64 == 'true'
 
   build-macos-x64:
@@ -328,11 +287,10 @@ jobs:
     uses: ./.github/workflows/build-macos.yml
     with:
       platform: macos-x64
-      runs-on: 'macos-15-intel'
-      xcode-toolset-version: '16.4'
+      runs-on: 'macos-13'
+      xcode-toolset-version: '14.3.1'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.macos-x64 == 'true'
 
   build-macos-aarch64:
@@ -341,11 +299,10 @@ jobs:
     uses: ./.github/workflows/build-macos.yml
     with:
       platform: macos-aarch64
-      runs-on: 'macos-15'
-      xcode-toolset-version: '16.4'
+      runs-on: 'macos-14'
+      xcode-toolset-version: '15.4'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.macos-aarch64 == 'true'
 
   build-windows-x64:
@@ -354,11 +311,10 @@ jobs:
     uses: ./.github/workflows/build-windows.yml
     with:
       platform: windows-x64
-      msvc-toolset-version: '14.44'
+      msvc-toolset-version: '14.43'
       msvc-toolset-architecture: 'x86.x64'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.windows-x64 == 'true'
 
   build-windows-aarch64:
@@ -367,13 +323,12 @@ jobs:
     uses: ./.github/workflows/build-windows.yml
     with:
       platform: windows-aarch64
-      msvc-toolset-version: '14.44'
+      msvc-toolset-version: '14.43'
       msvc-toolset-architecture: 'arm64'
       make-target: 'hotspot'
       extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.windows-aarch64 == 'true'
 
   build-docs:
@@ -390,7 +345,6 @@ jobs:
       gcc-major-version: '10'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
     if: needs.prepare.outputs.docs == 'true'
 
   ###
@@ -400,20 +354,17 @@ jobs:
   test-linux-x64:
     name: linux-x64
     needs:
-      - prepare
       - build-linux-x64
     uses: ./.github/workflows/test.yml
     with:
       platform: linux-x64
       bootjdk-platform: linux-x64
       runs-on: ubuntu-22.04
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
       debug-suffix: -debug
 
   test-linux-x64-static:
     name: linux-x64-static
     needs:
-      - prepare
       - build-linux-x64
       - build-linux-x64-static
     uses: ./.github/workflows/test.yml
@@ -421,32 +372,27 @@ jobs:
       platform: linux-x64
       bootjdk-platform: linux-x64
       runs-on: ubuntu-22.04
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
       static-suffix: "-static"
 
   test-macos-aarch64:
     name: macos-aarch64
     needs:
-      - prepare
       - build-macos-aarch64
     uses: ./.github/workflows/test.yml
     with:
       platform: macos-aarch64
       bootjdk-platform: macos-aarch64
-      runs-on: macos-15
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
-      xcode-toolset-version: '16.4'
+      runs-on: macos-14
+      xcode-toolset-version: '15.4'
       debug-suffix: -debug
 
   test-windows-x64:
     name: windows-x64
     needs:
-      - prepare
       - build-windows-x64
     uses: ./.github/workflows/test.yml
     with:
       platform: windows-x64
       bootjdk-platform: windows-x64
       runs-on: windows-2025
-      dry-run: ${{ needs.prepare.outputs.dry-run == 'true' }}
       debug-suffix: -debug

.github/workflows/test.yml

@@ -40,10 +40,6 @@ on:
       xcode-toolset-version:
         required: false
         type: string
-      dry-run:
-        required: false
-        type: boolean
-        default: false
       debug-suffix:
         required: false
         type: string
@@ -151,7 +147,6 @@ jobs:
           platform: ${{ inputs.platform }}
           debug-suffix: ${{ matrix.debug-suffix }}
           static-suffix: ${{ inputs.static-suffix }}
-        if: ${{ inputs.dry-run == false }}
 
       - name: 'Install dependencies'
         run: |
@@ -204,7 +199,6 @@ jobs:
           && bash ./.github/scripts/gen-test-summary.sh "$GITHUB_STEP_SUMMARY" "$GITHUB_OUTPUT"
         env:
           PATH: ${{ steps.path.outputs.value }}
-        if: ${{ inputs.dry-run == false }}
 
         # This is a separate step, since if the markdown from a step gets bigger than
         # 1024 kB it is skipped, but then the short summary above is still generated

.gitignore

@@ -25,5 +25,4 @@ NashornProfile.txt
 **/core.[0-9]*
 *.rej
 *.orig
-test/benchmarks/**/target
 /jbr-api/

.jcheck/conf

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

bin/idea.sh

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

bin/unshuffle_list.txt

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

bin/unshuffle_patch.sh

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

bin/update_pch.sh

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

doc/building.html

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

doc/building.md

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

doc/starting-next-release.html

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

doc/testing.html

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

doc/testing.md

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

jb/project/tools/common/modules.list

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

make/Bundles.gmk

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

make/CompileJavaModules.gmk

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

make/CreateJmods.gmk

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

make/Docs.gmk

@@ -236,8 +236,8 @@ define create_overview_file
       #
   ifneq ($$($1_GROUPS), )
     $1_OVERVIEW_TEXT += \
-      <p>This document has \
-      $$(subst 2,two,$$(subst 3,three,$$(words $$($1_GROUPS)))) major sections:</p> \
+      <p>This document is divided into \
+      $$(subst 2,two,$$(subst 3,three,$$(words $$($1_GROUPS)))) sections:</p> \
       <blockquote><dl> \
       #
     $1_OVERVIEW_TEXT += $$(foreach g, $$($1_GROUPS), \
@@ -246,10 +246,7 @@ define create_overview_file
     )
     $1_OVERVIEW_TEXT += \
         </dl></blockquote> \
-    <p><a href="../specs/index.html">Related documents</a> specify the Java \
-    programming language, the Java Virtual Machine, various protocols and file \
-    formats pertaining to the Java platform, and tools included in the JDK.</p> \
-    #
+        #
   endif
   $1_OVERVIEW_TEXT += \
       </body></html> \
@@ -291,7 +288,8 @@ define SetupApiDocsGenerationBody
   $1_INDIRECT_EXPORTS := $$(call FindTransitiveIndirectDepsForModules, $$($1_MODULES))
   $1_ALL_MODULES := $$(sort $$($1_MODULES) $$($1_INDIRECT_EXPORTS))
 
-  $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION)
+  $1_JAVA_ARGS := -Dextlink.spec.version=$$(VERSION_SPECIFICATION) \
+	-Djspec.version=$$(VERSION_SPECIFICATION)
 
   ifeq ($$(ENABLE_FULL_DOCS), true)
     $1_SEALED_GRAPHS_DIR := $$(SUPPORT_OUTPUTDIR)/docs/$1-sealed-graphs

make/Hsdis.gmk

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

make/Images.gmk

@@ -148,6 +148,7 @@ define CreateCDSArchive
   $1_$2_DUMP_EXTRA_ARG := $$($1_$2_COOPS_OPTION) $$($1_$2_COH_OPTION)
   $1_$2_DUMP_TYPE      := $(if $(findstring _nocoops, $2),-NOCOOPS,)$(if $(findstring _coh, $2),-COH,)
 
+  # Only G1 supports dumping the shared heap, so explicitly use G1 if the JVM supports it.
   $1_$2_CDS_DUMP_FLAGS := $(CDS_DUMP_FLAGS) $(if $(filter g1gc, $(JVM_FEATURES_$1)), -XX:+UseG1GC)
 
   ifeq ($(OPENJDK_TARGET_OS), windows)
@@ -269,7 +270,6 @@ endif
 # Since debug symbols are not included in the jmod files, they need to be copied
 # in manually after generating the images.
 
-# These variables are read by SetupCopyDebuginfo
 ALL_JDK_MODULES := $(JDK_MODULES)
 ALL_JRE_MODULES := $(sort $(JRE_MODULES), $(foreach m, $(JRE_MODULES), \
     $(call FindTransitiveDepsForModule, $m)))

make/JBRApi.gmk

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

make/Main.gmk

@@ -461,9 +461,9 @@ $(eval $(call SetupTarget, symbols-image, \
     TARGET := symbols, \
 ))
 
-$(eval $(call SetupTarget, static-launchers, \
+$(eval $(call SetupTarget, static-launcher, \
     MAKEFILE := StaticLibs, \
-    TARGET := static-launchers, \
+    TARGET := static-launcher, \
     DEPS := hotspot-static-libs static-libs, \
 ))
 
@@ -1014,7 +1014,7 @@ else
   else ifeq ($(EXTERNAL_BUILDJDK), false)
     # When not cross compiling, the BUILD_JDK is the interim jdk image, and
     # the javac launcher is needed.
-    jdk.compiler-gendata: jdk.compiler-launchers java.base-launchers
+    jdk.compiler-gendata: jdk.compiler-launchers
     jdk.javadoc-gendata: jdk.compiler-launchers
   endif
 
@@ -1290,7 +1290,7 @@ ifeq ($(call isTargetOs, macosx), true)
   legacy-images: mac-legacy-jre-bundle
 endif
 
-static-exploded-image: static-launchers exploded-image
+static-exploded-image: static-launcher exploded-image
 
 # These targets build the various documentation images
 docs-jdk-image: docs-jdk
@@ -1407,7 +1407,7 @@ CLEAN_SUPPORT_DIRS += demos
 CLEAN_SUPPORT_DIR_TARGETS := $(addprefix clean-, $(CLEAN_SUPPORT_DIRS))
 CLEAN_TESTS += hotspot-jtreg-native jdk-jtreg-native lib
 CLEAN_TEST_TARGETS += $(addprefix clean-test-, $(CLEAN_TESTS))
-CLEAN_PHASES += gensrc java native include
+CLEAN_PHASES := gensrc java native include
 CLEAN_PHASE_TARGETS := $(addprefix clean-, $(CLEAN_PHASES))
 CLEAN_MODULE_TARGETS := $(addprefix clean-, $(ALL_MODULES))
 # Construct targets of the form clean-$module-$phase

make/MainSupport.gmk

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

make/ModuleWrapper.gmk

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

make/RunTests.gmk

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

make/RunTestsPrebuiltSpec.gmk

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

make/StaticLibs.gmk

@@ -48,8 +48,8 @@ ifneq ($(word 2, $(wildcard $(HOTSPOT_STATIC_LIB_PATH))), )
 endif
 
 # Find all modules with static libraries
-STATIC_LIB_MODULES := $(sort $(patsubst $(SUPPORT_OUTPUTDIR)/modules_static-libs/%, \
-    %, $(wildcard $(SUPPORT_OUTPUTDIR)/modules_static-libs/*)))
+STATIC_LIB_MODULES := $(patsubst $(SUPPORT_OUTPUTDIR)/modules_static-libs/%, \
+    %, $(wildcard $(SUPPORT_OUTPUTDIR)/modules_static-libs/*))
 
 # Filter out known broken libraries. This is a temporary measure until
 # proper support for these libraries can be provided.
@@ -111,30 +111,22 @@ else ifeq ($(call isTargetOs, aix), true)
       INFO := Generating export list for $(notdir $(lib)), \
       DEPS :=  $(lib), \
       OUTPUT_FILE := $(lib).exp, \
-      COMMAND := $(AR) $(ARFLAGS) -w $(lib) | $(GREP) -v '^\.' | $(AWK) '{print $$1}' | $(SORT) -u > $(lib).exp, \
+      COMMAND := ( $(AR) $(ARFLAGS) -w $(lib) | $(GREP) -v '^\.' | $(AWK) '{print $$1}' | $(SORT) -u > $(lib).exp ), \
     )) \
     $(eval STATIC_LIB_EXPORT_FILES += $(lib).exp) \
   )
   STATIC_LIBS := -Wl,-bexpfull $(STATIC_LIB_FILES) $(addprefix -Wl$(COMMA)-bE:, $(STATIC_LIB_EXPORT_FILES))
-  ifeq ($(DEBUG_LEVEL), slowdebug)
-    STATIC_LIBS += -Wl,-bbigtoc
-  endif
 else
   $(error Unsupported platform)
 endif
 
-################################################################################
-# Build the java static launcher
-################################################################################
 $(eval $(call SetupBuildLauncher, java, \
     ENABLE_ARG_FILES := true, \
     EXPAND_CLASSPATH_WILDCARDS := true, \
     EXTRA_RCFLAGS := $(JAVA_RCFLAGS), \
     VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
     OPTIMIZATION := HIGH, \
-    MACOSX_PRIVILEGED := true, \
     STATIC_LAUNCHER := true, \
-    CFLAGS := -DSTATIC_BUILD, \
     LDFLAGS := $(LDFLAGS_STATIC_JDK), \
     LIBS := $(STATIC_LIBS) $(EXTERNAL_LIBS), \
     LINK_TYPE := C++, \
@@ -151,53 +143,7 @@ TARGETS += $(java)
 
 JAVA_LAUNCHER := $(BUILD_LAUNCHER_java_TARGET)
 
-static-launchers: $(java)
-
-################################################################################
-# Build relaunchers (thin wrappers calling the java binary) for all other
-# JDK launchers.
-################################################################################
-
-RELAUNCHER_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/launcher
-
-# $1: The module name
-# $2: The launcher name
-define SetupRelauncher
-  $1_$2_LAUNCHER_ARGS_LINE := $$(call ReadFile, $$(SUPPORT_OUTPUTDIR)/static-native/relaunchers/$1/$2-relauncher-arguments.txt)
-  # Restore |||| with space
-  $1_$2_LAUNCHER_ARGS := '{ $$(subst ||||,$(SPACE),$$(strip $$(foreach a, $$($1_$2_LAUNCHER_ARGS_LINE), "-J$$a"$$(COMMA) )) ) }'
-
-  $$(eval $$(call SetupJdkExecutable, BUILD_relauncher_$2, \
-      NAME := $2, \
-      EXTRA_FILES := $$(RELAUNCHER_SRC)/relauncher.c, \
-      CFLAGS := -DLAUNCHER_ARGS=$$($1_$2_LAUNCHER_ARGS), \
-      LIBS_windows := shlwapi.lib, \
-      OUTPUT_DIR := $$(STATIC_LAUNCHER_OUTPUT_DIR), \
-      OBJECT_DIR := $$(STATIC_LAUNCHER_OUTPUT_DIR)/relaunchers/$2, \
-  ))
-
-  TARGETS += $$(BUILD_relauncher_$2)
-
-  RELAUNCHERS += $$(BUILD_relauncher_$2_TARGET)
-  static-launchers: $$(BUILD_relauncher_$2)
-endef
-
-# Find all modules with launchers
-LAUNCHER_MODULES := $(sort $(patsubst $(SUPPORT_OUTPUTDIR)/modules_static-launchers/%, \
-    %, $(wildcard $(SUPPORT_OUTPUTDIR)/modules_static-launchers/*)))
-
-# Find launchers for each module
-$(foreach module, $(LAUNCHER_MODULES), \
-    $(eval LAUNCHERS_$(module) := $(if $(wildcard \
-    $(SUPPORT_OUTPUTDIR)/modules_static-launchers/$(module)/module-included-launchers.txt), \
-    $(shell cat \
-    $(SUPPORT_OUTPUTDIR)/modules_static-launchers/$(module)/module-included-launchers.txt))) \
-)
-
-# For all launchers (except java and javaw), setup a relauncher build
-$(foreach module, $(LAUNCHER_MODULES), \
-    $(foreach launcher, $(filter-out java javaw, $(LAUNCHERS_$(module))), \
-    $(eval $(call SetupRelauncher,$(module),$(launcher)))))
+static-launcher: $(java)
 
 ################################################################################
 #
@@ -239,72 +185,26 @@ TARGETS += $(copy-from-jdk-image)
 
 $(copy-from-jdk-image): | static-jdk-info
 
-$(eval $(call SetupCopyFiles, copy-static-launchers, \
-    FILES := $(JAVA_LAUNCHER) $(RELAUNCHERS), \
+$(eval $(call SetupCopyFiles, copy-static-launcher, \
+    FILES := $(JAVA_LAUNCHER), \
     DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
 ))
 
-TARGETS += $(copy-static-launchers)
+TARGETS += $(copy-static-launcher)
 
-$(eval $(call SetupCopyFiles, copy-static-launchers-debuginfo, \
+$(eval $(call SetupCopyFiles, copy-static-launcher-debuginfo, \
     SRC := $(STATIC_LAUNCHER_OUTPUT_DIR), \
     DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
     FILES := $(call FindDebuginfoFiles, $(STATIC_LAUNCHER_OUTPUT_DIR)), \
 ))
 
-TARGETS += $(copy-static-launchers-debuginfo)
+TARGETS += $(copy-static-launcher-debuginfo)
 
-# Copy the microsoft runtime libraries on windows
-ifeq ($(call isTargetOs, windows), true)
-  # Chmod to avoid permission issues if bundles are unpacked on unix platforms.
-  # Use separate macro calls in case the source files are not in the same
-  # directory.
-  $(eval $(call SetupCopyFiles, copy-windows-msvcr, \
-      DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
-      FILES := $(MSVCR_DLL), \
-      MACRO := copy-and-chmod-executable, \
-  ))
-
-  TARGETS += $(copy-windows-msvcr)
-
-  $(eval $(call SetupCopyFiles, copy-windows-vcruntime, \
-      DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
-      FILES := $(VCRUNTIME_1_DLL), \
-      MACRO := copy-and-chmod-executable, \
-  ))
-
-  TARGETS += $(copy-windows-vcruntime)
-
-  $(eval $(call SetupCopyFiles, copy-windows-msvcp, \
-      DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
-      FILES := $(MSVCP_DLL), \
-      MACRO := copy-and-chmod-executable, \
-  ))
-
-  TARGETS += $(copy-windows-msvcp)
-
-  copy-windows-libs := $(copy-windows-msvcr) $(copy-windows-vcruntime) $(copy-windows-msvcp)
-
-  ifneq ($(UCRT_DLL_DIR), )
-    $(eval $(call SetupCopyFiles, copy-windows-ucrt, \
-        DEST := $(STATIC_JDK_IMAGE_DIR)/bin, \
-        SRC := $(UCRT_DLL_DIR), \
-        FILES := $(wildcard $(UCRT_DLL_DIR)/*.dll), \
-        MACRO := copy-and-chmod-executable, \
-    ))
-
-    TARGETS += $(copy-windows-ucrt)
-
-    copy-windows-libs += $(copy-windows-ucrt)
-  endif
-endif
-
-static-jdk-image: $(copy-from-jdk-image) $(copy-static-launchers) \
-    $(copy-static-launchers-debuginfo) $(copy-windows-libs)
+static-jdk-image: $(copy-from-jdk-image) $(copy-static-launcher) $(copy-static-launcher-debuginfo)
 
 TARGETS += static-jdk-image
 
-.PHONY: static-launchers static-jdk-image
+.PHONY: static-launcher static-jdk-image
 
 ################################################################################
 

make/ToolsJdk.gmk

@@ -78,9 +78,6 @@ TOOL_GENERATECACERTS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_class
 TOOL_GENERATEEXTRAPROPERTIES = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.generateextraproperties.GenerateExtraProperties
 
-TOOL_GENERATECASEFOLDING = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
-    build.tools.generatecharacter.CaseFolding
-
 TOOL_MAKEZIPREPRODUCIBLE = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.makezipreproducible.MakeZipReproducible
 
@@ -130,9 +127,6 @@ TOOL_PUBLICSUFFIXLIST = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_clas
 TOOL_FIXUPPANDOC = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.fixuppandoc.Main
 
-TOOL_VARHANDLEGUARDMETHODGENERATOR = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
-    build.tools.methodhandle.VarHandleGuardMethodGenerator
-
 ################################################################################
 
 # Executable javascript filter for man page generation using pandoc.

make/ToolsLangtools.gmk

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

make/UpdateSleefSource.gmk

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

make/autoconf/basic.m4

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

make/autoconf/basic_tools.m4

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

make/autoconf/boot-jdk.m4

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

make/autoconf/bootcycle-spec.gmk.template

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

make/autoconf/build-performance.m4

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

make/autoconf/compare.sh.template

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

make/autoconf/configure.ac

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

make/autoconf/flags-cflags.m4

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

make/autoconf/flags-ldflags.m4

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

make/autoconf/flags-other.m4

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

make/autoconf/flags.m4

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

make/autoconf/jdk-options.m4

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

make/autoconf/jvm-features.m4

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

make/autoconf/lib-hsdis.m4

@@ -304,8 +304,6 @@ AC_DEFUN([LIB_SETUP_HSDIS_BINUTILS],
       # If we have libsframe add it.
       if test -e $BINUTILS_INSTALL_DIR/lib/libsframe.a; then
         HSDIS_LIBS="$HSDIS_LIBS $BINUTILS_INSTALL_DIR/lib/libsframe.a"
-      elif test -e $BINUTILS_INSTALL_DIR/lib64/libsframe.a; then
-        HSDIS_LIBS="$HSDIS_LIBS $BINUTILS_INSTALL_DIR/lib64/libsframe.a"
       fi
       AC_CHECK_LIB(z, deflate, [ HSDIS_LIBS="$HSDIS_LIBS -lz" ], AC_MSG_ERROR([libz not found]))
     else

make/autoconf/lib-tests.m4

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

make/autoconf/lib-vulkan.m4

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

make/autoconf/lib-wayland.m4

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

make/autoconf/libraries.m4

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

make/autoconf/spec.gmk.template

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

make/autoconf/toolchain.m4

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

make/autoconf/util_paths.m4

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

make/common/Execute.gmk

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

make/common/JavaCompilation.gmk

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

make/common/JdkNativeCompilation.gmk

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

make/common/MakeBase.gmk

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

make/common/MakeIncludeEnd.gmk

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

make/common/MakeIncludeStart.gmk

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

make/common/Modules.gmk

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

make/common/ProcessMarkdown.gmk

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

make/common/Utils.gmk

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

make/common/modules/GensrcStreamPreProcessing.gmk

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

make/common/modules/LauncherCommon.gmk

@@ -43,9 +43,6 @@ LAUNCHER_CFLAGS += -I$(TOPDIR)/src/java.base/share/native/launcher \
 MACOSX_PLIST_DIR := $(TOPDIR)/src/java.base/macosx/native/launcher
 JAVA_MANIFEST := $(TOPDIR)/src/java.base/windows/native/launcher/java.manifest
 
-INCLUDED_LAUNCHERS_FILE := $(SUPPORT_OUTPUTDIR)/modules_static-launchers/$(MODULE)/module-included-launchers.txt
-INCLUDED_LAUNCHERS :=
-
 ################################################################################
 # Build standard launcher.
 
@@ -77,29 +74,18 @@ define SetupBuildLauncherBody
 
   $1_MAIN_MODULE := $(MODULE)
 
-  $1_RELAUNCHER_ARGUMENTS :=
-
   ifneq ($$($1_MAIN_CLASS), )
     $1_JAVA_ARGS += -Xms8m
     $1_LAUNCHER_CLASS := -m $$($1_MAIN_MODULE)/$$($1_MAIN_CLASS)
   endif
 
-  ifeq ($$($1_ENABLE_ARG_FILES), true)
-    $1_CFLAGS += -DDISABLE_ARGFILE=JNI_FALSE
-  else
-    $1_CFLAGS += -DDISABLE_ARGFILE=JNI_TRUE
-    # This must be the first argument given, if it should be present
-    $1_RELAUNCHER_ARGUMENTS += -DjavaLauncherArgFiles=false
-  endif
-
   ifeq ($$($1_EXPAND_CLASSPATH_WILDCARDS), true)
-    $1_CFLAGS += -DCLASSPATH_WILDCARDS=JNI_TRUE
-  else
-    $1_CFLAGS += -DCLASSPATH_WILDCARDS=JNI_FALSE
-    $1_RELAUNCHER_ARGUMENTS += -DjavaLauncherWildcards=false
+    $1_CFLAGS += -DEXPAND_CLASSPATH_WILDCARDS
   endif
 
-  $1_RELAUNCHER_ARGUMENTS += -DjavaLauncherProgname=$1
+  ifeq ($$($1_ENABLE_ARG_FILES), true)
+    $1_CFLAGS += -DENABLE_ARG_FILES
+  endif
 
   ifeq ($(call isTargetOs, windows), true)
     ifeq ($$($1_WINDOWS_JAVAW), true)
@@ -108,14 +94,9 @@ define SetupBuildLauncherBody
   endif
 
   ifneq ($$($1_JAVA_ARGS), )
-    $1_PREFIXED_JAVA_ARGS := $$(addprefix -J, $$($1_JAVA_ARGS)) \
-        $$($1_LAUNCHER_CLASS)
-    $1_JAVA_ARGS_STR := '{ $$(strip $$(foreach a, $$($1_PREFIXED_JAVA_ARGS), \
-        "$$a"$(COMMA) )) }'
+    $1_JAVA_ARGS_STR := '{ $$(strip $$(foreach a, \
+        $$(addprefix -J, $$($1_JAVA_ARGS)) $$($1_LAUNCHER_CLASS), "$$a"$(COMMA) )) }'
     $1_CFLAGS += -DJAVA_ARGS=$$($1_JAVA_ARGS_STR)
-    # To preserve spaces, substitute them with a hopefully unique pattern
-    $1_RELAUNCHER_ARGUMENTS += \
-        -DjavaLauncherArgs=$$(subst $$(SPACE),||||,$$($1_PREFIXED_JAVA_ARGS))
   endif
 
   ifeq ($(call isTargetOs, macosx), true)
@@ -175,8 +156,8 @@ define SetupBuildLauncherBody
       DISABLED_WARNINGS_gcc := unused-function unused-variable, \
       DISABLED_WARNINGS_clang := unused-function, \
       LDFLAGS := $$($1_LDFLAGS), \
-      LDFLAGS_linux := $$(call SetExecutableOrigin,/../lib), \
-      LDFLAGS_macosx := $$(call SetExecutableOrigin,/../lib), \
+      LDFLAGS_linux := $$(call SET_EXECUTABLE_ORIGIN,/../lib), \
+      LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN,/../lib), \
       LDFLAGS_FILTER_OUT := $$($1_LDFLAGS_FILTER_OUT), \
       JDK_LIBS := $$($1_JDK_LIBS), \
       JDK_LIBS_windows := $$($1_JDK_LIBS_windows), \
@@ -191,28 +172,8 @@ define SetupBuildLauncherBody
   ))
 
   $1 += $$(BUILD_LAUNCHER_$1)
-
-  $1_RELAUNCHER_ARGUMENTS_FILE := \
-      $$(SUPPORT_OUTPUTDIR)/static-native/relaunchers/$$(MODULE)/$1-relauncher-arguments.txt
-
-  $1_VARDEPS := $$($1_RELAUNCHER_ARGUMENTS)
-  $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
-      $$($1_RELAUNCHER_ARGUMENTS_FILE).vardeps)
-
-  $$($1_RELAUNCHER_ARGUMENTS_FILE):
-	$$(call MakeDir, $$(@D))
-	$$(ECHO) '$$($1_RELAUNCHER_ARGUMENTS)' > $$@
-
-  $1 += $$($1_RELAUNCHER_ARGUMENTS_FILE)
-
   TARGETS += $$($1)
 
-  # Record the fact that this launcher is part of the current module.
-  INCLUDED_LAUNCHERS += $1
-
-  # Add a dependency from this launcher to the launcher list
-  $$(INCLUDED_LAUNCHERS_FILE): $$($1)
-
   $$(BUILD_LAUNCHER_$1): $$(BUILD_PLIST_$1)
 
   ifeq ($(call isTargetOs, macosx), true)
@@ -281,14 +242,5 @@ endif
 
 ################################################################################
 
-# We need to keep track of which launchers are created by this module. This
-# information is required for static builds, to know which relaunchers to
-# create. The file module-included-launchers.txt is then read in StaticLibs.gmk.
-$(INCLUDED_LAUNCHERS_FILE):
-	$(call MakeDir, $(@D))
-	$(ECHO) $(INCLUDED_LAUNCHERS) > $@
-
-TARGETS += $(INCLUDED_LAUNCHERS_FILE)
-
 endif # include guard
 include MakeIncludeEnd.gmk

make/common/native/CompileFile.gmk

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

make/common/native/Link.gmk

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

make/common/native/LinkMicrosoft.gmk

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

make/conf/docs-modules.conf

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2025, 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
@@ -51,6 +51,7 @@ DOCS_MODULES= \
     jdk.jdwp.agent \
     jdk.jfr \
     jdk.jlink \
+    jdk.jsobject \
     jdk.jshell \
     jdk.jstatd \
     jdk.localedata \

make/conf/github-actions.conf

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

make/conf/jib-profiles.js

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

make/conf/module-loader-map.conf

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

make/conf/version-numbers.conf

@@ -26,17 +26,17 @@
 # Default version, product, and vendor information to use,
 # unless overridden by configure
 
-DEFAULT_VERSION_FEATURE=26
+DEFAULT_VERSION_FEATURE=25
 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=2026-03-17
-DEFAULT_VERSION_CLASSFILE_MAJOR=70  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
+DEFAULT_VERSION_DATE=2025-09-16
+DEFAULT_VERSION_CLASSFILE_MAJOR=69  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="25 26"
-DEFAULT_JDK_SOURCE_TARGET_VERSION=26
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="24 25"
+DEFAULT_JDK_SOURCE_TARGET_VERSION=25
 DEFAULT_PROMOTED_VERSION_PRE=ea

make/data/asan/asan_default_options.c

@@ -67,8 +67,6 @@ ATTRIBUTE_DEFAULT_VISIBILITY ATTRIBUTE_USED const char* CDECL __asan_default_opt
 #endif
     "print_suppressions=0,"
     "handle_segv=0,"
-    // A lot of libjsig related tests fail because of the link order check; so better avoid it
-    "verify_asan_link_order=0,"
     // See https://github.com/google/sanitizers/issues/1322. Hopefully this is resolved
     // at some point and we can remove this option.
     "intercept_tls_get_addr=0";

make/data/charsetmapping/IBM930.c2b

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

make/data/charsetmapping/IBM930.map

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

make/data/cldr/LICENSE

@@ -1,4 +1,4 @@
-UNICODE LICENSE V3
+UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 

make/data/cldr/common/bcp47/calendar.xml

@@ -45,8 +45,6 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<type name="h23" description="Hour system using 0–23; 'H' in patterns" since="28" />
 			<type name="h11" description="Hour system using 0–11; 'K' in patterns" since="28" />
 			<type name="h24" description="Hour system using 1–24; 'k' in patterns" since="28" />
-			<type name="c12" description="Best 12-hour cycle for locale (h11 or h12)" since="48" deprecated="true" /> <!-- Technical Preview -->
-			<type name="c24" description="Best 24-hour cycle for locale (h23 or h24)" since="48" deprecated="true" /> <!-- Technical Preview -->
 		</key>
     </keyword>
 </ldmlBCP47>

make/data/cldr/common/bcp47/number.xml

@@ -105,7 +105,6 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="thai" description="Thai digits"/>
             <type name="tirh" description="Tirhuta digits" since="28"/>
             <type name="tibt" description="Tibetan digits"/>
-            <type name="tols" description="Tolong Siki digits" since="48"/>
             <type name="traditio" description="Traditional numerals — may be algorithmic" alias="traditional" since="21"/>
             <type name="vaii" description="Vai digits" since="21"/>
             <type name="wara" description="Warang Citi digits" since="28"/>

make/data/cldr/common/bcp47/timezone.xml

@@ -17,14 +17,14 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="aiaxa" description="Anguilla" alias="America/Anguilla"/>
             <type name="altia" description="Tirane, Albania" alias="Europe/Tirane"/>
             <type name="amevn" description="Yerevan, Armenia" alias="Asia/Yerevan"/>
-            <type name="ancur" description="Curaçao" alias="America/Curacao" region="CW"/>
+            <type name="ancur" description="Curaçao" alias="America/Curacao"/>
             <type name="aolad" description="Luanda, Angola" alias="Africa/Luanda"/>
-            <type name="aqams" description="Amundsen-Scott Station, South Pole" deprecated="true" preferred="aqmcm"/>
+            <type name="aqams" description="Amundsen-Scott Station, South Pole" deprecated="true" preferred="nzakl"/>
             <type name="aqcas" description="Casey Station, Bailey Peninsula" alias="Antarctica/Casey"/>
             <type name="aqdav" description="Davis Station, Vestfold Hills" alias="Antarctica/Davis"/>
             <type name="aqddu" description="Dumont d'Urville Station, Terre Adélie" alias="Antarctica/DumontDUrville"/>
             <type name="aqmaw" description="Mawson Station, Holme Bay" alias="Antarctica/Mawson"/>
-            <type name="aqmcm" description="McMurdo Station, Ross Island" alias="Antarctica/McMurdo Antarctica/South_Pole"/>
+            <type name="aqmcm" description="McMurdo Station, Ross Island" alias="Antarctica/McMurdo"/>
             <type name="aqplm" description="Palmer Station, Anvers Island" alias="Antarctica/Palmer"/>
             <type name="aqrot" description="Rothera Station, Adelaide Island" alias="Antarctica/Rothera"/>
             <type name="aqsyw" description="Syowa Station, East Ongul Island" alias="Antarctica/Syowa"/>
@@ -130,7 +130,6 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="chzrh" description="Zurich, Switzerland" alias="Europe/Zurich"/>
             <type name="ciabj" description="Abidjan, Côte d'Ivoire" alias="Africa/Abidjan"/>
             <type name="ckrar" description="Rarotonga, Cook Islands" alias="Pacific/Rarotonga"/>
-            <type name="clcxq" description="Aysén Region, Chile" alias="America/Coyhaique" since="48"/>
             <type name="clipc" description="Easter Island, Chile" alias="Pacific/Easter Chile/EasterIsland"/>
             <type name="clpuq" description="Punta Arenas, Chile" alias="America/Punta_Arenas" since="31"/>
             <type name="clscl" description="Santiago, Chile" alias="America/Santiago Chile/Continental"/>
@@ -168,7 +167,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="est5edt" description="POSIX style time zone for US Eastern Time" deprecated="true" preferred="usnyc"/>
             <type name="etadd" description="Addis Ababa, Ethiopia" alias="Africa/Addis_Ababa"/>
             <type name="fihel" description="Helsinki, Finland" alias="Europe/Helsinki"/>
-            <type name="fimhq" description="Mariehamn, Åland, Finland" alias="Europe/Mariehamn" region="AX"/>
+            <type name="fimhq" description="Mariehamn, Åland, Finland" alias="Europe/Mariehamn"/>
             <type name="fjsuv" description="Fiji" alias="Pacific/Fiji"/>
             <type name="fkpsy" description="Stanley, Falkland Islands" alias="Atlantic/Stanley"/>
             <type name="fmksa" description="Kosrae, Micronesia" alias="Pacific/Kosrae"/>
@@ -178,7 +177,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="frpar" description="Paris, France" alias="Europe/Paris"/>
             <type name="galbv" description="Libreville, Gabon" alias="Africa/Libreville"/>
             <type name="gaza" description="Gaza Strip, Palestinian Territories" deprecated="true" preferred="gazastrp"/>
-            <type name="gazastrp" description="Gaza Strip, Palestinian Territories" alias="Asia/Gaza" since="40" region="PS"/>
+            <type name="gazastrp" description="Gaza Strip, Palestinian Territories" alias="Asia/Gaza" since="40"/>
             <type name="gblon" description="London, United Kingdom" alias="Europe/London Europe/Belfast GB GB-Eire"/>
             <type name="gdgnd" description="Grenada" alias="America/Grenada"/>
             <type name="getbs" description="Tbilisi, Georgia" alias="Asia/Tbilisi"/>
@@ -194,8 +193,8 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="gmt" description="Greenwich Mean Time" alias="Etc/GMT Etc/GMT+0 Etc/GMT-0 Etc/GMT0 Etc/Greenwich GMT GMT+0 GMT-0 GMT0 Greenwich" since="31"/>
             <type name="gncky" description="Conakry, Guinea" alias="Africa/Conakry"/>
             <type name="gpbbr" description="Guadeloupe" alias="America/Guadeloupe"/>
-            <type name="gpmsb" description="Marigot, Saint Martin" alias="America/Marigot" region="MF"/>
-            <type name="gpsbh" description="Saint Barthélemy" alias="America/St_Barthelemy" region="BL"/>
+            <type name="gpmsb" description="Marigot, Saint Martin" alias="America/Marigot"/>
+            <type name="gpsbh" description="Saint Barthélemy" alias="America/St_Barthelemy"/>
             <type name="gqssg" description="Malabo, Equatorial Guinea" alias="Africa/Malabo"/>
             <type name="grath" description="Athens, Greece" alias="Europe/Athens EET"/>
             <type name="gsgrv" description="South Georgia and the South Sandwich Islands" alias="Atlantic/South_Georgia"/>
@@ -203,7 +202,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="gugum" description="Guam" alias="Pacific/Guam"/>
             <type name="gwoxb" description="Bissau, Guinea-Bissau" alias="Africa/Bissau"/>
             <type name="gygeo" description="Guyana" alias="America/Guyana"/>
-            <type name="hebron" description="West Bank, Palestinian Territories" alias="Asia/Hebron" since="21" region="PS"/>
+            <type name="hebron" description="West Bank, Palestinian Territories" alias="Asia/Hebron" since="21"/>
             <type name="hkhkg" description="Hong Kong SAR China" alias="Asia/Hong_Kong Hongkong"/>
             <type name="hntgu" description="Tegucigalpa, Honduras" alias="America/Tegucigalpa"/>
             <type name="hrzag" description="Zagreb, Croatia" alias="Europe/Zagreb"/>
@@ -221,7 +220,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="irthr" description="Tehran, Iran" alias="Asia/Tehran Iran"/>
             <type name="isrey" description="Reykjavik, Iceland" alias="Atlantic/Reykjavik Iceland"/>
             <type name="itrom" description="Rome, Italy" alias="Europe/Rome"/>
-            <type name="jeruslm" description="Jerusalem" alias="Asia/Jerusalem Asia/Tel_Aviv Israel" region="IL"/>
+            <type name="jeruslm" description="Jerusalem" alias="Asia/Jerusalem Asia/Tel_Aviv Israel"/>
             <type name="jesth" description="Jersey" alias="Europe/Jersey"/>
             <type name="jmkin" description="Jamaica" alias="America/Jamaica Jamaica"/>
             <type name="joamm" description="Amman, Jordan" alias="Asia/Amman"/>
@@ -306,7 +305,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="npktm" description="Kathmandu, Nepal" alias="Asia/Katmandu Asia/Kathmandu" iana="Asia/Kathmandu"/>
             <type name="nrinu" description="Nauru" alias="Pacific/Nauru"/>
             <type name="nuiue" description="Niue" alias="Pacific/Niue"/>
-            <type name="nzakl" description="Auckland, New Zealand" alias="Pacific/Auckland NZ"/>
+            <type name="nzakl" description="Auckland, New Zealand" alias="Pacific/Auckland Antarctica/South_Pole NZ"/>
             <type name="nzcht" description="Chatham Islands, New Zealand" alias="Pacific/Chatham NZ-CHAT"/>
             <type name="ommct" description="Muscat, Oman" alias="Asia/Muscat"/>
             <type name="papty" description="Panama" alias="America/Panama EST"/>

make/data/cldr/common/dtd/cldrTest.dtd

@@ -1,11 +1,12 @@
 <!--
-Copyright © 1991-2025 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-3.0
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
--->
+Copyright © 2003-2010 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 
-<!-- This is only referenced by the deprecated GenerateLikelySubtagTests.java - see CLDR-17535 -->
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
+-->
 
 <!ELEMENT cldrTest ((number | date | zoneFields | collation | likelySubtags)*) >
 <!ATTLIST cldrTest version CDATA #REQUIRED>
@@ -47,3 +48,4 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!-- likelySubtags result attributes -->
 <!ATTLIST result add NMTOKEN #IMPLIED>
 <!ATTLIST result remove NMTOKEN #IMPLIED>
+

make/data/cldr/common/dtd/ldml.dtd

@@ -42,7 +42,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:regex/\$Revision.*\$-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "48" >
+<!ATTLIST version cldrVersion CDATA #FIXED "47" >
     <!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -64,8 +64,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@MATCH:validity/locale-for-names-->
 <!ATTLIST language alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/long, secondary, short, variant, menu, official-->
-<!ATTLIST language menu NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/core, extension-->
 <!ATTLIST language draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -279,8 +277,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@MATCH:bcp47/anykey-->
 <!ATTLIST type type NMTOKEN #REQUIRED >
     <!--@MATCH:bcp47/anyvalue-->
-<!ATTLIST type scope NMTOKEN #IMPLIED >
-    <!--@MATCH:literal/core-->
 <!ATTLIST type alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/short, variant-->
 <!ATTLIST type draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -460,7 +456,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@DEPRECATED-->
 
 <!ELEMENT exemplarCharacters ( #PCDATA | cp )* >
-<!ATTLIST exemplarCharacters type (standard | auxiliary | numbers | numbers-auxiliary | punctuation | punctuation-auxiliary | punctuation-person | index | currencySymbol) #IMPLIED >
+<!ATTLIST exemplarCharacters type (auxiliary | standard | punctuation | currencySymbol | index | numbers) #IMPLIED >
     <!--@DEPRECATED:currencySymbol-->
 <!ATTLIST exemplarCharacters alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/variant-->
@@ -1532,7 +1528,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT dateTimeFormat ( alias | ( pattern*, displayName*, special* ) ) >
 <!ATTLIST dateTimeFormat type NMTOKEN "standard" >
-    <!--@MATCH:literal/standard, atTime, relative-->
+    <!--@MATCH:literal/standard, atTime-->
 <!ATTLIST dateTimeFormat alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/variant-->
 <!ATTLIST dateTimeFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -1722,7 +1718,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST relativePeriod draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
-<!ELEMENT timeZoneNames ( alias | ( hourFormat*, hoursFormat*, gmtFormat*, gmtZeroFormat*, gmtUnknownFormat*, regionFormat*, fallbackFormat*, fallbackRegionFormat*, abbreviationFallback*, preferenceOrdering*, singleCountries*, default*, zone*, metazone*, special* ) ) >
+<!ELEMENT timeZoneNames ( alias | ( hourFormat*, hoursFormat*, gmtFormat*, gmtZeroFormat*, regionFormat*, fallbackFormat*, fallbackRegionFormat*, abbreviationFallback*, preferenceOrdering*, singleCountries*, default*, zone*, metazone*, special* ) ) >
 <!ATTLIST timeZoneNames draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
@@ -1769,15 +1765,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST gmtZeroFormat references CDATA #IMPLIED >
     <!--@METADATA-->
 
-<!ELEMENT gmtUnknownFormat ( #PCDATA ) >
-<!ATTLIST gmtUnknownFormat alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
-<!ATTLIST gmtUnknownFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
-    <!--@METADATA-->
-    <!--@DEPRECATED:true, false-->
-<!ATTLIST gmtUnknownFormat references CDATA #IMPLIED >
-    <!--@METADATA-->
-
 <!ELEMENT regionFormat ( #PCDATA ) >
 <!ATTLIST regionFormat type (standard | daylight) #IMPLIED >
 <!ATTLIST regionFormat alt NMTOKENS #IMPLIED >
@@ -1976,7 +1963,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!-- ######################################################### -->
 
-<!ELEMENT numbers ( alias | ( defaultNumberingSystem*, otherNumberingSystems*, minimumGroupingDigits*, symbols*, decimalFormats*, rationalFormats*, scientificFormats*, percentFormats*, currencyFormats*, currencies?, miscPatterns*, minimalPairs*, special* ) ) >
+<!ELEMENT numbers ( alias | ( defaultNumberingSystem*, otherNumberingSystems*, minimumGroupingDigits*, symbols*, decimalFormats*, scientificFormats*, percentFormats*, currencyFormats*, currencies?, miscPatterns*, minimalPairs*, special* ) ) >
 <!ATTLIST numbers alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/variant-->
 <!ATTLIST numbers draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -2280,28 +2267,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
-<!ELEMENT rationalFormats ( alias | ( rationalPattern*, integerAndRationalPattern*, rationalUsage*, special* ) ) >
-<!ATTLIST rationalFormats numberSystem CDATA #REQUIRED >
-    <!--@MATCH:bcp47/nu-->
-
-<!ELEMENT rationalPattern ( #PCDATA ) >
-<!ATTLIST rationalPattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
-<!ATTLIST rationalPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
-    <!--@METADATA-->
-
-<!ELEMENT integerAndRationalPattern ( #PCDATA ) >
-<!ATTLIST integerAndRationalPattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/superSub-->
-<!ATTLIST integerAndRationalPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
-    <!--@METADATA-->
-
-<!ELEMENT rationalUsage ( #PCDATA ) >
-<!ATTLIST rationalUsage alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
-<!ATTLIST rationalUsage draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
-    <!--@METADATA-->
-
 <!ELEMENT scientificFormats ( alias | ( default*, scientificFormatLength*, special* ) ) >
 <!ATTLIST scientificFormats draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
@@ -3135,20 +3100,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT rbnf ( alias | ( rulesetGrouping*, special* ) ) >
 
-<!ELEMENT rulesetGrouping ( alias | ( rbnfRules?, ruleset*, special* ) ) >
+<!ELEMENT rulesetGrouping ( alias | ( ruleset*, special* ) ) >
 <!ATTLIST rulesetGrouping type NMTOKEN #REQUIRED >
     <!--@MATCH:literal/NumberingSystemRules, OrdinalRules, SpelloutRules-->
 <!ATTLIST rulesetGrouping draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
 
-<!ELEMENT rbnfRules ( #PCDATA ) >
-    <!--@CDATA-->
-<!ATTLIST rbnfRules alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
-<!ATTLIST rbnfRules draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
-    <!--@METADATA-->
-    <!--@DEPRECATED:true, false-->
-
 <!ELEMENT ruleset ( alias | ( rbnfrule*, special* ) ) >
     <!--@ORDERED-->
 <!ATTLIST ruleset type NMTOKEN #REQUIRED >

make/data/cldr/common/dtd/ldml.xsd

@@ -128,10 +128,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="version">
     <xs:complexType>
       <xs:attribute name="number" use="required"/>
-      <xs:attribute default="48" name="cldrVersion">
+      <xs:attribute default="47" name="cldrVersion">
         <xs:simpleType>
           <xs:restriction base="xs:string">
-            <xs:enumeration value="48"/>
+            <xs:enumeration value="47"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
@@ -182,7 +182,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
     <xs:complexType mixed="true">
       <xs:attribute name="type" type="xs:NMTOKEN" use="required"/>
       <xs:attribute name="alt" type="xs:NMTOKENS"/>
-      <xs:attribute name="menu" type="xs:NMTOKENS"/>
       <xs:attribute name="draft">
         <xs:simpleType>
           <xs:restriction base="xs:token">
@@ -204,7 +203,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
-  
   <xs:element name="script">
     <xs:complexType mixed="true">
       <xs:attribute name="type" type="xs:NMTOKEN" use="required"/>
@@ -698,7 +696,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
     <xs:complexType mixed="true">
       <xs:attribute name="key" type="xs:NMTOKEN" use="required"/>
       <xs:attribute name="type" type="xs:NMTOKEN" use="required"/>
-      <xs:attribute name="scope" type="xs:NMTOKEN"/>
       <xs:attribute name="alt" type="xs:NMTOKENS"/>
       <xs:attribute name="draft">
         <xs:simpleType>
@@ -721,7 +718,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
-  
   <xs:element name="transformNames">
     <xs:complexType>
       <xs:choice>
@@ -1200,15 +1196,12 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="type">
         <xs:simpleType>
           <xs:restriction base="xs:token">
-            <xs:enumeration value="standard"/>
             <xs:enumeration value="auxiliary"/>
-            <xs:enumeration value="numbers"/>
-            <xs:enumeration value="numbers-auxiliary"/>
+            <xs:enumeration value="standard"/>
             <xs:enumeration value="punctuation"/>
-            <xs:enumeration value="punctuation-auxiliary"/>
-            <xs:enumeration value="punctuation-person"/>
-            <xs:enumeration value="index"/>
             <xs:enumeration value="currencySymbol"/>
+            <xs:enumeration value="index"/>
+            <xs:enumeration value="numbers"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
@@ -4519,7 +4512,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="hoursFormat"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="gmtFormat"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="gmtZeroFormat"/>
-          <xs:element maxOccurs="unbounded" minOccurs="0" ref="gmtUnknownFormat"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="regionFormat"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="fallbackFormat"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="fallbackRegionFormat"/>
@@ -4642,28 +4634,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
-  <xs:element name="gmtUnknownFormat">
-    <xs:complexType mixed="true">
-      <xs:attribute name="alt" type="xs:NMTOKENS"/>
-      <xs:attribute name="draft">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="approved"/>
-            <xs:enumeration value="contributed"/>
-            <xs:enumeration value="provisional"/>
-            <xs:enumeration value="unconfirmed"/>
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-      <xs:attribute name="references"/>
-    </xs:complexType>
-  </xs:element>
-  
-  
-  
-  
   <xs:element name="regionFormat">
     <xs:complexType mixed="true">
       <xs:attribute name="type">
@@ -5129,7 +5099,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="minimumGroupingDigits"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="symbols"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="decimalFormats"/>
-          <xs:element maxOccurs="unbounded" minOccurs="0" ref="rationalFormats"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="scientificFormats"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="percentFormats"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="currencyFormats"/>
@@ -5861,72 +5830,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
-  <xs:element name="rationalFormats">
-    <xs:complexType>
-      <xs:choice>
-        <xs:element ref="alias"/>
-        <xs:sequence>
-          <xs:element maxOccurs="unbounded" minOccurs="0" ref="rationalPattern"/>
-          <xs:element maxOccurs="unbounded" minOccurs="0" ref="integerAndRationalPattern"/>
-          <xs:element maxOccurs="unbounded" minOccurs="0" ref="rationalUsage"/>
-          <xs:element maxOccurs="unbounded" minOccurs="0" ref="special"/>
-        </xs:sequence>
-      </xs:choice>
-      <xs:attribute name="numberSystem" use="required"/>
-    </xs:complexType>
-  </xs:element>
-  
-  <xs:element name="rationalPattern">
-    <xs:complexType mixed="true">
-      <xs:attribute name="alt" type="xs:NMTOKENS"/>
-      <xs:attribute name="draft">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="approved"/>
-            <xs:enumeration value="contributed"/>
-            <xs:enumeration value="provisional"/>
-            <xs:enumeration value="unconfirmed"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-  
-  
-  <xs:element name="integerAndRationalPattern">
-    <xs:complexType mixed="true">
-      <xs:attribute name="alt" type="xs:NMTOKENS"/>
-      <xs:attribute name="draft">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="approved"/>
-            <xs:enumeration value="contributed"/>
-            <xs:enumeration value="provisional"/>
-            <xs:enumeration value="unconfirmed"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-  
-  
-  <xs:element name="rationalUsage">
-    <xs:complexType mixed="true">
-      <xs:attribute name="alt" type="xs:NMTOKENS"/>
-      <xs:attribute name="draft">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="approved"/>
-            <xs:enumeration value="contributed"/>
-            <xs:enumeration value="provisional"/>
-            <xs:enumeration value="unconfirmed"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-  
-  
   <xs:element name="scientificFormats">
     <xs:complexType>
       <xs:choice>
@@ -8146,7 +8049,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:choice>
         <xs:element ref="alias"/>
         <xs:sequence>
-          <xs:element minOccurs="0" ref="rbnfRules"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="ruleset"/>
           <xs:element maxOccurs="unbounded" minOccurs="0" ref="special"/>
         </xs:sequence>
@@ -8168,27 +8070,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   </xs:element>
   
   
-  <xs:element name="rbnfRules">
-    <xs:complexType mixed="true">
-      <xs:attribute name="alt" type="xs:NMTOKENS"/>
-      <xs:attribute name="draft">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="approved"/>
-            <xs:enumeration value="contributed"/>
-            <xs:enumeration value="provisional"/>
-            <xs:enumeration value="unconfirmed"/>
-            <xs:enumeration value="true"/>
-            <xs:enumeration value="false"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-  
-  
-  
-  
   <xs:element name="ruleset">
     <xs:complexType>
       <xs:choice>

make/data/cldr/common/dtd/ldmlBCP47.dtd

@@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:regex/\$Revision.*\$-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "48" >
+<!ATTLIST version cldrVersion CDATA #FIXED "47" >
     <!--@MATCH:version-->
     <!--@VALUE-->
 
@@ -72,9 +72,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST type iana CDATA #IMPLIED >
     <!--@MATCH:regex/^[A-Za-z]+(/[A-Za-z_\-]+)+$-->
     <!--@VALUE-->
-<!ATTLIST type region CDATA #IMPLIED >
-    <!--@MATCH:regex/^[A-Z]{2}$-->
-    <!--@VALUE-->
 
 <!ELEMENT attribute EMPTY >
 <!ATTLIST attribute name NMTOKEN #REQUIRED >

make/data/cldr/common/dtd/ldmlBCP47.xsd

@@ -24,10 +24,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="version">
     <xs:complexType>
       <xs:attribute name="number" use="required"/>
-      <xs:attribute default="48" name="cldrVersion">
+      <xs:attribute default="47" name="cldrVersion">
         <xs:simpleType>
           <xs:restriction base="xs:string">
-            <xs:enumeration value="48"/>
+            <xs:enumeration value="47"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
@@ -120,7 +120,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="alias"/>
       <xs:attribute name="since"/>
       <xs:attribute name="iana"/>
-      <xs:attribute name="region"/>
     </xs:complexType>
   </xs:element>
   
@@ -135,8 +134,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
-  
-  
   <xs:element name="attribute">
     <xs:complexType>
       <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>

make/data/cldr/common/dtd/ldmlOpenOffice.dtd

@@ -1,8 +1,11 @@
 <!--
-Copyright © 1991-2025 Unicode, Inc.
-For terms of use, see http://www.unicode.org/copyright.html
-SPDX-License-Identifier: Unicode-3.0
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+Copyright © 2003-2010 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
 -->
 
 <!--  OpenOffice.org Specific elements                         -->
@@ -57,7 +60,7 @@ openOffice:quarter4Abbreviation?)>
 <!ELEMENT openOffice:belowWord (#PCDATA)>
 
 <!-- START_DEPRECATED -->
-<!ELEMENT openOffice:quarter1Abbreviation (#PCDATA)>
+<!ELEMENT openOffice:quarter1Abbreviation (#PCDATA)>   
 <!ELEMENT openOffice:quarter2Abbreviation (#PCDATA)>
 <!ELEMENT openOffice:quarter3Abbreviation (#PCDATA)>
 <!ELEMENT openOffice:quarter4Abbreviation (#PCDATA)>

make/data/cldr/common/dtd/ldmlSupplemental.dtd

@@ -12,7 +12,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST version number CDATA #REQUIRED >
     <!--@MATCH:any-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "48" >
+<!ATTLIST version cldrVersion CDATA #FIXED "47" >
     <!--@MATCH:version-->
     <!--@VALUE-->
 <!ATTLIST version unicodeVersion CDATA #FIXED "16.0.0" >
@@ -147,7 +147,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST language territories NMTOKENS #IMPLIED >
     <!--@MATCH:set/validity/region-->
     <!--@VALUE-->
-    <!--@DEPRECATED-->
 <!ATTLIST language variants NMTOKENS #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST language draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -275,7 +274,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@MATCH:time/yyyy-MM-dd-->
     <!--@VALUE-->
 <!ATTLIST era code NMTOKEN #IMPLIED >
-    <!--@MATCH:regex/[a-z0-9]{2,8}(\-[a-z0-9]{3,8})*-->
+    <!--@MATCH:regex/[a-z0-9]{3,8}(\-[a-z0-9]{3,8})*-->
     <!--@VALUE-->
 <!ATTLIST era aliases NMTOKENS #IMPLIED >
     <!--@MATCH:set/regex/[a-z0-9]{2,8}(\-[a-z0-9]{3,8})*-->
@@ -771,7 +770,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST unitAlias type NMTOKEN #REQUIRED >
     <!--@MATCH:validity/short-unit/deprecated-->
 <!ATTLIST unitAlias replacement NMTOKEN #REQUIRED >
-    <!--@MATCH:regex/[A-Za-z0-9][-A-Za-z0-9]*-->
+    <!--@MATCH:regex/[A-Za-z][-A-Za-z0-9]*-->
     <!--@VALUE-->
 <!ATTLIST unitAlias reason (deprecated) #IMPLIED >
     <!--@VALUE-->
@@ -997,12 +996,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST usesMetazone mzone NMTOKEN #REQUIRED >
     <!--@MATCH:metazone-->
     <!--@VALUE-->
-<!ATTLIST usesMetazone stdOffset CDATA #IMPLIED >
-    <!--@MATCH:regex/[+-][0-9]{2}(:[0-9]{2})?-->
-    <!--@VALUE-->
-<!ATTLIST usesMetazone dstOffset CDATA #IMPLIED >
-    <!--@MATCH:regex/[+-][0-9]{2}(:[0-9]{2})?-->
-    <!--@VALUE-->
 
 <!ELEMENT plurals ( pluralRules*, pluralRanges* ) >
 <!ATTLIST plurals type (ordinal | cardinal) #IMPLIED >
@@ -1097,7 +1090,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST numberingSystem radix NMTOKEN #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST numberingSystem digits CDATA #IMPLIED >
-    <!--@MATCH:unicodeset/[\p{Nd}[\u3007\u4E00\u4E03\u4E09\u4E5D\u4E8C\u4E94\u516B\u516D\u56DB][\U00011DE0-\U00011DE9]]-->
+    <!--@MATCH:unicodeset/[\p{Nd}[\u3007\u4E00\u4E03\u4E09\u4E5D\u4E8C\u4E94\u516B\u516D\u56DB][\U00010D40-\U00010D49\U000116D0-\U000116E3\U00011BF0-\U00011BF9\U00016130-\U00016139\U00016D70-\U00016D79\U0001CCF0-\U0001CCF9\U0001E5F1-\U0001E5FA]]-->
     <!--@VALUE-->
 <!ATTLIST numberingSystem rules CDATA #IMPLIED >
     <!--@MATCH:any-->

make/data/cldr/common/dtd/ldmlSupplemental.xsd

@@ -65,10 +65,10 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   <xs:element name="version">
     <xs:complexType>
       <xs:attribute name="number" use="required"/>
-      <xs:attribute default="48" name="cldrVersion">
+      <xs:attribute default="47" name="cldrVersion">
         <xs:simpleType>
           <xs:restriction base="xs:string">
-            <xs:enumeration value="48"/>
+            <xs:enumeration value="47"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
@@ -374,7 +374,6 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
   
   
   
-  
   <xs:element name="scriptData">
     <xs:complexType>
       <xs:sequence>
@@ -2184,18 +2183,12 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
       <xs:attribute name="from"/>
       <xs:attribute name="to"/>
       <xs:attribute name="mzone" type="xs:NMTOKEN" use="required"/>
-      <xs:attribute name="stdOffset"/>
-      <xs:attribute name="dstOffset"/>
     </xs:complexType>
   </xs:element>
   
   
   
   
-  
-  
-  
-  
   <xs:element name="plurals">
     <xs:complexType>
       <xs:sequence>

make/data/cldr/common/main/ab.xml

@@ -2072,7 +2072,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<zone type="Asia/Phnom_Penh">
 				<exemplarCity draft="unconfirmed">Пномпен</exemplarCity>
 			</zone>
-			<zone type="Pacific/Enderbury">
+			<zone type="Pacific/Kanton">
 				<exemplarCity draft="unconfirmed">Кантон</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -2746,7 +2746,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<standard draft="unconfirmed">Мраҭашәаратәи Африка</standard>
+					<generic draft="unconfirmed">Мраҭашәаратәи Африка</generic>
+					<standard draft="unconfirmed">Мраҭашәаратәи Африка, астандартә аамҭа</standard>
+					<daylight draft="unconfirmed">Мраҭашәаратәи Африка, аԥхынтәи аамҭа</daylight>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3134,11 +3136,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard draft="unconfirmed">Гаиана</standard>
 				</long>
 			</metazone>
-			<metazone type="Hawaii">
-				<long>
-					<standard draft="unconfirmed">Ҳаваи-алеуттәи астандартә аамҭа</standard>
-				</long>
-			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic draft="unconfirmed">Ҳаваи-алеуттәи аамҭа</generic>
@@ -3689,10 +3686,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern draft="unconfirmed">#,##0.00 ¤</pattern>
-					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
-				</currencyFormat>
-				<currencyFormat type="accounting">
-					<pattern alt="alphaNextToNumber">#,##0.00 ¤</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>

make/data/cldr/common/main/am.xml

@@ -215,6 +215,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="hax">ደቡባዊ ሃይዳ</language>
 			<language type="he">ዕብራይስጥ</language>
 			<language type="hi">ሕንድኛ</language>
+			<language type="hi_Latn">ሕንድኛ (ላቲን)</language>
 			<language type="hil">ሂሊጋይኖን</language>
 			<language type="hmn">ህሞንግ</language>
 			<language type="hr">ክሮሽያንኛ</language>
@@ -282,8 +283,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<language type="ksf">ባፊያ</language>
 			<language type="ksh">ኮሎኝኛ</language>
 			<language type="ku">ኩርድሽ</language>
-			<language type="ku" menu="core">ኩርድሽ</language>
-			<language type="ku" menu="extension">ኩርድሽ</language>
 			<language type="kum">ኩማይክ</language>
 			<language type="kv">ኮሚ</language>
 			<language type="kw">ኮርኒሽ</language>
@@ -712,7 +711,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<territory type="CN">ቻይና</territory>
 			<territory type="CO">ኮሎምቢያ</territory>
 			<territory type="CP">ክሊፐርቶን ደሴት</territory>
-			<territory type="CQ">ሳርክ</territory>
 			<territory type="CR">ኮስታሪካ</territory>
 			<territory type="CU">ኩባ</territory>
 			<territory type="CV">ኬፕቨርዴ</territory>
@@ -954,52 +952,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<key type="colNumeric">የቁጥር ድርደራ</key>
 			<key type="colStrength">የድርደራ አቅም</key>
 			<key type="currency">ምንዛሪ</key>
-			<key type="em">ስሜት ገላጭ ምስል አቀራረብ</key>
 			<key type="hc">የሰዓት ዑደት (12 ወይም 24)</key>
 			<key type="lb">መስመር መስበሪያ ቅጥ</key>
-			<key type="lw">የመስመር መሰባበር በቃላት ውስጥ</key>
 			<key type="ms">የመለኪያ ስርዓት</key>
 			<key type="numbers">ቁጥሮች</key>
-			<key type="ss">ከአህጽሮተ ቃል በኋላ የዐረፍተ ነገር መቋረጥ</key>
 			<key type="timezone">የሰዓት ሰቅ</key>
 			<key type="va">የአካባቢ አይነት</key>
 			<key type="x">ለግል ጥቅም</key>
 		</keys>
 		<types>
 			<type key="calendar" type="buddhist">የቡዲስት ቀን አቆጣጠር</type>
-			<type key="calendar" type="buddhist" scope="core">ቡዲስት</type>
 			<type key="calendar" type="chinese">የቻይና የቀን አቆጣጠር</type>
-			<type key="calendar" type="chinese" scope="core">ቻይንኛ</type>
 			<type key="calendar" type="coptic">የኮፕቲክ የቀን አቆጣጠር</type>
-			<type key="calendar" type="coptic" scope="core">ኮፕቲክ</type>
 			<type key="calendar" type="dangi">የዳንጊ የቀን አቆጣጠር</type>
-			<type key="calendar" type="dangi" scope="core">ዳንጊ</type>
 			<type key="calendar" type="ethiopic">የኢትዮጵያ የቀን አቆጣጠር</type>
-			<type key="calendar" type="ethiopic" scope="core">ኢትዮፒክ</type>
 			<type key="calendar" type="ethiopic-amete-alem">የኢትዮፒክ አመተ አለም የቀን አቆጣጠር</type>
-			<type key="calendar" type="ethiopic-amete-alem" scope="core">ኢትዮፒክ ዓመተ ዓለም</type>
 			<type key="calendar" type="gregorian">የግሪጎሪያን የቀን አቆጣጠር</type>
-			<type key="calendar" type="gregorian" scope="core">ግሪጎሪያን</type>
 			<type key="calendar" type="hebrew">የእብራዊያን የቀን አቆጣጠር</type>
-			<type key="calendar" type="hebrew" scope="core">ሂብሩ</type>
 			<type key="calendar" type="indian">የህንድ ብሔራዊ የቀን አቆጣጠር</type>
 			<type key="calendar" type="islamic">የሂጅራ የቀን አቆጣጠር</type>
-			<type key="calendar" type="islamic" scope="core">ሂጅራ</type>
 			<type key="calendar" type="islamic-civil">የሂጅራ የቀን አቆጣጠር (ታቡላር፣ ሲቪል አፖች)</type>
-			<type key="calendar" type="islamic-civil" scope="core">ሂጅራ (ታቡላር፣ የሲቪል ዘመን)</type>
 			<type key="calendar" type="islamic-umalqura">የሂጅራ የቀን አቆጣጠር (ኡም አል-ቁራ)</type>
-			<type key="calendar" type="islamic-umalqura" scope="core">ሂጅራ (ኡሙ አል-ቁራ)</type>
 			<type key="calendar" type="iso8601">ISO-8601 የቀን አቆጣጠር</type>
 			<type key="calendar" type="japanese">የጃፓን የቀን አቆጣጠር</type>
-			<type key="calendar" type="japanese" scope="core">ጃፓንኛ</type>
 			<type key="calendar" type="persian">የፐርሽያ የቀን አቆጣጠር</type>
-			<type key="calendar" type="persian" scope="core">ፐርሽያን</type>
 			<type key="calendar" type="roc">የሚንጉ የቀን አቆጣጠር</type>
-			<type key="calendar" type="roc" scope="core">ሚንጉ</type>
 			<type key="cf" type="account">የሂሳብ ምንዛሪ ቅርጸት</type>
-			<type key="cf" type="account" scope="core">የሂሳብ አያያዝ</type>
 			<type key="cf" type="standard">መደበኛ የምንዛሪ ቅርጸት</type>
-			<type key="cf" type="standard" scope="core">መደበኛ</type>
 			<type key="colAlternate" type="non-ignorable">ምልክቶችን ደርድር</type>
 			<type key="colAlternate" type="shifted">ችላ ባይ ምልክቶችን ደርድር</type>
 			<type key="colBackwards" type="no">የፊደል ጭረቶችን እንደመደበኛ ደርድር</type>
@@ -1009,17 +988,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="colCaseFirst" type="upper">አቢይ ሆሄ መጀመሪያ ደርድር</type>
 			<type key="colCaseLevel" type="no">ያለመልከፊደል ትብ ደርድር</type>
 			<type key="colCaseLevel" type="yes">በመልከፊደል ትብ ደርድር</type>
+			<type key="collation" type="big5han">የባህላዊ ቻይንኛ የድርድር ቅደም ተከተል - ትልቅ5</type>
 			<type key="collation" type="dictionary">የመዝገበ ቃላት የድርድር ቅደም ተከተል</type>
 			<type key="collation" type="ducet">የነባሪ ዩኒኮድ የድርድር ቅደም ተከተል</type>
-			<type key="collation" type="ducet" scope="core">ነባሪ ዩኒኮድ</type>
+			<type key="collation" type="gb2312han">የቀለለ የቻይንኛ የድርደራ ቅደም ተከተል - GB2312</type>
 			<type key="collation" type="phonebook">የስልክ ደብተር ድርድር ቅደም ተከተል</type>
 			<type key="collation" type="phonetic">የፎነቲክ ድርደራ ቅደም ተከተል</type>
 			<type key="collation" type="pinyin">ፒንይን የድርድር ቅደም ተከተል</type>
 			<type key="collation" type="search">ለጠቅላላ ጉዳይ ፍለጋ</type>
-			<type key="collation" type="search" scope="core">ፍለጋ</type>
 			<type key="collation" type="searchjl">በሃንጉል የመጀመሪያ ተነባቢ ፈልግ</type>
 			<type key="collation" type="standard">መደበኛ የድርድር ቅደም ተከተል</type>
-			<type key="collation" type="standard" scope="core">መደበኛ</type>
 			<type key="collation" type="stroke">የበትር ድርድር ቅደም ተከተል</type>
 			<type key="collation" type="traditional">ባህላዊ የድርድር ቅደም ተከተል</type>
 			<type key="collation" type="unihan">የመሰረታዊ በትር ድርድር ቅደም ተከተል</type>
@@ -1035,35 +1013,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="d0" type="fwidth">ሙሉ ወርድ</type>
 			<type key="d0" type="hwidth">ግማሽ ወርድ</type>
 			<type key="d0" type="npinyin">አሃዛዊ</type>
-			<type key="em" type="default" scope="core">ነባሪ</type>
-			<type key="em" type="emoji" scope="core">ስሜት ገላጭ ምስል</type>
-			<type key="em" type="text" scope="core">ጽሑፍ</type>
 			<type key="hc" type="h11">የ12 ሰዓት ስርዓት (0–11)</type>
-			<type key="hc" type="h11" scope="core">12 (0–11)</type>
 			<type key="hc" type="h12">የ12 ሰዓት ስርዓት (1–12)</type>
-			<type key="hc" type="h12" scope="core">12 (1–12)</type>
 			<type key="hc" type="h23">የ24 ሰዓት ስርዓት (0–23)</type>
-			<type key="hc" type="h23" scope="core">24 (0–23)</type>
 			<type key="hc" type="h24">የ24 ሰዓት ስርዓት (1–24)</type>
-			<type key="hc" type="h24" scope="core">24 (1–24)</type>
 			<type key="lb" type="loose">ላላ ያለ መስመር መስበሪያ ቅጥ</type>
-			<type key="lb" type="loose" scope="core">ልቅ</type>
 			<type key="lb" type="normal">መደበኛ መስመር መስበሪያ ቅጥ</type>
-			<type key="lb" type="normal" scope="core">መደበኛ</type>
 			<type key="lb" type="strict">ጠበቅ ያለ መስመር መስበሪያ ቅጥ</type>
-			<type key="lb" type="strict" scope="core">ጥብቅ</type>
-			<type key="lw" type="breakall" scope="core">ሁሉንም ሰብረው</type>
-			<type key="lw" type="keepall" scope="core">ሁሉንም አቆይ</type>
-			<type key="lw" type="normal" scope="core">መደበኛ</type>
-			<type key="lw" type="phrase" scope="core">በዓረፍተ ነገሮች ውስጥ ያስቀምጡ</type>
 			<type key="m0" type="bgn">ዩኤስ ቢጂኤን ትራንስሊትሬሽን</type>
 			<type key="m0" type="ungegn">ዩኤን ጂኢጂኤን ትራንስሊትሬሽን</type>
 			<type key="ms" type="metric">ሜትሪክ ስርዓት</type>
-			<type key="ms" type="metric" scope="core">መለኪያ</type>
 			<type key="ms" type="uksystem">ኢምፔሪያል የመለኪያ ስርዓት</type>
-			<type key="ms" type="uksystem" scope="core">ዩኬ</type>
 			<type key="ms" type="ussystem">የአሜሪካ መለኪያ ስርዓት</type>
-			<type key="ms" type="ussystem" scope="core">ዩኤስ</type>
 			<type key="numbers" type="arab">የአረቢክ-ኢንዲክ አሃዞች</type>
 			<type key="numbers" type="arabext">የተራዘሙ የአረቢክ-ኢንዲክ አሃዞች</type>
 			<type key="numbers" type="armn">የአርመንኛ ቁጥሮች</type>
@@ -1108,8 +1069,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<type key="numbers" type="tibt">የቲቤት አሃዞች</type>
 			<type key="numbers" type="traditional">ተለምዷዊ ቁጥሮች</type>
 			<type key="numbers" type="vaii">የቫይ አሃዞች</type>
-			<type key="ss" type="none" scope="core">ጠፍቷል</type>
-			<type key="ss" type="standard" scope="core">በርቷል</type>
 		</types>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">ሜትሪክ</measurementSystemName>
@@ -1139,23 +1098,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<dateTimeFormats>
 					<availableFormats>
 						<dateFormatItem id="GyMMM">MMM፣ y G</dateFormatItem>
-						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
-						<dateFormatItem id="yyyyMd">GGGGG y-MM-dd</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd, E</dateFormatItem>
 					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="H">
-							<greatestDifference id="H">HH–HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hv">
-							<greatestDifference id="H">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="coptic">
 				<eras>
 					<eraAbbr>
+						<era type="0" draft="unconfirmed">ዓ/ዓ</era>
 						<era type="1" draft="unconfirmed">ዓ/ም</era>
 					</eraAbbr>
 				</eras>
@@ -1184,18 +1133,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<availableFormats>
 						<dateFormatItem id="GyMMM">MMM፣ y G</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E, MMMM d</dateFormatItem>
-						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
-						<dateFormatItem id="yyyyMd">GGGGG y-MM-dd</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd, E</dateFormatItem>
 					</availableFormats>
-					<intervalFormats>
-						<intervalFormatItem id="H">
-							<greatestDifference id="H">HH–HH</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="Hv">
-							<greatestDifference id="H">HH–HH v</greatestDifference>
-						</intervalFormatItem>
-					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="generic">
@@ -1226,33 +1164,21 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="relative">
-							<pattern>{1} በ {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="long">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="relative">
-							<pattern>{1} በ {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="medium">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="relative">
-							<pattern>{1} በ {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="relative">
-							<pattern>{1} በ {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
@@ -1489,6 +1415,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dayPeriodWidth type="narrow">
 							<dayPeriod type="am">ጠ</dayPeriod>
 							<dayPeriod type="pm">ከ</dayPeriod>
+							<dayPeriod type="morning1">ጥዋት</dayPeriod>
+							<dayPeriod type="afternoon1">ከሰዓት</dayPeriod>
+							<dayPeriod type="evening1">ማታ</dayPeriod>
+							<dayPeriod type="night1">ሌሊት</dayPeriod>
 						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
@@ -1496,6 +1426,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<eraNames>
 						<era type="0">ዓመተ ዓለም</era>
 						<era type="1">ዓመተ ምሕረት</era>
+						<era type="1" alt="variant">ዓ/ም</era>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">ዓ/ዓ</era>
@@ -1575,17 +1506,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="Bh">B h</dateFormatItem>
 						<dateFormatItem id="Bhm">B h:mm</dateFormatItem>
 						<dateFormatItem id="Bhms">B h:mm:ss</dateFormatItem>
-						<dateFormatItem id="EBh">E B h</dateFormatItem>
 						<dateFormatItem id="EBhm">E B h:mm</dateFormatItem>
 						<dateFormatItem id="EBhms">E B h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Ed">E d</dateFormatItem>
-						<dateFormatItem id="Eh">E a h</dateFormatItem>
 						<dateFormatItem id="Ehm">E a h:mm</dateFormatItem>
 						<dateFormatItem id="Ehms">E a h:mm:ss</dateFormatItem>
 						<dateFormatItem id="Gy">y G</dateFormatItem>
-						<dateFormatItem id="GyM">M/y G</dateFormatItem>
 						<dateFormatItem id="GyMd">d/M/y GGGGG</dateFormatItem>
-						<dateFormatItem id="GyMEd">E d/M/y G</dateFormatItem>
 						<dateFormatItem id="GyMMM">MMM y G</dateFormatItem>
 						<dateFormatItem id="GyMMMd">MMM d y G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd">E MMM d y G</dateFormatItem>
@@ -1593,7 +1520,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="H">H</dateFormatItem>
 						<dateFormatItem id="hm">a h:mm</dateFormatItem>
 						<dateFormatItem id="hms">a h:mm:ss</dateFormatItem>
-						<dateFormatItem id="hv">a h v</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E፣ d/M</dateFormatItem>
 						<dateFormatItem id="MMMEd">E፣ MMM d</dateFormatItem>
@@ -1612,9 +1538,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="Bh">
-							<greatestDifference id="B">B h – B h</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="GyM">
 							<greatestDifference id="G">GGGGG M/y – GGGGG M/y</greatestDifference>
 							<greatestDifference id="M">GGGGG M/y – M/y</greatestDifference>
@@ -1758,26 +1681,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="0">ይህ ሩብ</relative>
 				<relative type="1">የሚቀጥለው ሩብ</relative>
 				<relativeTime type="future">
-					<relativeTimePattern count="one">በ{0} ሩብ</relativeTimePattern>
-					<relativeTimePattern count="other">በ{0} ሩብ</relativeTimePattern>
+					<relativeTimePattern count="one">+{0} ሩብ</relativeTimePattern>
+					<relativeTimePattern count="other">+{0} ሩብ</relativeTimePattern>
 				</relativeTime>
 				<relativeTime type="past">
 					<relativeTimePattern count="one">{0} ሩብ በፊት</relativeTimePattern>
 					<relativeTimePattern count="other">{0} ሩብ በፊት</relativeTimePattern>
 				</relativeTime>
 			</field>
-			<field type="quarter-short">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">በ{0} ሩብ</relativeTimePattern>
-					<relativeTimePattern count="other">በ{0} ሩብ</relativeTimePattern>
-				</relativeTime>
-			</field>
-			<field type="quarter-narrow">
-				<relativeTime type="future">
-					<relativeTimePattern count="one">በ{0} ሩብ</relativeTimePattern>
-					<relativeTimePattern count="other">በ{0} ሩብ</relativeTimePattern>
-				</relativeTime>
-			</field>
 			<field type="month">
 				<displayName>ወር</displayName>
 				<relative type="-1">ያለፈው ወር</relative>
@@ -2079,7 +1990,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<hourFormat>+HHmm;-HHmm</hourFormat>
 			<gmtFormat>ጂ ኤም ቲ{0}</gmtFormat>
 			<gmtZeroFormat>ጂ ኤም ቲ</gmtZeroFormat>
-			<gmtUnknownFormat>ጂ ኤም ቲ+</gmtUnknownFormat>
 			<regionFormat>{0} ሰዓት</regionFormat>
 			<regionFormat type="daylight">{0} የቀን ብርሃን ሰዓት</regionFormat>
 			<regionFormat type="standard">{0} መደበኛ ሰዓት</regionFormat>
@@ -2701,6 +2611,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<exemplarCity>ፍኖም ፔንህ</exemplarCity>
 			</zone>
 			<zone type="Pacific/Enderbury">
+				<exemplarCity>ኢንደርበሪ</exemplarCity>
+			</zone>
+			<zone type="Pacific/Kanton">
 				<exemplarCity>ካንቶን</exemplarCity>
 			</zone>
 			<zone type="Pacific/Kiritimati">
@@ -3370,7 +3283,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</metazone>
 			<metazone type="Africa_Western">
 				<long>
-					<standard>የምዕራብ አፍሪካ ሰዓት</standard>
+					<generic>የምዕራብ አፍሪካ ሰዓት</generic>
+					<standard>የምዕራብ አፍሪካ መደበኛ ሰዓት</standard>
+					<daylight>የምዕራብ አፍሪካ ክረምት ሰዓት</daylight>
 				</long>
 			</metazone>
 			<metazone type="Alaska">
@@ -3727,11 +3642,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					<standard>የጉያና ሰዓት</standard>
 				</long>
 			</metazone>
-			<metazone type="Hawaii">
-				<long>
-					<standard>የሃዋይ አሌኡት መደበኛ ሰዓት አቆጣጠር</standard>
-				</long>
-			</metazone>
 			<metazone type="Hawaii_Aleutian">
 				<long>
 					<generic>የሃዋይ አሌኡት ሰዓት አቆጣጠር</generic>
@@ -4315,6 +4225,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
+					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
 				</currencyFormat>
 				<currencyFormat type="accounting">
 					<pattern>¤#,##0.00;(¤#,##0.00)</pattern>
@@ -4864,11 +4775,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="XCD">
 				<displayName>የምዕራብ ካሪብያን ዶላር</displayName>
 			</currency>
-			<currency type="XCG">
-				<displayName>የካሪቢያን ጊልደር</displayName>
-				<displayName count="one">የካሪቢያን ጊልደር</displayName>
-				<displayName count="other">የካሪቢያን ጊልደር</displayName>
-			</currency>
 			<currency type="XOF">
 				<displayName>የምዕራብ አፍሪካ ሴፋ ፍራንክ</displayName>
 			</currency>
@@ -4893,11 +4799,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="ZWD">
 				<displayName>የዚምቧቡዌ ዶላር</displayName>
 			</currency>
-			<currency type="ZWG">
-				<displayName>የዚምባብዌ ወርቅ</displayName>
-				<displayName count="one">የዚምባብዌ ወርቅ</displayName>
-				<displayName count="other">የዚምባብዌ ወርቅ</displayName>
-			</currency>
 		</currencies>
 		<miscPatterns numberSystem="latn">
 			<pattern type="atLeast">{0}+</pattern>
@@ -4921,6 +4822,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<compoundUnit type="10p-3">
 				<unitPrefixPattern>ሚሊ{0}</unitPrefixPattern>
 			</compoundUnit>
+			<compoundUnit type="10p-6">
+				<unitPrefixPattern>ማይክሮ{0}</unitPrefixPattern>
+			</compoundUnit>
 			<compoundUnit type="10p-9">
 				<unitPrefixPattern>ናኖ{0}</unitPrefixPattern>
 			</compoundUnit>
@@ -4957,6 +4861,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<compoundUnit type="10p18">
 				<unitPrefixPattern>ኤክሳ {0}</unitPrefixPattern>
 			</compoundUnit>
+			<compoundUnit type="10p21">
+				<unitPrefixPattern>ዜታ {0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p24">
+				<unitPrefixPattern>ዮታ {0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p27">
+				<unitPrefixPattern>ሮና {0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p8">
+				<unitPrefixPattern>ዮቢ {0}</unitPrefixPattern>
+			</compoundUnit>
 			<compoundUnit type="per">
 				<compoundUnitPattern>{0} በ{1}</compoundUnitPattern>
 			</compoundUnit>
@@ -4975,12 +4891,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} ጂ-ኃይል</unitPattern>
 			</unit>
 			<unit type="angle-revolution">
+				<displayName>ኡደት</displayName>
 				<unitPattern count="one">{0} ኡደት</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ኡደት</unitPattern>
 				<unitPattern count="other">{0} ኡደት</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ኡደቶች</unitPattern>
 			</unit>
 			<unit type="angle-radian">
+				<displayName>ራዲ</displayName>
 				<unitPattern count="one">{0} ራዲ</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ራዲያን</unitPattern>
 				<unitPattern count="other">{0} ራዲ</unitPattern>
@@ -5004,6 +4922,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ካሬ ሜትር</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ካሬ ሜትር</unitPattern>
 			</unit>
+			<unit type="area-square-yard">
+				<displayName>ስኴር ያርድ</displayName>
+				<unitPattern count="one">{0} ስኴር ያርድ</unitPattern>
+				<unitPattern count="other">{0} ስኴር ያርድ</unitPattern>
+			</unit>
 			<unit type="area-dunam">
 				<displayName>ጋሻ</displayName>
 			</unit>
@@ -5017,12 +4940,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ንጥሎች</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ንጥሎች</unitPattern>
 			</unit>
-			<unit type="concentr-part">
-				<displayName>ክፍል</displayName>
-				<unitPattern count="one">{0} ክፍል</unitPattern>
-				<unitPattern count="other">{0} ክፍል</unitPattern>
-			</unit>
-			<unit type="concentr-part-per-1e6">
+			<unit type="concentr-permillion">
 				<unitPattern count="one">{0} ppm</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ክፍል በየሚሊዮን</unitPattern>
 				<unitPattern count="other">{0} ppm</unitPattern>
@@ -5046,11 +4964,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} mol</unitPattern>
 				<unitPattern count="other" case="accusative">{0} moles</unitPattern>
 			</unit>
-			<unit type="concentr-ofglucose">
-				<displayName>ግሉኮስ</displayName>
-				<unitPattern count="one">{0} ግሉኮስ</unitPattern>
-				<unitPattern count="other">{0} ግሉኮስ</unitPattern>
-			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<displayName>ሊትሮች በ100 ኪሎሜትሮች</displayName>
 				<unitPattern count="one">{0} ሊትር በ100 ኪሎሜትሮች</unitPattern>
@@ -5118,6 +5031,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} ማይክሮሰከንድ</unitPattern>
 			</unit>
 			<unit type="electric-ampere">
+				<displayName>አምፒር</displayName>
 				<unitPattern count="one">{0} አምፒር</unitPattern>
 				<unitPattern count="one" case="accusative">{0} አምፒር</unitPattern>
 				<unitPattern count="other">{0} አምፒር</unitPattern>
@@ -5130,11 +5044,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} ohms</unitPattern>
 			</unit>
 			<unit type="electric-volt">
+				<displayName>ቮልት</displayName>
 				<unitPattern count="one">{0} ቮልት</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ቮልት</unitPattern>
 				<unitPattern count="other">{0} ቮልት</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ቮልቶች</unitPattern>
 			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ኪሎ ካሎሪ</displayName>
+				<unitPattern count="one">{0} ኪሎ ካሎሪ</unitPattern>
+				<unitPattern count="one" case="accusative">{0} ኪሎ ካሎሪ</unitPattern>
+				<unitPattern count="other">{0} ኪሎ ካሎሪ</unitPattern>
+				<unitPattern count="other" case="accusative">{0} ኪሎ ካሎሪ</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>ኪጁ</displayName>
+				<unitPattern count="one">{0} ኪጁ</unitPattern>
+				<unitPattern count="one" case="accusative">{0} ኪጁ</unitPattern>
+				<unitPattern count="other">{0} ኪጁ</unitPattern>
+				<unitPattern count="other" case="accusative">{0} ኪጁ</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>ጁልስ</displayName>
+				<unitPattern count="one">{0} ጁልስ</unitPattern>
+				<unitPattern count="one" case="accusative">{0} ጁልስ</unitPattern>
+				<unitPattern count="other">{0} ጁልስ</unitPattern>
+				<unitPattern count="other" case="accusative">{0} ጁልስ</unitPattern>
+			</unit>
 			<unit type="force-newton">
 				<unitPattern count="one">{0} ኒ</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ኒውተን</unitPattern>
@@ -5148,6 +5084,34 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ኪሎዋት-ሰዓታት በየ 100 ኪሎሜትሮች</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ኪሎዋት-ሰዓታት በየ 100 ኪሎሜትሮች</unitPattern>
 			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>ጊጋኸርዝ</displayName>
+				<unitPattern count="one">{0} ጊጋኸርዝ</unitPattern>
+				<unitPattern count="one" case="accusative">{0} ጊጋኸርዝ</unitPattern>
+				<unitPattern count="other">{0} ጊጋኸርዝ</unitPattern>
+				<unitPattern count="other" case="accusative">{0} ጊጋኸርዝ</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>ሜጋኸርዝ</displayName>
+				<unitPattern count="one">{0} ሜጋኸርዝ</unitPattern>
+				<unitPattern count="one" case="accusative">{0} ሜጋኸርዝ</unitPattern>
+				<unitPattern count="other">{0} ሜጋኸርዝ</unitPattern>
+				<unitPattern count="other" case="accusative">{0} ሜጋኸርዝ</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>ኪሎኸርዝ</displayName>
+				<unitPattern count="one">{0} ኪሎኸርዝ</unitPattern>
+				<unitPattern count="one" case="accusative">{0} ኪሎኸርዝ</unitPattern>
+				<unitPattern count="other">{0} ኪሎኸርዝ</unitPattern>
+				<unitPattern count="other" case="accusative">{0} ኪሎኸርዝ</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>ኸርዝ</displayName>
+				<unitPattern count="one">{0} ኸርዝ</unitPattern>
+				<unitPattern count="one" case="accusative">{0} ኸርዝ</unitPattern>
+				<unitPattern count="other">{0} ኸርዝ</unitPattern>
+				<unitPattern count="other" case="accusative">{0} ኸርዝ</unitPattern>
+			</unit>
 			<unit type="graphics-em">
 				<displayName>ታይፖግራፊክ em</displayName>
 			</unit>
@@ -5238,7 +5202,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ግራም</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ግራም</unitPattern>
 			</unit>
+			<unit type="mass-milligram">
+				<displayName>ሚግ</displayName>
+				<unitPattern count="one">{0} ሚግ</unitPattern>
+				<unitPattern count="one" case="accusative">{0} ሚግ</unitPattern>
+				<unitPattern count="other">{0} ሚግ</unitPattern>
+				<unitPattern count="other" case="accusative">{0} ሚግ</unitPattern>
+			</unit>
 			<unit type="mass-microgram">
+				<displayName>ማግ</displayName>
 				<unitPattern count="one">{0} ማግ</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ማይክሮ ግራም</unitPattern>
 				<unitPattern count="other">{0} ማግ</unitPattern>
@@ -5251,6 +5223,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} CD</unitPattern>
 				<unitPattern count="other" case="accusative">{0} ካራቶች</unitPattern>
 			</unit>
+			<unit type="mass-dalton">
+				<displayName>ዳልተንስ</displayName>
+				<unitPattern count="one">{0} ዳልተንስ</unitPattern>
+				<unitPattern count="other">{0} ዳልተንስ</unitPattern>
+			</unit>
 			<unit type="mass-earth-mass">
 				<unitPattern count="one">{0} ኤርዝማስስ</unitPattern>
 				<unitPattern count="other">{0} ኤርዝማስስ</unitPattern>
@@ -5259,8 +5236,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ሶላር ማስስ</unitPattern>
 				<unitPattern count="other">{0} ሶላር ማስስ</unitPattern>
 			</unit>
+			<unit type="power-gigawatt">
+				<displayName>ጊጋ ዋት</displayName>
+				<unitPattern count="one">{0} ጊዋ</unitPattern>
+				<unitPattern count="one" case="accusative">{0} ጊዋ</unitPattern>
+				<unitPattern count="other">{0} ጊዋ</unitPattern>
+				<unitPattern count="other" case="accusative">{0} ጊዋ</unitPattern>
+			</unit>
 			<unit type="power-megawatt">
 				<displayName>ሜጋ ዋት</displayName>
+				<unitPattern count="one">{0} ሜዋ</unitPattern>
+				<unitPattern count="one" case="accusative">{0} ሜዋ</unitPattern>
+				<unitPattern count="other">{0} ሜዋ</unitPattern>
+				<unitPattern count="other" case="accusative">{0} ሜዋ</unitPattern>
 			</unit>
 			<unit type="power-kilowatt">
 				<unitPattern count="one">{0} ኪሎዋት</unitPattern>
@@ -5276,6 +5264,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</unit>
 			<unit type="power-milliwatt">
 				<displayName>ሚሊ ዋት</displayName>
+				<unitPattern count="one">{0} ሚዋ</unitPattern>
+				<unitPattern count="one" case="accusative">{0} ሚዋ</unitPattern>
+				<unitPattern count="other">{0} ሚዋ</unitPattern>
+				<unitPattern count="other" case="accusative">{0} ሚዋ</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
 				<unitPattern count="one">{0} የፈረስ ጉልበት</unitPattern>
@@ -5324,6 +5316,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ዲግሪ ፋራንሃይት</unitPattern>
 			</unit>
 			<unit type="temperature-kelvin">
+				<displayName>ኬ</displayName>
 				<unitPattern count="one">{0} ኬ</unitPattern>
 				<unitPattern count="one" case="accusative">{0} ኬልቪን</unitPattern>
 				<unitPattern count="other">{0} ኬ</unitPattern>
@@ -5339,8 +5332,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ኩቢክ ማይል</unitPattern>
 				<unitPattern count="other">{0} ኩቢክ ማይል</unitPattern>
 			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>ኪዩቢክ ያርድ</displayName>
+				<unitPattern count="one">{0} ኪዩቢክ ያርድ</unitPattern>
+				<unitPattern count="other">{0} ኪዩቢክ ያርድ</unitPattern>
+			</unit>
+			<unit type="volume-megaliter">
+				<displayName>ሜጋሊትር</displayName>
+				<unitPattern count="one">{0} ሜሊ</unitPattern>
+				<unitPattern count="one" case="accusative">{0} ሜሊ</unitPattern>
+				<unitPattern count="other">{0} ሜሊ</unitPattern>
+				<unitPattern count="other" case="accusative">{0} ሜሊ</unitPattern>
+			</unit>
 			<unit type="volume-hectoliter">
 				<displayName>ሄክቶሊትር</displayName>
+				<unitPattern count="one">{0} ሄሊ</unitPattern>
+				<unitPattern count="one" case="accusative">{0} ሄሊ</unitPattern>
+				<unitPattern count="other">{0} ሄሊ</unitPattern>
+				<unitPattern count="other" case="accusative">{0} ሄሊ</unitPattern>
 			</unit>
 			<unit type="volume-liter">
 				<unitPattern count="one">{0} ሊትር</unitPattern>
@@ -5369,47 +5378,46 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other" case="accusative">{0} ሜትሪክ ፒንቶች</unitPattern>
 			</unit>
 			<unit type="volume-gallon">
+				<displayName>ጋሎን</displayName>
 				<unitPattern count="one">{0}/ጋሎን</unitPattern>
 				<unitPattern count="other">{0}/ጋሎን</unitPattern>
+				<perUnitPattern>{0}/ጋሎን</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>ኳርትስ</displayName>
+				<unitPattern count="one">{0} ኳርትስ</unitPattern>
+				<unitPattern count="other">{0} ኳርትስ</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ኩባያ</displayName>
+				<unitPattern count="one">{0} ኩባያ</unitPattern>
+				<unitPattern count="other">{0} ኩባያ</unitPattern>
 			</unit>
 			<unit type="volume-fluid-ounce-imperial">
 				<displayName>Imp. fluid ኦንስስ</displayName>
 				<unitPattern count="one">{0} Imp. fluid ኦንስስ</unitPattern>
 				<unitPattern count="other">{0} Imp. fluid ኦንስስ</unitPattern>
 			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>የሻይ ማንኪያ</displayName>
+				<unitPattern count="one">{0} የሻይ ማንኪያ</unitPattern>
+				<unitPattern count="other">{0} የሻይ ማንኪያ</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>የሻይ ማንኪያዎች</displayName>
+				<unitPattern count="one">{0} የሻይ ማንኪያዎች</unitPattern>
+				<unitPattern count="other">{0} የሻይ ማንኪያዎች</unitPattern>
+			</unit>
 			<unit type="volume-barrel">
 				<unitPattern count="one">{0} በርሜል</unitPattern>
 				<unitPattern count="other">{0} በርሜሎች</unitPattern>
 			</unit>
-			<unit type="concentr-katal">
-				<displayName>ካታልስ</displayName>
-				<unitPattern count="one">{0} ካት</unitPattern>
-				<unitPattern count="other">{0} ካት</unitPattern>
-			</unit>
-			<unit type="electric-henry">
-				<displayName>ሄነሪስ</displayName>
-				<unitPattern count="one">{0} ሄ</unitPattern>
-				<unitPattern count="other">{0} ሄ</unitPattern>
-			</unit>
-			<unit type="energy-calorie-it">
-				<displayName>ካሎሪ [IT]</displayName>
-				<unitPattern count="one">{0} ካሎሪ [IT]</unitPattern>
-				<unitPattern count="other">{0} ካሎሪ [IT]</unitPattern>
-			</unit>
-			<unit type="force-kilogram-force">
-				<displayName>ኪሎግራም - ኃይል</displayName>
-				<unitPattern count="one">{0} ኪግ-ኃይል</unitPattern>
-				<unitPattern count="other">{0} ኪግ-ኃይል</unitPattern>
-			</unit>
-			<unit type="magnetic-tesla">
-				<displayName>ቴስላስ</displayName>
-				<unitPattern count="one">{0} ቴ</unitPattern>
-				<unitPattern count="other">{0} ቴ</unitPattern>
-			</unit>
-			<unit type="magnetic-weber">
-				<displayName>ዌበርስ</displayName>
-				<unitPattern count="one">{0} ዌበ</unitPattern>
-				<unitPattern count="other">{0} ዌበ</unitPattern>
+			<unit type="speed-light-speed">
+				<displayName>ብርሃን</displayName>
+				<unitPattern count="one">{0} ብርሃን</unitPattern>
+				<unitPattern count="one" case="accusative">{0} ብርሃን</unitPattern>
+				<unitPattern count="other">{0} ብርሃን</unitPattern>
+				<unitPattern count="other" case="accusative">{0} ብርሃን</unitPattern>
 			</unit>
 			<unit type="duration-night">
 				<displayName>ለሊት</displayName>
@@ -5417,6 +5425,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one" case="accusative">{0}/ለሊት</unitPattern>
 				<unitPattern count="other">{0}/ለሊት</unitPattern>
 				<unitPattern count="other" case="accusative">{0}/ለሊት</unitPattern>
+				<perUnitPattern>{0}/ለሊት</perUnitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName>ዓቢይ አቅጣጫ</displayName>
@@ -5604,22 +5613,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ንጥል</unitPattern>
 				<unitPattern count="other">{0} ንጥል</unitPattern>
 			</unit>
-			<unit type="concentr-part">
-				<displayName>ክፍል</displayName>
-				<unitPattern count="one">{0} ክፍል</unitPattern>
-				<unitPattern count="other">{0} ክፍል</unitPattern>
-			</unit>
 			<unit type="concentr-percent">
 				<displayName>ፐርሰንት</displayName>
 			</unit>
 			<unit type="concentr-permille">
 				<displayName>በማይል</displayName>
 			</unit>
-			<unit type="concentr-ofglucose">
-				<displayName>ግሉኮስ</displayName>
-				<unitPattern count="one">{0} ግሉኮስ</unitPattern>
-				<unitPattern count="other">{0} ግሉኮስ</unitPattern>
-			</unit>
 			<unit type="consumption-liter-per-kilometer">
 				<displayName>ሊ/ኪሜ</displayName>
 				<unitPattern count="one">{0} ሊ/ኪሜ</unitPattern>
@@ -6285,36 +6284,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} የፈሳሽ መለኪያ</unitPattern>
 				<unitPattern count="other">{0} የፈሳሽ መለኪያ</unitPattern>
 			</unit>
-			<unit type="concentr-katal">
-				<displayName>ካት</displayName>
-				<unitPattern count="one">{0} ካት</unitPattern>
-				<unitPattern count="other">{0} ካት</unitPattern>
-			</unit>
-			<unit type="electric-henry">
-				<displayName>ሄ</displayName>
-				<unitPattern count="one">{0} ሄ</unitPattern>
-				<unitPattern count="other">{0} ሄ</unitPattern>
-			</unit>
-			<unit type="energy-calorie-it">
-				<displayName>ካሎሪ-IT</displayName>
-				<unitPattern count="one">{0} ካሎሪ-IT</unitPattern>
-				<unitPattern count="other">{0} ካሎሪ-IT</unitPattern>
-			</unit>
-			<unit type="force-kilogram-force">
-				<displayName>ኪግ-ኃይል</displayName>
-				<unitPattern count="one">{0} ኪግ-ኃይል</unitPattern>
-				<unitPattern count="other">{0} ኪግ-ኃይል</unitPattern>
-			</unit>
-			<unit type="magnetic-tesla">
-				<displayName>ቴ</displayName>
-				<unitPattern count="one">{0} ቴ</unitPattern>
-				<unitPattern count="other">{0} ቴ</unitPattern>
-			</unit>
-			<unit type="magnetic-weber">
-				<displayName>ዌበ</displayName>
-				<unitPattern count="one">{0} ዌበ</unitPattern>
-				<unitPattern count="other">{0} ዌበ</unitPattern>
-			</unit>
 			<unit type="speed-light-speed">
 				<displayName>ብርሃን</displayName>
 				<unitPattern count="one">{0} ብርሃን</unitPattern>
@@ -6335,12 +6304,28 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
+			<compoundUnit type="10p-6">
+				<unitPrefixPattern>ማይክሮ{0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p21">
+				<unitPrefixPattern>ዜታ {0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p24">
+				<unitPrefixPattern>ዮታ {0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="10p27">
+				<unitPrefixPattern>ሮና {0}</unitPrefixPattern>
+			</compoundUnit>
+			<compoundUnit type="1024p8">
+				<unitPrefixPattern>ዮቢ {0}</unitPrefixPattern>
+			</compoundUnit>
 			<unit type="angle-revolution">
 				<displayName>ኡደ</displayName>
 				<unitPattern count="one">{0} ኡደ</unitPattern>
 				<unitPattern count="other">{0}ኡደ</unitPattern>
 			</unit>
 			<unit type="angle-radian">
+				<displayName>ራዲ</displayName>
 				<unitPattern count="one">{0}ራዲ</unitPattern>
 				<unitPattern count="other">{0}ራዲ</unitPattern>
 			</unit>
@@ -6360,23 +6345,17 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ማይል²</unitPattern>
 				<unitPattern count="other">{0} ማይል²</unitPattern>
 			</unit>
+			<unit type="area-square-yard">
+				<unitPattern count="one">{0} ስኴር ያርድ</unitPattern>
+				<unitPattern count="other">{0} ስኴር ያርድ</unitPattern>
+			</unit>
 			<unit type="area-square-foot">
 				<unitPattern count="one">{0} ጫማ²</unitPattern>
 				<unitPattern count="other">{0} ጫማ²</unitPattern>
 			</unit>
-			<unit type="concentr-part">
-				<displayName>ክፍል</displayName>
-				<unitPattern count="one">{0} ክፍል</unitPattern>
-				<unitPattern count="other">{0} ክፍል</unitPattern>
-			</unit>
 			<unit type="concentr-percent">
 				<displayName>%</displayName>
 			</unit>
-			<unit type="concentr-ofglucose">
-				<displayName>ግሉኮስ</displayName>
-				<unitPattern count="one">{0} ግሉኮስ</unitPattern>
-				<unitPattern count="other">{0} ግሉኮስ</unitPattern>
-			</unit>
 			<unit type="consumption-liter-per-100-kilometer">
 				<unitPattern count="one">{0}ሊበ100ኪሜ</unitPattern>
 				<unitPattern count="other">{0}ሊበ100ኪሜ</unitPattern>
@@ -6424,6 +6403,51 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ሰ</unitPattern>
 				<unitPattern count="other">{0} ሰ</unitPattern>
 			</unit>
+			<unit type="electric-ampere">
+				<displayName>አምፒር</displayName>
+				<unitPattern count="one">{0} አምፒር</unitPattern>
+				<unitPattern count="other">{0} አምፒር</unitPattern>
+			</unit>
+			<unit type="electric-volt">
+				<displayName>ቮልት</displayName>
+				<unitPattern count="one">{0} ቮልት</unitPattern>
+				<unitPattern count="other">{0} ቮልት</unitPattern>
+			</unit>
+			<unit type="energy-kilocalorie">
+				<displayName>ኪሎ ካሎሪ</displayName>
+				<unitPattern count="one">{0} ኪሎ ካሎሪ</unitPattern>
+				<unitPattern count="other">{0} ኪሎ ካሎሪ</unitPattern>
+			</unit>
+			<unit type="energy-kilojoule">
+				<displayName>ኪጁ</displayName>
+				<unitPattern count="one">{0} ኪጁ</unitPattern>
+				<unitPattern count="other">{0} ኪጁ</unitPattern>
+			</unit>
+			<unit type="energy-joule">
+				<displayName>ጁልስ</displayName>
+				<unitPattern count="one">{0} ጁልስ</unitPattern>
+				<unitPattern count="other">{0} ጁልስ</unitPattern>
+			</unit>
+			<unit type="frequency-gigahertz">
+				<displayName>ጊጋኸርዝ</displayName>
+				<unitPattern count="one">{0} ጊጋኸርዝ</unitPattern>
+				<unitPattern count="other">{0} ጊጋኸርዝ</unitPattern>
+			</unit>
+			<unit type="frequency-megahertz">
+				<displayName>ሜጋኸርዝ</displayName>
+				<unitPattern count="one">{0} ሜጋኸርዝ</unitPattern>
+				<unitPattern count="other">{0} ሜጋኸርዝ</unitPattern>
+			</unit>
+			<unit type="frequency-kilohertz">
+				<displayName>ኪሎኸርዝ</displayName>
+				<unitPattern count="one">{0} ኪሎኸርዝ</unitPattern>
+				<unitPattern count="other">{0} ኪሎኸርዝ</unitPattern>
+			</unit>
+			<unit type="frequency-hertz">
+				<displayName>ኸርዝ</displayName>
+				<unitPattern count="one">{0} ኸርዝ</unitPattern>
+				<unitPattern count="other">{0} ኸርዝ</unitPattern>
+			</unit>
 			<unit type="graphics-megapixel">
 				<unitPattern count="one">{0} ሜፒ</unitPattern>
 				<unitPattern count="other">{0} ሜፒ</unitPattern>
@@ -6441,11 +6465,33 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ሚሊግራም</unitPattern>
 				<unitPattern count="other">{0} ሚሊግራም</unitPattern>
 			</unit>
+			<unit type="mass-microgram">
+				<displayName>ማግ</displayName>
+				<unitPattern count="one">{0} ማግ</unitPattern>
+				<unitPattern count="other">{0} ማግ</unitPattern>
+			</unit>
 			<unit type="mass-carat">
 				<displayName>ካራት</displayName>
 			</unit>
+			<unit type="mass-dalton">
+				<displayName>ዳልተንስ</displayName>
+				<unitPattern count="one">{0} ዳልተንስ</unitPattern>
+				<unitPattern count="other">{0} ዳልተንስ</unitPattern>
+			</unit>
 			<unit type="power-gigawatt">
 				<displayName>ጊዋ</displayName>
+				<unitPattern count="one">{0} ጊዋ</unitPattern>
+				<unitPattern count="other">{0} ጊዋ</unitPattern>
+			</unit>
+			<unit type="power-megawatt">
+				<displayName>ሜዋ</displayName>
+				<unitPattern count="one">{0} ሜዋ</unitPattern>
+				<unitPattern count="other">{0} ሜዋ</unitPattern>
+			</unit>
+			<unit type="power-milliwatt">
+				<displayName>ሚዋ</displayName>
+				<unitPattern count="one">{0} ሚዋ</unitPattern>
+				<unitPattern count="other">{0} ሚዋ</unitPattern>
 			</unit>
 			<unit type="power-horsepower">
 				<unitPattern count="one">{0} የፈረስ ኃይል</unitPattern>
@@ -6475,10 +6521,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0}°</unitPattern>
 				<unitPattern count="other">{0}°</unitPattern>
 			</unit>
+			<unit type="temperature-kelvin">
+				<displayName>ኬ</displayName>
+				<unitPattern count="one">{0} ኬ</unitPattern>
+				<unitPattern count="other">{0} ኬ</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<displayName>ኪዩቢክ ያርድ</displayName>
+				<unitPattern count="one">{0} ኪዩቢክ ያርድ</unitPattern>
+				<unitPattern count="other">{0} ኪዩቢክ ያርድ</unitPattern>
+			</unit>
 			<unit type="volume-megaliter">
+				<displayName>ሜጋሊትር</displayName>
 				<unitPattern count="one">{0} ሜጋሊትር</unitPattern>
 				<unitPattern count="other">{0} ሜጋሊትር</unitPattern>
 			</unit>
+			<unit type="volume-hectoliter">
+				<displayName>ሄሊ</displayName>
+				<unitPattern count="one">{0} ሄሊ</unitPattern>
+				<unitPattern count="other">{0} ሄሊ</unitPattern>
+			</unit>
 			<unit type="volume-milliliter">
 				<unitPattern count="one">{0} ሚሊ</unitPattern>
 				<unitPattern count="other">{0} ሚሊ</unitPattern>
@@ -6488,8 +6550,30 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="other">{0} ኤጫ</unitPattern>
 			</unit>
 			<unit type="volume-gallon">
+				<displayName>ጋሎን</displayName>
 				<unitPattern count="one">{0} ጋሎን</unitPattern>
 				<unitPattern count="other">{0} ጋሎን</unitPattern>
+				<perUnitPattern>{0}/ጋሎን</perUnitPattern>
+			</unit>
+			<unit type="volume-quart">
+				<displayName>ኳርትስ</displayName>
+				<unitPattern count="one">{0} ኳርትስ</unitPattern>
+				<unitPattern count="other">{0} ኳርትስ</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<displayName>ኩባያ</displayName>
+				<unitPattern count="one">{0} ኩባያ</unitPattern>
+				<unitPattern count="other">{0} ኩባያ</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<displayName>የሻይ ማንኪያ</displayName>
+				<unitPattern count="one">{0} የሻይ ማንኪያ</unitPattern>
+				<unitPattern count="other">{0} የሻይ ማንኪያ</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<displayName>የሻይ ማንኪያዎች</displayName>
+				<unitPattern count="one">{0} የሻይ ማንኪያዎች</unitPattern>
+				<unitPattern count="other">{0} የሻይ ማንኪያዎች</unitPattern>
 			</unit>
 			<unit type="volume-dram">
 				<unitPattern count="one">{0} ክመ</unitPattern>
@@ -6499,35 +6583,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<unitPattern count="one">{0} ፈመ</unitPattern>
 				<unitPattern count="other">{0} ፈመ</unitPattern>
 			</unit>
-			<unit type="concentr-katal">
-				<displayName>ካት</displayName>
-				<unitPattern count="one">{0} ካት</unitPattern>
-				<unitPattern count="other">{0} ካት</unitPattern>
+			<unit type="speed-light-speed">
+				<displayName>ብርሃን</displayName>
+				<unitPattern count="one">{0} ብርሃን</unitPattern>
+				<unitPattern count="other">{0} ብርሃን</unitPattern>
 			</unit>
-			<unit type="electric-henry">
-				<displayName>ሄ</displayName>
-				<unitPattern count="one">{0} ሄ</unitPattern>
-				<unitPattern count="other">{0} ሄ</unitPattern>
-			</unit>
-			<unit type="energy-calorie-it">
-				<displayName>ካሎሪ-IT</displayName>
-				<unitPattern count="one">{0} ካሎሪ-IT</unitPattern>
-				<unitPattern count="other">{0} ካሎሪ-IT</unitPattern>
-			</unit>
-			<unit type="force-kilogram-force">
-				<displayName>ኪግ-ኃይል</displayName>
-				<unitPattern count="one">{0} ኪግ-ኃይል</unitPattern>
-				<unitPattern count="other">{0} ኪግ-ኃይል</unitPattern>
-			</unit>
-			<unit type="magnetic-tesla">
-				<displayName>ቴ</displayName>
-				<unitPattern count="one">{0} ቴ</unitPattern>
-				<unitPattern count="other">{0} ቴ</unitPattern>
-			</unit>
-			<unit type="magnetic-weber">
-				<displayName>ዌበ</displayName>
-				<unitPattern count="one">{0} ዌበ</unitPattern>
-				<unitPattern count="other">{0} ዌበ</unitPattern>
+			<unit type="duration-night">
+				<displayName>ለሊቶች</displayName>
+				<unitPattern count="one">{0} ለሊት</unitPattern>
+				<unitPattern count="other">{0} ለሊት</unitPattern>
+				<perUnitPattern>{0}/ለሊት</perUnitPattern>
 			</unit>
 		</unitLength>
 	</units>
@@ -6544,6 +6609,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<listPatternPart type="end">{0} ወይም {1}</listPatternPart>
 			<listPatternPart type="2">{0} ወይም {1}</listPatternPart>
 		</listPattern>
+		<listPattern type="or-narrow">
+			<listPatternPart type="end">{0} ወይም {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="or-short">
+			<listPatternPart type="end">{0} ወይም {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="standard-short">
+			<listPatternPart type="end">{0} እና {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit">
+			<listPatternPart type="end">{0} እና {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<listPatternPart type="end">{0} እና {1}</listPatternPart>
+			<listPatternPart type="2">{0} እና {1}</listPatternPart>
+		</listPattern>
 	</listPatterns>
 	<posix>
 		<messages>