Merge

2019-11-05 11:00:42 +05:30 · 2019-11-05 11:00:42 +05:30 · 91a70aeb63
commit 91a70aeb63
parent 00426d6cb0 bc8822095f
1975 changed files with 126376 additions and 56090 deletions
--- a/.hgtags
+++ b/.hgtags
@ -592,3 +592,5 @@ d29f0181ba424a95d881aba5eabf2e393abcc70f jdk-14+16
 5c83830390baafb76a1fbe33443c57620bd45fb9 jdk-14+17
 e84d8379815ba0d3e50fb096d28c25894cb50b8c jdk-14+18
 9b67dd88a9313e982ec5f710a7747161bc8f0c23 jdk-14+19
+54ffb15c48399dd59922ee22bb592d815307e77c jdk-14+20
+c16ac7a2eba4e73cb4f7ee9294dd647860eebff0 jdk-14+21
--- a/doc/building.html
+++ b/doc/building.html
@ -385,10 +385,10 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30</code></pre>
 <p>On Linux you can also get a JDK from the Linux distribution. On apt-based distros (like Debian and Ubuntu), <code>sudo apt-get install openjdk-&lt;VERSION&gt;-jdk</code> is typically enough to install a JDK &lt;VERSION&gt;. On rpm-based distros (like Fedora and Red Hat), try <code>sudo yum install java-&lt;VERSION&gt;-openjdk-devel</code>.</p>
 <h2 id="external-library-requirements">External Library Requirements</h2>
 <p>Different platforms require different external libraries. In general, libraries are not optional - that is, they are either required or not used.</p>
-<p>If a required library is not detected by <code>configure</code>, you need to provide the path to it. There are two forms of the <code>configure</code> arguments to point to an external library: <code>--with-&lt;LIB&gt;=&lt;path&gt;</code> or <code>--with-&lt;LIB&gt;-include=&lt;path to include&gt; --with-&lt;LIB&gt;-lib=&lt;path to lib&gt;</code>. The first variant is more concise, but require the include files an library files to reside in a default hierarchy under this directory. In most cases, it works fine.</p>
+<p>If a required library is not detected by <code>configure</code>, you need to provide the path to it. There are two forms of the <code>configure</code> arguments to point to an external library: <code>--with-&lt;LIB&gt;=&lt;path&gt;</code> or <code>--with-&lt;LIB&gt;-include=&lt;path to include&gt; --with-&lt;LIB&gt;-lib=&lt;path to lib&gt;</code>. The first variant is more concise, but require the include files and library files to reside in a default hierarchy under this directory. In most cases, it works fine.</p>
 <p>As a fallback, the second version allows you to point to the include directory and the lib directory separately.</p>
 <h3 id="freetype">FreeType</h3>
-<p>FreeType2 from <a href="http://www.freetype.org/">The FreeType Project</a> is not required on any platform. The exception is on Unix-based platforms when configuring such that the build artifacts will reference a system installed library, rather than bundling the JDK’s own copy.</p>
+<p>FreeType2 from <a href="http://www.freetype.org/">The FreeType Project</a> is not required on any platform. The exception is on Unix-based platforms when configuring such that the build artifacts will reference a system installed library, rather than bundling the JDK's own copy.</p>
 <ul>
 <li>To install on an apt-based Linux, try running <code>sudo apt-get install libfreetype6-dev</code>.</li>
 <li>To install on an rpm-based Linux, try running <code>sudo yum install freetype-devel</code>.</li>
@ -449,7 +449,7 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30</code></pre>
 <p>To build the JDK, you need a &quot;configuration&quot;, which consists of a directory where to store the build output, coupled with information about the platform, the specific build machine, and choices that affect how the JDK is built.</p>
 <p>The configuration is created by the <code>configure</code> script. The basic invocation of the <code>configure</code> script looks like this:</p>
 <pre><code>bash configure [options]</code></pre>
-<p>This will create an output directory containing the configuration and setup an area for the build result. This directory typically looks like <code>build/linux-x64-normal-server-release</code>, but the actual name depends on your specific configuration. (It can also be set directly, see <a href="#using-multiple-configurations">Using Multiple Configurations</a>). This directory is referred to as <code>$BUILD</code> in this documentation.</p>
+<p>This will create an output directory containing the configuration and setup an area for the build result. This directory typically looks like <code>build/linux-x64-server-release</code>, but the actual name depends on your specific configuration. (It can also be set directly, see <a href="#using-multiple-configurations">Using Multiple Configurations</a>). This directory is referred to as <code>$BUILD</code> in this documentation.</p>
 <p><code>configure</code> will try to figure out what system you are running on and where all necessary build components are. If you have all prerequisites for building installed, it should find everything. If it fails to detect any component automatically, it will exit and inform you about the problem.</p>
 <p>Some command line examples:</p>
 <ul>
--- a/doc/building.md
+++ b/doc/building.md
@ -473,8 +473,8 @@ If a required library is not detected by `configure`, you need to provide the
 path to it. There are two forms of the `configure` arguments to point to an
 external library: `--with-<LIB>=<path>` or `--with-<LIB>-include=<path to
 include> --with-<LIB>-lib=<path to lib>`. The first variant is more concise,
-but require the include files an library files to reside in a default hierarchy
-under this directory. In most cases, it works fine.
+but require the include files and library files to reside in a default
+hierarchy under this directory. In most cases, it works fine.

 As a fallback, the second version allows you to point to the include directory
 and the lib directory separately.
@ -484,7 +484,7 @@ and the lib directory separately.
 FreeType2 from [The FreeType Project](http://www.freetype.org/) is not required
 on any platform. The exception is on Unix-based platforms when configuring such
 that the build artifacts will reference a system installed library,
-rather than bundling the JDK’s own copy.
+rather than bundling the JDK's own copy.

  * To install on an apt-based Linux, try running `sudo apt-get install
    libfreetype6-dev`.
@ -623,8 +623,8 @@ bash configure [options]

 This will create an output directory containing the configuration and setup an
 area for the build result. This directory typically looks like
-`build/linux-x64-normal-server-release`, but the actual name depends on your
-specific configuration. (It can also be set directly, see [Using Multiple
+`build/linux-x64-server-release`, but the actual name depends on your specific
+configuration. (It can also be set directly, see [Using Multiple
 Configurations](#using-multiple-configurations)). This directory is referred to
 as `$BUILD` in this documentation.

--- a/make/Bundles.gmk
+++ b/make/Bundles.gmk
@ -50,6 +50,7 @@ $(eval $(call IncludeCustomExtension, Bundles-pre.gmk))
 #     files or directories may contain spaces.
 # BASE_DIRS : Base directories for the root dir in the bundle.
 # SUBDIR : Optional name of root dir in bundle.
+# OUTPUTDIR : Optionally override output dir
 SetupBundleFile = $(NamedParamsMacroTemplate)
 define SetupBundleFileBody

@ -70,8 +71,11 @@ define SetupBundleFileBody

  $$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false)

-  $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES)
+  $$(call SetIfEmpty, $1_OUTPUTDIR, $$(BUNDLES_OUTPUTDIR))
+
+  $$($1_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES)
 	$$(call MakeTargetDir)
+	$$(call LogWarn, Creating $$($1_BUNDLE_NAME))
        # If any of the files contain a space in the file name, FindFiles
        # will have replaced it with ?. Tar does not accept that so need to
        # switch it back.
@ -137,7 +141,7 @@ define SetupBundleFileBody
          endif
        endif

-  $1 += $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME)
+  $1 += $$($1_OUTPUTDIR)/$$($1_BUNDLE_NAME)

 endef

@ -165,7 +169,7 @@ endif

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

-ifneq ($(filter product-bundles legacy-bundles, $(MAKECMDGOALS)), )
+ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )

  SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.pdb %.map

@ -310,6 +314,27 @@ endif

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

+ifneq ($(filter static-libs-bundles, $(MAKECMDGOALS)), )
+  STATIC_LIBS_BUNDLE_FILES := $(call FindFiles, $(STATIC_LIBS_IMAGE_DIR))
+
+  ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release)
+    STATIC_LIBS_BUNDLE_SUBDIR := $(JDK_MACOSX_CONTENTS_SUBDIR)/Home
+  else
+    STATIC_LIBS_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)
+  endif
+
+  $(eval $(call SetupBundleFile, BUILD_STATIC_LIBS_BUNDLE, \
+      BUNDLE_NAME := $(STATIC_LIBS_BUNDLE_NAME), \
+      FILES := $(STATIC_LIBS_BUNDLE_FILES), \
+      BASE_DIRS := $(STATIC_LIBS_IMAGE_DIR), \
+      SUBDIR := $(STATIC_LIBS_BUNDLE_SUBDIR), \
+  ))
+
+  STATIC_LIBS_TARGETS += $(BUILD_STATIC_LIBS_BUNDLE)
+endif
+
+################################################################################
+
 # Hook to include the corresponding custom file, if present.
 $(eval $(call IncludeCustomExtension, Bundles.gmk))

@ -319,6 +344,8 @@ product-bundles: $(PRODUCT_TARGETS)
 legacy-bundles: $(LEGACY_TARGETS)
 test-bundles: $(TEST_TARGETS)
 docs-bundles: $(DOCS_TARGETS)
+static-libs-bundles: $(STATIC_LIBS_TARGETS)
 jcov-bundles: $(JCOV_TARGETS)

-.PHONY: all default product-bundles test-bundles docs-bundles jcov-bundles
+.PHONY: all default product-bundles test-bundles docs-bundles \
+    static-libs-bundles jcov-bundles
--- a/make/CompileInterimLangtools.gmk
+++ b/make/CompileInterimLangtools.gmk
@ -49,6 +49,13 @@ $(BUILDTOOLS_OUTPUTDIR)/gensrc/%.interim/module-info.java: \
 TARGETS += $(patsubst %, $(BUILDTOOLS_OUTPUTDIR)/gensrc/%/module-info.java, \
    $(INTERIM_LANGTOOLS_MODULES))

+$(eval $(call SetupCopyFiles, COPY_PREVIEW_FEATURES, \
+    FILES := $(TOPDIR)/src/java.base/share/classes/jdk/internal/PreviewFeature.java, \
+    DEST := $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim/jdk/internal/, \
+))
+
+TARGETS += $(COPY_PREVIEW_FEATURES)
+
 ################################################################################
 # Setup the rules to build interim langtools, which is compiled by the boot
 # javac and can be run on the boot jdk. This will be used to compile the rest of
@ -72,13 +79,15 @@ define SetupInterimModule
      BIN := $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules/$1.interim, \
      ADD_JAVAC_FLAGS := --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
          $$(INTERIM_LANGTOOLS_ADD_EXPORTS) \
+          --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
+          --add-exports java.base/jdk.internal=jdk.compiler.interim \
          -Xlint:-module, \
  ))

  $1_DEPS_INTERIM := $$(addsuffix .interim, $$(filter \
      $$(INTERIM_LANGTOOLS_BASE_MODULES), $$(call FindTransitiveDepsForModule, $1)))

-  $$(BUILD_$1.interim): $$(foreach d, $$($1_DEPS_INTERIM), $$(BUILD_$$d))
+  $$(BUILD_$1.interim): $$(foreach d, $$($1_DEPS_INTERIM), $$(BUILD_$$d)) $(COPY_PREVIEW_FEATURES)

  TARGETS += $$(BUILD_$1.interim)
 endef
--- a/make/CompileToolsJdk.gmk
+++ b/make/CompileToolsJdk.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, 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
--- a/make/Coverage.gmk
+++ b/make/Coverage.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, 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
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@ -95,6 +95,7 @@ JAVADOC_TAGS := \
    -tag see \
    -taglet build.tools.taglet.ExtLink \
    -taglet build.tools.taglet.Incubating \
+    -taglet build.tools.taglet.Preview \
    -tagletpath $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
    $(CUSTOM_JAVADOC_TAGS) \
    #
@ -137,9 +138,9 @@ JAVA_PLATFORM := Java Platform
 ifeq ($(IS_DRAFT), true)
  DRAFT_MARKER_STR := <br><strong>DRAFT $(VERSION_STRING)</strong>
  ifeq ($(VERSION_BUILD), 0)
-    DRAFT_MARKER_TITLE := [ad-hoc build]
+    DRAFT_MARKER_TITLE := $(SPACE)[ad-hoc build]
  else
-    DRAFT_MARKER_TITLE := [build $(VERSION_BUILD)]
+    DRAFT_MARKER_TITLE := $(SPACE)[build $(VERSION_BUILD)]
  endif
  DRAFT_TEXT := This specification is not final and is subject to change. \
      Use is subject to <a href="$(LICENSE_URL)">license terms</a>.
@ -191,26 +192,26 @@ JAVASE_LONG_NAME := Java<sup>&reg;</sup> Platform, Standard Edition
 ################################################################################
 # Functions

-# Helper function for creating a png file from a dot file generated by the
+# Helper function for creating a svg file from a dot file generated by the
 # GenGraphs tool.
 # param 1: SetupJavadocGeneration namespace ($1)
 # param 2: module name
 #
-define setup_gengraph_dot_to_png
+define setup_gengraph_dot_to_svg
  $1_$2_DOT_SRC :=  $$($1_GENGRAPHS_DIR)/$2.dot
-  $1_$2_PNG_TARGET := $$($1_TARGET_DIR)/$2/module-graph.png
+  $1_$2_SVG_TARGET := $$($1_TARGET_DIR)/$2/module-graph.svg

-    # For each module needing a graph, create a png file from the dot file
+    # For each module needing a graph, create a svg file from the dot file
    # generated by the GenGraphs tool and store it in the target dir.
