8319313: G1: Rename G1EvacFailureInjector appropriately

Reviewed-by: mli, iwalulya, ayang

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -100,6 +100,10 @@ jobs:
         with:
           platform: linux-x64
 
+      - name: 'Get GTest'
+        id: gtest
+        uses: ./.github/actions/get-gtest
+
         # Upgrading apt to solve libc6 installation bugs, see JDK-8260460.
       - name: 'Install toolchain and dependencies'
         run: |
@@ -155,6 +159,7 @@ jobs:
           --with-conf-name=linux-${{ matrix.target-cpu }}
           --with-version-opt=${GITHUB_ACTOR}-${GITHUB_SHA}
           --with-boot-jdk=${{ steps.bootjdk.outputs.path }}
+          --with-gtest=${{ steps.gtest.outputs.path }}
           --with-zlib=system
           --enable-debug
           --disable-precompiled-headers

.github/workflows/build-macos.yml

@@ -55,7 +55,7 @@ on:
 jobs:
   build-macos:
     name: build
-    runs-on: macos-11
+    runs-on: macos-13
 
     strategy:
       fail-fast: false

.github/workflows/main.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -30,6 +30,7 @@ on:
     branches-ignore:
       - master
       - pr/*
+      - jdk*
   workflow_dispatch:
     inputs:
       platforms:
@@ -146,8 +147,8 @@ jobs:
       apt-architecture: 'i386'
       # Some multilib libraries do not have proper inter-dependencies, so we have to
       # install their dependencies manually.
-      apt-extra-packages: 'libfreetype-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386 libgcc-s1:i386 libstdc++6:i386'
-      extra-conf-options: '--with-target-bits=32'
+      apt-extra-packages: 'libfreetype-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386 libgcc-s1:i386 libstdc++6:i386 libffi-dev:i386'
+      extra-conf-options: '--with-target-bits=32 --enable-fallback-linker --enable-libffi-bundling'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.select.outputs.linux-x86 == 'true'
@@ -227,7 +228,7 @@ jobs:
     uses: ./.github/workflows/build-macos.yml
     with:
       platform: macos-x64
-      xcode-toolset-version: '12.5.1'
+      xcode-toolset-version: '14.3.1'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.select.outputs.macos-x64 == 'true'
@@ -238,7 +239,7 @@ jobs:
     uses: ./.github/workflows/build-macos.yml
     with:
       platform: macos-aarch64
-      xcode-toolset-version: '12.5.1'
+      xcode-toolset-version: '14.3.1'
       extra-conf-options: '--openjdk-target=aarch64-apple-darwin'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -318,7 +319,7 @@ jobs:
     with:
       platform: macos-x64
       bootjdk-platform: macos-x64
-      runs-on: macos-11
+      runs-on: macos-13
 
   test-windows-x64:
     name: windows-x64

.github/workflows/test.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,9 @@ jobs:
           - 'jdk/tier1 part 3'
           - 'langtools/tier1'
           - 'hs/tier1 common'
-          - 'hs/tier1 compiler'
+          - 'hs/tier1 compiler part 1'
+          - 'hs/tier1 compiler part 2'
+          - 'hs/tier1 compiler part 3'
           - 'hs/tier1 gc'
           - 'hs/tier1 runtime'
           - 'hs/tier1 serviceability'
@@ -83,8 +85,16 @@ jobs:
             test-suite: 'test/hotspot/jtreg/:tier1_common'
             debug-suffix: -debug
 
-          - test-name: 'hs/tier1 compiler'
-            test-suite: 'test/hotspot/jtreg/:tier1_compiler'
+          - test-name: 'hs/tier1 compiler part 1'
+            test-suite: 'test/hotspot/jtreg/:tier1_compiler_1'
+            debug-suffix: -debug
+
+          - test-name: 'hs/tier1 compiler part 2'
+            test-suite: 'test/hotspot/jtreg/:tier1_compiler_2 test/hotspot/jtreg/:tier1_compiler_not_xcomp'
+            debug-suffix: -debug
+
+          - test-name: 'hs/tier1 compiler part 3'
+            test-suite: 'test/hotspot/jtreg/:tier1_compiler_3'
             debug-suffix: -debug
 
           - test-name: 'hs/tier1 gc'
@@ -132,7 +142,7 @@ jobs:
         run: |
           # On macOS we need to install some dependencies for testing
           brew install make
-          sudo xcode-select --switch /Applications/Xcode_11.7.app/Contents/Developer
+          sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
           # This will make GNU make available as 'make' and not only as 'gmake'
           echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH
         if: runner.os == 'macOS'

configure

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,14 @@
 # make sure that is called using bash.
 
 # Get an absolute path to this script, since that determines the top-level directory.
-this_script_dir=`dirname $0`
-this_script_dir=`cd $this_script_dir > /dev/null && pwd`
+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 configure script"
+  exit 1
+fi
 
 # Delegate to wrapper, forcing wrapper to believe $0 is this script by using -c.
 # This trick is needed to get autoconf to co-operate properly.
 # The ${-:+-$-} construction passes on bash options.
-bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"
+bash ${-:+-$-} -c ". \"${this_script_dir}/make/autoconf/configure\"" "${this_script_dir}/configure" CHECKME "${this_script_dir}" "$@"

doc/testing.html

@@ -207,13 +207,22 @@ changed, and the first N tiers they can afford to run, but at least
 tier1.</p>
 <p>A brief description of the tiered test groups:</p>
 <ul>
-<li><p><code>tier1</code>: This is the lowest test tier. Multiple
-developers run these tests every day. Because of the widespread use, the
-tests in <code>tier1</code> are carefully selected and optimized to run
-fast, and to run in the most stable manner. The test failures in
-<code>tier1</code> are usually followed up on quickly, either with
-fixes, or adding relevant tests to problem list. GitHub Actions
-workflows, if enabled, run <code>tier1</code> tests.</p></li>
+<li><p><code>tier1</code>: This is the most fundamental test tier.
+Roughly speaking, a failure of a test in this tier has the potential to
+indicate a problem that would affect many Java programs. Tests in
+<code>tier1</code> include tests of HotSpot, core APIs in the
+<code>java.base</code> module, and the <code>javac</code> compiler.
+Multiple developers run these tests every day. Because of the widespread
+use, the tests in <code>tier1</code> are carefully selected and
+optimized to run fast, and to run in the most stable manner. As a
+guideline, nearly all individual tests in <code>tier1</code> are
+expected to run to completion in ten seconds or less when run on common
+configurations used for development. Long-running tests, even of core
+functionality, should occur in higher tiers or be covered in other kinds
+of testing. The test failures in <code>tier1</code> are usually followed
+up on quickly, either with fixes, or adding relevant tests to problem
+list. GitHub Actions workflows, if enabled, run <code>tier1</code>
+tests.</p></li>
 <li><p><code>tier2</code>: This test group covers even more ground.
 These contain, among other things, tests that either run for too long to
 be at <code>tier1</code>, or may require special configuration, or tests
@@ -577,12 +586,15 @@ PKCS11 tests. Improper NSS version may lead to unexpected failures which
 are hard to diagnose. For example,
 sun/security/pkcs11/Secmod/AddTrustedCert.java may fail on Ubuntu 18.04
 with the default NSS version in the system. To run these tests
-correctly, the system property <code>test.nss.lib.paths</code> is
-required on Ubuntu 18.04 to specify the alternative NSS lib
-directories.</p>
+correctly, the system property
+<code>jdk.test.lib.artifacts.&lt;NAME&gt;</code> is required on Ubuntu
+18.04 to specify the alternative NSS lib directory. The
+<code>&lt;NAME&gt;</code> component should be replaced with the name
+element of the appropriate <code>@Artifact</code> class. (See
+<code>test/jdk/sun/security/pkcs11/PKCS11Test.java</code>)</p>
 <p>For example:</p>
 <pre><code>$ make test TEST=&quot;jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java&quot; \
-    JTREG=&quot;JAVA_OPTIONS=-Dtest.nss.lib.paths=/path/to/your/latest/NSS-libs&quot;</code></pre>
+    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="client-ui-tests">Client UI Tests</h3>

doc/testing.md

@@ -18,8 +18,8 @@ execute:
 This will run a default set of tests against the JDK, and present you with the
 results. `make test` is part of a family of test-related make targets which
 simplify running tests, because they invoke the various test frameworks for
-you. The "make test framework" is simple to start with, but more complex
-ad-hoc combination of tests is also possible. You can always invoke the test
+you. The "make test framework" is simple to start with, but more complex ad-hoc
+combination of tests is also possible. You can always invoke the test
 frameworks directly if you want even more control.
 
 Some example command-lines:
@@ -33,18 +33,18 @@ Some example command-lines:
     $ make test TEST="micro:java.lang.reflect" MICRO="FORK=1;WARMUP_ITER=2"
     $ make exploded-test TEST=tier2
 
-"tier1" and "tier2" refer to tiered testing, see further down. "TEST" is a
- test selection argument which the make test framework will use to try to
- find the tests you want. It iterates over the available test frameworks, and
- if the test isn't present in one, it tries the next one. The main target
- `test` uses the jdk-image as the tested product. There is also an alternate
- target `exploded-test` that uses the exploded image instead. Not all tests
- will run successfully on the exploded image, but using this target can
- greatly improve rebuild times for certain workflows.
+"tier1" and "tier2" refer to tiered testing, see further down. "TEST" is a test
+ selection argument which the make test framework will use to try to find the
+ tests you want. It iterates over the available test frameworks, and if the
+ test isn't present in one, it tries the next one. The main target `test` uses
+ the jdk-image as the tested product. There is also an alternate target
+ `exploded-test` that uses the exploded image instead. Not all tests will run
+ successfully on the exploded image, but using this target can greatly improve
+ rebuild times for certain workflows.
 
-Previously, `make test` was used to invoke an old system for running tests,
-and `make run-test` was used for the new test framework. For backward
-compatibility with scripts and muscle memory, `run-test` and variants like
+Previously, `make test` was used to invoke an old system for running tests, and
+`make run-test` was used for the new test framework. For backward compatibility
+with scripts and muscle memory, `run-test` and variants like
 `exploded-run-test` or `run-test-tier1` are kept as aliases.
 
 ### Configuration
@@ -64,26 +64,27 @@ after which `--with-jmh=build/jmh/jars` should work.
 
 When tests fail or timeout, jtreg runs its failure handler to capture necessary
 data from the system where the test was run. This data can then be used to
-analyze the test failures. Collecting this data involves running various commands
-(which are listed in files residing in `test/failure_handler/src/share/conf`)
-and some of these commands use `sudo`. If the system's `sudoers` file isn't
-configured to allow running these commands, then it can result in password being
-prompted during the failure handler execution. Typically, when running locally,
-collecting this additional data isn't always necessary. To disable running the
-failure handler, use `--enable-jtreg-failure-handler=no` when running `configure`.
-If, however, you want to let the failure handler to run and don't want to be
-prompted for sudo password, then you can configure your `sudoers` file
-appropriately. Please read the necessary documentation of your operating system
-to see how to do that; here we only show one possible way of doing that - edit
-the `/etc/sudoers.d/sudoers` file to include the following line:
+analyze the test failures. Collecting this data involves running various
+commands (which are listed in files residing in
+`test/failure_handler/src/share/conf`) and some of these commands use `sudo`.
+If the system's `sudoers` file isn't configured to allow running these
+commands, then it can result in password being prompted during the failure
+handler execution. Typically, when running locally, collecting this additional
+data isn't always necessary. To disable running the failure handler, use
+`--enable-jtreg-failure-handler=no` when running `configure`. If, however, you
+want to let the failure handler to run and don't want to be prompted for sudo
+password, then you can configure your `sudoers` file appropriately. Please read
+the necessary documentation of your operating system to see how to do that;
+here we only show one possible way of doing that - edit the
+`/etc/sudoers.d/sudoers` file to include the following line:
 
 ```
 johndoe ALL=(ALL) NOPASSWD: /sbin/dmesg
 ```
 
 This line configures `sudo` to _not_ prompt for password for the `/sbin/dmesg`
-command (this is one of the commands that is listed in the files
-at `test/failure_handler/src/share/conf`), for the user `johndoe`. Here `johndoe`
+command (this is one of the commands that is listed in the files at
+`test/failure_handler/src/share/conf`), for the user `johndoe`. Here `johndoe`
 is the user account under which the jtreg tests are run. Replace the username
 with a relevant user account of your system.
 
@@ -114,31 +115,36 @@ Ideally, all tests are run for every change but this may not be practical due
 to the limited testing resources, the scope of the change, etc.
 
 The source tree currently defines a few common test groups in the relevant
-`TEST.groups` files. There are test groups that cover a specific component,
-for example `hotspot_gc`. It is a good idea to look into `TEST.groups` files
-to get a sense what tests are relevant to a particular JDK component.
+`TEST.groups` files. There are test groups that cover a specific component, for
+example `hotspot_gc`. It is a good idea to look into `TEST.groups` files to get
+a sense what tests are relevant to a particular JDK component.
 
 Component-specific tests may miss some unintended consequences of a change, so
 other tests should also be run. Again, it might be impractical to run all
-tests, and therefore
-_tiered_ test groups exist. Tiered test groups are not component-specific, but
- rather cover the significant parts of the entire JDK.
+tests, and therefore _tiered_ test groups exist. Tiered test groups are not
+component-specific, but rather cover the significant parts of the entire JDK.
 
 Multiple tiers allow balancing test coverage and testing costs. Lower test
 tiers are supposed to contain the simpler, quicker and more stable tests.
 Higher tiers are supposed to contain progressively more thorough, slower, and
-sometimes less stable tests, or the tests that require special
-configuration.
+sometimes less stable tests, or the tests that require special configuration.
 
 Contributors are expected to run the tests for the areas that are changed, and
 the first N tiers they can afford to run, but at least tier1.
 
 A brief description of the tiered test groups:
 
-- `tier1`: This is the lowest test tier. Multiple developers run these tests
-  every day. Because of the widespread use, the tests in `tier1` are
-  carefully selected and optimized to run fast, and to run in the most stable
-  manner. The test failures in `tier1` are usually followed up on quickly,
+- `tier1`: This is the most fundamental test tier. Roughly speaking, a failure
+  of a test in this tier has the potential to indicate a problem that would
+  affect many Java programs. Tests in `tier1` include tests of HotSpot, core
+  APIs in the `java.base` module, and the `javac` compiler. Multiple developers
+  run these tests every day. Because of the widespread use, the tests in
+  `tier1` are carefully selected and optimized to run fast, and to run in the
+  most stable manner. As a guideline, nearly all individual tests in `tier1`
+  are expected to run to completion in ten seconds or less when run on common
+  configurations used for development. Long-running tests, even of core
+  functionality, should occur in higher tiers or be covered in other kinds of
+  testing. The test failures in `tier1` are usually followed up on quickly,
   either with fixes, or adding relevant tests to problem list. GitHub Actions
   workflows, if enabled, run `tier1` tests.
 
@@ -149,9 +155,8 @@ A brief description of the tiered test groups:
 
 - `tier3`: This test group includes more stressful tests, the tests for corner
   cases not covered by previous tiers, plus the tests that require GUIs. As
-  such, this suite should either be run with low concurrency
-  (`TEST_JOBS=1`), or without headful tests(`JTREG_KEYWORDS=\!headful`), or
-  both.
+  such, this suite should either be run with low concurrency (`TEST_JOBS=1`),
+  or without headful tests(`JTREG_KEYWORDS=\!headful`), or both.
 
 - `tier4`: This test group includes every other test not covered by previous
   tiers. It includes, for example, `vmTestbase` suites for Hotspot, which run
@@ -160,18 +165,17 @@ A brief description of the tiered test groups:
 
 ### JTReg
 
-JTReg tests can be selected either by picking a JTReg test group, or a selection
-of files or directories containing JTReg tests. Documentation can be found at
-[https://openjdk.org/jtreg/](https://openjdk.org/jtreg/), note especially the
-extensive [FAQ](https://openjdk.org/jtreg/faq.html).
+JTReg tests can be selected either by picking a JTReg test group, or a
+selection of files or directories containing JTReg tests. Documentation can be
+found at [https://openjdk.org/jtreg/](https://openjdk.org/jtreg/), note
+especially the extensive [FAQ](https://openjdk.org/jtreg/faq.html).
 
 JTReg test groups can be specified either without a test root, e.g. `:tier1`
 (or `tier1`, the initial colon is optional), or with, e.g. `hotspot:tier1`,
 `test/jdk:jdk_util` or `$(TOPDIR)/test/hotspot/jtreg:hotspot_all`. The test
-root can be specified either as an absolute path, or a path relative to the
-JDK top directory, or the `test` directory. For simplicity, the hotspot
-JTReg test root, which really is `hotspot/jtreg` can be abbreviated as
-just `hotspot`.
+root can be specified either as an absolute path, or a path relative to the JDK
+top directory, or the `test` directory. For simplicity, the hotspot JTReg test
+root, which really is `hotspot/jtreg` can be abbreviated as just `hotspot`.
 
 When specified without a test root, all matching groups from all test roots
 will be added. Otherwise, only the group from the specified test root will be
@@ -192,8 +196,8 @@ use a fully qualified test descriptor, add `jtreg:`, e.g.
 
 ### Gtest
 
-**Note:** To be able to run the Gtest suite, you need to configure your build to
-be able to find a proper version of the gtest source. For details, see the
+**Note:** To be able to run the Gtest suite, you need to configure your build
+to be able to find a proper version of the gtest source. For details, see the
 section ["Running Tests" in the build
 documentation](building.html#running-tests).
 
@@ -213,10 +217,10 @@ present, then `gtest:all` will be equivalent to `gtest:all/server`.
 
 ### Microbenchmarks
 
-Which microbenchmarks to run is selected using a regular expression
-following the `micro:` test descriptor, e.g., `micro:java.lang.reflect`. This
-delegates the test selection to JMH, meaning package name, class name and even
-benchmark method names can be used to select tests.
+Which microbenchmarks to run is selected using a regular expression following
+the `micro:` test descriptor, e.g., `micro:java.lang.reflect`. This delegates
+the test selection to JMH, meaning package name, class name and even benchmark
+method names can be used to select tests.
 
 Using special characters like `|` in the regular expression is possible, but
 needs to be escaped multiple times: `micro:ArrayCopy\\\\\|reflect`.
@@ -293,11 +297,12 @@ normally eats `;`, the recommended usage is to write the assignment inside
 qoutes, e.g. `JTREG="...;..."`. This will also make sure spaces are preserved,
 as in `JTREG="JAVA_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"`.
 
-(Other ways are possible, e.g. using backslash: `JTREG=JOBS=1\;TIMEOUT_FACTOR=8`.
-Also, as a special technique, the string `%20` will be replaced with space for
-certain options, e.g. `JTREG=JAVA_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug`.
-This can be useful if you have layers of scripts and have trouble getting
-proper quoting of command line arguments through.)
+(Other ways are possible, e.g. using backslash:
+`JTREG=JOBS=1\;TIMEOUT_FACTOR=8`. Also, as a special technique, the string
+`%20` will be replaced with space for certain options, e.g.
+`JTREG=JAVA_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug`. This can be useful if
+you have layers of scripts and have trouble getting proper quoting of command
+line arguments through.)
 
 As far as possible, the names of the keywords have been standardized between
 test suites.
@@ -310,7 +315,8 @@ control variable to use, then you can use the general TEST_OPTS control
 variable.
 
 There are also some keywords that applies globally to the test runner system,
-not to any specific test suites. These are also available as TEST_OPTS keywords.
+not to any specific test suites. These are also available as TEST_OPTS
+keywords.
 
 #### JOBS
 
@@ -364,8 +370,8 @@ The report is stored in
 The test concurrency (`-concurrency`).
 
 Defaults to TEST_JOBS (if set by `--with-test-jobs=`), otherwise it defaults to
-JOBS, except for Hotspot, where the default is *number of CPU cores/2*,
-but never more than *memory size in GB/2*.
+JOBS, except for Hotspot, where the default is *number of CPU cores/2*, but
+never more than *memory size in GB/2*.
 
 #### TIMEOUT_FACTOR
 
@@ -380,12 +386,12 @@ This is only valid if the failure handler is built.
 
 #### JTREG_TEST_THREAD_FACTORY
 
-Sets the `-testThreadFactory` for JTReg. It should be the fully qualified classname
-of a class which implements `java.util.concurrent.ThreadFactory`.
-One such implementation class, named Virtual, is currently part of the JDK build
-in the `test/jtreg_test_thread_factory/` directory. This class gets compiled during
-the test image build. The implementation of the Virtual class creates a new virtual
-thread for executing each test class.
+Sets the `-testThreadFactory` for JTReg. It should be the fully qualified
+classname of a class which implements `java.util.concurrent.ThreadFactory`. One
+such implementation class, named Virtual, is currently part of the JDK build in
+the `test/jtreg_test_thread_factory/` directory. This class gets compiled
+during the test image build. The implementation of the Virtual class creates a
+new virtual thread for executing each test class.
 
 #### TEST_MODE
 
@@ -447,9 +453,8 @@ the tests to be run.
 
 Use the problem lists to select tests instead of excluding them.
 
-Set to `true` or `false`.
-If `true`, JTReg will use `-match:` option, otherwise `-exclude:` will be used.
-Default is `false`.
+Set to `true` or `false`. If `true`, JTReg will use `-match:` option, otherwise
+`-exclude:` will be used. Default is `false`.
 
 #### OPTIONS
 
@@ -483,15 +488,13 @@ modules. If multiple modules are specified, they should be separated by space
 
 #### RETRY_COUNT
 
-Retry failed tests up to a set number of times, until they pass.
-This allows to pass the tests with intermittent failures.
-Defaults to 0.
+Retry failed tests up to a set number of times, until they pass. This allows to
+pass the tests with intermittent failures. Defaults to 0.
 
 #### REPEAT_COUNT
 
-Repeat the tests up to a set number of times, stopping at first failure.
-This helps to reproduce intermittent test failures.
-Defaults to 0.
+Repeat the tests up to a set number of times, stopping at first failure. This
+helps to reproduce intermittent test failures. Defaults to 0.
 
 #### REPORT
 
@@ -542,7 +545,8 @@ Same as specifying `-wi <num>`.
 
 #### WARMUP_TIME
 
-Amount of time to spend in each warmup iteration. Same as specifying `-w <num>`.
+Amount of time to spend in each warmup iteration. Same as specifying `-w
+<num>`.
 
 #### RESULTS_FORMAT
 
@@ -583,9 +587,9 @@ $ make test TEST="jtreg:test/hotspot/jtreg/containers/docker" \
 
 If your locale is non-US, some tests are likely to fail. To work around this
 you can set the locale to US. On Unix platforms simply setting `LANG="en_US"`
-in the environment before running tests should work. On Windows or MacOS, setting
-`JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US"` helps for most, but
-not all test cases.
+in the environment before running tests should work. On Windows or MacOS,
+setting `JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US"` helps for
+most, but not all test cases.
 
 For example:
 
@@ -600,14 +604,16 @@ It is highly recommended to use the latest NSS version when running PKCS11
 tests. Improper NSS version may lead to unexpected failures which are hard to
 diagnose. For example, sun/security/pkcs11/Secmod/AddTrustedCert.java may fail
 on Ubuntu 18.04 with the default NSS version in the system. To run these tests
-correctly, the system property `test.nss.lib.paths` is required on Ubuntu 18.04
-to specify the alternative NSS lib directories.
+correctly, the system property `jdk.test.lib.artifacts.<NAME>` is required on
+Ubuntu 18.04 to specify the alternative NSS lib directory. The `<NAME>`
+component should be replaced with the name element of the appropriate
+`@Artifact` class. (See `test/jdk/sun/security/pkcs11/PKCS11Test.java`)
 
 For example:
 
 ```
 $ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" \
-    JTREG="JAVA_OPTIONS=-Dtest.nss.lib.paths=/path/to/your/latest/NSS-libs"
+    JTREG="JAVA_OPTIONS=-Djdk.test.lib.artifacts.nsslib-linux_aarch64=/path/to/NSS-libs"
 ```
 
 For more notes about the PKCS11 tests, please refer to
@@ -651,29 +657,30 @@ Note: restart is required to make the settings take effect.
 
 #### Robot API
 
-Most automated Client UI tests use `Robot` API to control the UI. Usually,
-the default operating system settings need to be adjusted for Robot
-to work correctly. The detailed steps how to access and update these settings
-for different platforms are provided below.
+Most automated Client UI tests use `Robot` API to control the UI. Usually, the
+default operating system settings need to be adjusted for Robot to work
+correctly. The detailed steps how to access and update these settings for
+different platforms are provided below.
 
 ##### macOS
 
-`Robot` is not permitted to control your Mac by default since
-macOS 10.15. To allow it, choose Apple menu -> System Settings, click
-Privacy & Security; then click Accessibility and ensure the following apps are
-allowed to control your computer: *Java* and *Terminal*. If the tests are run
-from an IDE, the IDE should be granted this permission too.
+`Robot` is not permitted to control your Mac by default since macOS 10.15. To
+allow it, choose Apple menu -> System Settings, click Privacy & Security; then
+click Accessibility and ensure the following apps are allowed to control your
+computer: *Java* and *Terminal*. If the tests are run from an IDE, the IDE
+should be granted this permission too.
 
 ##### Windows
 
 On Windows if Cygwin terminal is used to run the tests, there is a delay in
 focus transfer. Usually it causes automated UI test failure. To disable the
 delay, type `regedit` in the Search and then select Registry Editor; navigate
-to the following key: `HKEY_CURRENT_USER\Control Panel\Desktop`; make sure
-the `ForegroundLockTimeout` value is set to 0.
+to the following key: `HKEY_CURRENT_USER\Control Panel\Desktop`; make sure the
+`ForegroundLockTimeout` value is set to 0.
 
-Additional information about Client UI tests configuration for various operating
-systems can be obtained at [Automated client GUI testing system set up
+Additional information about Client UI tests configuration for various
+operating systems can be obtained at [Automated client GUI testing system set
+up
 requirements](https://wiki.openjdk.org/display/ClientLibs/Automated+client+GUI+testing+system+set+up+requirements)
 
 ## Editing this document

make/CompileDemos.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/CompileInterimLangtools.gmk

@@ -99,6 +99,9 @@ define SetupInterimModule
       EXCLUDE_FILES := $(TOPDIR)/src/$1/share/classes/module-info.java \
           $(TOPDIR)/src/$1/share/classes/javax/tools/ToolProvider.java \
           $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/Main.java \
+          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryContext.java \
+          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/MemoryModuleFinder.java \
+          $(TOPDIR)/src/$1/share/classes/com/sun/tools/javac/launcher/SourceLauncher.java \
           Standard.java, \
       EXTRA_FILES := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim/module-info.java \
           $($1.interim_EXTRA_FILES), \

make/CompileModuleTools.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/CreateJmods.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -81,13 +81,11 @@ endif
 ifneq ($(CMDS_DIR), )
   DEPS += $(call FindFiles, $(CMDS_DIR))
   ifeq ($(call isTargetOs, windows)+$(SHIP_DEBUG_SYMBOLS), true+public)
-    # For public debug symbols on Windows, we have to use stripped pdbs, rename them
-    # and filter out a few launcher pdbs where there's a lib that goes by the same name
+    # For public debug symbols on Windows, we have to use stripped pdbs and rename them
     rename_stripped = $(patsubst %.stripped.pdb,%.pdb,$1)
     CMDS_DIR_FILTERED := $(subst modules_cmds,modules_cmds_filtered, $(CMDS_DIR))
     FILES_CMDS := $(filter-out %.pdb, $(call FindFiles, $(CMDS_DIR))) \
-        $(filter-out %jimage.stripped.pdb %jpackage.stripped.pdb %java.stripped.pdb, \
-            $(filter %.stripped.pdb, $(call FindFiles, $(CMDS_DIR))))
+        $(filter %.stripped.pdb, $(call FindFiles, $(CMDS_DIR)))
     $(eval $(call SetupCopyFiles, COPY_FILTERED_CMDS, \
         SRC := $(CMDS_DIR), \
         DEST := $(CMDS_DIR_FILTERED), \
@@ -96,18 +94,6 @@ ifneq ($(CMDS_DIR), )
     ))
     DEPS += $(COPY_FILTERED_CMDS)
     JMOD_FLAGS += --cmds $(CMDS_DIR_FILTERED)
-  else ifeq ($(call isTargetOs, windows)+$(SHIP_DEBUG_SYMBOLS), true+full)
-    # For full debug symbols on Windows, we have to filter out a few launcher pdbs
-    # where there's a lib that goes by the same name
-    CMDS_DIR_FILTERED := $(subst modules_cmds,modules_cmds_filtered, $(CMDS_DIR))
-    $(eval $(call SetupCopyFiles, COPY_FILTERED_CMDS, \
-        SRC := $(CMDS_DIR), \
-        DEST := $(CMDS_DIR_FILTERED), \
-        FILES := $(filter-out %jimage.pdb %jpackage.pdb %java.pdb, \
-            $(call FindFiles, $(CMDS_DIR))), \
-    ))
-    DEPS += $(COPY_FILTERED_CMDS)
-    JMOD_FLAGS += --cmds $(CMDS_DIR_FILTERED)
   else
     JMOD_FLAGS += --cmds $(CMDS_DIR)
   endif
@@ -196,9 +182,14 @@ else # not java.base
   endif
 endif
 
-# Set main class of jdk.httpserver module
-ifeq ($(MODULE), jdk.httpserver)
-    JMOD_FLAGS += --main-class sun.net.httpserver.simpleserver.Main
+################################################################################
+# Include module specific build settings
+
+-include Jmod.gmk
+
+# Set main class
+ifneq ($(JMOD_FLAGS_main_class), )
+  JMOD_FLAGS += $(JMOD_FLAGS_main_class)
 endif
 
 # Changes to the jmod tool itself should also trigger a rebuild of all jmods.

make/Global.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,6 @@ help:
 	$(info $(_) make docs              # Create all docs)
 	$(info $(_) make docs-jdk-api      # Create just JDK javadocs)
 	$(info $(_) make bootcycle-images  # Build images twice, second time with newly built JDK)
-	$(info $(_) make install           # Install the generated images locally)
 	$(info $(_) make check             # Run basic testing (currently tier1))
 	$(info $(_) make test-<test>       # Run test, e.g. test-tier1)
 	$(info $(_) make test TEST=<t>     # Run test(s) given by TEST specification)

make/Hsdis.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@ ifeq ($(HSDIS_BACKEND), capstone)
     CAPSTONE_ARCH := CS_ARCH_X86
     CAPSTONE_MODE := CS_MODE_$(OPENJDK_TARGET_CPU_BITS)
   else ifeq ($(call isTargetCpuArch, aarch64), true)
-    CAPSTONE_ARCH := CS_ARCH_ARM64
+    CAPSTONE_ARCH := CS_ARCH_$(CAPSTONE_ARCH_AARCH64_NAME)
     CAPSTONE_MODE := CS_MODE_ARM
   else
     $(error No support for Capstone on this platform)

make/Images.gmk

@@ -274,9 +274,6 @@ else
   endif
 endif
 
-FILTERED_PDBS := %jimage.stripped.pdb %jpackage.stripped.pdb %java.stripped.pdb \
-    %jimage.pdb %jpackage.pdb %java.pdb %jimage.map %jpackage.map %java.map
-
 # Param 1 - either JDK or JRE
 SetupCopyDebuginfo = \
     $(foreach m, $(ALL_$1_MODULES), \
@@ -290,8 +287,8 @@ SetupCopyDebuginfo = \
       $(eval $(call SetupCopyFiles, COPY_$1_CMDS_DEBUGINFO_$m, \
           SRC := $(SUPPORT_OUTPUTDIR)/modules_cmds/$m, \
           DEST := $($1_IMAGE_DIR)/$(CMDS_TARGET_SUBDIR), \
-          FILES := $(filter-out $(FILTERED_PDBS), $(call FindDebuginfoFiles, \
-              $(SUPPORT_OUTPUTDIR)/modules_cmds/$m)), \
+          FILES := $(call FindDebuginfoFiles, \
+              $(SUPPORT_OUTPUTDIR)/modules_cmds/$m), \
       )) \
       $(eval $1_TARGETS += $$(COPY_$1_CMDS_DEBUGINFO_$m)) \
     )

make/Install.gmk

@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-default: install
-
-include $(SPEC)
-
-BINARIES := $(notdir $(wildcard $(JDK_IMAGE_DIR)/bin/*))
-INSTALLDIR := openjdk-$(VERSION_SHORT)
-
-# Install the jdk image, in a very crude way. Not taking into
-# account, how to install properly on macosx or windows etc.
-install:
-	echo Installing jdk image into $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
-	echo and creating $(words $(BINARIES)) links from $(INSTALL_PREFIX)/bin into the jdk.
-	$(MKDIR) -p $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
-	$(RM) -r $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/*
-	$(CP) -rp $(JDK_IMAGE_DIR)/* $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
-	$(MKDIR) -p $(INSTALL_PREFIX)/bin
-	$(RM) $(addprefix $(INSTALL_PREFIX)/bin/, $(BINARIES))
-	$(foreach b, $(BINARIES), $(LN) -s $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/bin/$b $(INSTALL_PREFIX)/bin/$b &&) true

make/JrtfsJar.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -46,8 +46,10 @@ JIMAGE_PKGS := \
     jdk/internal/jrtfs \
     #
 
+# Compile jrt-fs.jar with the interim compiler, as it
+# ends up in the image, this will ensure reproducible classes
 $(eval $(call SetupJavaCompilation, BUILD_JRTFS, \
-    COMPILER := bootjdk, \
+    COMPILER := interim, \
     DISABLED_WARNINGS := options, \
     TARGET_RELEASE := $(TARGET_RELEASE_JDK8), \
     SRC := $(TOPDIR)/src/java.base/share/classes, \

make/Main.gmk

@@ -405,8 +405,9 @@ JMOD_TARGETS := $(addsuffix -jmod, $(JMOD_MODULES))
 
 define DeclareJmodRecipe
   $1-jmod:
-	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateJmods.gmk \
-	    MODULE=$1)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
+	    $(patsubst %,-I%/modules/$1,$(PHASE_MAKEDIRS)) \
+	    -f CreateJmods.gmk MODULE=$1)
 endef
 
 $(foreach m, $(JMOD_MODULES), $(eval $(call DeclareJmodRecipe,$m)))
@@ -607,11 +608,11 @@ endif
 ifeq ($(CREATING_BUILDJDK), true)
   # This target is only called by the recursive call below.
   create-buildjdk-interim-image-helper: interim-image jdk.jlink-launchers \
-      java.base-copy jdk.jdeps-launchers
+      java.base-copy jdk.jdeps-launchers jdk.compiler-launchers
 endif
 
-BUILDJDK_MODULES := $(sort $(foreach m, jdk.jlink $(INTERIM_IMAGE_MODULES), \
-    $(call FindTransitiveDepsForModule, $m) $m))
+BUILDJDK_MODULES := $(sort $(foreach m, jdk.jlink jdk.compiler \
+    $(INTERIM_IMAGE_MODULES), $(call FindTransitiveDepsForModule, $m) $m))
 
 $(eval $(call SetupTarget, create-buildjdk-interim-image, \
     MAKEFILE := Main, \
@@ -865,14 +866,6 @@ ifeq ($(JCOV_ENABLED), true)
   ))
 endif
 
-################################################################################
-# Install targets
-
-$(eval $(call SetupTarget, install, \
-    MAKEFILE := Install, \
-    DEPS := product-images, \
-))
-
 ################################################################################
 #
 # Dependency declarations between targets.
@@ -970,7 +963,20 @@ else
   jdk.jdeps-gendata: java
 
   # The ct.sym generation uses all the moduleinfos as input
-  jdk.compiler-gendata: $(GENSRC_MODULEINFO_TARGETS)
+  jdk.compiler-gendata: $(GENSRC_MODULEINFO_TARGETS) $(JAVA_TARGETS)
+  # jdk.compiler-gendata needs the BUILD_JDK. If the BUILD_JDK was supplied
+  # externally, no extra prerequisites are needed.
+  ifeq ($(CREATE_BUILDJDK), true)
+    ifneq ($(CREATING_BUILDJDK), true)
+      # When cross compiling and an external BUILD_JDK wasn't supplied, it's
+      # produced by the create-buildjdk target.
+      jdk.compiler-gendata: create-buildjdk
+    endif
+  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
+  endif
 
   # Declare dependencies between jmod targets.
   # java.base jmod needs jrt-fs.jar and access to the jmods for all non
@@ -1053,6 +1059,9 @@ else
   # All modules include the main license files from java.base.
   $(JMOD_TARGETS): java.base-copy
 
+  # jdk.javadoc uses an internal copy of the main license files from java.base.
+  jdk.javadoc-copy: java.base-copy
+
   zip-security: $(filter jdk.crypto%, $(JAVA_TARGETS))
 
   ifeq ($(ENABLE_GENERATE_CLASSLIST), true)

make/ReleaseFile.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/RunTests.gmk

@@ -178,7 +178,8 @@ ifeq ($(TEST_JOBS), 0)
       c = c * $(TEST_JOBS_FACTOR_JDL); \
       c = c * $(TEST_JOBS_FACTOR_MACHINE); \
       if (c < 1) c = 1; \
-      printf "%.0f", c; \
+      c = c + 0.5; \
+      printf "%d", c; \
     }')
 endif
 
@@ -356,7 +357,7 @@ ExpandJtregPath = \
 # with test id: dir/Test.java#selection -> Test.java#selection -> .java#selection -> #selection
 #      without: dir/Test.java           -> Test.java           -> .java           -> <<empty string>>
 TestID = \
-    $(subst .sh,,$(subst .html,,$(subst .java,,$(suffix $(notdir $1)))))
+    $(subst .jasm,,$(subst .sh,,$(subst .html,,$(subst .java,,$(suffix $(notdir $1))))))
 
 # The test id starting with a hash (#testid) will be stripped by all
 # evals in ParseJtregTestSelectionInner and will be reinserted by calling
@@ -867,7 +868,7 @@ define SetupRunJtregTestBody
 	$$(RM) -r $$($1_TEST_RESULTS_DIR)
 
   $1_COMMAND_LINE := \
-      $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
+      $$(JTREG_JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
           -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \
           $$($1_JTREG_BASIC_OPTIONS) \
           -testjdk:$$(JDK_UNDER_TEST) \

make/RunTestsPrebuilt.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 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
@@ -122,6 +122,7 @@ $(eval $(call SetupVariable,JT_HOME))
 $(eval $(call SetupVariable,JDK_IMAGE_DIR,$(OUTPUTDIR)/images/jdk))
 $(eval $(call SetupVariable,TEST_IMAGE_DIR,$(OUTPUTDIR)/images/test))
 $(eval $(call SetupVariable,SYMBOLS_IMAGE_DIR,$(OUTPUTDIR)/images/symbols,NO_CHECK))
+$(eval $(call SetupVariable,JTREG_JDK,$(BOOT_JDK)))
 
 # Provide default values for tools that we need
 $(eval $(call SetupVariable,MAKE,make,NO_CHECK))
@@ -157,6 +158,10 @@ ifeq ($(UNAME_OS), CYGWIN)
   OPENJDK_TARGET_OS := windows
   OPENJDK_TARGET_OS_TYPE := windows
   OPENJDK_TARGET_OS_ENV := windows.cygwin
+else ifeq ($(UNAME_OS), MINGW64)
+  OPENJDK_TARGET_OS := windows
+  OPENJDK_TARGET_OS_TYPE := windows
+  OPENJDK_TARGET_OS_ENV := windows.msys2
 else
   OPENJDK_TARGET_OS_TYPE:=unix
   ifeq ($(UNAME_OS), Linux)
@@ -169,6 +174,9 @@ else
   OPENJDK_TARGET_OS_ENV := $(OPENJDK_TARGET_OS)
 endif
 
+# Sanity check env detection
+$(info Detected target OS, type and env: [$(OPENJDK_TARGET_OS)] [$(OPENJDK_TARGET_OS_TYPE)] [$(OPENJDK_TARGET_OS_ENV)])
+
 # Assume little endian unless otherwise specified
 OPENJDK_TARGET_CPU_ENDIAN := little
 
@@ -248,6 +256,7 @@ $(call CreateNewSpec, $(NEW_SPEC), \
     TOPDIR := $(TOPDIR), \
     OUTPUTDIR := $(OUTPUTDIR), \
     BOOT_JDK := $(BOOT_JDK), \
+    JTREG_JDK := $(JTREG_JDK), \
     JT_HOME := $(JT_HOME), \
     JDK_IMAGE_DIR := $(JDK_IMAGE_DIR), \
     JCOV_IMAGE_DIR := $(JCOV_IMAGE_DIR), \

make/RunTestsPrebuiltSpec.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 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
@@ -124,6 +124,8 @@ JAR := $(FIXPATH) $(JAR_CMD)
 JLINK := $(FIXPATH) $(JLINK_CMD)
 JMOD := $(FIXPATH) $(JMOD_CMD)
 
+JTREG_JAVA := $(FIXPATH) $(JTREG_JDK)/bin/java $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
+
 BUILD_JAVA := $(JDK_IMAGE_DIR)/bin/JAVA
 ################################################################################
 # Some common tools. Assume most common name and no path.

make/ToolsJdk.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/ZipSecurity.gmk

@@ -87,9 +87,9 @@ ifeq ($(call isTargetOs, windows), true)
   $(eval $(call SetupZipArchive,BUILD_JGSS_BIN_ZIP, \
       SRC := $(SUPPORT_OUTPUTDIR), \
       INCLUDE_FILES := modules_libs/java.security.jgss/w2k_lsa_auth.dll \
-          modules_libs/java.security.jgss/w2k_lsa_auth.diz \
-          modules_libs/java.security.jgss/w2k_lsa_auth.map \
-          modules_libs/java.security.jgss/w2k_lsa_auth.pdb, \
+          modules_libs/java.security.jgss/w2k_lsa_auth.dll.diz \
+          modules_libs/java.security.jgss/w2k_lsa_auth.dll.map \
+          modules_libs/java.security.jgss/w2k_lsa_auth.dll.pdb, \
       ZIP := $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)))
 
   TARGETS += $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)

make/autoconf/Makefile.in

@@ -24,4 +24,4 @@
 # This Makefile was generated by configure @DATE_WHEN_CONFIGURED@
 # GENERATED FILE, DO NOT EDIT
 SPEC:=@OUTPUTDIR@/spec.gmk
-include @TOPDIR@/Makefile
+include @WORKSPACE_ROOT@/Makefile

make/autoconf/basic.m4

@@ -479,7 +479,7 @@ AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
     # df on AIX does not understand -l. On modern AIXes it understands "-T local" which
     # is the same. On older AIXes we just continue to live with a "not local build" warning.
     if test "x$OPENJDK_TARGET_OS" = xaix; then
-      if "$DF -T local > /dev/null 2>&1"; then
+      if $DF -T local > /dev/null 2>&1; then
         DF_LOCAL_ONLY_OPTION='-T local'
       else # AIX may use GNU-utils instead
         DF_LOCAL_ONLY_OPTION='-l'

make/autoconf/basic_tools.m4

@@ -390,6 +390,17 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
 
   if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
     UTIL_REQUIRE_PROGS(DSYMUTIL, dsymutil)
+    AC_MSG_CHECKING([if dsymutil supports --reproducer option])
+    if $DSYMUTIL --help | $GREP -q '\--reproducer '; then
+      AC_MSG_RESULT([yes])
+      # --reproducer option is supported
+      # set "--reproducer Off" to prevent unnecessary temporary
+      # directories creation
+      DSYMUTIL="$DSYMUTIL --reproducer Off"
+    else
+      # --reproducer option isn't supported
+      AC_MSG_RESULT([no])
+    fi
     UTIL_REQUIRE_PROGS(MIG, mig)
     UTIL_REQUIRE_PROGS(XATTR, xattr)
     UTIL_LOOKUP_PROGS(CODESIGN, codesign)

make/autoconf/boot-jdk.m4

@@ -520,8 +520,8 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
 
   # Don't presuppose SerialGC is present in the buildjdk. Also, we cannot test
   # the buildjdk, but on the other hand we know what it will support.
-  BUILDJDK_JAVA_FLAGS_SMALL="-Xms32M -Xmx512M -XX:TieredStopAtLevel=1"
-  AC_SUBST(BUILDJDK_JAVA_FLAGS_SMALL)
+  BUILD_JAVA_FLAGS_SMALL="-Xms32M -Xmx512M -XX:TieredStopAtLevel=1"
+  AC_SUBST(BUILD_JAVA_FLAGS_SMALL)
 
   JAVA_TOOL_FLAGS_SMALL=""
   for f in $JAVA_FLAGS_SMALL; do

make/autoconf/buildjdk-spec.gmk.in

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/autoconf/configure

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,12 @@ if test "x$BASH" = x; then
   echo "Error: This script must be run using bash." 1>&2
   exit 1
 fi
+
+if [[ "$TOPDIR" =~ .*[[:space:]]+.* ]]; then
+  echo "Error: Build path containing space character is not supported" 1>&2
+  exit 1
+fi
+
 # Force autoconf to use bash. This also means we must disable autoconf re-exec.
 export CONFIG_SHELL=$BASH
 export _as_can_reexec=no

make/autoconf/flags-cflags.m4

@@ -522,7 +522,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
     # do this on s390x also for libjvm (where serviceability agent is not supported)
     if test "x$ENABLE_LINKTIME_GC" = xtrue; then
       TOOLCHAIN_CFLAGS_JDK="$TOOLCHAIN_CFLAGS_JDK -ffunction-sections -fdata-sections"
-      if test "x$OPENJDK_TARGET_CPU" = xs390x; then
+      if test "x$OPENJDK_TARGET_CPU" = xs390x && test "x$DEBUG_LEVEL" == xrelease; then
         TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -ffunction-sections -fdata-sections"
       fi
     fi
@@ -562,7 +562,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     # The -utf-8 option sets source and execution character sets to UTF-8 to enable correct
     # compilation of all source files regardless of the active code page on Windows.
-    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:strictStrings -Zc:inline -utf-8 -MP"
+    TOOLCHAIN_CFLAGS_JVM="-nologo -MD -Zc:preprocessor -Zc:strictStrings -Zc:inline -permissive- -utf-8 -MP"
     TOOLCHAIN_CFLAGS_JDK="-nologo -MD -Zc:preprocessor -Zc:strictStrings -Zc:inline -utf-8 -Zc:wchar_t-"
   fi
 
@@ -799,15 +799,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
     $1_TOOLCHAIN_CFLAGS="${$1_GCC6_CFLAGS}"
 
     $1_WARNING_CFLAGS_JVM="-Wno-format-zero-length -Wtype-limits -Wuninitialized"
-  elif test "x$TOOLCHAIN_TYPE" = xclang; then
-    NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks"
-    FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_DELETE_NULL_POINTER_CHECKS_CFLAG],
-        PREFIX: $3,
-        IF_FALSE: [
-            NO_DELETE_NULL_POINTER_CHECKS_CFLAG=
-        ]
-    )
-    $1_TOOLCHAIN_CFLAGS="${NO_DELETE_NULL_POINTER_CHECKS_CFLAG}"
   fi
 
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
@@ -852,6 +843,22 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
               FILE_MACRO_CFLAGS=
           ]
       )
+      if test "x$FILE_MACRO_CFLAGS" != x; then
+        # Add -pathmap for all VS system include paths using Windows
+        # full Long path name that is generated by the compiler
+        # Not enabled under WSL as there is no easy way to obtain the
+        # Windows full long paths, thus reproducible WSL builds will
+        # depend on building with the same VS toolchain install location.
+        if test "x$OPENJDK_BUILD_OS_ENV" != "xwindows.wsl1" && test "x$OPENJDK_BUILD_OS_ENV" != "xwindows.wsl2"; then
+          for ipath in ${$3SYSROOT_CFLAGS}; do
+              if test "x${ipath:0:2}" == "x-I"; then
+                  ipath_path=${ipath#"-I"}
+                  UTIL_FIXUP_WIN_LONG_PATH(ipath_path)
+                  FILE_MACRO_CFLAGS="$FILE_MACRO_CFLAGS -pathmap:\"$ipath_path\"=vsi"
+              fi
+          done
+        fi
+      fi
     fi
 
     AC_MSG_CHECKING([how to prevent absolute paths in output])
@@ -929,17 +936,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
 # $2 - Prefix for compiler variables (either BUILD_ or nothing).
 AC_DEFUN([FLAGS_SETUP_GCC6_COMPILER_FLAGS],
 [
-  # These flags are required for GCC 6 builds as undefined behavior in OpenJDK code
-  # runs afoul of the more aggressive versions of these optimizations.
-  # Notably, value range propagation now assumes that the this pointer of C++
-  # member functions is non-null.
-  NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks"
-  FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_DELETE_NULL_POINTER_CHECKS_CFLAG],
-      PREFIX: $2, IF_FALSE: [NO_DELETE_NULL_POINTER_CHECKS_CFLAG=""])
+  # This flag is required for GCC 6 builds as undefined behavior in OpenJDK code
+  # runs afoul of the more aggressive versions of this optimization.
   NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse"
   FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_LIFETIME_DSE_CFLAG],
       PREFIX: $2, IF_FALSE: [NO_LIFETIME_DSE_CFLAG=""])
-  $1_GCC6_CFLAGS="${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
+  $1_GCC6_CFLAGS="${NO_LIFETIME_DSE_CFLAG}"
 ])
 
 AC_DEFUN_ONCE([FLAGS_SETUP_BRANCH_PROTECTION],

make/autoconf/flags-other.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/autoconf/flags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -128,16 +128,12 @@ AC_DEFUN([FLAGS_SETUP_MACOSX_VERSION],
     # The expected format for <version> is either nn.n.n or nn.nn.nn. See
     # /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/AvailabilityVersions.h
 
-    # MACOSX_VERSION_MIN specifies the lowest version of Macosx that the built
+    # MACOSX_VERSION_MIN specifies the lowest version of macOS that the built
     # binaries should be compatible with, even if compiled on a newer version
     # of the OS. It currently has a hard coded value. Setting this also limits
     # exposure to API changes in header files. Bumping this is likely to
     # require code changes to build.
-    if test "x$OPENJDK_TARGET_CPU_ARCH" = xaarch64; then
-      MACOSX_VERSION_MIN=11.00.00
-    else
-      MACOSX_VERSION_MIN=10.12.0
-    fi
+    MACOSX_VERSION_MIN=11.00.00
     MACOSX_VERSION_MIN_NODOTS=${MACOSX_VERSION_MIN//\./}
 
     AC_SUBST(MACOSX_VERSION_MIN)

make/autoconf/lib-ffi.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/autoconf/lib-hsdis.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2021, 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
@@ -63,6 +63,19 @@ AC_DEFUN([LIB_SETUP_HSDIS_CAPSTONE],
       AC_MSG_ERROR([Cannot continue])
     fi
   fi
+
+  capstone_header="\"$CAPSTONE/include/capstone/capstone.h\""
+  AC_MSG_CHECKING([capstone aarch64 arch name])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include $capstone_header],[[cs_arch test = CS_ARCH_AARCH64]])],
+    [
+      AC_MSG_RESULT([AARCH64])
+      CAPSTONE_ARCH_AARCH64_NAME="AARCH64"
+    ],
+    [
+      AC_MSG_RESULT([ARM64])
+      CAPSTONE_ARCH_AARCH64_NAME="ARM64"
+    ]
+  )
 ])
 
 ################################################################################
@@ -134,7 +147,8 @@ AC_DEFUN([LIB_BUILD_BINUTILS],
   BINUTILS_SRC="$with_binutils_src"
   UTIL_FIXUP_PATH(BINUTILS_SRC)
 
-  BINUTILS_DIR="$CONFIGURESUPPORT_OUTPUTDIR/binutils"
+  BINUTILS_BUILD_DIR="$CONFIGURESUPPORT_OUTPUTDIR/binutils"
+  BINUTILS_INSTALL_DIR="$CONFIGURESUPPORT_OUTPUTDIR/binutils-install"
 
   if ! test -d $BINUTILS_SRC; then
     AC_MSG_ERROR([--with-binutils-src is not pointing to a directory])
@@ -143,15 +157,15 @@ AC_DEFUN([LIB_BUILD_BINUTILS],
     AC_MSG_ERROR([--with-binutils-src does not look like a binutils source directory])
   fi
 
-  if ! test -d $BINUTILS_DIR; then
-    $MKDIR -p $BINUTILS_DIR
+  if ! test -d $BINUTILS_BUILD_DIR; then
+    $MKDIR -p $BINUTILS_BUILD_DIR
   fi
 
-  if test -e $BINUTILS_DIR/bfd/libbfd.a && \
-      test -e $BINUTILS_DIR/opcodes/libopcodes.a && \
-      test -e $BINUTILS_DIR/libiberty/libiberty.a && \
-      test -e $BINUTILS_DIR/zlib/libz.a; then
-    AC_MSG_NOTICE([Found binutils binaries in binutils source directory -- not building])
+  # We don't know the version, not checking for libsframe.a
+  if test -e $BINUTILS_INSTALL_DIR/lib/libbfd.a && \
+     test -e $BINUTILS_INSTALL_DIR/lib/libopcodes.a && \
+     test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a; then
+    AC_MSG_NOTICE([Found binutils binaries in binutils install directory -- not building])
   else
     # On Windows, we cannot build with the normal Microsoft CL, but must instead use
     # a separate mingw toolchain.
@@ -190,20 +204,26 @@ AC_DEFUN([LIB_BUILD_BINUTILS],
     binutils_cflags="$binutils_cflags $MACHINE_FLAG $JVM_PICFLAG $C_O_FLAG_NORM"
 
     AC_MSG_NOTICE([Running binutils configure])
-    AC_MSG_NOTICE([configure command line: cd $BINUTILS_DIR && $BINUTILS_SRC/configure --disable-nls CFLAGS="$binutils_cflags" CC="$binutils_cc" AR="$AR" $binutils_target])
+    AC_MSG_NOTICE([configure command line: cd $BINUTILS_BUILD_DIR && $BINUTILS_SRC/configure --disable-werror --prefix=$BINUTILS_INSTALL_DIR --enable-install-libiberty --with-system-zlib --without-zstd --disable-nls CFLAGS="$binutils_cflags" CC="$binutils_cc" AR="$AR" $binutils_target])
     saved_dir=`pwd`
-    cd "$BINUTILS_DIR"
-    $BINUTILS_SRC/configure --disable-nls CFLAGS="$binutils_cflags" CC="$binutils_cc" AR="$AR" $binutils_target
-    if test $? -ne 0 || ! test -e $BINUTILS_DIR/Makefile; then
+    cd "$BINUTILS_BUILD_DIR"
+    $BINUTILS_SRC/configure --disable-werror --prefix=$BINUTILS_INSTALL_DIR --enable-install-libiberty --with-system-zlib --without-zstd --disable-nls CFLAGS="$binutils_cflags" CC="$binutils_cc" AR="$AR" $binutils_target
+    if test $? -ne 0 || ! test -e $BINUTILS_BUILD_DIR/Makefile; then
       AC_MSG_NOTICE([Automatic building of binutils failed on configure. Try building it manually])
       AC_MSG_ERROR([Cannot continue])
     fi
     AC_MSG_NOTICE([Running binutils make])
-    $MAKE all-opcodes
+    $MAKE all-opcodes all-libiberty
     if test $? -ne 0; then
       AC_MSG_NOTICE([Automatic building of binutils failed on make. Try building it manually])
       AC_MSG_ERROR([Cannot continue])
     fi
+    AC_MSG_NOTICE([Running binutils make install])
+    $MAKE install-opcodes install-libiberty
+    if test $? -ne 0; then
+      AC_MSG_NOTICE([Automatic building, install step, of binutils failed on make. Try building it manually])
+      AC_MSG_ERROR([Cannot continue])
+    fi
     cd $saved_dir
     AC_MSG_NOTICE([Building of binutils done])
   fi
@@ -223,40 +243,66 @@ AC_DEFUN([LIB_SETUP_HSDIS_BINUTILS],
 
   # We need the binutils static libs and includes.
   if test "x$with_binutils_src" != x; then
-    # Try building the source first. If it succeeds, it sets $BINUTILS_DIR.
+    # Try building the source first. If it succeeds, it sets $BINUTILS_INSTALL_DIR.
     LIB_BUILD_BINUTILS
   fi
 
   if test "x$with_binutils" != x; then
-    BINUTILS_DIR="$with_binutils"
+    BINUTILS_INSTALL_DIR="$with_binutils"
   fi
 
   binutils_system_error=""
+  HSDIS_LDFLAGS=""
   HSDIS_LIBS=""
-  if test "x$BINUTILS_DIR" = xsystem; then
+  disasm_header="<dis-asm.h>"
+
+  if test "x$BINUTILS_INSTALL_DIR" = xsystem; then
     AC_CHECK_LIB(bfd, bfd_openr, [ HSDIS_LIBS="-lbfd" ], [ binutils_system_error="libbfd not found" ])
     AC_CHECK_LIB(opcodes, disassembler, [ HSDIS_LIBS="$HSDIS_LIBS -lopcodes" ], [ binutils_system_error="libopcodes not found" ])
-    AC_CHECK_LIB(iberty, xmalloc, [ HSDIS_LIBS="$HSDIS_LIBS -liberty" ], [ binutils_system_error="libiberty not found" ])
     AC_CHECK_LIB(z, deflate, [ HSDIS_LIBS="$HSDIS_LIBS -lz" ], [ binutils_system_error="libz not found" ])
+    # libiberty is not required on Ubuntu
+    AC_CHECK_LIB(iberty, xmalloc, [ HSDIS_LIBS="$HSDIS_LIBS -liberty" ])
+    AC_CHECK_LIB(sframe, frame, [ HSDIS_LIBS="$HSDIS_LIBS -lsframe" ], )
     HSDIS_CFLAGS="-DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB"
-  elif test "x$BINUTILS_DIR" != x; then
-    if test -e $BINUTILS_DIR/bfd/libbfd.a && \
-        test -e $BINUTILS_DIR/opcodes/libopcodes.a && \
-        test -e $BINUTILS_DIR/libiberty/libiberty.a && \
-        test -e $BINUTILS_DIR/zlib/libz.a; then
-      HSDIS_CFLAGS="-DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB"
-      if test -n "$BINUTILS_SRC"; then
-        HSDIS_CFLAGS="$HSDIS_CFLAGS -I$BINUTILS_SRC/include -I$BINUTILS_DIR/bfd"
+  elif test "x$BINUTILS_INSTALL_DIR" != x; then
+    disasm_header="\"$BINUTILS_INSTALL_DIR/include/dis-asm.h\""
+    if test -e $BINUTILS_INSTALL_DIR/lib/libbfd.a && \
+       test -e $BINUTILS_INSTALL_DIR/lib/libopcodes.a && \
+       (test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a || test -e $BINUTILS_INSTALL_DIR/lib64/libiberty.a); then
+      HSDIS_CFLAGS="-DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB -I$BINUTILS_INSTALL_DIR/include"
+
+      # libiberty ignores --libdir and may be installed in $BINUTILS_INSTALL_DIR/lib or $BINUTILS_INSTALL_DIR/lib64
+      # depending on system setup
+      LIBIBERTY_LIB=""
+      if test -e $BINUTILS_INSTALL_DIR/lib/libiberty.a; then
+        LIBIBERTY_LIB="$BINUTILS_INSTALL_DIR/lib/libiberty.a"
       else
-        HSDIS_CFLAGS="$HSDIS_CFLAGS -I$BINUTILS_DIR/include -I$BINUTILS_DIR/bfd"
+        LIBIBERTY_LIB="$BINUTILS_INSTALL_DIR/lib64/libiberty.a"
       fi
-      HSDIS_LDFLAGS=""
-      HSDIS_LIBS="$BINUTILS_DIR/bfd/libbfd.a $BINUTILS_DIR/opcodes/libopcodes.a $BINUTILS_DIR/libiberty/libiberty.a $BINUTILS_DIR/zlib/libz.a"
+      HSDIS_LIBS="$BINUTILS_INSTALL_DIR/lib/libbfd.a $BINUTILS_INSTALL_DIR/lib/libopcodes.a $LIBIBERTY_LIB"
+      # 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"
+      fi
+      AC_CHECK_LIB(z, deflate, [ HSDIS_LIBS="$HSDIS_LIBS -lz" ], AC_MSG_ERROR([libz not found]))
+    else
+      AC_MSG_ERROR(["$BINUTILS_INSTALL_DIR/lib[64] must contain libbfd.a, libopcodes.a and libiberty.a"])
     fi
   fi
 
+  AC_MSG_CHECKING([Checking binutils API])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include $disasm_header],[[init_disassemble_info(0, 0, 0, 0);]])],
+    [
+      AC_MSG_RESULT([New API])
+      HSDIS_CFLAGS="$HSDIS_CFLAGS -DBINUTILS_NEW_API"
+    ],
+    [
+      AC_MSG_RESULT([Old API])
+    ]
+  )
+
   AC_MSG_CHECKING([for binutils to use with hsdis])
-  case "x$BINUTILS_DIR" in
+  case "x$BINUTILS_INSTALL_DIR" in
     xsystem)
       if test "x$OPENJDK_TARGET_OS" != xlinux; then
         AC_MSG_RESULT([invalid])
@@ -279,10 +325,10 @@ AC_DEFUN([LIB_SETUP_HSDIS_BINUTILS],
       ;;
     *)
       if test "x$HSDIS_LIBS" != x; then
-        AC_MSG_RESULT([$BINUTILS_DIR])
+        AC_MSG_RESULT([$BINUTILS_INSTALL_DIR])
       else
         AC_MSG_RESULT([invalid])
-        AC_MSG_ERROR([$BINUTILS_DIR does not contain a proper binutils installation])
+        AC_MSG_ERROR([$BINUTILS_INSTALL_DIR does not contain a proper binutils installation])
       fi
       ;;
   esac
@@ -332,6 +378,7 @@ AC_DEFUN_ONCE([LIB_SETUP_HSDIS],
   AC_SUBST(HSDIS_CFLAGS)
   AC_SUBST(HSDIS_LDFLAGS)
   AC_SUBST(HSDIS_LIBS)
+  AC_SUBST(CAPSTONE_ARCH_AARCH64_NAME)
 
   AC_MSG_CHECKING([if hsdis should be bundled])
   if test "x$ENABLE_HSDIS_BUNDLING" = "xtrue"; then

make/autoconf/lib-tests.m4

@@ -227,12 +227,47 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_JTREG],
   UTIL_FIXUP_PATH(JT_HOME)
   AC_SUBST(JT_HOME)
 
+  # Specify a JDK for running jtreg. Defaults to the BOOT_JDK.
+  AC_ARG_WITH(jtreg-jdk, [AS_HELP_STRING([--with-jdk],
+    [path to JDK for running jtreg @<:@BOOT_JDK@:>@])])
+
+  AC_MSG_CHECKING([for jtreg jdk])
+  if test "x${with_jtreg_jdk}" != x; then
+    if test "x${with_jtreg_jdk}" = xno; then
+      AC_MSG_RESULT([no, jtreg jdk not specified])
+    elif test "x${with_jtreg_jdk}" = xyes; then
+      AC_MSG_RESULT([not specified])
+      AC_MSG_ERROR([--with-jtreg-jdk needs a value])
+    else
+      JTREG_JDK="${with_jtreg_jdk}"
+      AC_MSG_RESULT([$JTREG_JDK])
+      UTIL_FIXUP_PATH(JTREG_JDK)
+      if test ! -f "$JTREG_JDK/bin/java"; then
+        AC_MSG_ERROR([Could not find jtreg java at $JTREG_JDK/bin/java])
+      fi
+    fi
+  else
+    JTREG_JDK="${BOOT_JDK}"
+    AC_MSG_RESULT([no, using BOOT_JDK])
+  fi
+
+  UTIL_FIXUP_PATH(JTREG_JDK)
+  AC_SUBST([JTREG_JDK])
+  # For use in the configure script
+  JTREG_JAVA="$FIXPATH $JTREG_JDK/bin/java"
+
   # Verify jtreg version
   if test "x$JT_HOME" != x; then
+    AC_MSG_CHECKING([jtreg jar existence])
+    if test ! -f "$JT_HOME/lib/jtreg.jar"; then
+      AC_MSG_ERROR([Could not find jtreg jar at $JT_HOME/lib/jtreg.jar])
+    fi
+
     AC_MSG_CHECKING([jtreg version number])
     # jtreg -version looks like this: "jtreg 6.1+1-19"
     # Extract actual version part ("6.1" in this case)
-    jtreg_version_full=`$JAVA -jar $JT_HOME/lib/jtreg.jar -version | $HEAD -n 1 | $CUT -d ' ' -f 2`
+    jtreg_version_full=$($JTREG_JAVA -jar $JT_HOME/lib/jtreg.jar -version | $HEAD -n 1 | $CUT -d ' ' -f 2)
+
     jtreg_version=${jtreg_version_full/%+*}
     AC_MSG_RESULT([$jtreg_version])
 

make/autoconf/libraries.m4

@@ -108,12 +108,6 @@ AC_DEFUN([LIB_SETUP_JVM_LIBS],
       BASIC_JVM_LIBS_$1="$BASIC_JVM_LIBS_$1 -latomic"
     fi
   fi
-
-  # Because RISC-V only has word-sized atomics, it requires libatomic where
-  # other common architectures do not, so link libatomic by default.
-  if test "x$OPENJDK_$1_OS" = xlinux && test "x$OPENJDK_$1_CPU" = xriscv64; then
-    BASIC_JVM_LIBS_$1="$BASIC_JVM_LIBS_$1 -latomic"
-  fi
 ])
 
 ################################################################################

make/autoconf/util_paths.m4

@@ -118,6 +118,24 @@ AC_DEFUN([UTIL_FIXUP_PATH],
   fi
 ])
 
+##############################################################################
+# Fixup path to be a Windows full long path
+# Note: Only supported with cygwin/msys2 (cygpath tool)
+AC_DEFUN([UTIL_FIXUP_WIN_LONG_PATH],
+[
+  # Only process if variable expands to non-empty
+  path="[$]$1"
+  if test "x$path" != x; then
+    if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
+      win_path=$($PATHTOOL -wl "$path")
+      if test "x$win_path" != "x$path"; then
+        $1="$win_path"
+      fi
+    fi
+  fi
+])
+
+
 ###############################################################################
 # Check if the given file is a unix-style or windows-style executable, that is,
 # if it expects paths in unix-style or windows-style.

make/common/MakeIO.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/common/Modules.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2021, 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
@@ -62,8 +62,8 @@ endif
 # Filter out jvmci specific modules if jvmci is disabled
 ifeq ($(INCLUDE_JVMCI), false)
   MODULES_FILTER += jdk.internal.vm.ci
-  MODULES_FILTER += jdk.internal.vm.compiler
-  MODULES_FILTER += jdk.internal.vm.compiler.management
+  MODULES_FILTER += jdk.graal.compiler
+  MODULES_FILTER += jdk.graal.compiler.management
 endif
 
 # jpackage is only on windows, macosx, and linux

make/common/NativeCompilation.gmk

@@ -1073,13 +1073,13 @@ define SetupNativeCompilationBody
       ifneq ($$($1_TYPE), STATIC_LIBRARY)
         # Generate debuginfo files.
         ifeq ($(call isTargetOs, windows), true)
-          $1_EXTRA_LDFLAGS += -debug "-pdb:$$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).pdb" \
-              "-map:$$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).map"
+          $1_EXTRA_LDFLAGS += -debug "-pdb:$$($1_SYMBOLS_DIR)/$$($1_BASENAME).pdb" \
+              "-map:$$($1_SYMBOLS_DIR)/$$($1_BASENAME).map"
           ifeq ($(SHIP_DEBUG_SYMBOLS), public)
-            $1_EXTRA_LDFLAGS += "-pdbstripped:$$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).stripped.pdb"
+            $1_EXTRA_LDFLAGS += "-pdbstripped:$$($1_SYMBOLS_DIR)/$$($1_BASENAME).stripped.pdb"
           endif
-          $1_DEBUGINFO_FILES := $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).pdb \
-              $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).map
+          $1_DEBUGINFO_FILES := $$($1_SYMBOLS_DIR)/$$($1_BASENAME).pdb \
+              $$($1_SYMBOLS_DIR)/$$($1_BASENAME).map
 
         else ifeq ($(call isTargetOs, linux), true)
           $1_DEBUGINFO_FILES := $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).debuginfo
@@ -1127,7 +1127,11 @@ define SetupNativeCompilationBody
         $1 += $$($1_DEBUGINFO_FILES)
 
         ifeq ($$($1_ZIP_EXTERNAL_DEBUG_SYMBOLS), true)
-          $1_DEBUGINFO_ZIP := $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).diz
+          ifeq ($(call isTargetOs, windows), true)
+            $1_DEBUGINFO_ZIP := $$($1_SYMBOLS_DIR)/$$($1_BASENAME).diz
+          else
+            $1_DEBUGINFO_ZIP := $$($1_SYMBOLS_DIR)/$$($1_NOSUFFIX).diz
+          endif
           $1 += $$($1_DEBUGINFO_ZIP)
 
           # The dependency on TARGET is needed for debuginfo files

make/common/ProcessMarkdown.gmk

@@ -1,4 +1,4 @@
-# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 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

make/conf/github-actions.conf

@@ -29,13 +29,13 @@ GTEST_VERSION=1.14.0
 JTREG_VERSION=7.3.1+1
 
 LINUX_X64_BOOT_JDK_EXT=tar.gz
-LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz
-LINUX_X64_BOOT_JDK_SHA256=bb863b2d542976d1ae4b7b81af3e78b1e4247a64644350b552d298d8dc5980dc
+LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_linux-x64_bin.tar.gz
+LINUX_X64_BOOT_JDK_SHA256=a30c454a9bef8f46d5f1bf3122830014a8fbe7ac03b5f8729bc3add4b92a1d0a
 
 MACOS_X64_BOOT_JDK_EXT=tar.gz
-MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_macos-x64_bin.tar.gz
-MACOS_X64_BOOT_JDK_SHA256=47cf960d9bb89dbe987535a389f7e26c42de7c984ef5108612d77c81aa8cc6a4
+MACOS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_macos-x64_bin.tar.gz
+MACOS_X64_BOOT_JDK_SHA256=af32e84c11009f72f783fdcdc9917efc277893988f097e198e2576875d1e88c1
 
 WINDOWS_X64_BOOT_JDK_EXT=zip
-WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_windows-x64_bin.zip
-WINDOWS_X64_BOOT_JDK_SHA256=c92fae5e42b9aecf444a66c8ec563c652f60b1e231dfdd33a4f5a3e3603058fb
+WINDOWS_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_windows-x64_bin.zip
+WINDOWS_X64_BOOT_JDK_SHA256=5434faaf029e66e7ce6e75770ca384de476750984a7d2881ef7686894c4b4944

make/conf/jib-profiles.js

@@ -390,8 +390,8 @@ var getJibProfilesCommon = function (input, data) {
         };
     };
 
-    common.boot_jdk_version = "20";
-    common.boot_jdk_build_number = "36";
+    common.boot_jdk_version = "21";
+    common.boot_jdk_build_number = "35";
     common.boot_jdk_home = input.get("boot_jdk", "install_path") + "/jdk-"
         + common.boot_jdk_version
         + (input.build_os == "macosx" ? ".jdk/Contents/Home" : "");
@@ -407,6 +407,8 @@ var getJibProfilesCommon = function (input, data) {
  * @returns {{}} Profiles part of the configuration
  */
 var getJibProfilesProfiles = function (input, common, data) {
+    var cross_compiling = input.build_platform != input.target_platform;
+
     // Main SE profiles
     var profiles = {
 
@@ -426,9 +428,14 @@ var getJibProfilesProfiles = function (input, common, data) {
             target_os: "linux",
             target_cpu: "x86",
             build_cpu: "x64",
-            dependencies: ["devkit", "gtest"],
-            configure_args: concat(common.configure_args_32bit,
-                "--with-jvm-variants=minimal,server", "--with-zlib=system"),
+            dependencies: ["devkit", "gtest", "libffi"],
+            configure_args: concat(common.configure_args_32bit, [
+                "--with-jvm-variants=minimal,server",
+                "--with-zlib=system",
+                "--with-libffi=" + input.get("libffi", "home_path"),
+                "--enable-libffi-bundling",
+                "--enable-fallback-linker"
+            ])
         },
 
         "macosx-x64": {
@@ -436,7 +443,7 @@ var getJibProfilesProfiles = function (input, common, data) {
             target_cpu: "x64",
             dependencies: ["devkit", "gtest", "pandoc"],
             configure_args: concat(common.configure_args_64bit, "--with-zlib=system",
-                "--with-macosx-version-max=10.12.00",
+                "--with-macosx-version-max=11.00.00",
                 "--enable-compatible-cds-alignment",
                 // Use system SetFile instead of the one in the devkit as the
                 // devkit one may not work on Catalina.
@@ -479,14 +486,12 @@ var getJibProfilesProfiles = function (input, common, data) {
         "linux-aarch64": {
             target_os: "linux",
             target_cpu: "aarch64",
-            build_cpu: "x64",
             dependencies: ["devkit", "gtest", "build_devkit", "pandoc"],
             configure_args: [
-                "--openjdk-target=aarch64-linux-gnu",
                 "--with-zlib=system",
                 "--disable-dtrace",
 		"--enable-compatible-cds-alignment",
-            ],
+	    ].concat(cross_compiling ? ["--openjdk-target=aarch64-linux-gnu"] : []),
         },
 
         "linux-arm32": {
@@ -945,10 +950,7 @@ var getJibProfilesProfiles = function (input, common, data) {
             target_os: input.build_os,
             target_cpu: input.build_cpu,
             dependencies: [ "jtreg", "gnumake", "boot_jdk", "devkit", "jib" ],
-            labels: "test",
-            environment: {
-                "JT_JAVA": common.boot_jdk_home
-            }
+            labels: "test"
         }
     };
     profiles = concatObjects(profiles, testOnlyProfiles);
@@ -1083,10 +1085,10 @@ var getJibProfilesProfiles = function (input, common, data) {
 var getJibProfilesDependencies = function (input, common) {
 
     var devkit_platform_revisions = {
-        linux_x64: "gcc11.2.0-OL6.4+1.0",
-        macosx: "Xcode12.4+1.1",
-        windows_x64: "VS2022-17.1.0+1.1",
-        linux_aarch64: input.build_cpu == "x64" ? "gcc11.2.0-OL7.6+1.1" : "gcc11.2.0-OL7.6+1.0",
+        linux_x64: "gcc13.2.0-OL6.4+1.0",
+        macosx: "Xcode14.3.1+1.0",
+        windows_x64: "VS2022-17.6.5+1.0",
+        linux_aarch64: "gcc13.2.0-OL7.6+1.0",
         linux_arm: "gcc8.2.0-Fedora27+1.0",
         linux_ppc64le: "gcc8.2.0-Fedora27+1.0",
         linux_s390x: "gcc8.2.0-Fedora27+1.0",

make/conf/module-loader-map.conf

@@ -60,8 +60,8 @@ BOOT_MODULES= \
 # should carefully be considered if it should be upgradeable or not.
 UPGRADEABLE_PLATFORM_MODULES= \
     java.compiler \
-    jdk.internal.vm.compiler \
-    jdk.internal.vm.compiler.management \
+    jdk.graal.compiler \
+    jdk.graal.compiler.management \
     #
 
 PLATFORM_MODULES= \

make/conf/version-numbers.conf

@@ -37,6 +37,6 @@ DEFAULT_VERSION_DATE=2024-03-19
 DEFAULT_VERSION_CLASSFILE_MAJOR=66  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="20 21 22"
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="21 22"
 DEFAULT_JDK_SOURCE_TARGET_VERSION=22
 DEFAULT_PROMOTED_VERSION_PRE=ea

make/data/cldr/LICENSE.txt

@@ -1,46 +1,39 @@
-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
-
-See Terms of Use for definitions of Unicode Inc.'s
-Data Files and Software.
-
-NOTICE TO USER: Carefully read the following legal agreement.
-BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
-DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
-YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
-TERMS AND CONDITIONS OF THIS AGREEMENT.
-IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
-THE DATA FILES OR SOFTWARE.
+UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 1991-2022 Unicode, Inc. All rights reserved.
-Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
+Copyright © 2019-2023 Unicode, Inc.
 
-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 either
-(a) this copyright and permission notice appear with all copies
-of the Data Files or Software, or
-(b) this copyright and permission notice appear in associated
-Documentation.
+NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
 
-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.
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of data files and any associated documentation (the "Data Files") or
+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 either (a)
+this copyright and permission notice appear with all copies of the Data
+Files or Software, or (b) this copyright and permission notice appear in
+associated Documentation.
 
-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.
+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.

make/data/cldr/README

@@ -1,4 +1,4 @@
 CLDR - Unicode Common Locale Data Repository
 http://cldr.unicode.org
 
-CLDR version installed: 43
+CLDR version installed: 44

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

@@ -19,11 +19,11 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="gregory" description="Gregorian calendar" alias="gregorian"/>
             <type name="hebrew" description="Traditional Hebrew calendar"/>
             <type name="indian" description="Indian calendar"/>
-            <type name="islamic" description="Islamic calendar"/>
-            <type name="islamic-umalqura" description="Islamic calendar, Umm al-Qura" since="24"/>
-            <type name="islamic-tbla" description="Islamic calendar, tabular (intercalary years [2,5,7,10,13,16,18,21,24,26,29] - astronomical epoch)" since="24"/>
-            <type name="islamic-civil" description="Islamic calendar, tabular (intercalary years [2,5,7,10,13,16,18,21,24,26,29] - civil epoch)" since="24"/>
-            <type name="islamic-rgsa" description="Islamic calendar, Saudi Arabia sighting" since="24"/>
+            <type name="islamic" description="Hijri calendar"/>
+            <type name="islamic-umalqura" description="Hijri calendar, Umm al-Qura" since="24"/>
+            <type name="islamic-tbla" description="Hijri calendar, tabular (intercalary years [2,5,7,10,13,16,18,21,24,26,29] - astronomical epoch)" since="24"/>
+            <type name="islamic-civil" description="Hijri calendar, tabular (intercalary years [2,5,7,10,13,16,18,21,24,26,29] - civil epoch)" since="24"/>
+            <type name="islamic-rgsa" description="Hijri calendar, Saudi Arabia sighting" since="24"/>
             <type name="iso8601" description="ISO calendar (Gregorian calendar using the ISO 8601 calendar week rules)" since="2.0"/>
             <type name="japanese" description="Japanese Imperial calendar"/>
             <type name="persian" description="Persian calendar"/>

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

@@ -30,13 +30,13 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="aqsyw" description="Syowa Station, East Ongul Island" alias="Antarctica/Syowa"/>
             <type name="aqtrl" description="Troll Station, Queen Maud Land" alias="Antarctica/Troll" since="26"/>
             <type name="aqvos" description="Vostok Station, Lake Vostok" alias="Antarctica/Vostok"/>
-            <type name="arbue" description="Buenos Aires, Argentina" alias="America/Buenos_Aires America/Argentina/Buenos_Aires"/>
-            <type name="arcor" description="Córdoba, Argentina" alias="America/Cordoba America/Argentina/Cordoba America/Rosario"/>
-            <type name="arctc" description="Catamarca, Argentina" alias="America/Catamarca America/Argentina/Catamarca America/Argentina/ComodRivadavia"/>
+            <type name="arbue" description="Buenos Aires, Argentina" alias="America/Buenos_Aires America/Argentina/Buenos_Aires" iana="America/Argentina/Buenos_Aires"/>
+            <type name="arcor" description="Córdoba, Argentina" alias="America/Cordoba America/Argentina/Cordoba America/Rosario" iana="America/Argentina/Cordoba"/>
+            <type name="arctc" description="Catamarca, Argentina" alias="America/Catamarca America/Argentina/Catamarca America/Argentina/ComodRivadavia" iana="America/Argentina/Catamarca"/>
             <type name="arirj" description="La Rioja, Argentina" alias="America/Argentina/La_Rioja"/>
-            <type name="arjuj" description="Jujuy, Argentina" alias="America/Jujuy America/Argentina/Jujuy"/>
+            <type name="arjuj" description="Jujuy, Argentina" alias="America/Jujuy America/Argentina/Jujuy" iana="America/Argentina/Jujuy"/>
             <type name="arluq" description="San Luis, Argentina" alias="America/Argentina/San_Luis"/>
-            <type name="armdz" description="Mendoza, Argentina" alias="America/Mendoza America/Argentina/Mendoza"/>
+            <type name="armdz" description="Mendoza, Argentina" alias="America/Mendoza America/Argentina/Mendoza" iana="America/Argentina/Mendoza"/>
             <type name="arrgl" description="Río Gallegos, Argentina" alias="America/Argentina/Rio_Gallegos"/>
             <type name="arsla" description="Salta, Argentina" alias="America/Argentina/Salta"/>
             <type name="artuc" description="Tucumán, Argentina" alias="America/Argentina/Tucuman"/>
@@ -49,8 +49,8 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="aubne" description="Brisbane, Australia" alias="Australia/Brisbane Australia/Queensland"/>
             <type name="audrw" description="Darwin, Australia" alias="Australia/Darwin Australia/North"/>
             <type name="aueuc" description="Eucla, Australia" alias="Australia/Eucla"/>
-            <type name="auhba" description="Hobart, Australia" alias="Australia/Hobart Australia/Tasmania"/>
-            <type name="aukns" description="Currie, Australia" alias="Australia/Currie"/>
+            <type name="auhba" description="Hobart, Australia" alias="Australia/Hobart Australia/Tasmania Australia/Currie"/>
+            <type name="aukns" description="Currie, Australia" deprecated="true" preferred="auhba"/>
             <type name="auldc" description="Lindeman Island, Australia" alias="Australia/Lindeman"/>
             <type name="auldh" description="Lord Howe Island, Australia" alias="Australia/Lord_Howe Australia/LHI"/>
             <type name="aumel" description="Melbourne, Australia" alias="Australia/Melbourne Australia/Victoria"/>
@@ -94,24 +94,24 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="bymsq" description="Minsk, Belarus" alias="Europe/Minsk"/>
             <type name="bzbze" description="Belize" alias="America/Belize"/>
             <type name="cacfq" description="Creston, Canada" alias="America/Creston" since="21.0.1"/>
-            <type name="caedm" description="Edmonton, Canada" alias="America/Edmonton Canada/Mountain"/>
-            <type name="caffs" description="Rainy River, Canada" alias="America/Rainy_River"/>
+            <type name="caedm" description="Edmonton, Canada" alias="America/Edmonton Canada/Mountain America/Yellowknife"/>
+            <type name="caffs" description="Rainy River, Canada" deprecated="true" preferred="cawnp"/>
             <type name="cafne" description="Fort Nelson, Canada" alias="America/Fort_Nelson" since="29"/>
             <type name="caglb" description="Glace Bay, Canada" alias="America/Glace_Bay"/>
             <type name="cagoo" description="Goose Bay, Canada" alias="America/Goose_Bay"/>
             <type name="cahal" description="Halifax, Canada" alias="America/Halifax Canada/Atlantic"/>
-            <type name="caiql" description="Iqaluit, Canada" alias="America/Iqaluit"/>
+            <type name="caiql" description="Iqaluit, Canada" alias="America/Iqaluit America/Pangnirtung"/>
             <type name="camon" description="Moncton, Canada" alias="America/Moncton"/>
             <type name="camtr" description="Montreal, Canada" deprecated="true" preferred="cator"/>
-            <type name="capnt" description="Pangnirtung, Canada" alias="America/Pangnirtung"/>
+            <type name="capnt" description="Pangnirtung, Canada" deprecated="true" preferred="caiql"/>
             <type name="careb" description="Resolute, Canada" alias="America/Resolute"/>
             <type name="careg" description="Regina, Canada" alias="America/Regina Canada/East-Saskatchewan Canada/Saskatchewan"/>
             <type name="casjf" description="St. John's, Canada" alias="America/St_Johns Canada/Newfoundland"/>
-            <type name="canpg" description="Nipigon, Canada" alias="America/Nipigon"/>
-            <type name="cathu" description="Thunder Bay, Canada" alias="America/Thunder_Bay"/>
-            <type name="cator" description="Toronto, Canada" alias="America/Toronto America/Montreal Canada/Eastern"/>
+            <type name="canpg" description="Nipigon, Canada" deprecated="true" preferred="cator"/>
+            <type name="cathu" description="Thunder Bay, Canada" deprecated="true" preferred="cator"/>
+            <type name="cator" description="Toronto, Canada" alias="America/Toronto America/Montreal Canada/Eastern America/Nipigon America/Thunder_Bay"/>
             <type name="cavan" description="Vancouver, Canada" alias="America/Vancouver Canada/Pacific"/>
-            <type name="cawnp" description="Winnipeg, Canada" alias="America/Winnipeg Canada/Central"/>
+            <type name="cawnp" description="Winnipeg, Canada" alias="America/Winnipeg Canada/Central America/Rainy_River"/>
             <type name="caybx" description="Blanc-Sablon, Canada" alias="America/Blanc-Sablon"/>
             <type name="caycb" description="Cambridge Bay, Canada" alias="America/Cambridge_Bay"/>
             <type name="cayda" description="Dawson, Canada" alias="America/Dawson"/>
@@ -120,8 +120,8 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="cayev" description="Inuvik, Canada" alias="America/Inuvik"/>
             <type name="cayxy" description="Whitehorse, Canada" alias="America/Whitehorse Canada/Yukon"/>
             <type name="cayyn" description="Swift Current, Canada" alias="America/Swift_Current"/>
-            <type name="cayzf" description="Yellowknife, Canada" alias="America/Yellowknife"/>
-            <type name="cayzs" description="Atikokan, Canada" alias="America/Coral_Harbour America/Atikokan"/>
+            <type name="cayzf" description="Yellowknife, Canada" deprecated="true" preferred="caedm"/>
+            <type name="cayzs" description="Atikokan, Canada" alias="America/Coral_Harbour America/Atikokan" iana="America/Atikokan"/>
             <type name="cccck" description="Cocos (Keeling) Islands" alias="Indian/Cocos"/>
             <type name="cdfbm" description="Lubumbashi, Democratic Republic of the Congo" alias="Africa/Lubumbashi"/>
             <type name="cdfih" description="Kinshasa, Democratic Republic of the Congo" alias="Africa/Kinshasa"/>
@@ -160,7 +160,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="eetll" description="Tallinn, Estonia" alias="Europe/Tallinn"/>
             <type name="egcai" description="Cairo, Egypt" alias="Africa/Cairo Egypt"/>
             <type name="eheai" description="El Aaiún, Western Sahara" alias="Africa/El_Aaiun"/>
-            <type name="erasm" description="Asmara, Eritrea" alias="Africa/Asmera Africa/Asmara"/>
+            <type name="erasm" description="Asmara, Eritrea" alias="Africa/Asmera Africa/Asmara" iana="Africa/Asmara"/>
             <type name="esceu" description="Ceuta, Spain" alias="Africa/Ceuta"/>
             <type name="eslpa" description="Canary Islands, Spain" alias="Atlantic/Canary"/>
             <type name="esmad" description="Madrid, Spain" alias="Europe/Madrid"/>
@@ -171,9 +171,9 @@ For terms of use, see http://www.unicode.org/copyright.html
             <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"/>
-            <type name="fmpni" description="Pohnpei, Micronesia" alias="Pacific/Ponape Pacific/Pohnpei"/>
-            <type name="fmtkk" description="Chuuk, Micronesia" alias="Pacific/Truk Pacific/Chuuk Pacific/Yap"/>
-            <type name="fotho" description="Faroe Islands" alias="Atlantic/Faeroe Atlantic/Faroe"/>
+            <type name="fmpni" description="Pohnpei, Micronesia" alias="Pacific/Ponape Pacific/Pohnpei" iana="Pacific/Pohnpei"/>
+            <type name="fmtkk" description="Chuuk, Micronesia" alias="Pacific/Truk Pacific/Chuuk Pacific/Yap" iana="Pacific/Chuuk"/>
+            <type name="fotho" description="Faroe Islands" alias="Atlantic/Faeroe Atlantic/Faroe" iana="Atlantic/Faroe"/>
             <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"/>
@@ -186,7 +186,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="ghacc" description="Accra, Ghana" alias="Africa/Accra"/>
             <type name="gigib" description="Gibraltar" alias="Europe/Gibraltar"/>
             <type name="gldkshvn" description="Danmarkshavn, Greenland" alias="America/Danmarkshavn"/>
-            <type name="glgoh" description="Nuuk (Godthåb), Greenland" alias="America/Godthab America/Nuuk"/>
+            <type name="glgoh" description="Nuuk (Godthåb), Greenland" alias="America/Godthab America/Nuuk" iana="America/Nuuk"/>
             <type name="globy" description="Ittoqqortoormiit (Scoresbysund), Greenland" alias="America/Scoresbysund"/>
             <type name="glthu" description="Qaanaaq (Thule), Greenland" alias="America/Thule"/>
             <type name="gmbjl" description="Banjul, Gambia" alias="Africa/Banjul"/>
@@ -214,7 +214,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="idpnk" description="Pontianak, Indonesia" alias="Asia/Pontianak"/>
             <type name="iedub" description="Dublin, Ireland" alias="Europe/Dublin Eire"/>
             <type name="imdgs" description="Isle of Man" alias="Europe/Isle_of_Man"/>
-            <type name="inccu" description="Kolkata, India" alias="Asia/Calcutta Asia/Kolkata"/>
+            <type name="inccu" description="Kolkata, India" alias="Asia/Calcutta Asia/Kolkata" iana="Asia/Kolkata"/>
             <type name="iodga" description="Chagos Archipelago" alias="Indian/Chagos"/>
             <type name="iqbgw" description="Baghdad, Iraq" alias="Asia/Baghdad"/>
             <type name="irthr" description="Tehran, Iran" alias="Asia/Tehran Iran"/>
@@ -229,7 +229,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="kgfru" description="Bishkek, Kyrgyzstan" alias="Asia/Bishkek"/>
             <type name="khpnh" description="Phnom Penh, Cambodia" alias="Asia/Phnom_Penh"/>
             <type name="kicxi" description="Kiritimati, Kiribati" alias="Pacific/Kiritimati"/>
-            <type name="kipho" description="Enderbury Island, Kiribati" alias="Pacific/Enderbury Pacific/Kanton"/>
+            <type name="kipho" description="Enderbury Island, Kiribati" alias="Pacific/Enderbury Pacific/Kanton" iana="Pacific/Kanton"/>
             <type name="kitrw" description="Tarawa, Kiribati" alias="Pacific/Tarawa"/>
             <type name="kmyva" description="Comoros" alias="Indian/Comoro"/>
             <type name="knbas" description="Saint Kitts" alias="America/St_Kitts"/>
@@ -264,7 +264,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="mhmaj" description="Majuro, Marshall Islands" alias="Pacific/Majuro"/>
             <type name="mkskp" description="Skopje, Macedonia" alias="Europe/Skopje"/>
             <type name="mlbko" description="Bamako, Mali" alias="Africa/Bamako Africa/Timbuktu"/>
-            <type name="mmrgn" description="Yangon (Rangoon), Burma" alias="Asia/Rangoon Asia/Yangon"/>
+            <type name="mmrgn" description="Yangon (Rangoon), Burma" alias="Asia/Rangoon Asia/Yangon" iana="Asia/Yangon"/>
             <type name="mncoq" description="Choibalsan, Mongolia" alias="Asia/Choibalsan"/>
             <type name="mnhvd" description="Khovd (Hovd), Mongolia" alias="Asia/Hovd"/>
             <type name="mnuln" description="Ulaanbaatar (Ulan Bator), Mongolia" alias="Asia/Ulaanbaatar Asia/Ulan_Bator"/>
@@ -289,8 +289,8 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="mxmzt" description="Mazatlán, Mexico" alias="America/Mazatlan Mexico/BajaSur"/>
             <type name="mxoji" description="Ojinaga, Mexico" alias="America/Ojinaga"/>
             <type name="mxpvr" description="Bahía de Banderas, Mexico" alias="America/Bahia_Banderas" since="1.9"/>
-            <type name="mxstis" description="Santa Isabel (Baja California), Mexico" alias="America/Santa_Isabel"/>
-            <type name="mxtij" description="Tijuana, Mexico" alias="America/Tijuana America/Ensenada Mexico/BajaNorte"/>
+            <type name="mxstis" description="Santa Isabel (Baja California), Mexico" deprecated="true" preferred="mxtij"/>
+            <type name="mxtij" description="Tijuana, Mexico" alias="America/Tijuana America/Ensenada Mexico/BajaNorte America/Santa_Isabel"/>
             <type name="mykch" description="Kuching, Malaysia" alias="Asia/Kuching"/>
             <type name="mykul" description="Kuala Lumpur, Malaysia" alias="Asia/Kuala_Lumpur"/>
             <type name="mzmpm" description="Maputo, Mozambique" alias="Africa/Maputo"/>
@@ -302,7 +302,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="nimga" description="Managua, Nicaragua" alias="America/Managua"/>
             <type name="nlams" description="Amsterdam, Netherlands" alias="Europe/Amsterdam"/>
             <type name="noosl" description="Oslo, Norway" alias="Europe/Oslo"/>
-            <type name="npktm" description="Kathmandu, Nepal" alias="Asia/Katmandu Asia/Kathmandu"/>
+            <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 Antarctica/South_Pole NZ"/>
@@ -395,13 +395,13 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="tvfun" description="Funafuti, Tuvalu" alias="Pacific/Funafuti"/>
             <type name="twtpe" description="Taipei, Taiwan" alias="Asia/Taipei ROC"/>
             <type name="tzdar" description="Dar es Salaam, Tanzania" alias="Africa/Dar_es_Salaam"/>
-            <type name="uaiev" description="Kyiv, Ukraine" alias="Europe/Kiev Europe/Kyiv"/>
-            <type name="uaozh" description="Zaporizhia (Zaporozhye), Ukraine" alias="Europe/Zaporozhye"/>
+            <type name="uaiev" description="Kyiv, Ukraine" alias="Europe/Kiev Europe/Kyiv Europe/Zaporozhye Europe/Uzhgorod" iana="Europe/Kyiv"/>
+            <type name="uaozh" description="Zaporizhia (Zaporozhye), Ukraine" deprecated="true" preferred="uaiev"/>
             <type name="uasip" description="Simferopol, Ukraine" alias="Europe/Simferopol"/>
-            <type name="uauzh" description="Uzhhorod (Uzhgorod), Ukraine" alias="Europe/Uzhgorod"/>
+            <type name="uauzh" description="Uzhhorod (Uzhgorod), Ukraine" deprecated="true" preferred="uaiev"/>
             <type name="ugkla" description="Kampala, Uganda" alias="Africa/Kampala"/>
             <type name="umawk" description="Wake Island, U.S. Minor Outlying Islands" alias="Pacific/Wake"/>
-            <type name="umjon" description="Johnston Atoll, U.S. Minor Outlying Islands" alias="Pacific/Johnston"/>
+            <type name="umjon" description="Johnston Atoll, U.S. Minor Outlying Islands" deprecated="true" preferred="ushnl"/>
             <type name="ummdy" description="Midway Islands, U.S. Minor Outlying Islands" alias="Pacific/Midway"/>
             <type name="unk" description="Unknown time zone" alias="Etc/Unknown"/>
             <type name="usadk" description="Adak (Alaska), United States" alias="America/Adak America/Atka US/Aleutian"/>
@@ -411,13 +411,13 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="uschi" description="Chicago, United States" alias="America/Chicago US/Central"/>
             <type name="usden" description="Denver, United States" alias="America/Denver America/Shiprock Navajo US/Mountain"/>
             <type name="usdet" description="Detroit, United States" alias="America/Detroit US/Michigan"/>
-            <type name="ushnl" description="Honolulu, United States" alias="Pacific/Honolulu US/Hawaii"/>
-            <type name="usind" description="Indianapolis, United States" alias="America/Indianapolis America/Fort_Wayne America/Indiana/Indianapolis US/East-Indiana"/>
+            <type name="ushnl" description="Honolulu, United States" alias="Pacific/Honolulu US/Hawaii Pacific/Johnston"/>
+            <type name="usind" description="Indianapolis, United States" alias="America/Indianapolis America/Fort_Wayne America/Indiana/Indianapolis US/East-Indiana" iana="America/Indiana/Indianapolis"/>
             <type name="usinvev" description="Vevay (Indiana), United States" alias="America/Indiana/Vevay"/>
             <type name="usjnu" description="Juneau (Alaska), United States" alias="America/Juneau"/>
             <type name="usknx" description="Knox (Indiana), United States" alias="America/Indiana/Knox America/Knox_IN US/Indiana-Starke"/>
             <type name="uslax" description="Los Angeles, United States" alias="America/Los_Angeles US/Pacific US/Pacific-New"/>
-            <type name="uslui" description="Louisville (Kentucky), United States" alias="America/Louisville America/Kentucky/Louisville"/>
+            <type name="uslui" description="Louisville (Kentucky), United States" alias="America/Louisville America/Kentucky/Louisville" iana="America/Kentucky/Louisville"/>
             <type name="usmnm" description="Menominee (Michigan), United States" alias="America/Menominee"/>
             <type name="usmtm" description="Metlakatla (Alaska), United States" alias="America/Metlakatla" since="1.9.1"/>
             <type name="usmoc" description="Monticello (Kentucky), United States" alias="America/Kentucky/Monticello"/>
@@ -469,7 +469,7 @@ For terms of use, see http://www.unicode.org/copyright.html
             <type name="veccs" description="Caracas, Venezuela" alias="America/Caracas"/>
             <type name="vgtov" description="Tortola, British Virgin Islands" alias="America/Tortola"/>
             <type name="vistt" description="Saint Thomas, U.S. Virgin Islands" alias="America/St_Thomas America/Virgin"/>
-            <type name="vnsgn" description="Ho Chi Minh City, Vietnam" alias="Asia/Saigon Asia/Ho_Chi_Minh"/>
+            <type name="vnsgn" description="Ho Chi Minh City, Vietnam" alias="Asia/Saigon Asia/Ho_Chi_Minh" iana="Asia/Ho_Chi_Minh"/>
             <type name="vuvli" description="Efate, Vanuatu" alias="Pacific/Efate"/>
             <type name="wfmau" description="Wallis Islands, Wallis and Futuna" alias="Pacific/Wallis"/>
             <type name="wsapw" description="Apia, Samoa" alias="Pacific/Apia"/>

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 "43" >
+<!ATTLIST version cldrVersion CDATA #FIXED "44" >
     <!--@MATCH:any-->
     <!--@VALUE-->
 <!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@@ -86,7 +86,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST territory type NMTOKEN #REQUIRED >
     <!--@MATCH:validity/region-->
 <!ATTLIST territory alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/short, variant-->
+    <!--@MATCH:literal/short, variant, biot, chagos-->
 <!ATTLIST territory draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -427,7 +427,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT contextTransformUsage ( alias | ( contextTransform*, special* ) ) >
 <!ATTLIST contextTransformUsage type CDATA #REQUIRED >
-    <!--@MATCH:literal/calendar-field, currencyName, day-format-except-narrow, day-standalone-except-narrow, era-abbr, era-name, keyValue, languages, month-format-except-narrow, month-standalone-except-narrow, number-spellout, relative, script, typographicNames-->
+    <!--@MATCH:literal/all, calendar-field, currencyName, currencyName-count, day-format-except-narrow, day-standalone-except-narrow, era-abbr, era-name, key, keyValue, languages, metazone-long, metazone-short, month-format-except-narrow, month-standalone-except-narrow, number-spellout, relative, script, territory, typographicNames, zone-exemplarCity, zone-long, zone-short-->
 <!ATTLIST contextTransformUsage alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/variant-->
 <!ATTLIST contextTransformUsage draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
@@ -1425,13 +1425,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST pattern type NMTOKEN "standard" >
     <!--@MATCH:literal/1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000, 10000000000, 100000000000, 1000000000000, 10000000000000, 100000000000000, 1000000000000000, 10000000000000000, 100000000000000000, 1000000000000000000, 10000000000000000000, approximately, atLeast, atMost, range, standard-->
 <!ATTLIST pattern numbers CDATA #IMPLIED >
-    <!-- TODO: generalize this to be any (M=|d=)?<numberSystem> -->
-    <!--@MATCH:literal/M=romanlow, d=hanidays, hanidec, hebr, y=jpanyear-->
+    <!-- TODO: generalize this to be any (M=|d=|y=)?<numberSystem> -->
+    <!--@MATCH:literal/M=romanlow, d=hanidays, d=jpan, hanidec, hebr, tibt, y=jpanyear-->
     <!--@VALUE-->
 <!ATTLIST pattern count (0 | 1 | zero | one | two | few | many | other) #IMPLIED >
     <!-- Only used for decimalFormats type="1000..." -->
 <!ATTLIST pattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/alphaNextToNumber, noCurrency, variant-->
+    <!--@MATCH:literal/alphaNextToNumber, ascii, noCurrency, variant-->
 <!ATTLIST pattern draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1557,11 +1557,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT dateFormatItem ( #PCDATA ) >
 <!ATTLIST dateFormatItem id CDATA #REQUIRED >
-    <!-- TODO rationalize this list -->
-    <!--@MATCH:literal/Bh, Bhm, Bhms, E, EBhm, EBhms, EEEEd, EHm, EHms, Ed, Ehm, Ehms, Gy, GyM, GyMEEEEd, GyMMM, GyMMMEEEEd, GyMMMEd, GyMMMM, GyMMMMEd, GyMMMMd, GyMMMd, GyMd, H, HHmm, HHmmZ, HHmmss, Hm, HmZ, Hmm, Hms, Hmsv, Hmsvvvv, Hmv, Hmvvvv, M, MEEEEd, MEd, MMM, MMMEEEEd, MMMEd, MMMM, MMMMEEEEd, MMMMEd, MMMMW, MMMMd, MMMMdd, MMMd, MMMdd, MMd, MMdd, Md, Mdd, UM, UMMM, UMMMd, UMd, d, h, hhmm, hhmmss, hm, hms, hmsv, hmsvvvv, hmv, hmvvvv, mmss, ms, y, yM, yMEEEEd, yMEd, yMM, yMMM, yMMMEEEEd, yMMMEd, yMMMM, yMMMMEEEEd, yMMMMEd, yMMMMccccd, yMMMMd, yMMMd, yMMdd, yMd, yQ, yQQQ, yQQQQ, yw, yyyy, yyyyM, yyyyMEEEEd, yyyyMEd, yyyyMM, yyyyMMM, yyyyMMMEEEEd, yyyyMMMEd, yyyyMMMM, yyyyMMMMEd, yyyyMMMMccccd, yyyyMMMMd, yyyyMMMd, yyyyMMdd, yyyyMd, yyyyQQQ, yyyyQQQQ-->
+    <!--@MATCH:regex/((E|EEEE)?(H|HH|h|hh|Bh)(m|ms|mm|mmss)?(Z|z|zzzz|v|vvvv)?)|(ms|mmss)|((G|GGGGG)?(y|yy|yyyy)((M{1,4}((E|EEEE|cccc)?(d|dd))?)|(w|Q|QQQ|QQQQ))?)|(U(M|MMM)d?)|(M{1,4}(((E|EEEE|cccc)?(d|dd))|W)?)|((E|EEEE)?d)|(E|EEEE)-->
 <!ATTLIST dateFormatItem count (zero | one | two | few | many | other) #IMPLIED >
 <!ATTLIST dateFormatItem alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
+    <!--@MATCH:literal/ascii, variant-->
 <!ATTLIST dateFormatItem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
@@ -1616,8 +1615,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT intervalFormatItem ( alias | ( greatestDifference*, special* ) ) >
 <!ATTLIST intervalFormatItem id NMTOKEN #REQUIRED >
-    <!-- TODO: check to see if this should be minimized -->
-    <!--@MATCH:literal/Bh, Bhm, Gy, GyM, GyMEd, GyMMM, GyMMMEd, GyMMMd, GyMd, H, Hm, Hmv, Hmvvvv, Hv, Hvvvv, M, MEd, MMM, MMMEEEEd, MMMEd, MMMM, MMMMEd, MMMMd, MMMd, Md, d, h, hm, hmv, hmvvvv, hv, hvvvv, y, yM, yMEd, yMMM, yMMMEEEEd, yMMMEd, yMMMM, yMMMMEEEEd, yMMMMEd, yMMMMd, yMMMd, yMd, GGGGGyM, GGGGGyMEd, GGGGGyMd, GyMMMM, GyMMMMEd, GyMMMMd-->
+    <!--@MATCH:regex/((H|h|Bh)m?(v|vvvv)?)|((G|GGGGG)?(y|yyyy)((M|MMM|MMMM)((E|EEEE)?d)?)?)|((M|MMM|MMMM)((E|EEEE)?d)?)|d-->
 <!ATTLIST intervalFormatItem alt NMTOKENS #IMPLIED >
     <!--@MATCH:literal/variant-->
 <!ATTLIST intervalFormatItem draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
@@ -3006,7 +3004,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 
 <!ELEMENT characterLabelPattern ( #PCDATA ) >
 <!ATTLIST characterLabelPattern type NMTOKEN #REQUIRED >
-    <!--@MATCH:literal/all, category-list, compatibility, enclosed, extended, historic, miscellaneous, other, scripts, strokes, subscript, superscript-->
+    <!--@MATCH:literal/all, category-list, compatibility, enclosed, extended, facing-left, facing-right, historic, miscellaneous, other, scripts, strokes, subscript, superscript-->
 <!ATTLIST characterLabelPattern count (0 | 1 | zero | one | two | few | many | other) #IMPLIED >
     <!-- count only used for certain patterns" -->
 <!ATTLIST characterLabelPattern alt NMTOKENS #IMPLIED >
@@ -3161,7 +3159,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST featureName draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
-<!ELEMENT personNames ( alias | ( nameOrderLocales*, foreignSpaceReplacement*, initialPattern*, personName*, sampleName*, special* ) ) >
+<!ELEMENT personNames ( alias | ( nameOrderLocales*, parameterDefault*, nativeSpaceReplacement*, foreignSpaceReplacement*, initialPattern*, personName*, sampleName*, special* ) ) >
 
 <!ELEMENT nameOrderLocales ( #PCDATA ) >
 <!ATTLIST nameOrderLocales order (givenFirst | surnameFirst) #REQUIRED >
@@ -3172,6 +3170,25 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST nameOrderLocales references CDATA #IMPLIED >
     <!--@METADATA-->
 
+<!ELEMENT parameterDefault ( #PCDATA ) >
+<!ATTLIST parameterDefault parameter (length | formality) #REQUIRED >
+<!ATTLIST parameterDefault alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
+<!ATTLIST parameterDefault draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST parameterDefault references CDATA #IMPLIED >
+    <!--@METADATA-->
+
+<!ELEMENT nativeSpaceReplacement ( #PCDATA ) >
+<!ATTLIST nativeSpaceReplacement xml:space (default | preserve) "preserve" >
+    <!--@METADATA-->
+<!ATTLIST nativeSpaceReplacement alt NMTOKENS #IMPLIED >
+    <!--@MATCH:literal/variant-->
+<!ATTLIST nativeSpaceReplacement draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
+    <!--@METADATA-->
+<!ATTLIST nativeSpaceReplacement references CDATA #IMPLIED >
+    <!--@METADATA-->
+
 <!ELEMENT foreignSpaceReplacement ( #PCDATA ) >
 <!ATTLIST foreignSpaceReplacement xml:space (default | preserve) "preserve" >
     <!--@METADATA-->

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 "43" >
+<!ATTLIST version cldrVersion CDATA #FIXED "44" >
     <!--@MATCH:version-->
     <!--@VALUE-->
 
@@ -69,6 +69,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST type since CDATA #IMPLIED >
     <!--@MATCH:version-->
     <!--@METADATA-->
+<!ATTLIST type iana CDATA #IMPLIED >
+    <!--@MATCH:regex/^[A-Za-z]+(/[A-Za-z_\-]+)+$-->
+    <!--@VALUE-->
 
 <!ELEMENT attribute EMPTY >
 <!ATTLIST attribute name NMTOKEN #REQUIRED >

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

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Note: The .xsd files are a Technology Preview. They are subject to change or removal in future CLDR versions.
+Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file validation, use the DTD and CLDR tools.
+-->
+
+<!--
+  Copyright © 1991-2023 Unicode, Inc.
+  For terms of use, see http://www.unicode.org/copyright.html
+  SPDX-License-Identifier: Unicode-DFS-2016
+  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+--><xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:element name="ldmlBCP47">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="version"/>
+        <xs:element minOccurs="0" ref="generation"/>
+        <xs:element minOccurs="0" ref="cldrVersion"/>
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="keyword"/>
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="attribute"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="version">
+    <xs:complexType>
+      <xs:attribute name="number" use="required"/>
+      <xs:attribute default="44" name="cldrVersion">
+        <xs:simpleType>
+          <xs:restriction base="xs:string">
+            <xs:enumeration value="44"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  
+  
+  
+  
+  
+  <xs:element name="generation">
+    <xs:complexType>
+      <xs:attribute name="date" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  
+  
+  
+  
+  <xs:element name="cldrVersion">
+    <xs:complexType>
+      <xs:attribute name="version" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  
+  
+  
+  <xs:element name="keyword">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="key"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="key">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="type"/>
+      </xs:sequence>
+      <xs:attribute name="extension" type="xs:NMTOKEN"/>
+      <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>
+      <xs:attribute name="description"/>
+      <xs:attribute default="false" name="deprecated">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="true"/>
+            <xs:enumeration value="false"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="preferred" type="xs:NMTOKEN"/>
+      <xs:attribute name="alias" type="xs:NMTOKEN"/>
+      <xs:attribute name="valueType">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="single"/>
+            <xs:enumeration value="multiple"/>
+            <xs:enumeration value="incremental"/>
+            <xs:enumeration value="any"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="since"/>
+    </xs:complexType>
+  </xs:element>
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  <xs:element name="type">
+    <xs:complexType>
+      <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>
+      <xs:attribute name="description" use="required"/>
+      <xs:attribute default="false" name="deprecated">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="true"/>
+            <xs:enumeration value="false"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="preferred" type="xs:NMTOKEN"/>
+      <xs:attribute name="alias"/>
+      <xs:attribute name="since"/>
+      <xs:attribute name="iana"/>
+    </xs:complexType>
+  </xs:element>
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  <xs:element name="attribute">
+    <xs:complexType>
+      <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>
+      <xs:attribute name="description" use="required"/>
+      <xs:attribute default="false" name="deprecated">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="true"/>
+            <xs:enumeration value="false"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="preferred" type="xs:NMTOKEN"/>
+      <xs:attribute name="since"/>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

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 "43" >
+<!ATTLIST version cldrVersion CDATA #FIXED "44" >
     <!--@MATCH:version-->
     <!--@VALUE-->
 <!ATTLIST version unicodeVersion CDATA #FIXED "15.0.0" >
@@ -415,6 +415,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@MATCH:regex/simple-->
     <!--@VALUE-->
 <!ATTLIST unitQuantity description CDATA #IMPLIED >
+    <!--@MATCH:any-->
     <!--@METADATA-->
 
 <!ELEMENT convertUnits ( convertUnit* ) >
@@ -432,9 +433,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
     <!--@MATCH:regex/[-+*/\._ 0-9a-zA-Z]+-->
     <!--@VALUE-->
 <!ATTLIST convertUnit systems NMTOKENS #IMPLIED >
-    <!--@MATCH:set/literal/ussystem, uksystem, metric, si, other-->
+    <!--@MATCH:set/literal/si, si_acceptable, metric, metric_adjacent, ussystem, uksystem, jpsystem, astronomical, person_age, other, prefixable-->
     <!--@VALUE-->
 <!ATTLIST convertUnit description CDATA #IMPLIED >
+    <!--@MATCH:any-->
     <!--@METADATA-->
 
 <!ELEMENT unitPreferenceData ( unitPreferences* ) >
@@ -1251,7 +1253,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 <!ATTLIST coverageLevel inTerritory CDATA #IMPLIED >
     <!--@MATCH:any-->
 <!ATTLIST coverageLevel value CDATA #REQUIRED >
-    <!--@MATCH:literal/basic, core, minimal, moderate, modern, posix-->
+    <!--@MATCH:literal/basic, comprehensive, core, minimal, moderate, modern, posix-->
     <!--@VALUE-->
 <!ATTLIST coverageLevel match CDATA #REQUIRED >
     <!--@MATCH:any-->

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.w3.org/XML/1998/namespace">
+  <xs:import schemaLocation="ldml.xsd"/>
+  <xs:attribute name="space">
+    <xs:simpleType>
+      <xs:restriction base="xs:token">
+        <xs:enumeration value="default"/>
+        <xs:enumeration value="preserve"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:attribute>
+</xs:schema>

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

@@ -143,10 +143,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<dayPeriod type="am" draft="unconfirmed">saaku</dayPeriod>
 							<dayPeriod type="pm" draft="unconfirmed">carra</dayPeriod>
 						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="unconfirmed">saaku</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">carra</dayPeriod>
-						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>

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

@@ -15,11 +15,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		<language type="ab"/>
 	</identity>
 	<localeDisplayNames>
-		<localeDisplayPattern>
-			<localePattern draft="unconfirmed">{0} ({1})</localePattern>
-			<localeSeparator draft="unconfirmed">{0}, {1}</localeSeparator>
-			<localeKeyTypePattern draft="unconfirmed">{0}: {1}</localeKeyTypePattern>
-		</localeDisplayPattern>
 		<languages>
 			<language type="ab">Аԥсшәа</language>
 			<language type="ace" draft="unconfirmed">ачех</language>
@@ -890,40 +885,22 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 	</localeDisplayNames>
 	<characters>
 		<exemplarCharacters>[а ә б в г {гә} {гь} ӷ {ӷә} {ӷь} д {дә} е ж {жә} {жь} з ӡ {ӡә} и к {кә} {кь} қ {қә} {қь} ҟ {ҟә} {ҟь} л м н о п ԥ р с т {тә} ҭ {ҭә} у ф х {хә} {хь} ҳ {ҳә} ц {цә} ҵ {ҵә} ч ҷ ҽ ҿ џ {џь} ш {шә} {шь} ы ь ҩ]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[{а\u0301} ҕ {ҕә} {ҕь} {е\u0301} {и\u0301} {о\u0301} ҧ {у\u0301} {ы\u0301}]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[{а́} ҕ {ҕә} {ҕь} {е́} {и́} {о́} ҧ {у́} {ы́}]</exemplarCharacters>
 		<exemplarCharacters type="index">[А Б В Г {ГӘ} {ГЬ} Ӷ {ӶӘ} {ӶЬ} Д {ДӘ} Е Ж {ЖӘ} {ЖЬ} З Ӡ {ӠӘ} И К {КӘ} {КЬ} Қ {ҚӘ} {ҚЬ} Ҟ {ҞӘ} {ҞЬ} Л М Н О П Ԥ Р С Т {ТӘ} Ҭ {ҬӘ} У Ф Х {ХӘ} {ХЬ} Ҳ {ҲӘ} Ц {ЦӘ} Ҵ {ҴӘ} Ч Ҷ Ҽ Ҿ Џ {ЏЬ} Ш {ШӘ} {ШЬ} Ы Ҩ]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[\- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[\- ‐ ‑ – — , ; \: ! ? . … ' ‘ ‚ &quot; “ „ « » ( ) \[ \] \{ \} § @ * / \&amp; #]</exemplarCharacters>
-		<ellipsis type="final" draft="unconfirmed">{0}…</ellipsis>
-		<ellipsis type="initial" draft="unconfirmed">…{0}</ellipsis>
-		<ellipsis type="medial" draft="unconfirmed">{0}…{1}</ellipsis>
-		<ellipsis type="word-final" draft="unconfirmed">{0} …</ellipsis>
-		<ellipsis type="word-initial" draft="unconfirmed">… {0}</ellipsis>
-		<ellipsis type="word-medial" draft="unconfirmed">{0} … {1}</ellipsis>
-		<moreInformation draft="unconfirmed">?</moreInformation>
+		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ? . … '‘‚ &quot;“„ « » ( ) \[ \] \{ \} § @ * / \&amp; #]</exemplarCharacters>
 		<parseLenients scope="date" level="lenient">
-			<parseLenient sample="-" draft="unconfirmed">[\--/]</parseLenient>
-			<parseLenient sample=":" draft="unconfirmed">[\:∶]</parseLenient>
+			<parseLenient sample=":" draft="unconfirmed">[\: ∶]</parseLenient>
 		</parseLenients>
 		<parseLenients scope="general" level="lenient">
-			<parseLenient sample="." draft="unconfirmed">[.․。︒﹒．｡]</parseLenient>
-			<parseLenient sample="’" draft="unconfirmed">['ʼ՚᾽᾿’＇]</parseLenient>
-			<parseLenient sample="%" draft="unconfirmed">[%٪﹪％]</parseLenient>
-			<parseLenient sample="‰" draft="unconfirmed">[؉‰]</parseLenient>
-			<parseLenient sample="$" draft="unconfirmed">[\$﹩＄$]</parseLenient>
-			<parseLenient sample="£" draft="unconfirmed">[£₤]</parseLenient>
-			<parseLenient sample="¥" draft="unconfirmed">[¥￥]</parseLenient>
-			<parseLenient sample="₩" draft="unconfirmed">[₩￦]</parseLenient>
-			<parseLenient sample="₹" draft="unconfirmed">[₨₹{Rp}{Rs}]</parseLenient>
+			<parseLenient sample="£" draft="unconfirmed">[£ ₤]</parseLenient>
 		</parseLenients>
 		<parseLenients scope="number" level="lenient">
-			<parseLenient sample="-" draft="unconfirmed">[\-‒⁻₋−➖﹣－]</parseLenient>
-			<parseLenient sample="," draft="unconfirmed">[,،٫、︐︑﹐﹑，､]</parseLenient>
-			<parseLenient sample="+" draft="unconfirmed">[+⁺₊➕﬩﹢＋]</parseLenient>
+			<parseLenient sample="-" draft="unconfirmed">[\-－﹣ ‑ ‒ −⁻₋ ➖]</parseLenient>
+			<parseLenient sample="," draft="unconfirmed">[,，﹐︐ ، ٫ 、﹑､︑]</parseLenient>
 		</parseLenients>
 		<parseLenients scope="number" level="stricter">
-			<parseLenient sample="," draft="unconfirmed">[,٫︐﹐，]</parseLenient>
-			<parseLenient sample="." draft="unconfirmed">[.․﹒．｡]</parseLenient>
+			<parseLenient sample="," draft="unconfirmed">[,，﹐︐ ٫]</parseLenient>
 		</parseLenients>
 	</characters>
 	<delimiters>
@@ -978,17 +955,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern draft="unconfirmed">{1}, {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1}, {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern draft="unconfirmed">{1}, {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1}, {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="Ed" draft="unconfirmed">E, d</dateFormatItem>
@@ -1160,20 +1131,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">Ажь</month>
-							<month type="2" draft="unconfirmed">Жəаб</month>
-							<month type="3" draft="unconfirmed">Хəажә</month>
-							<month type="4" draft="unconfirmed">Мш</month>
-							<month type="5" draft="unconfirmed">Лаҵ</month>
-							<month type="6" draft="unconfirmed">Рашә</month>
-							<month type="7" draft="unconfirmed">Ԥхынгә</month>
-							<month type="8" draft="unconfirmed">Нанҳә</month>
-							<month type="9" draft="unconfirmed">Цəыб</month>
-							<month type="10" draft="unconfirmed">Жьҭ</month>
-							<month type="11" draft="unconfirmed">Абҵ</month>
-							<month type="12" draft="unconfirmed">Ԥхынҷ</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1" draft="unconfirmed">Жь</month>
 							<month type="2" draft="unconfirmed">Жə</month>
@@ -1188,20 +1145,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<month type="11" draft="unconfirmed">Б</month>
 							<month type="12" draft="unconfirmed">Ҷ</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1" draft="unconfirmed">Ажьырныҳəа</month>
-							<month type="2" draft="unconfirmed">Жəабран</month>
-							<month type="3" draft="unconfirmed">Хəажəкыра</month>
-							<month type="4" draft="unconfirmed">Мшаԥы</month>
-							<month type="5" draft="unconfirmed">Лаҵара</month>
-							<month type="6" draft="unconfirmed">Рашəара</month>
-							<month type="7" draft="unconfirmed">Ԥхынгəы</month>
-							<month type="8" draft="unconfirmed">Нанҳəа</month>
-							<month type="9" draft="unconfirmed">Цəыббра</month>
-							<month type="10" draft="unconfirmed">Жьҭаара</month>
-							<month type="11" draft="unconfirmed">Абҵара</month>
-							<month type="12" draft="unconfirmed">Ԥхынҷкәын</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 				<days>
@@ -1215,24 +1158,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<day type="fri" draft="unconfirmed">Ахә</day>
 							<day type="sat" draft="unconfirmed">Ас</day>
 						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun" draft="unconfirmed">М</day>
-							<day type="mon" draft="unconfirmed">Шә</day>
-							<day type="tue" draft="unconfirmed">Ҩ</day>
-							<day type="wed" draft="unconfirmed">Х</day>
-							<day type="thu" draft="unconfirmed">Ԥ</day>
-							<day type="fri" draft="unconfirmed">Хә</day>
-							<day type="sat" draft="unconfirmed">С</day>
-						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun" draft="unconfirmed">Ам</day>
-							<day type="mon" draft="unconfirmed">Ашә</day>
-							<day type="tue" draft="unconfirmed">Аҩ</day>
-							<day type="wed" draft="unconfirmed">Ах</day>
-							<day type="thu" draft="unconfirmed">Аԥ</day>
-							<day type="fri" draft="unconfirmed">Ахә</day>
-							<day type="sat" draft="unconfirmed">Ас</day>
-						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun" draft="unconfirmed">Амҽыша</day>
 							<day type="mon" draft="unconfirmed">Ашәахьа</day>
@@ -1244,15 +1169,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</dayWidth>
 					</dayContext>
 					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<day type="sun" draft="unconfirmed">Ам</day>
-							<day type="mon" draft="unconfirmed">Ашә</day>
-							<day type="tue" draft="unconfirmed">Аҩ</day>
-							<day type="wed" draft="unconfirmed">Ах</day>
-							<day type="thu" draft="unconfirmed">Аԥ</day>
-							<day type="fri" draft="unconfirmed">Ахә</day>
-							<day type="sat" draft="unconfirmed">Ас</day>
-						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun" draft="unconfirmed">М</day>
 							<day type="mon" draft="unconfirmed">Шә</day>
@@ -1262,48 +1178,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<day type="fri" draft="unconfirmed">Хә</day>
 							<day type="sat" draft="unconfirmed">С</day>
 						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun" draft="unconfirmed">Ам</day>
-							<day type="mon" draft="unconfirmed">Ашә</day>
-							<day type="tue" draft="unconfirmed">Аҩ</day>
-							<day type="wed" draft="unconfirmed">Ах</day>
-							<day type="thu" draft="unconfirmed">Аԥ</day>
-							<day type="fri" draft="unconfirmed">Ахә</day>
-							<day type="sat" draft="unconfirmed">Ас</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun" draft="unconfirmed">Амҽыша</day>
-							<day type="mon" draft="unconfirmed">Ашәахьа</day>
-							<day type="tue" draft="unconfirmed">Аҩаша</day>
-							<day type="wed" draft="unconfirmed">Ахаша</day>
-							<day type="thu" draft="unconfirmed">Аԥшьаша</day>
-							<day type="fri" draft="unconfirmed">Ахәаша</day>
-							<day type="sat" draft="unconfirmed">Асабша</day>
-						</dayWidth>
 					</dayContext>
 				</days>
 				<quarters>
 					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1" draft="unconfirmed">1-тәи акв.</quarter>
-							<quarter type="2" draft="unconfirmed">2-тәи акв.</quarter>
-							<quarter type="3" draft="unconfirmed">3-тәи акв.</quarter>
-							<quarter type="4" draft="unconfirmed">4-тәи акв.</quarter>
-						</quarterWidth>
-						<quarterWidth type="narrow">
-							<quarter type="1" draft="unconfirmed">1</quarter>
-							<quarter type="2" draft="unconfirmed">2</quarter>
-							<quarter type="3" draft="unconfirmed">3</quarter>
-							<quarter type="4" draft="unconfirmed">4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1" draft="unconfirmed">1-тәи аквартал</quarter>
-							<quarter type="2" draft="unconfirmed">2-тәи аквартал</quarter>
-							<quarter type="3" draft="unconfirmed">3-тәи аквартал</quarter>
-							<quarter type="4" draft="unconfirmed">4-тәи аквартал</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
 						<quarterWidth type="abbreviated">
 							<quarter type="1" draft="unconfirmed">1-тәи акв.</quarter>
 							<quarter type="2" draft="unconfirmed">2-тәи акв.</quarter>
@@ -1318,32 +1196,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
-				<dayPeriods>
-					<dayPeriodContext type="format">
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am" draft="unconfirmed">AM</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">PM</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="unconfirmed">AM</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">PM</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-					<dayPeriodContext type="stand-alone">
-						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am" draft="unconfirmed">AM</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">PM</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am" draft="unconfirmed">AM</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">PM</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="unconfirmed">AM</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">PM</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-				</dayPeriods>
 				<dateFormats>
 					<dateFormatLength type="full">
 						<dateFormat>
@@ -1409,17 +1261,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateTimeFormat>
 							<pattern draft="unconfirmed">{1}, {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1}, {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<dateTimeFormatLength type="short">
 						<dateTimeFormat>
 							<pattern draft="unconfirmed">{1}, {0}</pattern>
 						</dateTimeFormat>
-						<dateTimeFormat type="atTime">
-							<pattern draft="unconfirmed">{1}, {0}</pattern>
-						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="EBhm" draft="unconfirmed">ccc, h:mm B</dateFormatItem>
@@ -1431,11 +1277,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 						<dateFormatItem id="GyMMMd" draft="unconfirmed">d MMM y 'ш'. G</dateFormatItem>
 						<dateFormatItem id="GyMMMEd" draft="unconfirmed">E, d MMM y 'ш'. G</dateFormatItem>
 						<dateFormatItem id="hm" draft="unconfirmed">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm" draft="unconfirmed">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms" draft="unconfirmed">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms" draft="unconfirmed">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="hmsv" draft="unconfirmed">h:mm:ss a v</dateFormatItem>
-						<dateFormatItem id="Hmsv" draft="unconfirmed">HH:mm:ss v</dateFormatItem>
 						<dateFormatItem id="Md" draft="unconfirmed">dd.MM</dateFormatItem>
 						<dateFormatItem id="MEd" draft="unconfirmed">E, dd.MM</dateFormatItem>
 						<dateFormatItem id="MMMd" draft="unconfirmed">d MMM</dateFormatItem>
@@ -1455,9 +1298,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 					</availableFormats>
 					<intervalFormats>
 						<intervalFormatFallback draft="unconfirmed">{0} – {1}</intervalFormatFallback>
-						<intervalFormatItem id="d">
-							<greatestDifference id="d" draft="unconfirmed">d–d</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="Gy">
 							<greatestDifference id="G" draft="unconfirmed">y 'ш'. G – y 'ш'. G</greatestDifference>
 							<greatestDifference id="y" draft="unconfirmed">y–y 'шш'. G</greatestDifference>
@@ -1500,9 +1340,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="a" draft="unconfirmed">h a – h a</greatestDifference>
 							<greatestDifference id="h" draft="unconfirmed">h–h a</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="H">
-							<greatestDifference id="H" draft="unconfirmed">HH–HH</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="hm">
 							<greatestDifference id="a" draft="unconfirmed">h:mm a – h:mm a</greatestDifference>
 							<greatestDifference id="h" draft="unconfirmed">h:mm–h:mm a</greatestDifference>
@@ -1539,9 +1376,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 							<greatestDifference id="d" draft="unconfirmed">E, d MMM – E, d MMM</greatestDifference>
 							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y" draft="unconfirmed">y–y</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="yM">
 							<greatestDifference id="M" draft="unconfirmed">MM.y – MM.y</greatestDifference>
 							<greatestDifference id="y" draft="unconfirmed">MM.y – MM.y</greatestDifference>
@@ -1624,18 +1458,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<relative type="0" draft="unconfirmed">иахьа</relative>
 				<relative type="1" draft="unconfirmed">уаҵәы</relative>
 			</field>
-			<field type="day-short">
-				<displayName draft="unconfirmed">амш</displayName>
-				<relative type="-1" draft="unconfirmed">иацы</relative>
-				<relative type="0" draft="unconfirmed">иахьа</relative>
-				<relative type="1" draft="unconfirmed">уаҵәы</relative>
-			</field>
-			<field type="day-narrow">
-				<displayName draft="unconfirmed">амш</displayName>
-				<relative type="-1" draft="unconfirmed">иацы</relative>
-				<relative type="0" draft="unconfirmed">иахьа</relative>
-				<relative type="1" draft="unconfirmed">уаҵәы</relative>
-			</field>
 		</fields>
 		<timeZoneNames>
 			<regionFormat draft="unconfirmed">{0} Аамҭа</regionFormat>
@@ -3894,29 +3716,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</timeZoneNames>
 	</dates>
 	<numbers>
-		<defaultNumberingSystem draft="unconfirmed">latn</defaultNumberingSystem>
-		<otherNumberingSystems>
-			<native draft="unconfirmed">latn</native>
-		</otherNumberingSystems>
 		<symbols numberSystem="latn">
 			<decimal draft="unconfirmed">,</decimal>
 			<group draft="unconfirmed"> </group>
 			<approximatelySign draft="unconfirmed">≈</approximatelySign>
 		</symbols>
-		<decimalFormats numberSystem="latn">
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern draft="unconfirmed">#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats numberSystem="latn">
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern draft="unconfirmed">#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
 		<percentFormats numberSystem="latn">
 			<percentFormatLength>
 				<percentFormat>
@@ -3929,20 +3733,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 				<currencyFormat type="standard">
 					<pattern draft="unconfirmed">#,##0.00 ¤</pattern>
 				</currencyFormat>
-				<currencyFormat type="accounting">
-					<pattern draft="unconfirmed">#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="unconfirmed">#,##0.00</pattern>
-				</currencyFormat>
 			</currencyFormatLength>
+			<unitPattern count="other" draft="unconfirmed">{0} {1}</unitPattern>
 		</currencyFormats>
 		<currencies>
 			<currency type="BMD">
 				<displayName draft="unconfirmed">бермудтәи адоллар</displayName>
-				<displayName count="other" draft="unconfirmed">бермудтәи адоллар</displayName>
 			</currency>
 			<currency type="EUR">
 				<displayName draft="unconfirmed">евро</displayName>
-				<displayName count="other" draft="unconfirmed">евро</displayName>
 			</currency>
 			<currency type="GEL">
 				<symbol alt="narrow" draft="unconfirmed">ლ</symbol>
@@ -3959,9 +3758,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<currency type="RUB">
 				<symbol draft="unconfirmed">₽</symbol>
 			</currency>
-			<currency type="SLL">
+			<currency type="SLE">
 				<displayName draft="unconfirmed">леоне</displayName>
-				<displayName count="other" draft="unconfirmed">леоне</displayName>
+			</currency>
+			<currency type="SLL">
+				<displayName draft="unconfirmed">леоне (1964—2022)</displayName>
 			</currency>
 			<currency type="THB">
 				<symbol draft="unconfirmed">฿</symbol>
@@ -3987,24 +3788,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<pluralMinimalPairs count="other" draft="unconfirmed">{0} мшы</pluralMinimalPairs>
 		</minimalPairs>
 	</numbers>
-	<units>
-		<unitLength type="long">
-			<compoundUnit type="per">
-				<compoundUnitPattern draft="unconfirmed">{0}/{1}</compoundUnitPattern>
-			</compoundUnit>
-			<compoundUnit type="times">
-				<compoundUnitPattern draft="unconfirmed">{0}⋅{1}</compoundUnitPattern>
-			</compoundUnit>
-		</unitLength>
-		<unitLength type="narrow">
-			<compoundUnit type="per">
-				<compoundUnitPattern draft="unconfirmed">{0}/{1}</compoundUnitPattern>
-			</compoundUnit>
-			<compoundUnit type="times">
-				<compoundUnitPattern draft="unconfirmed">{0}⋅{1}</compoundUnitPattern>
-			</compoundUnit>
-		</unitLength>
-	</units>
 	<listPatterns>
 		<listPattern>
 			<listPatternPart type="end" draft="unconfirmed">{0}-и {1}-и</listPatternPart>
@@ -4014,42 +3797,10 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 			<listPatternPart type="end" draft="unconfirmed">{0} ма {1}</listPatternPart>
 			<listPatternPart type="2" draft="unconfirmed">{0} ма {1}</listPatternPart>
 		</listPattern>
-		<listPattern type="or-narrow">
-			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} ма {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} ма {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="or-short">
-			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} ма {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} ма {1}</listPatternPart>
-		</listPattern>
 		<listPattern type="standard-narrow">
-			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
 			<listPatternPart type="end" draft="unconfirmed">{0}, {1}</listPatternPart>
 			<listPatternPart type="2" draft="unconfirmed">{0}, {1}</listPatternPart>
 		</listPattern>
-		<listPattern type="standard-short">
-			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0}-и {1}-и</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0}-и {1}-и</listPatternPart>
-		</listPattern>
-		<listPattern type="unit">
-			<listPatternPart type="start" draft="unconfirmed">{0} {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0} {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit-narrow">
-			<listPatternPart type="start" draft="unconfirmed">{0} {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0} {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} {1}</listPatternPart>
-		</listPattern>
 		<listPattern type="unit-short">
 			<listPatternPart type="start" draft="unconfirmed">{0} {1}</listPatternPart>
 			<listPatternPart type="middle" draft="unconfirmed">{0} {1}</listPatternPart>

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

@@ -149,7 +149,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="IE">Aelɨ̀lân</territory>
 			<territory type="IL">Ezɨ̀lɛ̂</territory>
 			<territory type="IN">Endìa</territory>
-			<territory type="IO">Dɨŋò kɨ dzughùnstòʔ kɨ Endìa kɨ Bɨ̀letì kò</territory>
+			<territory type="IO" draft="provisional">Dɨŋò kɨ dzughùnstòʔ kɨ Endìa kɨ Bɨ̀letì kò</territory>
 			<territory type="IQ">Èlâkɨ̀</territory>
 			<territory type="IR">Èlân</territory>
 			<territory type="IS">Aesɨ̀lân</territory>
@@ -285,16 +285,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</territories>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters>[a à â ǎ ā b c d e è ê ě ē ɛ {ɛ\u0300} {ɛ\u0302} {ɛ\u030C} {ɛ\u0304} f g h i ì î ǐ ī ɨ {ɨ\u0300} {ɨ\u0302} {ɨ\u030C} {ɨ\u0304} k l m n ŋ o ò ô ǒ ō ɔ {ɔ\u0300} {ɔ\u0302} {ɔ\u030C} {ɔ\u0304} p s t u ù û ǔ ū ʉ {ʉ\u0300} {ʉ\u0302} {ʉ\u030C} {ʉ\u0304} v w y z ʔ]</exemplarCharacters>
+		<exemplarCharacters>[aàâǎā b c d eèêěē ɛ{ɛ̀}{ɛ̂}{ɛ̌}{ɛ̄} f g h iìîǐī ɨ{ɨ̀}{ɨ̂}{ɨ̌}{ɨ̄} k l m n ŋ oòôǒō ɔ{ɔ̀}{ɔ̂}{ɔ̌}{ɔ̄} p s t uùûǔū ʉ{ʉ̀}{ʉ̂}{ʉ̌}{ʉ̄} v w y z ʔ]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[q r x]</exemplarCharacters>
 		<exemplarCharacters type="index">[A B C D E Ɛ F G H I Ɨ K L M N Ŋ O Ɔ P S T U Ʉ V W Y Z ʔ]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 	</characters>
 	<delimiters>
 		<quotationStart>„</quotationStart>
-		<quotationEnd>”</quotationEnd>
 		<alternateQuotationStart>‚</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
 	</delimiters>
 	<dates>
 		<calendars>
@@ -303,19 +301,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>EEEE d MMMM y G</pattern>
-							<datetimeSkeleton>GyMMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>d MMMM y G</pattern>
-							<datetimeSkeleton>GyMMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>d MMM, y G</pattern>
-							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -327,16 +322,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</dateFormats>
 				<dateTimeFormats>
 					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E d/M</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
 						<dateFormatItem id="ms">m:ss</dateFormatItem>
@@ -450,10 +440,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<dayPeriod type="am">a.g</dayPeriod>
 							<dayPeriod type="pm">a.k</dayPeriod>
 						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">a.g</dayPeriod>
-							<dayPeriod type="pm">a.k</dayPeriod>
-						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
@@ -470,19 +456,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern>EEEE d MMMM y</pattern>
-							<datetimeSkeleton>yMMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>d MMMM y</pattern>
-							<datetimeSkeleton>yMMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>d MMM, y</pattern>
-							<datetimeSkeleton>yMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -496,44 +479,34 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<timeFormatLength type="full">
 						<timeFormat>
 							<pattern>HH:mm:ss zzzz</pattern>
-							<datetimeSkeleton>HHmmsszzzz</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="long">
 						<timeFormat>
 							<pattern>HH:mm:ss z</pattern>
-							<datetimeSkeleton>HHmmssz</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="medium">
 						<timeFormat>
 							<pattern>HH:mm:ss</pattern>
-							<datetimeSkeleton>HHmmss</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
 					<timeFormatLength type="short">
 						<timeFormat>
 							<pattern>HH:mm</pattern>
-							<datetimeSkeleton>HHmm</datetimeSkeleton>
 						</timeFormat>
 					</timeFormatLength>
 				</timeFormats>
 				<dateTimeFormats>
 					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="Ed">d E</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">d/M</dateFormatItem>
 						<dateFormatItem id="MEd">E d/M</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">d MMM</dateFormatItem>
 						<dateFormatItem id="MMMEd">E d MMM</dateFormatItem>
 						<dateFormatItem id="ms">m:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
 						<dateFormatItem id="yMd">d/M/y</dateFormatItem>
 						<dateFormatItem id="yMEd">E d/M/y</dateFormatItem>
@@ -590,26 +563,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<decimal>,</decimal>
 			<group> </group>
 		</symbols>
-		<decimalFormats numberSystem="latn">
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern>#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<percentFormats numberSystem="latn">
-			<percentFormatLength>
-				<percentFormat>
-					<pattern>#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>#,##0.00¤</pattern>
 					<pattern alt="alphaNextToNumber" draft="provisional">#,##0.00 ¤</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -756,9 +714,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="SHP">
 				<displayName>Bɔ̀ŋ è Sɛ̀n Èlenà</displayName>
 			</currency>
-			<currency type="SLL">
+			<currency type="SLE">
 				<displayName>Lyɔ̂ŋ</displayName>
 			</currency>
+			<currency type="SLL">
+				<displayName>Lyɔ̂ŋ (1964—2022)</displayName>
+			</currency>
 			<currency type="SOS">
 				<displayName>Shwɨlà è Sùmalìa</displayName>
 			</currency>

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

@@ -148,7 +148,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="IE">Aereland</territory>
 			<territory type="IL">Israel</territory>
 			<territory type="IN">India</territory>
-			<territory type="IO">Britenfo Hɔn Man Wɔ India Po No Mu</territory>
+			<territory type="IO" draft="provisional">Britenfo Hɔn Man Wɔ India Po No Mu</territory>
 			<territory type="IQ">Irak</territory>
 			<territory type="IR">Iran</territory>
 			<territory type="IS">Aesland</territory>
@@ -287,14 +287,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<exemplarCharacters>[a b d e ɛ f g h i k l m n o ɔ p r s t u w y]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[c j q v z]</exemplarCharacters>
 		<exemplarCharacters type="index">[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]</exemplarCharacters>
-		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 	</characters>
-	<delimiters>
-		<quotationStart>“</quotationStart>
-		<quotationEnd>”</quotationEnd>
-		<alternateQuotationStart>‘</alternateQuotationStart>
-		<alternateQuotationEnd>’</alternateQuotationEnd>
-	</delimiters>
 	<dates>
 		<calendars>
 			<calendar type="generic">
@@ -308,13 +301,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>G y MMMM d</pattern>
-							<datetimeSkeleton>GyMMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>G y MMM d</pattern>
-							<datetimeSkeleton>GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -326,19 +317,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</dateFormats>
 				<dateTimeFormats>
 					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E, MMMM d</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
 						<dateFormatItem id="yMd">y/M/d</dateFormatItem>
@@ -423,10 +406,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<dayPeriod type="am">AN</dayPeriod>
 							<dayPeriod type="pm">EW</dayPeriod>
 						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am">AN</dayPeriod>
-							<dayPeriod type="pm">EW</dayPeriod>
-						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
@@ -449,13 +428,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern>y MMMM d</pattern>
-							<datetimeSkeleton>yMMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern>y MMM d</pattern>
-							<datetimeSkeleton>yMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -493,20 +470,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				</timeFormats>
 				<dateTimeFormats>
 					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
 						<dateFormatItem id="Md">M/d</dateFormatItem>
 						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
 						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
 						<dateFormatItem id="MMMMEd">E, MMMM d</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
 						<dateFormatItem id="yM">M/y</dateFormatItem>
 						<dateFormatItem id="yMd">y/M/d</dateFormatItem>
 						<dateFormatItem id="yMEd">E, M/d/y</dateFormatItem>
@@ -559,16 +527,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</fields>
 	</dates>
 	<numbers>
-		<symbols numberSystem="latn">
-			<decimal>.</decimal>
-			<group>,</group>
-		</symbols>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
 					<pattern>¤#,##0.00</pattern>
 					<pattern alt="alphaNextToNumber" draft="provisional">¤ #,##0.00</pattern>
-					<pattern alt="noCurrency" draft="provisional">#,##0.00</pattern>
 				</currencyFormat>
 			</currencyFormatLength>
 			<currencyFormatLength type="short">
@@ -755,9 +718,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<currency type="SHP">
 				<displayName>St Helena Pɔn</displayName>
 			</currency>
-			<currency type="SLL">
+			<currency type="SLE">
 				<displayName>Leone</displayName>
 			</currency>
+			<currency type="SLL">
+				<displayName>Leone (1964—2022)</displayName>
+			</currency>
 			<currency type="SOS">
 				<displayName>Somailia Hyelen</displayName>
 			</currency>

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

@@ -394,11 +394,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</codePatterns>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters>[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]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[· à â ä ç è ê ë ì î ï ñ ò ô ö ù û]</exemplarCharacters>
+		<exemplarCharacters>[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]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[· àâä ç èêë ìîï ñ òôö ùû]</exemplarCharacters>
 		<exemplarCharacters type="index">[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]</exemplarCharacters>
-		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[\- ‐ ‑ – — , ; \: ! ¡ ? ¿ . … ' ‘ ’ &quot; “ ” « » ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐‑ – — , ; \: ! ¡ ? ¿ . … '‘’ &quot;“” « » ( ) \[ \] § @ * / \&amp; # † ‡ ′ ″]</exemplarCharacters>
 	</characters>
 	<delimiters>
 		<quotationStart draft="unconfirmed">«</quotationStart>
@@ -413,25 +412,21 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern draft="unconfirmed">EEEE, d MMMM 'de' y G</pattern>
-							<datetimeSkeleton draft="unconfirmed">GyMMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern draft="unconfirmed">d MMMM 'de' y G</pattern>
-							<datetimeSkeleton draft="unconfirmed">GyMMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern draft="unconfirmed">d MMM 'de' y G</pattern>
-							<datetimeSkeleton draft="unconfirmed">GyMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
 							<pattern draft="unconfirmed">dd-MM-y GGGGG</pattern>
-							<datetimeSkeleton draft="unconfirmed">GGGGGyMMdd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -529,9 +524,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="d" draft="unconfirmed">E, d/M – E, d/M</greatestDifference>
 							<greatestDifference id="M" draft="unconfirmed">E, d/M – E, d/M</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M" draft="unconfirmed">LLL–LLL</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d" draft="unconfirmed">d–d MMM</greatestDifference>
 							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM</greatestDifference>
@@ -595,20 +587,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11" draft="unconfirmed">nov.</month>
 							<month type="12" draft="unconfirmed">avi.</month>
 						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1" draft="unconfirmed">1</month>
-							<month type="2" draft="unconfirmed">2</month>
-							<month type="3" draft="unconfirmed">3</month>
-							<month type="4" draft="unconfirmed">4</month>
-							<month type="5" draft="unconfirmed">5</month>
-							<month type="6" draft="unconfirmed">6</month>
-							<month type="7" draft="unconfirmed">7</month>
-							<month type="8" draft="unconfirmed">8</month>
-							<month type="9" draft="unconfirmed">9</month>
-							<month type="10" draft="unconfirmed">10</month>
-							<month type="11" draft="unconfirmed">11</month>
-							<month type="12" draft="unconfirmed">12</month>
-						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1" draft="unconfirmed">de chinero</month>
 							<month type="2" draft="unconfirmed">de febrero</month>
@@ -625,34 +603,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1" draft="unconfirmed">chi.</month>
-							<month type="2" draft="unconfirmed">feb.</month>
-							<month type="3" draft="unconfirmed">mar.</month>
-							<month type="4" draft="unconfirmed">abr.</month>
-							<month type="5" draft="unconfirmed">may.</month>
-							<month type="6" draft="unconfirmed">chn.</month>
-							<month type="7" draft="unconfirmed">chl.</month>
-							<month type="8" draft="unconfirmed">ago.</month>
-							<month type="9" draft="unconfirmed">set.</month>
-							<month type="10" draft="unconfirmed">oct.</month>
-							<month type="11" draft="unconfirmed">nov.</month>
-							<month type="12" draft="unconfirmed">avi.</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1" draft="unconfirmed">1</month>
-							<month type="2" draft="unconfirmed">2</month>
-							<month type="3" draft="unconfirmed">3</month>
-							<month type="4" draft="unconfirmed">4</month>
-							<month type="5" draft="unconfirmed">5</month>
-							<month type="6" draft="unconfirmed">6</month>
-							<month type="7" draft="unconfirmed">7</month>
-							<month type="8" draft="unconfirmed">8</month>
-							<month type="9" draft="unconfirmed">9</month>
-							<month type="10" draft="unconfirmed">10</month>
-							<month type="11" draft="unconfirmed">11</month>
-							<month type="12" draft="unconfirmed">12</month>
-						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1" draft="unconfirmed">chinero</month>
 							<month type="2" draft="unconfirmed">febrero</month>
@@ -680,24 +630,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="fri" draft="unconfirmed">vie</day>
 							<day type="sat" draft="unconfirmed">sab</day>
 						</dayWidth>
-						<dayWidth type="narrow">
-							<day type="sun" draft="unconfirmed">D</day>
-							<day type="mon" draft="unconfirmed">L</day>
-							<day type="tue" draft="unconfirmed">Ma</day>
-							<day type="wed" draft="unconfirmed">Mi</day>
-							<day type="thu" draft="unconfirmed">Ch</day>
-							<day type="fri" draft="unconfirmed">V</day>
-							<day type="sat" draft="unconfirmed">S</day>
-						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun" draft="unconfirmed">dom</day>
-							<day type="mon" draft="unconfirmed">lun</day>
-							<day type="tue" draft="unconfirmed">mar</day>
-							<day type="wed" draft="unconfirmed">mie</day>
-							<day type="thu" draft="unconfirmed">chu</day>
-							<day type="fri" draft="unconfirmed">vie</day>
-							<day type="sat" draft="unconfirmed">sab</day>
-						</dayWidth>
 						<dayWidth type="wide">
 							<day type="sun" draft="unconfirmed">dominche</day>
 							<day type="mon" draft="unconfirmed">luns</day>
@@ -709,15 +641,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dayWidth>
 					</dayContext>
 					<dayContext type="stand-alone">
-						<dayWidth type="abbreviated">
-							<day type="sun" draft="unconfirmed">dom</day>
-							<day type="mon" draft="unconfirmed">lun</day>
-							<day type="tue" draft="unconfirmed">mar</day>
-							<day type="wed" draft="unconfirmed">mie</day>
-							<day type="thu" draft="unconfirmed">chu</day>
-							<day type="fri" draft="unconfirmed">vie</day>
-							<day type="sat" draft="unconfirmed">sab</day>
-						</dayWidth>
 						<dayWidth type="narrow">
 							<day type="sun" draft="unconfirmed">D</day>
 							<day type="mon" draft="unconfirmed">L</day>
@@ -727,48 +650,10 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<day type="fri" draft="unconfirmed">V</day>
 							<day type="sat" draft="unconfirmed">S</day>
 						</dayWidth>
-						<dayWidth type="short">
-							<day type="sun" draft="unconfirmed">dom</day>
-							<day type="mon" draft="unconfirmed">lun</day>
-							<day type="tue" draft="unconfirmed">mar</day>
-							<day type="wed" draft="unconfirmed">mie</day>
-							<day type="thu" draft="unconfirmed">chu</day>
-							<day type="fri" draft="unconfirmed">vie</day>
-							<day type="sat" draft="unconfirmed">sab</day>
-						</dayWidth>
-						<dayWidth type="wide">
-							<day type="sun" draft="unconfirmed">dominche</day>
-							<day type="mon" draft="unconfirmed">luns</day>
-							<day type="tue" draft="unconfirmed">martz</day>
-							<day type="wed" draft="unconfirmed">miercres</day>
-							<day type="thu" draft="unconfirmed">chueves</day>
-							<day type="fri" draft="unconfirmed">viernes</day>
-							<day type="sat" draft="unconfirmed">sabado</day>
-						</dayWidth>
 					</dayContext>
 				</days>
 				<quarters>
 					<quarterContext type="format">
-						<quarterWidth type="abbreviated">
-							<quarter type="1" draft="unconfirmed">1T</quarter>
-							<quarter type="2" draft="unconfirmed">2T</quarter>
-							<quarter type="3" draft="unconfirmed">3T</quarter>
-							<quarter type="4" draft="unconfirmed">4T</quarter>
-						</quarterWidth>
-						<quarterWidth type="narrow">
-							<quarter type="1" draft="unconfirmed">1</quarter>
-							<quarter type="2" draft="unconfirmed">2</quarter>
-							<quarter type="3" draft="unconfirmed">3</quarter>
-							<quarter type="4" draft="unconfirmed">4</quarter>
-						</quarterWidth>
-						<quarterWidth type="wide">
-							<quarter type="1" draft="unconfirmed">1r trimestre</quarter>
-							<quarter type="2" draft="unconfirmed">2o trimestre</quarter>
-							<quarter type="3" draft="unconfirmed">3r trimestre</quarter>
-							<quarter type="4" draft="unconfirmed">4o trimestre</quarter>
-						</quarterWidth>
-					</quarterContext>
-					<quarterContext type="stand-alone">
 						<quarterWidth type="abbreviated">
 							<quarter type="1" draft="unconfirmed">1T</quarter>
 							<quarter type="2" draft="unconfirmed">2T</quarter>
@@ -789,37 +674,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<dayPeriod type="am" draft="unconfirmed">a.m.</dayPeriod>
 							<dayPeriod type="pm" draft="unconfirmed">p.m.</dayPeriod>
 						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am" draft="unconfirmed">a.m.</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">p.m.</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="unconfirmed">a.m.</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">p.m.</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-					<dayPeriodContext type="stand-alone">
-						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="am" draft="unconfirmed">a.m.</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">p.m.</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="am" draft="unconfirmed">a.m.</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">p.m.</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="am" draft="unconfirmed">a.m.</dayPeriod>
-							<dayPeriod type="pm" draft="unconfirmed">p.m.</dayPeriod>
-						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 				<eras>
-					<eraNames>
-						<era type="0" draft="unconfirmed">a.C.</era>
-						<era type="0" alt="variant" draft="unconfirmed">AEC</era>
-						<era type="1" draft="unconfirmed">d.C.</era>
-						<era type="1" alt="variant" draft="unconfirmed">EC</era>
-					</eraNames>
 					<eraAbbr>
 						<era type="0" draft="unconfirmed">a.C.</era>
 						<era type="0" alt="variant" draft="unconfirmed">AEC</era>
@@ -831,19 +688,16 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 					<dateFormatLength type="full">
 						<dateFormat>
 							<pattern draft="unconfirmed">EEEE, d MMMM 'de' y</pattern>
-							<datetimeSkeleton draft="unconfirmed">yMMMMEEEEd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
 							<pattern draft="unconfirmed">d MMMM 'de' y</pattern>
-							<datetimeSkeleton draft="unconfirmed">yMMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
 							<pattern draft="unconfirmed">d MMM y</pattern>
-							<datetimeSkeleton draft="unconfirmed">yMMMd</datetimeSkeleton>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
@@ -901,8 +755,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</dateTimeFormat>
 					</dateTimeFormatLength>
 					<availableFormats>
-						<dateFormatItem id="d" draft="unconfirmed">d</dateFormatItem>
-						<dateFormatItem id="E" draft="unconfirmed">ccc</dateFormatItem>
 						<dateFormatItem id="Ed" draft="unconfirmed">E d</dateFormatItem>
 						<dateFormatItem id="Gy" draft="unconfirmed">y G</dateFormatItem>
 						<dateFormatItem id="GyMMM" draft="unconfirmed">MMM y G</dateFormatItem>
@@ -915,11 +767,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						<dateFormatItem id="MMMMd" draft="unconfirmed">d MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="one" draft="unconfirmed">'semana' W 'de' MMMM</dateFormatItem>
 						<dateFormatItem id="MMMMW" count="other" draft="unconfirmed">'semana' W 'de' MMMM</dateFormatItem>
-						<dateFormatItem id="y" draft="unconfirmed">y</dateFormatItem>
 						<dateFormatItem id="yM" draft="unconfirmed">M/y</dateFormatItem>
 						<dateFormatItem id="yMd" draft="unconfirmed">d/M/y</dateFormatItem>
 						<dateFormatItem id="yMEd" draft="unconfirmed">E, d/M/y</dateFormatItem>
-						<dateFormatItem id="yMMM" draft="unconfirmed">y MMM</dateFormatItem>
 						<dateFormatItem id="yMMMd" draft="unconfirmed">d MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMEd" draft="unconfirmed">E, d MMM y</dateFormatItem>
 						<dateFormatItem id="yMMMM" draft="unconfirmed">MMMM y</dateFormatItem>
@@ -1010,9 +860,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="d" draft="unconfirmed">E, d/M – E, d/M</greatestDifference>
 							<greatestDifference id="M" draft="unconfirmed">E, d/M – E, d/M</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="MMM">
-							<greatestDifference id="M" draft="unconfirmed">LLL–LLL</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
 							<greatestDifference id="d" draft="unconfirmed">d–d MMM</greatestDifference>
 							<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM</greatestDifference>
@@ -1021,9 +868,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<greatestDifference id="d" draft="unconfirmed">E, d MMM – E, d MMM</greatestDifference>
 							<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM</greatestDifference>
 						</intervalFormatItem>
-						<intervalFormatItem id="y">
-							<greatestDifference id="y" draft="unconfirmed">y–y</greatestDifference>
-						</intervalFormatItem>
 						<intervalFormatItem id="yM">
 							<greatestDifference id="M" draft="unconfirmed">M/y – M/y</greatestDifference>
 							<greatestDifference id="y" draft="unconfirmed">M/y – M/y</greatestDifference>
@@ -1072,15 +916,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="year-short">
 				<displayName draft="unconfirmed">a.</displayName>
-				<relative type="-1" draft="unconfirmed">l’anyo pasau</relative>
-				<relative type="0" draft="unconfirmed">estianyo</relative>
-				<relative type="1" draft="unconfirmed">l’anyo que viene</relative>
-			</field>
-			<field type="year-narrow">
-				<displayName draft="unconfirmed">a.</displayName>
-				<relative type="-1" draft="unconfirmed">l’anyo pasau</relative>
-				<relative type="0" draft="unconfirmed">estianyo</relative>
-				<relative type="1" draft="unconfirmed">l’anyo que viene</relative>
 			</field>
 			<field type="quarter">
 				<displayName draft="unconfirmed">trimestre</displayName>
@@ -1088,9 +923,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="quarter-short">
 				<displayName draft="unconfirmed">trim.</displayName>
 			</field>
-			<field type="quarter-narrow">
-				<displayName draft="unconfirmed">trim.</displayName>
-			</field>
 			<field type="month">
 				<displayName draft="unconfirmed">mes</displayName>
 				<relative type="-1" draft="unconfirmed">lo mes pasau</relative>
@@ -1099,15 +931,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="month-short">
 				<displayName draft="unconfirmed">m.</displayName>
-				<relative type="-1" draft="unconfirmed">lo mes pasau</relative>
-				<relative type="0" draft="unconfirmed">este mes</relative>
-				<relative type="1" draft="unconfirmed">lo mes que viene</relative>
-			</field>
-			<field type="month-narrow">
-				<displayName draft="unconfirmed">m.</displayName>
-				<relative type="-1" draft="unconfirmed">lo mes pasau</relative>
-				<relative type="0" draft="unconfirmed">este mes</relative>
-				<relative type="1" draft="unconfirmed">lo mes que viene</relative>
 			</field>
 			<field type="week">
 				<displayName draft="unconfirmed">semana</displayName>
@@ -1118,16 +941,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</field>
 			<field type="week-short">
 				<displayName draft="unconfirmed">s.</displayName>
-				<relative type="-1" draft="unconfirmed">la semana pasada</relative>
-				<relative type="0" draft="unconfirmed">esta semana</relative>
-				<relative type="1" draft="unconfirmed">la semana que viene</relative>
-				<relativePeriod draft="unconfirmed">la semana de {0}</relativePeriod>
 			</field>
 			<field type="week-narrow">
-				<displayName draft="unconfirmed">s.</displayName>
-				<relative type="-1" draft="unconfirmed">la semana pasada</relative>
-				<relative type="0" draft="unconfirmed">esta semana</relative>
-				<relative type="1" draft="unconfirmed">la semana que viene</relative>
 				<relativePeriod draft="unconfirmed">la semana de ´{0}</relativePeriod>
 			</field>
 			<field type="day">
@@ -1136,18 +951,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="unconfirmed">hue</relative>
 				<relative type="1" draft="unconfirmed">manyana</relative>
 			</field>
-			<field type="day-short">
-				<displayName draft="unconfirmed">día</displayName>
-				<relative type="-1" draft="unconfirmed">ahiere</relative>
-				<relative type="0" draft="unconfirmed">hue</relative>
-				<relative type="1" draft="unconfirmed">manyana</relative>
-			</field>
-			<field type="day-narrow">
-				<displayName draft="unconfirmed">día</displayName>
-				<relative type="-1" draft="unconfirmed">ahiere</relative>
-				<relative type="0" draft="unconfirmed">hue</relative>
-				<relative type="1" draft="unconfirmed">manyana</relative>
-			</field>
 			<field type="weekday">
 				<displayName draft="unconfirmed">día d’a semana</displayName>
 			</field>
@@ -1160,33 +963,23 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<field type="hour-short">
 				<displayName draft="unconfirmed">h.</displayName>
 			</field>
-			<field type="hour-narrow">
-				<displayName draft="unconfirmed">h.</displayName>
-			</field>
 			<field type="minute">
 				<displayName draft="unconfirmed">minuto</displayName>
 			</field>
 			<field type="minute-short">
 				<displayName draft="unconfirmed">min.</displayName>
 			</field>
-			<field type="minute-narrow">
-				<displayName draft="unconfirmed">min.</displayName>
-			</field>
 			<field type="second">
 				<displayName draft="unconfirmed">segundo</displayName>
 			</field>
 			<field type="second-short">
 				<displayName draft="unconfirmed">s.</displayName>
 			</field>
-			<field type="second-narrow">
-				<displayName draft="unconfirmed">s.</displayName>
-			</field>
 			<field type="zone">
 				<displayName draft="unconfirmed">zona horaria</displayName>
 			</field>
 		</fields>
 		<timeZoneNames>
-			<gmtFormat draft="unconfirmed">GMT{0}</gmtFormat>
 			<regionFormat draft="unconfirmed">Hora de {0}</regionFormat>
 			<regionFormat type="daylight" draft="unconfirmed">Hora de verano de {0}</regionFormat>
 			<regionFormat type="standard" draft="unconfirmed">Hora standard de {0}</regionFormat>
@@ -1268,31 +1061,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<symbols numberSystem="latn">
 			<decimal draft="unconfirmed">,</decimal>
 			<group draft="unconfirmed">.</group>
-			<percentSign draft="unconfirmed">%</percentSign>
-			<plusSign draft="unconfirmed">+</plusSign>
-			<minusSign draft="unconfirmed">-</minusSign>
 		</symbols>
-		<decimalFormats numberSystem="latn">
-			<decimalFormatLength>
-				<decimalFormat>
-					<pattern draft="unconfirmed">#,##0.###</pattern>
-				</decimalFormat>
-			</decimalFormatLength>
-		</decimalFormats>
-		<scientificFormats numberSystem="latn">
-			<scientificFormatLength>
-				<scientificFormat>
-					<pattern draft="unconfirmed">#E0</pattern>
-				</scientificFormat>
-			</scientificFormatLength>
-		</scientificFormats>
-		<percentFormats numberSystem="latn">
-			<percentFormatLength>
-				<percentFormat>
-					<pattern draft="unconfirmed">#,##0%</pattern>
-				</percentFormat>
-			</percentFormatLength>
-		</percentFormats>
 		<currencyFormats numberSystem="latn">
 			<currencyFormatLength>
 				<currencyFormat type="standard">
@@ -1310,48 +1079,36 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">real brasilenyo</displayName>
 				<displayName count="one" draft="unconfirmed">real brasilenyo</displayName>
 				<displayName count="other" draft="unconfirmed">reals brasilenyos</displayName>
-				<symbol draft="unconfirmed">R$</symbol>
-				<symbol alt="narrow" draft="unconfirmed">R$</symbol>
 			</currency>
 			<currency type="CNY">
 				<displayName draft="unconfirmed">yuan chino</displayName>
 				<displayName count="one" draft="unconfirmed">yuan chino</displayName>
 				<displayName count="other" draft="unconfirmed">yuans chinos</displayName>
-				<symbol draft="unconfirmed">CN¥</symbol>
-				<symbol alt="narrow" draft="unconfirmed">¥</symbol>
 			</currency>
 			<currency type="EUR">
 				<displayName draft="unconfirmed">euro</displayName>
 				<displayName count="one" draft="unconfirmed">euro</displayName>
 				<displayName count="other" draft="unconfirmed">euros</displayName>
-				<symbol draft="unconfirmed">€</symbol>
 				<symbol alt="narrow" draft="unconfirmed">r</symbol>
 			</currency>
 			<currency type="GBP">
 				<displayName draft="unconfirmed">libra britanica</displayName>
 				<displayName count="one" draft="unconfirmed">libra britanica</displayName>
 				<displayName count="other" draft="unconfirmed">libras britanicas</displayName>
-				<symbol draft="unconfirmed">£</symbol>
-				<symbol alt="narrow" draft="unconfirmed">£</symbol>
 			</currency>
 			<currency type="INR">
 				<displayName draft="unconfirmed">rupia india</displayName>
 				<displayName count="one" draft="unconfirmed">rupia india</displayName>
 				<displayName count="other" draft="unconfirmed">rupias indias</displayName>
-				<symbol draft="unconfirmed">₹</symbol>
-				<symbol alt="narrow" draft="unconfirmed">₹</symbol>
 			</currency>
 			<currency type="JPY">
 				<displayName draft="unconfirmed">yen chaponés</displayName>
 				<displayName count="one" draft="unconfirmed">yen chaponés</displayName>
 				<displayName count="other" draft="unconfirmed">yens chaponeses</displayName>
 				<symbol draft="unconfirmed">¥</symbol>
-				<symbol alt="narrow" draft="unconfirmed">¥</symbol>
 			</currency>
 			<currency type="MYR">
 				<displayName draft="unconfirmed">ringgit de Malasia</displayName>
-				<displayName count="one" draft="unconfirmed">ringgit de Malasia</displayName>
-				<displayName count="other" draft="unconfirmed">ringgit de Malasia</displayName>
 			</currency>
 			<currency type="PHP">
 				<displayName draft="unconfirmed">piso filipino</displayName>
@@ -1362,8 +1119,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<displayName draft="unconfirmed">rublo ruso</displayName>
 				<displayName count="one" draft="unconfirmed">rublo ruso</displayName>
 				<displayName count="other" draft="unconfirmed">rublos rusos</displayName>
-				<symbol draft="unconfirmed">RUB</symbol>
-				<symbol alt="narrow" draft="unconfirmed">₽</symbol>
 			</currency>
 			<currency type="SGD">
 				<displayName draft="unconfirmed">dólar de Singapur</displayName>
@@ -1372,15 +1127,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</currency>
 			<currency type="THB">
 				<displayName draft="unconfirmed">baht tailandés</displayName>
-				<displayName count="one" draft="unconfirmed">baht tailandés</displayName>
-				<displayName count="other" draft="unconfirmed">baht tailandés</displayName>
 			</currency>
 			<currency type="USD">
 				<displayName draft="unconfirmed">dolar d’os Estaus Unius</displayName>
 				<displayName count="one" draft="unconfirmed">dolar d’os Estaus Unius</displayName>
 				<displayName count="other" draft="unconfirmed">dolars d’os Estaus Unius</displayName>
-				<symbol draft="unconfirmed">US$</symbol>
-				<symbol alt="narrow" draft="unconfirmed">$</symbol>
 			</currency>
 			<currency type="XXX">
 				<displayName draft="unconfirmed">moneda desconoixida</displayName>
@@ -1399,9 +1150,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<compoundUnit type="per">
 				<compoundUnitPattern draft="unconfirmed">{0} per {1}</compoundUnitPattern>
 			</compoundUnit>
-			<compoundUnit type="times">
-				<compoundUnitPattern draft="unconfirmed">{0}⋅{1}</compoundUnitPattern>
-			</compoundUnit>
 			<unit type="angle-revolution">
 				<displayName draft="unconfirmed">revolución</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} revolución</unitPattern>
@@ -1524,18 +1272,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="short">
-			<unit type="angle-revolution">
-				<unitPattern count="one" draft="unconfirmed">{0} rev</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} rev</unitPattern>
-			</unit>
-			<unit type="angle-radian">
-				<unitPattern count="one" draft="unconfirmed">{0} rad</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} rad</unitPattern>
-			</unit>
 			<unit type="angle-degree">
 				<displayName draft="unconfirmed">º</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}°</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}°</unitPattern>
 			</unit>
 			<unit type="angle-arc-minute">
 				<unitPattern count="one" draft="unconfirmed">{0} arcmin</unitPattern>
@@ -1545,186 +1283,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one" draft="unconfirmed">{0} arcsec</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} arcsec</unitPattern>
 			</unit>
-			<unit type="concentr-karat">
-				<unitPattern count="one" draft="unconfirmed">{0} kt</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kt</unitPattern>
-			</unit>
-			<unit type="concentr-percent">
-				<unitPattern count="one" draft="unconfirmed">{0}%</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}%</unitPattern>
-			</unit>
-			<unit type="concentr-permille">
-				<unitPattern count="one" draft="unconfirmed">{0}‰</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}‰</unitPattern>
-			</unit>
-			<unit type="concentr-permyriad">
-				<unitPattern count="one" draft="unconfirmed">{0}‱</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}‱</unitPattern>
-			</unit>
 			<unit type="energy-joule">
 				<displayName draft="unconfirmed">J</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} J</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} J</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="unconfirmed">cm</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} cm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} cm</unitPattern>
-				<perUnitPattern draft="unconfirmed">{0}/cm</perUnitPattern>
 			</unit>
 			<unit type="mass-tonne">
 				<displayName draft="unconfirmed">tm</displayName>
 				<unitPattern count="one" draft="unconfirmed">{0} tm</unitPattern>
 				<unitPattern count="other" draft="unconfirmed">{0} tm</unitPattern>
 			</unit>
-			<unit type="mass-kilogram">
-				<unitPattern count="one" draft="unconfirmed">{0} kg</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kg</unitPattern>
-			</unit>
 			<unit type="mass-gram">
 				<displayName draft="unconfirmed">g</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} g</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} g</unitPattern>
-			</unit>
-			<unit type="mass-ton">
-				<unitPattern count="one" draft="unconfirmed">{0} tn</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} tn</unitPattern>
-			</unit>
-			<unit type="mass-earth-mass">
-				<unitPattern count="one" draft="unconfirmed">{0} M⊕</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} M⊕</unitPattern>
-			</unit>
-			<unit type="mass-solar-mass">
-				<unitPattern count="one" draft="unconfirmed">{0} M☉</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} M☉</unitPattern>
 			</unit>
 			<unit type="power-watt">
 				<displayName draft="unconfirmed">W</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} W</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} W</unitPattern>