-    $$(eval $$(call SetupExecute, gengraphs_png_$1_$2, \
+    $$(eval $$(call SetupExecute, gengraphs_svg_$1_$2, \
        INFO := Running dot for module graphs for $2, \
        DEPS := $$(gengraphs_$1_TARGET), \
-        OUTPUT_FILE := $$($1_$2_PNG_TARGET), \
+        OUTPUT_FILE := $$($1_$2_SVG_TARGET), \
        SUPPORT_DIR := $$($1_GENGRAPHS_DIR), \
-        COMMAND := $$(DOT) -Tpng -o $$($1_$2_PNG_TARGET) $$($1_$2_DOT_SRC), \
+        COMMAND := $$(DOT) -Tsvg -o $$($1_$2_SVG_TARGET) $$($1_$2_DOT_SRC), \
    ))

-  $1_MODULEGRAPH_TARGETS += $$($1_$2_PNG_TARGET)
+  $1_MODULEGRAPH_TARGETS += $$($1_$2_SVG_TARGET)
 endef

 # Helper function to create the overview.html file to use with the -overview
@ -281,7 +282,7 @@ define SetupApiDocsGenerationBody

  ifeq ($$(ENABLE_FULL_DOCS), true)
    # Tell the ModuleGraph taglet to generate html links to soon-to-be-created
-    # png files with module graphs.
+    # svg files with module graphs.
    $1_JAVA_ARGS += -DenableModuleGraph=true
  endif

@ -303,7 +304,7 @@ define SetupApiDocsGenerationBody

  $1_DOC_TITLE := $$($1_LONG_NAME)<br>Version $$(VERSION_SPECIFICATION) API \
      Specification
-  $1_WINDOW_TITLE := $$(subst &amp;,&,$$($1_SHORT_NAME)) $$(DRAFT_MARKER_TITLE)
+  $1_WINDOW_TITLE := $$(subst &amp;,&,$$($1_SHORT_NAME))$$(DRAFT_MARKER_TITLE)
  $1_HEADER_TITLE := <div $$(HEADER_STYLE)><strong>$$($1_SHORT_NAME)</strong> \
      $$(DRAFT_MARKER_STR)</div>

@ -361,8 +362,8 @@ define SetupApiDocsGenerationBody
  $1_JAVADOC_TARGETS := $$(javadoc_$1_TARGET)

  ifeq ($$(ENABLE_FULL_DOCS), true)
-    # We have asked ModuleGraph to generate links to png files. Now we must
-    # produce the png files.
+    # We have asked ModuleGraph to generate links to svg files. Now we must
+    # produce the svg files.

    # Locate which modules has the @moduleGraph tag in their module-info.java
    $1_MODULES_NEEDING_GRAPH := $$(strip $$(foreach m, $$($1_ALL_MODULES), \
@ -387,11 +388,11 @@ define SetupApiDocsGenerationBody
            --dot-attributes $$(GENGRAPHS_PROPS), \
    ))

-    # For each module needing a graph, create a png file from the dot file
+    # For each module needing a graph, create a svg file from the dot file
    # generated by the GenGraphs tool and store it in the target dir.
    # They will depend on gengraphs_$1_TARGET, and will be added to $1.
    $$(foreach m, $$($1_MODULES_NEEDING_GRAPH), \
-      $$(eval $$(call setup_gengraph_dot_to_png,$1,$$m)) \
+      $$(eval $$(call setup_gengraph_dot_to_svg,$1,$$m)) \
    )
  endif
 endef
--- a/make/GenerateLinkOptData.gmk
+++ b/make/GenerateLinkOptData.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, 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
--- a/make/Help.gmk
+++ b/make/Help.gmk
@ -43,7 +43,7 @@ help:
 	$(info $(_) make images            # Create a complete jdk image)
 	$(info $(_)                        # (alias for product-images))
 	$(info $(_) make <name>-image      # Build just the image for any of: )
-	$(info $(_)                        # jdk, test, docs, symbols, legacy-jre)
+	$(info $(_)                        # jdk, test, docs, symbols, legacy-jre, static-libs)
 	$(info $(_) make <phase>           # Build the specified phase and everything it depends on)
 	$(info $(_)                        # (gensrc, java, copy, libs, launchers, gendata, rmic))
 	$(info $(_) make *-only            # Applies to most targets and disables building the)
--- a/make/Main.gmk
+++ b/make/Main.gmk
@ -77,7 +77,7 @@ interim-rmic:

 interim-cldrconverter:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
- 
+
 interim-tzdb:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimTZDB.gmk)

@ -133,7 +133,7 @@ GENSRC_TARGETS += $(sort $(GENSRC_MODULEINFO_TARGETS) \
 define DeclareModuleInfoRecipe
  $1-gensrc-moduleinfo:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
-	    -f GensrcModuleInfo.gmk MODULE=$1)
+	    -f gensrc/GensrcModuleInfo.gmk MODULE=$1)

  $1-gensrc: $1-gensrc-moduleinfo
 endef
@ -217,6 +217,21 @@ $(eval $(call DeclareRecipesForPhase, LIBS, \

 ALL_TARGETS += $(LIBS_TARGETS)

+################################################################################
+# Targets for compiling static versions of certain native libraries. These do
+# not end up in the jmods or the normal JDK image, but are instead bundled into
+# a special deliverable.
+$(eval $(call DeclareRecipesForPhase, STATIC_LIBS, \
+    TARGET_SUFFIX := static-libs, \
+    FILE_PREFIX := Lib, \
+    MAKE_SUBDIR := lib, \
+    CHECK_MODULES := $(STATIC_LIBS_MODULES), \
+    USE_WRAPPER := true, \
+    EXTRA_ARGS := STATIC_LIBS=true, \
+))
+
+ALL_TARGETS += $(STATIC_LIBS_TARGETS)
+
 ################################################################################
 # Targets for compiling native executables
 $(eval $(call DeclareRecipesForPhase, LAUNCHER, \
@ -377,6 +392,9 @@ legacy-jre-image:
 symbols-image:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols)

+static-libs-image:
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f StaticLibsImage.gmk)
+
 mac-jdk-bundle:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk jdk-bundle)

@ -396,7 +414,7 @@ endif

 ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-images zip-security \
    zip-source jrtfs-jar jdk-image legacy-jre-image \
-    symbols-image mac-jdk-bundle mac-legacy-jre-bundle \
+    symbols-image static-libs-image mac-jdk-bundle mac-legacy-jre-bundle \
    release-file exploded-image-optimize jcov-image

 ################################################################################
@ -614,12 +632,16 @@ test-bundles:
 docs-bundles:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk docs-bundles)

+static-libs-bundles:
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk static-libs-bundles)
+
 ifeq ($(JCOV_ENABLED), true)
  jcov-bundles:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk jcov-bundles)
 endif

-ALL_TARGETS += product-bundles legacy-bundles test-bundles docs-bundles jcov-bundles
+ALL_TARGETS += product-bundles legacy-bundles test-bundles docs-bundles \
+    static-libs-bundles jcov-bundles

 ################################################################################
 # Install targets
@ -796,6 +818,10 @@ else
  vscode-project-rtags: compile-commands
  vscode-project-ccls: compile-commands

+  # The -static-libs targets depend on -java as well as java.base-copy.
+  $(foreach m, $(filter $(JAVA_MODULES), $(STATIC_LIBS_MODULES)), \
+    $(eval $m-static-libs: $m-java java.base-copy))
+
  # Jmods cannot be created until we have the jmod tool ready to run. During
  # a normal build we run it from the exploded image, but when cross compiling
  # it's run from the buildjdk, which is either created at build time or user
@ -858,6 +884,8 @@ else
  legacy-jre-image: jmods release-file
  symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS)

+  static-libs-image: $(STATIC_LIBS_TARGETS)
+
  mac-jdk-bundle: jdk-image
  mac-legacy-jre-bundle: legacy-jre-image

@ -946,6 +974,8 @@ else

  jcov-bundles: jcov-image

+  static-libs-bundles: static-libs-image
+
  generate-summary: jmods buildtools-modules

  update-x11wrappers: java.base-copy buildtools-jdk
@ -984,6 +1014,8 @@ rmic: $(RMIC_TARGETS)

 libs: $(LIBS_TARGETS)

+static-libs: $(STATIC_LIBS_TARGETS)
+
 launchers: $(LAUNCHER_TARGETS)

 jmods: $(JMOD_TARGETS)
@ -1094,10 +1126,10 @@ endif
 all-images: product-images test-image docs-image

 # all-bundles packages all our deliverables as tar.gz bundles.
-all-bundles: product-bundles test-bundles docs-bundles
+all-bundles: product-bundles test-bundles docs-bundles static-libs-bundles

 ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \
-    copy java rmic libs launchers jmods \
+    copy java rmic libs static-libs launchers jmods \
    jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \
    exploded-image-base exploded-image \
    create-buildjdk docs-jdk-api docs-javase-api docs-reference-api docs-jdk \
--- a/make/MainSupport.gmk
+++ b/make/MainSupport.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, 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
@ -133,7 +133,7 @@ define DeclareRecipeForModuleMakefile
 	      $$(addprefix -I, $$(PHASE_MAKEDIRS) \
 	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(PHASE_MAKEDIRS)) \
 	      ) \
-	      MODULE=$2 MAKEFILE_PREFIX=$$($1_FILE_PREFIX))
+	      MODULE=$2 MAKEFILE_PREFIX=$$($1_FILE_PREFIX) $$($1_EXTRA_ARGS))
        else
 	  +($(CD) $$(dir $$(firstword $$(wildcard $$(addsuffix \
 	      /$$($1_MAKE_SUBDIR)/$$($1_FILE_PREFIX)-$2.gmk, $$(PHASE_MAKEDIRS))))) \
@ -142,7 +142,7 @@ define DeclareRecipeForModuleMakefile
 	      $$(addprefix -I, $$(PHASE_MAKEDIRS) \
 	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(PHASE_MAKEDIRS)) \
 	      ) \
-	      MODULE=$2 \
+	      MODULE=$2 $$($1_EXTRA_ARGS) \
 	  )
        endif

@ -182,12 +182,13 @@ endef
 # CHECK_MODULES : List of modules to try
 # MULTIPLE_MAKEFILES : Set to true to handle makefiles for the same module and
 #                      phase in multiple repos
+# EXTRA_ARGS : Add extra make args to each makefile call
 # Exported variables:
 # $1_MODULES : All modules that had rules generated
 # $1_TARGETS : All targets generated
 define DeclareRecipesForPhase
-  $(foreach i,2 3 4 5 6 7, $(if $(strip $($i)),$(strip $1)_$(strip $($i)))$(NEWLINE))
-  $(if $(8),$(error Internal makefile error: Too many arguments to \
+  $(foreach i,2 3 4 5 6 7 8, $(if $(strip $($i)),$(strip $1)_$(strip $($i)))$(NEWLINE))
+  $(if $(9),$(error Internal makefile error: Too many arguments to \
      DeclareRecipesForPhase, please update MakeHelper.gmk))

  $$(foreach m, $$($(strip $1)_CHECK_MODULES), \
--- a/make/ModuleWrapper.gmk
+++ b/make/ModuleWrapper.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2019, 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
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@ -185,13 +185,13 @@ define SetupAotModuleBody
 	    $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/jaotc \
 	        $$($1_JAOTC_OPTS) --output $$@ --module $$($1_MODULE) \
 	)
-	$$(call ExecuteWithLog, $$@.check, \
+	$$(call ExecuteWithLog, $$@.check, ( \
 	    $$(FIXPATH) $$(JDK_UNDER_TEST)/bin/java \
 	        $$($1_VM_OPTIONS) -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions \
 	        -XX:+PrintAOT -XX:+UseAOTStrictLoading \
 	        -XX:AOTLibrary=$$@ -version \
 	         > $$@.verify-aot \
-	)
+	))

  $1_AOT_OPTIONS += -XX:+UnlockExperimentalVMOptions
  $1_AOT_OPTIONS += -XX:AOTLibrary=$$($1_AOT_LIB)
@ -593,7 +593,7 @@ define SetupRunGtestTestBody
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
-	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, \
+	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, ( \
 	    $$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/$$($1_VARIANT)/gtestLauncher \
 	        -jdk $(JDK_UNDER_TEST) $$($1_GTEST_FILTER) \
 	        --gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \
@ -602,7 +602,7 @@ define SetupRunGtestTestBody
 	        > >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) \
 	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
-	)
+	))

  $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt

@ -705,7 +705,7 @@ define SetupRunMicroTestBody
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
-	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/micro, \
+	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/micro, ( \
 	    $$(FIXPATH) $$($1_MICRO_TEST_JDK)/bin/java $$($1_MICRO_JAVA_OPTIONS) \
 	        -jar $$($1_MICRO_BENCHMARKS_JAR) \
 	        $$($1_MICRO_ITER) $$($1_MICRO_FORK) $$($1_MICRO_TIME) \
@ -715,7 +715,7 @@ define SetupRunMicroTestBody
 	        > >($(TEE) $$($1_TEST_RESULTS_DIR)/micro.txt) \
 	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
-	)
+	))

  $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/micro.txt

@ -928,7 +928,7 @@ define SetupRunJtregTestBody
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
-	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, \
+	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, ( \
 	    $$(COV_ENVIRONMENT) \
 	    $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
 	        -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \
@ -943,7 +943,7 @@ define SetupRunJtregTestBody
 	        $$($1_TEST_NAME) \
 	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
-	)
+	))

  $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/text/stats.txt

@ -1019,12 +1019,12 @@ define SetupRunSpecialTestBody
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
-	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/test-execution, \
+	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/test-execution, ( \
 	    $$($1_TEST_COMMAND_LINE) \
 	        > >($(TEE) $$($1_TEST_RESULTS_DIR)/test-output.txt) \
 	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
-	)
+	))

  $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt

--- a/make/RunTestsPrebuiltSpec.gmk
+++ b/make/RunTestsPrebuiltSpec.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, 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
--- a/make/StaticLibsImage.gmk
+++ b/make/StaticLibsImage.gmk
@ -0,0 +1,54 @@
+#
+# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This makefile creates an image of the optional static versions of certain JDK
+# libraries.
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include Modules.gmk
+
+################################################################################
+
+TARGETS :=
+
+$(foreach m, $(STATIC_LIBS_MODULES), \
+  $(eval $(call SetupCopyFiles, COPY_STATIC_LIBS_$m, \
+      FLATTEN := true, \
+      SRC := $(SUPPORT_OUTPUTDIR)/native/$m, \
+      DEST := $(STATIC_LIBS_IMAGE_DIR)/lib, \
+      FILES := $(filter %$(STATIC_LIBRARY_SUFFIX), \
+          $(call FindFiles, $(SUPPORT_OUTPUTDIR)/native/$m/*/static)), \
+  )) \
+  $(eval TARGETS += $$(COPY_STATIC_LIBS_$m)) \
+)
+
+################################################################################
+
+all: $(TARGETS)
+
+.PHONY: all
--- a/make/TestImage.gmk
+++ b/make/TestImage.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, 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
--- a/make/UpdateBuildDocs.gmk
+++ b/make/UpdateBuildDocs.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -45,29 +45,13 @@ GLOBAL_SPECS_DEFAULT_CSS_FILE := $(TOPDIR)/make/data/docs-resources/resources/jd

 DOCS_DIR := $(TOPDIR)/doc

-$(eval $(call SetupProcessMarkdown, building, \
-  FILES := $(DOCS_DIR)/building.md, \
+$(eval $(call SetupProcessMarkdown, md_docs, \
+  FILES := $(call FindFiles, $(DOCS_DIR), *.md), \
  DEST := $(DOCS_DIR), \
  CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
  OPTIONS := --toc, \
 ))
-TARGETS += $(building)
-
-$(eval $(call SetupProcessMarkdown, testing, \
-  FILES := $(DOCS_DIR)/testing.md, \
-  DEST := $(DOCS_DIR), \
-  CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
-  OPTIONS := --toc, \
-))
-TARGETS += $(testing)
-
-$(eval $(call SetupProcessMarkdown, ide, \
-  FILES := $(DOCS_DIR)/ide.md, \
-  DEST := $(DOCS_DIR), \
-  CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
-  OPTIONS := --toc, \
-))
-TARGETS += $(ide)
+TARGETS += $(md_docs)

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

--- a/make/ZipSecurity.gmk
+++ b/make/ZipSecurity.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2019, 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
--- a/make/autoconf/configure.ac
+++ b/make/autoconf/configure.ac
@ -1,5 +1,5 @@
-SRC#
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+#
+# Copyright (c) 2011, 2019, 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
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@ -170,11 +170,11 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
      DISABLE_WARNING_PREFIX="-erroff="
      CFLAGS_WARNINGS_ARE_ERRORS="-errwarn=%all"

-      WARNINGS_ENABLE_ALL_CFLAGS="-v"
-      WARNINGS_ENABLE_ALL_CXXFLAGS="+w"
+      WARNINGS_ENABLE_ALL_CFLAGS="-v -fd -xtransition"
+      WARNINGS_ENABLE_ALL_CXXFLAGS="+w +w2"

-      DISABLED_WARNINGS_C=""
-      DISABLED_WARNINGS_CXX=""
+      DISABLED_WARNINGS_C="E_OLD_STYLE_FUNC_DECL E_OLD_STYLE_FUNC_DEF E_SEMANTICS_OF_OP_CHG_IN_ANSI_C E_NO_REPLACEMENT_IN_STRING E_DECLARATION_IN_CODE"
+      DISABLED_WARNINGS_CXX="inllargeuse inllargeint notused wemptydecl notemsource"
      ;;

    gcc)
@ -597,7 +597,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
    LANGSTD_CFLAGS="-xc99=all,no_lib"
  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
    # MSVC doesn't support C99/C11 explicitly, unless you compile as C++:
-    # LANGSTD_CFLAGS="/TP"
+    # LANGSTD_CFLAGS="-TP"
    # but that requires numerous changes to the sources files. So we are limited
    # to C89/C90 plus whatever extensions Visual Studio has decided to implement.
    # This is the lowest bar for shared code.
@ -694,6 +694,20 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
      OS_CFLAGS_JVM="$OS_CFLAGS_JVM -DNEEDS_LIBRT"
    fi
  fi
+
+  # Extra flags needed when building optional static versions of certain
+  # JDK libraries.
+  STATIC_LIBS_CFLAGS="-DSTATIC_BUILD=1"
+  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+    STATIC_LIBS_CFLAGS="$STATIC_LIBS_CFLAGS -ffunction-sections -fdata-sections"
+  fi
+  if test "x$TOOLCHAIN_TYPE" = xgcc; then
+    # Disable relax-relocation to enable compatibility with older linkers
+    RELAX_RELOCATIONS_FLAG="-Xassembler -mrelax-relocations=no"
+    FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${RELAX_RELOCATIONS_FLAG}],
+        IF_TRUE: [STATIC_LIBS_CFLAGS="$STATIC_LIBS_CFLAGS ${RELAX_RELOCATIONS_FLAG}"])
+  fi
+  AC_SUBST(STATIC_LIBS_CFLAGS)
 ])

 ################################################################################
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@ -599,7 +599,14 @@ AC_DEFUN_ONCE([JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST],
    AC_MSG_RESULT([yes, forced])
    ENABLE_GENERATE_CLASSLIST="true"
    if test "x$ENABLE_GENERATE_CLASSLIST_POSSIBLE" = "xfalse"; then
-      AC_MSG_WARN([Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS and enable-cds=$ENABLE_CDS])
+      if test "x$ENABLE_CDS" = "xfalse"; then
+        # In GenerateLinkOptData.gmk, DumpLoadedClassList is used to generate the
+        # classlist file. It never will work in this case since the VM will report
+        # an error for DumpLoadedClassList when CDS is disabled.
+        AC_MSG_ERROR([Generation of classlist is not possible with enable-cds=false])
+      else
+        AC_MSG_WARN([Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS and enable-cds=$ENABLE_CDS])
+      fi
    fi
  elif test "x$enable_generate_classlist" = "xno"; then
    AC_MSG_RESULT([no, forced])
--- a/make/autoconf/jdk-version.m4
+++ b/make/autoconf/jdk-version.m4
@ -162,7 +162,9 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
    AC_MSG_ERROR([--with-vendor-vm-bug-url must have a value])
  elif [ ! [[ $with_vendor_vm_bug_url =~ ^[[:print:]]*$ ]] ]; then
    AC_MSG_ERROR([--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url])
-  else
+  elif test "x$with_vendor_vm_bug_url" != x; then
+    # Only set VENDOR_URL_VM_BUG if '--with-vendor-vm-bug-url' was used and is not empty.
+    # Otherwise we will use the value from "version-numbers" included above.
    VENDOR_URL_VM_BUG="$with_vendor_vm_bug_url"
  fi
  AC_SUBST(VENDOR_URL_VM_BUG)
--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@ -376,6 +376,8 @@ ENABLE_LIBFFI_BUNDLING:=@ENABLE_LIBFFI_BUNDLING@
 LIBFFI_LIB_FILE:=@LIBFFI_LIB_FILE@
 GRAALUNIT_LIB := @GRAALUNIT_LIB@

+STATIC_LIBS_CFLAGS := @STATIC_LIBS_CFLAGS@
+
 JMH_CORE_JAR := @JMH_CORE_JAR@
 JMH_GENERATOR_JAR := @JMH_GENERATOR_JAR@
 JMH_JOPT_SIMPLE_JAR := @JMH_JOPT_SIMPLE_JAR@
@ -892,6 +894,10 @@ DOCS_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_IMAGE_SUBDIR)
 # Output docs directly into image
 DOCS_OUTPUTDIR := $(DOCS_IMAGE_DIR)

+# Static libs image
+STATIC_LIBS_IMAGE_SUBDIR := static-libs
+STATIC_LIBS_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(STATIC_LIBS_IMAGE_SUBDIR)
+
 # Macosx bundles directory definitions
 JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle
 JRE_MACOSX_BUNDLE_SUBDIR=jre-bundle
@ -920,6 +926,7 @@ JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
 TEST_DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests-demos$(DEBUG_PART).tar.gz
 TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz
 DOCS_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
+STATIC_LIBS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-static-libs$(DEBUG_PART).tar.gz
 JCOV_BUNDLE_NAME := jdk-jcov-$(BASE_NAME)_bin$(DEBUG_PART).$(JDK_BUNDLE_EXTENSION)

 JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
--- a/make/autoconf/version-numbers
+++ b/make/autoconf/version-numbers
@ -23,7 +23,8 @@
 # questions.
 #

-# Default version numbers to use unless overridden by configure
+# Default version, product, and vendor information to use,
+# unless overridden by configure

 DEFAULT_VERSION_FEATURE=14
 DEFAULT_VERSION_INTERIM=0
@ -47,6 +48,7 @@ COMPANY_NAME=N/A
 HOTSPOT_VM_DISTRO="OpenJDK"
 VENDOR_URL=https://openjdk.java.net/
 VENDOR_URL_BUG=https://bugreport.java.com/bugreport/
+VENDOR_URL_VM_BUG=https://bugreport.java.com/bugreport/crash.jsp

 # Might need better names for these
 MACOSX_BUNDLE_NAME_BASE="OpenJDK"
--- a/make/common/JavaCompilation.gmk
+++ b/make/common/JavaCompilation.gmk
@ -222,7 +222,7 @@ define SetupJavaCompilationBody
    ) \
  )
  $$(call MakeDir,$$($1_BIN))
-  # Order src files according to the order of the src dirs. Correct odering is
+  # Order src files according to the order of the src dirs. Correct ordering is
  # needed for correct overriding between different source roots.
  $1_ALL_SRC_RAW := $$(call FindFiles, $$($1_SRC))
  $1_ALL_SRCS := $$($1_EXTRA_FILES) \
--- a/make/common/JdkNativeCompilation.gmk
+++ b/make/common/JdkNativeCompilation.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2019, 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,8 @@ FindSrcDirsForComponent += \
      $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/$(strip $2) \
      $(TOPDIR)/src/$(strip $1)/share/native/$(strip $2)))

-# Find a library
+# Find a library. Used for declaring dependencies on libraries in different
+# modules.
 # Param 1 - module name
 # Param 2 - library name
 # Param 3 - optional subdir for library
@ -69,6 +70,12 @@ ifeq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
  FindLib =
  FindStaticLib =
 endif
+# If building static versions of libraries, make these return empty to avoid
+# declaring dependencies.
+ifeq ($(STATIC_LIBS), true)
+  FindLib =
+  FindStaticLib =
+endif

 GetJavaHeaderDir = \
  $(wildcard $(SUPPORT_OUTPUTDIR)/headers/$(strip $1))
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@ -198,6 +198,21 @@ HOTSPOT_MODULES := \
    jdk.internal.vm.compiler.management \
    #

+# The native dynamic libraries in these modules will also get built into static
+# libraries for consumption by downstream projects that need to statically link
+# the JDK libraries. Those static libraries are not part of the main JDK
+# distribution. 
+STATIC_LIBS_MODULES := \
+    java.base \
+    jdk.crypto.ec \
+    jdk.security.auth \
+    java.prefs \
+    java.security.jgss \
+    java.smartcardio \
+    jdk.crypto.cryptoki \
+    jdk.net \
+    #
+
 ################################################################################
 # Some platforms don't have the serviceability agent

--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@ -453,6 +453,28 @@ define SetupNativeCompilationBody
    endif
  endif

+  $$(call SetIfEmpty, $1_COMPILE_WITH_DEBUG_SYMBOLS, $$(COMPILE_WITH_DEBUG_SYMBOLS))
+
+  # STATIC_LIBS is set from Main.gmk when building static versions of certain
+  # native libraries.
+  ifeq ($(STATIC_LIBS), true)
+    $1_TYPE := STATIC_LIBRARY
+    # The static versions need to be redirected to different output dirs, both
+    # to not interfere with the main build as well as to not end up inside the
+    # jmods.
+    $1_OBJECT_DIR := $$($1_OBJECT_DIR)/static
+    $1_OUTPUT_DIR := $$($1_OBJECT_DIR)
+    # For release builds where debug symbols are configured to be moved to
+    # separate debuginfo files, disable debug symbols for static libs instead.
+    # We don't currently support this configuration and we don't want symbol
+    # information in release builds unless explicitly asked to provide it.
+    ifeq ($(DEBUG_LEVEL), release)
+      ifeq ($(COPY_DEBUG_SYMBOLS), true)
+        $1_COMPILE_WITH_DEBUG_SYMBOLS := false
+      endif
+    endif
+  endif
+
  ifeq ($$($1_TYPE), EXECUTABLE)
    $1_PREFIX :=
    ifeq ($$($1_SUFFIX), )
@ -592,6 +614,9 @@ define SetupNativeCompilationBody
    $1_EXTRA_CFLAGS += $$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release)
    $1_EXTRA_CFLAGS += $$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_release)
  endif
+  ifeq ($(STATIC_LIBS), true)
+    $1_EXTRA_CFLAGS += $$(STATIC_LIBS_CFLAGS)
+  endif

  # Pickup extra OPENJDK_TARGET_OS_TYPE and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS.
  $1_EXTRA_CXXFLAGS := $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS))
@ -605,6 +630,9 @@ define SetupNativeCompilationBody
    $1_EXTRA_CXXFLAGS += $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release)
    $1_EXTRA_CXXFLAGS += $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
  endif
+  ifeq ($(STATIC_LIBS), true)
+    $1_EXTRA_CXXFLAGS += $$(STATIC_LIB_CFLAGS)
+  endif

  # If no C++ flags are explicitly set, default to using the C flags.
  # After that, we can set additional C++ flags that should not interfere
@ -616,7 +644,7 @@ define SetupNativeCompilationBody
    $1_EXTRA_CXXFLAGS := $$($1_EXTRA_CFLAGS)
  endif

-  ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true)
+  ifeq ($$($1_COMPILE_WITH_DEBUG_SYMBOLS), true)
    $1_EXTRA_CFLAGS += $$(CFLAGS_DEBUG_SYMBOLS)
    $1_EXTRA_CXXFLAGS += $$(CFLAGS_DEBUG_SYMBOLS)
    $1_EXTRA_ASFLAGS += $$(ASFLAGS_DEBUG_SYMBOLS)
--- a/make/common/ProcessMarkdown.gmk
+++ b/make/common/ProcessMarkdown.gmk
@ -1,4 +1,4 @@
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, 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
--- a/make/common/RMICompilation.gmk
+++ b/make/common/RMICompilation.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, 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
--- a/make/common/SetupJavaCompilers.gmk
+++ b/make/common/SetupJavaCompilers.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, 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
--- a/make/common/TestFilesCompilation.gmk
+++ b/make/common/TestFilesCompilation.gmk
@ -98,7 +98,7 @@ define SetupTestFilesCompilationBody
        DISABLED_WARNINGS_gcc := format undef unused-function unused-value, \
        DISABLED_WARNINGS_clang := undef format-nonliteral \
            missing-field-initializers sometimes-uninitialized, \
-        DISABLED_WARNINGS_CXX_solstudio := wvarhidenmem, \
+        DISABLED_WARNINGS_CXX_solstudio := wvarhidenmem doubunder, \
        LIBS := $$($1_LIBS_$$(name)), \
        TOOLCHAIN := $(if $$(filter %.cpp, $$(file)), TOOLCHAIN_LINK_CXX, TOOLCHAIN_DEFAULT), \
        OPTIMIZATION := $$(if $$($1_OPTIMIZATION_$$(name)),$$($1_OPTIMIZATION_$$(name)),LOW), \
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@ -247,7 +247,7 @@ var getJibProfilesCommon = function (input, data) {
    // These are the base setttings for all the main build profiles.
    common.main_profile_base = {
        dependencies: ["boot_jdk", "gnumake", "jtreg", "jib", "autoconf", "jmh", "jcov"],
-        default_make_targets: ["product-bundles", "test-bundles"],
+        default_make_targets: ["product-bundles", "test-bundles", "static-libs-bundles"],
        configure_args: concat(["--enable-jtreg-failure-handler"],
            "--with-exclude-translations=de,es,fr,it,ko,pt_BR,sv,ca,tr,cs,sk,ja_JP_A,ja_JP_HA,ja_JP_HI,ja_JP_I,zh_TW,zh_HK",
            "--disable-manpages",
@ -320,6 +320,14 @@ var getJibProfilesCommon = function (input, data) {
                    subdir: jdk_subdir,
                    exploded: "images/jdk"
                },
+                static_libs: {
+                    local: "bundles/\\(jdk.*bin-static-libs.tar.gz\\)",
+                    remote: [
+                        "bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-static-libs.tar.gz",
+                        "bundles/" + pf + "/\\1"
+                    ],
+                    subdir: jdk_subdir,
+                },
            }
        };
    };
@ -361,6 +369,14 @@ var getJibProfilesCommon = function (input, data) {
                    subdir: jdk_subdir,
                    exploded: "images/jdk"
                },
+                static_libs: {
+                    local: "bundles/\\(jdk.*bin-static-libs-debug.tar.gz\\)",
+                    remote: [
+                        "bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-static-libs-debug.tar.gz",
+                        "bundles/" + pf + "/\\1"
+                    ],
+                    subdir: jdk_subdir,
+                },
            }
        };
    };
@ -839,13 +855,17 @@ var getJibProfilesProfiles = function (input, common, data) {
    if (testedProfile == null) {
        testedProfile = input.build_os + "-" + input.build_cpu;
    }
-    var testedProfileJDK = testedProfile + ".jdk";
-    var testedProfileTest = ""
-    if (testedProfile.endsWith("-jcov")) {
-        testedProfileTest = testedProfile.substring(0, testedProfile.length - "-jcov".length) + ".test";
+    var testedProfileJdk = testedProfile + ".jdk";
+    // Make it possible to use the test image from a different profile
+    var testImageProfile;
+    if (input.testImageProfile != null) {
+        testImageProfile = input.testImageProfile;
+    } else if (testedProfile.endsWith("-jcov")) {
+        testImageProfile = testedProfile.substring(0, testedProfile.length - "-jcov".length);
    } else {
-        testedProfileTest = testedProfile + ".test";
+        testImageProfile = testedProfile;
    }
+    var testedProfileTest = testImageProfile + ".test"
    var testOnlyMake = [ "run-test-prebuilt", "LOG_CMDLINES=true", "JTREG_VERBOSE=fail,error,time" ];
    if (testedProfile.endsWith("-gcov")) {
        testOnlyMake = concat(testOnlyMake, "GCOV_ENABLED=true")
@ -855,14 +875,14 @@ var getJibProfilesProfiles = function (input, common, data) {
            target_os: input.build_os,
            target_cpu: input.build_cpu,
            dependencies: [
-                "jtreg", "gnumake", "boot_jdk", "devkit", "jib", "jcov", testedProfileJDK,
+                "jtreg", "gnumake", "boot_jdk", "devkit", "jib", "jcov", testedProfileJdk,
                testedProfileTest
            ],
            src: "src.conf",
            make_args: testOnlyMake,
            environment: {
                "BOOT_JDK": common.boot_jdk_home,
-                "JDK_IMAGE_DIR": input.get(testedProfileJDK, "home_path"),
+                "JDK_IMAGE_DIR": input.get(testedProfileJdk, "home_path"),
                "TEST_IMAGE_DIR": input.get(testedProfileTest, "home_path")
            },
            labels: "test"
@ -871,10 +891,10 @@ var getJibProfilesProfiles = function (input, common, data) {

    // If actually running the run-test-prebuilt profile, verify that the input
    // variable is valid and if so, add the appropriate target_* values from
-    // the tested profile.
+    // the tested profile. Use testImageProfile value as backup.
    if (input.profile == "run-test-prebuilt") {
-        if (profiles[testedProfile] == null) {
-            error("testedProfile is not defined: " + testedProfile);
+        if (profiles[testedProfile] == null && profiles[testImageProfile] == null) {
+            error("testedProfile is not defined: " + testedProfile + " " + testImageProfile);
        }
    }
    if (profiles[testedProfile] != null) {
@ -882,6 +902,11 @@ var getJibProfilesProfiles = function (input, common, data) {
            = profiles[testedProfile]["target_os"];
        testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_cpu"]
            = profiles[testedProfile]["target_cpu"];
+    } else if (profiles[testImageProfile] != null) {
+        testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_os"]
+            = profiles[testImageProfile]["target_os"];
+        testOnlyProfilesPrebuilt["run-test-prebuilt"]["target_cpu"]
+            = profiles[testImageProfile]["target_cpu"];
    }
    profiles = concatObjects(profiles, testOnlyProfilesPrebuilt);

@ -1346,3 +1371,8 @@ var isWsl = function (input) {
             || (input.build_os == "linux"
                 && java.lang.System.getProperty("os.version").contains("Microsoft")));
 }
+
+var error = function (s) {
+    java.lang.System.err.println("[ERROR] " + s);
+    exit(1);
+};
--- a/make/copy/Copy-jdk.crypto.cryptoki.gmk
+++ b/make/copy/Copy-jdk.crypto.cryptoki.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2019, 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
--- a/make/copy/Copy-jdk.crypto.ucrypto.gmk
+++ b/make/copy/Copy-jdk.crypto.ucrypto.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2019, 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
--- a/make/data/cldr/README
+++ b/make/data/cldr/README
@ -1,4 +1,4 @@
 CLDR - Unicode Common Locale Data Repository
 http://cldr.unicode.org

-CLDR version installed: 35.1
+CLDR version installed: 36
--- a/make/data/cldr/common/bcp47/timezone.xml
+++ b/make/data/cldr/common/bcp47/timezone.xml
@ -7,7 +7,7 @@ For terms of use, see http://www.unicode.org/copyright.html
 -->

 <ldmlBCP47>
-    <version number="$Revision: 14742 $"/>
+    <version number="$Revision$"/>
    <keyword>
        <key name="tz" description="Time zone key" alias="timezone">
            <type name="adalv" description="Andorra" alias="Europe/Andorra"/>
--- a/make/data/cldr/common/dtd/ldml.dtd
+++ b/make/data/cldr/common/dtd/ldml.dtd
@ -6,7 +6,7 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 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.
-$Revision: 14983 $
+$Revision$
 -->

 <!ELEMENT ldml ( identity, ( alias | ( fallback*, localeDisplayNames?, layout?, contextTransforms?, characters?, delimiters?, measurement?, dates?, numbers?, units?, listPatterns?, collations?, posix?, characterLabels?, segmentations?, rbnf?, typographicNames?, annotations?, metadata?, references?, special* ) ) ) >
@ -46,7 +46,7 @@ $Revision: 14983 $
 <!ATTLIST version number CDATA #REQUIRED >
    <!--@MATCH:regex/\$Revision.*\$-->
    <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "35.1" >
+<!ATTLIST version cldrVersion CDATA #FIXED "36" >
    <!--@MATCH:any-->
    <!--@VALUE-->
 <!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
@ -2543,7 +2543,7 @@ $Revision: 14983 $

 <!ELEMENT compoundUnit ( alias | ( compoundUnitPattern*, special* ) ) >
 <!ATTLIST compoundUnit type NMTOKEN #REQUIRED >
-    <!--@MATCH:literal/per-->
+    <!--@MATCH:literal/per, times-->
 <!ATTLIST compoundUnit alt NMTOKENS #IMPLIED >
    <!--@MATCH:literal/variant-->
 <!ATTLIST compoundUnit draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
--- a/make/data/cldr/common/dtd/ldmlBCP47.dtd
+++ b/make/data/cldr/common/dtd/ldmlBCP47.dtd
@ -6,7 +6,7 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 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.
-$Revision: 14983 $
+$Revision$
 -->

 <!ELEMENT ldmlBCP47 ( version, generation?, cldrVersion?, keyword*, attribute* ) >
@ -16,7 +16,7 @@ $Revision: 14983 $
 <!ATTLIST version number CDATA #REQUIRED >
 	<!--@MATCH:regex/\$Revision.*\$-->
    <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "35.1" >
+<!ATTLIST version cldrVersion CDATA #FIXED "36" >
 	<!--@MATCH:version-->
    <!--@VALUE-->

--- a/make/data/cldr/common/dtd/ldmlSupplemental.dtd
+++ b/make/data/cldr/common/dtd/ldmlSupplemental.dtd
@ -7,7 +7,7 @@ THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 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.

-    $Revision: 14983 $
+    $Revision$
 -->

 <!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, subdivisionContainment?, languageData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, unitPreferenceData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?, gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?, idValidity?, rgScope?, languageGroups? ) >
@ -17,7 +17,7 @@ Except as contained in this notice, the name of a copyright holder shall not be
 <!ATTLIST version number CDATA #REQUIRED >
 	<!--@MATCH:any-->
    <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "35.1" >
+<!ATTLIST version cldrVersion CDATA #FIXED "36" >
 	<!--@MATCH:version-->
    <!--@VALUE-->
 <!ATTLIST version unicodeVersion CDATA #FIXED "12.1.0" >
--- a/make/data/cldr/common/main/af.xml
+++ b/make/data/cldr/common/main/af.xml
--- a/make/data/cldr/common/main/af_NA.xml
+++ b/make/data/cldr/common/main/af_NA.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14822 $"/>
+		<version number="$Revision$"/>
 		<language type="af"/>
 		<territory type="NA"/>
 	</identity>
--- a/make/data/cldr/common/main/af_ZA.xml
+++ b/make/data/cldr/common/main/af_ZA.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="af"/>
 		<territory type="ZA"/>
 	</identity>
--- a/make/data/cldr/common/main/agq.xml
+++ b/make/data/cldr/common/main/agq.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14782 $"/>
+		<version number="$Revision$"/>
 		<language type="agq"/>
 	</identity>
 	<localeDisplayNames>
@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MD">Mòodovà</territory>
 			<territory type="MG">Màdàgasɨkà</territory>
 			<territory type="MH">Chwɨlà fɨ Mashà</territory>
-			<territory type="MK">Mɨ̀sɨ̀donyìa</territory>
 			<territory type="ML">Malè</territory>
 			<territory type="MM">Mǐanmà</territory>
 			<territory type="MN">Mùŋgolìa</territory>
@ -289,7 +288,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<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 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>
+		<exemplarCharacters type="numbers">[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 	</characters>
 	<delimiters>
 		<quotationStart>„</quotationStart>
--- a/make/data/cldr/common/main/agq_CM.xml
+++ b/make/data/cldr/common/main/agq_CM.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14782 $"/>
+		<version number="$Revision$"/>
 		<language type="agq"/>
 		<territory type="CM"/>
 	</identity>
--- a/make/data/cldr/common/main/ak.xml
+++ b/make/data/cldr/common/main/ak.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14782 $"/>
+		<version number="$Revision$"/>
 		<language type="ak"/>
 	</identity>
 	<localeDisplayNames>
@ -183,7 +183,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MD">Mɔldova</territory>
 			<territory type="MG">Madagaska</territory>
 			<territory type="MH">Marshall Islands</territory>
-			<territory type="MK">Masedonia</territory>
 			<territory type="ML">Mali</territory>
 			<territory type="MM">Miyanma</territory>
 			<territory type="MN">Mɔngolia</territory>
@ -288,7 +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>
+		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 	</characters>
 	<delimiters>
 		<quotationStart>“</quotationStart>
--- a/make/data/cldr/common/main/ak_GH.xml
+++ b/make/data/cldr/common/main/ak_GH.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14782 $"/>
+		<version number="$Revision$"/>
 		<language type="ak"/>
 		<territory type="GH"/>
 	</identity>
--- a/make/data/cldr/common/main/am.xml
+++ b/make/data/cldr/common/main/am.xml
--- a/make/data/cldr/common/main/am_ET.xml
+++ b/make/data/cldr/common/main/am_ET.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="am"/>
 		<territory type="ET"/>
 	</identity>
--- a/make/data/cldr/common/main/ar.xml
+++ b/make/data/cldr/common/main/ar.xml
--- a/make/data/cldr/common/main/ar_001.xml
+++ b/make/data/cldr/common/main/ar_001.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="001"/>
 	</identity>
--- a/make/data/cldr/common/main/ar_AE.xml
+++ b/make/data/cldr/common/main/ar_AE.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14936 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="AE"/>
 	</identity>
@ -40,14 +40,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
-		<symbols numberSystem="arab">
-			<decimal draft="contributed">٫</decimal>
-			<group draft="contributed">٬</group>
-		</symbols>
-		<symbols numberSystem="latn">
-			<decimal draft="contributed">.</decimal>
-			<group draft="contributed">,</group>
-		</symbols>
 		<currencies>
 			<currency type="BND">
 				<symbol alt="narrow" draft="contributed">$</symbol>
--- a/make/data/cldr/common/main/ar_BH.xml
+++ b/make/data/cldr/common/main/ar_BH.xml
@ -7,19 +7,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14936 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="BH"/>
 	</identity>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
-		<symbols numberSystem="arab">
-			<decimal draft="contributed">٫</decimal>
-			<group draft="contributed">٬</group>
-		</symbols>
-		<symbols numberSystem="latn">
-			<decimal draft="contributed">.</decimal>
-			<group draft="contributed">,</group>
-		</symbols>
 	</numbers>
 </ldml>
--- a/make/data/cldr/common/main/ar_DJ.xml
+++ b/make/data/cldr/common/main/ar_DJ.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="DJ"/>
 	</identity>
--- a/make/data/cldr/common/main/ar_DZ.xml
+++ b/make/data/cldr/common/main/ar_DZ.xml
@ -7,12 +7,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14786 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="DZ"/>
 	</identity>
 	<characters>
-		<exemplarCharacters type="numbers">[\u200E \- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\u200E \- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 	</characters>
 	<dates>
 		<calendars>
@ -82,10 +82,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>latn</defaultNumberingSystem>
-		<symbols numberSystem="arab">
-			<decimal draft="contributed">٫</decimal>
-			<group draft="contributed">٬</group>
-		</symbols>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group>.</group>
--- a/make/data/cldr/common/main/ar_EG.xml
+++ b/make/data/cldr/common/main/ar_EG.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14936 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="EG"/>
 	</identity>
@ -18,13 +18,5 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</localeDisplayNames>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
-		<symbols numberSystem="arab">
-			<decimal draft="contributed">٫</decimal>
-			<group draft="contributed">٬</group>
-		</symbols>
-		<symbols numberSystem="latn">
-			<decimal draft="contributed">.</decimal>
-			<group draft="contributed">,</group>
-		</symbols>
 	</numbers>
 </ldml>
--- a/make/data/cldr/common/main/ar_EH.xml
+++ b/make/data/cldr/common/main/ar_EH.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="EH"/>
 	</identity>
--- a/make/data/cldr/common/main/ar_ER.xml
+++ b/make/data/cldr/common/main/ar_ER.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="ER"/>
 	</identity>
--- a/make/data/cldr/common/main/ar_IL.xml
+++ b/make/data/cldr/common/main/ar_IL.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="IL"/>
 	</identity>
--- a/make/data/cldr/common/main/ar_IQ.xml
+++ b/make/data/cldr/common/main/ar_IQ.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14936 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="IQ"/>
 	</identity>
@ -109,13 +109,5 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
-		<symbols numberSystem="arab">
-			<decimal draft="contributed">٫</decimal>
-			<group draft="contributed">٬</group>
-		</symbols>
-		<symbols numberSystem="latn">
-			<decimal draft="contributed">.</decimal>
-			<group draft="contributed">,</group>
-		</symbols>
 	</numbers>
 </ldml>
--- a/make/data/cldr/common/main/ar_JO.xml
+++ b/make/data/cldr/common/main/ar_JO.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14936 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="JO"/>
 	</identity>
@ -109,13 +109,5 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
-		<symbols numberSystem="arab">
-			<decimal draft="contributed">٫</decimal>
-			<group draft="contributed">٬</group>
-		</symbols>
-		<symbols numberSystem="latn">
-			<decimal draft="contributed">.</decimal>
-			<group draft="contributed">,</group>
-		</symbols>
 	</numbers>
 </ldml>
--- a/make/data/cldr/common/main/ar_KM.xml
+++ b/make/data/cldr/common/main/ar_KM.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="KM"/>
 	</identity>
--- a/make/data/cldr/common/main/ar_KW.xml
+++ b/make/data/cldr/common/main/ar_KW.xml
@ -7,19 +7,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14936 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="KW"/>
 	</identity>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
-		<symbols numberSystem="arab">
-			<decimal draft="contributed">٫</decimal>
-			<group draft="contributed">٬</group>
-		</symbols>
-		<symbols numberSystem="latn">
-			<decimal draft="contributed">.</decimal>
-			<group draft="contributed">,</group>
-		</symbols>
 	</numbers>
 </ldml>
--- a/make/data/cldr/common/main/ar_LB.xml
+++ b/make/data/cldr/common/main/ar_LB.xml
@ -7,12 +7,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="LB"/>
 	</identity>
 	<characters>
-		<exemplarCharacters type="numbers">[\u200E \- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\u200E \- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 	</characters>
 	<dates>
 		<calendars>
--- a/make/data/cldr/common/main/ar_LY.xml
+++ b/make/data/cldr/common/main/ar_LY.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="LY"/>
 	</identity>
@ -30,7 +30,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		</territories>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters type="numbers">[\u200E \- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\u200E \- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 	</characters>
 	<dates>
 		<calendars>
--- a/make/data/cldr/common/main/ar_MA.xml
+++ b/make/data/cldr/common/main/ar_MA.xml
@ -7,13 +7,13 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14786 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="MA"/>
 	</identity>
 	<characters>
 		<exemplarCharacters type="auxiliary">[\u200C\u200D\u200E\u200F پ چ ژ ڜ ڢ ڤ ڥ ٯ ڧ ڨ ک ڭ گ ݣ ی]</exemplarCharacters>
-		<exemplarCharacters type="numbers">[\u200E \- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\u200E \- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 	</characters>
 	<dates>
 		<calendars>
@ -106,10 +106,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>latn</defaultNumberingSystem>
-		<symbols numberSystem="arab">
-			<decimal draft="contributed">٫</decimal>
-			<group draft="contributed">٬</group>
-		</symbols>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group>.</group>
--- a/make/data/cldr/common/main/ar_MR.xml
+++ b/make/data/cldr/common/main/ar_MR.xml
@ -7,12 +7,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="MR"/>
 	</identity>
 	<characters>
-		<exemplarCharacters type="numbers">[\u200E \- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\u200E \- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 	</characters>
 	<dates>
 		<calendars>
--- a/make/data/cldr/common/main/ar_OM.xml
+++ b/make/data/cldr/common/main/ar_OM.xml
@ -7,19 +7,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14936 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="OM"/>
 	</identity>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
-		<symbols numberSystem="arab">
-			<decimal draft="contributed">٫</decimal>
-			<group draft="contributed">٬</group>
-		</symbols>
-		<symbols numberSystem="latn">
-			<decimal draft="contributed">.</decimal>
-			<group draft="contributed">,</group>
-		</symbols>
 	</numbers>
 </ldml>
--- a/make/data/cldr/common/main/ar_PS.xml
+++ b/make/data/cldr/common/main/ar_PS.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="PS"/>
 	</identity>
--- a/make/data/cldr/common/main/ar_QA.xml
+++ b/make/data/cldr/common/main/ar_QA.xml
@ -7,19 +7,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14936 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="QA"/>
 	</identity>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
-		<symbols numberSystem="arab">
-			<decimal draft="contributed">٫</decimal>
-			<group draft="contributed">٬</group>
-		</symbols>
-		<symbols numberSystem="latn">
-			<decimal draft="contributed">.</decimal>
-			<group draft="contributed">,</group>
-		</symbols>
 	</numbers>
 </ldml>
--- a/make/data/cldr/common/main/ar_SA.xml
+++ b/make/data/cldr/common/main/ar_SA.xml
@ -7,26 +7,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14936 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="SA"/>
 	</identity>
 	<localeDisplayNames>
 		<languages>
+			<language type="ar_001" draft="contributed">العربية الرسمية الحديثة</language>
 			<language type="arn" draft="contributed">المابودونجونية</language>
+			<language type="de_AT" draft="contributed">الألمانية النمساوية</language>
+			<language type="de_CH" draft="contributed">الألمانية العليا السويسرية</language>
+			<language type="en_AU" draft="contributed">الإنجليزية الأسترالية</language>
+			<language type="en_CA" draft="contributed">الإنجليزية الكندية</language>
+			<language type="en_GB" draft="contributed">الإنجليزية البريطانية</language>
+			<language type="en_GB" alt="short" draft="contributed">الإنجليزية المملكة المتحدة</language>
+			<language type="en_US" draft="contributed">الإنجليزية الأمريكية</language>
+			<language type="en_US" alt="short" draft="contributed">الإنجليزية الولايات المتحدة</language>
+			<language type="es_419" draft="contributed">الإسبانية أمريكا اللاتينية</language>
+			<language type="es_ES" draft="contributed">الإسبانية الأوروبية</language>
+			<language type="es_MX" draft="contributed">الإسبانية المكسيكية</language>
+			<language type="fr_CA" draft="contributed">الفرنسية الكندية</language>
+			<language type="fr_CH" draft="contributed">الفرنسية السويسرية</language>
 			<language type="gn" draft="contributed">الغورانية</language>
 			<language type="hsb" draft="contributed">صوربيا العليا</language>
 			<language type="lo" draft="contributed">اللاوو</language>
+			<language type="nds_NL" draft="contributed">السكسونية السفلى</language>
+			<language type="nl_BE" draft="contributed">الفلمنكية</language>
+			<language type="pt_BR" draft="contributed">البرتغالية البرازيلية</language>
+			<language type="pt_PT" draft="contributed">البرتغالية الأوروبية</language>
 			<language type="sh" draft="contributed">الكرواتية الصربية</language>
 			<language type="sma" draft="contributed">سامي الجنوبية</language>
 			<language type="sw" draft="contributed">السواحيلية</language>
 			<language type="sw_CD" draft="contributed">السواحيلية الكونغولية</language>
 			<language type="te" draft="contributed">التيلوجو</language>
 			<language type="ti" draft="contributed">التيغرينية</language>
+			<language type="zh_Hans" draft="contributed">الصينية المبسطة</language>
+			<language type="zh_Hant" draft="contributed">الصينية التقليدية</language>
 		</languages>
 		<territories>
 			<territory type="AC" draft="contributed">جزيرة أسينشين</territory>
-			<territory type="BS" draft="contributed">جزر البهاما</territory>
 			<territory type="CZ" alt="variant" draft="contributed">التشيك</territory>
 			<territory type="EA" draft="contributed">سبتة ومليلية</territory>
 			<territory type="MO" draft="contributed">ماكاو الصينية (منطقة إدارية خاصة)</territory>
@ -34,9 +53,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MS" draft="contributed">مونتيسيرات</territory>
 			<territory type="UY" draft="contributed">أوروغواي</territory>
 		</territories>
+		<measurementSystemNames>
+			<measurementSystemName type="US" draft="contributed">الولايت المتحدة</measurementSystemName>
+		</measurementSystemNames>
 	</localeDisplayNames>
 	<characters>
-		<exemplarCharacters type="numbers">[\u200E \- , . ٪ ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\u200E \- ‑ , . ٪ ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 	</characters>
 	<dates>
 		<calendars>
@ -44,25 +66,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<dayPeriods>
 					<dayPeriodContext type="format">
 						<dayPeriodWidth type="abbreviated">
+							<dayPeriod type="morning1" draft="contributed">فجرًا</dayPeriod>
+							<dayPeriod type="morning2">ص</dayPeriod>
+							<dayPeriod type="afternoon1">ظهرًا</dayPeriod>
+							<dayPeriod type="afternoon2">بعد الظهر</dayPeriod>
+							<dayPeriod type="evening1">مساءً</dayPeriod>
+							<dayPeriod type="night1">منتصف الليل</dayPeriod>
 							<dayPeriod type="night2">ل</dayPeriod>
 						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="morning1" draft="contributed">فجرًا</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="morning1" draft="contributed">فجرًا</dayPeriod>
-						</dayPeriodWidth>
-					</dayPeriodContext>
-					<dayPeriodContext type="stand-alone">
-						<dayPeriodWidth type="abbreviated">
-							<dayPeriod type="morning1" draft="contributed">فجرًا</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="narrow">
-							<dayPeriod type="morning1" draft="contributed">فجرًا</dayPeriod>
-						</dayPeriodWidth>
-						<dayPeriodWidth type="wide">
-							<dayPeriod type="morning1" draft="contributed">فجرًا</dayPeriod>
-						</dayPeriodWidth>
 					</dayPeriodContext>
 				</dayPeriods>
 			</calendar>
@ -74,4 +85,762 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<percentSign draft="contributed">٪</percentSign>
 		</symbols>
 	</numbers>
+	<units>
+		<unitLength type="long">
+			<unit type="acceleration-meter-per-second-squared">
+				<unitPattern count="zero" draft="contributed">{0} متر في الثانية المربعة</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} متر في الثانية المربعة</unitPattern>
+				<unitPattern count="two" draft="contributed">متران في الثانية المربعة</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أمتار في الثانية المربعة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} مترًا في الثانية المربعة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} متر في الثانية المربعة</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<unitPattern count="zero" draft="contributed">{0} دقيقة قوسية</unitPattern>
+				<unitPattern count="one" draft="contributed">دقيقة قوسية</unitPattern>
+				<unitPattern count="two" draft="contributed">دقيقتان قوسيتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} دقائق قوسية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} دقيقة قوسية</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} دقيقة قوسية</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<unitPattern count="zero" draft="contributed">{0} كيلومتر مربع</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كيلومتر مربع</unitPattern>
+				<unitPattern count="two" draft="contributed">كيلومتران مربعان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كيلومترات مربعة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كيلومترًا مربعًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كيلومتر مربع</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<unitPattern count="zero" draft="contributed">{0} هكتار</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} هكتار</unitPattern>
+				<unitPattern count="two" draft="contributed">هكتاران</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} هكتارات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} هكتارًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} هكتار</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="zero" draft="contributed">{0} متر مربع</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} متر مربع</unitPattern>
+				<unitPattern count="two" draft="contributed">متران مربعان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أمتار مربعة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} مترًا مربعًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} متر مربع</unitPattern>
+			</unit>
+			<unit type="area-square-centimeter">
+				<unitPattern count="zero" draft="contributed">{0} سنتيمتر مربع</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} سنتيمتر مربع</unitPattern>
+				<unitPattern count="two" draft="contributed">سنتيمتران مربعان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} سنتيمترات مربعة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} سنتيمترًا مربعًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} سنتيمتر مربع</unitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="zero" draft="contributed">{0} ميل مربع</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ميل مربع</unitPattern>
+				<unitPattern count="two" draft="contributed">ميلان مربعان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أميال مربعة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ميلًا مربعًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ميل مربع</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="zero" draft="contributed">{0} فدان</unitPattern>
+				<unitPattern count="one" draft="contributed">فدان</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} فدان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أفدنة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} فدانًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} فدان</unitPattern>
+			</unit>
+			<unit type="area-square-yard">
+				<unitPattern count="zero" draft="contributed">{0} ياردة مربعة</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ياردة مربعة</unitPattern>
+				<unitPattern count="two" draft="contributed">ياردتان مربعتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ياردات مربعة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ياردة مربعة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ياردة مربعة</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="zero" draft="contributed">{0} قدم مربعة</unitPattern>
+				<unitPattern count="one" draft="contributed">قدم مربعة</unitPattern>
+				<unitPattern count="two" draft="contributed">قدمان مربعتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أقدام مربعة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} قدمًا مربعة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} قدم مربعة</unitPattern>
+			</unit>
+			<unit type="area-square-inch">
+				<unitPattern count="zero" draft="contributed">{0} بوصة مربعة</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} بوصة مربعة</unitPattern>
+				<unitPattern count="two" draft="contributed">بوصتان مربعتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} بوصات مربعة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} بوصة مربعة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} بوصة مربعة</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-million">
+				<unitPattern count="zero" draft="contributed">{0} جزء في المليون</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} جزء في المليون</unitPattern>
+				<unitPattern count="two" draft="contributed">جزءان في المليون</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أجزاء في المليون</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} جزءًا في المليون</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} جزء في المليون</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<unitPattern count="zero" draft="contributed">{0} ميل لكل غالون</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ميل لكل غالون</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ميلان لكل غالون</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أميال لكل غالون</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ميلًا لكل غالون</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ميل لكل غالون</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<unitPattern count="zero" draft="contributed">{0} ثانية</unitPattern>
+				<unitPattern count="one" draft="contributed">ثانية</unitPattern>
+				<unitPattern count="two" draft="contributed">ثانيتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ثوانٍ</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ثانية</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ثانية</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<unitPattern count="zero" draft="contributed">{0} كيلومتر</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كيلومتر</unitPattern>
+				<unitPattern count="two" draft="contributed">كيلومتران</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كيلومترات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كيلومترًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كيلومتر</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<unitPattern count="zero" draft="contributed">{0} سنتيمتر</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} سنتيمتر</unitPattern>
+				<unitPattern count="two" draft="contributed">سنتيمتران</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} سنتيمترات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} سنتيمترًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} سنتيمتر</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<unitPattern count="zero" draft="contributed">{0} مليمتر</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} مليمتر</unitPattern>
+				<unitPattern count="two" draft="contributed">مليمتران</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} مليمتر</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} مليمترًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} مليمتر</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="zero" draft="contributed">{0} ياردة</unitPattern>
+				<unitPattern count="one" draft="contributed">ياردة</unitPattern>
+				<unitPattern count="two" draft="contributed">ياردتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ياردات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ياردة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ياردة</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<unitPattern count="zero" draft="contributed">{0} قدم</unitPattern>
+				<unitPattern count="one" draft="contributed">قدم</unitPattern>
+				<unitPattern count="two" draft="contributed">قدمان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أقدام</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} قدمًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} قدم</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="zero" draft="contributed">{0} بوصة</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} بوصة</unitPattern>
+				<unitPattern count="two" draft="contributed">بوصتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} بوصات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} بوصة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} بوصة</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<unitPattern count="zero" draft="contributed">{0} فرسخ فلكي</unitPattern>
+				<unitPattern count="one" draft="contributed">فرسخ فلكي</unitPattern>
+				<unitPattern count="two" draft="contributed">فرسخان فلكيان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} فراسخ فلكية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} فرسخًا فلكيًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} فرسخ فلكي</unitPattern>
+			</unit>
+			<unit type="length-astronomical-unit">
+				<unitPattern count="zero" draft="contributed">{0} وحدة فلكية</unitPattern>
+				<unitPattern count="one" draft="contributed">وحدة فلكية</unitPattern>
+				<unitPattern count="two" draft="contributed">وحدتان فلكيتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} وحدات فلكية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} وحدة فلكية</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} وحدة فلكية</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<unitPattern count="zero" draft="contributed">{0} ميل بحري</unitPattern>
+				<unitPattern count="one" draft="contributed">ميل بحري</unitPattern>
+				<unitPattern count="two" draft="contributed">ميلان بحريان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أميال بحرية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ميلًا بحريًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ميل بحري</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<unitPattern count="zero" draft="contributed">{0} ميل اسكندنافي</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ميل اسكندنافي</unitPattern>
+				<unitPattern count="two" draft="contributed">ميلان اسكندنافيان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أميال اسكندنافية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ميلًا اسكندنافيًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ميل اسكندنافي</unitPattern>
+			</unit>
+			<unit type="light-solar-luminosity">
+				<unitPattern count="zero" draft="contributed">{0} ضياء شمسي</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ضياء شمسي</unitPattern>
+				<unitPattern count="two" draft="contributed">ضياءان شمسيان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ضياءات شمسية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ضياءً شمسيًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ضياء شمسي</unitPattern>
+			</unit>
+			<unit type="mass-metric-ton">
+				<unitPattern count="zero" draft="contributed">{0} طن متري</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} طن متري</unitPattern>
+				<unitPattern count="two" draft="contributed">طنان متريان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أطنان مترية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} طنًا متريًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} طن متري</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<unitPattern count="zero" draft="contributed">{0} كيلوغرام</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كيلوغرام</unitPattern>
+				<unitPattern count="two" draft="contributed">كيلوغرامان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كيلوغرامات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كيلوغرامًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كيلوغرام</unitPattern>
+			</unit>
+			<unit type="mass-milligram">
+				<unitPattern count="zero" draft="contributed">{0} مليغرام</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} مليغرام</unitPattern>
+				<unitPattern count="two" draft="contributed">مليغرامان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} مليغرامات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} مليغرامًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} مليغرام</unitPattern>
+			</unit>
+			<unit type="mass-microgram">
+				<unitPattern count="zero" draft="contributed">{0} ميكروغرام</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ميكروغرام</unitPattern>
+				<unitPattern count="two" draft="contributed">ميكروغرامان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ميكروغرامات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ميكروغرامًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ميكروغرام</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="zero" draft="contributed">{0} رطل</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} رطل</unitPattern>
+				<unitPattern count="two" draft="contributed">رطلان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أرطال</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} رطلًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} رطل</unitPattern>
+			</unit>
+			<unit type="mass-earth-mass">
+				<unitPattern count="zero" draft="contributed">{0} كتلة أرضية</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كتلة أرضية</unitPattern>
+				<unitPattern count="two" draft="contributed">كتلتان أرضيتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كتل أرضية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كتلة أرضية</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كتلة أرضية</unitPattern>
+			</unit>
+			<unit type="mass-solar-mass">
+				<unitPattern count="zero" draft="contributed">{0} كتلة شمسية</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كتلة شمسية</unitPattern>
+				<unitPattern count="two" draft="contributed">كتلتان شمسيتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كتل شمسية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كتلة شمسية</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كتلة شمسية</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<unitPattern count="zero" draft="contributed">{0} رطل لكل بوصة مربعة</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} رطل لكل بوصة مربعة</unitPattern>
+				<unitPattern count="two" draft="contributed">رطلان لكل بوصة مربعة</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أرطال لكل بوصة مربعة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} رطلًا لكل بوصة مربعة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} رطل لكل بوصة مربعة</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<unitPattern count="zero" draft="contributed">{0} كيلومتر في الساعة</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كيلومتر في الساعة</unitPattern>
+				<unitPattern count="two" draft="contributed">كيلومتران في الساعة</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كيلومترات في الساعة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كيلومترًا في الساعة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كيلومتر في الساعة</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<unitPattern count="zero" draft="contributed">{0} متر في الثانية</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} متر في الثانية</unitPattern>
+				<unitPattern count="two" draft="contributed">متران في الثانية</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أمتار في الثانية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} مترًا في الثانية</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} متر في الثانية</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<unitPattern count="zero" draft="contributed">{0} ميل في الساعة</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ميل في الساعة</unitPattern>
+				<unitPattern count="two" draft="contributed">ميلان في الساعة</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أميال في الساعة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ميلًا في الساعة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ميل في الساعة</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<unitPattern count="zero" draft="contributed">{0} عقدة</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} عقدة</unitPattern>
+				<unitPattern count="two" draft="contributed">عقدتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} عقد</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} عقدة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} عقدة</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<unitPattern count="zero" draft="contributed">{0} كيلومتر مكعب</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كيلومتر مكعب</unitPattern>
+				<unitPattern count="two" draft="contributed">كيلومتران مكعبان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كيلومترات مكعبة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كيلومترًا مكعبًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كيلومتر مكعب</unitPattern>
+			</unit>
+			<unit type="volume-cubic-meter">
+				<unitPattern count="zero" draft="contributed">{0} متر مكعب</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} متر مكعب</unitPattern>
+				<unitPattern count="two" draft="contributed">متران مكعبان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} مترات مكعبة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} مترًا مكعبًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} متر مكعب</unitPattern>
+			</unit>
+			<unit type="volume-cubic-centimeter">
+				<unitPattern count="zero" draft="contributed">{0} سنتيمتر مكعب</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} سنتيمتر مكعب</unitPattern>
+				<unitPattern count="two" draft="contributed">سنتيمتران مكعبان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} سنتيمترات مكعبة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} سنتيمترًا مكعبًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} سنتيمتر مكعب</unitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<unitPattern count="zero" draft="contributed">{0} ميل مكعب</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ميل مكعب</unitPattern>
+				<unitPattern count="two" draft="contributed">ميلان مكعبان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أميال مكعبة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ميلًا مكعبًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ميل مكعب</unitPattern>
+			</unit>
+			<unit type="volume-cubic-yard">
+				<unitPattern count="zero" draft="contributed">{0} ياردة مكعبة</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ياردة مكعبة</unitPattern>
+				<unitPattern count="two" draft="contributed">ياردتان مكعبتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ياردات مكعبة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ياردة مكعبة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ياردة مكعبة</unitPattern>
+			</unit>
+			<unit type="volume-cubic-foot">
+				<unitPattern count="zero" draft="contributed">{0} قدم مكعبة</unitPattern>
+				<unitPattern count="one" draft="contributed">قدم مكعبة</unitPattern>
+				<unitPattern count="two" draft="contributed">قدمان مكعبتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أقدام مكعبة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} أقدام مكعبة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} قدم مكعبة</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<unitPattern count="zero" draft="contributed">{0} بوصة مكعبة</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} بوصة مكعبة</unitPattern>
+				<unitPattern count="two" draft="contributed">بوصتان مكعبات</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} بوصات مكعبة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} بوصة مكعبة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} بوصة مكعبة</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<unitPattern count="zero" draft="contributed">{0} لتر</unitPattern>
+				<unitPattern count="one" draft="contributed">لتر</unitPattern>
+				<unitPattern count="two" draft="contributed">لتران</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} لترات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} لترًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} لتر</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<unitPattern count="zero" draft="contributed">{0} مكيال متري</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} مكيال متري</unitPattern>
+				<unitPattern count="two" draft="contributed">مكيالان متريان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} مكاييل مترية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} مكيالًا متريًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} مكيال متري</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<unitPattern count="zero" draft="contributed">{0} كوب متري</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كوب متري</unitPattern>
+				<unitPattern count="two" draft="contributed">كوبان متريان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أكواب مترية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كوبًا متريًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كوب متري</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<unitPattern count="zero" draft="contributed">{0} ملعقة كبيرة</unitPattern>
+				<unitPattern count="one" draft="contributed">ملعقة كبيرة</unitPattern>
+				<unitPattern count="two" draft="contributed">ملعقتان كبيرتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ملاعق كبيرة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ملعقة كبيرة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ملعقة كبيرة</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<unitPattern count="zero" draft="contributed">{0} ملعقة صغيرة</unitPattern>
+				<unitPattern count="one" draft="contributed">ملعقة صغيرة</unitPattern>
+				<unitPattern count="two" draft="contributed">ملعقتان صغيرتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ملاعق صغيرة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ملعقة صغيرة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ملعقة صغيرة</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="short">
+			<unit type="angle-revolution">
+				<unitPattern count="zero" draft="contributed">{0} دورة</unitPattern>
+				<unitPattern count="one" draft="contributed">دورة</unitPattern>
+				<unitPattern count="two" draft="contributed">دورتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} دورات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} دورة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} دورة</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<unitPattern count="zero" draft="contributed">{0} هكتار</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} هكتار</unitPattern>
+				<unitPattern count="two" draft="contributed">هكتاران</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} هكتارات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} هكتارًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} هكتار</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="zero" draft="contributed">{0} فدان</unitPattern>
+				<unitPattern count="one" draft="contributed">فدان</unitPattern>
+				<unitPattern count="two" draft="contributed">فدانان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أفدنة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} فدانًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} فدان</unitPattern>
+			</unit>
+			<unit type="concentr-karat">
+				<unitPattern count="zero" draft="contributed">{0} قيراط</unitPattern>
+				<unitPattern count="one" draft="contributed">قيراط</unitPattern>
+				<unitPattern count="two" draft="contributed">قيراطان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} قراريط</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} قيراطًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} قيراط</unitPattern>
+			</unit>
+			<unit type="concentr-part-per-million">
+				<unitPattern count="zero" draft="contributed">{0} جزء/مليون</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} جزء/مليون</unitPattern>
+				<unitPattern count="two" draft="contributed">جزءان/مليون</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أجزاء/مليون</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} جزءًا/مليون</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} جزء/مليون</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-kilometer">
+				<unitPattern count="zero" draft="contributed">{0} لتر/كم</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} لتر/كم</unitPattern>
+				<unitPattern count="two" draft="contributed">لتران/كم</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} لترات/كم</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} لترًا/كم</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} لتر/كم</unitPattern>
+			</unit>
+			<unit type="consumption-liter-per-100kilometers">
+				<unitPattern count="zero" draft="contributed">{0} لتر/١٠٠ كم</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} لتر/١٠٠ كم</unitPattern>
+				<unitPattern count="two" draft="contributed">لتران/١٠٠ كم</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} لترات/١٠٠ كم</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} لترًا/١٠٠ كم</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} لتر/١٠٠ كم</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon">
+				<unitPattern count="zero" draft="contributed">{0} ميل/غالون</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ميل/غالون</unitPattern>
+				<unitPattern count="two" draft="contributed">ميلان/غالون</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أميال/غالون</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ميلًا/غالون</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ميل/غالون</unitPattern>
+			</unit>
+			<unit type="consumption-mile-per-gallon-imperial">
+				<unitPattern count="zero" draft="contributed">{0} ميل/غ. إمبراطوري</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ميل/غ. إمبراطوري</unitPattern>
+				<unitPattern count="two" draft="contributed">ميلان/غ. إمبراطوري</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أميال/غ. إمبراطوري</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ميلًا/غ. إمبراطوري</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ميل/غ. إمبراطوري</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<displayName draft="contributed">سنوات</displayName>
+				<unitPattern count="zero" draft="contributed">{0} سنة</unitPattern>
+				<unitPattern count="one" draft="contributed">سنة</unitPattern>
+				<unitPattern count="two" draft="contributed">سنتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} سنوات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} سنة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} سنة</unitPattern>
+			</unit>
+			<unit type="energy-british-thermal-unit">
+				<unitPattern count="zero" draft="contributed">{0} وحدة حرارية بريطانية</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} وحدة حرارية بريطانية</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} وحدة حرارية بريطانية</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} وحدات حرارية بريطانية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} وحدة حرارية بريطانية</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} وحدة حرارية بريطانية</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="zero" draft="contributed">{0} ميل</unitPattern>
+				<unitPattern count="one" draft="contributed">ميل</unitPattern>
+				<unitPattern count="two" draft="contributed">ميلان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أميال</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ميل</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ميل</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="zero" draft="contributed">{0} ياردة</unitPattern>
+				<unitPattern count="one" draft="contributed">ياردة</unitPattern>
+				<unitPattern count="two" draft="contributed">ياردتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ياردات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ياردة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ياردة</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<unitPattern count="zero" draft="contributed">{0} قدم</unitPattern>
+				<unitPattern count="one" draft="contributed">قدم</unitPattern>
+				<unitPattern count="two" draft="contributed">قدمان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أقدام</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} قدمًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} قدم</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="zero" draft="contributed">{0} بوصة</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} بوصة</unitPattern>
+				<unitPattern count="two" draft="contributed">بوصتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} بوصات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} بوصة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} بوصة</unitPattern>
+			</unit>
+			<unit type="length-parsec">
+				<unitPattern count="zero" draft="contributed">{0} فرسخ فلكي</unitPattern>
+				<unitPattern count="one" draft="contributed">فرسخ فلكي</unitPattern>
+				<unitPattern count="two" draft="contributed">فرسخان فلكيان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} فراسخ فلكية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} فرسخًا فلكيًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} فرسخ فلكي</unitPattern>
+			</unit>
+			<unit type="length-nautical-mile">
+				<unitPattern count="zero" draft="contributed">{0} ميل بحري</unitPattern>
+				<unitPattern count="one" draft="contributed">ميل بحري</unitPattern>
+				<unitPattern count="two" draft="contributed">ميلان بحريان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أميال بحرية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ميلًا بحريًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ميل بحري</unitPattern>
+			</unit>
+			<unit type="length-mile-scandinavian">
+				<unitPattern count="zero" draft="contributed">{0} ميل اسكندنافي</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ميل اسكندنافي</unitPattern>
+				<unitPattern count="two" draft="contributed">ميلان اسكندنافيان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أميال اسكندنافية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ميلًا اسكندنافيًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ميل اسكندنافي</unitPattern>
+			</unit>
+			<unit type="light-solar-luminosity">
+				<unitPattern count="zero" draft="contributed">{0} ضياء شمسي</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ضياء شمسي</unitPattern>
+				<unitPattern count="two" draft="contributed">ضياءان شمسيان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ضياءات شمسية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ضياءً شمسيًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ضياء شمسي</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<unitPattern count="zero" draft="contributed">{0} غرام</unitPattern>
+				<unitPattern count="one" draft="contributed">غرام</unitPattern>
+				<unitPattern count="two" draft="contributed">غرامان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} غرامات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} غرامًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} غرام</unitPattern>
+			</unit>
+			<unit type="mass-ton">
+				<unitPattern count="zero" draft="contributed">{0} طن</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} طن</unitPattern>
+				<unitPattern count="two" draft="contributed">طنان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أطنان</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} طنًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} طن</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="zero" draft="contributed">{0} رطل</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} رطل</unitPattern>
+				<unitPattern count="two" draft="contributed">رطلان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أرطال</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} رطلُا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} رطل</unitPattern>
+			</unit>
+			<unit type="mass-carat">
+				<unitPattern count="zero" draft="contributed">{0} قيراط</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} قيراط</unitPattern>
+				<unitPattern count="two" draft="contributed">قيراطان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} قراريط</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} قيراطًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} قيراط</unitPattern>
+			</unit>
+			<unit type="mass-earth-mass">
+				<unitPattern count="zero" draft="contributed">{0} كتلة أرضية</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كتلة أرضية</unitPattern>
+				<unitPattern count="two" draft="contributed">كتلتان أرضيتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كتل أرضية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كتلة أرضية</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كتلة أرضية</unitPattern>
+			</unit>
+			<unit type="mass-solar-mass">
+				<unitPattern count="zero" draft="contributed">{0} كتلة شمسية</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كتلة شمسية</unitPattern>
+				<unitPattern count="two" draft="contributed">كتلتان شمسيتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كتل شمسية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كتلة شمسية</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كتلة شمسية</unitPattern>
+			</unit>
+			<unit type="pressure-pound-per-square-inch">
+				<unitPattern count="zero" draft="contributed">{0} رطل/بوصة²</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} رطل/بوصة²</unitPattern>
+				<unitPattern count="two" draft="contributed">رطلان/بوصة²</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أرطال/بوصة²</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} رطلًا/بوصة²</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} رطل/بوصة²</unitPattern>
+			</unit>
+			<unit type="pressure-kilopascal">
+				<displayName draft="contributed">كيلوباسكال</displayName>
+				<unitPattern count="zero" draft="contributed">{0} كيلوباسكال</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كيلوباسكال</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} كيلوباسكال</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كيلوباسكال</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كيلوباسكال</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كيلوباسكال</unitPattern>
+			</unit>
+			<unit type="pressure-megapascal">
+				<displayName draft="contributed">ميغاباسكال</displayName>
+				<unitPattern count="zero" draft="contributed">{0} ميغاباسكال</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ميغاباسكال</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ميغاباسكال</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ميغاباسكال</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ميغاباسكال</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ميغاباسكال</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<unitPattern count="zero" draft="contributed">{0} ميل/س</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} ميل/س</unitPattern>
+				<unitPattern count="two" draft="contributed">ميلان/س</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أميال/س</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ميلًا/س</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ميل/س</unitPattern>
+			</unit>
+			<unit type="speed-knot">
+				<unitPattern count="zero" draft="contributed">{0} عقدة</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} عقدة</unitPattern>
+				<unitPattern count="two" draft="contributed">عقدتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} عقد</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} عقدة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} عقدة</unitPattern>
+			</unit>
+			<unit type="temperature-kelvin">
+				<displayName draft="contributed">درجة كلفن</displayName>
+				<unitPattern count="zero" draft="contributed">{0} درجة كلفن</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} درجة كلفن</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} درجة كلفن</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} درجة كلفن</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} درجة كلفن</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} درجة كلفن</unitPattern>
+			</unit>
+			<unit type="volume-cubic-inch">
+				<unitPattern count="zero" draft="contributed">{0} بوصة³</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} بوصة مكعبة</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} بوصة³</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} بوصة³</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} بوصة³</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} بوصة³</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<unitPattern count="zero" draft="contributed">{0} لتر</unitPattern>
+				<unitPattern count="one" draft="contributed">لتر</unitPattern>
+				<unitPattern count="two" draft="contributed">لتران</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} لترات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} لترًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} لتر</unitPattern>
+			</unit>
+			<unit type="volume-pint-metric">
+				<unitPattern count="zero" draft="contributed">{0} مكيال متري</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} مكيال متري</unitPattern>
+				<unitPattern count="two" draft="contributed">مكيالان متريان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} مكاييل مترية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} مكيالًا متريًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} مكيال متري</unitPattern>
+			</unit>
+			<unit type="volume-cup-metric">
+				<unitPattern count="zero" draft="contributed">{0} كوب متري</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كوب متري</unitPattern>
+				<unitPattern count="two" draft="contributed">كوبان متريان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أكواب مترية</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كوبًا متريًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كوب متري</unitPattern>
+			</unit>
+			<unit type="volume-cup">
+				<unitPattern count="zero" draft="contributed">{0} كوب</unitPattern>
+				<unitPattern count="one" draft="contributed">كوب</unitPattern>
+				<unitPattern count="two" draft="contributed">كوبان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أكواب</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كوبًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كوب</unitPattern>
+			</unit>
+			<unit type="volume-fluid-ounce">
+				<unitPattern count="zero" draft="contributed">{0} أونصة سائلة</unitPattern>
+				<unitPattern count="one" draft="contributed">أونصة س</unitPattern>
+				<unitPattern count="two" draft="contributed">أونصتان سائلتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أونصات سائلة</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} أونصة س</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} أونصة سائلة</unitPattern>
+			</unit>
+			<unit type="volume-tablespoon">
+				<unitPattern count="zero" draft="contributed">{0} ملعقة ك.</unitPattern>
+				<unitPattern count="one" draft="contributed">ملعقة ك.</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ملعقتان ك.</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ملاعق ك.</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ملعقة ك.</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ملعقة ك.</unitPattern>
+			</unit>
+			<unit type="volume-teaspoon">
+				<unitPattern count="zero" draft="contributed">{0} ملعقة ص</unitPattern>
+				<unitPattern count="one" draft="contributed">ملعقة ص</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} ملعقتان ص</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} ملاعق ص</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} ملعقة ص</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} ملعقة ص</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="south" draft="contributed">{0} جنوب</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0} غرب</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+		<unitLength type="narrow">
+			<unit type="duration-year">
+				<unitPattern count="zero" draft="contributed">{0} سنة</unitPattern>
+				<unitPattern count="one" draft="contributed">سنة</unitPattern>
+				<unitPattern count="two" draft="contributed">سنتان</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} سنوات</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} سنة</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} سنة</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<unitPattern count="zero" draft="contributed">{0} شهر</unitPattern>
+				<unitPattern count="one" draft="contributed">شهر</unitPattern>
+				<unitPattern count="two" draft="contributed">شهران</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} أشهر</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} شهرًا</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} شهر</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<displayName draft="contributed">كغم</displayName>
+				<unitPattern count="zero" draft="contributed">{0} كغم</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} كغم</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} كغم</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} كغم</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} كغم</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} كغم</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<displayName draft="contributed">غم</displayName>
+				<unitPattern count="zero" draft="contributed">{0} غم</unitPattern>
+				<unitPattern count="one" draft="contributed">{0} غم</unitPattern>
+				<unitPattern count="two" draft="contributed">{0} غم</unitPattern>
+				<unitPattern count="few" draft="contributed">{0} غم</unitPattern>
+				<unitPattern count="many" draft="contributed">{0} غم</unitPattern>
+				<unitPattern count="other" draft="contributed">{0} غم</unitPattern>
+			</unit>
+			<coordinateUnit>
+				<coordinateUnitPattern type="south" draft="contributed">{0} جنوب</coordinateUnitPattern>
+				<coordinateUnitPattern type="west" draft="contributed">{0} غرب</coordinateUnitPattern>
+			</coordinateUnit>
+		</unitLength>
+	</units>
 </ldml>
--- a/make/data/cldr/common/main/ar_SD.xml
+++ b/make/data/cldr/common/main/ar_SD.xml
@ -7,19 +7,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14936 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="SD"/>
 	</identity>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
-		<symbols numberSystem="arab">
-			<decimal draft="contributed">٫</decimal>
-			<group draft="contributed">٬</group>
-		</symbols>
-		<symbols numberSystem="latn">
-			<decimal draft="contributed">.</decimal>
-			<group draft="contributed">,</group>
-		</symbols>
 	</numbers>
 </ldml>
--- a/make/data/cldr/common/main/ar_SO.xml
+++ b/make/data/cldr/common/main/ar_SO.xml
@ -7,12 +7,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="SO"/>
 	</identity>
 	<characters>
-		<exemplarCharacters type="numbers">[\u200E \- , . ٪ ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\u200E \- ‑ , . ٪ ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 	</characters>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
--- a/make/data/cldr/common/main/ar_SS.xml
+++ b/make/data/cldr/common/main/ar_SS.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="SS"/>
 	</identity>
--- a/make/data/cldr/common/main/ar_SY.xml
+++ b/make/data/cldr/common/main/ar_SY.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14936 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="SY"/>
 	</identity>
@ -109,13 +109,5 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
-		<symbols numberSystem="arab">
-			<decimal draft="contributed">٫</decimal>
-			<group draft="contributed">٬</group>
-		</symbols>
-		<symbols numberSystem="latn">
-			<decimal draft="contributed">.</decimal>
-			<group draft="contributed">,</group>
-		</symbols>
 	</numbers>
 </ldml>
--- a/make/data/cldr/common/main/ar_TD.xml
+++ b/make/data/cldr/common/main/ar_TD.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="TD"/>
 	</identity>
--- a/make/data/cldr/common/main/ar_TN.xml
+++ b/make/data/cldr/common/main/ar_TN.xml
@ -7,12 +7,12 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14786 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="TN"/>
 	</identity>
 	<characters>
-		<exemplarCharacters type="numbers">[\u200E \- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\u200E \- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 	</characters>
 	<dates>
 		<calendars>
@ -82,10 +82,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>latn</defaultNumberingSystem>
-		<symbols numberSystem="arab">
-			<decimal draft="contributed">٫</decimal>
-			<group draft="contributed">٬</group>
-		</symbols>
 		<symbols numberSystem="latn">
 			<decimal>,</decimal>
 			<group>.</group>
--- a/make/data/cldr/common/main/ar_YE.xml
+++ b/make/data/cldr/common/main/ar_YE.xml
@ -7,19 +7,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14936 $"/>
+		<version number="$Revision$"/>
 		<language type="ar"/>
 		<territory type="YE"/>
 	</identity>
 	<numbers>
 		<defaultNumberingSystem>arab</defaultNumberingSystem>
-		<symbols numberSystem="arab">
-			<decimal draft="contributed">٫</decimal>
-			<group draft="contributed">٬</group>
-		</symbols>
-		<symbols numberSystem="latn">
-			<decimal draft="contributed">.</decimal>
-			<group draft="contributed">,</group>
-		</symbols>
 	</numbers>
 </ldml>
--- a/make/data/cldr/common/main/as.xml
+++ b/make/data/cldr/common/main/as.xml
--- a/make/data/cldr/common/main/as_IN.xml
+++ b/make/data/cldr/common/main/as_IN.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="as"/>
 		<territory type="IN"/>
 	</identity>
--- a/make/data/cldr/common/main/asa.xml
+++ b/make/data/cldr/common/main/asa.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14782 $"/>
+		<version number="$Revision$"/>
 		<language type="asa"/>
 	</identity>
 	<localeDisplayNames>
@ -183,7 +183,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MD">Moldova</territory>
 			<territory type="MG">Bukini</territory>
 			<territory type="MH">Vithiwa vya Marshal</territory>
-			<territory type="MK">Mathedonia</territory>
 			<territory type="ML">Mali</territory>
 			<territory type="MM">Myama</territory>
 			<territory type="MN">Mongolia</territory>
--- a/make/data/cldr/common/main/asa_TZ.xml
+++ b/make/data/cldr/common/main/asa_TZ.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14782 $"/>
+		<version number="$Revision$"/>
 		<language type="asa"/>
 		<territory type="TZ"/>
 	</identity>
--- a/make/data/cldr/common/main/ast.xml
+++ b/make/data/cldr/common/main/ast.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14782 $"/>
+		<version number="$Revision$"/>
 		<language type="ast"/>
 	</identity>
 	<localeDisplayNames>
@ -472,7 +472,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="ro_MD">moldavu</language>
 			<language type="rof">rombo</language>
 			<language type="rom">romaní</language>
-			<language type="root">root</language>
 			<language type="rtm">rotumanu</language>
 			<language type="ru">rusu</language>
 			<language type="rue">rusyn</language>
@ -1002,8 +1001,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MF">Saint Martin</territory>
 			<territory type="MG">Madagascar</territory>
 			<territory type="MH">Islles Marshall</territory>
-			<territory type="MK">Macedonia</territory>
-			<territory type="MK" alt="variant">Macedonia (ARYDM)</territory>
 			<territory type="ML">Malí</territory>
 			<territory type="MM">Myanmar (Birmania)</territory>
 			<territory type="MN">Mongolia</territory>
@ -1135,68 +1132,45 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<variant type="BAKU1926">alfabetu turcu llatino unificáu</variant>
 			<variant type="BALANKA">dialectu balanka del anii</variant>
 			<variant type="BARLA">grupu dialectal barlavento del cabuverdianu</variant>
-			<variant type="BASICENG">BASICENG</variant>
-			<variant type="BAUDDHA">BAUDDHA</variant>
-			<variant type="BISCAYAN">BISCAYAN</variant>
 			<variant type="BISKE">dialectu San Giorgio/Bila</variant>
 			<variant type="BOHORIC">alfabetu bohorič</variant>
 			<variant type="BOONT">boontling</variant>
 			<variant type="COLB1945">convención ortográfica brasilanu-portuguesa de 1945</variant>
-			<variant type="CORNU">CORNU</variant>
 			<variant type="DAJNKO">alfabetu dajnko</variant>
 			<variant type="EKAVSK">serbiu con pronunciación ekaviana</variant>
 			<variant type="EMODENG">inglés modernu primitivu</variant>
 			<variant type="FONIPA">fonética IPA</variant>
 			<variant type="FONUPA">fonética UPA</variant>
-			<variant type="FONXSAMP">FONXSAMP</variant>
 			<variant type="HEPBURN">romanización de Hepburn</variant>
-			<variant type="HOGNORSK">HOGNORSK</variant>
 			<variant type="IJEKAVSK">serbiu con pronunciación Ijekaviana</variant>
-			<variant type="ITIHASA">ITIHASA</variant>
-			<variant type="JAUER">JAUER</variant>
-			<variant type="JYUTPING">JYUTPING</variant>
 			<variant type="KKCOR">ortografía común</variant>
-			<variant type="KOCIEWIE">KOCIEWIE</variant>
 			<variant type="KSCOR">ortografía estándar</variant>
-			<variant type="LAUKIKA">LAUKIKA</variant>
 			<variant type="LIPAW">el dialectu lipovaz del resianu</variant>
-			<variant type="LUNA1918">LUNA1918</variant>
 			<variant type="METELKO">alfabetu metelko</variant>
 			<variant type="MONOTON">monotónicu</variant>
 			<variant type="NDYUKA">dialectu ndyuka</variant>
 			<variant type="NEDIS">dialectu natisone</variant>
-			<variant type="NEWFOUND">NEWFOUND</variant>
 			<variant type="NJIVA">dialectu gniva/njiva</variant>
 			<variant type="NULIK">volapük modernu</variant>
 			<variant type="OSOJS">dialectu oseacco/osojane</variant>
 			<variant type="OXENDICT">ortografía del diccionariu d’inglés d’Oxford</variant>
 			<variant type="PAMAKA">dialectu pamaka</variant>
-			<variant type="PETR1708">PETR1708</variant>
 			<variant type="PINYIN">romanización pinyin</variant>
 			<variant type="POLYTON">politónicu</variant>
 			<variant type="POSIX">ordenador</variant>
-			<variant type="PUTER">PUTER</variant>
 			<variant type="REVISED">ortografía revisada</variant>
 			<variant type="RIGIK">volapük clásicu</variant>
 			<variant type="ROZAJ">resianu</variant>
-			<variant type="RUMGR">RUMGR</variant>
 			<variant type="SAAHO">saho</variant>
 			<variant type="SCOTLAND">inglés estándar escocés</variant>
 			<variant type="SCOUSE">scouse</variant>
-			<variant type="SIMPLE">SIMPLE</variant>
 			<variant type="SOLBA">dialectu stolvizza/solbica</variant>
 			<variant type="SOTAV">grupu dialectal sotavento del cabuverdianu</variant>
-			<variant type="SURMIRAN">SURMIRAN</variant>
-			<variant type="SURSILV">SURSILV</variant>
-			<variant type="SUTSILV">SUTSILV</variant>
 			<variant type="TARASK">ortografía taraskievica</variant>
 			<variant type="UCCOR">ortografía unificada</variant>
 			<variant type="UCRCOR">ortografía unificada revisada</variant>
-			<variant type="ULSTER">ULSTER</variant>
 			<variant type="UNIFON">alfabetu fonéticu Unifon</variant>
-			<variant type="VAIDIKA">VAIDIKA</variant>
 			<variant type="VALENCIA">valencianu</variant>
-			<variant type="VALLADER">VALLADER</variant>
 			<variant type="WADEGILE">romanización de Wade-Giles</variant>
 		</variants>
 		<keys>
@ -1346,8 +1320,8 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<exemplarCharacters>[a á b c d e é f g h ḥ i í l ḷ m n ñ o ó p q r s t u ú ü v x y z]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[ª à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī j k º ò ŏ ô ö ø ō œ ù ŭ û ū w ÿ]</exemplarCharacters>
 		<exemplarCharacters type="index">[A B C D E F G H I L M N Ñ O P Q R S T U V 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="numbers">[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- ‐ ‑ – — , ; \: ! ¡ ? ¿ . … ' ‘ ’ &quot; “ ” « » ( ) \[ \] § @ * / \\ \&amp; # † ‡ ′ ″]</exemplarCharacters>
 		<ellipsis type="final">{0}…</ellipsis>
 		<ellipsis type="initial">…{0}</ellipsis>
 		<ellipsis type="medial">{0}… {1}</ellipsis>
@ -9658,11 +9632,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} caballu de fuerza</unitPattern>
 				<unitPattern count="other">{0} caballos de fuerza</unitPattern>
 			</unit>
-			<unit type="pressure-hectopascal">
-				<displayName>hectopascales</displayName>
-				<unitPattern count="one">{0} hectopascal</unitPattern>
-				<unitPattern count="other">{0} hectopascales</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>milímetros de mercuriu</displayName>
 				<unitPattern count="one">{0} milímetru de mercuriu</unitPattern>
@ -9683,6 +9652,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} milibar</unitPattern>
 				<unitPattern count="other">{0} milibares</unitPattern>
 			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>hectopascales</displayName>
+				<unitPattern count="one">{0} hectopascal</unitPattern>
+				<unitPattern count="other">{0} hectopascales</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>quilómetros per hora</displayName>
 				<unitPattern count="one">{0} quilómetru per hora</unitPattern>
@ -10370,11 +10344,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} hp</unitPattern>
 				<unitPattern count="other">{0} hp</unitPattern>
 			</unit>
-			<unit type="pressure-hectopascal">
-				<displayName>hPa</displayName>
-				<unitPattern count="one">{0} hPa</unitPattern>
-				<unitPattern count="other">{0} hPa</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0} mm Hg</unitPattern>
@ -10395,6 +10364,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0} mbar</unitPattern>
 				<unitPattern count="other">{0} mbar</unitPattern>
 			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>hPa</displayName>
+				<unitPattern count="one">{0} hPa</unitPattern>
+				<unitPattern count="other">{0} hPa</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
 				<unitPattern count="one">{0} km/h</unitPattern>
@ -11077,11 +11051,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}hp</unitPattern>
 				<unitPattern count="other">{0}hp</unitPattern>
 			</unit>
-			<unit type="pressure-hectopascal">
-				<displayName>hPa</displayName>
-				<unitPattern count="one">{0}hPa</unitPattern>
-				<unitPattern count="other">{0}hPa</unitPattern>
-			</unit>
 			<unit type="pressure-millimeter-of-mercury">
 				<displayName>mm Hg</displayName>
 				<unitPattern count="one">{0}mm Hg</unitPattern>
@ -11102,6 +11071,11 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 				<unitPattern count="one">{0}mb</unitPattern>
 				<unitPattern count="other">{0}mb</unitPattern>
 			</unit>
+			<unit type="pressure-hectopascal">
+				<displayName>hPa</displayName>
+				<unitPattern count="one">{0}hPa</unitPattern>
+				<unitPattern count="other">{0}hPa</unitPattern>
+			</unit>
 			<unit type="speed-kilometer-per-hour">
 				<displayName>km/h</displayName>
 				<unitPattern count="one">{0}km/h</unitPattern>
--- a/make/data/cldr/common/main/ast_ES.xml
+++ b/make/data/cldr/common/main/ast_ES.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14782 $"/>
+		<version number="$Revision$"/>
 		<language type="ast"/>
 		<territory type="ES"/>
 	</identity>
--- a/make/data/cldr/common/main/az.xml
+++ b/make/data/cldr/common/main/az.xml
--- a/make/data/cldr/common/main/az_Cyrl.xml
+++ b/make/data/cldr/common/main/az_Cyrl.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14782 $"/>
+		<version number="$Revision$"/>
 		<language type="az"/>
 		<script type="Cyrl"/>
 	</identity>
@ -100,7 +100,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<language type="en_GB">Британија инҝилисҹәси</language>
 			<language type="en_GB" alt="short">инҝилис (Б.К.)</language>
 			<language type="en_US">Америка инҝилисҹәси</language>
-			<language type="en_US" alt="short">инҝилис (АБШ)</language>
 			<language type="eo">есперанто</language>
 			<language type="es">испан</language>
 			<language type="es_419">Латын Америкасы испанҹасы</language>
@ -591,7 +590,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MF">Сент Мартин</territory>
 			<territory type="MG">Мадагаскар</territory>
 			<territory type="MH">Маршал адалары</territory>
-			<territory type="MK" alt="variant">Македонија (КЈРМ)</territory>
 			<territory type="ML">Мали</territory>
 			<territory type="MM">Мјанма</territory>
 			<territory type="MN">Монголустан</territory>
@ -713,7 +711,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<exemplarCharacters>[а ә б в г ғ д е ж з и й ј к ҝ л м н о ө п р с т у ү ф х һ ч ҹ ш ы]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[ц щ ъ ь э ю я]</exemplarCharacters>
 		<exemplarCharacters type="index" draft="unconfirmed">[А Ә Б В Г Ғ Д Е Ж З И Й Ј К Ҝ Л М Н О Ө П Р С Т У Ү Ф Х Һ Ч Ҹ Ш Ы]</exemplarCharacters>
-		<exemplarCharacters type="numbers">[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 	</characters>
 	<delimiters>
 		<quotationStart>«</quotationStart>
--- a/make/data/cldr/common/main/az_Cyrl_AZ.xml
+++ b/make/data/cldr/common/main/az_Cyrl_AZ.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14782 $"/>
+		<version number="$Revision$"/>
 		<language type="az"/>
 		<script type="Cyrl"/>
 		<territory type="AZ"/>
--- a/make/data/cldr/common/main/az_Latn.xml
+++ b/make/data/cldr/common/main/az_Latn.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="az"/>
 		<script type="Latn"/>
 	</identity>
--- a/make/data/cldr/common/main/az_Latn_AZ.xml
+++ b/make/data/cldr/common/main/az_Latn_AZ.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="az"/>
 		<script type="Latn"/>
 		<territory type="AZ"/>
--- a/make/data/cldr/common/main/bas.xml
+++ b/make/data/cldr/common/main/bas.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14782 $"/>
+		<version number="$Revision$"/>
 		<language type="bas"/>
 	</identity>
 	<localeDisplayNames>
@ -181,7 +181,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MD">Moldavìà</territory>
 			<territory type="MG">Màdàgàskâr</territory>
 			<territory type="MH">Bìòn bi Marcàl</territory>
-			<territory type="MK">Màsèdonìà</territory>
 			<territory type="ML">Màli</territory>
 			<territory type="MM">Myànmâr</territory>
 			<territory type="MN">Mòŋgolìà</territory>
@ -286,7 +285,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 		<exemplarCharacters>[a á à â ǎ ā {a\u1DC6}{a\u1DC7} b ɓ c d e é è ê ě ē {e\u1DC6}{e\u1DC7} ɛ {ɛ\u0301} {ɛ\u0300} {ɛ\u0302} {ɛ\u030C} {ɛ\u0304} {ɛ\u1DC6}{ɛ\u1DC7} f g h i í ì î ǐ ī {i\u1DC6}{i\u1DC7} j k l m n ń ǹ ŋ o ó ò ô ǒ ō {o\u1DC6}{o\u1DC7} ɔ {ɔ\u0301} {ɔ\u0300} {ɔ\u0302} {ɔ\u030C} {ɔ\u0304} {ɔ\u1DC6}{ɔ\u1DC7} p r s t u ú ù û ǔ ū {u\u1DC6}{u\u1DC7} v w y z]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[q x]</exemplarCharacters>
 		<exemplarCharacters type="index">[A B Ɓ C D E Ɛ F G H I J K L M N Ŋ O Ɔ P R S T U V W Y Z]</exemplarCharacters>
-		<exemplarCharacters type="numbers">[  \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
+		<exemplarCharacters type="numbers">[  \- ‑ , % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters>
 	</characters>
 	<delimiters>
 		<quotationStart>«</quotationStart>
--- a/make/data/cldr/common/main/bas_CM.xml
+++ b/make/data/cldr/common/main/bas_CM.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14782 $"/>
+		<version number="$Revision$"/>
 		<language type="bas"/>
 		<territory type="CM"/>
 	</identity>
--- a/make/data/cldr/common/main/be.xml
+++ b/make/data/cldr/common/main/be.xml
--- a/make/data/cldr/common/main/be_BY.xml
+++ b/make/data/cldr/common/main/be_BY.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="be"/>
 		<territory type="BY"/>
 	</identity>
--- a/make/data/cldr/common/main/bem.xml
+++ b/make/data/cldr/common/main/bem.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14782 $"/>
+		<version number="$Revision$"/>
 		<language type="bem"/>
 	</identity>
 	<localeDisplayNames>
--- a/make/data/cldr/common/main/bem_ZM.xml
+++ b/make/data/cldr/common/main/bem_ZM.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14782 $"/>
+		<version number="$Revision$"/>
 		<language type="bem"/>
 		<territory type="ZM"/>
 	</identity>
--- a/make/data/cldr/common/main/bez.xml
+++ b/make/data/cldr/common/main/bez.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14782 $"/>
+		<version number="$Revision$"/>
 		<language type="bez"/>
 	</identity>
 	<localeDisplayNames>
@ -184,7 +184,6 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 			<territory type="MD">Humoldova</territory>
 			<territory type="MG">Hubukini</territory>
 			<territory type="MH">Ifisima fya Marshal</territory>
-			<territory type="MK">Humasedonia</territory>
 			<territory type="ML">Humali</territory>
 			<territory type="MM">Humyama</territory>
 			<territory type="MN">Humongolia</territory>
--- a/make/data/cldr/common/main/bez_TZ.xml
+++ b/make/data/cldr/common/main/bez_TZ.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14782 $"/>
+		<version number="$Revision$"/>
 		<language type="bez"/>
 		<territory type="TZ"/>
 	</identity>
--- a/make/data/cldr/common/main/bg.xml
+++ b/make/data/cldr/common/main/bg.xml
--- a/make/data/cldr/common/main/bg_BG.xml
+++ b/make/data/cldr/common/main/bg_BG.xml
@ -7,7 +7,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
 -->
 <ldml>
 	<identity>
-		<version number="$Revision: 14769 $"/>
+		<version number="$Revision$"/>
 		<language type="bg"/>
 		<territory type="BG"/>
 	</identity>
--- a/Show More
+++ b/Show More