-			</unit>
-			<unit type="power-horsepower">
-				<unitPattern count="one" draft="unconfirmed">{0} hp</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} hp</unitPattern>
-			</unit>
-			<unit type="temperature-celsius">
-				<unitPattern count="one" draft="unconfirmed">{0}°C</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}°C</unitPattern>
 			</unit>
 			<coordinateUnit>
 				<displayName draft="unconfirmed">punto</displayName>
 				<coordinateUnitPattern type="west" draft="unconfirmed">{0}U</coordinateUnitPattern>
 			</coordinateUnit>
 		</unitLength>
-		<unitLength type="narrow">
-			<compoundUnit type="per">
-				<compoundUnitPattern draft="unconfirmed">{0}/{1}</compoundUnitPattern>
-			</compoundUnit>
-			<compoundUnit type="times">
-				<compoundUnitPattern draft="unconfirmed">{0}⋅{1}</compoundUnitPattern>
-			</compoundUnit>
-			<unit type="concentr-percent">
-				<displayName draft="unconfirmed">%</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}%</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}%</unitPattern>
-			</unit>
-			<unit type="length-centimeter">
-				<displayName draft="unconfirmed">cm</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} cm</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} cm</unitPattern>
-			</unit>
-			<unit type="mass-kilogram">
-				<displayName draft="unconfirmed">kg</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} kg</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} kg</unitPattern>
-			</unit>
-			<unit type="mass-gram">
-				<displayName draft="unconfirmed">g</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0} g</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0} g</unitPattern>
-			</unit>
-			<unit type="temperature-celsius">
-				<displayName draft="unconfirmed">°C</displayName>
-				<unitPattern count="one" draft="unconfirmed">{0}°C</unitPattern>
-				<unitPattern count="other" draft="unconfirmed">{0}°C</unitPattern>
-			</unit>
-			<coordinateUnit>
-				<displayName draft="unconfirmed">punto</displayName>
-				<coordinateUnitPattern type="north" draft="unconfirmed">{0}N</coordinateUnitPattern>
-				<coordinateUnitPattern type="south" draft="unconfirmed">{0}S</coordinateUnitPattern>
-				<coordinateUnitPattern type="west" draft="unconfirmed">{0}U</coordinateUnitPattern>
-			</coordinateUnit>
-		</unitLength>
-		<durationUnit type="hm">
-			<durationUnitPattern draft="unconfirmed">h:mm</durationUnitPattern>
-		</durationUnit>
-		<durationUnit type="hms">
-			<durationUnitPattern draft="unconfirmed">h:mm:ss</durationUnitPattern>
-		</durationUnit>
-		<durationUnit type="ms">
-			<durationUnitPattern draft="unconfirmed">m:ss</durationUnitPattern>
-		</durationUnit>
 	</units>
 	<listPatterns>
 		<listPattern>
-			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
 			<listPatternPart type="end" draft="unconfirmed">{0} y {1}</listPatternPart>
 			<listPatternPart type="2" draft="unconfirmed">{0} y {1}</listPatternPart>
 		</listPattern>
 		<listPattern type="or">
-			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
 			<listPatternPart type="end" draft="unconfirmed">{0} u {1}</listPatternPart>
 			<listPatternPart type="2" draft="unconfirmed">{0} u {1}</listPatternPart>
 		</listPattern>
-		<listPattern type="or-narrow">
-			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} u {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} u {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="or-short">
-			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} u {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} u {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="standard-narrow">
-			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} y {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} y {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="standard-short">
-			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} y {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} y {1}</listPatternPart>
-		</listPattern>
-		<listPattern type="unit">
-			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} y {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} y {1}</listPatternPart>
-		</listPattern>
 		<listPattern type="unit-narrow">
 			<listPatternPart type="start" draft="unconfirmed">{0} {1}</listPatternPart>
 			<listPatternPart type="middle" draft="unconfirmed">{0} {1}</listPatternPart>
 			<listPatternPart type="end" draft="unconfirmed">{0} {1}</listPatternPart>
 			<listPatternPart type="2" draft="unconfirmed">{0} {1}</listPatternPart>
 		</listPattern>
-		<listPattern type="unit-short">
-			<listPatternPart type="start" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="middle" draft="unconfirmed">{0}, {1}</listPatternPart>
-			<listPatternPart type="end" draft="unconfirmed">{0} y {1}</listPatternPart>
-			<listPatternPart type="2" draft="unconfirmed">{0} y {1}</listPatternPart>
-		</listPattern>
 	</listPatterns>
 	<posix>
 		<messages>
 			<yesstr draft="unconfirmed">sí:s</yesstr>
-			<nostr draft="unconfirmed">no:n</nostr>
 		</messages>
 	</posix>
 </ldml>

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

@@ -16,9 +16,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</languages>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters>[a à â b {ch} d e è ê f g i ì î j k l m {m\u0300} n ǹ {n\u0304} o ò ô ọ {ọ\u0300} ộ p r s {sh} t u ù û v w y z]</exemplarCharacters>
-		<exemplarCharacters type="auxiliary">[á ǎ c é ě h í ǐ ḿ ń ó ǒ {ọ\u0301} {ọ\u030C} q ṣ ú ǔ x]</exemplarCharacters>
-		<exemplarCharacters type="index">[a b {ch} d e f g i j k l m n {n\u0304} o ọ p r s t u v w y z]</exemplarCharacters>
+		<exemplarCharacters>[aàâ b {ch} d eèê f g iìî j k l m{m̀} nǹ{n̄} oòôọ{ọ̀}ộ p r s {sh} t uùû v w y z]</exemplarCharacters>
+		<exemplarCharacters type="auxiliary">[áǎ c éě h íǐ ḿ ń óǒ{ọ́}{ọ̌} q ṣ úǔ x]</exemplarCharacters>
+		<exemplarCharacters type="index">[a b {ch} d e f g i j k l m n{n̄} oọ p r s t u v w y z]</exemplarCharacters>
 		<exemplarCharacters type="punctuation">[, ; ! ? .]</exemplarCharacters>
 	</characters>
 	<numbers>

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

@@ -23,11 +23,11 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
 		</orientation>
 	</layout>
 	<characters>
-		<exemplarCharacters>[\u064B \u064C \u064D \u064E \u064F \u0650 \u0651 \u0652 \u0670 ء آ أ ؤ إ ئ ا ب ة ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ى ي]</exemplarCharacters>
+		<exemplarCharacters>[ً ٌ ٍ َ ُ ِ ّ ْ ٰ ء آ أ ؤ إ ئ ا ب ة ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ى ي]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[ـ\u200C\u200D\u200E\u200F پ چ ژ ڜ ڢ ڤ ڥ ٯ ڧ ڨ ک گ ی]</exemplarCharacters>
 		<exemplarCharacters type="index">[ا ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ي]</exemplarCharacters>
 		<exemplarCharacters type="numbers">[\u061C\u200E \- ‑ , ٫ ٬ . % ٪ ‰ ؉ + 0٠ 1١ 2٢ 3٣ 4٤ 5٥ 6٦ 7٧ 8٨ 9٩]</exemplarCharacters>
-		<exemplarCharacters type="punctuation">[\- ‐ ‑ – — ، ؛ \: ! ؟ . … ' &quot; « » ( ) \[ \] \&amp;]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐‑ – — ، ؛ \: ! ؟ . … ' &quot; « » ( ) \[ \] \&amp;]</exemplarCharacters>
 	</characters>
 	<dates>
 		<calendars>

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

@@ -36,18 +36,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<relative type="0" draft="contributed">هذه السنة</relative>
 				<relative type="1" draft="contributed">السنة التالية</relative>
 			</field>
-			<field type="year-short">
-				<relative type="0">هذه السنة</relative>
-				<relative type="1">السنة التالية</relative>
-			</field>
-			<field type="year-narrow">
-				<relative type="0">هذه السنة</relative>
-				<relative type="1">السنة التالية</relative>
-			</field>
 		</fields>
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>latn</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 		<currencies>
 			<currency type="BND">
 				<symbol alt="narrow" draft="contributed">$</symbol>

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

@@ -13,5 +13,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 	</numbers>
 </ldml>

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

@@ -13,6 +13,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 		<currencies>
 			<currency type="DJF">
 				<symbol>Fdj</symbol>

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

@@ -19,24 +19,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">جانفي</month>
-							<month type="2">فيفري</month>
-							<month type="4">أفريل</month>
-							<month type="5">ماي</month>
-							<month type="6">جوان</month>
-							<month type="7">جويلية</month>
-							<month type="8">أوت</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1" draft="contributed">ج</month>
-							<month type="5" draft="contributed">م</month>
-							<month type="6" draft="contributed">ج</month>
-							<month type="7" draft="contributed">ج</month>
-							<month type="8" draft="contributed">أ</month>
-							<month type="10" draft="contributed">أ</month>
-							<month type="11" draft="contributed">ن</month>
-						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">جانفي</month>
 							<month type="2">فيفري</month>
@@ -48,15 +30,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">جانفي</month>
-							<month type="2">فيفري</month>
-							<month type="4">أفريل</month>
-							<month type="5">ماي</month>
-							<month type="6">جوان</month>
-							<month type="7">جويلية</month>
-							<month type="8">أوت</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1" draft="contributed">ج</month>
 							<month type="5" draft="contributed">م</month>
@@ -66,15 +39,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="10" draft="contributed">أ</month>
 							<month type="11" draft="contributed">ن</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">جانفي</month>
-							<month type="2">فيفري</month>
-							<month type="4">أفريل</month>
-							<month type="5">ماي</month>
-							<month type="6">جوان</month>
-							<month type="7">جويلية</month>
-							<month type="8">أوت</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 			</calendar>
@@ -82,6 +46,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>latn</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group>.</group>

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

@@ -18,5 +18,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</localeDisplayNames>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 	</numbers>
 </ldml>

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

@@ -13,5 +13,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<numbers>
 		<defaultNumberingSystem>latn</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 	</numbers>
 </ldml>

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

@@ -13,6 +13,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 		<currencies>
 			<currency type="ERN">
 				<symbol>Nfk</symbol>

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

@@ -45,5 +45,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 	</numbers>
 </ldml>

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

@@ -30,20 +30,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">تشرين الثاني</month>
 							<month type="12">كانون الأول</month>
 						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1" draft="contributed">ك</month>
-							<month type="2" draft="contributed">ش</month>
-							<month type="3" draft="contributed">آ</month>
-							<month type="4" draft="contributed">ن</month>
-							<month type="5" draft="contributed">أ</month>
-							<month type="6" draft="contributed">ح</month>
-							<month type="7" draft="contributed">ت</month>
-							<month type="8" draft="contributed">آ</month>
-							<month type="9" draft="contributed">أ</month>
-							<month type="10" draft="contributed">ت</month>
-							<month type="11" draft="contributed">ت</month>
-							<month type="12" draft="contributed">ك</month>
-						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">كانون الثاني</month>
 							<month type="2">شباط</month>
@@ -88,20 +74,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11" draft="contributed">ت</month>
 							<month type="12" draft="contributed">ك</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">أيار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 			</calendar>
@@ -109,5 +81,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 	</numbers>
 </ldml>

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

@@ -16,34 +16,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">أيار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">ك</month>
-							<month type="2">ش</month>
-							<month type="3">آ</month>
-							<month type="4">ن</month>
-							<month type="5">أ</month>
-							<month type="6">ح</month>
-							<month type="7">ت</month>
-							<month type="8">آ</month>
-							<month type="9">أ</month>
-							<month type="10">ت</month>
-							<month type="11">ت</month>
-							<month type="12">ك</month>
-						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">كانون الثاني</month>
 							<month type="2">شباط</month>
@@ -60,20 +32,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">أيار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">ك</month>
 							<month type="2">ش</month>
@@ -88,20 +46,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">ت</month>
 							<month type="12">ك</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">أيار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 			</calendar>
@@ -109,5 +53,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 	</numbers>
 </ldml>

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

@@ -45,6 +45,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 		<currencies>
 			<currency type="KMF">
 				<symbol>CF</symbol>

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

@@ -13,5 +13,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 	</numbers>
 </ldml>

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

@@ -19,34 +19,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">أيار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">ك</month>
-							<month type="2">ش</month>
-							<month type="3">آ</month>
-							<month type="4">ن</month>
-							<month type="5">أ</month>
-							<month type="6">ح</month>
-							<month type="7">ت</month>
-							<month type="8">آ</month>
-							<month type="9">أ</month>
-							<month type="10">ت</month>
-							<month type="11">ت</month>
-							<month type="12">ك</month>
-						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">كانون الثاني</month>
 							<month type="2">شباط</month>
@@ -63,20 +35,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">أيار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">ك</month>
 							<month type="2">ش</month>
@@ -91,20 +49,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">ت</month>
 							<month type="12">ك</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">أيار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 			</calendar>
@@ -112,6 +56,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group>.</group>

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

@@ -53,6 +53,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>latn</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group>.</group>

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

@@ -20,25 +20,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="4">أبريل</month>
-							<month type="5">ماي</month>
-							<month type="7">يوليوز</month>
-							<month type="8">غشت</month>
-							<month type="9">شتنبر</month>
-							<month type="11">نونبر</month>
-							<month type="12">دجنبر</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="4">أ</month>
-							<month type="5">م</month>
-							<month type="6">ن</month>
-							<month type="7">ل</month>
-							<month type="9">ش</month>
-							<month type="10">ك</month>
-							<month type="11">ب</month>
-							<month type="12">د</month>
-						</monthWidth>
 						<monthWidth type="wide">
 							<month type="4">أبريل</month>
 							<month type="5">ماي</month>
@@ -50,14 +31,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="5">ماي</month>
-							<month type="7">يوليوز</month>
-							<month type="8">غشت</month>
-							<month type="9">شتنبر</month>
-							<month type="11">نونبر</month>
-							<month type="12">دجنبر</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="4">أ</month>
 							<month type="5">م</month>
@@ -68,15 +41,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">ب</month>
 							<month type="12">د</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="4">أبريل</month>
-							<month type="5">ماي</month>
-							<month type="7">يوليوز</month>
-							<month type="8">غشت</month>
-							<month type="9">شتنبر</month>
-							<month type="11">نونبر</month>
-							<month type="12">دجنبر</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 				<timeFormats>
@@ -110,6 +74,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>latn</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group>.</group>

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

@@ -19,34 +19,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">يناير</month>
-							<month type="2">فبراير</month>
-							<month type="3">مارس</month>
-							<month type="4">إبريل</month>
-							<month type="5">مايو</month>
-							<month type="6">يونيو</month>
-							<month type="7">يوليو</month>
-							<month type="8">أغشت</month>
-							<month type="9">شتمبر</month>
-							<month type="10">أكتوبر</month>
-							<month type="11">نوفمبر</month>
-							<month type="12">دجمبر</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">ي</month>
-							<month type="2">ف</month>
-							<month type="3">م</month>
-							<month type="4">إ</month>
-							<month type="5">و</month>
-							<month type="6">ن</month>
-							<month type="7">ل</month>
-							<month type="8">غ</month>
-							<month type="9">ش</month>
-							<month type="10">ك</month>
-							<month type="11">ب</month>
-							<month type="12">د</month>
-						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">يناير</month>
 							<month type="2">فبراير</month>
@@ -63,20 +35,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">يناير</month>
-							<month type="2">فبراير</month>
-							<month type="3">مارس</month>
-							<month type="4">إبريل</month>
-							<month type="5">مايو</month>
-							<month type="6">يونيو</month>
-							<month type="7">يوليو</month>
-							<month type="8">أغشت</month>
-							<month type="9">شتمبر</month>
-							<month type="10">أكتوبر</month>
-							<month type="11">نوفمبر</month>
-							<month type="12">دجمبر</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">ي</month>
 							<month type="2">ف</month>
@@ -91,20 +49,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">ب</month>
 							<month type="12">د</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">يناير</month>
-							<month type="2">فبراير</month>
-							<month type="3">مارس</month>
-							<month type="4">إبريل</month>
-							<month type="5">مايو</month>
-							<month type="6">يونيو</month>
-							<month type="7">يوليو</month>
-							<month type="8">أغشت</month>
-							<month type="9">شتمبر</month>
-							<month type="10">أكتوبر</month>
-							<month type="11">نوفمبر</month>
-							<month type="12">دجمبر</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 			</calendar>
@@ -112,6 +56,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group>.</group>

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

@@ -13,5 +13,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 	</numbers>
 </ldml>

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

@@ -16,34 +16,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">أيار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">ك</month>
-							<month type="2">ش</month>
-							<month type="3">آ</month>
-							<month type="4">ن</month>
-							<month type="5">أ</month>
-							<month type="6">ح</month>
-							<month type="7">ت</month>
-							<month type="8">آ</month>
-							<month type="9">أ</month>
-							<month type="10">ت</month>
-							<month type="11">ت</month>
-							<month type="12">ك</month>
-						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">كانون الثاني</month>
 							<month type="2">شباط</month>
@@ -60,20 +32,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">أيار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">ك</month>
 							<month type="2">ش</month>
@@ -88,20 +46,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">ت</month>
 							<month type="12">ك</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">أيار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 			</calendar>
@@ -109,5 +53,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 	</numbers>
 </ldml>

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

@@ -13,5 +13,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 	</numbers>
 </ldml>

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

@@ -62,6 +62,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 		<symbols numberSystem="latn">
 			<percentSign>٪</percentSign>
 		</symbols>
@@ -84,14 +85,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many">{0} كيلومترًا مربعًا</unitPattern>
 				<unitPattern count="other">{0} كيلومتر مربع</unitPattern>
 			</unit>
-			<unit type="area-hectare">
-				<unitPattern count="zero">{0} هكتار</unitPattern>
-				<unitPattern count="one">{0} هكتار</unitPattern>
-				<unitPattern count="two">هكتاران</unitPattern>
-				<unitPattern count="few">{0} هكتارات</unitPattern>
-				<unitPattern count="many">{0} هكتارًا</unitPattern>
-				<unitPattern count="other">{0} هكتار</unitPattern>
-			</unit>
 			<unit type="area-square-meter">
 				<unitPattern count="zero">{0} متر مربع</unitPattern>
 				<unitPattern count="one">{0} متر مربع</unitPattern>
@@ -116,14 +109,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many">{0} ميلًا مربعًا</unitPattern>
 				<unitPattern count="other">{0} ميل مربع</unitPattern>
 			</unit>
-			<unit type="area-acre">
-				<unitPattern count="zero">{0} فدان</unitPattern>
-				<unitPattern count="one">فدان</unitPattern>
-				<unitPattern count="two">{0} فدان</unitPattern>
-				<unitPattern count="few">{0} أفدنة</unitPattern>
-				<unitPattern count="many">{0} فدانًا</unitPattern>
-				<unitPattern count="other">{0} فدان</unitPattern>
-			</unit>
 			<unit type="area-square-yard">
 				<unitPattern count="zero">{0} ياردة مربعة</unitPattern>
 				<unitPattern count="one">{0} ياردة مربعة</unitPattern>
@@ -180,6 +165,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many">{0} كيلومترًا</unitPattern>
 				<unitPattern count="other">{0} كيلومتر</unitPattern>
 			</unit>
+			<unit type="length-meter">
+				<unitPattern count="zero">{0} متر</unitPattern>
+				<unitPattern count="one">متر</unitPattern>
+				<unitPattern count="two">متران</unitPattern>
+				<unitPattern count="few">{0} أمتار</unitPattern>
+				<unitPattern count="many">{0} مترًا</unitPattern>
+				<unitPattern count="other">{0} متر</unitPattern>
+			</unit>
 			<unit type="length-centimeter">
 				<unitPattern count="zero">{0} سنتيمتر</unitPattern>
 				<unitPattern count="one">{0} سنتيمتر</unitPattern>
@@ -196,38 +189,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many">{0} مليمترًا</unitPattern>
 				<unitPattern count="other">{0} مليمتر</unitPattern>
 			</unit>
-			<unit type="length-yard">
-				<unitPattern count="zero">{0} ياردة</unitPattern>
-				<unitPattern count="one">ياردة</unitPattern>
-				<unitPattern count="two">ياردتان</unitPattern>
-				<unitPattern count="few">{0} ياردات</unitPattern>
-				<unitPattern count="many">{0} ياردة</unitPattern>
-				<unitPattern count="other">{0} ياردة</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="zero">{0} قدم</unitPattern>
-				<unitPattern count="one">قدم</unitPattern>
-				<unitPattern count="two">قدمان</unitPattern>
-				<unitPattern count="few">{0} أقدام</unitPattern>
-				<unitPattern count="many">{0} قدمًا</unitPattern>
-				<unitPattern count="other">{0} قدم</unitPattern>
-			</unit>
-			<unit type="length-inch">
-				<unitPattern count="zero">{0} بوصة</unitPattern>
-				<unitPattern count="one">{0} بوصة</unitPattern>
-				<unitPattern count="two">بوصتان</unitPattern>
-				<unitPattern count="few">{0} بوصات</unitPattern>
-				<unitPattern count="many">{0} بوصة</unitPattern>
-				<unitPattern count="other">{0} بوصة</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="zero">{0} فرسخ فلكي</unitPattern>
-				<unitPattern count="one">فرسخ فلكي</unitPattern>
-				<unitPattern count="two">فرسخان فلكيان</unitPattern>
-				<unitPattern count="few">{0} فراسخ فلكية</unitPattern>
-				<unitPattern count="many">{0} فرسخًا فلكيًا</unitPattern>
-				<unitPattern count="other">{0} فرسخ فلكي</unitPattern>
-			</unit>
 			<unit type="length-astronomical-unit">
 				<unitPattern count="zero">{0} وحدة فلكية</unitPattern>
 				<unitPattern count="one">وحدة فلكية</unitPattern>
@@ -236,30 +197,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many">{0} وحدة فلكية</unitPattern>
 				<unitPattern count="other">{0} وحدة فلكية</unitPattern>
 			</unit>
-			<unit type="length-nautical-mile">
-				<unitPattern count="zero">{0} ميل بحري</unitPattern>
-				<unitPattern count="one">ميل بحري</unitPattern>
-				<unitPattern count="two">ميلان بحريان</unitPattern>
-				<unitPattern count="few">{0} أميال بحرية</unitPattern>
-				<unitPattern count="many">{0} ميلًا بحريًا</unitPattern>
-				<unitPattern count="other">{0} ميل بحري</unitPattern>
-			</unit>
-			<unit type="length-mile-scandinavian">
-				<unitPattern count="zero">{0} ميل اسكندنافي</unitPattern>
-				<unitPattern count="one">{0} ميل اسكندنافي</unitPattern>
-				<unitPattern count="two">ميلان اسكندنافيان</unitPattern>
-				<unitPattern count="few">{0} أميال اسكندنافية</unitPattern>
-				<unitPattern count="many">{0} ميلًا اسكندنافيًا</unitPattern>
-				<unitPattern count="other">{0} ميل اسكندنافي</unitPattern>
-			</unit>
-			<unit type="light-solar-luminosity">
-				<unitPattern count="zero">{0} ضياء شمسي</unitPattern>
-				<unitPattern count="one">{0} ضياء شمسي</unitPattern>
-				<unitPattern count="two">ضياءان شمسيان</unitPattern>
-				<unitPattern count="few">{0} ضياءات شمسية</unitPattern>
-				<unitPattern count="many">{0} ضياءً شمسيًا</unitPattern>
-				<unitPattern count="other">{0} ضياء شمسي</unitPattern>
-			</unit>
 			<unit type="mass-tonne">
 				<unitPattern count="zero">{0} طن متري</unitPattern>
 				<unitPattern count="one">{0} طن متري</unitPattern>
@@ -292,30 +229,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many">{0} ميكروغرامًا</unitPattern>
 				<unitPattern count="other">{0} ميكروغرام</unitPattern>
 			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="zero">{0} رطل</unitPattern>
-				<unitPattern count="one">{0} رطل</unitPattern>
-				<unitPattern count="two">رطلان</unitPattern>
-				<unitPattern count="few">{0} أرطال</unitPattern>
-				<unitPattern count="many">{0} رطلًا</unitPattern>
-				<unitPattern count="other">{0} رطل</unitPattern>
-			</unit>
-			<unit type="mass-earth-mass">
-				<unitPattern count="zero">{0} كتلة أرضية</unitPattern>
-				<unitPattern count="one">{0} كتلة أرضية</unitPattern>
-				<unitPattern count="two">كتلتان أرضيتان</unitPattern>
-				<unitPattern count="few">{0} كتل أرضية</unitPattern>
-				<unitPattern count="many">{0} كتلة أرضية</unitPattern>
-				<unitPattern count="other">{0} كتلة أرضية</unitPattern>
-			</unit>
-			<unit type="mass-solar-mass">
-				<unitPattern count="zero">{0} كتلة شمسية</unitPattern>
-				<unitPattern count="one">{0} كتلة شمسية</unitPattern>
-				<unitPattern count="two">كتلتان شمسيتان</unitPattern>
-				<unitPattern count="few">{0} كتل شمسية</unitPattern>
-				<unitPattern count="many">{0} كتلة شمسية</unitPattern>
-				<unitPattern count="other">{0} كتلة شمسية</unitPattern>
-			</unit>
 			<unit type="pressure-pound-force-per-square-inch">
 				<unitPattern count="zero" draft="contributed">{0} رطل لكل بوصة مربعة</unitPattern>
 				<unitPattern count="one" draft="contributed">{0} رطل لكل بوصة مربعة</unitPattern>
@@ -348,14 +261,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many">{0} ميلًا في الساعة</unitPattern>
 				<unitPattern count="other">{0} ميل في الساعة</unitPattern>
 			</unit>
-			<unit type="speed-knot">
-				<unitPattern count="zero">{0} عقدة</unitPattern>
-				<unitPattern count="one">{0} عقدة</unitPattern>
-				<unitPattern count="two">عقدتان</unitPattern>
-				<unitPattern count="few">{0} عقد</unitPattern>
-				<unitPattern count="many">{0} عقدة</unitPattern>
-				<unitPattern count="other">{0} عقدة</unitPattern>
-			</unit>
 			<unit type="volume-cubic-kilometer">
 				<unitPattern count="zero">{0} كيلومتر مكعب</unitPattern>
 				<unitPattern count="one">{0} كيلومتر مكعب</unitPattern>
@@ -405,36 +310,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="other">{0} قدم مكعبة</unitPattern>
 			</unit>
 			<unit type="volume-cubic-inch">
-				<unitPattern count="zero">{0} بوصة مكعبة</unitPattern>
-				<unitPattern count="one">{0} بوصة مكعبة</unitPattern>
+				<unitPattern count="zero">{0} بوصة³</unitPattern>
+				<unitPattern count="one">{0} بوصة³</unitPattern>
 				<unitPattern count="two">بوصتان مكعبات</unitPattern>
 				<unitPattern count="few">{0} بوصات مكعبة</unitPattern>
-				<unitPattern count="many">{0} بوصة مكعبة</unitPattern>
-				<unitPattern count="other">{0} بوصة مكعبة</unitPattern>
-			</unit>
-			<unit type="volume-liter">
-				<unitPattern count="zero">{0} لتر</unitPattern>
-				<unitPattern count="one">لتر</unitPattern>
-				<unitPattern count="two">لتران</unitPattern>
-				<unitPattern count="few">{0} لترات</unitPattern>
-				<unitPattern count="many">{0} لترًا</unitPattern>
-				<unitPattern count="other">{0} لتر</unitPattern>
-			</unit>
-			<unit type="volume-pint-metric">
-				<unitPattern count="zero">{0} مكيال متري</unitPattern>
-				<unitPattern count="one">{0} مكيال متري</unitPattern>
-				<unitPattern count="two">مكيالان متريان</unitPattern>
-				<unitPattern count="few">{0} مكاييل مترية</unitPattern>
-				<unitPattern count="many">{0} مكيالًا متريًا</unitPattern>
-				<unitPattern count="other">{0} مكيال متري</unitPattern>
-			</unit>
-			<unit type="volume-cup-metric">
-				<unitPattern count="zero">{0} كوب متري</unitPattern>
-				<unitPattern count="one">{0} كوب متري</unitPattern>
-				<unitPattern count="two">كوبان متريان</unitPattern>
-				<unitPattern count="few">{0} أكواب مترية</unitPattern>
-				<unitPattern count="many">{0} كوبًا متريًا</unitPattern>
-				<unitPattern count="other">{0} كوب متري</unitPattern>
+				<unitPattern count="many">{0} بوصة³</unitPattern>
+				<unitPattern count="other">{0} بوصة³</unitPattern>
 			</unit>
 			<unit type="volume-tablespoon">
 				<unitPattern count="zero">{0} ملعقة كبيرة</unitPattern>
@@ -700,7 +581,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</unit>
 			<unit type="volume-cubic-inch">
 				<unitPattern count="zero">{0} بوصة³</unitPattern>
-				<unitPattern count="one">{0} بوصة مكعبة</unitPattern>
+				<unitPattern count="one">{0} بوصة³</unitPattern>
 				<unitPattern count="two">{0} بوصة³</unitPattern>
 				<unitPattern count="few">{0} بوصة³</unitPattern>
 				<unitPattern count="many">{0} بوصة³</unitPattern>
@@ -768,40 +649,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			</coordinateUnit>
 		</unitLength>
 		<unitLength type="narrow">
-			<unit type="angle-revolution">
-				<unitPattern count="two">دورتان</unitPattern>
-				<unitPattern count="few">{0} دورات</unitPattern>
-			</unit>
-			<unit type="area-hectare">
-				<unitPattern count="two">هكتاران</unitPattern>
-				<unitPattern count="few">{0} هكتارات</unitPattern>
-				<unitPattern count="many">{0} هكتارًا</unitPattern>
-			</unit>
-			<unit type="area-acre">
-				<unitPattern count="two">فدانان</unitPattern>
-				<unitPattern count="few">{0} أفدنة</unitPattern>
-				<unitPattern count="many">{0} فدانًا</unitPattern>
-			</unit>
-			<unit type="concentr-karat">
-				<unitPattern count="two">قيراطان</unitPattern>
-				<unitPattern count="few">{0} قراريط</unitPattern>
-				<unitPattern count="many">{0} قيراطًا</unitPattern>
-			</unit>
-			<unit type="concentr-permillion">
-				<unitPattern count="two">جزءان/مليون</unitPattern>
-				<unitPattern count="few">{0} أجزاء/مليون</unitPattern>
-				<unitPattern count="many">{0} جزءًا/مليون</unitPattern>
-			</unit>
-			<unit type="consumption-mile-per-gallon">
-				<unitPattern count="two">ميلان/غالون</unitPattern>
-				<unitPattern count="few">{0} أميال/غالون</unitPattern>
-				<unitPattern count="many">{0} ميلًا/غالون</unitPattern>
-			</unit>
-			<unit type="consumption-mile-per-gallon-imperial">
-				<unitPattern count="two">ميلان/غ. إمبراطوري</unitPattern>
-				<unitPattern count="few">{0} أميال/غ. إمبراطوري</unitPattern>
-				<unitPattern count="many">{0} ميلًا/غ. إمبراطوري</unitPattern>
-			</unit>
 			<unit type="duration-year">
 				<unitPattern count="zero">{0} سنة</unitPattern>
 				<unitPattern count="one">سنة</unitPattern>
@@ -810,32 +657,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many">{0} سنة</unitPattern>
 				<unitPattern count="other">{0} سنة</unitPattern>
 			</unit>
-			<unit type="length-yard">
-				<unitPattern count="two">ياردتان</unitPattern>
-			</unit>
-			<unit type="length-foot">
-				<unitPattern count="two">قدمان</unitPattern>
-				<unitPattern count="few">{0} أقدام</unitPattern>
-			</unit>
-			<unit type="length-parsec">
-				<unitPattern count="two">فرسخان فلكيان</unitPattern>
-				<unitPattern count="few">{0} فراسخ فلكية</unitPattern>
-				<unitPattern count="many">{0} فرسخًا فلكيًا</unitPattern>
-			</unit>
-			<unit type="length-nautical-mile">
-				<unitPattern count="two">ميلان بحريان</unitPattern>
-				<unitPattern count="few">{0} أميال بحرية</unitPattern>
-				<unitPattern count="many">{0} ميلًا بحريًا</unitPattern>
-			</unit>
-			<unit type="length-mile-scandinavian">
-				<unitPattern count="two">ميلان اسكندنافيان</unitPattern>
-				<unitPattern count="few">{0} أميال اسكندنافية</unitPattern>
-				<unitPattern count="many">{0} ميلًا اسكندنافيًا</unitPattern>
-			</unit>
-			<unit type="light-solar-luminosity">
-				<unitPattern count="two">ضياءان شمسيان</unitPattern>
-				<unitPattern count="few">{0} ضياءات شمسية</unitPattern>
-				<unitPattern count="many">{0} ضياءً شمسيًا</unitPattern>
+			<unit type="length-meter">
+				<displayName>متر</displayName>
 			</unit>
 			<unit type="mass-kilogram">
 				<displayName>كغم</displayName>
@@ -855,91 +678,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="many">{0} غم</unitPattern>
 				<unitPattern count="other">{0} غم</unitPattern>
 			</unit>
-			<unit type="mass-ton">
-				<unitPattern count="two">طنان</unitPattern>
-				<unitPattern count="few">{0} أطنان</unitPattern>
-				<unitPattern count="many">{0} طنًا</unitPattern>
-			</unit>
-			<unit type="mass-pound">
-				<unitPattern count="two">رطلان</unitPattern>
-				<unitPattern count="few">{0} أرطال</unitPattern>
-				<unitPattern count="many">{0} رطلُا</unitPattern>
-			</unit>
-			<unit type="mass-carat">
-				<unitPattern count="two">قيراطان</unitPattern>
-				<unitPattern count="few">{0} قراريط</unitPattern>
-				<unitPattern count="many">{0} قيراطًا</unitPattern>
-			</unit>
-			<unit type="mass-earth-mass">
-				<unitPattern count="two">كتلتان أرضيتان</unitPattern>
-				<unitPattern count="few">{0} كتل أرضية</unitPattern>
-			</unit>
-			<unit type="mass-solar-mass">
-				<unitPattern count="two">كتلتان شمسيتان</unitPattern>
-				<unitPattern count="few">{0} كتل شمسية</unitPattern>
-			</unit>
-			<unit type="pressure-pound-force-per-square-inch">
-				<unitPattern count="two">رطلان/بوصة²</unitPattern>
-				<unitPattern count="few">{0} أرطال/بوصة²</unitPattern>
-				<unitPattern count="many">{0} رطلًا/بوصة²</unitPattern>
-			</unit>
-			<unit type="pressure-kilopascal">
-				<displayName>كيلوباسكال</displayName>
-				<unitPattern count="zero">{0} كيلوباسكال</unitPattern>
-				<unitPattern count="one">{0} كيلوباسكال</unitPattern>
-				<unitPattern count="two">{0} كيلوباسكال</unitPattern>
-				<unitPattern count="few">{0} كيلوباسكال</unitPattern>
-				<unitPattern count="many">{0} كيلوباسكال</unitPattern>
-				<unitPattern count="other">{0} كيلوباسكال</unitPattern>
-			</unit>
-			<unit type="pressure-megapascal">
-				<displayName>ميغاباسكال</displayName>
-				<unitPattern count="zero">{0} ميغاباسكال</unitPattern>
-				<unitPattern count="one">{0} ميغاباسكال</unitPattern>
-				<unitPattern count="two">{0} ميغاباسكال</unitPattern>
-				<unitPattern count="few">{0} ميغاباسكال</unitPattern>
-				<unitPattern count="many">{0} ميغاباسكال</unitPattern>
-				<unitPattern count="other">{0} ميغاباسكال</unitPattern>
-			</unit>
-			<unit type="speed-knot">
-				<unitPattern count="two">عقدتان</unitPattern>
-				<unitPattern count="few">{0} عقد</unitPattern>
-			</unit>
-			<unit type="temperature-kelvin">
-				<displayName>درجة كلفن</displayName>
-				<unitPattern count="zero">{0} درجة كلفن</unitPattern>
-				<unitPattern count="one">{0} درجة كلفن</unitPattern>
-				<unitPattern count="two">{0} درجة كلفن</unitPattern>
-				<unitPattern count="few">{0} درجة كلفن</unitPattern>
-				<unitPattern count="many">{0} درجة كلفن</unitPattern>
-				<unitPattern count="other">{0} درجة كلفن</unitPattern>
-			</unit>
-			<unit type="volume-pint-metric">
-				<unitPattern count="two">مكيالان متريان</unitPattern>
-				<unitPattern count="few">{0} مكاييل مترية</unitPattern>
-				<unitPattern count="many">{0} مكيالًا متريًا</unitPattern>
-			</unit>
-			<unit type="volume-cup-metric">
-				<unitPattern count="two">كوبان متريان</unitPattern>
-				<unitPattern count="few">{0} أكواب مترية</unitPattern>
-				<unitPattern count="many">{0} كوبًا متريًا</unitPattern>
-			</unit>
-			<unit type="volume-cup">
-				<unitPattern count="two">كوبان</unitPattern>
-				<unitPattern count="few">{0} أكواب</unitPattern>
-				<unitPattern count="many">{0} كوبًا</unitPattern>
-			</unit>
-			<unit type="volume-fluid-ounce">
-				<unitPattern count="two">أونصتان سائلتان</unitPattern>
-			</unit>
-			<unit type="volume-teaspoon">
-				<unitPattern count="two">{0} ملعقتان ص</unitPattern>
-				<unitPattern count="few">{0} ملاعق ص</unitPattern>
-			</unit>
-			<coordinateUnit>
-				<coordinateUnitPattern type="south">{0} جنوب</coordinateUnitPattern>
-				<coordinateUnitPattern type="west">{0} غرب</coordinateUnitPattern>
-			</coordinateUnit>
 		</unitLength>
 	</units>
 </ldml>

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

@@ -13,5 +13,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 	</numbers>
 </ldml>

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

@@ -16,6 +16,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</characters>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 		<symbols numberSystem="latn">
 			<percentSign draft="contributed">٪</percentSign>
 		</symbols>

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

@@ -13,6 +13,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 		<currencies>
 			<currency type="GBP">
 				<symbol>GB£</symbol>

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

@@ -16,34 +16,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">أيار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">ك</month>
-							<month type="2">ش</month>
-							<month type="3">آ</month>
-							<month type="4">ن</month>
-							<month type="5">أ</month>
-							<month type="6">ح</month>
-							<month type="7">ت</month>
-							<month type="8">آ</month>
-							<month type="9">أ</month>
-							<month type="10">ت</month>
-							<month type="11">ت</month>
-							<month type="12">ك</month>
-						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">كانون الثاني</month>
 							<month type="2">شباط</month>
@@ -60,20 +32,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">أيار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1">ك</month>
 							<month type="2">ش</month>
@@ -88,20 +46,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="11">ت</month>
 							<month type="12">ك</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">كانون الثاني</month>
-							<month type="2">شباط</month>
-							<month type="3">آذار</month>
-							<month type="4">نيسان</month>
-							<month type="5">أيار</month>
-							<month type="6">حزيران</month>
-							<month type="7">تموز</month>
-							<month type="8">آب</month>
-							<month type="9">أيلول</month>
-							<month type="10">تشرين الأول</month>
-							<month type="11">تشرين الثاني</month>
-							<month type="12">كانون الأول</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 			</calendar>
@@ -109,5 +53,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 	</numbers>
 </ldml>

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

@@ -13,5 +13,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 	</numbers>
 </ldml>

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

@@ -19,24 +19,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<calendar type="gregorian">
 				<months>
 					<monthContext type="format">
-						<monthWidth type="abbreviated">
-							<month type="1">جانفي</month>
-							<month type="2">فيفري</month>
-							<month type="4">أفريل</month>
-							<month type="5">ماي</month>
-							<month type="6">جوان</month>
-							<month type="7">جويلية</month>
-							<month type="8">أوت</month>
-						</monthWidth>
-						<monthWidth type="narrow">
-							<month type="1">ج</month>
-							<month type="5">م</month>
-							<month type="6">ج</month>
-							<month type="7">ج</month>
-							<month type="8">أ</month>
-							<month type="10">أ</month>
-							<month type="11">ن</month>
-						</monthWidth>
 						<monthWidth type="wide">
 							<month type="1">جانفي</month>
 							<month type="2">فيفري</month>
@@ -48,15 +30,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
-						<monthWidth type="abbreviated">
-							<month type="1">جانفي</month>
-							<month type="2">فيفري</month>
-							<month type="4">أفريل</month>
-							<month type="5">ماي</month>
-							<month type="6">جوان</month>
-							<month type="7">جويلية</month>
-							<month type="8">أوت</month>
-						</monthWidth>
 						<monthWidth type="narrow">
 							<month type="1" draft="contributed">ج</month>
 							<month type="5" draft="contributed">م</month>
@@ -66,15 +39,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 							<month type="10" draft="contributed">أ</month>
 							<month type="11" draft="contributed">ن</month>
 						</monthWidth>
-						<monthWidth type="wide">
-							<month type="1">جانفي</month>
-							<month type="2">فيفري</month>
-							<month type="4">أفريل</month>
-							<month type="5">ماي</month>
-							<month type="6">جوان</month>
-							<month type="7">جويلية</month>
-							<month type="8">أوت</month>
-						</monthWidth>
 					</monthContext>
 				</months>
 			</calendar>
@@ -82,6 +46,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>latn</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group>.</group>

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

@@ -13,5 +13,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</identity>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
+		<defaultNumberingSystem alt="latn">latn</defaultNumberingSystem>
 	</numbers>
 </ldml>

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

@@ -15,15 +15,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="arn">Mapudungun</language>
 		</languages>
 	</localeDisplayNames>
-	<layout>
-		<orientation>
-			<characterOrder>left-to-right</characterOrder>
-			<lineOrder>top-to-bottom</lineOrder>
-		</orientation>
-	</layout>
 	<characters>
-		<exemplarCharacters>[a {ch} d e f g i k l ḻ {ll} m n ñ ṉ {ng} o p r s {sh} t ṯ {tr} u ü w y]</exemplarCharacters>
+		<exemplarCharacters>[a {ch} d e f g i k lḻ {ll} m nñṉ {ng} o p r s {sh} tṯ {tr} uü w y]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[b c h j q x z]</exemplarCharacters>
-		<exemplarCharacters type="index">[A {CH} D E F G I K L Ḻ {LL} M N Ñ Ṉ {NG} O P R S {SH} T Ṯ {TR} U Ü W Y]</exemplarCharacters>
+		<exemplarCharacters type="index">[A {CH} D E F G I K LḺ {LL} M NÑṈ {NG} O P R S {SH} TṮ {TR} UÜ W Y]</exemplarCharacters>
 	</characters>
 </ldml>