updated JTreg exclude list

.gitattributes

@@ -1 +0,0 @@
-*	-text

.hgtags

@@ -623,21 +623,3 @@ c45f74d45787a857d35b5a66c9b0304c91a9c5d0 jdk-11.0.10+7
 43428f69099f6f87f6e1922deacbf13e1adb751f jdk-11.0.10+8
 8b3498547395ee80a6e731078056b2aeb3e3c5e8 jdk-11.0.10+9
 8b3498547395ee80a6e731078056b2aeb3e3c5e8 jdk-11.0.10-ga
-4ed322bf6b0098353ceaecf35662fadf457cd81d jdk-11.0.11+1
-b68647c6ecc1e73111d8047448d75966f255460f jdk-11.0.11+2
-14cc036b17a5f4be5b0643e6b24ed32563684ab9 jdk-11.0.11+3
-c4405735470a92e2c45490b89a8099252f3481d2 jdk-11.0.11+4
-38430a8a4488582612c6a87ab58d109cc5217e8b jdk-11.0.11+5
-e41ae00add1d76a8f25adb558933382947ea840d jdk-11.0.11+6
-14f9928caac31368d27f13e4e21ca25c1e0be950 jdk-11.0.11+7
-9f0347b029d3a0349f23befcfb68ee02d85d9034 jdk-11.0.11+8
-15862747ee15445292b4b9949b4f0f4badba4812 jdk-11.0.11+9
-15862747ee15445292b4b9949b4f0f4badba4812 jdk-11.0.11-ga
-5720ffa08f8514b9f0ea8b3a49e05a872c9c0efe jdk-11.0.12+1
-70a4031a8bef3e693f34864fdd482429c73dc76a jdk-11.0.12+2
-873a691b1ae4fa8b55ca5d08fa21aca3a4904fb8 jdk-11.0.12+3
-40d1e784e1937aaea696a9654cc2d944d3d78996 jdk-11.0.12+4
-6aa6f6860508fca3a97aea1de7a36574498d22bf jdk-11.0.12+5
-91e81ac088545abdc3eaaa707853d31a6cf99af3 jdk-11.0.12+6
-f412f2537f1502a9697a9684c77bea8d848db1ab jdk-11.0.12+7
-f412f2537f1502a9697a9684c77bea8d848db1ab jdk-11.0.12-ga

.idea/copyright/JetBrains.xml

@@ -1,7 +1,9 @@
 <component name="CopyrightManager">
   <copyright>
-    <option name="allowReplaceRegexp" value="JetBrains" />
-    <option name="notice" value="Copyright 2000-&amp;#36;today.year JetBrains s.r.o.&#10;DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.&#10; &#10;This code is free software; you can redistribute it and/or modify it&#10;under the terms of the GNU General Public License version 2 only, as&#10;published by the Free Software Foundation.&#10;&#10;This code is distributed in the hope that it will be useful, but WITHOUT&#10;ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or&#10;FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License&#10;version 2 for more details (a copy is included in the LICENSE file that&#10;accompanied this code).&#10;&#10;You should have received a copy of the GNU General Public License version&#10;2 along with this work; if not, write to the Free Software Foundation,&#10;Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.&#10;&#10;Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA&#10;or visit www.oracle.com if you need additional information or have any&#10;questions." />
+    <option name="notice" value="Copyright 2000-&amp;#36;today.year JetBrains s.r.o.&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+    <option name="keyword" value="Copyright" />
+    <option name="allowReplaceKeyword" value="JetBrains" />
     <option name="myName" value="JetBrains" />
+    <option name="myLocal" value="true" />
   </copyright>
 </component>

README.md

@@ -1,171 +1,91 @@
 [![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
 
-# Welcome to JetBrains Runtime!
+# Downloads
 
-JetBrains Runtime is a fork of [OpenJDK](https://github.com/openjdk/jdk) available for Windows, Mac OS X, and Linux.
-It includes a number enhancements in font rendering, HiDPI support, ligatures, performance improvements, and bugfixes.
+|Windows-x64  |macOS        |Linux-x64    |
+|-------------|-------------|-------------|
+|[ ![Download](https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk11-windows-x64/images/download.svg) ](https://bintray.com/jetbrains/intellij-jdk/openjdk11-windows-x64/_latestVersion)|[ ![Download](https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk11-osx-x64/images/download.svg) ](https://bintray.com/jetbrains/intellij-jdk/openjdk11-osx-x64/_latestVersion)|[ ![Download](https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk11-linux-x64/images/download.svg) ](https://bintray.com/jetbrains/intellij-jdk/openjdk11-linux-x64/_latestVersion)|
 
-## Releases
-Download the latest releases of JetBrains Runtime to use with JetBrains IDEs. The full list
-can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntime/releases).
 
-| IDE Version | Latest JBR | Date Released |
-|  ---        | ---        | ---           |
-| 2021.3      | [11_0_12-b1751.11](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr11_0_12b1751.11) | 21-Oct-2021 |
-| 2021.2      | [11_0_12-b1504.40](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jb11_0_12-b1504.40) | 28-Sep-2021 |
-| 2021.1      | [11.0.11+9-b1341.60](https://confluence.jetbrains.com/pages/viewpage.action?pageId=218857477) | 15-Jun-2021 |
-| 2020.3      | [11_0_11-b1145.115](https://confluence.jetbrains.com/pages/viewpage.action?pageId=219349001) | 21-Jun-2021 |
+# How JetBrains Runtime is organised
+## Workspaces
 
-## Contents
-- [Welcome to JetBrains Runtime](#jetbrains-runtime)
-  - [Products Built on JetBrains Runtime](#products-built-on-jetbrains-runtime)
-  - [Getting Sources](#getting-sources)
-    - [macOS, Linux](#macos-linux)
-    - [Windows](#sources-windows)
-  - [Configuring the Build Environment](#configuring-the-build-environment)
-    - [Linux (Docker)](#linux-docker)
-    - [Ubuntu Linux](#ubuntu-linux)
-    - [Windows](#build-windows)
-    - [macOS](#macos)
-  - [Developing](#developing)
-  - [Contributing](#contributing)
-  - [Resources](#resources)
+[github.com/JetBrains/JetBrainsRuntime](https://github.com/JetBrains/JetBrainsRuntime)  
 
-## Products Built on JetBrains Runtime
-* [Android Studio](https://developer.android.com/studio). The official IDE for Google's Android operating system.
-* [CLion](https://www.jetbrains.com/clion/). A cross-platform IDE for C and C++ from JetBrains.
-* [DataGrip](https://www.jetbrains.com/datagrip/). The IDE for Databases and SQL from JetBrains.
-* [GoLand](https://www.jetbrains.com/go/). The cross-platform Go IDE from JetBrains.
-* [IntelliJ IDEA](https://www.jetbrains.com/idea/). The IDE for JVM from JetBrains.
-* [JProfiler](https://www.ej-technologies.com/products/jprofiler/overview.html). The Java profiler.
-* [PhpStorm](https://www.jetbrains.com/phpstorm/). The PHP IDE from JetBrains.
-* [PyCharm](https://www.jetbrains.com/pycharm/). The Python IDE from JetBrains.
-* [Rider](https://www.jetbrains.com/rider/). The cross-platform .NET IDE from JetBrains.
-* [RubyMine](https://www.jetbrains.com/ruby/). The Ruby and Rails IDE from JetBrains.
-* [WebStorm](https://www.jetbrains.com/webstorm/). The JavaScript IDE from JetBrains.
-* [YourKit](https://www.yourkit.com/). Java and .NET profilers.
-
-## Getting Sources
-### macOS, Linux
+## Getting sources
+__macOS, Linux:__
 ```
 git config --global core.autocrlf input
 git clone git@github.com:JetBrains/JetBrainsRuntime.git
 ```
 
-### Windows
-<a name="sources-windows"></a>
+__Windows:__
 ```
 git config --global core.autocrlf false
 git clone git@github.com:JetBrains/JetBrainsRuntime.git
 ```
 
-## Configuring the Build Environment
-Here are quick per-platform instructions for those who can't wait to get started. 
-Please refer to [OpenJDK build docs](http://hg.openjdk.java.net/jdk/jdk11/raw-file/tip/doc/building.html) for in-depth
-coverage of all the details.
+# Configure local build environment
+[OpenJDK build docs](http://hg.openjdk.java.net/jdk/jdk11/raw-file/tip/doc/building.html)  
+Tip for all platforms: run `./configure` and check output.  
+Usually, it has meaningful advice how to solve your problem.
 
-> **_TIP:_**  To get a preliminary report of what's missing, run `./configure` and check its output. 
-> It would usually have a meaningful advice on how to solve the problem.
-
-### Linux (Docker)
-Create a container:
+## Linux (Docker)
 ```
 $ cd jb/project/docker
 $ docker build .
 ...
 Successfully built 942ea9900054
-```
-Run these commands in the new container:
-```
+
 $ docker run -v `pwd`../../../../:/JetBrainsRuntime -it 942ea9900054
+
 # cd /JetBrainsRuntime
 # sh ./configure
 # make images CONF=linux-x86_64-normal-server-release
 ```
 
-### Ubuntu Linux
-Install the necessary tools, libraries, and headers with:
-```
-$ sudo apt-get install autoconf make build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev \
-       libxt-dev libxrandr-dev libcups2-dev libfontconfig1-dev libasound2-dev \
-       openjdk-11-jdk
-```
-Then run the following:
+## Linux (Ubuntu 18.10 desktop)
 ```
+$ sudo apt-get install autoconf make build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev libxrandr-dev libcups2-dev libfontconfig1-dev libasound2-dev 
+
 $ cd JetBrainsRuntime
 $ sh ./configure --disable-warnings-as-errors
 $ make images
 ```
 
-### Windows
-<a name="build-windows"></a>
-Install the following:
-* [Cygwin x64](http://www.cygwin.com/).
-  Required packages: `autoconf`, `binutils`, `cpio`, `diffutils`, `file`, `gawk`, `gcc-core`, `make`, `m4`, `unzip`, `zip`.  
-  Install those together with Cygwin.
-* [Visual Studio compiler toolset](https://visualstudio.microsoft.com/downloads/).
-  Install with the desktop development kit, which includes Windows SDK and compilers.
-  Visual Studio 2015 is supported by default.
-* [Java 11](https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html). 
-  If you have problems while configuring, read [Java tips on Cygwin](http://horstmann.com/articles/cygwin-tips.html).
+## Windows
+Install:
+* [Cygwin x64](http://www.cygwin.com/)  
+  Required packages: autoconf, binutils, cpio, diffutils, file, gawk, gcc-core, make, m4, unzip, zip.  
+  **Install them while installing Cygwin**.
+* Visual Studio compiler toolset [Download](https://visualstudio.microsoft.com/downloads/)  
+  Visual Studio 2015 has support by default.  
+  **Install with desktop development kit, it includes Windows SDK and compilers**.
+* [Java 11](http://www.oracle.com/technetwork/java/javase/downloads/index.html)  
+  If you have problems while configuring [read Java tips on Cygwin](http://horstmann.com/articles/cygwin-tips.html)
 
-From the command line: 
+From command line: 
 ```
-"c:\Program Files (x86)\Microsoft Visual Studio 15.0\VC\vcvarsall.bat" amd64
-c:\cygwin64\bin\mintty.exe /usr/bin/bash -l
+"c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+"c:\Program_Files\cygwin64\bin\mintty.exe" /bin/bash -l
 ```
-The first command sets up environment variables, the second starts a Cygwin shell with the proper environment.  
+First command will set env vars, the second will run Cygwin shell with proper environment.  
 
-In the Cygwin shell: 
-```
-$ cd JetBrainsRuntime
-$ bash configure --enable-option-checking=fatal --with-toolchain-version=2015 \
-                 --with-boot-jdk="/cygdrive/c/Program Files/Java/jdk-11.0.5" --disable-warnings-as-errors
-$ make images
+In Cygwin shell: 
+```    
+cd JetBrainsRuntime
+bash configure --enable-option-checking=fatal --with-toolchain-version=2015 --with-boot-jdk="/cygdrive/c/Program Files/Java/jdk-11.0.5" --disable-warnings-as-errors
+make images
 ```
 
-### macOS
-Install the following:
-* Xcode command line developer tools and `autoconf` via [Homebrew](getDpiInfo).
-* [Java 11](https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html).
+## macOS
+Install Xcode command line developer tools, autoconf (via Homebrew).
 
-From the command line:
+Run:
 ```
-$ cd JetBrainsRuntime
-$ sh ./configure --prefix=$(pwd)/build  --disable-warnings-as-errors
-$ make images
+sh ./configure --prefix=$(pwd)/build  --disable-warnings-as-errors
+make images
 ```
 
-## Developing
-You can use  [CLion](https://www.jetbrains.com/clion/) to develop native parts of the JetBrains Runtime and
-[IntelliJ IDEA](https://www.jetbrains.com/idea/) for the parts written in Java.
-Both require projects to be created.
-
-### CLion
-Run
-```
-$ make compile-commands
-```
-in the git root and open the resulting `build/.../compile_commands.json` file as a project.
-Then use `Tools | Compilation Database | Change Project Root` to point to git root of this repository.
-
-See also this detailed step-by-step tutorial for all platforms:
-[How to develop OpenJDK with CLion](https://blog.jetbrains.com/clion/2020/03/openjdk-with-clion/).
-
-### IDEA
-Run
-```
-$ sh ./bin/idea.sh
-```
-in the git root to generate project files (add `--help` for options). Then open the git root directory
-as a project in IDEA.
-
-## Contributing
-We are happy to receive your pull requests! 
-Before you submit one, please sign our [Contributor License Agreement (CLA)](https://www.jetbrains.com/agreements/cla/).
-
-## Resources
-* [JetBrains Runtime on github](https://github.com/JetBrains/JetBrainsRuntime).
-* [OpenJDK build instructions](http://hg.openjdk.java.net/jdk/jdk11/raw-file/tip/doc/building.html).
-* [OpenJDK test instructions](http://hg.openjdk.java.net/jdk/jdk11/raw-file/tip/doc/building.html#running-tests).
-* [How to develop OpenJDK with CLion](https://blog.jetbrains.com/clion/2020/03/openjdk-with-clion/).
+## Contribution
+We will be happy to receive your pull requests. Before you submit one, please sign our Contributor License Agreement (CLA)  https://www.jetbrains.com/agreements/cla/ 

jb/project/docker/Dockerfile

@@ -4,9 +4,9 @@ RUN yum -y install centos-release-scl
 RUN yum -y install devtoolset-8
 RUN yum -y install zip bzip2 unzip tar wget make autoconf automake libtool alsa-devel cups-devel xorg-x11-devel libjpeg62-devel giflib-devel freetype-devel file which libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel libXrandr-devel libXi-devel git
 # Install Java 11
-RUN wget https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-linux_x64.tar.gz \
+RUN wget https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_3-linux-x64-b360.2.tar.gz \
 -O - | tar xz -C /
-ENV JAVA_HOME /zulu11.45.27-ca-jdk11.0.10-linux_x64
+ENV JAVA_HOME /jbrsdk
 ENV PATH $JAVA_HOME/bin:/opt/rh/devtoolset-8/root/usr/bin:$PATH
 RUN git config --global user.email "teamcity@buildserver.intellij.net"
 RUN git config --global user.name "builduser"

jb/project/tools/common/scripts/build-jbr-api.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# $1 - Boot JDK
-# $2 - JBR part of API version
-
-cd "`dirname "$0"`/../../../../.."
-PWD="`pwd`"
-CONF="$PWD/build/jbr-api.conf"
-./configure --with-debug-level=release --with-boot-jdk=$1 || exit $?
-make jbr-api CONF=release MAKEOVERRIDES= "JBR_API_CONF_FILE=$CONF" JBR_API_JBR_VERSION=$2 || exit $?
-. $CONF || exit $?
-echo "##teamcity[buildNumber '$VERSION']"
-cp "$JAR" ./jbr-api-${VERSION}.jar || exit $?
-cp "$SOURCES_JAR" ./jbr-api-${VERSION}-sources.jar || exit $?
-echo "##teamcity[publishArtifacts '$PWD/jbr-api-${VERSION}.jar']"
-echo "##teamcity[publishArtifacts '$PWD/jbr-api-${VERSION}-sources.jar']"

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

@@ -16,16 +16,6 @@
 # OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
 #
 
-while getopts ":i?" o; do
-    case "${o}" in
-        i)
-            i="incremental build"
-            INC_BUILD=1
-            ;;
-    esac
-done
-shift $((OPTIND-1))
-
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
@@ -34,27 +24,21 @@ JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
 
 source jb/project/tools/common.sh
 
-function do_configure {
-  sh configure \
-    --disable-warnings-as-errors \
-    --with-debug-level=release \
-    --with-vendor-name="${VENDOR_NAME}" \
-    --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build=${JDK_BUILD_NUMBER} \
-    --with-version-opt=b${build_number} \
-    --with-import-modules=./modular-sdk \
-    --with-boot-jdk=amazon-corretto-11.0.5.10.1-linux-aarch64 \
-    --enable-cds=yes || exit $?
-}
-
 JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
 
-if [ -z "$INC_BUILD" ]; then
-  do_configure || do_exit $?
-  make clean CONF=linux-aarch64-normal-server-release || exit $?
-fi
+sh configure \
+  --disable-warnings-as-errors \
+  --with-debug-level=release \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
+  --with-jvm-features=shenandoahgc \
+  --with-version-pre= \
+  --with-version-build=${JDK_BUILD_NUMBER} \
+  --with-version-opt=b${build_number} \
+  --with-import-modules=./modular-sdk \
+  --with-boot-jdk=amazon-corretto-11.0.5.10.1-linux-aarch64 \
+  --enable-cds=yes || exit $?
+make clean CONF=linux-aarch64-normal-server-release || exit $?
 make images CONF=linux-aarch64-normal-server-release test-image || exit $?
 
 JBSDK=${JBRSDK_BASE_NAME}-linux-aarch64-b${build_number}

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

@@ -24,16 +24,6 @@
 #   JCEF_PATH - specifies the path to the directory with JCEF binaries.
 #               By default JCEF binaries should be located in ./jcef_linux_x64
 
-while getopts ":i?" o; do
-    case "${o}" in
-        i)
-            i="incremental build"
-            INC_BUILD=1
-            ;;
-    esac
-done
-shift $((OPTIND-1))
-
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
@@ -44,20 +34,6 @@ JCEF_PATH=${JCEF_PATH:=./jcef_linux_x64}
 
 source jb/project/tools/common.sh
 
-function do_configure {
-  sh configure \
-    --disable-warnings-as-errors \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="${VENDOR_NAME}" \
-    --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build=${JDK_BUILD_NUMBER} \
-    --with-version-opt=b${build_number} \
-    $WITH_IMPORT_MODULES \
-    --enable-cds=yes || do_exit $?
-}
-
 function create_jbr {
 
   JBR_BUNDLE=jbr_${bundle_type}
@@ -125,11 +101,19 @@ case "$bundle_type" in
     ;;
 esac
 
-if [ -z "$INC_BUILD" ]; then
-  do_configure || do_exit $?
-  make clean CONF=$RELEASE_NAME || do_exit $?
-fi
-make images CONF=$RELEASE_NAME || do_exit $?
+sh configure \
+  --disable-warnings-as-errors \
+  $WITH_DEBUG_LEVEL \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
+  --with-jvm-features=shenandoahgc \
+  --with-version-pre= \
+  --with-version-build=${JDK_BUILD_NUMBER} \
+  --with-version-opt=b${build_number} \
+  $WITH_IMPORT_MODULES \
+  --enable-cds=yes || do_exit $?
+
+make clean images CONF=$RELEASE_NAME || do_exit $?
 
 JSDK=build/${RELEASE_NAME}/images/jdk
 

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

@@ -24,16 +24,6 @@
 #   JCEF_PATH - specifies the path to the directory with JCEF binaries.
 #               By default JCEF binaries should be located in ./jcef_mac
 
-while getopts ":i?" o; do
-    case "${o}" in
-        i)
-            i="incremental build"
-            INC_BUILD=1
-            ;;
-    esac
-done
-shift $((OPTIND-1))
-
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
@@ -52,47 +42,6 @@ function copyJNF {
     mkdir -p ${__contents_dir}/Frameworks
     cp -Rp Frameworks/JavaNativeFoundation.framework ${__contents_dir}/Frameworks
 }
-
-function do_configure {
-  if [[ "${architecture}" == *aarch64* ]]; then
-    # NOTE: aot, cds aren't supported yet
-    WITH_JVM_FEATURES="--with-jvm-features=-aot"
-    if [[ "${enable_aot}" == *enable_aot* ]]; then
-      echo "Enable unstable jvm feature: AOT"
-      WITH_JVM_FEATURES=""
-    fi
-    sh configure \
-    --disable-warnings-as-errors \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="${VENDOR_NAME}" \
-    --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build=${JDK_BUILD_NUMBER} \
-    --with-version-opt=b${build_number} \
-    $WITH_IMPORT_MODULES \
-    --with-boot-jdk=`/usr/libexec/java_home -v 11` \
-    --disable-hotspot-gtest --disable-javac-server --disable-full-docs --disable-manpages \
-    --enable-cds=no \
-    $WITH_JVM_FEATURES \
-    --with-extra-cflags="-F$(pwd)/Frameworks" \
-    --with-extra-cxxflags="-F$(pwd)/Frameworks" \
-    --with-extra-ldflags="-F$(pwd)/Frameworks" || do_exit $?
-  else
-    sh configure \
-      --disable-warnings-as-errors \
-      $WITH_DEBUG_LEVEL \
-      --with-vendor-name="${VENDOR_NAME}" \
-      --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-      --with-version-pre= \
-      --with-version-build=${JDK_BUILD_NUMBER} \
-      --with-version-opt=b${build_number} \
-      $WITH_IMPORT_MODULES \
-      --with-boot-jdk=`/usr/libexec/java_home -v 11` \
-      --enable-cds=yes || do_exit $?
-  fi
-}
-
 function create_jbr {
 
   JBR_BUNDLE=jbr_${bundle_type}
@@ -187,10 +136,45 @@ case "$bundle_type" in
     ;;
 esac
 
-if [ -z "$INC_BUILD" ]; then
-  do_configure || do_exit $?
-  make clean CONF=$RELEASE_NAME || do_exit $?
+if [[ "${architecture}" == *aarch64* ]]; then
+  # NOTE: aot, cds aren't supported yet
+  WITH_JVM_FEATURES="--with-jvm-features=-aot"
+  if [[ "${enable_aot}" == *enable_aot* ]]; then
+    echo "Enable unstable jvm feature: AOT"
+    WITH_JVM_FEATURES=""
+  fi
+  sh configure \
+  --disable-warnings-as-errors \
+  $WITH_DEBUG_LEVEL \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
+  --with-jvm-features=shenandoahgc \
+  --with-version-pre= \
+  --with-version-build=${JDK_BUILD_NUMBER} \
+  --with-version-opt=b${build_number} \
+  $WITH_IMPORT_MODULES \
+  --with-boot-jdk=`/usr/libexec/java_home -v 11` \
+  --disable-hotspot-gtest --disable-javac-server --disable-full-docs --disable-manpages \
+  --enable-cds=no \
+  $WITH_JVM_FEATURES \
+  --with-extra-cflags="-F$(pwd)/Frameworks" \
+  --with-extra-cxxflags="-F$(pwd)/Frameworks" \
+  --with-extra-ldflags="-F$(pwd)/Frameworks" || do_exit $?
+else
+  sh configure \
+    --disable-warnings-as-errors \
+    $WITH_DEBUG_LEVEL \
+    --with-vendor-name="${VENDOR_NAME}" \
+    --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
+    --with-version-pre= \
+    --with-version-build=${JDK_BUILD_NUMBER} \
+    --with-version-opt=b${build_number} \
+    $WITH_IMPORT_MODULES \
+    --with-boot-jdk=`/usr/libexec/java_home -v 11` \
+    --enable-cds=yes || do_exit $?
 fi
+
+make clean CONF=$CONF_NAME || do_exit $?
 make images CONF=$CONF_NAME || do_exit $?
 
 JSDK=build/${CONF_NAME}/images/jdk-bundle

jb/project/tools/patches/add_jcef_module_winaarch64.patch

@@ -1,27 +0,0 @@
-diff --git modules.list modules.list
-index 33375b527c4..76539cbc0e0 100644
---- modules.list
-+++ modules.list
-@@ -55,4 +55,5 @@ jdk.unsupported,
- jdk.xml.dom,
- jdk.zipfs,
- jdk.hotspot.agent,
--jdk.jcmd
-+jdk.jcmd,
-+jcef
-diff --git src/java.desktop/share/classes/module-info.java src/java.desktop/share/classes/module-info.java
-index b663b382f52..3e9acdc0c27 100644
---- src/java.desktop/share/classes/module-info.java
-+++ src/java.desktop/share/classes/module-info.java
-@@ -109,7 +109,10 @@ module java.desktop {
-     // see make/GensrcModuleInfo.gmk
-     exports sun.awt to
-         jdk.accessibility,
--        jdk.unsupported.desktop;
-+        jdk.unsupported.desktop,
-+        jcef;
-+
-+    exports java.awt.peer to jcef;
- 
-     exports java.awt.dnd.peer to jdk.unsupported.desktop;
-     exports sun.awt.dnd to jdk.unsupported.desktop;

jb/project/tools/patches/dcevm/0001-Apply-basic-dcevm11-patch.patch

@@ -1,7 +1,7 @@
-From d00ac9fa0f9a90fe52d93a5cab88d17638a0fb01 Mon Sep 17 00:00:00 2001
+From d75ca6d0d1799ffde4199f6ef5047699b98d3ff2 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Wed, 14 Nov 2018 21:09:39 +0100
-Subject: [PATCH 01/31] Apply basic dcevm11 patch
+Subject: [PATCH 01/18] Apply basic dcevm11 patch
 
 ---
  src/hotspot/share/ci/ciObjectFactory.cpp      |   25 +
@@ -126,7 +126,7 @@ index 1063c9853e1..3e9d48c4cdc 100644
  
  #endif // SHARE_VM_CI_CIOBJECTFACTORY_HPP
 diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
-index 154dab55e43..0c6c3a86965 100644
+index 6d65cca2101..e2b8c5793d0 100644
 --- a/src/hotspot/share/classfile/classFileParser.cpp
 +++ b/src/hotspot/share/classfile/classFileParser.cpp
 @@ -954,6 +954,8 @@ void ClassFileParser::parse_interfaces(const ClassFileStream* const stream,
@@ -236,10 +236,10 @@ index 3bdfd34e39f..d792ab4bb3f 100644
    ReferenceType reference_type() const { return _rt; }
    AccessFlags access_flags() const { return _access_flags; }
 diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp
-index e10d32ea7b7..079558bb244 100644
+index 78eb096458a..368c59e2cbf 100644
 --- a/src/hotspot/share/classfile/classLoader.cpp
 +++ b/src/hotspot/share/classfile/classLoader.cpp
-@@ -1502,6 +1502,7 @@ InstanceKlass* ClassLoader::load_class(Symbol* name, bool search_append_only, TR
+@@ -1505,6 +1505,7 @@ InstanceKlass* ClassLoader::load_class(Symbol* name, bool search_append_only, TR
                                                             protection_domain,
                                                             NULL, // host_klass
                                                             NULL, // cp_patches
@@ -248,10 +248,10 @@ index e10d32ea7b7..079558bb244 100644
    if (HAS_PENDING_EXCEPTION) {
      if (DumpSharedSpaces) {
 diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index 5d9ac0009aa..e2754d5f5be 100644
+index c58026ae192..25103fff2c0 100644
 --- a/src/hotspot/share/classfile/classLoaderData.cpp
 +++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -1245,6 +1245,12 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*)) {
+@@ -1242,6 +1242,12 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*)) {
    }
  }
  
@@ -264,7 +264,7 @@ index 5d9ac0009aa..e2754d5f5be 100644
  // Only walks the classes defined in this class loader.
  void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*, TRAPS), TRAPS) {
    Thread* thread = Thread::current();
-@@ -1254,6 +1260,12 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*, TRAPS),
+@@ -1251,6 +1257,12 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*, TRAPS),
    }
  }
  
@@ -277,7 +277,7 @@ index 5d9ac0009aa..e2754d5f5be 100644
  // Walks all entries in the dictionary including entries initiated by this class loader.
  void ClassLoaderDataGraph::dictionary_all_entries_do(void f(InstanceKlass*, ClassLoaderData*)) {
    Thread* thread = Thread::current();
-@@ -1375,11 +1387,15 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
+@@ -1372,11 +1384,15 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
    // Mark metadata seen on the stack only so we can delete unneeded entries.
    // Only walk all metadata, including the expensive code cache walk, for Full GC
    // and only if class redefinition and if there's previous versions of
@@ -294,7 +294,7 @@ index 5d9ac0009aa..e2754d5f5be 100644
  
    // Save previous _unloading pointer for CMS which may add to unloading list before
    // purging and we don't want to rewalk the previously unloaded class loader data.
-@@ -1389,10 +1405,12 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
+@@ -1386,10 +1402,12 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
    while (data != NULL) {
      if (data->is_alive()) {
        // clean metaspace
@@ -336,7 +336,7 @@ index f5157e07c76..e9e52f00e8a 100644
  
    if (HAS_PENDING_EXCEPTION) {
 diff --git a/src/hotspot/share/classfile/dictionary.cpp b/src/hotspot/share/classfile/dictionary.cpp
-index b949bac8de6..5bd048d8627 100644
+index 3ac1ca69ae5..118730f1b83 100644
 --- a/src/hotspot/share/classfile/dictionary.cpp
 +++ b/src/hotspot/share/classfile/dictionary.cpp
 @@ -245,6 +245,19 @@ void Dictionary::classes_do(void f(InstanceKlass*)) {
@@ -449,10 +449,10 @@ index d26f1f11fb4..fd4b134d7a7 100644
  
  // An entry in the class loader data dictionaries, this describes a class as
 diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
-index 559d90339be..b86f8320d70 100644
+index fc4efecc6e7..903979c9ef2 100644
 --- a/src/hotspot/share/classfile/javaClasses.cpp
 +++ b/src/hotspot/share/classfile/javaClasses.cpp
-@@ -2428,6 +2428,8 @@ void java_lang_Throwable::fill_in_stack_trace(Handle throwable, const methodHand
+@@ -2446,6 +2446,8 @@ void java_lang_Throwable::fill_in_stack_trace(Handle throwable, const methodHand
          skip_throwableInit_check = true;
        }
      }
@@ -461,7 +461,7 @@ index 559d90339be..b86f8320d70 100644
      if (method->is_hidden()) {
        if (skip_hidden)  continue;
      }
-@@ -3610,6 +3612,62 @@ void java_lang_invoke_DirectMethodHandle::serialize_offsets(SerializeClosure* f)
+@@ -3628,6 +3630,62 @@ void java_lang_invoke_DirectMethodHandle::serialize_offsets(SerializeClosure* f)
  }
  #endif
  
@@ -524,7 +524,7 @@ index 559d90339be..b86f8320d70 100644
  // Support for java_lang_invoke_MethodHandle
  
  int java_lang_invoke_MethodHandle::_type_offset;
-@@ -3796,6 +3854,11 @@ void java_lang_invoke_ResolvedMethodName::set_vmtarget(oop resolved_method, Meth
+@@ -3814,6 +3872,11 @@ void java_lang_invoke_ResolvedMethodName::set_vmtarget(oop resolved_method, Meth
    resolved_method->address_field_put(_vmtarget_offset, (address)m);
  }
  
@@ -537,7 +537,7 @@ index 559d90339be..b86f8320d70 100644
    // lookup ResolvedMethod oop in the table, or create a new one and intern it
    oop resolved_method = ResolvedMethodTable::find_method(m());
 diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
-index 97df4a0bdea..2e121e19f19 100644
+index bd9cdca3fe3..da004d1b307 100644
 --- a/src/hotspot/share/classfile/javaClasses.hpp
 +++ b/src/hotspot/share/classfile/javaClasses.hpp
 @@ -67,6 +67,8 @@
@@ -561,7 +561,7 @@ index 97df4a0bdea..2e121e19f19 100644
    static void allocate_fixup_lists();
    static void compute_offsets();
  
-@@ -1048,6 +1050,55 @@ class java_lang_invoke_DirectMethodHandle: AllStatic {
+@@ -1055,6 +1057,55 @@ class java_lang_invoke_DirectMethodHandle: AllStatic {
    static int member_offset_in_bytes()           { return _member_offset; }
  };
  
@@ -617,7 +617,7 @@ index 97df4a0bdea..2e121e19f19 100644
  // Interface to java.lang.invoke.LambdaForm objects
  // (These are a private interface for managing adapter code generation.)
  
-@@ -1099,6 +1150,7 @@ class java_lang_invoke_ResolvedMethodName : AllStatic {
+@@ -1106,6 +1157,7 @@ class java_lang_invoke_ResolvedMethodName : AllStatic {
  
    static Method* vmtarget(oop resolved_method);
    static void set_vmtarget(oop resolved_method, Method* method);
@@ -732,7 +732,7 @@ index 8a7a1248e62..611e18aaf85 100644
    bool add_entry(Symbol* name, InstanceKlass* klass1, Handle loader1,
                                      InstanceKlass* klass2, Handle loader2);
 diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index 4509025cf70..1ab9b99b435 100644
+index bfd67334f82..5a745b6fca6 100644
 --- a/src/hotspot/share/classfile/systemDictionary.cpp
 +++ b/src/hotspot/share/classfile/systemDictionary.cpp
 @@ -201,6 +201,7 @@ Klass* SystemDictionary::resolve_or_fail(Symbol* class_name, Handle class_loader
@@ -824,7 +824,7 @@ index 4509025cf70..1ab9b99b435 100644
    } );
  
    return k;
-@@ -1555,11 +1568,12 @@ static void post_class_define_event(InstanceKlass* k, const ClassLoaderData* def
+@@ -1553,11 +1566,12 @@ static void post_class_define_event(InstanceKlass* k, const ClassLoaderData* def
    }
  }
  
@@ -838,7 +838,7 @@ index 4509025cf70..1ab9b99b435 100644
  
   // for bootstrap and other parallel classloaders don't acquire lock,
   // use placeholder token
-@@ -1584,7 +1598,11 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, TRAPS) {
+@@ -1582,7 +1596,11 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, TRAPS) {
    Symbol*  name_h = k->name();
    Dictionary* dictionary = loader_data->dictionary();
    unsigned int d_hash = dictionary->compute_hash(name_h);
@@ -851,7 +851,7 @@ index 4509025cf70..1ab9b99b435 100644
  
    // Register class just loaded with class loader (placed in Vector)
    // Note we do this before updating the dictionary, as this can
-@@ -1618,7 +1636,7 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, TRAPS) {
+@@ -1616,7 +1634,7 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, TRAPS) {
    k->eager_initialize(THREAD);
  
    // notify jvmti
@@ -860,7 +860,7 @@ index 4509025cf70..1ab9b99b435 100644
        assert(THREAD->is_Java_thread(), "thread->is_Java_thread()");
        JvmtiExport::post_class_load((JavaThread *) THREAD, k);
  
-@@ -1696,7 +1714,7 @@ InstanceKlass* SystemDictionary::find_or_define_instance_class(Symbol* class_nam
+@@ -1694,7 +1712,7 @@ InstanceKlass* SystemDictionary::find_or_define_instance_class(Symbol* class_nam
      }
    }
  
@@ -869,7 +869,7 @@ index 4509025cf70..1ab9b99b435 100644
  
    Handle linkage_exception = Handle(); // null handle
  
-@@ -1819,6 +1837,18 @@ void SystemDictionary::add_to_hierarchy(InstanceKlass* k, TRAPS) {
+@@ -1817,6 +1835,18 @@ void SystemDictionary::add_to_hierarchy(InstanceKlass* k, TRAPS) {
    CodeCache::flush_dependents_on(k);
  }
  
@@ -888,7 +888,7 @@ index 4509025cf70..1ab9b99b435 100644
  // ----------------------------------------------------------------------------
  // GC support
  
-@@ -2115,7 +2145,7 @@ void SystemDictionary::check_constraints(unsigned int d_hash,
+@@ -2113,7 +2143,7 @@ void SystemDictionary::check_constraints(unsigned int d_hash,
        // also hold array classes.
  
        assert(check->is_instance_klass(), "noninstance in systemdictionary");
@@ -898,7 +898,7 @@ index 4509025cf70..1ab9b99b435 100644
          ss.print("loader %s", loader_data->loader_name_and_id());
          ss.print(" attempted duplicate %s definition for %s. (%s)",
 diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
-index a14728df757..b956c6a7519 100644
+index 649b321a6a4..06f6c869d63 100644
 --- a/src/hotspot/share/classfile/systemDictionary.hpp
 +++ b/src/hotspot/share/classfile/systemDictionary.hpp
 @@ -161,6 +161,8 @@ class OopStorage;
@@ -910,7 +910,7 @@ index a14728df757..b956c6a7519 100644
    do_klass(MethodHandle_klass,                          java_lang_invoke_MethodHandle,             Pre                 ) \
    do_klass(VarHandle_klass,                             java_lang_invoke_VarHandle,                Pre                 ) \
    do_klass(MemberName_klass,                            java_lang_invoke_MemberName,               Pre                 ) \
-@@ -321,6 +323,7 @@ public:
+@@ -318,6 +320,7 @@ public:
                                              Handle class_loader,
                                              Handle protection_domain,
                                              ClassFileStream* st,
@@ -918,7 +918,7 @@ index a14728df757..b956c6a7519 100644
                                              TRAPS);
  
    // Lookup an already loaded class. If not found NULL is returned.
-@@ -465,6 +468,10 @@ public:
+@@ -462,6 +465,10 @@ public:
    static bool is_well_known_klass(Symbol* class_name);
  #endif
  
@@ -929,7 +929,7 @@ index a14728df757..b956c6a7519 100644
  protected:
    // Returns the class loader data to be used when looking up/updating the
    // system dictionary.
-@@ -658,7 +665,7 @@ protected:
+@@ -655,7 +662,7 @@ protected:
    // after waiting, but before reentering SystemDictionary_lock
    // to preserve lock order semantics.
    static void double_lock_wait(Handle lockObject, TRAPS);
@@ -977,10 +977,10 @@ index 05239c57866..c1357bde0ed 100644
    methodHandle        _method; // current method being verified
    VerificationType    _this_type; // the verification type of the current class
 diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
-index cef3f530cbc..17f7e720c95 100644
+index 44cf2583eb9..41e9a84cd69 100644
 --- a/src/hotspot/share/classfile/vmSymbols.hpp
 +++ b/src/hotspot/share/classfile/vmSymbols.hpp
-@@ -287,6 +287,8 @@
+@@ -286,6 +286,8 @@
    template(java_lang_invoke_CallSite,                 "java/lang/invoke/CallSite")                \
    template(java_lang_invoke_ConstantCallSite,         "java/lang/invoke/ConstantCallSite")        \
    template(java_lang_invoke_DirectMethodHandle,       "java/lang/invoke/DirectMethodHandle")      \
@@ -989,7 +989,7 @@ index cef3f530cbc..17f7e720c95 100644
    template(java_lang_invoke_MutableCallSite,          "java/lang/invoke/MutableCallSite")         \
    template(java_lang_invoke_VolatileCallSite,         "java/lang/invoke/VolatileCallSite")        \
    template(java_lang_invoke_MethodHandle,             "java/lang/invoke/MethodHandle")            \
-@@ -447,6 +449,12 @@
+@@ -446,6 +448,12 @@
    template(module_entry_name,                         "module_entry")                             \
    template(resolved_references_name,                  "<resolved_references>")                    \
    template(init_lock_name,                            "<init_lock>")                              \
@@ -1684,10 +1684,10 @@ index 81998728f66..b9ccdee8cca 100644
      }
    }
 diff --git a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
-index 6cf7aec68f8..61a406377ee 100644
+index 77c28924b0d..84891b48c2a 100644
 --- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
 +++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
-@@ -1471,6 +1471,7 @@ static InstanceKlass* create_new_instance_klass(InstanceKlass* ik, ClassFileStre
+@@ -1467,6 +1467,7 @@ static InstanceKlass* create_new_instance_klass(InstanceKlass* ik, ClassFileStre
                               NULL, // host klass
                               NULL, // cp_patches
                               ClassFileParser::INTERNAL, // internal visibility
@@ -2186,10 +2186,10 @@ index b77a19deb38..5573b10f021 100644
    // Compiler support
    static ByteSize super_offset()                 { return in_ByteSize(offset_of(Klass, _super)); }
 diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
-index 576da96ed32..e47dd223f92 100644
+index 916772c0b10..ed6f769bf1b 100644
 --- a/src/hotspot/share/oops/method.cpp
 +++ b/src/hotspot/share/oops/method.cpp
-@@ -1447,6 +1447,8 @@ methodHandle Method::clone_with_new_data(const methodHandle& m, u_char* new_code
+@@ -1402,6 +1402,8 @@ methodHandle Method::clone_with_new_data(const methodHandle& m, u_char* new_code
  
    // Reset correct method/const method, method size, and parameter info
    newm->set_constMethod(newcm);
@@ -2198,7 +2198,7 @@ index 576da96ed32..e47dd223f92 100644
    newm->constMethod()->set_code_size(new_code_length);
    newm->constMethod()->set_constMethod_size(new_const_method_size);
    assert(newm->code_size() == new_code_length, "check");
-@@ -2141,6 +2143,10 @@ void Method::ensure_jmethod_ids(ClassLoaderData* loader_data, int capacity) {
+@@ -2096,6 +2098,10 @@ void Method::ensure_jmethod_ids(ClassLoaderData* loader_data, int capacity) {
  
  // Add a method id to the jmethod_ids
  jmethodID Method::make_jmethod_id(ClassLoaderData* loader_data, Method* m) {
@@ -2210,7 +2210,7 @@ index 576da96ed32..e47dd223f92 100644
  
    if (!SafepointSynchronize::is_at_safepoint()) {
 diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp
-index da8468dead4..4ac3e6e80de 100644
+index 18c706187df..4533476ff8f 100644
 --- a/src/hotspot/share/oops/method.hpp
 +++ b/src/hotspot/share/oops/method.hpp
 @@ -78,6 +78,9 @@ class Method : public Metadata {
@@ -2248,7 +2248,7 @@ index da8468dead4..4ac3e6e80de 100644
    Symbol* signature() const                      { return constants()->symbol_at(signature_index()); }
    int signature_index() const                    { return constMethod()->signature_index();         }
 diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
-index f5db74f4225..7f88297aa10 100644
+index 21e7f652652..e9cc3de9652 100644
 --- a/src/hotspot/share/prims/jni.cpp
 +++ b/src/hotspot/share/prims/jni.cpp
 @@ -353,6 +353,7 @@ JNI_ENTRY(jclass, jni_DefineClass(JNIEnv *env, const char *name, jobject loaderR
@@ -2260,7 +2260,7 @@ index f5db74f4225..7f88297aa10 100644
  
    if (log_is_enabled(Debug, class, resolve) && k != NULL) {
 diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
-index 147beffc814..129b71bf0f5 100644
+index 378dcce8cf5..f92d2697e0e 100644
 --- a/src/hotspot/share/prims/jvm.cpp
 +++ b/src/hotspot/share/prims/jvm.cpp
 @@ -936,6 +936,7 @@ static jclass jvm_define_class_common(JNIEnv *env, const char *name,
@@ -4806,10 +4806,10 @@ index f54c9b713be..54617f05b5a 100644
    VMThread::execute(&op);
    return (op.check_error());
 diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
-index a63b0f67423..9e70e3bc3f8 100644
+index 6600848e2d3..9337b6ab585 100644
 --- a/src/hotspot/share/prims/jvmtiExport.cpp
 +++ b/src/hotspot/share/prims/jvmtiExport.cpp
-@@ -2783,7 +2783,7 @@ JvmtiDynamicCodeEventCollector::JvmtiDynamicCodeEventCollector() : _code_blobs(N
+@@ -2780,7 +2780,7 @@ JvmtiDynamicCodeEventCollector::JvmtiDynamicCodeEventCollector() : _code_blobs(N
  // iterate over any code blob descriptors collected and post a
  // DYNAMIC_CODE_GENERATED event to the profiler.
  JvmtiDynamicCodeEventCollector::~JvmtiDynamicCodeEventCollector() {
@@ -4819,7 +4819,7 @@ index a63b0f67423..9e70e3bc3f8 100644
   if (_code_blobs != NULL) {
     for (int i=0; i<_code_blobs->length(); i++) {
 diff --git a/src/hotspot/share/prims/jvmtiExport.hpp b/src/hotspot/share/prims/jvmtiExport.hpp
-index b8246554f74..be2c373aba7 100644
+index cc5868f1e93..a6cbac03bb2 100644
 --- a/src/hotspot/share/prims/jvmtiExport.hpp
 +++ b/src/hotspot/share/prims/jvmtiExport.hpp
 @@ -176,6 +176,7 @@ class JvmtiExport : public AllStatic {
@@ -4866,10 +4866,10 @@ index a0a6a6cbd18..39953a71244 100644
    for (InstanceKlass* pv_node = ik->previous_versions();
         pv_node != NULL;
 diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp
-index 5c1ed782b8f..5bca664c7c0 100644
+index c071e0641d4..a9057893368 100644
 --- a/src/hotspot/share/prims/resolvedMethodTable.cpp
 +++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
-@@ -202,6 +202,8 @@ void ResolvedMethodTable::print() {
+@@ -201,6 +201,8 @@ void ResolvedMethodTable::print() {
  void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
    assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
    // For each entry in RMT, change to new method
@@ -4878,7 +4878,7 @@ index 5c1ed782b8f..5bca664c7c0 100644
    for (int i = 0; i < _the_table->table_size(); ++i) {
      for (ResolvedMethodEntry* entry = _the_table->bucket(i);
           entry != NULL;
-@@ -216,18 +218,30 @@ void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
+@@ -215,18 +217,30 @@ void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
  
        if (old_method->is_old()) {
  
@@ -4918,7 +4918,7 @@ index 5c1ed782b8f..5bca664c7c0 100644
  
          ResourceMark rm;
          if (!(*trace_name_printed)) {
-@@ -236,9 +250,14 @@ void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
+@@ -235,9 +249,14 @@ void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
          }
          log_debug(redefine, class, update, constantpool)
            ("ResolvedMethod method update: %s(%s)",
@@ -4997,10 +4997,10 @@ index bd439aab073..cc7f71a4404 100644
    static size_t max_heap_for_compressed_oops();
  
 diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
-index 5c389505417..194242e4c4b 100644
+index 4a53ecb37a8..a6c33744760 100644
 --- a/src/hotspot/share/runtime/globals.hpp
 +++ b/src/hotspot/share/runtime/globals.hpp
-@@ -2680,7 +2680,11 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
+@@ -2674,7 +2674,11 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
            "Start flight recording with options"))                           \
                                                                              \
    experimental(bool, UseFastUnorderedTimeStamps, false,                     \
@@ -5043,7 +5043,7 @@ index 563ffdbd446..55f06eadcc2 100644
    _result   = result;
  
 diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
-index 42f1fa9626f..16e91c85fd1 100644
+index d504ef00f90..982ba1b69d5 100644
 --- a/src/hotspot/share/runtime/mutexLocker.cpp
 +++ b/src/hotspot/share/runtime/mutexLocker.cpp
 @@ -5,7 +5,7 @@
@@ -5064,7 +5064,7 @@ index 42f1fa9626f..16e91c85fd1 100644
  Monitor* GCTaskManager_lock           = NULL;
  
  Mutex*   Management_lock              = NULL;
-@@ -291,6 +293,7 @@ void mutex_init() {
+@@ -285,6 +287,7 @@ void mutex_init() {
    def(JNIGlobalActive_lock         , PaddedMutex  , nonleaf-1,   true,  Monitor::_safepoint_check_never);
    def(JNIWeakAlloc_lock            , PaddedMutex  , nonleaf,     true,  Monitor::_safepoint_check_never);
    def(JNIWeakActive_lock           , PaddedMutex  , nonleaf-1,   true,  Monitor::_safepoint_check_never);
@@ -5073,10 +5073,10 @@ index 42f1fa9626f..16e91c85fd1 100644
    def(AdapterHandlerLibrary_lock   , PaddedMutex  , nonleaf,     true,  Monitor::_safepoint_check_always);
  
 diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp
-index 0d263ca55ba..b41abcb82ae 100644
+index 12366c7ead1..70aeb1bd0c1 100644
 --- a/src/hotspot/share/runtime/mutexLocker.hpp
 +++ b/src/hotspot/share/runtime/mutexLocker.hpp
-@@ -124,6 +124,8 @@ extern Mutex*   PerfDataManager_lock;            // a long on access to PerfData
+@@ -123,6 +123,8 @@ extern Mutex*   PerfDataManager_lock;            // a long on access to PerfData
  extern Mutex*   ParkerFreeList_lock;
  extern Mutex*   OopMapCacheAlloc_lock;           // protects allocation of oop_map caches
  

jb/project/tools/patches/dcevm/0002-dcevm11-fixes.patch

@@ -1,7 +1,7 @@
-From 4cbc3b3e13472d7690098240d6d954597c269c7a Mon Sep 17 00:00:00 2001
+From ebd5c9df33771ad5181a225cccc0cca3881a4dbe Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Wed, 14 Nov 2018 21:18:22 +0100
-Subject: [PATCH 02/31] dcevm11 fixes
+Subject: [PATCH 02/18] dcevm11 fixes
 
 1. We need to set classRedefinitionCount on new class, not old class.
 
@@ -82,7 +82,7 @@ dmh
  19 files changed, 324 insertions(+), 415 deletions(-)
 
 diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
-index 0c6c3a86965..b03272da179 100644
+index e2b8c5793d0..5e1c740a3d2 100644
 --- a/src/hotspot/share/classfile/classFileParser.cpp
 +++ b/src/hotspot/share/classfile/classFileParser.cpp
 @@ -954,6 +954,7 @@ void ClassFileParser::parse_interfaces(const ClassFileStream* const stream,
@@ -124,10 +124,10 @@ index d792ab4bb3f..de48092bde8 100644
  
   public:
 diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index e2754d5f5be..1c0d5b0a8f2 100644
+index 25103fff2c0..ab2615da0ed 100644
 --- a/src/hotspot/share/classfile/classLoaderData.cpp
 +++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -1245,6 +1245,7 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*)) {
+@@ -1242,6 +1242,7 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*)) {
    }
  }
  
@@ -135,7 +135,7 @@ index e2754d5f5be..1c0d5b0a8f2 100644
  void ClassLoaderDataGraph::dictionary_classes_do(KlassClosure* klass_closure) {
    FOR_ALL_DICTIONARY(cld) {
      cld->dictionary()->classes_do(klass_closure);
-@@ -1260,6 +1261,7 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*, TRAPS),
+@@ -1257,6 +1258,7 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*, TRAPS),
    }
  }
  
@@ -143,7 +143,7 @@ index e2754d5f5be..1c0d5b0a8f2 100644
  void ClassLoaderDataGraph::rollback_redefinition() {
    FOR_ALL_DICTIONARY(cld) {
      cld->dictionary()->rollback_redefinition();
-@@ -1390,12 +1392,13 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
+@@ -1387,12 +1389,13 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
    // Klassesoto delete.
  
    // FIXME: dcevm - block asserts in MetadataOnStackMark
@@ -163,7 +163,7 @@ index e2754d5f5be..1c0d5b0a8f2 100644
  
    // Save previous _unloading pointer for CMS which may add to unloading list before
    // purging and we don't want to rewalk the previously unloaded class loader data.
-@@ -1405,12 +1408,12 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
+@@ -1402,12 +1405,12 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
    while (data != NULL) {
      if (data->is_alive()) {
        // clean metaspace
@@ -182,7 +182,7 @@ index e2754d5f5be..1c0d5b0a8f2 100644
        data = data->next();
        loaders_processed++;
 diff --git a/src/hotspot/share/classfile/dictionary.cpp b/src/hotspot/share/classfile/dictionary.cpp
-index 5bd048d8627..a97b48fe5bb 100644
+index 118730f1b83..dda5188c370 100644
 --- a/src/hotspot/share/classfile/dictionary.cpp
 +++ b/src/hotspot/share/classfile/dictionary.cpp
 @@ -245,6 +245,8 @@ void Dictionary::classes_do(void f(InstanceKlass*)) {
@@ -244,7 +244,7 @@ index a26b9d1cb55..3d5a59a04ff 100644
    for (int index = 0; index < table_size(); index++) {
      LoaderConstraintEntry** p = bucket_addr(index);
 diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index 1ab9b99b435..52b6ed22b5d 100644
+index 5a745b6fca6..19bc8d9899a 100644
 --- a/src/hotspot/share/classfile/systemDictionary.cpp
 +++ b/src/hotspot/share/classfile/systemDictionary.cpp
 @@ -876,7 +876,8 @@ Klass* SystemDictionary::resolve_instance_class_or_null(Symbol* name,
@@ -266,7 +266,7 @@ index 1ab9b99b435..52b6ed22b5d 100644
    if (!DumpSharedSpaces) {
      k = SystemDictionaryShared::lookup_from_stream(class_name,
                                                     class_loader,
-@@ -1837,7 +1838,7 @@ void SystemDictionary::add_to_hierarchy(InstanceKlass* k, TRAPS) {
+@@ -1835,7 +1836,7 @@ void SystemDictionary::add_to_hierarchy(InstanceKlass* k, TRAPS) {
    CodeCache::flush_dependents_on(k);
  }
  
@@ -275,7 +275,7 @@ index 1ab9b99b435..52b6ed22b5d 100644
  void SystemDictionary::remove_from_hierarchy(InstanceKlass* k) {
      assert(k != NULL, "just checking");
  
-@@ -1845,6 +1846,7 @@ void SystemDictionary::remove_from_hierarchy(InstanceKlass* k) {
+@@ -1843,6 +1844,7 @@ void SystemDictionary::remove_from_hierarchy(InstanceKlass* k) {
    k->remove_from_sibling_list();
  }
  
@@ -1528,10 +1528,10 @@ index 39953a71244..b59d3046b88 100644
  
    // search previous versions if they exist
 diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp
-index 5bca664c7c0..4498bdcd77e 100644
+index a9057893368..af2ec48c2e1 100644
 --- a/src/hotspot/share/prims/resolvedMethodTable.cpp
 +++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
-@@ -198,8 +198,52 @@ void ResolvedMethodTable::print() {
+@@ -197,8 +197,52 @@ void ResolvedMethodTable::print() {
  #endif // PRODUCT
  
  #if INCLUDE_JVMTI

jb/project/tools/patches/dcevm/0003-Support-for-Concurrent-Mark-Sweep-CMS-collector.patch

@@ -1,7 +1,7 @@
-From fc483e0a98a0bb8042df60567fa238d00bf66263 Mon Sep 17 00:00:00 2001
+From aaefe6f66a8d363eb35fcdc8ce29bb25be67fe1c Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Wed, 12 Dec 2018 19:38:28 +0100
-Subject: [PATCH 03/31] Support for Concurrent Mark Sweep (CMS) collector
+Subject: [PATCH 03/18] Support for Concurrent Mark Sweep (CMS) collector
 
 ---
  .../share/gc/cms/compactibleFreeListSpace.cpp | 139 ++++++++++++------

jb/project/tools/patches/dcevm/0004-Fix-class-cast-exception-on-redefinition-of-class-A-.patch

@@ -1,7 +1,7 @@
-From 61bd37c232d7a2f6ee607f39c29e6e231cb4f36d Mon Sep 17 00:00:00 2001
+From 002ad1880190d0749f8f8d325c587fd9275bdab2 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@mailprofiler.com>
 Date: Wed, 11 Mar 2020 14:19:34 +0100
-Subject: [PATCH 04/31] Fix class cast exception on redefinition of class A,
+Subject: [PATCH 04/18] Fix class cast exception on redefinition of class A,
  that is superclass of B that has anonymous class C
 
 ---

jb/project/tools/patches/dcevm/0005-HotswapAgent-integration.patch

@@ -1,7 +1,7 @@
-From da3762cb7687c58c89303092a7e8ed92d4c00cef Mon Sep 17 00:00:00 2001
+From a00292280f4e3754bffc7a0c562dca1d7552eb39 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
-Date: Thu, 15 Nov 2018 03:20:08 +0700
-Subject: [PATCH 05/31] HotswapAgent integration
+Date: Wed, 14 Nov 2018 21:20:08 +0100
+Subject: [PATCH 05/18] HotswapAgent integration
 
 It include:
 
@@ -37,7 +37,7 @@ old DCEVM
  make/launcher/Launcher-jdk.jartool.gmk        |  2 +
  make/launcher/Launcher-jdk.javadoc.gmk        |  3 +-
  make/launcher/Launcher-jdk.jcmd.gmk           | 13 +++-
- make/launcher/Launcher-jdk.jconsole.gmk       |  1 +
+ make/launcher/Launcher-jdk.jconsole.gmk       |  3 +-
  make/launcher/Launcher-jdk.jdeps.gmk          |  3 +
  make/launcher/Launcher-jdk.jdi.gmk            |  1 +
  make/launcher/Launcher-jdk.jlink.gmk          |  5 +-
@@ -55,7 +55,7 @@ old DCEVM
  .../classes/com/sun/beans/package-info.java   | 26 +++++++
  .../com/sun/beans/util/package-info.java      | 26 +++++++
  .../share/classes/module-info.java            |  3 +
- 28 files changed, 208 insertions(+), 10 deletions(-)
+ 28 files changed, 209 insertions(+), 11 deletions(-)
  create mode 100644 src/java.desktop/share/classes/com/sun/beans/introspect/package-info.java
  create mode 100644 src/java.desktop/share/classes/com/sun/beans/package-info.java
  create mode 100644 src/java.desktop/share/classes/com/sun/beans/util/package-info.java
@@ -259,14 +259,16 @@ index 7117fa78059..761a52d8466 100644
  
  # Hook to include the corresponding custom file, if present.
 diff --git a/make/launcher/Launcher-jdk.jconsole.gmk b/make/launcher/Launcher-jdk.jconsole.gmk
-index 575b9e0595b..2f442f69113 100644
+index 575b9e0595b..9b38683a489 100644
 --- a/make/launcher/Launcher-jdk.jconsole.gmk
 +++ b/make/launcher/Launcher-jdk.jconsole.gmk
-@@ -30,6 +30,7 @@ $(eval $(call SetupBuildLauncher, jconsole, \
+@@ -29,7 +29,8 @@ $(eval $(call SetupBuildLauncher, jconsole, \
+     MAIN_CLASS := sun.tools.jconsole.JConsole, \
      JAVA_ARGS := --add-opens java.base/java.io=jdk.jconsole \
  		 -Djconsole.showOutputViewer \
- 		 -Djdk.attach.allowAttachSelf=true, \
-+         -XX:+DisableHotswapAgent, \
+-		 -Djdk.attach.allowAttachSelf=true, \
++		 -Djdk.attach.allowAttachSelf=true \
++		 -XX:+DisableHotswapAgent, \
      CFLAGS_windows := -DJAVAW, \
      LIBS_windows := user32.lib, \
  ))
@@ -390,10 +392,10 @@ index 82311e69fd6..bd39f8595b2 100644
      CFLAGS := -DENABLE_ARG_FILES, \
  ))
 diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
-index 17f7e720c95..0d0badeabd0 100644
+index 41e9a84cd69..1f67eb202b5 100644
 --- a/src/hotspot/share/classfile/vmSymbols.hpp
 +++ b/src/hotspot/share/classfile/vmSymbols.hpp
-@@ -343,6 +343,7 @@
+@@ -342,6 +342,7 @@
    /* common method and field names */                                                             \
    template(object_initializer_name,                   "<init>")                                   \
    template(class_initializer_name,                    "<clinit>")                                 \
@@ -511,7 +513,7 @@ index cc7f71a4404..b2bab2e1f44 100644
    static size_t max_heap_for_compressed_oops();
  
 diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
-index 194242e4c4b..9c007fc2d82 100644
+index a6c33744760..b8dba232fc1 100644
 --- a/src/hotspot/share/runtime/globals.hpp
 +++ b/src/hotspot/share/runtime/globals.hpp
 @@ -32,6 +32,12 @@
@@ -527,7 +529,7 @@ index 194242e4c4b..9c007fc2d82 100644
  // The larger HeapWordSize for 64bit requires larger heaps
  // for the same application running in 64bit.  See bug 4967770.
  // The minimum alignment to a heap word size is done.  Other
-@@ -2684,8 +2690,10 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
+@@ -2678,8 +2684,10 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
                                                                              \
    product(bool, AllowEnhancedClassRedefinition, true,                       \
               "Allow enhanced class redefinition beyond swapping method "    \

jb/project/tools/patches/dcevm/0006-Support-for-Lambda-class-redefinition.patch

@@ -1,7 +1,7 @@
-From 124f27f271c87f37f342028412bc7387f2028cde Mon Sep 17 00:00:00 2001
+From 62f3578e0a73913c1262a1612a464d19abfeb626 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 4 Oct 2020 21:12:12 +0200
-Subject: [PATCH 06/31] Support for Lambda class redefinition
+Subject: [PATCH 06/18] Support for Lambda class redefinition
 
 ---
  .../share/classfile/classLoaderData.cpp       |  9 +++
@@ -15,7 +15,7 @@ Subject: [PATCH 06/31] Support for Lambda class redefinition
  8 files changed, 85 insertions(+), 10 deletions(-)
 
 diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index 1c0d5b0a8f2..d5ee3c0338c 100644
+index ab2615da0ed..1bc67adf5a7 100644
 --- a/src/hotspot/share/classfile/classLoaderData.cpp
 +++ b/src/hotspot/share/classfile/classLoaderData.cpp
 @@ -663,6 +663,15 @@ Dictionary* ClassLoaderData::create_dictionary() {
@@ -47,7 +47,7 @@ index 7e357929971..00a84610b43 100644
  
    void unload();
 diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index 52b6ed22b5d..1dd53e0b7bc 100644
+index 19bc8d9899a..a6a03d3c0e9 100644
 --- a/src/hotspot/share/classfile/systemDictionary.cpp
 +++ b/src/hotspot/share/classfile/systemDictionary.cpp
 @@ -971,12 +971,16 @@ InstanceKlass* SystemDictionary::parse_stream(Symbol* class_name,
@@ -81,7 +81,7 @@ index 52b6ed22b5d..1dd53e0b7bc 100644
  
    if (host_klass != NULL && k != NULL) {
      // Anonymous classes must update ClassLoaderData holder (was host_klass loader)
-@@ -1846,7 +1854,7 @@ void SystemDictionary::remove_from_hierarchy(InstanceKlass* k) {
+@@ -1844,7 +1852,7 @@ void SystemDictionary::remove_from_hierarchy(InstanceKlass* k) {
    k->remove_from_sibling_list();
  }
  
@@ -91,10 +91,10 @@ index 52b6ed22b5d..1dd53e0b7bc 100644
    constraints()->update_after_redefinition();
  }
 diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
-index b956c6a7519..a8359143908 100644
+index 06f6c869d63..1dbbffa197f 100644
 --- a/src/hotspot/share/classfile/systemDictionary.hpp
 +++ b/src/hotspot/share/classfile/systemDictionary.hpp
-@@ -307,6 +307,7 @@ public:
+@@ -304,6 +304,7 @@ public:
                          protection_domain,
                          st,
                          NULL, // host klass
@@ -102,7 +102,7 @@ index b956c6a7519..a8359143908 100644
                          NULL, // cp_patches
                          THREAD);
    }
-@@ -315,6 +316,7 @@ public:
+@@ -312,6 +313,7 @@ public:
                                       Handle protection_domain,
                                       ClassFileStream* st,
                                       const InstanceKlass* host_klass,
@@ -220,10 +220,10 @@ index a48e07e3a6a..3551b06ecde 100644
    // Figure out which new methods match old methods in name and signature,
    // which methods have been added, and which are no longer present
 diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp
-index 4498bdcd77e..8966ee8a00a 100644
+index af2ec48c2e1..7741328979f 100644
 --- a/src/hotspot/share/prims/resolvedMethodTable.cpp
 +++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
-@@ -201,7 +201,7 @@ void ResolvedMethodTable::print() {
+@@ -200,7 +200,7 @@ void ResolvedMethodTable::print() {
  
  void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
    assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
@@ -232,7 +232,7 @@ index 4498bdcd77e..8966ee8a00a 100644
    for (int i = 0; i < _the_table->table_size(); ++i) {
      for (ResolvedMethodEntry* entry = _the_table->bucket(i);
           entry != NULL;
-@@ -272,6 +272,8 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
+@@ -271,6 +271,8 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
          InstanceKlass* newer_klass = InstanceKlass::cast(old_method->method_holder()->new_version());
          Method* newer_method = newer_klass->method_with_idnum(old_method->orig_method_idnum());
  
@@ -242,7 +242,7 @@ index 4498bdcd77e..8966ee8a00a 100644
          assert(newer_method != NULL, "method_with_idnum() should not be NULL");
          assert(old_method != newer_method, "sanity check");
 diff --git a/src/hotspot/share/prims/unsafe.cpp b/src/hotspot/share/prims/unsafe.cpp
-index 1983b4f45f0..5e7aca092eb 100644
+index c071f8b7cc6..e484b8991d1 100644
 --- a/src/hotspot/share/prims/unsafe.cpp
 +++ b/src/hotspot/share/prims/unsafe.cpp
 @@ -820,6 +820,7 @@ Unsafe_DefineAnonymousClass_impl(JNIEnv *env,

jb/project/tools/patches/dcevm/0007-Fix-no-original-bytecode-found-error-if-method-with-.patch

@@ -1,7 +1,7 @@
-From 6ea212ab2f71a8c874be649b2342053134dff9ea Mon Sep 17 00:00:00 2001
+From 4b445e7a7f77f82f757c12010e3c88b2eb4698f9 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 23 May 2020 10:02:15 +0200
-Subject: [PATCH 07/31] Fix "no original bytecode found" error if method with
+Subject: [PATCH 07/18] Fix "no original bytecode found" error if method with
  bkp is missing
 
 Sometimes IDE can deploy class with erroneous method, such method has
@@ -41,10 +41,10 @@ index c25e13d83e8..2a66419908c 100644
  
  IRT_ENTRY(void, InterpreterRuntime::set_original_bytecode_at(JavaThread* thread, Method* method, address bcp, Bytecodes::Code new_code))
 diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
-index e47dd223f92..165a2e4de36 100644
+index ed6f769bf1b..031f255e632 100644
 --- a/src/hotspot/share/oops/method.cpp
 +++ b/src/hotspot/share/oops/method.cpp
-@@ -1789,14 +1789,14 @@ bool CompressedLineNumberReadStream::read_pair() {
+@@ -1744,14 +1744,14 @@ bool CompressedLineNumberReadStream::read_pair() {
  
  #if INCLUDE_JVMTI
  
@@ -61,7 +61,7 @@ index e47dd223f92..165a2e4de36 100644
      ResourceMark rm;
      fatal("no original bytecode found in %s at bci %d", name_and_sig_as_C_string(), bci);
    }
-@@ -1942,7 +1942,7 @@ BreakpointInfo::BreakpointInfo(Method* m, int bci) {
+@@ -1897,7 +1897,7 @@ BreakpointInfo::BreakpointInfo(Method* m, int bci) {
    _signature_index = m->signature_index();
    _orig_bytecode = (Bytecodes::Code) *m->bcp_from(_bci);
    if (_orig_bytecode == Bytecodes::_breakpoint)
@@ -70,7 +70,7 @@ index e47dd223f92..165a2e4de36 100644
    _next = NULL;
  }
  
-@@ -1951,7 +1951,7 @@ void BreakpointInfo::set(Method* method) {
+@@ -1906,7 +1906,7 @@ void BreakpointInfo::set(Method* method) {
    {
      Bytecodes::Code code = (Bytecodes::Code) *method->bcp_from(_bci);
      if (code == Bytecodes::_breakpoint)
@@ -80,7 +80,7 @@ index e47dd223f92..165a2e4de36 100644
    }
  #endif
 diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp
-index 4ac3e6e80de..9ff4f0e8036 100644
+index 4533476ff8f..193e1845b23 100644
 --- a/src/hotspot/share/oops/method.hpp
 +++ b/src/hotspot/share/oops/method.hpp
 @@ -230,7 +230,7 @@ class Method : public Metadata {

jb/project/tools/patches/dcevm/0008-Replace-deleted-method-with-Universe-throw_no_such_m.patch

@@ -1,7 +1,7 @@
-From dc73c2dc3268a8b17844b75b76e14b5d0e3c1259 Mon Sep 17 00:00:00 2001
+From c022124c6e0680d2dfc174f66fc858b0eb2591dc Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 24 May 2020 12:07:42 +0200
-Subject: [PATCH 08/31] Replace deleted method with
+Subject: [PATCH 08/18] Replace deleted method with
  Universe::throw_no_such_method_error
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 08/31] Replace deleted method with
  1 file changed, 14 insertions(+), 14 deletions(-)
 
 diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp
-index 8966ee8a00a..c3ed1d28fe5 100644
+index 7741328979f..06581643c3b 100644
 --- a/src/hotspot/share/prims/resolvedMethodTable.cpp
 +++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
-@@ -262,25 +262,25 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
+@@ -261,25 +261,25 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
  
        if (old_method->is_old()) {
  

jb/project/tools/patches/dcevm/0009-Support-for-G1-gc.patch

@@ -1,7 +1,7 @@
-From 2a004a093c23ca8515954d180064a59cdcaba0f8 Mon Sep 17 00:00:00 2001
+From aa1d291c7349e5cecf9d93e817d0866460deb903 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 12 Jun 2020 17:43:52 +0200
-Subject: [PATCH 09/31] Support for G1 gc
+Subject: [PATCH 09/18] Support for G1 gc
 
 ---
  src/hotspot/share/gc/g1/g1CollectedHeap.cpp   |  20 +++
@@ -31,10 +31,10 @@ Subject: [PATCH 09/31] Support for G1 gc
  create mode 100644 src/hotspot/share/gc/shared/dcevmSharedGC.hpp
 
 diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
-index 83b7d6b5077..c4ae1eee351 100644
+index dea8d9fdb0e..33664a30519 100644
 --- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
 +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
-@@ -2115,6 +2115,21 @@ public:
+@@ -2108,6 +2108,21 @@ public:
    }
  };
  
@@ -56,7 +56,7 @@ index 83b7d6b5077..c4ae1eee351 100644
  void G1CollectedHeap::object_iterate(ObjectClosure* cl) {
    IterateObjectClosureRegionClosure blk(cl);
    heap_region_iterate(&blk);
-@@ -2128,6 +2143,11 @@ void G1CollectedHeap::heap_region_iterate(HeapRegionClosure* cl) const {
+@@ -2117,6 +2132,11 @@ void G1CollectedHeap::heap_region_iterate(HeapRegionClosure* cl) const {
    _hrm.iterate(cl);
  }
  
@@ -69,7 +69,7 @@ index 83b7d6b5077..c4ae1eee351 100644
                                                                   HeapRegionClaimer *hrclaimer,
                                                                   uint worker_id) const {
 diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
-index be160d04bfe..9e92ee4a1fa 100644
+index 8a171dc6b52..05a068bb2e0 100644
 --- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
 +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
 @@ -144,6 +144,7 @@ class G1CollectedHeap : public CollectedHeap {

jb/project/tools/patches/dcevm/0010-Change-log-level-in-advanced-redefinition.patch

@@ -1,7 +1,7 @@
-From b49d26f6e512f5bbdb89c360e8cb73e3bbd037e4 Mon Sep 17 00:00:00 2001
+From b6ea0ee6fcc376f575be0f461c494664d55ed986 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 13 Jun 2020 18:50:59 +0200
-Subject: [PATCH 10/31] Change log level in advanced redefinition
+Subject: [PATCH 10/18] Change log level in advanced redefinition
 
 - Change log level for "Comparing different class ver.." to debug
 - Fix adjust_method_entries_dcevm logging levels and severity
@@ -24,10 +24,10 @@ index 8b6fad2128e..a8adfa5af47 100644
    assert(new_class->old_version() != NULL, "must have old version");
    InstanceKlass* the_class = InstanceKlass::cast(new_class->old_version());
 diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp
-index c3ed1d28fe5..650007b26ff 100644
+index 06581643c3b..10806bee29b 100644
 --- a/src/hotspot/share/prims/resolvedMethodTable.cpp
 +++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
-@@ -271,7 +271,7 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
+@@ -270,7 +270,7 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
          } else {
            newer_method = newer_klass->method_with_idnum(old_method->orig_method_idnum());
  
@@ -36,7 +36,7 @@ index c3ed1d28fe5..650007b26ff 100644
  
            assert(newer_klass == newer_method->method_holder(), "call after swapping redefined guts");
            assert(newer_method != NULL, "method_with_idnum() should not be NULL");
-@@ -291,7 +291,7 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
+@@ -290,7 +290,7 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
  
          ResourceMark rm;
          if (!(*trace_name_printed)) {

jb/project/tools/patches/dcevm/0011-AllowEnhancedClassRedefinition-is-false-disabled-by-.patch

@@ -1,7 +1,7 @@
-From 993fa0c4dc645102204d8dcf716407bcc84e5e7f Mon Sep 17 00:00:00 2001
+From ef1098751c596a03fd1721affc20d221b3544d37 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Tue, 6 Oct 2020 22:15:31 +0200
-Subject: [PATCH 11/31] AllowEnhancedClassRedefinition is false (disabled) by
+Subject: [PATCH 11/18] AllowEnhancedClassRedefinition is false (disabled) by
  default
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 11/31] AllowEnhancedClassRedefinition is false (disabled) by
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
-index 9c007fc2d82..705381825ff 100644
+index b8dba232fc1..d4453de1ff5 100644
 --- a/src/hotspot/share/runtime/globals.hpp
 +++ b/src/hotspot/share/runtime/globals.hpp
-@@ -2688,7 +2688,7 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
+@@ -2682,7 +2682,7 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
    experimental(bool, UseFastUnorderedTimeStamps, false,                     \
            "Use platform unstable time where supported for timestamps only") \
                                                                              \

jb/project/tools/patches/dcevm/0012-add-jvmtiEnhancedRedefineClasses.-to-CMakeLists.txt.patch

@@ -1,7 +1,7 @@
-From 9604363bb215769dc397cedf1e7b7b89f1d518d8 Mon Sep 17 00:00:00 2001
+From 6a78dda15c66cbba1ca6a2d7f3df3a55fc087f50 Mon Sep 17 00:00:00 2001
 From: Artem Khvastunov <artem.khvastunov@jetbrains.com>
 Date: Tue, 14 Apr 2020 19:11:35 +0200
-Subject: [PATCH 12/31] add jvmtiEnhancedRedefineClasses.* to CMakeLists.txt
+Subject: [PATCH 12/18] add jvmtiEnhancedRedefineClasses.* to CMakeLists.txt
 
 ---
  jb/project/hotspot-cmake/CMakeLists.txt | 2 ++

jb/project/tools/patches/dcevm/0013-Set-HOTSPOT_VM_DISTRO-Dynamic-Code-Evolution.patch

@@ -1,14 +1,14 @@
-From 00e668de1ec62caa31d8a0d8d64a8e143819b296 Mon Sep 17 00:00:00 2001
+From 80c1cd01b45735928e3b3e9283b5484ea6a70a7f Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Mon, 19 Oct 2020 20:00:04 +0200
-Subject: [PATCH 13/31] Set HOTSPOT_VM_DISTRO=Dynamic Code Evolution
+Subject: [PATCH 13/18] Set HOTSPOT_VM_DISTRO=Dynamic Code Evolution
 
 ---
  make/autoconf/version-numbers | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/make/autoconf/version-numbers b/make/autoconf/version-numbers
-index 12a95c59483..662ad155896 100644
+index 1d08f6a80dc..88b4d460ee8 100644
 --- a/make/autoconf/version-numbers
 +++ b/make/autoconf/version-numbers
 @@ -44,7 +44,7 @@ PRODUCT_NAME=OpenJDK

jb/project/tools/patches/dcevm/0014-Fix-G1-nmethod-registration.patch

@@ -1,7 +1,7 @@
-From c5e0cc85307942efce6b7946be166ea7ef7ada79 Mon Sep 17 00:00:00 2001
+From 122562d31005edd3573a645c3a02c1d8fe843c5e Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 11 Oct 2020 10:43:28 +0200
-Subject: [PATCH 14/31] Fix G1 nmethod registration
+Subject: [PATCH 14/18] Fix G1 nmethod registration
 
 ---
  .../prims/jvmtiEnhancedRedefineClasses.cpp    | 19 ++++++++++++++++---

jb/project/tools/patches/dcevm/0015-Initialize-method-s-_new_version-_old_version-to-NUL.patch

@@ -1,14 +1,14 @@
-From 24f735428a47eeaa0ac5e84f41a437d4964c35ba Mon Sep 17 00:00:00 2001
+From 0156b2084be20579b407e112a00ba15f54248003 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Thu, 22 Oct 2020 20:15:20 +0200
-Subject: [PATCH 15/31] Initialize method's _new_version/_old_version to NULL
+Subject: [PATCH 15/18] Initialize method's _new_version/_old_version to NULL
 
 ---
  src/hotspot/share/oops/method.cpp | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
-index 165a2e4de36..17c08a9dc18 100644
+index 031f255e632..a9556ecf0c4 100644
 --- a/src/hotspot/share/oops/method.cpp
 +++ b/src/hotspot/share/oops/method.cpp
 @@ -83,7 +83,8 @@ Method* Method::allocate(ClassLoaderData* loader_data,

jb/project/tools/patches/dcevm/0016-Clear-dcevm-code-separation.patch

@@ -1,7 +1,7 @@
-From 4ca5a545df83c41c0ee4465d5d598aa83f1b106c Mon Sep 17 00:00:00 2001
+From 81ba8f1d120e158a7b0cfa09b5dd51295d51901f Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 23 Oct 2020 10:20:26 +0200
-Subject: [PATCH 16/31] Clear dcevm code separation
+Subject: [PATCH 16/18] Clear dcevm code separation
 
 ---
  src/hotspot/share/classfile/systemDictionary.cpp   |  4 ++--
@@ -15,7 +15,7 @@ Subject: [PATCH 16/31] Clear dcevm code separation
  8 files changed, 27 insertions(+), 17 deletions(-)
 
 diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index 1dd53e0b7bc..fe537421e22 100644
+index a6a03d3c0e9..9e0f4dd3c96 100644
 --- a/src/hotspot/share/classfile/systemDictionary.cpp
 +++ b/src/hotspot/share/classfile/systemDictionary.cpp
 @@ -1152,7 +1152,7 @@ InstanceKlass* SystemDictionary::resolve_from_stream(Symbol* class_name,
@@ -27,7 +27,7 @@ index 1dd53e0b7bc..fe537421e22 100644
    } );
  
    return k;
-@@ -2155,7 +2155,7 @@ void SystemDictionary::check_constraints(unsigned int d_hash,
+@@ -2153,7 +2153,7 @@ void SystemDictionary::check_constraints(unsigned int d_hash,
        // also hold array classes.
  
        assert(check->is_instance_klass(), "noninstance in systemdictionary");
@@ -93,10 +93,10 @@ index 9dc184d02f5..bff1c3627b0 100644
                   is_static ? "static" : "non-static", resolved_klass->external_name(), fd.name()->as_C_string(),
                  current_klass->external_name());
 diff --git a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
-index 61a406377ee..da9df7a21a2 100644
+index 84891b48c2a..6f19e2939a2 100644
 --- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
 +++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
-@@ -1471,7 +1471,7 @@ static InstanceKlass* create_new_instance_klass(InstanceKlass* ik, ClassFileStre
+@@ -1467,7 +1467,7 @@ static InstanceKlass* create_new_instance_klass(InstanceKlass* ik, ClassFileStre
                               NULL, // host klass
                               NULL, // cp_patches
                               ClassFileParser::INTERNAL, // internal visibility
@@ -148,10 +148,10 @@ index 7eb1b01c785..710e0ddc930 100644
  
    // Verify implementor fields requires the Compile_lock, but this is sometimes
 diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
-index 17c08a9dc18..2596ed7add2 100644
+index a9556ecf0c4..6c7edaca67e 100644
 --- a/src/hotspot/share/oops/method.cpp
 +++ b/src/hotspot/share/oops/method.cpp
-@@ -2145,7 +2145,7 @@ void Method::ensure_jmethod_ids(ClassLoaderData* loader_data, int capacity) {
+@@ -2100,7 +2100,7 @@ void Method::ensure_jmethod_ids(ClassLoaderData* loader_data, int capacity) {
  // Add a method id to the jmethod_ids
  jmethodID Method::make_jmethod_id(ClassLoaderData* loader_data, Method* m) {
    // FIXME: (DCEVM) ???

jb/project/tools/patches/dcevm/0017-Fix-metadataOnStack-bug.patch

@@ -1,7 +1,7 @@
-From e029e021d4fbc24506571ad83555189175b9ebad Mon Sep 17 00:00:00 2001
+From a022248d12e37084c8f8987a44d567ba0e02fb6d Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 23 Oct 2020 11:07:40 +0200
-Subject: [PATCH 17/31] Fix metadataOnStack bug
+Subject: [PATCH 17/18] Fix metadataOnStack bug
 
 ---
  .../share/classfile/classLoaderData.cpp       |  7 +-
@@ -11,10 +11,10 @@ Subject: [PATCH 17/31] Fix metadataOnStack bug
  4 files changed, 41 insertions(+), 38 deletions(-)
 
 diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index d5ee3c0338c..0376777649b 100644
+index 1bc67adf5a7..bba5ce0511f 100644
 --- a/src/hotspot/share/classfile/classLoaderData.cpp
 +++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -1401,13 +1401,10 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
+@@ -1398,13 +1398,10 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
    // Klassesoto delete.
  
    // FIXME: dcevm - block asserts in MetadataOnStackMark

jb/project/tools/patches/dcevm/0018-Fix-LoadedClassesClosure-fixes-problems-with-remote-.patch

@@ -1,7 +1,7 @@
-From 992ae7e64b6af91e1aab29577203ff2e9fce0dd4 Mon Sep 17 00:00:00 2001
+From 46795cd6c086e2008b270f89971bb07ad34ac355 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Wed, 11 Nov 2020 18:45:15 +0100
-Subject: [PATCH 19/31] Fix LoadedClassesClosure - fixes problems with remote
+Subject: [PATCH 18/18] Fix LoadedClassesClosure - fixes problems with remote
  debugging
 
 ---

jb/project/tools/patches/dcevm/0018-Ignore-MetadataOnStackMark-if-redefining_gc_run.patch

@@ -1,25 +0,0 @@
-From fac0c15ae914e5b45fece5dc8d35d389098bdff7 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Sun, 1 Nov 2020 21:19:00 +0100
-Subject: [PATCH 18/31] Ignore MetadataOnStackMark if redefining_gc_run
-
----
- src/hotspot/share/classfile/classLoaderData.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index 0376777649b..b649d6358ed 100644
---- a/src/hotspot/share/classfile/classLoaderData.cpp
-+++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -1404,7 +1404,7 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
-   bool walk_all_metadata = clean_previous_versions &&
-                              JvmtiExport::has_redefined_a_class() &&
-                              InstanceKlass::has_previous_versions_and_reset();
--  MetadataOnStackMark md_on_stack(walk_all_metadata, AllowEnhancedClassRedefinition);
-+  MetadataOnStackMark md_on_stack(walk_all_metadata, Universe::is_redefining_gc_run());
- 
-   // Save previous _unloading pointer for CMS which may add to unloading list before
-   // purging and we don't want to rewalk the previously unloaded class loader data.
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0019-Disable-AllowEnhancedClassRedefinition-in-flight-rec.patch

@@ -1,7 +1,7 @@
-From e20336116249d0b7ddb6bfcc69c54627da31d122 Mon Sep 17 00:00:00 2001
+From 62fc66fa74886bd8bb15cd3e2084175f7ad5d0c7 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
 Date: Fri, 5 Feb 2021 23:30:49 +0100
-Subject: [PATCH 20/31] Disable AllowEnhancedClassRedefinition in flight
+Subject: [PATCH 19/19] Disable AllowEnhancedClassRedefinition in flight
  recorder
 
 ---

jb/project/tools/patches/dcevm/0021-JBR-3106-Check-InstanceKlass-has_nestmate_access_to-.patch

@@ -1,41 +0,0 @@
-From 970ff0fd814d94573b929cbc222ff731d3e6e1c8 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Fri, 12 Feb 2021 12:33:11 +0100
-Subject: [PATCH 21/31] JBR-3106 Check InstanceKlass::has_nestmate_access_to
- with active classes
-
-Dcevm can leave old host in nested class if nested class is not
-redefined together with host class
----
- src/hotspot/share/oops/instanceKlass.cpp | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
-index 710e0ddc930..24eb3ed68a6 100644
---- a/src/hotspot/share/oops/instanceKlass.cpp
-+++ b/src/hotspot/share/oops/instanceKlass.cpp
-@@ -327,11 +327,21 @@ bool InstanceKlass::has_nestmate_access_to(InstanceKlass* k, TRAPS) {
-     return false;
-   }
- 
-+  // (DCEVM) cur_host can be old, decide accessibility based on active version
-+  if (AllowEnhancedClassRedefinition) {
-+    cur_host = InstanceKlass::cast(cur_host->active_version());
-+  }
-+
-   Klass* k_nest_host = k->nest_host(icce, CHECK_false);
-   if (k_nest_host == NULL) {
-     return false;
-   }
- 
-+  // (DCEVM) k_nest_host can be old, decide accessibility based on active version
-+  if (AllowEnhancedClassRedefinition) {
-+    k_nest_host = InstanceKlass::cast(k_nest_host->active_version());
-+  }
-+
-   bool access = (cur_host == k_nest_host);
- 
-   if (log_is_enabled(Trace, class, nestmates)) {
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0022-JBR-3110-Fix-assert-in-MetadataOnStackMark.patch

@@ -1,31 +0,0 @@
-From fc955c851f24501927e14d8200ddc7f2c05faa3c Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Sun, 7 Feb 2021 12:08:58 +0100
-Subject: [PATCH 22/31] JBR-3110 Fix assert in MetadataOnStackMark
-
-Fixed fastdebug tests crashes in redefine gc run
----
- src/hotspot/share/classfile/metadataOnStackMark.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/hotspot/share/classfile/metadataOnStackMark.cpp b/src/hotspot/share/classfile/metadataOnStackMark.cpp
-index 9d7bdbde74b..66049f11629 100644
---- a/src/hotspot/share/classfile/metadataOnStackMark.cpp
-+++ b/src/hotspot/share/classfile/metadataOnStackMark.cpp
-@@ -49,10 +49,11 @@ NOT_PRODUCT(bool MetadataOnStackMark::_is_active = false;)
- MetadataOnStackMark::MetadataOnStackMark(bool redefinition_walk, bool ignore) : _ignore(ignore) {
-   assert(SafepointSynchronize::is_at_safepoint(), "sanity check");
-   assert(_used_buffers == NULL, "sanity check");
--  assert(!_is_active, "MetadataOnStackMarks do not nest");
--  NOT_PRODUCT(_is_active = true;)
- 
-   if (!ignore) {
-+    assert(!_is_active, "MetadataOnStackMarks do not nest");
-+    NOT_PRODUCT(_is_active = true;)
-+
-     Threads::metadata_handles_do(Metadata::mark_on_stack);
- 
-     if (redefinition_walk) {
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0023-Code-cleanup.patch

@@ -1,78 +0,0 @@
-From 66d88a8d5abfc1dbadf860930bb662cd9c9c690b Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Fri, 12 Feb 2021 11:27:39 +0100
-Subject: [PATCH 23/31] Code cleanup
-
-- Rename confusing method name old_if_redefined to old_if_redefining
-- Remove unused is_redefining_gc_run
----
- src/hotspot/share/classfile/dictionary.cpp | 6 +++---
- src/hotspot/share/classfile/dictionary.hpp | 2 +-
- src/hotspot/share/memory/universe.hpp      | 5 -----
- 3 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/src/hotspot/share/classfile/dictionary.cpp b/src/hotspot/share/classfile/dictionary.cpp
-index a97b48fe5bb..781a929e7de 100644
---- a/src/hotspot/share/classfile/dictionary.cpp
-+++ b/src/hotspot/share/classfile/dictionary.cpp
-@@ -381,7 +381,7 @@ InstanceKlass* Dictionary::find(unsigned int hash, Symbol* name,
-   int index = hash_to_index(hash);
-   DictionaryEntry* entry = get_entry(index, hash, name);
-   if (entry != NULL && entry->is_valid_protection_domain(protection_domain)) {
--    return old_if_redefined(entry->instance_klass());
-+    return old_if_redefining(entry->instance_klass());
-   } else {
-     return NULL;
-   }
-@@ -394,7 +394,7 @@ InstanceKlass* Dictionary::find_class(int index, unsigned int hash,
-   assert (index == index_for(name), "incorrect index?");
- 
-   DictionaryEntry* entry = get_entry(index, hash, name);
--  return old_if_redefined((entry != NULL) ? entry->instance_klass() : NULL);
-+  return old_if_redefining((entry != NULL) ? entry->instance_klass() : NULL);
- }
- 
- 
-@@ -406,7 +406,7 @@ InstanceKlass* Dictionary::find_shared_class(int index, unsigned int hash,
-   assert (index == index_for(name), "incorrect index?");
- 
-   DictionaryEntry* entry = get_entry(index, hash, name);
--  return old_if_redefined((entry != NULL) ? entry->instance_klass() : NULL);
-+  return old_if_redefining((entry != NULL) ? entry->instance_klass() : NULL);
- }
- 
- 
-diff --git a/src/hotspot/share/classfile/dictionary.hpp b/src/hotspot/share/classfile/dictionary.hpp
-index 5eaa741d500..f6e08e7bfd5 100644
---- a/src/hotspot/share/classfile/dictionary.hpp
-+++ b/src/hotspot/share/classfile/dictionary.hpp
-@@ -120,7 +120,7 @@ public:
-   void rollback_redefinition();
- 
-   // (DCEVM) return old class if redefining in AllowEnhancedClassRedefinition, otherwise return "k"
--  static InstanceKlass* old_if_redefined(InstanceKlass* k) {
-+  static InstanceKlass* old_if_redefining(InstanceKlass* k) {
-     return (k != NULL && k->is_redefining()) ? ((InstanceKlass* )k->old_version()) : k;
-   }
- };
-diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp
-index b32db16b9cf..742dada0e8f 100644
---- a/src/hotspot/share/memory/universe.hpp
-+++ b/src/hotspot/share/memory/universe.hpp
-@@ -52,13 +52,8 @@ class LatestMethodCache : public CHeapObj<mtClass> {
-   Klass*                _klass;
-   int                   _method_idnum;
- 
--  static bool _is_redefining_gc_run;
--
-  public:
- 
--   static bool is_redefining_gc_run()               { return _is_redefining_gc_run; }
--   static void set_redefining_gc_run(bool b)        { _is_redefining_gc_run = b;    }
--
-   LatestMethodCache()   { _klass = NULL; _method_idnum = -1; }
-   ~LatestMethodCache()  { _klass = NULL; _method_idnum = -1; }
- 
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0024-JBR-3111-Update-class-in-all-dictionaries-where-it-w.patch

@@ -1,95 +0,0 @@
-From 94482d0b6d49ee57870c8dcefc207cb1ec707065 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Sat, 13 Feb 2021 20:47:52 +0100
-Subject: [PATCH 24/31] JBR-3111 Update class in all dictionaries where it was
- already defined
-
-This patch keeps compatibility with std redefinition, that does not
-create a new Klass, but modifies it, then it is modified in all
-dictionaries containing this class.
----
- src/hotspot/share/classfile/classLoaderData.cpp  | 9 +++++++++
- src/hotspot/share/classfile/classLoaderData.hpp  | 3 +++
- src/hotspot/share/classfile/dictionary.cpp       | 2 +-
- src/hotspot/share/classfile/dictionary.hpp       | 2 +-
- src/hotspot/share/classfile/systemDictionary.cpp | 4 +++-
- 5 files changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index b649d6358ed..a70d92c27fc 100644
---- a/src/hotspot/share/classfile/classLoaderData.cpp
-+++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -1277,6 +1277,15 @@ void ClassLoaderDataGraph::rollback_redefinition() {
-   }
- }
- 
-+// (DCEVM) - iterate over all classes in all dictionaries
-+bool ClassLoaderDataGraph::dictionary_classes_do_update_klass(Symbol* name, InstanceKlass* k, InstanceKlass* old_klass) {
-+  bool ok = false;
-+  FOR_ALL_DICTIONARY(cld) {
-+    ok = cld->dictionary()->update_klass(name, k, old_klass) || ok;
-+  }
-+  return ok;
-+}
-+
- // Walks all entries in the dictionary including entries initiated by this class loader.
- void ClassLoaderDataGraph::dictionary_all_entries_do(void f(InstanceKlass*, ClassLoaderData*)) {
-   Thread* thread = Thread::current();
-diff --git a/src/hotspot/share/classfile/classLoaderData.hpp b/src/hotspot/share/classfile/classLoaderData.hpp
-index 00a84610b43..16711dca237 100644
---- a/src/hotspot/share/classfile/classLoaderData.hpp
-+++ b/src/hotspot/share/classfile/classLoaderData.hpp
-@@ -130,6 +130,9 @@ class ClassLoaderDataGraph : public AllStatic {
-   // Enhanced class redefinition
-   static void rollback_redefinition();
- 
-+  // Enhanced class redefinition
-+  static bool dictionary_classes_do_update_klass(Symbol* name, InstanceKlass* k, InstanceKlass* old_klass);
-+
-   // Iterate all classes and their class loaders, including initiating class loaders.
-   static void dictionary_all_entries_do(void f(InstanceKlass*, ClassLoaderData*));
- 
-diff --git a/src/hotspot/share/classfile/dictionary.cpp b/src/hotspot/share/classfile/dictionary.cpp
-index 781a929e7de..a1baaef86f5 100644
---- a/src/hotspot/share/classfile/dictionary.cpp
-+++ b/src/hotspot/share/classfile/dictionary.cpp
-@@ -345,7 +345,7 @@ DictionaryEntry* Dictionary::get_entry(int index, unsigned int hash,
- }
- 
- // (DCEVM) replace old_class by new class in dictionary
--bool Dictionary::update_klass(unsigned int hash, Symbol* name, ClassLoaderData* loader_data, InstanceKlass* k, InstanceKlass* old_klass) {
-+bool Dictionary::update_klass(Symbol* name, InstanceKlass* k, InstanceKlass* old_klass) {
-   // There are several entries for the same class in the dictionary: One extra entry for each parent classloader of the classloader of the class.
-   bool found = false;
-   for (int index = 0; index < table_size(); index++) {
-diff --git a/src/hotspot/share/classfile/dictionary.hpp b/src/hotspot/share/classfile/dictionary.hpp
-index f6e08e7bfd5..2932cc9c320 100644
---- a/src/hotspot/share/classfile/dictionary.hpp
-+++ b/src/hotspot/share/classfile/dictionary.hpp
-@@ -115,7 +115,7 @@ public:
-   void free_entry(DictionaryEntry* entry);
- 
-   // Enhanced class redefinition
--  bool update_klass(unsigned int hash, Symbol* name, ClassLoaderData* loader_data, InstanceKlass* k, InstanceKlass* old_klass);
-+  bool update_klass(Symbol* name, InstanceKlass* k, InstanceKlass* old_klass);
- 
-   void rollback_redefinition();
- 
-diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index fe537421e22..f7452adcf02 100644
---- a/src/hotspot/share/classfile/systemDictionary.cpp
-+++ b/src/hotspot/share/classfile/systemDictionary.cpp
-@@ -1608,7 +1608,9 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, InstanceKlass* ol
-   Dictionary* dictionary = loader_data->dictionary();
-   unsigned int d_hash = dictionary->compute_hash(name_h);
-   if (is_redefining) {
--    bool ok = dictionary->update_klass(d_hash, name_h, loader_data, k, old_klass);
-+    // Update all dictionaries containing old_class to new_class
-+    // outcome must be same as result of standard redefinition, that does not create a new Klass
-+    bool ok = ClassLoaderDataGraph::dictionary_classes_do_update_klass(name_h, k, old_klass);
-     assert (ok, "must have found old class and updated!");
-   }
-   check_constraints(d_hash, k, class_loader_h, !is_redefining, CHECK);
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0025-JBR-3140-support-for-modularized-HotswapAgent.patch

@@ -1,527 +0,0 @@
-From 7a7a6733faf1ef9fd4787fd67d99e846f480e922 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Thu, 18 Jun 2020 18:40:11 +0200
-Subject: [PATCH 25/31] JBR-3140 - support for modularized HotswapAgent
-
-Add -XX:HotswapAgent=[disabled,fatjar.core]
----
- make/launcher/Launcher-java.base.gmk          |  1 -
- make/launcher/Launcher-java.rmi.gmk           |  2 -
- make/launcher/Launcher-java.scripting.gmk     |  3 +-
- make/launcher/Launcher-java.security.jgss.gmk |  3 --
- make/launcher/Launcher-jdk.aot.gmk            |  2 -
- make/launcher/Launcher-jdk.compiler.gmk       |  5 +-
- make/launcher/Launcher-jdk.hotspot.agent.gmk  |  1 -
- make/launcher/Launcher-jdk.jartool.gmk        |  2 -
- make/launcher/Launcher-jdk.javadoc.gmk        |  3 +-
- make/launcher/Launcher-jdk.jcmd.gmk           | 13 +----
- make/launcher/Launcher-jdk.jdeps.gmk          |  3 --
- make/launcher/Launcher-jdk.jdi.gmk            |  1 -
- make/launcher/Launcher-jdk.jlink.gmk          |  5 +-
- make/launcher/Launcher-jdk.jshell.gmk         |  1 -
- make/launcher/Launcher-jdk.jstatd.gmk         |  1 -
- make/launcher/Launcher-jdk.pack.gmk           |  1 -
- make/launcher/Launcher-jdk.rmic.gmk           |  1 -
- .../Launcher-jdk.scripting.nashorn.shell.gmk  |  3 +-
- src/hotspot/share/runtime/arguments.cpp       | 48 +++++++++++--------
- .../runtime/flags/jvmFlagConstraintList.cpp   | 23 +++++++++
- .../runtime/flags/jvmFlagConstraintList.hpp   |  1 +
- .../flags/jvmFlagConstraintsRuntime.cpp       | 10 ++++
- .../flags/jvmFlagConstraintsRuntime.hpp       |  1 +
- src/hotspot/share/runtime/globals.hpp         | 12 ++++-
- 24 files changed, 81 insertions(+), 65 deletions(-)
-
-diff --git a/make/launcher/Launcher-java.base.gmk b/make/launcher/Launcher-java.base.gmk
-index 38ba29530d8..f6d4aa28fe6 100644
---- a/make/launcher/Launcher-java.base.gmk
-+++ b/make/launcher/Launcher-java.base.gmk
-@@ -52,7 +52,6 @@ endif
- 
- $(eval $(call SetupBuildLauncher, keytool, \
-     MAIN_CLASS := sun.security.tools.keytool.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
- 
- ################################################################################
-diff --git a/make/launcher/Launcher-java.rmi.gmk b/make/launcher/Launcher-java.rmi.gmk
-index 07046232275..a69a90bcc81 100644
---- a/make/launcher/Launcher-java.rmi.gmk
-+++ b/make/launcher/Launcher-java.rmi.gmk
-@@ -27,10 +27,8 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, rmid, \
-     MAIN_CLASS := sun.rmi.server.Activation, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
- 
- $(eval $(call SetupBuildLauncher, rmiregistry, \
-     MAIN_CLASS := sun.rmi.registry.RegistryImpl, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
-diff --git a/make/launcher/Launcher-java.scripting.gmk b/make/launcher/Launcher-java.scripting.gmk
-index cf100e20789..057d2bf3aca 100644
---- a/make/launcher/Launcher-java.scripting.gmk
-+++ b/make/launcher/Launcher-java.scripting.gmk
-@@ -27,6 +27,5 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jrunscript, \
-     MAIN_CLASS := com.sun.tools.script.shell.Main, \
--    JAVA_ARGS := --add-modules ALL-DEFAULT \
--        -XX:+DisableHotswapAgent, \
-+    JAVA_ARGS := --add-modules ALL-DEFAULT, \
- ))
-diff --git a/make/launcher/Launcher-java.security.jgss.gmk b/make/launcher/Launcher-java.security.jgss.gmk
-index 2b856bfccb4..7411e1a21c4 100644
---- a/make/launcher/Launcher-java.security.jgss.gmk
-+++ b/make/launcher/Launcher-java.security.jgss.gmk
-@@ -28,16 +28,13 @@ include LauncherCommon.gmk
- ifeq ($(OPENJDK_TARGET_OS), windows)
-   $(eval $(call SetupBuildLauncher, kinit, \
-       MAIN_CLASS := sun.security.krb5.internal.tools.Kinit, \
--      JAVA_ARGS := -XX:+DisableHotswapAgent, \
-   ))
- 
-   $(eval $(call SetupBuildLauncher, klist, \
-       MAIN_CLASS := sun.security.krb5.internal.tools.Klist, \
--      JAVA_ARGS := -XX:+DisableHotswapAgent, \
-   ))
- 
-   $(eval $(call SetupBuildLauncher, ktab, \
-       MAIN_CLASS := sun.security.krb5.internal.tools.Ktab, \
--      JAVA_ARGS := -XX:+DisableHotswapAgent, \
-   ))
- endif
-diff --git a/make/launcher/Launcher-jdk.aot.gmk b/make/launcher/Launcher-jdk.aot.gmk
-index 2c52c31a555..10717a5e1c5 100644
---- a/make/launcher/Launcher-jdk.aot.gmk
-+++ b/make/launcher/Launcher-jdk.aot.gmk
-@@ -31,7 +31,6 @@ include LauncherCommon.gmk
- $(eval $(call SetupBuildLauncher, jaotc, \
-     MAIN_CLASS := jdk.tools.jaotc.Main, \
-     EXTRA_JAVA_ARGS := -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI \
--        -XX:+DisableHotswapAgent \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.aarch64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.amd64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-@@ -41,7 +40,6 @@ $(eval $(call SetupBuildLauncher, jaotc, \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-     , \
-     JAVA_ARGS := --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
--        -XX:+DisableHotswapAgent \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-diff --git a/make/launcher/Launcher-jdk.compiler.gmk b/make/launcher/Launcher-jdk.compiler.gmk
-index 744969546de..f71c37adf74 100644
---- a/make/launcher/Launcher-jdk.compiler.gmk
-+++ b/make/launcher/Launcher-jdk.compiler.gmk
-@@ -27,14 +27,12 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, javac, \
-    MAIN_CLASS := com.sun.tools.javac.Main, \
--   JAVA_ARGS := --add-modules ALL-DEFAULT \
--       -XX:+DisableHotswapAgent, \
-+   JAVA_ARGS := --add-modules ALL-DEFAULT, \
-    CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
- 
- $(eval $(call SetupBuildLauncher, serialver, \
-     MAIN_CLASS := sun.tools.serialver.SerialVer, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
- 
-@@ -43,7 +41,6 @@ ifeq ($(ENABLE_SJAVAC), yes)
-   # into any real images
-   $(eval $(call SetupBuildLauncher, sjavac, \
-       MAIN_CLASS := com.sun.tools.sjavac.Main, \
--      JAVA_ARGS := -XX:+DisableHotswapAgent, \
-       CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
-       OUTPUT_DIR := $(JDK_OUTPUTDIR)/bin, \
-   ))
-diff --git a/make/launcher/Launcher-jdk.hotspot.agent.gmk b/make/launcher/Launcher-jdk.hotspot.agent.gmk
-index 9f12b05b172..76da3600368 100644
---- a/make/launcher/Launcher-jdk.hotspot.agent.gmk
-+++ b/make/launcher/Launcher-jdk.hotspot.agent.gmk
-@@ -27,6 +27,5 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jhsdb, \
-     MAIN_CLASS := sun.jvm.hotspot.SALauncher, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     MACOSX_PRIVILEGED := true, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jartool.gmk b/make/launcher/Launcher-jdk.jartool.gmk
-index 647d82b65b1..f74e82bfdae 100644
---- a/make/launcher/Launcher-jdk.jartool.gmk
-+++ b/make/launcher/Launcher-jdk.jartool.gmk
-@@ -27,10 +27,8 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jar, \
-     MAIN_CLASS := sun.tools.jar.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jarsigner, \
-     MAIN_CLASS := sun.security.tools.jarsigner.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
-diff --git a/make/launcher/Launcher-jdk.javadoc.gmk b/make/launcher/Launcher-jdk.javadoc.gmk
-index c3d2093be04..889028a2b17 100644
---- a/make/launcher/Launcher-jdk.javadoc.gmk
-+++ b/make/launcher/Launcher-jdk.javadoc.gmk
-@@ -27,7 +27,6 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, javadoc, \
-     MAIN_CLASS := jdk.javadoc.internal.tool.Main, \
--    JAVA_ARGS := --add-modules ALL-DEFAULT \
--        -XX:+DisableHotswapAgent, \
-+    JAVA_ARGS := --add-modules ALL-DEFAULT, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jcmd.gmk b/make/launcher/Launcher-jdk.jcmd.gmk
-index 761a52d8466..7117fa78059 100644
---- a/make/launcher/Launcher-jdk.jcmd.gmk
-+++ b/make/launcher/Launcher-jdk.jcmd.gmk
-@@ -30,7 +30,6 @@ $(eval $(call SetupBuildLauncher, jinfo, \
-     JAVA_ARGS := \
-         -Dsun.jvm.hotspot.debugger.useProcDebugger \
-         -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
--        -XX:+DisableHotswapAgent, \
-     MACOSX_PRIVILEGED := true, \
- ))
- 
-@@ -38,36 +37,28 @@ $(eval $(call SetupBuildLauncher, jmap, \
-     MAIN_CLASS := sun.tools.jmap.JMap, \
-     JAVA_ARGS := \
-         -Dsun.jvm.hotspot.debugger.useProcDebugger \
--        -Dsun.jvm.hotspot.debugger.useWindbgDebugger \
--        -XX:+DisableHotswapAgent, \
-+        -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
-     MACOSX_PRIVILEGED := true, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jps, \
-     MAIN_CLASS := sun.tools.jps.Jps, \
--    JAVA_ARGS := \
--        -XX:+DisableHotswapAgent, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jstack, \
-     MAIN_CLASS := sun.tools.jstack.JStack, \
-     JAVA_ARGS := \
-         -Dsun.jvm.hotspot.debugger.useProcDebugger \
--        -Dsun.jvm.hotspot.debugger.useWindbgDebugger \
--        -XX:+DisableHotswapAgent, \
-+        -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
-     MACOSX_PRIVILEGED := true, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jstat, \
-     MAIN_CLASS := sun.tools.jstat.Jstat, \
--    JAVA_ARGS := \
--        -XX:+DisableHotswapAgent, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jcmd, \
-     MAIN_CLASS := sun.tools.jcmd.JCmd, \
--    JAVA_ARGS := \
--        -XX:+DisableHotswapAgent, \
- ))
- 
- # Hook to include the corresponding custom file, if present.
-diff --git a/make/launcher/Launcher-jdk.jdeps.gmk b/make/launcher/Launcher-jdk.jdeps.gmk
-index 5448278dae7..217523c48cc 100644
---- a/make/launcher/Launcher-jdk.jdeps.gmk
-+++ b/make/launcher/Launcher-jdk.jdeps.gmk
-@@ -27,18 +27,15 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, javap, \
-     MAIN_CLASS := com.sun.tools.javap.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jdeps, \
-     MAIN_CLASS := com.sun.tools.jdeps.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jdeprscan, \
-     MAIN_CLASS := com.sun.tools.jdeprscan.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jdi.gmk b/make/launcher/Launcher-jdk.jdi.gmk
-index 27bd448e3ae..fcce98cf430 100644
---- a/make/launcher/Launcher-jdk.jdi.gmk
-+++ b/make/launcher/Launcher-jdk.jdi.gmk
-@@ -27,5 +27,4 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jdb, \
-     MAIN_CLASS := com.sun.tools.example.debug.tty.TTY, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jlink.gmk b/make/launcher/Launcher-jdk.jlink.gmk
-index 9e61edeb2c8..df2173996d7 100644
---- a/make/launcher/Launcher-jdk.jlink.gmk
-+++ b/make/launcher/Launcher-jdk.jlink.gmk
-@@ -27,21 +27,18 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jimage,\
-     MAIN_CLASS := jdk.tools.jimage.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DENABLE_ARG_FILES, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jlink,\
-     MAIN_CLASS := jdk.tools.jlink.internal.Main, \
--    JAVA_ARGS :=  --add-modules ALL-DEFAULT \
--        -XX:+DisableHotswapAgent, \
-+    JAVA_ARGS :=  --add-modules ALL-DEFAULT, \
-     CFLAGS := -DENABLE_ARG_FILES \
-         -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jmod,\
-     MAIN_CLASS := jdk.tools.jmod.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DENABLE_ARG_FILES \
-         -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jshell.gmk b/make/launcher/Launcher-jdk.jshell.gmk
-index 7287f8f998a..349eb88e9eb 100644
---- a/make/launcher/Launcher-jdk.jshell.gmk
-+++ b/make/launcher/Launcher-jdk.jshell.gmk
-@@ -27,6 +27,5 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jshell, \
-     MAIN_CLASS := jdk.internal.jshell.tool.JShellToolProvider, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jstatd.gmk b/make/launcher/Launcher-jdk.jstatd.gmk
-index e1657910c67..e9286d63094 100644
---- a/make/launcher/Launcher-jdk.jstatd.gmk
-+++ b/make/launcher/Launcher-jdk.jstatd.gmk
-@@ -27,7 +27,6 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jstatd, \
-     MAIN_CLASS := sun.tools.jstatd.Jstatd, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
- 
- # Hook to include the corresponding custom file, if present.
-diff --git a/make/launcher/Launcher-jdk.pack.gmk b/make/launcher/Launcher-jdk.pack.gmk
-index 64bbbb7c949..a93fd2a9017 100644
---- a/make/launcher/Launcher-jdk.pack.gmk
-+++ b/make/launcher/Launcher-jdk.pack.gmk
-@@ -28,7 +28,6 @@ include LauncherCommon.gmk
- $(eval $(call SetupBuildLauncher, pack200, \
-     MAIN_MODULE := java.base, \
-     MAIN_CLASS := com.sun.java.util.jar.pack.Driver, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
- 
- ################################################################################
-diff --git a/make/launcher/Launcher-jdk.rmic.gmk b/make/launcher/Launcher-jdk.rmic.gmk
-index b8a55900b0e..d60c3d9b60b 100644
---- a/make/launcher/Launcher-jdk.rmic.gmk
-+++ b/make/launcher/Launcher-jdk.rmic.gmk
-@@ -27,6 +27,5 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, rmic, \
-     MAIN_CLASS := sun.rmi.rmic.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
-diff --git a/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk b/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk
-index bd39f8595b2..82311e69fd6 100644
---- a/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk
-+++ b/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk
-@@ -27,7 +27,6 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jjs, \
-     MAIN_CLASS := jdk.nashorn.tools.jjs.Main, \
--    JAVA_ARGS := --add-modules ALL-DEFAULT \
--        -XX:+DisableHotswapAgent, \
-+    JAVA_ARGS := --add-modules ALL-DEFAULT, \
-     CFLAGS := -DENABLE_ARG_FILES, \
- ))
-diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
-index c5635bb8537..d7fee6a8c95 100644
---- a/src/hotspot/share/runtime/arguments.cpp
-+++ b/src/hotspot/share/runtime/arguments.cpp
-@@ -4310,11 +4310,17 @@ void Arguments::setup_hotswap_agent() {
-   if (DumpSharedSpaces)
-     return;
- 
--  if (!AllowEnhancedClassRedefinition)
-+  if (HotswapAgent == NULL || strcmp(HotswapAgent, "disabled") == 0)
-     return;
- 
-+  // Force AllowEnhancedClassRedefinition if HA is enabled
-+  AllowEnhancedClassRedefinition = true;
-+
-+  bool ha_fatjar = strcmp(HotswapAgent, "fatjar") == 0;
-+  bool ha_core = strcmp(HotswapAgent, "core") == 0;
-+
-   // Set HotswapAgent
--  if (!DisableHotswapAgent) {
-+  if (ha_fatjar || ha_core) {
- 
-     char ext_path_str[JVM_MAXPATHLEN];
- 
-@@ -4333,23 +4339,27 @@ void Arguments::setup_hotswap_agent() {
-       }
-     }
-     if (ext_path_length < JVM_MAXPATHLEN - 10) {
--      jio_snprintf(ext_path_str + ext_path_length, sizeof(ext_path_str) - ext_path_length,
--                   "%shotswap%shotswap-agent.jar", os::file_separator(), os::file_separator());
--    }
--
--    int fd = ::open(ext_path_str, O_RDONLY);
--    if (fd >= 0) {
--      os::close(fd);
--      size_t length = strlen(ext_path_str) + 1;
--      char *options = NEW_C_HEAP_ARRAY(char,  length, mtArguments);
--      jio_snprintf(options, length, "%s", ext_path_str);
--      add_init_agent("instrument", ext_path_str, false);
--      jio_fprintf(defaultStream::output_stream(), "Starting HotswapAgent '%s'\n", ext_path_str);
--    }
--//    else
--//    {
--//      jio_fprintf(defaultStream::error_stream(), "HotswapAgent not found on path:'%s'\n", ext_path_str);
--//    }
-+      if (ha_fatjar) {
-+        jio_snprintf(ext_path_str + ext_path_length, sizeof(ext_path_str) - ext_path_length,
-+                     "%shotswap%shotswap-agent.jar", os::file_separator(), os::file_separator());
-+      } else {
-+        jio_snprintf(ext_path_str + ext_path_length, sizeof(ext_path_str) - ext_path_length,
-+                     "%shotswap%shotswap-agent-core.jar", os::file_separator(), os::file_separator());
-+      }
-+      int fd = ::open(ext_path_str, O_RDONLY);
-+      if (fd >= 0) {
-+        os::close(fd);
-+        size_t length = strlen(ext_path_str) + 1;
-+        char *options = NEW_C_HEAP_ARRAY(char,  length, mtArguments);
-+        jio_snprintf(options, length, "%s", ext_path_str);
-+        add_init_agent("instrument", ext_path_str, false);
-+        jio_fprintf(defaultStream::output_stream(), "Starting HotswapAgent '%s'\n", ext_path_str);
-+      }
-+      else
-+      {
-+        jio_fprintf(defaultStream::error_stream(), "HotswapAgent not found on path:'%s'!\n", ext_path_str);
-+      }
-+    }
-   }
- 
-   // TODO: open it only for org.hotswap.agent module
-diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintList.cpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintList.cpp
-index 16d8030fd1c..94044c4831c 100644
---- a/src/hotspot/share/runtime/flags/jvmFlagConstraintList.cpp
-+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintList.cpp
-@@ -199,6 +199,26 @@ public:
-   }
- };
- 
-+class JVMFlagConstraint_ccstr : public JVMFlagConstraint {
-+  JVMFlagConstraintFunc_ccstr _constraint;
-+  const ccstr* _ptr;
-+
-+public:
-+  // the "name" argument must be a string literal
-+  JVMFlagConstraint_ccstr(const char* name, const ccstr* ptr,
-+                                   JVMFlagConstraintFunc_ccstr func,
-+                                 ConstraintType type) : JVMFlagConstraint(name, type), _constraint(func), _ptr(ptr) {}
-+
-+  JVMFlag::Error apply(bool verbose) {
-+    ccstr value = *_ptr;
-+    return _constraint(value, verbose);
-+  }
-+
-+  JVMFlag::Error apply_ccstr(ccstr value, bool verbose) {
-+    return _constraint(value, verbose);
-+  }
-+};
-+
- // No constraint emitting
- void emit_constraint_no(...)                                                      { /* NOP */ }
- 
-@@ -239,6 +259,9 @@ void emit_constraint_size_t(const char* name, const size_t* ptr, JVMFlagConstrai
- void emit_constraint_double(const char* name, const double* ptr, JVMFlagConstraintFunc_double func, JVMFlagConstraint::ConstraintType type) {
-   JVMFlagConstraintList::add(new JVMFlagConstraint_double(name, ptr, func, type));
- }
-+void emit_constraint_ccstr(const char* name, ccstr* ptr, JVMFlagConstraintFunc_ccstr func, JVMFlagConstraint::ConstraintType type) {
-+  JVMFlagConstraintList::add(new JVMFlagConstraint_ccstr(name, ptr, func, type));
-+}
- 
- // Generate code to call emit_constraint_xxx function
- #define EMIT_CONSTRAINT_PRODUCT_FLAG(type, name, value, doc)      ); emit_constraint_##type(#name,&name
-diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintList.hpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintList.hpp
-index 9c27f1db955..b644f7b817a 100644
---- a/src/hotspot/share/runtime/flags/jvmFlagConstraintList.hpp
-+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintList.hpp
-@@ -47,6 +47,7 @@ typedef JVMFlag::Error (*JVMFlagConstraintFunc_uintx)(uintx value, bool verbose)
- typedef JVMFlag::Error (*JVMFlagConstraintFunc_uint64_t)(uint64_t value, bool verbose);
- typedef JVMFlag::Error (*JVMFlagConstraintFunc_size_t)(size_t value, bool verbose);
- typedef JVMFlag::Error (*JVMFlagConstraintFunc_double)(double value, bool verbose);
-+typedef JVMFlag::Error (*JVMFlagConstraintFunc_ccstr)(ccstr value, bool verbose);
- 
- class JVMFlagConstraint : public CHeapObj<mtArguments> {
- public:
-diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp
-index 6559d4252f0..21afac72a2e 100644
---- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp
-+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp
-@@ -140,3 +140,13 @@ JVMFlag::Error ThreadLocalHandshakesConstraintFunc(bool value, bool verbose) {
-   }
-   return JVMFlag::SUCCESS;
- }
-+
-+JVMFlag::Error HotswapAgentConstraintFunc(char const* value, bool verbose) {
-+  if (value != NULL) {
-+    if (strcmp("disabled", value) != 0 && strcmp("fatjar", value) != 0 && strcmp("core", value) != 0 && strcmp("external", value) != 0) {
-+      JVMFlag::printError(verbose, "HotswapAgent(%s) must be one of disabled,fatjar,core or external.\n", value);
-+      return JVMFlag::VIOLATES_CONSTRAINT;
-+    }
-+  }
-+  return JVMFlag::SUCCESS;
-+}
-diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp
-index 8763b83fd37..c9ed15a89e1 100644
---- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp
-+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp
-@@ -46,5 +46,6 @@ JVMFlag::Error PerfDataSamplingIntervalFunc(intx value, bool verbose);
- 
- JVMFlag::Error ThreadLocalHandshakesConstraintFunc(bool value, bool verbose);
- 
-+JVMFlag::Error HotswapAgentConstraintFunc(char const* value, bool verbose);
- 
- #endif /* SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTSRUNTIME_HPP */
-diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
-index 705381825ff..eda4eca2451 100644
---- a/src/hotspot/share/runtime/globals.hpp
-+++ b/src/hotspot/share/runtime/globals.hpp
-@@ -2692,8 +2692,16 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
-              "Allow enhanced class redefinition beyond swapping method "    \
-              "bodies")                                                      \
-                                                                             \
--  product(bool, DisableHotswapAgent, DISABLED_HOTSWAP_AGENT,                \
--             "Disable integrated Hotswap Agent (HotswapVM only)")
-+  product(ccstr, HotswapAgent, "disabled",                                  \
-+          "Specify HotswapAgent image to be used."                          \
-+          "disabled: hotswap agent is disabled (default)"                   \
-+          "fatjar: full HA. Use integrated hotswap-agent.jar"               \
-+          "core: core HA. Use integrated hotswap-agent-core.jar"            \
-+          "external: external HA. use external HA, open required JDK "      \
-+          "modules.")                                                       \
-+          constraint(HotswapAgentConstraintFunc, AfterErgo)
-+
-+
- #define VM_FLAGS(develop,                                                   \
-                  develop_pd,                                                \
-                  product,                                                   \
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0026-Support-for-redefinition-of-Well-Known-classses-java.patch

@@ -1,333 +0,0 @@
-From cb2c85624c82ec9f9c30ba4a8122eb23e806999c Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Mon, 8 Mar 2021 02:22:54 +0700
-Subject: [PATCH 26/31] Support for redefinition of Well Known classses
- (java.*,jdk.*, sun.*)
-
----
- src/hotspot/share/ci/ciKlass.hpp              |  1 +
- src/hotspot/share/ci/ciObjectFactory.cpp      | 34 +++++++++++
- src/hotspot/share/ci/ciObjectFactory.hpp      |  6 ++
- .../share/classfile/systemDictionary.cpp      | 10 +++
- .../share/classfile/systemDictionary.hpp      |  2 +
- src/hotspot/share/classfile/vmSymbols.hpp     |  2 +
- src/hotspot/share/compiler/compileBroker.cpp  | 11 ++++
- src/hotspot/share/memory/universe.cpp         |  8 +++
- src/hotspot/share/memory/universe.hpp         |  3 +
- .../prims/jvmtiEnhancedRedefineClasses.cpp    | 61 ++++++++++++++++++-
- .../prims/jvmtiEnhancedRedefineClasses.hpp    |  2 +
- 11 files changed, 139 insertions(+), 1 deletion(-)
-
-diff --git a/src/hotspot/share/ci/ciKlass.hpp b/src/hotspot/share/ci/ciKlass.hpp
-index 896f489453a..c610c365aba 100644
---- a/src/hotspot/share/ci/ciKlass.hpp
-+++ b/src/hotspot/share/ci/ciKlass.hpp
-@@ -129,6 +129,7 @@ public:
-   void print_name_on(outputStream* st);
- 
-   const char* external_name() const;
-+  Klass* new_version() { return get_Klass()->new_version(); }
- };
- 
- #endif // SHARE_VM_CI_CIKLASS_HPP
-diff --git a/src/hotspot/share/ci/ciObjectFactory.cpp b/src/hotspot/share/ci/ciObjectFactory.cpp
-index 66bbe835e7b..107c16fa5cf 100644
---- a/src/hotspot/share/ci/ciObjectFactory.cpp
-+++ b/src/hotspot/share/ci/ciObjectFactory.cpp
-@@ -70,7 +70,10 @@ GrowableArray<ciMetadata*>* ciObjectFactory::_shared_ci_metadata = NULL;
- ciSymbol*                 ciObjectFactory::_shared_ci_symbols[vmSymbols::SID_LIMIT];
- int                       ciObjectFactory::_shared_ident_limit = 0;
- volatile bool             ciObjectFactory::_initialized = false;
-+volatile bool             ciObjectFactory::_reinitialize_wk_klasses = false;
- 
-+// TODO: review...
-+Arena* ciObjectFactory::_initial_arena = NULL;
- 
- // ------------------------------------------------------------------
- // ciObjectFactory::ciObjectFactory
-@@ -112,6 +115,7 @@ void ciObjectFactory::initialize() {
-   // compiler thread that initializes the initial ciObjectFactory which
-   // creates the shared ciObjects that all later ciObjectFactories use.
-   Arena* arena = new (mtCompiler) Arena(mtCompiler);
-+  ciObjectFactory::_initial_arena = arena;
-   ciEnv initial(arena);
-   ciEnv* env = ciEnv::current();
-   env->_factory->init_shared_objects();
-@@ -120,6 +124,36 @@ void ciObjectFactory::initialize() {
- 
- }
- 
-+// (DCEVM) wk classes could be modified
-+void ciObjectFactory::reinitialize_wk_classes() {
-+  ASSERT_IN_VM;
-+  JavaThread* thread = JavaThread::current();
-+  HandleMark  handle_mark(thread);
-+
-+  // This Arena is long lived and exists in the resource mark of the
-+  // compiler thread that initializes the initial ciObjectFactory which
-+  // creates the shared ciObjects that all later ciObjectFactories use.
-+  // Arena* arena = new (mtCompiler) Arena(mtCompiler);
-+  ciEnv initial(ciObjectFactory::_initial_arena);
-+  ciEnv* env = ciEnv::current();
-+  env->_factory->do_reinitialize_wk_classes();
-+  _reinitialize_wk_klasses = false;
-+}
-+
-+// (DCEVM) wk classes could be modified
-+void ciObjectFactory::do_reinitialize_wk_classes() {
-+#define WK_KLASS_DEFN(name, ignore_s, opt)   \
-+  if (ciEnv::_##name != NULL && ciEnv::_##name->new_version() != NULL) { \
-+    int old_ident = ciEnv::_##name->ident(); \
-+    ciEnv::_##name = get_metadata(SystemDictionary::name())->as_instance_klass(); \
-+    ciEnv::_##name->compute_nonstatic_fields(); \
-+    ciEnv::_##name->set_ident(old_ident); \
-+  }
-+
-+  WK_KLASSES_DO(WK_KLASS_DEFN)
-+#undef WK_KLASS_DEFN
-+}
-+
- void ciObjectFactory::init_shared_objects() {
- 
-   _next_ident = 1;  // start numbering CI objects at 1
-diff --git a/src/hotspot/share/ci/ciObjectFactory.hpp b/src/hotspot/share/ci/ciObjectFactory.hpp
-index 3e9d48c4cdc..79059f6e2e8 100644
---- a/src/hotspot/share/ci/ciObjectFactory.hpp
-+++ b/src/hotspot/share/ci/ciObjectFactory.hpp
-@@ -41,9 +41,11 @@ class ciObjectFactory : public ResourceObj {
- 
- private:
-   static volatile bool _initialized;
-+  static volatile bool _reinitialize_wk_klasses;
-   static GrowableArray<ciMetadata*>* _shared_ci_metadata;
-   static ciSymbol*                 _shared_ci_symbols[];
-   static int                       _shared_ident_limit;
-+  static Arena*                    _initial_arena;
- 
-   Arena*                    _arena;
-   GrowableArray<ciMetadata*>*        _ci_metadata;
-@@ -89,10 +91,14 @@ private:
-   ciInstance* get_unloaded_instance(ciInstanceKlass* klass);
- 
-   static int compare_cimetadata(ciMetadata** a, ciMetadata** b);
-+  void do_reinitialize_wk_classes();
- public:
-   static bool is_initialized() { return _initialized; }
-+  static bool is_reinitialize_wk_klasses() { return _reinitialize_wk_klasses; }
-+  static void set_reinitialize_wk_klasses() { _reinitialize_wk_klasses = true; }
- 
-   static void initialize();
-+  static void reinitialize_wk_classes();
-   void init_shared_objects();
-   void remove_symbols();
- 
-diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index f7452adcf02..1d2c7d22ce0 100644
---- a/src/hotspot/share/classfile/systemDictionary.cpp
-+++ b/src/hotspot/share/classfile/systemDictionary.cpp
-@@ -1985,6 +1985,16 @@ bool SystemDictionary::is_well_known_klass(Symbol* class_name) {
- }
- #endif
- 
-+bool SystemDictionary::update_well_known_klass(InstanceKlass* old_klass, InstanceKlass* new_klass) {
-+  for (int id = FIRST_WKID; id < WKID_LIMIT; id++) {
-+    if (well_known_klass((WKID) id) == old_klass) {
-+      *well_known_klass_addr((WKID)id) = new_klass;
-+      return true;
-+    }
-+  }
-+  return false;
-+}
-+
- bool SystemDictionary::resolve_wk_klass(WKID id, int init_opt, TRAPS) {
-   assert(id >= (int)FIRST_WKID && id < (int)WKID_LIMIT, "oob");
-   int  info = wk_init_info[id - FIRST_WKID];
-diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
-index a8359143908..aba2780a321 100644
---- a/src/hotspot/share/classfile/systemDictionary.hpp
-+++ b/src/hotspot/share/classfile/systemDictionary.hpp
-@@ -470,6 +470,8 @@ public:
-   static bool is_well_known_klass(Symbol* class_name);
- #endif
- 
-+  static bool update_well_known_klass(InstanceKlass* new_klass, InstanceKlass* old_klass);
-+
-   // Enhanced class redefinition
-   static void remove_from_hierarchy(InstanceKlass* k);
-   static void update_constraints_after_redefinition();
-diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
-index 0d0badeabd0..3477a408cb6 100644
---- a/src/hotspot/share/classfile/vmSymbols.hpp
-+++ b/src/hotspot/share/classfile/vmSymbols.hpp
-@@ -356,6 +356,8 @@
-   template(exit_method_name,                          "exit")                                     \
-   template(add_method_name,                           "add")                                      \
-   template(remove_method_name,                        "remove")                                   \
-+  template(registerNatives_method_name,               "registerNatives")                          \
-+  template(initIDs_method_name,                       "initIDs")                                  \
-   template(parent_name,                               "parent")                                   \
-   template(threads_name,                              "threads")                                  \
-   template(groups_name,                               "groups")                                   \
-diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
-index 0ed0ca52cb0..4f64beae978 100644
---- a/src/hotspot/share/compiler/compileBroker.cpp
-+++ b/src/hotspot/share/compiler/compileBroker.cpp
-@@ -1877,6 +1877,17 @@ void CompileBroker::compiler_thread_loop() {
-       if (method()->number_of_breakpoints() == 0) {
-         // Compile the method.
-         if ((UseCompiler || AlwaysCompileLoopMethods) && CompileBroker::should_compile_new_jobs()) {
-+
-+          // TODO: review usage of CompileThread_lock (DCEVM)
-+          if (ciObjectFactory::is_reinitialize_wk_klasses())
-+          {
-+            ASSERT_IN_VM;
-+            MutexLocker only_one (CompileThread_lock, thread);
-+            if (ciObjectFactory::is_reinitialize_wk_klasses()) {
-+              ciObjectFactory::reinitialize_wk_classes();
-+            }
-+          }
-+
-           invoke_compiler_on_method(task);
-           thread->start_idle_timer();
-         } else {
-diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
-index 3dc4cc1323c..6b88271b5ef 100644
---- a/src/hotspot/share/memory/universe.cpp
-+++ b/src/hotspot/share/memory/universe.cpp
-@@ -1030,6 +1030,14 @@ void Universe::initialize_known_methods(TRAPS) {
-                           vmSymbols::doStackWalk_signature(), false, CHECK);
- }
- 
-+void Universe::reinitialize_loader_addClass_method(TRAPS) {
-+  // Set up method for registering loaded classes in class loader vector
-+  initialize_known_method(_loader_addClass_cache,
-+                          SystemDictionary::ClassLoader_klass(),
-+                          "addClass",
-+                          vmSymbols::class_void_signature(), false, CHECK);
-+}
-+
- void universe2_init() {
-   EXCEPTION_MARK;
-   Universe::genesis(CATCH);
-diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp
-index 742dada0e8f..d1af82b5fa7 100644
---- a/src/hotspot/share/memory/universe.hpp
-+++ b/src/hotspot/share/memory/universe.hpp
-@@ -349,6 +349,9 @@ class Universe: AllStatic {
-   // Function to initialize these
-   static void initialize_known_methods(TRAPS);
- 
-+  // Enhanced class redefinition
-+  static void reinitialize_loader_addClass_method(TRAPS);
-+
-   static oop          null_ptr_exception_instance()   { return _null_ptr_exception_instance;   }
-   static oop          arithmetic_exception_instance() { return _arithmetic_exception_instance; }
-   static oop          virtual_machine_error_instance() { return _virtual_machine_error_instance; }
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 4ee12b7021f..7997b178d22 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -497,6 +497,16 @@ void VM_EnhancedRedefineClasses::doit() {
-     redefine_single_class(_new_classes->at(i), thread);
-   }
- 
-+  // Update possible redefinition of well-known classes (like ClassLoader)
-+  for (int i = 0; i < _new_classes->length(); i++) {
-+    InstanceKlass* cur = _new_classes->at(i);
-+    if (cur->old_version() != NULL && SystemDictionary::update_well_known_klass(InstanceKlass::cast(cur->old_version()), cur))
-+    {
-+      log_trace(redefine, class, obsolete, metadata)("Well known class updated %s", cur->external_name());
-+      ciObjectFactory::set_reinitialize_wk_klasses();
-+    }
-+  }
-+
-   // Deoptimize all compiled code that depends on this class (do only once, because it clears whole cache)
-   // if (_max_redefinition_flags > Klass::ModifyClass) {
-     flush_dependent_code(NULL, thread);
-@@ -672,12 +682,56 @@ void VM_EnhancedRedefineClasses::doit() {
-   _timer_vm_op_doit.stop();
- }
- 
-+void VM_EnhancedRedefineClasses::reinitializeJDKClasses() {
-+  if (!_new_classes->is_empty()) {
-+    ResourceMark rm(Thread::current());
-+
-+    for (int i = 0; i < _new_classes->length(); i++) {
-+      InstanceKlass* cur = _new_classes->at(i);
-+
-+      if (cur->name()->starts_with("java/") || cur->name()->starts_with("jdk/") || cur->name()->starts_with("sun/")) {
-+
-+        if (cur == SystemDictionary::ClassLoader_klass()) {
-+          // ClassLoader.addClass method is cached in Universe, we must redefine
-+          Universe::reinitialize_loader_addClass_method(Thread::current());
-+          log_trace(redefine, class, obsolete, metadata)("Reinitialize ClassLoade addClass method cache.");
-+        }
-+
-+        // naive assumptions that only JDK classes has native static "registerNative" and "initIDs" methods
-+        int end;
-+        Symbol* signature = vmSymbols::registerNatives_method_name();
-+        int midx = cur->find_method_by_name(signature, &end);
-+        if (midx == -1) {
-+          signature = vmSymbols::initIDs_method_name();
-+          midx = cur->find_method_by_name(signature, &end);
-+        }
-+        Method* m = NULL;
-+        if (midx != -1) {
-+          m = cur->methods()->at(midx);
-+        }
-+        if (m != NULL && m->is_static() && m->is_native()) {
-+          // call static registerNative if present
-+          JavaValue result(T_VOID);
-+          JavaCalls::call_static(&result,
-+                                  cur,
-+                                  signature,
-+                                  vmSymbols::void_method_signature(),
-+                                  Thread::current());
-+          log_trace(redefine, class, obsolete, metadata)("Reregister natives of JDK class %s", cur->external_name());
-+        }
-+      }
-+    }
-+  }
-+}
-+
- // Cleanup - runs in JVM thread
- //  - free used memory
- //  - end GC
- void VM_EnhancedRedefineClasses::doit_epilogue() {
-   VM_GC_Operation::doit_epilogue();
- 
-+  reinitializeJDKClasses();
-+
-   if (_new_classes != NULL) {
-     delete _new_classes;
-   }
-@@ -1589,7 +1643,12 @@ void VM_EnhancedRedefineClasses::check_methods_and_mark_as_obsolete() {
- 
-       // obsolete methods need a unique idnum so they become new entries in
-       // the jmethodID cache in InstanceKlass
--      assert(old_method->method_idnum() == new_method->method_idnum(), "must match");
-+      if (old_method->method_idnum() != new_method->method_idnum()) {
-+        log_error(redefine, class, normalize)
-+          ("Method not matched: %d != %d  old: %s = new: %s",  old_method->method_idnum(), new_method->method_idnum(),
-+              old_method->name_and_sig_as_C_string(), new_method->name_and_sig_as_C_string());
-+        // assert(old_method->method_idnum() == new_method->method_idnum(), "must match");
-+      }
- //      u2 num = InstanceKlass::cast(_the_class_oop)->next_method_idnum();
- //      if (num != ConstMethod::UNSET_IDNUM) {
- //        old_method->set_method_idnum(num);
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-index d00109a0b92..8c47baa8a74 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-@@ -141,6 +141,8 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
- 
-   void flush_dependent_code(InstanceKlass* k_h, TRAPS);
- 
-+  void reinitializeJDKClasses();
-+
-   static void check_class(InstanceKlass* k_oop, TRAPS);
- 
-   static void dump_methods();
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0027-JBR-3458-Skip-dynamic-proxy-classes-based-on-com.sun.patch

@@ -1,27 +0,0 @@
-From 5325334e5f75c8c5fd711c021764901b8fa81a33 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Fri, 19 Mar 2021 19:13:38 +0100
-Subject: [PATCH 27/31] JBR-3458: Skip dynamic proxy classes based on
- com.sun.proxy
-
----
- src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 7997b178d22..0d1c68f5cd0 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -689,7 +689,8 @@ void VM_EnhancedRedefineClasses::reinitializeJDKClasses() {
-     for (int i = 0; i < _new_classes->length(); i++) {
-       InstanceKlass* cur = _new_classes->at(i);
- 
--      if (cur->name()->starts_with("java/") || cur->name()->starts_with("jdk/") || cur->name()->starts_with("sun/")) {
-+      if ((cur->name()->starts_with("java/") || cur->name()->starts_with("jdk/") || cur->name()->starts_with("sun/"))
-+          && cur->name()->index_of_at(0, "$$") == -1) { // skip dynamic proxies
- 
-         if (cur == SystemDictionary::ClassLoader_klass()) {
-           // ClassLoader.addClass method is cached in Universe, we must redefine
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0028-JBR-3459-Fix-race-condition-in-ClassLoaderDataGraph-.patch

@@ -1,79 +0,0 @@
-From 6ec78dba58b2e05b373dda3ca6a7f6b5c837b331 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Sat, 20 Mar 2021 20:51:08 +0100
-Subject: [PATCH 28/31] JBR-3459: Fix race condition in
- ClassLoaderDataGraph::classes_do
-
-InstanceKlass in ClassLoaderData can be uninitialized when
-ClassLoaderDataGraph::classes_do is called. Using
-ClassLoaderDataGraph::dictionary_classes_do is safe but problem is still
-persisting with anonymous classes.
----
- src/hotspot/share/classfile/classLoaderData.cpp     | 10 ++++++++++
- src/hotspot/share/classfile/classLoaderData.hpp     |  4 ++++
- .../share/prims/jvmtiEnhancedRedefineClasses.cpp    | 13 +++++++++++--
- 3 files changed, 25 insertions(+), 2 deletions(-)
-
-diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index a70d92c27fc..f6764ff37a0 100644
---- a/src/hotspot/share/classfile/classLoaderData.cpp
-+++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -1169,6 +1169,16 @@ void ClassLoaderDataGraph::classes_do(KlassClosure* klass_closure) {
-   }
- }
- 
-+void ClassLoaderDataGraph::anonymous_classes_do(KlassClosure* klass_closure) {
-+  Thread* thread = Thread::current();
-+  for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->next()) {
-+    if (cld->is_anonymous()) {
-+      Handle holder(thread, cld->holder_phantom());
-+      cld->classes_do(klass_closure);
-+    }
-+  }
-+}
-+
- void ClassLoaderDataGraph::classes_do(void f(Klass* const)) {
-   Thread* thread = Thread::current();
-   for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->next()) {
-diff --git a/src/hotspot/share/classfile/classLoaderData.hpp b/src/hotspot/share/classfile/classLoaderData.hpp
-index 16711dca237..b10fafa01e5 100644
---- a/src/hotspot/share/classfile/classLoaderData.hpp
-+++ b/src/hotspot/share/classfile/classLoaderData.hpp
-@@ -108,6 +108,10 @@ class ClassLoaderDataGraph : public AllStatic {
-   // for redefinition.  These classes are removed during the next class unloading.
-   // Walking the ClassLoaderDataGraph also includes anonymous classes.
-   static void classes_do(KlassClosure* klass_closure);
-+
-+  // Enhanced class redefinition
-+  static void anonymous_classes_do(KlassClosure* klass_closure);
-+
-   static void classes_do(void f(Klass* const));
-   static void methods_do(void f(Method*));
-   static void modules_do(void f(ModuleEntry*));
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 0d1c68f5cd0..745109902af 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -2130,8 +2130,17 @@ jvmtiError VM_EnhancedRedefineClasses::find_sorted_affected_classes(TRAPS) {
-   AffectedKlassClosure closure(_affected_klasses);
-   // Updated in j10, from original SystemDictionary::classes_do
- 
--  ClassLoaderDataGraph::classes_do(&closure);
--  //ClassLoaderDataGraph::dictionary_classes_do(&closure);
-+  // 0. we can't use ClassLoaderDataGraph::classes_do since classes can be uninitialized in cld,
-+  // fully initialized class is in system dictionary
-+  // ClassLoaderDataGraph::classes_do(&closure);
-+
-+  // 1. Scan over dictionaries
-+  ClassLoaderDataGraph::dictionary_classes_do(&closure);
-+
-+  // 2. Anonymous class is not in dictionary, we have to iterate anonymous cld directly, but there is race cond...
-+  // TODO: review ... anonymous class is added to cld before InstanceKlass initialization,
-+  //                  find out how to check if the InstanceKlass is initialized
-+  ClassLoaderDataGraph::anonymous_classes_do(&closure);
- 
-   log_trace(redefine, class, load)("%d classes affected", _affected_klasses->length());
- 
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0029-JBR-3867-update-keys-of-jvmti-TAG-map-after-redefini.patch

@@ -1,222 +0,0 @@
-From 0bfeca57132d21f8bc68079ee41dd42bead48f02 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Sun, 10 Oct 2021 20:25:30 +0200
-Subject: [PATCH 29/31] JBR-3867 - update keys of jvmti TAG map after
- redefinition
-
-jdwp keeps relation class_ptr->class_ref in jvmti tag. class_ptr is used
-as a tag key, tag value is refnode. There are new class_ptrs after
-redefinition, therefore jdwp redefinition method update all affected
-keys in the tag map.
----
- src/hotspot/share/prims/jvmtiExtensions.cpp   | 24 ++++++++++++++
- .../share/native/libjdwp/VirtualMachineImpl.c | 20 +++++++++++
- .../share/native/libjdwp/commonRef.c          | 29 ++++++++++++++++
- .../share/native/libjdwp/commonRef.h          |  2 ++
- .../share/native/libjdwp/util.c               | 33 +++++++++++++++++++
- .../share/native/libjdwp/util.h               |  3 ++
- 6 files changed, 111 insertions(+)
-
-diff --git a/src/hotspot/share/prims/jvmtiExtensions.cpp b/src/hotspot/share/prims/jvmtiExtensions.cpp
-index 36bc47ad0b5..8a6058fd884 100644
---- a/src/hotspot/share/prims/jvmtiExtensions.cpp
-+++ b/src/hotspot/share/prims/jvmtiExtensions.cpp
-@@ -49,6 +49,15 @@ static jvmtiError JNICALL IsClassUnloadingEnabled(const jvmtiEnv* env, ...) {
-   return JVMTI_ERROR_NONE;
- }
- 
-+// extension function
-+static jvmtiError JNICALL IsEnhancedClassRedefinitionEnabled(const jvmtiEnv* env, jboolean* enabled, ...) {
-+  if (enabled == NULL) {
-+    return JVMTI_ERROR_NULL_POINTER;
-+  }
-+  *enabled = (jboolean)AllowEnhancedClassRedefinition;
-+  return JVMTI_ERROR_NONE;
-+}
-+
- // register extension functions and events. In this implementation we
- // have a single extension function (to prove the API) that tests if class
- // unloading is enabled or disabled. We also have a single extension event
-@@ -88,6 +97,21 @@ void JvmtiExtensions::register_extensions() {
-     event_params
-   };
-   _ext_events->append(&ext_event);
-+
-+  static jvmtiParamInfo func_params_enh_redef[] = {
-+    { (char*)"IsEnhancedClassRedefinitionEnabled", JVMTI_KIND_OUT,  JVMTI_TYPE_JBOOLEAN, JNI_FALSE }
-+
-+  };
-+  static jvmtiExtensionFunctionInfo ext_func_enh_redef = {
-+    (jvmtiExtensionFunction)IsEnhancedClassRedefinitionEnabled,
-+    (char*)"com.sun.hotspot.functions.IsEnhancedClassRedefinitionEnabled",
-+    (char*)"Tell if enhanced class redefinition is enabled (-noclassgc)",
-+    sizeof(func_params_enh_redef)/sizeof(func_params_enh_redef[0]),
-+    func_params_enh_redef,
-+    0,              // no non-universal errors
-+    NULL
-+  };
-+  _ext_functions->append(&ext_func_enh_redef);
- }
- 
- 
-diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
-index d7ca956dc57..faa8f55f91f 100644
---- a/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
-+++ b/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
-@@ -475,6 +475,14 @@ redefineClasses(PacketInputStream *in, PacketOutputStream *out)
-     if (ok == JNI_TRUE) {
-         jvmtiError error;
- 
-+        jlong classIds[classCount];
-+
-+        if (gdata->isEnhancedClassRedefinitionEnabled) {
-+            for (i = 0; i < classCount; ++i) {
-+              classIds[i] = commonRef_refToID(env, classDefs[i].klass);
-+            }
-+        }
-+
-         error = JVMTI_FUNC_PTR(gdata->jvmti,RedefineClasses)
-                         (gdata->jvmti, classCount, classDefs);
-         if (error != JVMTI_ERROR_NONE) {
-@@ -484,6 +492,18 @@ redefineClasses(PacketInputStream *in, PacketOutputStream *out)
-             for ( i = 0 ; i < classCount; i++ ) {
-                 eventHandler_freeClassBreakpoints(classDefs[i].klass);
-             }
-+
-+            if (gdata->isEnhancedClassRedefinitionEnabled) {
-+                /* Update tags in jvmti to use new classes */
-+                for ( i = 0 ; i < classCount; i++ ) {
-+                    /* pointer in classIds[i] is updated by advanced redefinition to a new class */
-+                    error = commonRef_updateTags(env, classIds[i]);
-+                    if (error != JVMTI_ERROR_NONE) {
-+                        break;
-+                    }
-+                }
-+            }
-+
-         }
-     }
- 
-diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c b/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c
-index 2a8f55014d9..3f33b423209 100644
---- a/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c
-+++ b/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c
-@@ -618,3 +618,32 @@ commonRef_unlock(void)
- {
-     debugMonitorExit(gdata->refLock);
- }
-+
-+/*
-+ * Update JVMTI tags, used from enhanced redefinition
-+ */
-+jvmtiError
-+commonRef_updateTags(JNIEnv *env, jlong id)
-+{
-+    jvmtiError error;
-+
-+    error = JVMTI_ERROR_NONE;
-+
-+    if (id == NULL_OBJECT_ID) {
-+        return error;
-+    }
-+
-+    debugMonitorEnter(gdata->refLock); {
-+        RefNode *node;
-+
-+        node = findNodeByID(env, id);
-+        if (node != NULL) {
-+            error = JVMTI_FUNC_PTR(gdata->jvmti, SetTag)
-+                                  (gdata->jvmti, node->ref, ptr_to_jlong(node));
-+        } else {
-+            printf("Node not found\n");
-+        }
-+    } debugMonitorExit(gdata->refLock);
-+
-+    return error;
-+}
-diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.h b/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.h
-index 7c76667eb19..d7b01e62a47 100644
---- a/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.h
-+++ b/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.h
-@@ -41,4 +41,6 @@ void commonRef_compact(void);
- void commonRef_lock(void);
- void commonRef_unlock(void);
- 
-+jvmtiError commonRef_updateTags(JNIEnv *env, jlong id);
-+
- #endif
-diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/util.c b/src/jdk.jdwp.agent/share/native/libjdwp/util.c
-index f4a1d19589d..0642c4a3d7f 100644
---- a/src/jdk.jdwp.agent/share/native/libjdwp/util.c
-+++ b/src/jdk.jdwp.agent/share/native/libjdwp/util.c
-@@ -41,6 +41,7 @@ BackendGlobalData *gdata = NULL;
- static jboolean isInterface(jclass clazz);
- static jboolean isArrayClass(jclass clazz);
- static char * getPropertyUTF8(JNIEnv *env, char *propertyName);
-+static jboolean isEnhancedClassRedefinitionEnabled(JNIEnv *env);
- 
- /* Save an object reference for use later (create a NewGlobalRef) */
- void
-@@ -281,6 +282,8 @@ util_initialize(JNIEnv *env)
-             }
-         }
- 
-+        gdata->isEnhancedClassRedefinitionEnabled = isEnhancedClassRedefinitionEnabled(env);
-+
-     } END_WITH_LOCAL_REFS(env);
- 
- }
-@@ -1739,6 +1742,36 @@ getPropertyUTF8(JNIEnv *env, char *propertyName)
-     return value;
- }
- 
-+static jboolean
-+isEnhancedClassRedefinitionEnabled(JNIEnv *env)
-+{
-+    jvmtiError error;
-+    jint count, i;
-+    jvmtiExtensionFunctionInfo* ext_funcs;
-+
-+    error = JVMTI_FUNC_PTR(gdata->jvmti,GetExtensionFunctions)
-+                (gdata->jvmti, &count, &ext_funcs);
-+    if (error != JVMTI_ERROR_NONE) {
-+        return JNI_FALSE;
-+    }
-+
-+    for (i=0; i<count; i++) {
-+        if (strcmp(ext_funcs[i].id, (char*)"com.sun.hotspot.functions.IsEnhancedClassRedefinitionEnabled") == 0) {
-+            jboolean enabled;
-+            error = (*ext_funcs[i].func)(gdata->jvmti, &enabled);
-+
-+            if (error != JVMTI_ERROR_NONE) {
-+                return JNI_FALSE;
-+            } else {
-+                return enabled;
-+            }
-+        }
-+    }
-+
-+    return JNI_FALSE;
-+}
-+
-+
- jboolean
- isMethodObsolete(jmethodID method)
- {
-diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/util.h b/src/jdk.jdwp.agent/share/native/libjdwp/util.h
-index bcb59457120..72a365ad3c3 100644
---- a/src/jdk.jdwp.agent/share/native/libjdwp/util.h
-+++ b/src/jdk.jdwp.agent/share/native/libjdwp/util.h
-@@ -126,6 +126,9 @@ typedef struct {
-     int           objectsByIDsize;
-     int           objectsByIDcount;
- 
-+    /* true if enhanced class redefinition is enabled */
-+    jboolean isEnhancedClassRedefinitionEnabled;
-+
-      /* Indication that the agent has been loaded */
-      jboolean isLoaded;
- 
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0030-JBR-3867-fix-msvc-compilation-issue-with-non-const-a.patch

@@ -1,54 +0,0 @@
-From 16a09678b838d67b0a80340ba904b600013a494f Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Mon, 11 Oct 2021 20:22:26 +0200
-Subject: [PATCH 30/31] JBR-3867 - fix msvc compilation issue with non const
- array on stack
-
----
- .../share/native/libjdwp/VirtualMachineImpl.c      | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
-index faa8f55f91f..53f7e44f579 100644
---- a/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
-+++ b/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
-@@ -475,11 +475,16 @@ redefineClasses(PacketInputStream *in, PacketOutputStream *out)
-     if (ok == JNI_TRUE) {
-         jvmtiError error;
- 
--        jlong classIds[classCount];
-+        jlong* classIds = NULL;
- 
-         if (gdata->isEnhancedClassRedefinitionEnabled) {
--            for (i = 0; i < classCount; ++i) {
--              classIds[i] = commonRef_refToID(env, classDefs[i].klass);
-+            classIds = jvmtiAllocate(classCount*(int)sizeof(jlong));
-+            if (classIds == NULL) {
-+                outStream_setError(out, JDWP_ERROR(OUT_OF_MEMORY));
-+                return JNI_TRUE;
-+            }
-+            for (i = 0; i < classCount; i++) {
-+                classIds[i] = commonRef_refToID(env, classDefs[i].klass);
-             }
-         }
- 
-@@ -493,7 +498,7 @@ redefineClasses(PacketInputStream *in, PacketOutputStream *out)
-                 eventHandler_freeClassBreakpoints(classDefs[i].klass);
-             }
- 
--            if (gdata->isEnhancedClassRedefinitionEnabled) {
-+            if (gdata->isEnhancedClassRedefinitionEnabled && classIds != NULL) {
-                 /* Update tags in jvmti to use new classes */
-                 for ( i = 0 ; i < classCount; i++ ) {
-                     /* pointer in classIds[i] is updated by advanced redefinition to a new class */
-@@ -502,6 +507,7 @@ redefineClasses(PacketInputStream *in, PacketOutputStream *out)
-                         break;
-                     }
-                 }
-+                jvmtiDeallocate((void*) classIds);
-             }
- 
-         }
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0031-Attempt-to-fix-JBR-3887.patch

@@ -1,31 +0,0 @@
-From 8d3ebd313983584f63e2d5b3e32f3e2c60191711 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Tue, 19 Oct 2021 17:02:35 +0200
-Subject: [PATCH 31/31] Attempt to fix JBR-3887
-
----
- src/hotspot/share/prims/jvmtiExtensions.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/hotspot/share/prims/jvmtiExtensions.cpp b/src/hotspot/share/prims/jvmtiExtensions.cpp
-index 8a6058fd884..9c8c98cb70e 100644
---- a/src/hotspot/share/prims/jvmtiExtensions.cpp
-+++ b/src/hotspot/share/prims/jvmtiExtensions.cpp
-@@ -50,7 +50,13 @@ static jvmtiError JNICALL IsClassUnloadingEnabled(const jvmtiEnv* env, ...) {
- }
- 
- // extension function
--static jvmtiError JNICALL IsEnhancedClassRedefinitionEnabled(const jvmtiEnv* env, jboolean* enabled, ...) {
-+static jvmtiError JNICALL IsEnhancedClassRedefinitionEnabled(const jvmtiEnv* env, ...) {
-+  jboolean* enabled = NULL;
-+  va_list ap;
-+
-+  va_start(ap, env);
-+  enabled = va_arg(ap, jboolean *);
-+  va_end(ap);
-   if (enabled == NULL) {
-     return JVMTI_ERROR_NULL_POINTER;
-   }
--- 
-2.23.0
-

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

@@ -1,163 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies major version of OpenJDK e.g. 11_0_6 (instead of dots '.' underbars "_" are used)
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to be built; possible values:
-#                        jcef - the release bundles with jcef
-#                        dcevm - the release bundles with dcevm patches
-#                        nomod - the release bundles without any additional modules (jcef)
-#                        fd - the fastdebug bundles which also include the jcef module
-#
-# jbrsdk-${JBSDK_VERSION}-windows-aarch64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-windows-aarch64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-# Environment variables:
-#   MODULAR_SDK_PATH - specifies the path to the directory where imported modules are located.
-#                      By default imported modules should be located in ./modular-sdk.
-#   JCEF_PATH        - specifies the path to the directory with JCEF binaries.
-#                      By default JCEF binaries should be located in ./jcef_win_aarch64.
-#   BOOT_JDK         - specifies the path to the directory with a ready build of OpenJDK 11 with
-#                      the same architecture as the build system. It will be used as the boot jdk.
-
-while getopts ":i?" o; do
-    case "${o}" in
-        i)
-            i="incremental build"
-            INC_BUILD=1
-            ;;
-    esac
-done
-shift $((OPTIND-1))
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-bundle_type=$4
-JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
-WORK_DIR=$(pwd)
-WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=${WORK_DIR}/modular-sdk}"
-JCEF_PATH=${JCEF_PATH:=${WORK_DIR}/jcef_win_aarch64}
-TOOLCHAIN_VERSION=${TOOLCHAIN_VERSION:=2019}
-
-source jb/project/tools/common.sh
-
-function do_configure {
-  sh ./configure \
-    --openjdk-target=aarch64-unknown-cygwin \
-    --disable-warnings-as-errors \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="${VENDOR_NAME}" \
-    --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build=${JDK_BUILD_NUMBER} \
-    --with-version-opt=b${build_number} \
-    $WITH_IMPORT_MODULES \
-    --with-toolchain-version=${TOOLCHAIN_VERSION} \
-    --with-boot-jdk=${BOOT_JDK} \
-    --with-build-jdk=${BOOT_JDK} \
-    --disable-ccache \
-    --enable-cds=yes || do_exit $?
-}
-
-function create_jbr {
-
-  JBR_BUNDLE=jbr_${bundle_type}
-
-  case "${bundle_type}" in
-  "jcef" | "dcevm" | "nomod" | "fd")
-    JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
-    ;;
-  *)
-    echo "***ERR*** bundle was not specified" && do_exit 1
-    ;;
-  esac
-
-  echo "Exclude jdk.internal.vm.compiler and jdk.aot (because aot is not supported yet)"
-  cat modules.list | \
-    grep -v "jdk.internal.vm.compiler\|jdk.aot" \
-    > modules_tmp.list
-
-  rm -rf ${JBR_BUNDLE}
-
-  echo Running jlink....
-  ${BOOT_JDK}/bin/jlink \
-    --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
-    --add-modules $(xargs < modules_tmp.list | sed 's/ //g' | sed 's/,\?$//g') --output ${JBR_BUNDLE} || do_exit $?
-  if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]] || [[ "${bundle_type}" == fd ]]
-  then
-    rsync -av ${JCEF_PATH}/ ${JBR_BUNDLE}/bin --exclude="modular-sdk" || do_exit $?
-  fi
-  echo Modifying release info ...
-  cat ${JSDK}/release | tr -d '\r' | grep -v 'JAVA_VERSION' | grep -v 'MODULES' >> ${JBR_BUNDLE}/release
-}
-
-JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=windows-aarch64-normal-server-release
-JBSDK=${JBRSDK_BASE_NAME}-windows-aarch64-b${build_number}
-case "$bundle_type" in
-  "jcef")
-    git apply -p0 < jb/project/tools/patches/add_jcef_module_winaarch64.patch || do_exit $?
-    do_reset_changes=1
-    ;;
-  "dcevm")
-    HEAD_REVISION=$(git rev-parse HEAD)
-    git am jb/project/tools/patches/dcevm/*.patch || do_exit $?
-    do_reset_dcevm=1
-    git apply -p0 < jb/project/tools/patches/add_jcef_module_winaarch64.patch || do_exit $?
-    do_reset_changes=1
-    ;;
-  "nomod")
-    WITH_IMPORT_MODULES=""
-    ;;
-  "fd")
-    git apply -p0 < jb/project/tools/patches/add_jcef_module_winaarch64.patch || do_exit $?
-    do_reset_changes=1
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=windows-aarch64-normal-server-fastdebug
-    JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}-fastdebug
-    JBSDK=${JBRSDK_BASE_NAME}-windows-aarch64-fastdebug-b${build_number}
-    ;;
-  *)
-    echo "***ERR*** bundle was not specified" && do_exit 1
-    ;;
-esac
-
-if [ -z "$INC_BUILD" ]; then
-  do_configure || do_exit $?
-  if [ "${bundle_type}" == "jcef" ]; then
-    make LOG=info clean images test-image CONF=$RELEASE_NAME || do_exit $?
-  else
-    make LOG=info clean images CONF=$RELEASE_NAME || do_exit $?
-  fi
-else
-  if [ "${bundle_type}" == "jcef" ]; then
-    make LOG=info images test-image CONF=$RELEASE_NAME || do_exit $?
-  else
-    make LOG=info images CONF=$RELEASE_NAME || do_exit $?
-  fi
-fi
-
-JSDK=build/$RELEASE_NAME/images/jdk
-BASE_DIR=build/$RELEASE_NAME/images
-JBRSDK_BUNDLE=jbrsdk
-
-rm -rf ${BASE_DIR}/${JBRSDK_BUNDLE} && rsync -a --exclude demo --exclude sample ${JSDK}/ ${JBRSDK_BUNDLE} || do_exit $?
-if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]] || [[ "${bundle_type}" == fd ]]
-then
-  rsync -av ${JCEF_PATH}/ ${JBRSDK_BUNDLE}/bin --exclude='modular-sdk' || do_exit $?
-  sed 's/JBR/JBRSDK/g' ${JSDK}/release > release
-  mv release ${JBRSDK_BUNDLE}/release
-fi
-
-create_jbr || do_exit $?
-
-do_exit 0

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

@@ -24,16 +24,6 @@
 #   JCEF_PATH - specifies the path to the directory with JCEF binaries.
 #               By default JCEF binaries should be located in ./jcef_win_x64
 
-while getopts ":i?" o; do
-    case "${o}" in
-        i)
-            i="incremental build"
-            INC_BUILD=1
-            ;;
-    esac
-done
-shift $((OPTIND-1))
-
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
@@ -46,23 +36,6 @@ TOOLCHAIN_VERSION=${TOOLCHAIN_VERSION:=2015}
 
 source jb/project/tools/common.sh
 
-function do_configure {
-  sh ./configure \
-    --disable-warnings-as-errors \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="${VENDOR_NAME}" \
-    --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build=${JDK_BUILD_NUMBER} \
-    --with-version-opt=b${build_number} \
-    $WITH_IMPORT_MODULES \
-    --with-toolchain-version=${TOOLCHAIN_VERSION} \
-    --with-boot-jdk=${BOOT_JDK} \
-    --disable-ccache \
-    --enable-cds=yes || do_exit $?
-}
-
 function create_jbr {
 
   JBR_BUNDLE=jbr_${bundle_type}
@@ -122,19 +95,25 @@ case "$bundle_type" in
     ;;
 esac
 
-if [ -z "$INC_BUILD" ]; then
-  do_configure || do_exit $?
-  if [ "${bundle_type}" == "jcef" ]; then
-    make LOG=info CONF=$RELEASE_NAME clean images test-image || do_exit $?
-  else
-    make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
-  fi
+sh ./configure \
+  --disable-warnings-as-errors \
+  $WITH_DEBUG_LEVEL \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
+  --with-jvm-features=shenandoahgc \
+  --with-version-pre= \
+  --with-version-build=${JDK_BUILD_NUMBER} \
+  --with-version-opt=b${build_number} \
+  $WITH_IMPORT_MODULES \
+  --with-toolchain-version=${TOOLCHAIN_VERSION} \
+  --with-boot-jdk=${BOOT_JDK} \
+  --disable-ccache \
+  --enable-cds=yes || do_exit $?
+
+if [ "${bundle_type}" == "jcef" ]; then
+  make LOG=info clean images test-image CONF=$RELEASE_NAME || do_exit $?
 else
-  if [ "${bundle_type}" == "jcef" ]; then
-    make LOG=info CONF=$RELEASE_NAME images test-image || do_exit $?
-  else
-    make LOG=info CONF=$RELEASE_NAME images || do_exit $?
-  fi
+  make LOG=info clean images CONF=$RELEASE_NAME || do_exit $?
 fi
 
 JSDK=build/$RELEASE_NAME/images/jdk

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

@@ -1,83 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies major version of OpenJDK e.g. 11_0_6 (instead of dots '.' underbars "_" are used)
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to be built; possible values:
-#                        jcef - the release bundles with jcef
-#                        dcevm - the release bundles with dcevm patches
-#                        nomod - the release bundles without any additional modules (jcef)
-#                        fd - the fastdebug bundles which also include the jcef module
-#
-# jbrsdk-${JBSDK_VERSION}-windows-aarch64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-windows-aarch64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-# Environment variables:
-#   MODULAR_SDK_PATH - specifies the path to the directory where imported modules are located.
-#                      By default imported modules should be located in ./modular-sdk.
-#   JCEF_PATH        - specifies the path to the directory with JCEF binaries.
-#                      By default JCEF binaries should be located in ./jcef_win_aarch64.
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-bundle_type=$4
-
-source jb/project/tools/common.sh
-
-function pack_jbr {
-
-  JBR_BUNDLE=jbr_${bundle_type}
-
-  case "${bundle_type}" in
-  "jcef" | "dcevm" | "nomod" | "fd")
-    JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
-    ;;
-  *)
-    echo "***ERR*** bundle was not specified" && do_exit 1
-    ;;
-  esac
-
-  JBR=$JBR_BASE_NAME-windows-aarch64-b$build_number
-  echo Creating $JBR.tar.gz ...
-  chmod -R ug+rwx,o+rx ${BASE_DIR}/${JBR_BUNDLE}
-  cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
-  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR jbr || do_exit $?
-}
-
-JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=windows-aarch64-normal-server-release
-JBSDK=${JBRSDK_BASE_NAME}-windows-aarch64-b${build_number}
-case "$bundle_type" in
-  "fd")
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=windows-aarch64-normal-server-fastdebug
-    JBSDK=${JBRSDK_BASE_NAME}-windows-aarch64-fastdebug-b${build_number}
-    ;;
-esac
-
-IMAGES_DIR=build/$RELEASE_NAME/images
-JSDK=$IMAGES_DIR/jdk
-BASE_DIR=.
-
-if [ "${bundle_type}" == "jcef" ] || [ "${bundle_type}" == "fd" ]; then
-  JBRSDK_BUNDLE=jbrsdk
-  echo Creating $JBSDK.tar.gz ...
-  [ -f "$JBSDK.tar.gz" ] && rm "$JBSDK.tar.gz"
-  /usr/bin/tar -czf $JBSDK.tar.gz $JBRSDK_BUNDLE || do_exit $?
-fi
-
-pack_jbr $bundle_type
-
-if [ "$bundle_type" == "jcef" ]; then
-  JBRSDK_TEST=$JBRSDK_BASE_NAME-windows-test-aarch64-b$build_number
-  echo Creating $JBRSDK_TEST.tar.gz ...
-  /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
-fi

make/Docs.gmk

@@ -168,6 +168,14 @@ JAVADOC_TOP := \
     font-family: DejaVu Sans, Arial, Helvetica, sans-serif; \
     font-weight: normal;">$(DRAFT_TEXT)</div>
 
+JDK_INDEX_CONTENT := \
+    <!DOCTYPE html> \
+    <html lang="en"> \
+    <head> \
+    <meta http-equiv="refresh" content="0;url=api/index.html"> \
+    </head> \
+    </html>
+
 ################################################################################
 # JDK javadoc titles/text snippets
 
@@ -477,7 +485,14 @@ $(eval $(call SetupApiDocsGeneration, REFERENCE_API, \
 
 ################################################################################
 
-# Copy the global resources, including the top-level redirect index.html
+JDK_INDEX_HTML := $(DOCS_OUTPUTDIR)/index.html
+
+$(JDK_INDEX_HTML):
+	$(ECHO) '$(JDK_INDEX_CONTENT)' > $@
+
+JDK_INDEX_TARGETS += $(JDK_INDEX_HTML)
+
+# Copy the global resources
 GLOBAL_SPECS_RESOURCES_DIR := $(TOPDIR)/make/data/docs-resources/
 $(eval $(call SetupCopyFiles, COPY_GLOBAL_RESOURCES, \
     SRC := $(GLOBAL_SPECS_RESOURCES_DIR), \

make/JBRApi.gmk

@@ -1,80 +0,0 @@
-#
-# Copyright 2000-2021 JetBrains s.r.o.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
-include SetupJavaCompilers.gmk
-
-JBR_API_ROOT_DIR := $(TOPDIR)/src/jetbrains.api
-JBR_API_GENSRC_TEMPLATES := $(JBR_API_ROOT_DIR)/templates
-JBR_API_SRC_DIR          := $(JBR_API_ROOT_DIR)/src
-JBR_API_OUTPUT_DIR := $(OUTPUTDIR)/jbr-api
-JBR_API_GENSRC_DIR := $(JBR_API_OUTPUT_DIR)/gensrc
-JBR_API_BIN_DIR    := $(JBR_API_OUTPUT_DIR)/bin
-JBR_API_VERSION_PROPERTIES := $(JBR_API_ROOT_DIR)/version.properties
-
-JBR_API_GENSRC_SOURCES := $(call FindFiles, $(JBR_API_GENSRC_TEMPLATES))
-JBR_API_GENSRC_FILES := $(JBR_API_GENSRC_DIR)/com/jetbrains/JBR.java
-JBR_API_SRC_FILES := $(call FindFiles, $(JBR_API_SRC_DIR))
-
-ifeq ($(JBR_API_JBR_VERSION),)
-  JBR_API_JBR_VERSION := <DEVELOPMENT>
-  JBR_API_FAIL_ON_HASH_MISMATCH := false
-else
-  .PHONY: $(JBR_API_VERSION_PROPERTIES)
-  JBR_API_FAIL_ON_HASH_MISMATCH := true
-endif
-
-ARCHIVE_BUILD_JBR_API_BIN := $(JBR_API_BIN_DIR)
-$(eval $(call SetupJavaCompilation, BUILD_JBR_API, \
-    SETUP := BOOT_JAVAC, \
-    SRC := $(JBR_API_GENSRC_DIR) $(JBR_API_SRC_DIR), \
-    EXTRA_FILES := $(JBR_API_GENSRC_FILES), \
-    DEPENDS := $(JBR_API_GENSRC_FILES), \
-    BIN := $(JBR_API_BIN_DIR), \
-    JAR := $(JBR_API_OUTPUT_DIR)/jbr-api.jar, \
-))
-
-$(eval $(call SetupJarArchive, BUILD_JBR_API_SOURCES_JAR, \
-    DEPENDENCIES := $(JBR_API_GENSRC_FILES) $(JBR_API_SRC_FILES), \
-    SRCS := $(JBR_API_GENSRC_DIR) $(JBR_API_SRC_DIR), \
-    JAR := $(JBR_API_OUTPUT_DIR)/jbr-api-sources.jar, \
-    SUFFIXES := .java, \
-    BIN := $(JBR_API_BIN_DIR), \
-))
-
-$(JBR_API_GENSRC_FILES): $(JBR_API_GENSRC_SOURCES) $(JBR_API_SRC_FILES) $(JBR_API_VERSION_PROPERTIES)
-	$(ECHO) Generating sources for JBR API
-	$(JAVA_CMD) $(JAVA_FLAGS_SMALL) "$(JBR_API_GENSRC_TEMPLATES)/Gensrc.java" \
-	    "$(TOPDIR)/src" "$(JBR_API_OUTPUT_DIR)" "$(JBR_API_JBR_VERSION)"
-
-jbr-api-check-version: $(JBR_API_GENSRC_FILES) $(JBR_API_SRC_FILES) $(JBR_API_VERSION_PROPERTIES)
-	$(JAVA_CMD) $(JAVA_FLAGS_SMALL) "$(JBR_API_GENSRC_TEMPLATES)/CheckVersion.java" \
-	    "$(JBR_API_ROOT_DIR)" "$(JBR_API_GENSRC_DIR)" "$(JBR_API_FAIL_ON_HASH_MISMATCH)"
-
-jbr-api: $(BUILD_JBR_API) $(BUILD_JBR_API_SOURCES_JAR) jbr-api-check-version
-
-.PHONY: jbr-api jbr-api-check-version
-
-ifneq ($(JBR_API_CONF_FILE),)
-  $(JBR_API_CONF_FILE): $(JBR_API_GENSRC_FILES)
-	$(ECHO) "VERSION=`$(CAT) $(JBR_API_OUTPUT_DIR)/jbr-api.version`" > $(JBR_API_CONF_FILE)
-	$(ECHO) "JAR=$(JBR_API_OUTPUT_DIR)/jbr-api.jar" >> $(JBR_API_CONF_FILE)
-	$(ECHO) "SOURCES_JAR=$(JBR_API_OUTPUT_DIR)/jbr-api-sources.jar" >> $(JBR_API_CONF_FILE)
-  jbr-api: $(JBR_API_CONF_FILE)
-  .PHONY: $(JBR_API_CONF_FILE)
-endif

make/Main.gmk

@@ -1254,13 +1254,6 @@ ALL_TARGETS += clean clean-docs clean-compile-commands dist-clean $(CLEAN_DIR_TA
     $(CLEAN_SUPPORT_DIR_TARGETS) $(CLEAN_TEST_TARGETS) $(CLEAN_PHASE_TARGETS) \
     $(CLEAN_MODULE_TARGETS) $(CLEAN_MODULE_PHASE_TARGETS)
 
-################################################################################
-# JBR API
-
-jbr-api:
-	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f JBRApi.gmk jbr-api)
-ALL_TARGETS += jbr-api
-
 ################################################################################
 # Declare *-only targets for each normal target
 $(foreach t, $(ALL_TARGETS), $(eval $(t)-only: $(t)))

make/RunTests.gmk

@@ -532,7 +532,6 @@ define SetupRunGtestTestBody
 	    $$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/$$($1_VARIANT)/gtestLauncher \
 	        -jdk $(JDK_IMAGE_DIR) $$($1_GTEST_FILTER) \
 	        --gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \
-	        --gtest_catch_exceptions=0 \
 	        $$($1_GTEST_REPEAT) $$(GTEST_OPTIONS) $$(GTEST_VM_OPTIONS) \
 	        $$(GTEST_JAVA_OPTIONS) $$($1_AOT_OPTIONS) \
 	        > >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) \

make/autoconf/basics.m4

@@ -672,16 +672,6 @@ AC_DEFUN([BASIC_EVAL_DEVKIT_VARIABLE],
   fi
 ])
 
-###############################################################################
-# Evaluates platform specific overrides for build devkit variables.
-# $1: Name of variable
-AC_DEFUN([BASIC_EVAL_BUILD_DEVKIT_VARIABLE],
-[
-  if test "x[$]$1" = x; then
-    eval $1="\${$1_${OPENJDK_BUILD_CPU}}"
-  fi
-])
-
 ###############################################################################
 AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
 [

make/autoconf/basics_windows.m4

@@ -112,6 +112,7 @@ AC_DEFUN([BASIC_FIXUP_PATH_CYGWIN],
   # unix format.
   path="[$]$1"
   new_path=`$CYGPATH -u "$path"`
+
   # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
   # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
   # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
@@ -401,19 +402,8 @@ AC_DEFUN_ONCE([BASIC_COMPILE_FIXPATH],
     BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_BIN_W])
     $RM -rf $FIXPATH_BIN $FIXPATH_DIR
     $MKDIR -p $FIXPATH_DIR $CONFIGURESUPPORT_OUTPUTDIR/bin
-    # simple cross compilation solution for fixpath for aarch64
-    # Final solution should be backport of 8257679
-    if test "x$COMPILE_TYPE-$OPENJDK_TARGET_CPU" = xcross-aarch64; then
-      FIXPATH_CC=`$ECHO "$CC"|$SED 's|/arm64/cl|/x64/cl|I'`
-      FIXPATH_LIB=`$ECHO "$LIB"|$SED 's|arm64|x64|gI'`
-    else
-      FIXPATH_CC=$CC
-      FIXPATH_LIB=$LIB
-    fi
-    OLDLIB=$LIB
-    export LIB="$FIXPATH_LIB"
     cd $FIXPATH_DIR
-    $FIXPATH_CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1
+    $CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1
     cd $CURDIR
 
     if test ! -x $FIXPATH_BIN; then
@@ -424,10 +414,9 @@ AC_DEFUN_ONCE([BASIC_COMPILE_FIXPATH],
     AC_MSG_RESULT([yes])
     AC_MSG_CHECKING([if fixpath.exe works])
     cd $FIXPATH_DIR
-    $FIXPATH $FIXPATH_CC $FIXPATH_SRC -Fe$FIXPATH_DIR/fixpath2.exe \
+    $FIXPATH $CC $FIXPATH_SRC -Fe$FIXPATH_DIR/fixpath2.exe \
         > $FIXPATH_DIR/fixpath2.log 2>&1
     cd $CURDIR
-    export LIB="$OLDLIB"
     if test ! -x $FIXPATH_DIR/fixpath2.exe; then
       AC_MSG_RESULT([no])
       cat $FIXPATH_DIR/fixpath2.log

make/autoconf/buildjdk-spec.gmk.in

@@ -30,13 +30,13 @@
 # First include the real base spec.gmk file
 include @SPEC@
 
-CC := @FIXPATH@ @BUILD_CC@
-CXX := @FIXPATH@ @BUILD_CXX@
-LD := @FIXPATH@ @BUILD_LD@
-LDCXX := @FIXPATH@ @BUILD_LDCXX@
-AS := @FIXPATH@ @BUILD_AS@
+CC := @BUILD_CC@
+CXX := @BUILD_CXX@
+LD := @BUILD_LD@
+LDCXX := @BUILD_LDCXX@
+AS := @BUILD_AS@
 NM := @BUILD_NM@
-AR := @FIXPATH@ @BUILD_AR@
+AR := @BUILD_AR@
 OBJCOPY := @BUILD_OBJCOPY@
 STRIP := @BUILD_STRIP@
 SYSROOT_CFLAGS := @BUILD_SYSROOT_CFLAGS@

make/autoconf/flags-cflags.m4

@@ -705,9 +705,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
       $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -DcpuIntel -Di586 -D$FLAGS_CPU_LEGACY_LIB"
     fi
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    if test "x$FLAGS_CPU" = xaarch64; then
-      $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_ARM64_ -Darm64"
-    elif test "x$FLAGS_CPU" = xx86_64; then
+    if test "x$FLAGS_CPU" = xx86_64; then
       $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_AMD64_ -Damd64"
     else
       $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_X86_ -Dx86"
@@ -717,21 +715,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
   # CFLAGS PER CPU
   if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
     # COMMON to gcc and clang
-    AC_MSG_CHECKING([if $1 is x86])
     if test "x$FLAGS_CPU" = xx86; then
-      AC_MSG_RESULT([yes])
-      AC_MSG_CHECKING([if control flow protection is enabled by additional compiler flags])
-      if echo "${EXTRA_CFLAGS}${EXTRA_CXXFLAGS}${EXTRA_ASFLAGS}" | ${GREP} -q 'fcf-protection' ; then
-        # cf-protection requires CMOV and thus i686
-        $1_CFLAGS_CPU="-march=i686"
-        AC_MSG_RESULT([yes, forcing ${$1_CFLAGS_CPU}])
-      else
-        # Force compatibility with i586 on 32 bit intel platforms.
-        $1_CFLAGS_CPU="-march=i586"
-        AC_MSG_RESULT([no, forcing ${$1_CFLAGS_CPU}])
-      fi
-    else
-      AC_MSG_RESULT([no])
+      # Force compatibility with i586 on 32 bit intel platforms.
+      $1_CFLAGS_CPU="-march=i586"
     fi
   fi
 

make/autoconf/flags-ldflags.m4

@@ -118,7 +118,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
       # Assume clang or gcc.
       # FIXME: We should really generalize SET_SHARED_LIBRARY_ORIGIN instead.
       OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.."
-      OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN"
+      OS_LDFLAGS_JDK_ONLY="-mmacosx-version-min=$MACOSX_VERSION_MIN"
     fi
   fi
 
@@ -188,19 +188,20 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
     fi
 
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    if test "x${OPENJDK_$1_CPU_BITS}" = "x32"; then
-      $1_CPU_EXECUTABLE_LDFLAGS="-stack:327680"
-    elif test "x${OPENJDK_$1_CPU_BITS}" = "x64"; then
-      $1_CPU_EXECUTABLE_LDFLAGS="-stack:1048576"
-    fi
     if test "x${OPENJDK_$1_CPU}" = "xx86"; then
       $1_CPU_LDFLAGS="-safeseh"
+      # NOTE: Old build added -machine. Probably not needed.
+      $1_CPU_LDFLAGS_JVM_ONLY="-machine:I386"
+      $1_CPU_EXECUTABLE_LDFLAGS="-stack:327680"
+    else
+      $1_CPU_LDFLAGS_JVM_ONLY="-machine:AMD64"
+      $1_CPU_EXECUTABLE_LDFLAGS="-stack:1048576"
     fi
   fi
 
   # JVM_VARIANT_PATH depends on if this is build or target...
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    $1_LDFLAGS_JDK_LIBPATH="-libpath:\${SUPPORT_OUTPUTDIR}/modules_libs/java.base"
+    $1_LDFLAGS_JDK_LIBPATH="-libpath:${OUTPUTDIR}/support/modules_libs/java.base"
   else
     $1_LDFLAGS_JDK_LIBPATH="-L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \
         -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/${$1_JVM_VARIANT_PATH}"
@@ -208,13 +209,13 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
 
   # Export variables according to old definitions, prefix with $2 if present.
   LDFLAGS_JDK_COMMON="$BASIC_LDFLAGS $BASIC_LDFLAGS_JDK_ONLY \
-      $OS_LDFLAGS $DEBUGLEVEL_LDFLAGS_JDK_ONLY ${$2EXTRA_LDFLAGS}"
+      $OS_LDFLAGS_JDK_ONLY $DEBUGLEVEL_LDFLAGS_JDK_ONLY ${$2EXTRA_LDFLAGS}"
   $2LDFLAGS_JDKLIB="$LDFLAGS_JDK_COMMON $BASIC_LDFLAGS_JDK_LIB_ONLY \
       ${$1_LDFLAGS_JDK_LIBPATH} $SHARED_LIBRARY_FLAGS"
   $2LDFLAGS_JDKEXE="$LDFLAGS_JDK_COMMON $EXECUTABLE_LDFLAGS \
       ${$1_CPU_EXECUTABLE_LDFLAGS}"
 
-  $2JVM_LDFLAGS="$BASIC_LDFLAGS $BASIC_LDFLAGS_JVM_ONLY $OS_LDFLAGS $OS_LDFLAGS_JVM_ONLY \
+  $2JVM_LDFLAGS="$BASIC_LDFLAGS $BASIC_LDFLAGS_JVM_ONLY $OS_LDFLAGS_JVM_ONLY \
       $DEBUGLEVEL_LDFLAGS $DEBUGLEVEL_LDFLAGS_JVM_ONLY $BASIC_LDFLAGS_ONLYCXX \
       ${$1_CPU_LDFLAGS} ${$1_CPU_LDFLAGS_JVM_ONLY} ${$2EXTRA_LDFLAGS}"
 

make/autoconf/flags-other.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, 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
@@ -107,17 +107,6 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS],
 [
   if test "x$OPENJDK_TARGET_OS" = xmacosx; then
     JVM_BASIC_ASFLAGS="-x assembler-with-cpp -mno-omit-leaf-frame-pointer -mstack-alignment=16"
-
-    # Fix linker warning.
-    # Code taken from make/autoconf/flags-cflags.m4 and adapted.
-    JVM_BASIC_ASFLAGS="$JVM_BASIC_ASFLAGS \
-        -DMAC_OS_X_VERSION_MIN_REQUIRED=$MACOSX_VERSION_MIN_NODOTS \
-        -mmacosx-version-min=$MACOSX_VERSION_MIN"
-
-    if test -n "$MACOSX_VERSION_MAX"; then
-        JVM_BASIC_ASFLAGS="$JVM_BASIC_ASFLAGS $OS_CFLAGS \
-            -DMAC_OS_X_VERSION_MAX_ALLOWED=$MACOSX_VERSION_MAX_NODOTS"
-    fi
   fi
 ])
 

make/autoconf/hotspot.m4

@@ -221,7 +221,7 @@ AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_AOT],
 
   if test "x$ENABLE_AOT" = "xtrue"; then
     # Only enable AOT on X64 platforms.
-    if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-aarch64" ; then
+    if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
       if test -e "${TOPDIR}/src/jdk.aot"; then
         if test -e "${TOPDIR}/src/jdk.internal.vm.compiler"; then
           ENABLE_AOT="true"
@@ -240,7 +240,7 @@ AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_AOT],
     else
       ENABLE_AOT="false"
       if test "x$enable_aot" = "xyes"; then
-        AC_MSG_ERROR([AOT is currently only supported on x86_64 and linux-aarch64. Remove --enable-aot.])
+        AC_MSG_ERROR([AOT is currently only supported on x86_64 and aarch64. Remove --enable-aot.])
       fi
     fi
   fi
@@ -364,10 +364,6 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
   AC_MSG_CHECKING([if shenandoah can be built])
   if HOTSPOT_CHECK_JVM_FEATURE(shenandoahgc); then
     if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86" || test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
-      # Filter out Shenandoah from user requested features, as it's already in non-minimal set
-      if HOTSPOT_CHECK_JVM_VARIANT(minimal); then
-        BASIC_GET_NON_MATCHING_VALUES(JVM_FEATURES, $JVM_FEATURES, shenandoahgc)
-      fi
       AC_MSG_RESULT([yes])
     else
       DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES shenandoahgc"
@@ -375,7 +371,6 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
     fi
   else
       DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES shenandoahgc"
-      AC_MSG_RESULT([no, not enabled by default])
   fi
 
   # Only enable ZGC on supported platforms
@@ -425,9 +420,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
     # Only enable jvmci on x86_64, sparcv9 and aarch64
     if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
        test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \
-       test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xwindows-aarch64" || \
-       test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-aarch64"   || \
-       test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xmacosx-aarch64" ; then
+       test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
       AC_MSG_RESULT([yes])
       JVM_FEATURES_jvmci="jvmci"
       INCLUDE_JVMCI="true"
@@ -458,11 +451,10 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
       JVM_FEATURES_graal="graal"
       INCLUDE_GRAAL="true"
     else
-      # By default enable graal build on x64/aarch64 or where AOT is available.
+      # By default enable graal build on x64 or where AOT is available.
       # graal build requires jvmci.
       if test "x$JVM_FEATURES_jvmci" = "xjvmci" && \
           (test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
-           test "x$OPENJDK_TARGET_CPU" = "xaarch64" || \
            test "x$ENABLE_AOT" = "xtrue") ; then
         AC_MSG_RESULT([yes])
         JVM_FEATURES_graal="graal"

make/autoconf/jdk-options.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -291,7 +291,11 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
       [AS_HELP_STRING([--with-native-debug-symbols],
       [set the native debug symbol configuration (none, internal, external, zipped) @<:@varying@:>@])],
       [
-        if test "x$OPENJDK_TARGET_OS" = xwindows; then
+        if test "x$OPENJDK_TARGET_OS" = xaix; then
+          if test "x$withval" = xexternal || test "x$withval" = xzipped; then
+            AC_MSG_ERROR([AIX only supports the parameters 'none' and 'internal' for --with-native-debug-symbols])
+          fi
+        elif test "x$OPENJDK_TARGET_OS" = xwindows; then
           if test "x$withval" = xinternal; then
             AC_MSG_ERROR([Windows does not support the parameter 'internal' for --with-native-debug-symbols])
           fi
@@ -301,7 +305,12 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
         if test "x$STATIC_BUILD" = xtrue; then
           with_native_debug_symbols="none"
         else
-          with_native_debug_symbols="external"
+          if test "x$OPENJDK_TARGET_OS" = xaix; then
+            # AIX doesn't support 'external' so use 'internal' as default
+            with_native_debug_symbols="internal"
+          else
+            with_native_debug_symbols="external"
+          fi
         fi
       ])
   AC_MSG_RESULT([$with_native_debug_symbols])

make/autoconf/spec.gmk.in

@@ -382,7 +382,7 @@ GCOV_ENABLED=@GCOV_ENABLED@
 export ASAN_ENABLED:=@ASAN_ENABLED@
 export DEVKIT_LIB_DIR:=@DEVKIT_LIB_DIR@
 ifeq ($(ASAN_ENABLED), yes)
-  export ASAN_OPTIONS=handle_segv=0 detect_leaks=0
+  export ASAN_OPTIONS="handle_segv=0 detect_leaks=0"
   ifneq ($(DEVKIT_LIB_DIR),)
     export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(DEVKIT_LIB_DIR)
   endif

make/autoconf/toolchain.m4

@@ -918,18 +918,14 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
           . $CONFIGURESUPPORT_OUTPUTDIR/build-devkit.info
           # This potentially sets the following:
           # A descriptive name of the devkit
-          BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_NAME])
+          BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_NAME])
           # Corresponds to --with-extra-path
-          BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_EXTRA_PATH])
+          BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_EXTRA_PATH])
           # Corresponds to --with-toolchain-path
-          BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_TOOLCHAIN_PATH])
+          BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_TOOLCHAIN_PATH])
           # Corresponds to --with-sysroot
-          BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_SYSROOT])
-
-          if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-            BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_VS_INCLUDE])
-            BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_VS_LIB])
-          fi
+          BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_SYSROOT])
+          # Skip the Window specific parts
         fi
 
         AC_MSG_CHECKING([for build platform devkit])
@@ -939,37 +935,13 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
           AC_MSG_RESULT([$BUILD_DEVKIT_ROOT])
         fi
 
-        PATH="$BUILD_DEVKIT_EXTRA_PATH:$PATH"
+        BUILD_SYSROOT="$BUILD_DEVKIT_SYSROOT"
 
-        # Fallback default of just /bin if DEVKIT_PATH is not defined
+         # Fallback default of just /bin if DEVKIT_PATH is not defined
         if test "x$BUILD_DEVKIT_TOOLCHAIN_PATH" = x; then
           BUILD_DEVKIT_TOOLCHAIN_PATH="$BUILD_DEVKIT_ROOT/bin"
         fi
-        PATH="$BUILD_DEVKIT_TOOLCHAIN_PATH:$PATH"
-
-        BUILD_SYSROOT="$BUILD_DEVKIT_SYSROOT"
-
-        if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-          BUILD_VS_INCLUDE="$BUILD_DEVKIT_VS_INCLUDE"
-          BUILD_VS_LIB="$BUILD_DEVKIT_VS_LIB"
-
-          TOOLCHAIN_SETUP_VISUAL_STUDIO_SYSROOT_FLAGS([BUILD_])
-        fi
-      fi
-    else
-      if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-        if test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
-          # try to guess compiler layout. Final solution should be
-          # backport of 8257679. Try primitive approach for now 
-          BUILD_CC=`$ECHO "$CC"|$SED 's|/arm64/cl|/x64/cl|I'`
-          BUILD_CXX=`$ECHO "$CXX"|$SED 's|/arm64/cl|/x64/cl|I'`
-          BUILD_AR=`$ECHO "$AR"|$SED 's|/arm64/lib|/x64/lib|I'`
-          BUILD_LD=`$ECHO "$LD"|$SED 's|/arm64/link|/x64/link|I'`
-          BUILD_SYSROOT_CFLAGS=`$ECHO "$SYSROOT_CFLAGS"|$SED 's|/arm64|/x64|gI'`
-          BUILD_SYSROOT_LDFLAGS=`$ECHO "$SYSROOT_LDFLAGS"|$SED 's|/arm64|/x64|gI'`
-        else
-          AC_MSG_ERROR([only windows-aarch64 cross compilation is supported so far])
-        fi
+        PATH="$BUILD_DEVKIT_TOOLCHAIN_PATH:$BUILD_DEVKIT_EXTRA_PATH"
       fi
     fi
 
@@ -995,37 +967,9 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
     BASIC_FIXUP_EXECUTABLE(BUILD_STRIP)
     # Assume the C compiler is the assembler
     BUILD_AS="$BUILD_CC -c"
-    if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-      # In the Microsoft toolchain we have a separate LD command "link".
-      # Make sure we reject /usr/bin/link (as determined in CYGWIN_LINK), which is
-      # a cygwin program for something completely different.
-      AC_CHECK_PROG([BUILD_LD], [link$EXE_SUFFIX],[link$EXE_SUFFIX],,, [$CYGWIN_LINK])
-      BASIC_FIXUP_EXECUTABLE(BUILD_LD)
-      # Verify that we indeed succeeded with this trick.
-      AC_MSG_CHECKING([if the found link.exe is actually the Visual Studio linker])
-
-      # Reset PATH since it can contain a mix of WSL/linux paths and Windows paths from VS,
-      # which, in combination with WSLENV, will make the WSL layer complain
-      old_path="$PATH"
-      PATH=
-
-      "$BUILD_LD" --version > /dev/null
-
-      if test $? -eq 0 ; then
-        AC_MSG_RESULT([no])
-        AC_MSG_ERROR([This is the Cygwin link tool. Please check your PATH and rerun configure.])
-      else
-        AC_MSG_RESULT([yes])
-      fi
-
-      PATH="$old_path"
-
-      BUILD_LDCXX="$BUILD_LD"
-    else
-      # Just like for the target compiler, use the compiler as linker
-      BUILD_LD="$BUILD_CC"
-      BUILD_LDCXX="$BUILD_CXX"
-    fi
+    # Just like for the target compiler, use the compiler as linker
+    BUILD_LD="$BUILD_CC"
+    BUILD_LDCXX="$BUILD_CXX"
 
     PATH="$OLDPATH"
 
@@ -1081,10 +1025,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
       if test "x$COMPILER_CPU_TEST" != "xx64"; then
         AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "x64".])
       fi
-    elif test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
-      if test "x$COMPILER_CPU_TEST" != "xARM64"; then
-        AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "arm64".])
-      fi
     fi
   fi
 

make/autoconf/toolchain_windows.m4

@@ -25,7 +25,7 @@
 
 ################################################################################
 # The order of these defines the priority by which we try to find them.
-VALID_VS_VERSIONS="2019 2017 2013 2015 2012 2010"
+VALID_VS_VERSIONS="2017 2013 2015 2012 2010"
 
 VS_DESCRIPTION_2010="Microsoft Visual Studio 2010"
 VS_VERSION_INTERNAL_2010=100
@@ -80,7 +80,7 @@ VS_VERSION_INTERNAL_2017=141
 VS_MSVCR_2017=vcruntime140.dll
 VS_MSVCP_2017=msvcp140.dll
 VS_ENVVAR_2017="VS150COMNTOOLS"
-VS_USE_UCRT_2017="false"
+VS_USE_UCRT_2017="true"
 VS_VS_INSTALLDIR_2017="Microsoft Visual Studio/2017"
 VS_EDITIONS_2017="BuildTools Community Professional Enterprise"
 VS_SDK_INSTALLDIR_2017=
@@ -88,19 +88,6 @@ VS_VS_PLATFORM_NAME_2017="v141"
 VS_SDK_PLATFORM_NAME_2017=
 VS_SUPPORTED_2017=true
 
-VS_DESCRIPTION_2019="Microsoft Visual Studio 2019"
-VS_VERSION_INTERNAL_2019=142
-VS_MSVCR_2019=vcruntime140.dll
-VS_MSVCP_2019=msvcp140.dll
-VS_ENVVAR_2019="VS160COMNTOOLS"
-VS_USE_UCRT_2019="false"
-VS_VS_INSTALLDIR_2019="Microsoft Visual Studio/2019"
-VS_EDITIONS_2019="BuildTools Community Professional Enterprise"
-VS_SDK_INSTALLDIR_2019=
-VS_VS_PLATFORM_NAME_2019="v142"
-VS_SDK_PLATFORM_NAME_2019=
-VS_SUPPORTED_2019=true
-
 ################################################################################
 
 AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
@@ -124,15 +111,11 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
 
     if test -d "$VS_BASE"; then
       AC_MSG_NOTICE([Found Visual Studio installation at $VS_BASE using $METHOD])
-      if test "x$OPENJDK_TARGET_CPU" = xx86; then
+      if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
         VCVARSFILES="vc/bin/vcvars32.bat vc/auxiliary/build/vcvars32.bat"
-      elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+      else
         VCVARSFILES="vc/bin/amd64/vcvars64.bat vc/bin/x86_amd64/vcvarsx86_amd64.bat \
             vc/auxiliary/build/vcvarsx86_amd64.bat vc/auxiliary/build/vcvars64.bat"
-      elif test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-        # for host x86-64, target aarch64
-        VCVARSFILES="vc/auxiliary/build/vcvarsamd64_arm64.bat \
-            vc/auxiliary/build/vcvarsx86_arm64.bat"
       fi
 
       for VCVARSFILE in $VCVARSFILES; do
@@ -172,12 +155,10 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT],
       elif test -f "$WIN_SDK_BASE/Bin/SetEnv.Cmd"; then
         AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
         VS_ENV_CMD="$WIN_SDK_BASE/Bin/SetEnv.Cmd"
-        if test "x$OPENJDK_TARGET_CPU" = xx86; then
+        if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
           VS_ENV_ARGS="/x86"
-        elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+        else
           VS_ENV_ARGS="/x64"
-        elif test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-          VS_ENV_ARGS="/arm64"
         fi
         # PLATFORM_TOOLSET is used during the compilation of the freetype sources (see
         # 'LIB_BUILD_FREETYPE' in libraries.m4) and must be 'Windows7.1SDK' for Windows7.1SDK
@@ -474,7 +455,41 @@ AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
       AC_SUBST(VS_INCLUDE)
       AC_SUBST(VS_LIB)
 
-      TOOLCHAIN_SETUP_VISUAL_STUDIO_SYSROOT_FLAGS
+      # Convert VS_INCLUDE into SYSROOT_CFLAGS
+      OLDIFS="$IFS"
+      IFS=";"
+      for i in $VS_INCLUDE; do
+        ipath=$i
+        # Only process non-empty elements
+        if test "x$ipath" != x; then
+          IFS="$OLDIFS"
+          # Check that directory exists before calling fixup_path
+          testpath=$ipath
+          BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath])
+          if test -d "$testpath"; then
+            BASIC_FIXUP_PATH([ipath])
+            SYSROOT_CFLAGS="$SYSROOT_CFLAGS -I$ipath"
+          fi
+          IFS=";"
+        fi
+      done
+      # Convert VS_LIB into SYSROOT_LDFLAGS
+      for i in $VS_LIB; do
+        libpath=$i
+        # Only process non-empty elements
+        if test "x$libpath" != x; then
+          IFS="$OLDIFS"
+          # Check that directory exists before calling fixup_path
+          testpath=$libpath
+          BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath])
+          if test -d "$testpath"; then
+            BASIC_FIXUP_PATH([libpath])
+            SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS -libpath:$libpath"
+          fi
+          IFS=";"
+        fi
+      done
+      IFS="$OLDIFS"
     fi
   else
     AC_MSG_RESULT([not found])
@@ -511,15 +526,10 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL],
         CORRECT_MSVCR_ARCH="PE32+ executable"
       fi
     else
-      if test "x$OPENJDK_TARGET_CPU" = xx86; then
+      if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
         CORRECT_MSVCR_ARCH=386
-      elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+      else
         CORRECT_MSVCR_ARCH=x86-64
-      elif test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-        # The cygwin 'file' command only returns "PE32+ executable (DLL) (console), for MS Windows",
-        # without specifying which architecture it is for specifically. This has been fixed upstream.
-        # https://github.com/file/file/commit/b849b1af098ddd530094bf779b58431395db2e10#diff-ff2eced09e6860de75057dd731d092aeR142
-        CORRECT_MSVCR_ARCH="PE32+ executable"
       fi
     fi
     if $ECHO "$MSVC_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
@@ -539,24 +549,24 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
   DLL_NAME="$1"
   MSVC_DLL=
 
-  if test "x$OPENJDK_TARGET_CPU" = xx86; then
-    vs_target_cpu=x86
-  elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-    vs_target_cpu=x64
-  elif test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-    vs_target_cpu=arm64
-  fi
-
   if test "x$MSVC_DLL" = x; then
     if test "x$VCINSTALLDIR" != x; then
       CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
       BASIC_FIXUP_PATH(CYGWIN_VC_INSTALL_DIR)
       if test "$VS_VERSION" -lt 2017; then
         # Probe: Using well-known location from Visual Studio 12.0 and older
-        POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/$vs_target_cpu/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
+        if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+          POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
+        else
+          POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
+        fi
       else
         # Probe: Using well-known location from VS 2017
-        POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_INSTALL_DIR/Redist/MSVC/*/$vs_target_cpu/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`"
+        if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+          POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_INSTALL_DIR/Redist/MSVC/*/x64/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`"
+        else
+          POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_INSTALL_DIR/Redist/MSVC/*/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`"
+        fi
       fi
       # In case any of the above finds more than one file, loop over them.
       for possible_msvc_dll in $POSSIBLE_MSVC_DLL; do
@@ -588,8 +598,13 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
     if test "x$VS100COMNTOOLS" != x; then
       CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
       BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VS_TOOLS_DIR)
-      POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
-        | $GREP -i /$vs_target_cpu/ | $HEAD --lines 1`
+      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+        POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
+	    | $GREP -i /x64/ | $HEAD --lines 1`
+      else
+        POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
+	    | $GREP -i /x86/ | $HEAD --lines 1`
+      fi
       TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
           [search of VS100COMNTOOLS])
     fi
@@ -599,17 +614,17 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
     # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now.
     # (This was the original behaviour; kept since it might turn something up)
     if test "x$CYGWIN_VC_INSTALL_DIR" != x; then
-      if test "x$OPENJDK_TARGET_CPU" = xx86; then
+      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
         POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
-        | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $GREP -v arm64 | $HEAD --lines 1`
+	    | $GREP x64 | $HEAD --lines 1`
+      else
+        POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
+	    | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
         if test "x$POSSIBLE_MSVC_DLL" = x; then
           # We're grasping at straws now...
           POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
 	      | $HEAD --lines 1`
         fi
-      else
-        POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
-          | $GREP $vs_target_cpu | $HEAD --lines 1`
       fi
 
       TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
@@ -693,12 +708,8 @@ AC_DEFUN([TOOLCHAIN_SETUP_VS_RUNTIME_DLLS],
       CYGWIN_WINDOWSSDKDIR="${WINDOWSSDKDIR}"
       BASIC_FIXUP_PATH([CYGWIN_WINDOWSSDKDIR])
       dll_subdir=$OPENJDK_TARGET_CPU
-      if test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
-        dll_subdir="arm64"
-      elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
+      if test "x$dll_subdir" = "xx86_64"; then
         dll_subdir="x64"
-      elif test "x$OPENJDK_TARGET_CPU" = "xx86"; then
-        dll_subdir="x86"
       fi
       UCRT_DLL_DIR="$CYGWIN_WINDOWSSDKDIR/Redist/ucrt/DLLs/$dll_subdir"
       if test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then
@@ -721,49 +732,3 @@ AC_DEFUN([TOOLCHAIN_SETUP_VS_RUNTIME_DLLS],
   fi
   AC_SUBST(UCRT_DLL_DIR)
 ])
-
-# Setup the sysroot flags and add them to global CFLAGS and LDFLAGS so
-# that configure can use them while detecting compilers.
-# TOOLCHAIN_TYPE is available here.
-# Param 1 - Optional prefix to all variables. (e.g BUILD_)
-AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_SYSROOT_FLAGS],
-[
-  # Convert $1VS_INCLUDE into $1SYSROOT_CFLAGS
-  OLDIFS="$IFS"
-  IFS=";"
-  for i in [$]$1VS_INCLUDE; do
-    ipath=$i
-    # Only process non-empty elements
-    if test "x$ipath" != x; then
-      IFS="$OLDIFS"
-      # Check that directory exists before calling fixup_path
-      testpath=$ipath
-      BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath])
-      if test -d "$testpath"; then
-        BASIC_FIXUP_PATH([ipath])
-        $1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -I$ipath"
-      fi
-      IFS=";"
-    fi
-  done
-  # Convert $1VS_LIB into $1SYSROOT_LDFLAGS
-  for i in [$]$1VS_LIB; do
-    libpath=$i
-    # Only process non-empty elements
-    if test "x$libpath" != x; then
-      IFS="$OLDIFS"
-      # Check that directory exists before calling fixup_path
-      testpath=$libpath
-      BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath])
-      if test -d "$testpath"; then
-        BASIC_FIXUP_PATH([libpath])
-        $1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -libpath:$libpath"
-      fi
-      IFS=";"
-    fi
-  done
-  IFS="$OLDIFS"
-
-  AC_SUBST($1SYSROOT_CFLAGS)
-  AC_SUBST($1SYSROOT_LDFLAGS)
-])

make/autoconf/version-numbers

@@ -28,12 +28,12 @@
 
 DEFAULT_VERSION_FEATURE=11
 DEFAULT_VERSION_INTERIM=0
-DEFAULT_VERSION_UPDATE=12
+DEFAULT_VERSION_UPDATE=10
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2021-07-20
+DEFAULT_VERSION_DATE=2021-01-19
 DEFAULT_VERSION_CLASSFILE_MAJOR=55  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="10 11"

make/common/NativeCompilation.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -239,30 +239,15 @@ ifeq ($(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT)-$(FILE_MACRO_CFLAGS), false-)
         ) \
       )
 
-  # When compiling with relative paths, the deps file may come out with relative
-  # paths, and that path may start with './'. First remove any leading ./, then
-  # add WORKSPACE_ROOT to any line not starting with /, while allowing for
-  # leading spaces. There may also be multiple entries on the same line, so start
-  # with splitting such lines.
-  # Non GNU sed (BSD on macosx) cannot substitue in literal \n using regex.
-  # Instead use a bash escaped literal newline. To avoid having unmatched quotes
-  # ruin the ability for an editor to properly syntax highlight this file, define
-  # that newline sequence as a separate variable and add the closing quote behind
-  # a comment.
-  sed_newline := \'$$'\n''#'
+  # When compiling with relative paths, the deps file comes out with relative
+  # paths.
   ifeq ($(TOOLCHAIN_TYPE), solstudio)
     define fix-deps-file
 	$(SED) -e 's|\./|$(WORKSPACE_ROOT)/|g' $1.tmp > $1
     endef
   else
     define fix-deps-file
-	$(SED) \
-	    -e 's|\([^ ]\) \{1,\}\([^\\:]\)|\1 \\$(sed_newline) \2|g' \
-	    $1.tmp \
-	    | $(SED) \
-	        -e 's|^\([ ]*\)\./|\1|' \
-	        -e '/^[ ]*[^/ ]/s|^\([ ]*\)|\1$(WORKSPACE_ROOT)/|' \
-	        > $1
+	$(SED) -e 's|^\([ ]*\)|\1$(WORKSPACE_ROOT)|' $1.tmp > $1
     endef
   endif
 else
@@ -838,15 +823,13 @@ define SetupNativeCompilationBody
         -include $$($1_PCH_DEPS_TARGETS_FILE)
 
         $1_PCH_COMMAND := $$($1_CC) $$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $$($1_SYSROOT_CFLAGS) \
-            $$($1_OPT_CFLAGS) -x c++-header -c $(C_FLAG_DEPS) \
-            $$(addsuffix .tmp, $$($1_PCH_DEPS_FILE))
+            $$($1_OPT_CFLAGS) -x c++-header -c $(C_FLAG_DEPS) $$($1_PCH_DEPS_FILE)
 
         $$($1_PCH_FILE): $$($1_PRECOMPILED_HEADER) $$($1_COMPILE_VARDEPS_FILE)
 		$$(call LogInfo, Generating precompiled header)
 		$$(call MakeDir, $$(@D))
 		$$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
 		    $$($1_PCH_COMMAND) $$< -o $$@))
-		$$(call fix-deps-file, $$($1_PCH_DEPS_FILE))
 		$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_PCH_DEPS_FILE) \
 		    > $$($1_PCH_DEPS_TARGETS_FILE)
 
@@ -1008,13 +991,6 @@ define SetupNativeCompilationBody
               $(CD) $$($1_OUTPUT_DIR) && \
                   $$($1_OBJCOPY) --add-gnu-debuglink=$$($1_DEBUGINFO_FILES) $$($1_TARGET)
 
-        else ifeq ($(OPENJDK_TARGET_OS), aix)
-          # AIX does not provide the equivalent of OBJCOPY to extract debug symbols,
-          # so we copy the compiled object with symbols to the .debuginfo file, which
-          # happens prior to the STRIP_CMD on the original target object file.
-          $1_DEBUGINFO_FILES := $$($1_OUTPUT_DIR)/$$($1_NOSUFFIX).debuginfo 
-          $1_CREATE_DEBUGINFO_CMDS := $(CP) $$($1_TARGET) $$($1_DEBUGINFO_FILES)
-
         else ifeq ($(OPENJDK_TARGET_OS), macosx)
           $1_DEBUGINFO_FILES := \
               $$($1_OUTPUT_DIR)/$$($1_BASENAME).dSYM/Contents/Info.plist \

make/common/TestFilesCompilation.gmk

@@ -75,7 +75,7 @@ define SetupTestFilesCompilationBody
 
   # Locate all files with the matching prefix
   $1_FILE_LIST := \
-      $$(call FindFiles, $$($1_SOURCE_DIRS), $$($1_PREFIX)*.c $$($1_PREFIX)*.m)
+      $$(call FindFiles, $$($1_SOURCE_DIRS), $$($1_PREFIX)*.c)
 
   $1_EXCLUDE_PATTERN := $$(addprefix %/, $$($1_EXCLUDE))
   $1_FILTERED_FILE_LIST := $$(filter-out $$($1_EXCLUDE_PATTERN), $$($1_FILE_LIST))

make/conf/jib-profiles.js

@@ -1160,15 +1160,15 @@ var concatObjects = function (o1, o2) {
  * @param patch Override patch version
  * @returns {String} The numeric version string
  */
-var getVersion = function (feature, interim, update, patch, extra1, extra2, extra3) {
+var getVersion = function (feature, interim, update, patch) {
     var version_numbers = getVersionNumbers();
     var version = (feature != null ? feature : version_numbers.get("DEFAULT_VERSION_FEATURE"))
         + "." + (interim != null ? interim : version_numbers.get("DEFAULT_VERSION_INTERIM"))
         + "." + (update != null ? update :  version_numbers.get("DEFAULT_VERSION_UPDATE"))
         + "." + (patch != null ? patch : version_numbers.get("DEFAULT_VERSION_PATCH"))
-        + "." + (extra1 != null ? extra1 : version_numbers.get("DEFAULT_VERSION_EXTRA1"))
-        + "." + (extra2 != null ? extra2 : version_numbers.get("DEFAULT_VERSION_EXTRA2"))
-        + "." + (extra3 != null ? extra3 : version_numbers.get("DEFAULT_VERSION_EXTRA3"));
+        + "." + version_numbers.get("DEFAULT_VERSION_EXTRA1")
+        + "." + version_numbers.get("DEFAULT_VERSION_EXTRA2")
+        + "." + version_numbers.get("DEFAULT_VERSION_EXTRA3");
     while (version.match(".*\\.0$")) {
         version = version.substring(0, version.length - 2);
     }

make/copy/Copy-java.base.gmk

@@ -43,43 +43,38 @@ ifneq ($(findstring $(OPENJDK_TARGET_OS), windows aix),)
 endif
 
 ################################################################################
-# Copy the microsoft runtime libraries on windows, but only if we are not
-# creating a buildjdk. If we are, the provided runtime librareis are made for
-# the target platform, not the build platform (and we should not need to bundle
-# anything with the minimalistic, locally-only buildjdk.)
+# Copy the microsoft runtime libraries on windows
 ifeq ($(OPENJDK_TARGET_OS), windows)
-  ifneq ($(CREATING_BUILDJDK), true)
 
-    # Chmod to avoid permission issues if bundles are unpacked on unix platforms.
-    define copy-and-chmod
+  # Chmod to avoid permission issues if bundles are unpacked on unix platforms.
+  define copy-and-chmod
 	$(install-file)
 	$(CHMOD) a+rx $@
-    endef
+  endef
 
-    # Use separate macro calls in case the source files are not in the same
-    # directory.
-    $(eval $(call SetupCopyFiles,COPY_MSVCR, \
+  # Use separate macro calls in case the source files are not in the same
+  # directory.
+  $(eval $(call SetupCopyFiles,COPY_MSVCR, \
       DEST := $(LIB_DST_DIR), \
       FILES := $(MSVCR_DLL), \
       MACRO := copy-and-chmod))
 
-    $(eval $(call SetupCopyFiles,COPY_MSVCP, \
+  $(eval $(call SetupCopyFiles,COPY_MSVCP, \
       DEST := $(LIB_DST_DIR), \
       FILES := $(MSVCP_DLL), \
       MACRO := copy-and-chmod))
 
-    TARGETS += $(COPY_MSVCR) $(COPY_MSVCP)
+  TARGETS += $(COPY_MSVCR) $(COPY_MSVCP)
 
-    ifneq ($(UCRT_DLL_DIR), )
-      $(eval $(call SetupCopyFiles, COPY_UCRT_DLLS, \
+  ifneq ($(UCRT_DLL_DIR), )
+    $(eval $(call SetupCopyFiles, COPY_UCRT_DLLS, \
         DEST := $(LIB_DST_DIR), \
         SRC := $(UCRT_DLL_DIR), \
         FILES := $(wildcard $(UCRT_DLL_DIR)/*.dll), \
         MACRO := copy-and-chmod, \
-      ))
+    ))
 
-      TARGETS += $(COPY_UCRT_DLLS)
-    endif
+    TARGETS += $(COPY_UCRT_DLLS)
   endif
 endif
 

make/copy/Copy-java.desktop.gmk

@@ -86,7 +86,7 @@ TARGETS += $(COPY_LEGAL)
 ################################################################################
 
 FONTFILE_SRC_DIR := $(TOPDIR)/src/java.desktop/share
-FONTFILE_SRCS := $(wildcard $(FONTFILE_SRC_DIR)/fonts/*.ttf) $(wildcard $(FONTFILE_SRC_DIR)/fonts/*.otf) $(FONTFILE_SRC_DIR)/fonts/fonts.dir $(FONTFILE_SRC_DIR)/fonts/font.conf
+FONTFILE_SRCS := $(wildcard $(FONTFILE_SRC_DIR)/fonts/*.ttf) $(FONTFILE_SRC_DIR)/fonts/fonts.dir $(FONTFILE_SRC_DIR)/fonts/font.conf
 FONTFILE_TARGET_FILES := $(subst $(FONTFILE_SRC_DIR),$(LIB_DST_DIR),$(FONTFILE_SRCS))
 
 $(LIB_DST_DIR)/fonts/%: $(FONTFILE_SRC_DIR)/fonts/%

make/data/cacerts/haricaeccrootca2015

@@ -1,24 +0,0 @@
-Owner: CN=Hellenic Academic and Research Institutions ECC RootCA 2015, O=Hellenic Academic and Research Institutions Cert. Authority, L=Athens, C=GR
-Issuer: CN=Hellenic Academic and Research Institutions ECC RootCA 2015, O=Hellenic Academic and Research Institutions Cert. Authority, L=Athens, C=GR
-Serial number: 0
-Valid from: Tue Jul 07 10:37:12 GMT 2015 until: Sat Jun 30 10:37:12 GMT 2040
-Signature algorithm name: SHA256withECDSA
-Subject Public Key Algorithm: 384-bit EC key
-Version: 3
------BEGIN CERTIFICATE-----
-MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzAN
-BgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
-c2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hl
-bGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgRUNDIFJv
-b3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEwMzcxMlowgaoxCzAJ
-BgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmljIEFj
-YWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5
-MUQwQgYDVQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0
-dXRpb25zIEVDQyBSb290Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKg
-QehLgoRc4vgxEZmGZE4JJS+dQS8KrjVPdJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJa
-jq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoKVlp8aQuqgAkkbH7BRqNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFLQi
-C4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaep
-lSTAGiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7Sof
-TUwJCA3sS61kFyjndc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR
------END CERTIFICATE-----

make/data/cacerts/haricarootca2015

@@ -1,42 +0,0 @@
-Owner: CN=Hellenic Academic and Research Institutions RootCA 2015, O=Hellenic Academic and Research Institutions Cert. Authority, L=Athens, C=GR
-Issuer: CN=Hellenic Academic and Research Institutions RootCA 2015, O=Hellenic Academic and Research Institutions Cert. Authority, L=Athens, C=GR
-Serial number: 0
-Valid from: Tue Jul 07 10:11:21 GMT 2015 until: Sat Jun 30 10:11:21 GMT 2040
-Signature algorithm name: SHA256withRSA
-Subject Public Key Algorithm: 4096-bit RSA key
-Version: 3
------BEGIN CERTIFICATE-----
-MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1Ix
-DzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5k
-IFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMT
-N0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9v
-dENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAxMTIxWjCBpjELMAkG
-A1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNh
-ZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkx
-QDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1
-dGlvbnMgUm9vdENBIDIwMTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQDC+Kk/G4n8PDwEXT2QNrCROnk8ZlrvbTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA
-4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+ehiGsxr/CL0BgzuNtFajT0
-AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+6PAQZe10
-4S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06C
-ojXdFPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV
-9Cz82XBST3i4vTwri5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrD
-gfgXy5I2XdGj2HUb4Ysn6npIQf1FGQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6
-Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2fu/Z8VFRfS0myGlZYeCsargq
-NhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9muiNX6hME6wGko
-LfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc
-Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNV
-HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVd
-ctA4GGqd83EkVAswDQYJKoZIhvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0I
-XtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+D1hYc2Ryx+hFjtyp8iY/xnmMsVMI
-M4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrMd/K4kPFox/la/vot
-9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+yd+2V
-Z5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/ea
-j8GsGsVn82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnh
-X9izjFk0WaSrT2y7HxjbdavYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQ
-l033DlZdwJVqwjbDG2jJ9SrcR5q+ss7FJej6A7na+RZukYT1HCjI/CbM1xyQVqdf
-bzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVtJ94Cj8rDtSvK6evIIVM4
-pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGaJI7ZjnHK
-e7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0
-vm9qp/UsQu0yrbYhnr68
------END CERTIFICATE-----

make/data/cacerts/soneraclass2ca

@@ -0,0 +1,26 @@
+Owner: CN=Sonera Class2 CA, O=Sonera, C=FI
+Issuer: CN=Sonera Class2 CA, O=Sonera, C=FI
+Serial number: 1d
+Valid from: Fri Apr 06 07:29:40 GMT 2001 until: Tue Apr 06 07:29:40 GMT 2021
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
+MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx
+MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV
+BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o
+Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt
+5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s
+3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej
+vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu
+8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw
+DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG
+MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil
+zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/
+3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD
+FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6
+Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2
+ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
+-----END CERTIFICATE-----

make/data/cacerts/thawtepremiumserverca

@@ -0,0 +1,27 @@
+Owner: EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
+Issuer: EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
+Serial number: 36122296c5e338a520a1d25f4cd70954
+Valid from: Thu Aug 01 00:00:00 GMT 1996 until: Fri Jan 01 23:59:59 GMT 2021
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 1024-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDNjCCAp+gAwIBAgIQNhIilsXjOKUgodJfTNcJVDANBgkqhkiG9w0BAQUFADCB
+zjELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ
+Q2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UE
+CxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhh
+d3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNl
+cnZlckB0aGF3dGUuY29tMB4XDTk2MDgwMTAwMDAwMFoXDTIxMDEwMTIzNTk1OVow
+gc4xCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcT
+CUNhcGUgVG93bjEdMBsGA1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNV
+BAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRo
+YXd0ZSBQcmVtaXVtIFNlcnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1z
+ZXJ2ZXJAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2
+aovXwlue2oFBYo847kkEVdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560
+ZXUCTe/LCaIhUdib0GfQug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j
++ao6hnO2RlNYyIkFvYMRuHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/
+BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBlkKyID1bZ5jA01CbH0FDxkt5r1DmI
+CSLGpmODA/eZd9iy5Ri4XWPz1HP7bJyZePFLeH0ZJMMrAoT4vCLZiiLXoPxx7JGH
+IPG47LHlVYCsPVLIOQ7C8MAFT9aCdYy9X9LcdpoFEsmvcsPcJX6kTY4XpeCHf+Ga
+WuFg3GQjPEIuTQ==
+-----END CERTIFICATE-----

make/data/cacerts/verisignclass2g2ca

@@ -0,0 +1,26 @@
+Owner: OU=VeriSign Trust Network, OU="(c) 1998 VeriSign, Inc. - For authorized use only", OU=Class 2 Public Primary Certification Authority - G2, O="VeriSign, Inc.", C=US
+Issuer: OU=VeriSign Trust Network, OU="(c) 1998 VeriSign, Inc. - For authorized use only", OU=Class 2 Public Primary Certification Authority - G2, O="VeriSign, Inc.", C=US
+Serial number: b92f60cc889fa17a4609b85b706c8aaf
+Valid from: Mon May 18 00:00:00 GMT 1998 until: Tue Aug 01 23:59:59 GMT 2028
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 1024-bit RSA key
+Version: 1
+-----BEGIN CERTIFICATE-----
+MIIDAzCCAmwCEQC5L2DMiJ+hekYJuFtwbIqvMA0GCSqGSIb3DQEBBQUAMIHBMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0Ns
+YXNzIDIgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
+MjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y
+aXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazAe
+Fw05ODA1MTgwMDAwMDBaFw0yODA4MDEyMzU5NTlaMIHBMQswCQYDVQQGEwJVUzEX
+MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGlj
+IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMx
+KGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAp4gBIXQs5xoD8JjhlzwPIQjxnNuX6Zr8wgQGE75fUsjM
+HiwSViy4AWkszJkfrbCWrnkE8hM5wXuYuggs6MKEEyyqaekJ9MepAqRCwiNPStjw
+DqL7MWzJ5m+ZJwf15vRMeJ5t60aG+rmGyVTyssSv1EYcWskVMP8NbPUtDm3Of3cC
+AwEAATANBgkqhkiG9w0BAQUFAAOBgQByLvl/0fFx+8Se9sVeUYpAmLho+Jscg9ji
+nb3/7aHmZuovCfTK1+qlK5X2JGCGTUQug6XELaDTrnhpb3LabK4I8GOSN+a7xDAX
+rXfMSTWqz9iP0b63GJZHc2pUIjRkLbYWm1lbtFFZOrMLFPQS32eg9K0yZF6xRnIn
+jBJ7xUS0rg==
+-----END CERTIFICATE-----

make/data/cacerts/verisignclass3ca

@@ -0,0 +1,21 @@
+Owner: OU=Class 3 Public Primary Certification Authority, O="VeriSign, Inc.", C=US
+Issuer: OU=Class 3 Public Primary Certification Authority, O="VeriSign, Inc.", C=US
+Serial number: 3c9131cb1ff6d01b0e9ab8d044bf12be
+Valid from: Mon Jan 29 00:00:00 GMT 1996 until: Wed Aug 02 23:59:59 GMT 2028
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 1024-bit RSA key
+Version: 1
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBBQUAA4GBABByUqkFFBkyCEHwxWsKzH4PIRnN5GfcX6kb5sroc50i
+2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWXbj9T/UWZYB2oK0z5XqcJ
+2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/D/xwzoiQ
+-----END CERTIFICATE-----

make/data/cacerts/verisignclass3g2ca

@@ -0,0 +1,26 @@
+Owner: OU=VeriSign Trust Network, OU="(c) 1998 VeriSign, Inc. - For authorized use only", OU=Class 3 Public Primary Certification Authority - G2, O="VeriSign, Inc.", C=US
+Issuer: OU=VeriSign Trust Network, OU="(c) 1998 VeriSign, Inc. - For authorized use only", OU=Class 3 Public Primary Certification Authority - G2, O="VeriSign, Inc.", C=US
+Serial number: 7dd9fe07cfa81eb7107967fba78934c6
+Valid from: Mon May 18 00:00:00 GMT 1998 until: Tue Aug 01 23:59:59 GMT 2028
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 1024-bit RSA key
+Version: 1
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
+pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
+13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
+U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
+F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
+oJ2daZH9
+-----END CERTIFICATE-----

make/data/cacerts/verisigntsaca

@@ -0,0 +1,24 @@
+Owner: CN=Thawte Timestamping CA, OU=Thawte Certification, O=Thawte, L=Durbanville, ST=Western Cape, C=ZA
+Issuer: CN=Thawte Timestamping CA, OU=Thawte Certification, O=Thawte, L=Durbanville, ST=Western Cape, C=ZA
+Serial number: 67c8e1e8e3be1cbdfc913b8ea6238749
+Valid from: Wed Jan 01 00:00:00 GMT 1997 until: Fri Jan 01 23:59:59 GMT 2021
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 1024-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIICsDCCAhmgAwIBAgIQZ8jh6OO+HL38kTuOpiOHSTANBgkqhkiG9w0BAQUFADCB
+izELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTEUMBIGA1UEBxML
+RHVyYmFudmlsbGUxDzANBgNVBAoTBlRoYXd0ZTEdMBsGA1UECxMUVGhhd3RlIENl
+cnRpZmljYXRpb24xHzAdBgNVBAMTFlRoYXd0ZSBUaW1lc3RhbXBpbmcgQ0EwHhcN
+OTcwMTAxMDAwMDAwWhcNMjEwMTAxMjM1OTU5WjCBizELMAkGA1UEBhMCWkExFTAT
+BgNVBAgTDFdlc3Rlcm4gQ2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxDzANBgNV
+BAoTBlRoYXd0ZTEdMBsGA1UECxMUVGhhd3RlIENlcnRpZmljYXRpb24xHzAdBgNV
+BAMTFlRoYXd0ZSBUaW1lc3RhbXBpbmcgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0A
+MIGJAoGBANYrWHhhRYZT6jR7UZztsOYuGA7+4F+oJ9O0yeB8WU4WDnNUYMF/9p8u
+6TqFJBU820cEY8OexJQaWt9MevPZQx08EHp5JduQ/vBR5zDWQQD9nyjfeb6Uu522
+FOMjhdepQeBMpHmwKxqL8vg7ij5FrHGSALSQQZj7X+36ty6K+Ig3AgMBAAGjEzAR
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAS+mqF4EF+3kKMZ/F
+QfRWVKvpwuWXjhj+kckMPiZkyaFMJ2SnvQGTVXFuF0853BvcSTUQOSP/ypvIz2Y/
+3Ewa1IEGQlIf4SaxFhe65nByMUToTo1b5NP50OOPJWQx5yr4GIg2GlLFDUE1G2m3
+JvUXzMEZXkt8XOKDgJH6L/uatxY=
+-----END CERTIFICATE-----

make/data/lsrdata/language-subtag-registry.txt

@@ -1,4 +1,4 @@
-File-Date: 2020-09-29
+File-Date: 2019-09-16
 %%
 Type: language
 Subtag: aa
@@ -1530,7 +1530,7 @@ Added: 2005-10-16
 %%
 Type: language
 Subtag: adb
-Description: Atauran
+Description: Adabe
 Added: 2009-07-29
 %%
 Type: language
@@ -2707,7 +2707,6 @@ Type: language
 Subtag: aoh
 Description: Arma
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: aoi
@@ -3771,7 +3770,6 @@ Type: language
 Subtag: ayy
 Description: Tayabas Ayta
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: ayz
@@ -4087,7 +4085,6 @@ Type: language
 Subtag: bbz
 Description: Babalia Creole Arabic
 Added: 2009-07-29
-Deprecated: 2020-03-28
 Macrolanguage: ar
 %%
 Type: language
@@ -5758,7 +5755,6 @@ Type: language
 Subtag: bpb
 Description: Barbacoas
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: bpd
@@ -6015,7 +6011,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: brf
-Description: Bira
+Description: Bera
 Added: 2009-07-29
 %%
 Type: language
@@ -7378,7 +7374,6 @@ Type: language
 Subtag: cca
 Description: Cauca
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: ccc
@@ -7485,7 +7480,6 @@ Type: language
 Subtag: cdg
 Description: Chamari
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: cdh
@@ -7881,11 +7875,6 @@ Description: Cibak
 Added: 2009-07-29
 %%
 Type: language
-Subtag: ckm
-Description: Chakavian
-Added: 2020-03-28
-%%
-Type: language
 Subtag: ckn
 Description: Kaang Chin
 Added: 2013-09-10
@@ -8132,13 +8121,6 @@ Description: Con
 Added: 2009-07-29
 %%
 Type: language
-Subtag: cnp
-Description: Northern Ping Chinese
-Description: Northern Pinghua
-Added: 2020-03-28
-Macrolanguage: zh
-%%
-Type: language
 Subtag: cnr
 Description: Montenegrin
 Added: 2018-01-23
@@ -8582,13 +8564,6 @@ Description: Sochiapan Chinantec
 Added: 2009-07-29
 %%
 Type: language
-Subtag: csp
-Description: Southern Ping Chinese
-Description: Southern Pinghua
-Added: 2020-03-28
-Macrolanguage: zh
-%%
-Type: language
 Subtag: csq
 Description: Croatia Sign Language
 Added: 2009-07-29
@@ -9343,7 +9318,6 @@ Macrolanguage: doi
 Type: language
 Subtag: dgr
 Description: Dogrib
-Description: Tłı̨chǫ
 Added: 2005-10-16
 %%
 Type: language
@@ -9360,7 +9334,6 @@ Type: language
 Subtag: dgu
 Description: Degaru
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: dgw
@@ -9747,11 +9720,6 @@ Description: Dugwor
 Added: 2009-07-29
 %%
 Type: language
-Subtag: dmf
-Description: Medefaidrin
-Added: 2020-03-28
-%%
-Type: language
 Subtag: dmg
 Description: Upper Kinabatangan
 Added: 2009-07-29
@@ -10073,8 +10041,6 @@ Type: language
 Subtag: drr
 Description: Dororo
 Added: 2009-07-29
-Deprecated: 2020-03-28
-Preferred-Value: kzk
 %%
 Type: language
 Subtag: drs
@@ -10364,11 +10330,6 @@ Description: Diri
 Added: 2009-07-29
 %%
 Type: language
-Subtag: dwk
-Description: Dawik Kui
-Added: 2020-03-28
-%%
-Type: language
 Subtag: dwl
 Description: Walo Kumbe Dogon
 Added: 2009-07-29
@@ -10494,11 +10455,6 @@ Description: Karenggapa
 Added: 2013-09-10
 %%
 Type: language
-Subtag: ebc
-Description: Beginci
-Added: 2020-03-28
-%%
-Type: language
 Subtag: ebg
 Description: Ebughu
 Added: 2009-07-29
@@ -10620,7 +10576,6 @@ Type: language
 Subtag: ekc
 Description: Eastern Karnic
 Added: 2013-09-10
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: eke
@@ -11260,11 +11215,6 @@ Description: Fyer
 Added: 2009-07-29
 %%
 Type: language
-Subtag: fif
-Description: Faifi
-Added: 2020-06-08
-%%
-Type: language
 Subtag: fil
 Description: Filipino
 Description: Pilipino
@@ -11931,7 +11881,6 @@ Added: 2009-07-29
 Type: language
 Subtag: gdh
 Description: Gadjerawang
-Description: Gajirrabeng
 Added: 2009-07-29
 %%
 Type: language
@@ -12021,11 +11970,6 @@ Description: Gade
 Added: 2009-07-29
 %%
 Type: language
-Subtag: gef
-Description: Gerai
-Added: 2020-03-28
-%%
-Type: language
 Subtag: geg
 Description: Gengle
 Added: 2009-07-29
@@ -12437,8 +12381,6 @@ Type: language
 Subtag: gli
 Description: Guliguli
 Added: 2009-07-29
-Deprecated: 2020-03-28
-Preferred-Value: kzk
 %%
 Type: language
 Subtag: glj
@@ -12534,12 +12476,6 @@ Added: 2009-07-29
 Scope: collection
 %%
 Type: language
-Subtag: gmr
-Description: Mirning
-Description: Mirniny
-Added: 2020-03-28
-%%
-Type: language
 Subtag: gmu
 Description: Gumalu
 Added: 2009-07-29
@@ -13219,7 +13155,6 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: gwc
-Description: Gawri
 Description: Kalami
 Added: 2009-07-29
 %%
@@ -13924,11 +13859,6 @@ Description: Chhattisgarhi
 Added: 2009-07-29
 %%
 Type: language
-Subtag: hng
-Description: Hungu
-Added: 2020-03-28
-%%
-Type: language
 Subtag: hnh
 Description: ǁAni
 Added: 2009-07-29
@@ -14210,7 +14140,6 @@ Added: 2009-07-29
 Type: language
 Subtag: huc
 Description: ǂHua
-Description: ǂʼAmkhoe
 Added: 2009-07-29
 %%
 Type: language
@@ -15981,7 +15910,6 @@ Added: 2009-07-29
 Type: language
 Subtag: kaa
 Description: Kara-Kalpak
-Description: Karakalpak
 Added: 2005-10-16
 %%
 Type: language
@@ -17139,9 +17067,8 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: kjf
-Description: Khalaj [Indo-Iranian]
+Description: Khalaj
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: kjg
@@ -17321,7 +17248,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: kkq
-Description: Kaeku
+Description: Kaiku
 Added: 2009-07-29
 %%
 Type: language
@@ -17417,7 +17344,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: klj
-Description: Khalaj
+Description: Turkic Khalaj
 Added: 2009-07-29
 %%
 Type: language
@@ -18570,7 +18497,6 @@ Added: 2009-07-29
 Type: language
 Subtag: kui
 Description: Kuikúro-Kalapálo
-Description: Kalapalo
 Added: 2009-07-29
 %%
 Type: language
@@ -18982,8 +18908,6 @@ Type: language
 Subtag: kxl
 Description: Nepali Kurux
 Added: 2009-07-29
-Deprecated: 2020-03-28
-Preferred-Value: kru
 %%
 Type: language
 Subtag: kxm
@@ -19029,8 +18953,6 @@ Type: language
 Subtag: kxu
 Description: Kui (India)
 Added: 2009-07-29
-Deprecated: 2020-03-28
-Comments: see dwk, uki
 %%
 Type: language
 Subtag: kxv
@@ -20415,7 +20337,6 @@ Type: language
 Subtag: lmz
 Description: Lumbee
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: lna
@@ -22867,7 +22788,6 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: moe
-Description: Innu
 Description: Montagnais
 Added: 2009-07-29
 %%
@@ -26279,11 +26199,6 @@ Description: Sangtam Naga
 Added: 2009-07-29
 %%
 Type: language
-Subtag: nsb
-Description: Lower Nossob
-Added: 2020-03-28
-%%
-Type: language
 Subtag: nsc
 Description: Nshi
 Added: 2009-07-29
@@ -26752,8 +26667,6 @@ Type: language
 Subtag: nxu
 Description: Narau
 Added: 2009-07-29
-Deprecated: 2020-03-28
-Preferred-Value: bpp
 %%
 Type: language
 Subtag: nxx
@@ -28253,7 +28166,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: pfe
-Description: Pere
+Description: Peere
 Added: 2009-07-29
 %%
 Type: language
@@ -28659,7 +28572,6 @@ Type: language
 Subtag: plp
 Description: Palpa
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: plq
@@ -31220,8 +31132,6 @@ Type: language
 Subtag: sdm
 Description: Semandang
 Added: 2009-07-29
-Deprecated: 2020-03-28
-Comments: see ebc, gef, sdq
 %%
 Type: language
 Subtag: sdn
@@ -31240,11 +31150,6 @@ Description: Sherdukpen
 Added: 2009-07-29
 %%
 Type: language
-Subtag: sdq
-Description: Semandang
-Added: 2020-03-28
-%%
-Type: language
 Subtag: sdr
 Description: Oraon Sadri
 Added: 2009-07-29
@@ -33597,7 +33502,6 @@ Type: language
 Subtag: tbb
 Description: Tapeba
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: tbc
@@ -34315,8 +34219,6 @@ Type: language
 Subtag: thw
 Description: Thudam
 Added: 2009-07-29
-Deprecated: 2020-06-08
-Preferred-Value: ola
 %%
 Type: language
 Subtag: thx
@@ -36338,11 +36240,6 @@ Description: Ukhwejo
 Added: 2009-07-29
 %%
 Type: language
-Subtag: uki
-Description: Kui (India)
-Added: 2020-03-28
-%%
-Type: language
 Subtag: ukk
 Description: Muak Sa-aak
 Added: 2017-02-23
@@ -36374,11 +36271,6 @@ Description: Ukue
 Added: 2009-07-29
 %%
 Type: language
-Subtag: ukv
-Description: Kuku
-Added: 2020-03-28
-%%
-Type: language
 Subtag: ukw
 Description: Ukwuani-Aboh-Ndoni
 Added: 2009-07-29
@@ -37868,11 +37760,6 @@ Description: Kunbarlang
 Added: 2009-07-29
 %%
 Type: language
-Subtag: wlh
-Description: Welaun
-Added: 2020-03-28
-%%
-Type: language
 Subtag: wli
 Description: Waioli
 Added: 2009-07-29
@@ -39345,11 +39232,6 @@ Description: Nganakarti
 Added: 2013-09-10
 %%
 Type: language
-Subtag: xnm
-Description: Ngumbarl
-Added: 2020-03-28
-%%
-Type: language
 Subtag: xnn
 Description: Northern Kankanay
 Added: 2009-07-29
@@ -39452,45 +39334,22 @@ Description: Pirriya
 Added: 2013-09-10
 %%
 Type: language
-Subtag: xpb
-Description: Northeastern Tasmanian
-Description: Pyemmairrener
-Added: 2020-03-28
-%%
-Type: language
 Subtag: xpc
 Description: Pecheneg
 Added: 2009-07-29
 %%
 Type: language
-Subtag: xpd
-Description: Oyster Bay Tasmanian
-Added: 2020-03-28
-%%
-Type: language
 Subtag: xpe
 Description: Liberia Kpelle
 Added: 2009-07-29
 Macrolanguage: kpe
 %%
 Type: language
-Subtag: xpf
-Description: Southeast Tasmanian
-Description: Nuenonne
-Added: 2020-03-28
-%%
-Type: language
 Subtag: xpg
 Description: Phrygian
 Added: 2009-07-29
 %%
 Type: language
-Subtag: xph
-Description: North Midlands Tasmanian
-Description: Tyerrenoterpanner
-Added: 2020-03-28
-%%
-Type: language
 Subtag: xpi
 Description: Pictish
 Added: 2009-07-29
@@ -39506,11 +39365,6 @@ Description: Kulina Pano
 Added: 2009-07-29
 %%
 Type: language
-Subtag: xpl
-Description: Port Sorell Tasmanian
-Added: 2020-03-28
-%%
-Type: language
 Subtag: xpm
 Description: Pumpokol
 Added: 2009-07-29
@@ -39556,34 +39410,11 @@ Description: Punic
 Added: 2009-07-29
 %%
 Type: language
-Subtag: xpv
-Description: Northern Tasmanian
-Description: Tommeginne
-Added: 2020-03-28
-%%
-Type: language
-Subtag: xpw
-Description: Northwestern Tasmanian
-Description: Peerapper
-Added: 2020-03-28
-%%
-Type: language
-Subtag: xpx
-Description: Southwestern Tasmanian
-Description: Toogee
-Added: 2020-03-28
-%%
-Type: language
 Subtag: xpy
 Description: Puyo
 Added: 2009-07-29
 %%
 Type: language
-Subtag: xpz
-Description: Bruny Island Tasmanian
-Added: 2020-03-28
-%%
-Type: language
 Subtag: xqa
 Description: Karakhanid
 Added: 2009-07-29
@@ -39637,8 +39468,6 @@ Type: language
 Subtag: xrq
 Description: Karranga
 Added: 2013-09-10
-Deprecated: 2020-03-28
-Preferred-Value: dmw
 %%
 Type: language
 Subtag: xrr
@@ -39871,8 +39700,6 @@ Type: language
 Subtag: xtz
 Description: Tasmanian
 Added: 2009-07-29
-Deprecated: 2020-03-28
-Comments: see xpb, xpd, xpf, xph, xpl, xpv, xpw, xpx, xpz
 %%
 Type: language
 Subtag: xua
@@ -39902,7 +39729,6 @@ Added: 2009-07-29
 Type: language
 Subtag: xul
 Description: Ngunawal
-Description: Nunukul
 Added: 2013-09-10
 %%
 Type: language
@@ -41495,11 +41321,6 @@ Description: Zari
 Added: 2009-07-29
 %%
 Type: language
-Subtag: zba
-Description: Balaibalan
-Added: 2020-03-28
-%%
-Type: language
 Subtag: zbc
 Description: Central Berawan
 Added: 2009-07-29
@@ -41665,8 +41486,6 @@ Type: language
 Subtag: zir
 Description: Ziriya
 Added: 2009-07-29
-Deprecated: 2020-03-28
-Preferred-Value: scv
 %%
 Type: language
 Subtag: ziw
@@ -42644,7 +42463,6 @@ Type: extlang
 Subtag: bbz
 Description: Babalia Creole Arabic
 Added: 2009-07-29
-Deprecated: 2020-03-28
 Preferred-Value: bbz
 Prefix: ar
 Macrolanguage: ar
@@ -42762,15 +42580,6 @@ Prefix: zh
 Macrolanguage: zh
 %%
 Type: extlang
-Subtag: cnp
-Description: Northern Ping Chinese
-Description: Northern Pinghua
-Added: 2020-03-28
-Preferred-Value: cnp
-Prefix: zh
-Macrolanguage: zh
-%%
-Type: extlang
 Subtag: coa
 Description: Cocos Islands Malay
 Added: 2009-07-29
@@ -42838,15 +42647,6 @@ Preferred-Value: csn
 Prefix: sgn
 %%
 Type: extlang
-Subtag: csp
-Description: Southern Ping Chinese
-Description: Southern Pinghua
-Added: 2020-03-28
-Preferred-Value: csp
-Prefix: zh
-Macrolanguage: zh
-%%
-Type: extlang
 Subtag: csq
 Description: Croatia Sign Language
 Added: 2009-07-29
@@ -45128,11 +44928,6 @@ Description: Tirhuta
 Added: 2011-08-16
 %%
 Type: script
-Subtag: Toto
-Description: Toto
-Added: 2020-05-12
-%%
-Type: script
 Subtag: Ugar
 Description: Ugaritic
 Added: 2005-10-16
@@ -46835,12 +46630,6 @@ Comments: Denotes conventions established by the Academia Brasileira de
   Letras in 1943 and generally used in Brazil until 2009
 %%
 Type: variant
-Subtag: akuapem
-Description: Akuapem Twi
-Added: 2017-06-05
-Prefix: tw
-%%
-Type: variant
 Subtag: alalc97
 Description: ALA-LC Romanization, 1997 edition
 Added: 2009-12-09
@@ -46859,6 +46648,12 @@ Comments: Aluku dialect of the "Busi Nenge Tongo" English-based Creole
   continuum in Eastern Suriname and Western French Guiana
 %%
 Type: variant
+Subtag: akuapem
+Description: Akuapem Twi
+Added: 2017-06-05
+Prefix: tw
+%%
+Type: variant
 Subtag: ao1990
 Description: Portuguese Language Orthographic Agreement of 1990 (Acordo
   Ortográfico da Língua Portuguesa de 1990)
@@ -47334,16 +47129,6 @@ Comments: Pamaka dialect of the "Busi Nenge Tongo" English-based
   Creole continuum in Eastern Suriname and Western French Guiana
 %%
 Type: variant
-Subtag: peano
-Description: Latino Sine Flexione
-Description: Interlingua de API
-Description: Interlingua de Peano
-Prefix: la
-Comments: Peano’s Interlingua, created in 1903 by Giuseppe Peano as an
-  international auxiliary language
-Added: 2020-03-12
-%%
-Type: variant
 Subtag: petr1708
 Description: Petrine orthography
 Added: 2010-10-10
@@ -47481,23 +47266,6 @@ Comments: The subtag represents Branislau Taraskievic's Belarusian
   Miensk 2005).
 %%
 Type: variant
-Subtag: tongyong
-Description: Tongyong Pinyin romanization
-Added: 2020-06-08
-Prefix: zh-Latn
-Comments: Former official transcription standard for Mandarin Chinese in
-  Taiwan.
-%%
-Type: variant
-Subtag: tunumiit
-Description: Tunumiisiut
-Description: East Greenlandic
-Description: Østgrønlandsk
-Added: 2020-07-16
-Prefix: kl
-Comments: Also known as Tunumiit oraasiat
-%%
-Type: variant
 Subtag: uccor
 Description: Unified Cornish orthography of Revived Cornish
 Added: 2008-10-14
@@ -47550,14 +47318,6 @@ Comments: Vallader is one of the five traditional written standards or
   "idioms" of the Romansh language.
 %%
 Type: variant
-Subtag: vecdruka
-Description: Latvian orthography used before 1920s ("vecā druka")
-Added: 2020-09-26
-Prefix: lv
-Comments: The subtag represents the old orthography of the Latvian
-  language used during c. 1600s–1920s.
-%%
-Type: variant
 Subtag: vivaraup
 Description: Vivaro-Alpine
 Added: 2018-04-22

make/data/tzdata/VERSION

@@ -21,4 +21,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-tzdata2021a
+tzdata2020d

make/data/tzdata/africa

@@ -409,87 +409,36 @@ Zone	Africa/Cairo	2:05:09 -	LMT	1900 Oct
 
 # Ghana
 
-# From P Chan (2020-11-20):
-# Interpretation Amendment Ordinance, 1915 (No.24 of 1915) [1915-11-02]
-# Ordinances of the Gold Coast, Ashanti, Northern Territories 1915, p 69-71
-# https://books.google.com/books?id=ErA-AQAAIAAJ&pg=PA70
-# This Ordinance added "'Time' shall mean Greenwich Mean Time" to the
-# Interpretation Ordinance, 1876.
-#
-# Determination of the Time Ordinance, 1919 (No. 18 of 1919) [1919-11-24]
-# Ordinances of the Gold Coast, Ashanti, Northern Territories 1919, p 75-76
-# https://books.google.com/books?id=MbA-AQAAIAAJ&pg=PA75
-# This Ordinance removed the previous definition of time and introduced DST.
-#
-# Time Determination Ordinance (Cap. 214)
-# The Laws of the Gold Coast (including Togoland Under British Mandate)
-# Vol. II (1937), p 2328
-# https://books.google.com/books?id=Z7M-AQAAIAAJ&pg=PA2328
-# Revised edition of the 1919 Ordinance.
-#
-# Time Determination (Amendment) Ordinance, 1940 (No. 9 of 1940) [1940-04-06]
-# Annual Volume of the Laws of the Gold Coast:
-# Containing All Legislation Enacted During Year 1940, p 22
-# https://books.google.com/books?id=1ao-AQAAIAAJ&pg=PA22
-# This Ordinance changed the forward transition from September to May.
-#
-# Defence (Time Determination Ordinance Amendment) Regulations, 1942
-# (Regulations No. 6 of 1942) [1942-01-31, commenced on 1942-02-08]
-# Annual Volume of the Laws of the Gold Coast:
-# Containing All Legislation Enacted During Year 1942, p 48
-# https://books.google.com/books?id=Das-AQAAIAAJ&pg=PA48
-# These regulations advanced the [standard] time by thirty minutes.
-#
-# Defence (Time Determination Ordinance Amendment (No.2)) Regulations,
-# 1942 (Regulations No. 28 of 1942) [1942-04-25]
-# Annual Volume of the Laws of the Gold Coast:
-# Containing All Legislation Enacted During Year 1942, p 87
-# https://books.google.com/books?id=Das-AQAAIAAJ&pg=PA87
-# These regulations abolished DST and changed the time to GMT+0:30.
-#
-# Defence (Revocation) (No.4) Regulations, 1945 (Regulations No. 45 of
-# 1945) [1945-10-24, commenced on 1946-01-06]
-# Annual Volume of the Laws of the Gold Coast:
-# Containing All Legislation Enacted During Year 1945, p 256
-# https://books.google.com/books?id=9as-AQAAIAAJ&pg=PA256
-# These regulations revoked the previous two sets of Regulations.
-#
-# Time Determination (Amendment) Ordinance, 1945 (No. 18 of 1945) [1946-01-06]
-# Annual Volume of the Laws of the Gold Coast:
-# Containing All Legislation Enacted During Year 1945, p 69
-# https://books.google.com/books?id=9as-AQAAIAAJ&pg=PA69
-# This Ordinance abolished DST.
-#
-# Time Determination (Amendment) Ordinance, 1950 (No. 26 of 1950) [1950-07-22]
-# Annual Volume of the Laws of the Gold Coast:
-# Containing All Legislation Enacted During Year 1950, p 35
-# https://books.google.com/books?id=e60-AQAAIAAJ&pg=PA35
-# This Ordinance restored DST but with thirty minutes offset.
-#
-# Time Determination Ordinance (Cap. 264)
-# The Laws of the Gold Coast, Vol. V (1954), p 380
-# https://books.google.com/books?id=Mqc-AQAAIAAJ&pg=PA380
-# Revised edition of the Time Determination Ordinance.
-#
-# Time Determination (Amendment) Ordinance, 1956 (No. 21 of 1956) [1956-08-29]
-# Annual Volume of the Ordinances of the Gold Coast Enacted During the
-# Year 1956, p 83
-# https://books.google.com/books?id=VLE-AQAAIAAJ&pg=PA83
-# This Ordinance abolished DST.
-
+# From Paul Eggert (2018-01-30):
+# Whitman says DST was observed from 1931 to "the present";
+# Shanks & Pottenger say 1936 to 1942 with 20 minutes of DST,
+# with transitions on 09-01 and 12-31 at 00:00.
+# Page 33 of Parish GCB, Colonial Reports - Annual. No. 1066. Gold
+# Coast. Report for 1919. (March 1921), OCLC 784024077
+# http://libsysdigi.library.illinois.edu/ilharvest/africana/books2011-05/5530214/5530214_1919/5530214_1919_opt.pdf
+# lists the Determination of the Time Ordinance, 1919, No. 18,
+# "to advance the time observed locally by the space of twenty minutes
+# during the last four months of each year; the object in view being
+# to extend during those months the period of daylight-time available
+# for evening recreation after office hours."
+# Vanessa Ogle, The Global Transformation of Time, 1870-1950 (2015), p 33,
+# writes "In 1919, the Gold Coast (Ghana as of 1957) made Greenwich
+# time its legal time and simultaneously legalized a summer time of
+# UTC - 00:20 minutes from March to October."; a footnote lists
+# the ordinance as being dated 1919-11-24.
+# The Crown Colonist, Volume 12 (1942), p 176, says "the Government
+# intend advancing Gold Coast time half an hour ahead of G.M.T.
+# The actual date of the alteration has not yet been announced."
+# These sources are incomplete and contradictory.  Possibly what is
+# now Ghana observed different DST regimes in different years.  For
+# lack of better info, use Shanks except treat the minus sign as a
+# typo, and assume DST started in 1920 not 1936.
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
-Rule	Ghana	1919	only	-	Nov	24	0:00	0:20	+0020
-Rule	Ghana	1920	1942	-	Jan	 1	2:00	0	GMT
-Rule	Ghana	1920	1939	-	Sep	 1	2:00	0:20	+0020
-Rule	Ghana	1940	1941	-	May	 1	2:00	0:20	+0020
-Rule	Ghana	1950	1955	-	Sep	 1	2:00	0:30	+0030
-Rule	Ghana	1951	1956	-	Jan	 1	2:00	0	GMT
-
+Rule	Ghana	1920	1942	-	Sep	 1	0:00	0:20	-
+Rule	Ghana	1920	1942	-	Dec	31	0:00	0	-
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Accra	-0:00:52 -	LMT	1915 Nov  2
-			 0:00	Ghana	%s	1942 Feb  8
-			 0:30	-	+0030	1946 Jan  6
-			 0:00	Ghana	%s
+Zone	Africa/Accra	-0:00:52 -	LMT	1918
+			 0:00	Ghana	GMT/+0020
 
 # Guinea
 # See Africa/Abidjan.
@@ -507,54 +456,11 @@ Zone	Africa/Bissau	-1:02:20 -	LMT	1912 Jan  1  1:00u
 			 0:00	-	GMT
 
 # Kenya
-
-# From P Chan (2020-10-24):
-#
-# The standard time of GMT+2:30 was adopted in the East Africa Protectorate....
-# [The Official Gazette, 1908-05-01, p 274]
-# https://books.google.com/books?id=e-cAC-sjPSEC&pg=PA274
-#
-# At midnight on 30 June 1928 the clocks throughout Kenya was put forward
-# half an hour by the Alteration of Time Ordinance, 1928.
-# https://gazettes.africa/archive/ke/1928/ke-government-gazette-dated-1928-05-11-no-28.pdf
-# [Ordinance No. 11 of 1928, The Offical Gazette, 1928-06-26, p 813]
-# https://books.google.com/books?id=2S0S6os32ZUC&pg=PA813
-#
-# The 1928 ordinance was repealed by the Alteration of Time (repeal) Ordinance,
-# 1929 and the time was restored to GMT+2:30 at midnight on 4 January 1930.
-# [Ordinance No. 97 of 1929, The Official Gazette, 1929-12-31, p 2701]
-# https://books.google.com/books?id=_g18jIZQlwwC&pg=PA2701
-#
-# The Alteration of Time Ordinance, 1936 changed the time to GMT+2:45
-# and repealed the previous ordinance at midnight on 31 December 1936.
-# [The Official Gazette, 1936-07-21, p 705]
-# https://books.google.com/books?id=K7j41z0aC5wC&pg=PA705
-#
-# The Defence (Amendment of Laws No. 120) Regulations changed the time
-# to GMT+3 at midnight on 31 July 1942.
-# [Kenya Official Gazette Supplement No. 32, 1942-07-21, p 331]
-# https://books.google.com/books?hl=zh-TW&id=c_E-AQAAIAAJ&pg=PA331
-# The provision of the 1936 ordinance was not repealed and was later
-# incorporated in the Interpretation and General Clauses Ordinance in 1948.
-# Although it was overridden by the 1942 regulations.
-# [The Laws of Kenya in force on 1948-09-21, Title I, Chapter 1, 31]
-# https://dds.crl.edu/item/217517 (p.101)
-# In 1950 the Interpretation and General Clauses Ordinance was amended to adopt
-# GMT+3 permanently as the 1942 regulations were due to expire on 10 December.
-# https://books.google.com/books?id=jvR8mUDAwR0C&pg=PA787
-# [Ordinance No. 44 of 1950, Kenya Ordinances 1950, Vol. XXIX, p 294]
-# https://books.google.com/books?id=-_dQAQAAMAAJ&pg=PA294
-
-# From Paul Eggert (2020-10-24):
-# The 1908-05-01 announcement does not give an effective date,
-# so just say "1908 May".
-
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Nairobi	2:27:16	-	LMT	1908 May
-			2:30	-	+0230	1928 Jun 30 24:00
-			3:00	-	EAT	1930 Jan  4 24:00
-			2:30	-	+0230	1936 Dec 31 24:00
-			2:45	-	+0245	1942 Jul 31 24:00
+Zone	Africa/Nairobi	2:27:16	-	LMT	1928 Jul
+			3:00	-	EAT	1930
+			2:30	-	+0230	1940
+			2:45	-	+0245	1960
 			3:00	-	EAT
 Link Africa/Nairobi Africa/Addis_Ababa	 # Ethiopia
 Link Africa/Nairobi Africa/Asmara	 # Eritrea
@@ -1341,69 +1247,8 @@ Zone	Africa/Windhoek	1:08:24 -	LMT	1892 Feb 8
 # See Africa/Lagos.
 
 # Nigeria
-
-# From P Chan (2020-12-03):
-# GMT was adopted as the standard time of Lagos on 1905-07-01.
-# Lagos Weekly Record, 1905-06-24, p 3
-# http://ddsnext.crl.edu/titles/31558#?c=0&m=668&s=0&cv=2&r=0&xywh=1446%2C5221%2C1931%2C1235
-# says "It is officially notified that on and after the 1st of July 1905
-# Greenwich Mean Solar Time will be adopted thought the Colony and
-# Protectorate, and that it will be necessary to put all clocks 13 minutes and
-# 35 seconds back, recording local mean time."
-#
-# It seemed that Lagos returned to LMT on 1908-07-01.
-# [The Lagos Standard], 1908-07-01, p 5
-# http://ddsnext.crl.edu/titles/31556#?c=0&m=78&s=0&cv=4&r=0&xywh=-92%2C3590%2C3944%2C2523
-# says "Scarcely have the people become accustomed to this new time, when
-# another official notice has now appeared announcing that from and after the
-# 1st July next, return will be made to local mean time."
-#
-# From P Chan (2020-11-27):
-# On 1914-01-01, standard time of GMT+0:30 was adopted for the unified Nigeria.
-# Colonial Reports - Annual. No. 878. Nigeria. Report for 1914. (April 1916),
-# p 27
-# https://libsysdigi.library.illinois.edu/ilharvest/Africana/Books2011-05/3064634/3064634_1914/3064634_1914_opt.pdf#page=27
-# "On January 1st [1914], a universal standard time for Nigeria was adopted,
-# viz., half an hour fast on Greenwich mean time, corresponding to the meridian
-# 7 [degrees] 30' E. long."
-# Lloyd's Register of Shipping (1915) says "Hitherto the time observed in Lagos
-# was the local mean time. On 1st January, 1914, standard time for the whole of
-# Nigeria was introduced ... Lagos time has been advanced about 16 minutes
-# accordingly."
-#
-# In 1919, standard time was changed to GMT+1.
-# Interpretation Ordinance (Cap 2)
-# The Laws of Nigeria, Containing the Ordinances of Nigeria, in Force on the
-# 1st Day of January, 1923, Vol.I [p 16]
-# https://books.google.com/books?id=BOMrAQAAMAAJ&pg=PA16
-# "The expression 'Standard time' means standard time as used in Nigeria:
-# namely, 60 minutes in advance of Greenwich mean time.  (As amended by 18 of
-# 1919, s. 2.)"
-# From Tim Parenti (2020-12-10):
-# The Lagos Weekly Record, 1919-09-20, p 3 details discussion on the first
-# reading of this Bill by the Legislative Council of the Colony of Nigeria on
-# Thursday 1919-08-28:
-# http://ddsnext.crl.edu/titles/31558?terms&item_id=303484#?m=1118&c=1&s=0&cv=2&r=0&xywh=1261%2C3408%2C2994%2C1915
-# "The proposal is that the Globe should be divided into twelve zones East and
-# West of Greenwich, of one hour each, Nigeria falling into the zone with a
-# standard of one hour fast on Greenwich Mean Time.  Nigeria standard time is
-# now 30 minutes in advance of Greenwich Mean Time ... according to the new
-# proposal, standard time will be advanced another 30 minutes".  It was further
-# proposed that the firing of the time guns likewise be adjusted by 30 minutes
-# to compensate.
-# From Tim Parenti (2020-12-10), per P Chan (2020-12-11):
-# The text of Ordinance 18 of 1919, published in Nigeria Gazette, Vol 6, No 52,
-# shows that the change was assented to the following day and took effect "on
-# the 1st day of September, 1919."
-# Nigeria Gazette and Supplements 1919 Jan-Dec, Reference: 73266B-40,
-# img 245-246
-# https://microform.digital/boa/collections/77/volumes/539/nigeria-lagos-1887-1919
-
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Lagos	0:13:35 -	LMT	1905 Jul  1
-			0:00	-	GMT	1908 Jul  1
-			0:13:35	-	LMT	1914 Jan  1
-			0:30	-	+0030	1919 Sep  1
+Zone	Africa/Lagos	0:13:36 -	LMT	1919 Sep
 			1:00	-	WAT
 Link Africa/Lagos Africa/Bangui	     # Central African Republic
 Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo
@@ -1476,21 +1321,8 @@ Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
 # See Africa/Abidjan.
 
 # Seychelles
-
-# From P Chan (2020-11-27):
-# Standard Time was adopted on 1907-01-01.
-#
-# Standard Time Ordinance (Chapter 237)
-# The Laws of Seychelles in Force on the 31st December, 1971, Vol. 6, p 571
-# https://books.google.com/books?id=efE-AQAAIAAJ&pg=PA571
-#
-# From Tim Parenti (2020-12-05):
-# A footnote on https://books.google.com/books?id=DYdDAQAAMAAJ&pg=PA1689
-# confirms that Ordinance No. 9 of 1906 "was brought into force on the 1st
-# January, 1907."
-
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone	Indian/Mahe	3:41:48 -	LMT	1907 Jan  1 # Victoria
+Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun # Victoria
 			4:00	-	+04
 # From Paul Eggert (2001-05-30):
 # Aldabra, Farquhar, and Desroches, originally dependencies of the
@@ -1550,17 +1382,11 @@ Zone	Africa/Khartoum	2:10:08 -	LMT	1931
 			3:00	-	EAT	2017 Nov  1
 			2:00	-	CAT
 
-# From Steffen Thorsen (2021-01-18):
-# "South Sudan will change its time zone by setting the clock back 1
-# hour on February 1, 2021...."
-# from https://eyeradio.org/south-sudan-adopts-new-time-zone-makuei/
-
 # South Sudan
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Juba	2:06:28 -	LMT	1931
 			2:00	Sudan	CA%sT	2000 Jan 15 12:00
-			3:00	-	EAT	2021 Feb  1 00:00
-			2:00	-	CAT
+			3:00	-	EAT
 
 # Tanzania
 # See Africa/Nairobi.

make/data/tzdata/asia

@@ -1746,180 +1746,40 @@ Zone	Asia/Baghdad	2:57:40	-	LMT	1890
 # high on my favorite-country list (and not only because my wife's
 # family is from India).
 
-# From P Chan (2020-10-27), with corrections:
-#
-# 1940-1946 Supplement No. 2 to the Palestine Gazette
-# # issue page  Order No.   dated      start        end         note
-# 1 1010  729  67 of 1940 1940-05-22 1940-05-31* 1940-09-30* revoked by #2
-# 2 1013  758  73 of 1940 1940-05-31 1940-05-31  1940-09-30
-# 3 1055 1574 196 of 1940 1940-11-06 1940-11-16  1940-12-31
-# 4 1066 1811 208 of 1940 1940-12-17 1940-12-31  1941-12-31
-# 5 1156 1967 116 of 1941 1941-12-16 1941-12-31  1942-12-31* amended by #6
-# 6 1228 1608  86 of 1942 1942-10-14 1941-12-31  1942-10-31
-# 7 1256  279  21 of 1943 1943-03-18 1943-03-31  1943-10-31
-# 8 1323  249  19 of 1944 1944-03-13 1944-03-31  1944-10-31
-# 9 1402  328  20 of 1945 1945-04-05 1945-04-15  1945-10-31
-#10 1487  596  14 of 1946 1946-04-04 1946-04-15  1946-10-31
-#
-# 1948 Iton Rishmi (Official Gazette of the Provisional Government)
-# #    issue    page   dated      start       end
-#11 2             7 1948-05-20 1948-05-22 1948-10-31*
-#	^This moved timezone to +04, replaced by #12 from 1948-08-31 24:00 GMT.
-#12 17 (Annex B) 84 1948-08-22 1948-08-31 1948-10-31
-#
-# 1949-2000 Kovetz HaTakanot (Collection of Regulations)
-# # issue page  dated      start       end            note
-#13    6  133 1949-03-23 1949-04-30  1949-10-31
-#14   80  755 1950-03-17 1950-04-15  1950-09-14
-#15  164  782 1951-03-22 1951-03-31  1951-09-29* amended by #16
-#16  206 1940 1951-09-23 ----------  1951-10-22* amended by #17
-#17  212   78 1951-10-19 ----------  1951-11-10
-#18  254  652 1952-03-03 1952-04-19  1952-09-27* amended by #19
-#19  300   11 1952-09-15 ----------  1952-10-18
-#20  348  817 1953-03-03 1953-04-11  1953-09-12
-#21  420  385 1954-02-17 1954-06-12  1954-09-11
-#22  497  548 1955-01-14 1955-06-11  1955-09-10
-#23  591  608 1956-03-12 1956-06-02  1956-09-29
-#24  680  957 1957-02-08 1957-04-27  1957-09-21
-#25 3192 1418 1974-06-28 1974-07-06  1974-10-12
-#26 3322 1389 1975-04-03 1975-04-19  1975-08-30
-#27 4146 2089 1980-07-15 1980-08-02  1980-09-13
-#28 4604 1081 1984-02-22 1984-05-05* 1984-08-25* revoked by #29
-#29 4619 1312 1984-04-06 1984-05-05  1984-08-25
-#30 4744  475 1984-12-23 1985-04-13  1985-09-14* amended by #31
-#31 4851 1848 1985-08-18 ----------  1985-08-31
-#32 4932  899 1986-04-22 1986-05-17  1986-09-06
-#33 5013  580 1987-02-15 1987-04-18* 1987-08-22* revoked by #34
-#34 5021  744 1987-03-30 1987-04-14  1987-09-12
-#35 5096  659 1988-02-14 1988-04-09  1988-09-03
-#36 5167  514 1989-02-03 1989-04-29  1989-09-02
-#37 5248  375 1990-01-23 1990-03-24  1990-08-25
-#38 5335  612 1991-02-10 1991-03-09* 1991-08-31	 amended by #39
-#			 1992-03-28  1992-09-05
-#39 5339  709 1991-03-04 1991-03-23  ----------
-#40 5506  503 1993-02-18 1993-04-02  1993-09-05
-#			 1994-04-01  1994-08-28
-#			 1995-03-31  1995-09-03
-#41 5731  438 1996-01-01 1996-03-14  1996-09-15
-#			 1997-03-13* 1997-09-18* overridden by 1997 Temp Prov
-#			 1998-03-19* 1998-09-17* revoked by #42
-#42 5853 1243 1997-09-18 1998-03-19  1998-09-05
-#43 5937   77 1998-10-18 1999-04-02  1999-09-03
-#			 2000-04-14* 2000-09-15* revoked by #44
-#			 2001-04-13* 2001-09-14* revoked by #44
-#44 6024   39 2000-03-14 2000-04-14  2000-10-22* overridden by 2000 Temp Prov
-#			 2001-04-06* 2001-10-10* overridden by 2000 Temp Prov
-#			 2002-03-29* 2002-10-29* overridden by 2000 Temp Prov
-#
-# These are laws enacted by the Knesset since the Minister could only alter the
-# transition dates at least six months in advanced under the 1992 Law.
-#				dated		start		end
-# 1997 Temporary Provisions	1997-03-06	1997-03-20	1997-09-13
-# 2000 Temporary Provisions	2000-07-28	----------	2000-10-06
-#						2001-04-09	2001-09-24
-#						2002-03-29	2002-10-07
-#						2003-03-28	2003-10-03
-#						2004-04-07	2004-09-22
-# Note:
-# Transition times in 1940-1957 (#1-#24) were midnight GMT,
-# in 1974-1998 (#25-#42 and the 1997 Temporary Provisions) were midnight,
-# in 1999-April 2000 (#43,#44) were 02:00,
-# in the 2000 Temporary Provisions were 01:00.
-#
-# -----------------------------------------------------------------------------
-# Links:
-# 1 https://findit.library.yale.edu/images_layout/view?parentoid=15537490&increment=687
-# 2 https://findit.library.yale.edu/images_layout/view?parentoid=15537490&increment=716
-# 3 https://findit.library.yale.edu/images_layout/view?parentoid=15537491&increment=721
-# 4 https://findit.library.yale.edu/images_layout/view?parentoid=15537491&increment=958
-# 5 https://findit.library.yale.edu/images_layout/view?parentoid=15537502&increment=558
-# 6 https://findit.library.yale.edu/images_layout/view?parentoid=15537511&increment=105
-# 7 https://findit.library.yale.edu/images_layout/view?parentoid=15537516&increment=278
-# 8 https://findit.library.yale.edu/images_layout/view?parentoid=15537522&increment=248
-# 9 https://findit.library.yale.edu/images_layout/view?parentoid=15537530&increment=329
-#10 https://findit.library.yale.edu/images_layout/view?parentoid=15537537&increment=601
-#11 https://www.nevo.co.il/law_word/law12/er-002.pdf#page=3
-#12 https://www.nevo.co.il/law_word/law12/er-017-t2.pdf#page=4
-#13 https://www.nevo.co.il/law_word/law06/tak-0006.pdf#page=3
-#14 https://www.nevo.co.il/law_word/law06/tak-0080.pdf#page=7
-#15 https://www.nevo.co.il/law_word/law06/tak-0164.pdf#page=10
-#16 https://www.nevo.co.il/law_word/law06/tak-0206.pdf#page=4
-#17 https://www.nevo.co.il/law_word/law06/tak-0212.pdf#page=2
-#18 https://www.nevo.co.il/law_word/law06/tak-0254.pdf#page=4
-#19 https://www.nevo.co.il/law_word/law06/tak-0300.pdf#page=5
-#20 https://www.nevo.co.il/law_word/law06/tak-0348.pdf#page=3
-#21 https://www.nevo.co.il/law_word/law06/tak-0420.pdf#page=5
-#22 https://www.nevo.co.il/law_word/law06/tak-0497.pdf#page=10
-#23 https://www.nevo.co.il/law_word/law06/tak-0591.pdf#page=6
-#24 https://www.nevo.co.il/law_word/law06/tak-0680.pdf#page=3
-#25 https://www.nevo.co.il/law_word/law06/tak-3192.pdf#page=2
-#26 https://www.nevo.co.il/law_word/law06/tak-3322.pdf#page=5
-#27 https://www.nevo.co.il/law_word/law06/tak-4146.pdf#page=2
-#28 https://www.nevo.co.il/law_word/law06/tak-4604.pdf#page=7
-#29 https://www.nevo.co.il/law_word/law06/tak-4619.pdf#page=2
-#30 https://www.nevo.co.il/law_word/law06/tak-4744.pdf#page=11
-#31 https://www.nevo.co.il/law_word/law06/tak-4851.pdf#page=2
-#32 https://www.nevo.co.il/law_word/law06/tak-4932.pdf#page=19
-#33 https://www.nevo.co.il/law_word/law06/tak-5013.pdf#page=8
-#34 https://www.nevo.co.il/law_word/law06/tak-5021.pdf#page=8
-#35 https://www.nevo.co.il/law_word/law06/tak-5096.pdf#page=3
-#36 https://www.nevo.co.il/law_word/law06/tak-5167.pdf#page=2
-#37 https://www.nevo.co.il/law_word/law06/tak-5248.pdf#page=7
-#38 https://www.nevo.co.il/law_word/law06/tak-5335.pdf#page=6
-#39 https://www.nevo.co.il/law_word/law06/tak-5339.pdf#page=7
-#40 https://www.nevo.co.il/law_word/law06/tak-5506.pdf#page=19
-#41 https://www.nevo.co.il/law_word/law06/tak-5731.pdf#page=2
-#42 https://www.nevo.co.il/law_word/law06/tak-5853.pdf#page=3
-#43 https://www.nevo.co.il/law_word/law06/tak-5937.pdf#page=9
-#44 https://www.nevo.co.il/law_word/law06/tak-6024.pdf#page=4
-#
-# Time Determination (Temporary Provisions) Law, 1997
-# https://www.nevo.co.il/law_html/law19/p201_003.htm
-#
-# Time Determination (Temporary Provisions) Law, 2000
-# https://www.nevo.co.il/law_html/law19/p201_004.htm
-#
-# Time Determination Law, 1992 and amendments
-# https://www.nevo.co.il/law_html/law01/p201_002.htm
-# https://main.knesset.gov.il/Activity/Legislation/Laws/Pages/LawPrimary.aspx?lawitemid=2001174
-
-# From Paul Eggert (2020-10-27):
-# Several of the midnight transitions mentioned above are ambiguous;
-# are they 00:00, 00:00s, 24:00, or 24:00s?  When resolving these ambiguities,
-# try to minimize changes from previous tzdb versions, for lack of better info.
-# Commentary from previous versions is included below, to help explain this.
-
+# From Shanks & Pottenger:
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
-Rule	Zion	1940	only	-	May	31	24:00u	1:00	D
-Rule	Zion	1940	only	-	Sep	30	24:00u	0	S
-Rule	Zion	1940	only	-	Nov	16	24:00u	1:00	D
-Rule	Zion	1942	1946	-	Oct	31	24:00u	0	S
-Rule	Zion	1943	1944	-	Mar	31	24:00u	1:00	D
-Rule	Zion	1945	1946	-	Apr	15	24:00u	1:00	D
-Rule	Zion	1948	only	-	May	22	24:00u	2:00	DD
-Rule	Zion	1948	only	-	Aug	31	24:00u	1:00	D
-Rule	Zion	1948	1949	-	Oct	31	24:00u	0	S
-Rule	Zion	1949	only	-	Apr	30	24:00u	1:00	D
-Rule	Zion	1950	only	-	Apr	15	24:00u	1:00	D
-Rule	Zion	1950	only	-	Sep	14	24:00u	0	S
-Rule	Zion	1951	only	-	Mar	31	24:00u	1:00	D
-Rule	Zion	1951	only	-	Nov	10	24:00u	0	S
-Rule	Zion	1952	only	-	Apr	19	24:00u	1:00	D
-Rule	Zion	1952	only	-	Oct	18	24:00u	0	S
-Rule	Zion	1953	only	-	Apr	11	24:00u	1:00	D
-Rule	Zion	1953	only	-	Sep	12	24:00u	0	S
-Rule	Zion	1954	only	-	Jun	12	24:00u	1:00	D
-Rule	Zion	1954	only	-	Sep	11	24:00u	0	S
-Rule	Zion	1955	only	-	Jun	11	24:00u	1:00	D
-Rule	Zion	1955	only	-	Sep	10	24:00u	0	S
-Rule	Zion	1956	only	-	Jun	 2	24:00u	1:00	D
-Rule	Zion	1956	only	-	Sep	29	24:00u	0	S
-Rule	Zion	1957	only	-	Apr	27	24:00u	1:00	D
-Rule	Zion	1957	only	-	Sep	21	24:00u	0	S
-Rule	Zion	1974	only	-	Jul	 6	24:00	1:00	D
-Rule	Zion	1974	only	-	Oct	12	24:00	0	S
-Rule	Zion	1975	only	-	Apr	19	24:00	1:00	D
-Rule	Zion	1975	only	-	Aug	30	24:00	0	S
+Rule	Zion	1940	only	-	Jun	 1	0:00	1:00	D
+Rule	Zion	1942	1944	-	Nov	 1	0:00	0	S
+Rule	Zion	1943	only	-	Apr	 1	2:00	1:00	D
+Rule	Zion	1944	only	-	Apr	 1	0:00	1:00	D
+Rule	Zion	1945	only	-	Apr	16	0:00	1:00	D
+Rule	Zion	1945	only	-	Nov	 1	2:00	0	S
+Rule	Zion	1946	only	-	Apr	16	2:00	1:00	D
+Rule	Zion	1946	only	-	Nov	 1	0:00	0	S
+Rule	Zion	1948	only	-	May	23	0:00	2:00	DD
+Rule	Zion	1948	only	-	Sep	 1	0:00	1:00	D
+Rule	Zion	1948	1949	-	Nov	 1	2:00	0	S
+Rule	Zion	1949	only	-	May	 1	0:00	1:00	D
+Rule	Zion	1950	only	-	Apr	16	0:00	1:00	D
+Rule	Zion	1950	only	-	Sep	15	3:00	0	S
+Rule	Zion	1951	only	-	Apr	 1	0:00	1:00	D
+Rule	Zion	1951	only	-	Nov	11	3:00	0	S
+Rule	Zion	1952	only	-	Apr	20	2:00	1:00	D
+Rule	Zion	1952	only	-	Oct	19	3:00	0	S
+Rule	Zion	1953	only	-	Apr	12	2:00	1:00	D
+Rule	Zion	1953	only	-	Sep	13	3:00	0	S
+Rule	Zion	1954	only	-	Jun	13	0:00	1:00	D
+Rule	Zion	1954	only	-	Sep	12	0:00	0	S
+Rule	Zion	1955	only	-	Jun	11	2:00	1:00	D
+Rule	Zion	1955	only	-	Sep	11	0:00	0	S
+Rule	Zion	1956	only	-	Jun	 3	0:00	1:00	D
+Rule	Zion	1956	only	-	Sep	30	3:00	0	S
+Rule	Zion	1957	only	-	Apr	29	2:00	1:00	D
+Rule	Zion	1957	only	-	Sep	22	0:00	0	S
+Rule	Zion	1974	only	-	Jul	 7	0:00	1:00	D
+Rule	Zion	1974	only	-	Oct	13	0:00	0	S
+Rule	Zion	1975	only	-	Apr	20	0:00	1:00	D
+Rule	Zion	1975	only	-	Aug	31	0:00	0	S
 
 # From Alois Treindl (2019-03-06):
 # http://www.moin.gov.il/Documents/שעון%20קיץ/clock-50-years-7-2014.pdf
@@ -1932,24 +1792,25 @@ Rule	Zion	1975	only	-	Aug	30	24:00	0	S
 # From Paul Eggert (2019-03-06):
 # Also see this thread about the moin.gov.il URL:
 # https://mm.icann.org/pipermail/tz/2018-November/027194.html
-Rule	Zion	1980	only	-	Aug	 2	24:00s	1:00	D
-Rule	Zion	1980	only	-	Sep	13	24:00s	0	S
-Rule	Zion	1984	only	-	May	 5	24:00s	1:00	D
-Rule	Zion	1984	only	-	Aug	25	24:00s	0	S
+Rule	Zion	1980	only	-	Aug	 2	0:00	1:00	D
+Rule	Zion	1980	only	-	Sep	13	1:00	0	S
+Rule	Zion	1984	only	-	May	 5	0:00	1:00	D
+Rule	Zion	1984	only	-	Aug	25	1:00	0	S
 
-Rule	Zion	1985	only	-	Apr	13	24:00	1:00	D
-Rule	Zion	1985	only	-	Aug	31	24:00	0	S
-Rule	Zion	1986	only	-	May	17	24:00	1:00	D
-Rule	Zion	1986	only	-	Sep	 6	24:00	0	S
-Rule	Zion	1987	only	-	Apr	14	24:00	1:00	D
-Rule	Zion	1987	only	-	Sep	12	24:00	0	S
+# From Shanks & Pottenger:
+Rule	Zion	1985	only	-	Apr	14	0:00	1:00	D
+Rule	Zion	1985	only	-	Sep	15	0:00	0	S
+Rule	Zion	1986	only	-	May	18	0:00	1:00	D
+Rule	Zion	1986	only	-	Sep	 7	0:00	0	S
+Rule	Zion	1987	only	-	Apr	15	0:00	1:00	D
+Rule	Zion	1987	only	-	Sep	13	0:00	0	S
 
 # From Avigdor Finkelstein (2014-03-05):
 # I check the Parliament (Knesset) records and there it's stated that the
 # [1988] transition should take place on Saturday night, when the Sabbath
 # ends and changes to Sunday.
-Rule	Zion	1988	only	-	Apr	 9	24:00	1:00	D
-Rule	Zion	1988	only	-	Sep	 3	24:00	0	S
+Rule	Zion	1988	only	-	Apr	10	0:00	1:00	D
+Rule	Zion	1988	only	-	Sep	 4	0:00	0	S
 
 # From Ephraim Silverberg
 # (1997-03-04, 1998-03-16, 1998-12-28, 2000-01-17, 2000-07-25, 2004-12-22,
@@ -1979,14 +1840,14 @@ Rule	Zion	1988	only	-	Sep	 3	24:00	0	S
 # (the eve of the 7th of Tishrei in the lunar Hebrew calendar).
 
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
-Rule	Zion	1989	only	-	Apr	29	24:00	1:00	D
-Rule	Zion	1989	only	-	Sep	 2	24:00	0	S
-Rule	Zion	1990	only	-	Mar	24	24:00	1:00	D
-Rule	Zion	1990	only	-	Aug	25	24:00	0	S
-Rule	Zion	1991	only	-	Mar	23	24:00	1:00	D
-Rule	Zion	1991	only	-	Aug	31	24:00	0	S
-Rule	Zion	1992	only	-	Mar	28	24:00	1:00	D
-Rule	Zion	1992	only	-	Sep	 5	24:00	0	S
+Rule	Zion	1989	only	-	Apr	30	0:00	1:00	D
+Rule	Zion	1989	only	-	Sep	 3	0:00	0	S
+Rule	Zion	1990	only	-	Mar	25	0:00	1:00	D
+Rule	Zion	1990	only	-	Aug	26	0:00	0	S
+Rule	Zion	1991	only	-	Mar	24	0:00	1:00	D
+Rule	Zion	1991	only	-	Sep	 1	0:00	0	S
+Rule	Zion	1992	only	-	Mar	29	0:00	1:00	D
+Rule	Zion	1992	only	-	Sep	 6	0:00	0	S
 Rule	Zion	1993	only	-	Apr	 2	0:00	1:00	D
 Rule	Zion	1993	only	-	Sep	 5	0:00	0	S
 
@@ -2015,10 +1876,10 @@ Rule	Zion	1995	only	-	Sep	 3	0:00	0	S
 #       where YYYY is the relevant year.
 
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
-Rule	Zion	1996	only	-	Mar	14	24:00	1:00	D
-Rule	Zion	1996	only	-	Sep	15	24:00	0	S
-Rule	Zion	1997	only	-	Mar	20	24:00	1:00	D
-Rule	Zion	1997	only	-	Sep	13	24:00	0	S
+Rule	Zion	1996	only	-	Mar	15	0:00	1:00	D
+Rule	Zion	1996	only	-	Sep	16	0:00	0	S
+Rule	Zion	1997	only	-	Mar	21	0:00	1:00	D
+Rule	Zion	1997	only	-	Sep	14	0:00	0	S
 Rule	Zion	1998	only	-	Mar	20	0:00	1:00	D
 Rule	Zion	1998	only	-	Sep	 6	0:00	0	S
 Rule	Zion	1999	only	-	Apr	 2	2:00	1:00	D
@@ -2070,15 +1931,14 @@ Rule	Zion	2010	only	-	Sep	12	2:00	0	S
 Rule	Zion	2011	only	-	Oct	 2	2:00	0	S
 Rule	Zion	2012	only	-	Sep	23	2:00	0	S
 
-# From Ephraim Silverberg (2020-10-26):
-# The current time law (2013) from the State of Israel can be viewed
-# (in Hebrew) at:
-# ftp://ftp.cs.huji.ac.il/pub/tz/israel/announcements/2013+law.pdf
-# It translates to:
-# Every year, in the period from the Friday before the last Sunday in
-# the month of March at 02:00 a.m. until the last Sunday of the month
-# of October at 02:00 a.m., Israel Time will be advanced an additional
-# hour such that it will be UTC+3.
+# From Ephraim Silverberg (2013-06-27):
+# On June 23, 2013, the Israeli government approved changes to the
+# Time Decree Law.  The next day, the changes passed the First Reading
+# in the Knesset.  The law is expected to pass the Second and Third
+# (final) Readings by the beginning of September 2013.
+#
+# As of 2013, DST starts at 02:00 on the Friday before the last Sunday
+# in March.  DST ends at 02:00 on the last Sunday of October.
 
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
 Rule	Zion	2013	max	-	Mar	Fri>=23	2:00	1:00	D

make/data/tzdata/australasia

@@ -37,13 +37,16 @@
 # Please see the notes below for the controversy about "EST" versus "AEST" etc.
 
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
-Rule	Aus	1917	only	-	Jan	 1	2:00s	1:00	D
-Rule	Aus	1917	only	-	Mar	lastSun	2:00s	0	S
-Rule	Aus	1942	only	-	Jan	 1	2:00s	1:00	D
-Rule	Aus	1942	only	-	Mar	lastSun	2:00s	0	S
-Rule	Aus	1942	only	-	Sep	27	2:00s	1:00	D
-Rule	Aus	1943	1944	-	Mar	lastSun	2:00s	0	S
-Rule	Aus	1943	only	-	Oct	 3	2:00s	1:00	D
+Rule	Aus	1917	only	-	Jan	 1	0:01	1:00	D
+Rule	Aus	1917	only	-	Mar	25	2:00	0	S
+Rule	Aus	1942	only	-	Jan	 1	2:00	1:00	D
+Rule	Aus	1942	only	-	Mar	29	2:00	0	S
+Rule	Aus	1942	only	-	Sep	27	2:00	1:00	D
+Rule	Aus	1943	1944	-	Mar	lastSun	2:00	0	S
+Rule	Aus	1943	only	-	Oct	 3	2:00	1:00	D
+# Go with Whitman and the Australian National Standards Commission, which
+# says W Australia didn't use DST in 1943/1944.  Ignore Whitman's claim that
+# 1944/1945 was just like 1943/1944.
 
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 # Northern Territory
@@ -135,12 +138,8 @@ Zone Australia/Adelaide	9:14:20 -	LMT	1895 Feb
 # says King Island didn't observe DST from WWII until late 1971.
 #
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
-Rule	AT	1916	only	-	Oct	Sun>=1	2:00s	1:00	D
-Rule	AT	1917	only	-	Mar	lastSun	2:00s	0	S
-Rule	AT	1917	1918	-	Oct	Sun>=22	2:00s	1:00	D
-Rule	AT	1918	1919	-	Mar	Sun>=1	2:00s	0	S
 Rule	AT	1967	only	-	Oct	Sun>=1	2:00s	1:00	D
-Rule	AT	1968	only	-	Mar	Sun>=29	2:00s	0	S
+Rule	AT	1968	only	-	Mar	lastSun	2:00s	0	S
 Rule	AT	1968	1985	-	Oct	lastSun	2:00s	1:00	D
 Rule	AT	1969	1971	-	Mar	Sun>=8	2:00s	0	S
 Rule	AT	1972	only	-	Feb	lastSun	2:00s	0	S
@@ -160,9 +159,15 @@ Rule	AT	2007	only	-	Mar	lastSun	2:00s	0	S
 Rule	AT	2008	max	-	Apr	Sun>=1	2:00s	0	S
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 Zone Australia/Hobart	9:49:16	-	LMT	1895 Sep
-			10:00	AT	AE%sT	1919 Oct 24
+			10:00	-	AEST	1916 Oct  1  2:00
+			10:00	1:00	AEDT	1917 Feb
 			10:00	Aus	AE%sT	1967
 			10:00	AT	AE%sT
+Zone Australia/Currie	9:35:28	-	LMT	1895 Sep
+			10:00	-	AEST	1916 Oct  1  2:00
+			10:00	1:00	AEDT	1917 Feb
+			10:00	Aus	AE%sT	1971 Jul
+			10:00	AT	AE%sT
 
 # Victoria
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
@@ -891,36 +896,13 @@ Zone	Pacific/Wake	11:06:28 -	LMT	1901
 
 
 # Vanuatu
-
-# From P Chan (2020-11-27):
-# Joint Daylight Saving Regulation No 59 of 1973
-# New Hebrides Condominium Gazette No 336. December 1973
-# http://www.paclii.org/vu/other/VUNHGovGaz//1973/11.pdf#page=15
-#
-# Joint Daylight Saving (Repeal) Regulation No 10 of 1974
-# New Hebrides Condominium Gazette No 336. March 1974
-# http://www.paclii.org/vu/other/VUNHGovGaz//1974/3.pdf#page=11
-#
-# Summer Time Act No. 35 of 1982 [commenced 1983-09-01]
-# http://www.paclii.org/vu/other/VUGovGaz/1982/32.pdf#page=48
-#
-# Summer Time Act (Cap 157)
-# Laws of the Republic of Vanuatu Revised Edition 1988
-# http://www.paclii.org/cgi-bin/sinodisp/vu/legis/consol_act1988/sta147/sta147.html
-#
-# Summer Time (Amendment) Act No. 6 of 1991 [commenced 1991-11-11]
-# http://www.paclii.org/vu/legis/num_act/sta1991227/
-#
-# Summer Time (Repeal) Act No. 4 of 1993 [commenced 1993-05-03]
-# http://www.paclii.org/vu/other/VUGovGaz/1993/15.pdf#page=59
-
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
-Rule	Vanuatu	1973	only	-	Dec	22	12:00u	1:00	-
-Rule	Vanuatu	1974	only	-	Mar	30	12:00u	0	-
-Rule	Vanuatu	1983	1991	-	Sep	Sat>=22	24:00	1:00	-
-Rule	Vanuatu	1984	1991	-	Mar	Sat>=22	24:00	0	-
-Rule	Vanuatu	1992	1993	-	Jan	Sat>=22	24:00	0	-
-Rule	Vanuatu	1992	only	-	Oct	Sat>=22	24:00	1:00	-
+Rule	Vanuatu	1983	only	-	Sep	25	0:00	1:00	-
+Rule	Vanuatu	1984	1991	-	Mar	Sun>=23	0:00	0	-
+Rule	Vanuatu	1984	only	-	Oct	23	0:00	1:00	-
+Rule	Vanuatu	1985	1991	-	Sep	Sun>=23	0:00	1:00	-
+Rule	Vanuatu	1992	1993	-	Jan	Sun>=23	0:00	0	-
+Rule	Vanuatu	1992	only	-	Oct	Sun>=23	0:00	1:00	-
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13 # Vila
 			11:00	Vanuatu	+11/+12
@@ -999,25 +981,6 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 # Electronic Journal of Australian and New Zealand History (1997-03-03)
 # http://www.jcu.edu.au/aff/history/reviews/davison.htm
 
-# From P Chan (2020-11-20):
-# Daylight Saving Act 1916 (No. 40 of 1916) [1916-12-21, commenced 1917-01-01]
-# http://classic.austlii.edu.au/au/legis/cth/num_act/dsa1916401916192/
-#
-# Daylight Saving Repeal Act 1917 (No. 35 of 1917) [1917-09-25]
-# http://classic.austlii.edu.au/au/legis/cth/num_act/dsra1917351917243/
-#
-# Statutory Rules 1941, No. 323 [1941-12-24]
-# https://www.legislation.gov.au/Details/C1941L00323
-#
-# Statutory Rules 1942, No. 392 [1942-09-10]
-# https://www.legislation.gov.au/Details/C1942L00392
-#
-# Statutory Rules 1943, No. 241 [1943-09-29]
-# https://www.legislation.gov.au/Details/C1943L00241
-#
-# All transition times should be 02:00 standard time.
-
-
 # From Paul Eggert (2005-12-08):
 # Implementation Dates of Daylight Saving Time within Australia
 # http://www.bom.gov.au/climate/averages/tables/dst_times.shtml
@@ -1410,27 +1373,6 @@ Zone	Pacific/Wallis	12:15:20 -	LMT	1901
 
 # Tasmania
 
-# From P Chan (2020-11-20):
-# Tasmania observed DST in 1916-1919.
-#
-# Daylight Saving Act, 1916 (7 Geo V, No 2) [1916-09-22]
-# http://classic.austlii.edu.au/au/legis/tas/num_act/tdsa19167gvn2267/
-#
-# Daylight Saving Amendment Act, 1917 (8 Geo V, No 5) [1917-10-01]
-# http://classic.austlii.edu.au/au/legis/tas/num_act/tdsaa19178gvn5347/
-#
-# Daylight Saving Act Repeal Act, 1919 (10 Geo V, No 9) [1919-10-24]
-# http://classic.austlii.edu.au/au/legis/tas/num_act/tdsara191910gvn9339/
-#
-# King Island is mentioned in the 1967 Act but not the 1968 Act.
-# Therefore it possibly observed DST from 1968/69.
-#
-# Daylight Saving Act 1967 (No. 33 of 1967) [1967-09-22]
-# http://classic.austlii.edu.au/au/legis/tas/num_act/dsa196733o1967211/
-#
-# Daylight Saving Act 1968 (No. 42 of 1968) [1968-10-15]
-# http://classic.austlii.edu.au/au/legis/tas/num_act/dsa196842o1968211/
-
 # The rules for 1967 through 1991 were reported by George Shepherd
 # via Simon Woodhead via Robert Elz (1991-03-06):
 # #  The state of TASMANIA.. [Courtesy Tasmanian Dept of Premier + Cabinet ]

make/data/tzdata/backward

@@ -72,7 +72,6 @@ Link	Atlantic/Faroe		Atlantic/Faeroe
 Link	Europe/Oslo		Atlantic/Jan_Mayen
 Link	Australia/Sydney	Australia/ACT
 Link	Australia/Sydney	Australia/Canberra
-Link	Australia/Hobart	Australia/Currie
 Link	Australia/Lord_Howe	Australia/LHI
 Link	Australia/Sydney	Australia/NSW
 Link	Australia/Darwin	Australia/North

make/data/tzdata/etcetera

@@ -26,11 +26,12 @@
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
-# These entries are for uses not otherwise covered by the tz database.
-# Their main practical use is for platforms like Android that lack
-# support for POSIX-style TZ strings.  On such platforms these entries
-# can be useful if the timezone database is wrong or if a ship or
-# aircraft at sea is not in a timezone.
+# These entries are mostly present for historical reasons, so that
+# people in areas not otherwise covered by the tz files could "zic -l"
+# to a timezone that was right for their area.  These days, the
+# tz files cover almost all the inhabited world, and the only practical
+# need now for the entries that are not on UTC are for ships at sea
+# that cannot use POSIX TZ settings.
 
 # Starting with POSIX 1003.1-2001, the entries below are all
 # unnecessary as settings for the TZ environment variable.  E.g.,

make/data/tzdata/europe

@@ -2915,19 +2915,6 @@ Zone Europe/Astrakhan	 3:12:12 -	LMT	1924 May
 # The law has been published today on
 # http://publication.pravo.gov.ru/Document/View/0001201810110037
 
-# From Alexander Krivenyshev (2020-11-27):
-# The State Duma approved (Nov 24, 2020) the transition of the Volgograd
-# region to the Moscow time zone....
-# https://sozd.duma.gov.ru/bill/1012130-7
-#
-# From Stepan Golosunov (2020-12-05):
-# Currently proposed text for the second reading (expected on December 8) ...
-# changes the date to December 27. https://v1.ru/text/gorod/2020/12/04/69601031/
-#
-# From Stepan Golosunov (2020-12-22):
-# The law was published today on
-# http://publication.pravo.gov.ru/Document/View/0001202012220002
-
 Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
 			 3:00	-	+03	1930 Jun 21
 			 4:00	-	+04	1961 Nov 11
@@ -2937,8 +2924,7 @@ Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
 			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
 			 4:00	-	+04	2014 Oct 26  2:00s
 			 3:00	-	+03	2018 Oct 28  2:00s
-			 4:00	-	+04	2020 Dec 27  2:00s
-			 3:00	-	+03
+			 4:00	-	+04
 
 # From Paul Eggert (2016-11-11):
 # Europe/Saratov covers:

make/data/tzdata/leapseconds

@@ -29,10 +29,6 @@
 # NIST format leap-seconds.list file, which can be copied from
 # <ftp://ftp.nist.gov/pub/time/leap-seconds.list>
 # or <ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.list>.
-# The NIST file is used instead of its IERS upstream counterpart
-# <https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list>
-# because under US law the NIST file is public domain
-# whereas the IERS file's copyright and license status is unclear.
 # For more about leap-seconds.list, please see
 # The NTP Timescale and Leap Seconds
 # <https://www.eecis.udel.edu/~mills/leap.html>.
@@ -95,11 +91,11 @@ Leap	2016	Dec	31	23:59:60	+	S
 # Any additional leap seconds will come after this.
 # This Expires line is commented out for now,
 # so that pre-2020a zic implementations do not reject this file.
-#Expires 2021	Dec	28	00:00:00
+#Expires 2021	Jun	28	00:00:00
 
 # POSIX timestamps for the data in this file:
 #updated 1467936000 (2016-07-08 00:00:00 UTC)
-#expires 1640649600 (2021-12-28 00:00:00 UTC)
+#expires 1624838400 (2021-06-28 00:00:00 UTC)
 
-#	Updated through IERS Bulletin C61
-#	File expires on:  28 December 2021
+#	Updated through IERS Bulletin C60
+#	File expires on:  28 June 2021

make/data/tzdata/northamerica

@@ -2257,7 +2257,7 @@ Zone America/Creston	-7:46:04 -	LMT	1884
 #     to say eight hours behind Greenwich Time.
 #
 # * O.I.C. 1980/02 INTERPRETATION ACT
-#   https://mm.icann.org/pipermail/tz/attachments/20201125/d5adc93b/CAYTOIC1980-02DST1980-01-04-0001.pdf
+#   [no online source found]
 #
 # * Yukon Daylight Saving Time, YOIC 1987/56
 #   https://www.canlii.org/en/yk/laws/regu/yoic-1987-56/latest/yoic-1987-56.html
@@ -2958,38 +2958,12 @@ Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:56
 #
 # For 1899 Milne gives -5:09:29.5; round that.
 #
-# From P Chan (2020-11-27, corrected on 2020-12-02):
-# There were two periods of DST observed in 1942-1945: 1942-05-01
-# midnight to 1944-12-31 midnight and 1945-02-01 to 1945-10-17 midnight.
-# "midnight" should mean 24:00 from the context.
-#
-# War Time Order 1942 [1942-05-01] and War Time (No. 2) Order 1942  [1942-09-29]
-# Appendix to the Statutes of 7 George VI. and the Year 1942. p 34, 43
-# https://books.google.com/books?id=5rlNAQAAIAAJ&pg=RA3-PA34
-# https://books.google.com/books?id=5rlNAQAAIAAJ&pg=RA3-PA43
-#
-# War Time Order 1943 [1943-03-31] and War Time Order 1944 [1943-12-29]
-# Appendix to the Statutes of 8 George VI. and the Year 1943. p 9-10, 28-29
-# https://books.google.com/books?id=5rlNAQAAIAAJ&pg=RA4-PA9
-# https://books.google.com/books?id=5rlNAQAAIAAJ&pg=RA4-PA28
-#
-# War Time Order 1945 [1945-01-31] and the Order which revoke War Time Order
-# 1945 [1945-10-16] Appendix to the Statutes of 9 George VI. and the Year
-# 1945. p 160, 247-248
-# https://books.google.com/books?id=5rlNAQAAIAAJ&pg=RA6-PA160
-# https://books.google.com/books?id=5rlNAQAAIAAJ&pg=RA6-PA247
-#
 # From Sue Williams (2006-12-07):
 # The Bahamas announced about a month ago that they plan to change their DST
 # rules to sync with the U.S. starting in 2007....
 # http://www.jonesbahamas.com/?c=45&a=10412
 
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
-Rule	Bahamas	1942	only	-	May	 1	24:00	1:00	W
-Rule	Bahamas	1944	only	-	Dec	31	24:00	0	S
-Rule	Bahamas	1945	only	-	Feb	 1	0:00	1:00	W
-Rule	Bahamas	1945	only	-	Aug	14	23:00u	1:00	P # Peace
-Rule	Bahamas	1945	only	-	Oct	17	24:00	0	S
 Rule	Bahamas	1964	1975	-	Oct	lastSun	2:00	0	S
 Rule	Bahamas	1964	1975	-	Apr	lastSun	2:00	1:00	D
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
@@ -3013,161 +2987,34 @@ Zone America/Barbados	-3:58:29 -	LMT	1924 # Bridgetown
 			-4:00	Barb	A%sT
 
 # Belize
-
-# From P Chan (2020-11-03):
-# Below are some laws related to the time in British Honduras/Belize:
-#
-# Definition of Time Ordinance, 1927 (No.4 of 1927) [1927-04-01]
-# Ordinances of British Honduras Passed in the Year 1927, p 19-20
-# https://books.google.com/books?id=LqEpAQAAMAAJ&pg=RA3-PA19
-#
-# Definition of Time (Amendment) Ordinance, 1942 (No. 5 of 1942) [1942-06-27]
-# Ordinances of British Honduras Passed in the Year 1942, p 31-32
-# https://books.google.com/books?id=h6MpAQAAMAAJ&pg=RA6-PA95-IA44
-#
-# Definition of Time Ordinance, 1945 (No. 19 of 1945) [1945-12-15]
-# Ordinances of British Honduras Passed in the Year 1945, p 49-50
-# https://books.google.com/books?id=xaMpAQAAMAAJ&pg=RA2-PP1
-#
-# Definition of Time Ordinance, 1947 (No. 1 of 1947) [1947-03-11]
-# Ordinances of British Honduras Passed in the Year 1947, p 1-2
-# https://books.google.com/books?id=xaMpAQAAMAAJ&pg=RA3-PA1
-#
-# Time (Definition of) Ordinance  (Chapter 180)
-# The Laws of British Honduras in Force on the 15th Day of September, 1958 , Volume IV, p 2580
-# https://books.google.com/books?id=v5QpAQAAMAAJ&pg=PA2580
-#
-# Time (Definition of) (Amendment) Ordinance, 1968 (No. 13 of 1968) [1968-08-03]
-# https://books.google.com/books?id=xij7KEB_58wC&pg=RA1-PA428-IA9
-#
-# Definition of Time Act (Chapter 339)
-# Law of Belize, Revised Edition 2000
-# http://www.belizelaw.org/web/lawadmin/PDF%20files/cap339.pdf
-
-# From Paul Eggert (2020-11-03):
-# The transitions below are derived from P Chan's sources, except that the
-# 1973 through 1983 transitions are from Shanks & Pottenger since we have
-# no better data there.
-
+# Whitman entirely disagrees with Shanks; go with Shanks & Pottenger.
 # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
-Rule	Belize	1918	1941	-	Oct	Sat>=1	24:00	0:30	-0530
-Rule	Belize	1919	1942	-	Feb	Sat>=8	24:00	0	CST
-Rule	Belize	1942	only	-	Jun	27	24:00	1:00	CWT
-Rule	Belize	1945	only	-	Aug	14	23:00u	1:00	CPT
-Rule	Belize	1945	only	-	Dec	15	24:00	0	CST
-Rule	Belize	1947	1967	-	Oct	Sat>=1	24:00	0:30	-0530
-Rule	Belize	1948	1968	-	Feb	Sat>=8	24:00	0	CST
+Rule	Belize	1918	1942	-	Oct	Sun>=2	0:00	0:30	-0530
+Rule	Belize	1919	1943	-	Feb	Sun>=9	0:00	0	CST
 Rule	Belize	1973	only	-	Dec	 5	0:00	1:00	CDT
 Rule	Belize	1974	only	-	Feb	 9	0:00	0	CST
 Rule	Belize	1982	only	-	Dec	18	0:00	1:00	CDT
 Rule	Belize	1983	only	-	Feb	12	0:00	0	CST
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Belize	-5:52:48 -	LMT	1912 Apr  1
+Zone	America/Belize	-5:52:48 -	LMT	1912 Apr
 			-6:00	Belize	%s
 
 # Bermuda
 
-# From Paul Eggert (2020-11-24):
 # For 1899 Milne gives -4:19:18.3 as the meridian of the clock tower,
-# Bermuda dockyard, Ireland I.  This agrees with standard offset given in the
-# Daylight Saving Act, 1917 cited below.  Round that to the nearest second.
-# It is not known when this time became standard for Bermuda; guess 1890.
-# The transition to -04 was specified by:
-# 1930: The Time Zone Act, 1929 (1929: No. 39) [1929-11-08]
-# https://books.google.com/books?id=7tdMAQAAIAAJ&pg=RA54-PP1
-
-# From P Chan (2020-11-20):
-# Most of the information can be found online from the Bermuda National
-# Library - Digital Collection which includes The Royal Gazette (RG) until 1957
-# https://bnl.contentdm.oclc.org/digital/
-# I will cite the ID.  For example, [10000] means
-# https://bnl.contentdm.oclc.org/digital/collection/BermudaNP02/id/10000
-#
-# 1917: Apr 5 midnight to Sep 30 midnight
-# Daylight Saving Act, 1917 (1917 No. 13) [1917-04-02]
-# Bermuda Acts and Resolves 1917, p 37-38
-# https://books.google.com/books?id=M-lCAQAAMAAJ&pg=PA36-IA2
-# RG, 1917-04-04, p 6 [42340] gives the spring forward date.
-#
-# 1918: Apr 13 midnight to Sep 15 midnight
-# Daylight Saving Act, 1918 (1918 No. 9) [1918-04-06]
-# Bermuda Acts and Resolves 1917, p 13
-# https://books.google.com/books?id=K-lCAQAAMAAJ&pg=RA1-PA7
-#
-# Note that local mean time was still used before 1930.
-#
-# During WWII, DST was introduced by Defence Regulations
-# 1942: Jan 11 02:00 to Oct 18 02:00 [113646], [115726]
-# 1943: Mar 21 02:00 to Oct 31 02:00 [116704], [118193]
-# 1944: Mar 12 02:00 to Nov 5 02:00 [119225], [121593]
-# 1945: Mar 11 02:00 to Nov 4 02:00 [122369], [124461]
-# RG, 1942-01-08, p 2, 1942-10-12, p 2 , 1943-03-06, p 2, 1943-09-03, p 1,
-# 1944-02-29, p 6, 1944-09-20, p 2, 1945-02-13, p 2, 1945-11-03, p 1
-#
-# In 1946, the House of Assembly rejected DST twice. [128686], [128076]
-# RG, 1946-03-16 p 1,1946-04-13 p 1
-#
-# 1947: third Sunday in May 02:00 to second Sunday in September 02:00
-# DST in 1947 was defined in the Daylight Saving Act, 1947 (1947: No. 12)
-# which expired at the end of the year.  [125784] ,[132405], [144454], [138226]
-# RG, 1947-02-27, p 1, 1947-05-15, p 1, 1947-09-13, p 1, 1947-12-30, p 1
-#
-# 1948-1952: fourth Sunday in May 02:00 to first Sunday in September 02:00
-# DST in 1948 was defined in the Daylight Saving Act, 1948 (1948 : No. 12)
-# which was set to expired at the end of the year but it was extended until
-# the end of 1952 and was not further extended.
-# [129802], [139403], [146008], [135240], [144330], [139049], [143309],
-# [148271], [149773], [153589], [153802], [155924]
-# RG, 1948-04-13, p 1, 1948-05-22, p 1, 1948-09-04, p 1, 1949-05-21, p1,
-# 1949-09-03, p 1, 1950-05-27 p 1, 1950-09-02, p 1, 1951-05-27, p 1,
-# 1951-09-01, p 1, 1952-05-23, p 1, 1952-09-26, p 1, 1952-12-21, p 8
-#
-# In 1953-1955, the House of Assembly rejected DST each year. [158996],
-# [162620], [166720] RG, 1953-05-02, p 1, 1954-04-01 p 1, 1955-03-12, p 1
-#
-# 1956: fourth Sunday in May 02:00 to last Sunday in October 02:00
-# Time Zone (Seasonal Variation) Act, 1956 (1956: No.44) [1956-05-25]
-# Bermuda Public Acts 1956, p 331-332
-# https://books.google.com/books?id=Xs1AlmD_cEwC&pg=PA63
-#
-# The extension of the Act was rejected by the House of Assembly. [176218]
-# RG, 1956-12-13, p 1
-#
-# From the Chronological Table of Public and Private Acts up to 1985, it seems
-# that there does not exist other Acts related to DST before 1973.
-# https://books.google.com/books?id=r9hMAQAAIAAJ&pg=RA23-PA1
-# Public Acts of the Legislature of the Islands of Bermuda, Together with
-# Statutory Instruments in Force Thereunder, Vol VII
+# Bermuda dockyard, Ireland I; round that.
 
 # From Dan Jones, reporting in The Royal Gazette (2006-06-26):
+
 # Next year, however, clocks in the US will go forward on the second Sunday
 # in March, until the first Sunday in November.  And, after the Time Zone
 # (Seasonal Variation) Bill 2006 was passed in the House of Assembly on
 # Friday, the same thing will happen in Bermuda.
 # http://www.theroyalgazette.com/apps/pbcs.dll/article?AID=/20060529/NEWS/105290135
 
-# Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
-Rule	Bermuda	1917	only	-	Apr	 5	24:00	1:00	-
-Rule	Bermuda	1917	only	-	Sep	30	24:00	0	-
-Rule	Bermuda	1918	only	-	Apr	13	24:00	1:00	-
-Rule	Bermuda	1918	only	-	Sep	15	24:00	0	S
-Rule	Bermuda	1942	only	-	Jan	11	 2:00	1:00	D
-Rule	Bermuda	1942	only	-	Oct	18	 2:00	0	S
-Rule	Bermuda	1943	only	-	Mar	21	 2:00	1:00	D
-Rule	Bermuda	1943	only	-	Oct	31	 2:00	0	S
-Rule	Bermuda	1944	1945	-	Mar	Sun>=8	 2:00	1:00	D
-Rule	Bermuda	1944	1945	-	Nov	Sun>=1	 2:00	0	S
-Rule	Bermuda	1947	only	-	May	Sun>=15	 2:00	1:00	D
-Rule	Bermuda	1947	only	-	Sep	Sun>=8	 2:00	0	S
-Rule	Bermuda	1948	1952	-	May	Sun>=22	 2:00	1:00	D
-Rule	Bermuda	1948	1952	-	Sep	Sun>=1	 2:00	0	S
-Rule	Bermuda	1956	only	-	May	Sun>=22	 2:00	1:00	D
-Rule	Bermuda	1956	only	-	Oct	lastSun	 2:00	0	S
-
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/Bermuda	-4:19:18 -	LMT	1890	# Hamilton
-			-4:19:18 Bermuda BMT/BST 1930 Jan 1  2:00
-			-4:00	Bermuda	A%sT	1974 Apr 28  2:00
+Zone Atlantic/Bermuda	-4:19:18 -	LMT	1930 Jan  1  2:00 # Hamilton
+			-4:00	-	AST	1974 Apr 28  2:00
 			-4:00	Canada	A%sT	1976
 			-4:00	US	A%sT
 
@@ -3750,7 +3597,7 @@ Zone America/Miquelon	-3:44:40 -	LMT	1911 May 15 # St Pierre
 # "Eastern Standard Times Begins 2007
 # Clocks are set back one hour at 2:00 a.m. local Daylight Saving Time"
 # indicating that the normal ET rules are followed.
-
+#
 # From Paul Eggert (2014-08-19):
 # The 2014-08-13 Cabinet meeting decided to stay on UT -04 year-round.  See:
 # http://tcweeklynews.com/daylight-savings-time-to-be-maintained-p5353-127.htm
@@ -3765,42 +3612,19 @@ Zone America/Miquelon	-3:44:40 -	LMT	1911 May 15 # St Pierre
 # during the summer months and Standard Time, also known as Local
 # Time, during the winter months with effect from April 2018 ...
 # https://www.gov.uk/government/news/turks-and-caicos-post-cabinet-meeting-statement--3
+#
 # From Paul Eggert (2017-08-26):
 # The date of effect of the spring 2018 change appears to be March 11,
 # which makes more sense.  See: Hamilton D. Time change back
 # by March 2018 for TCI. Magnetic Media. 2017-08-25.
 # http://magneticmediatv.com/2017/08/time-change-back-by-march-2018-for-tci/
 #
-# From P Chan (2020-11-27):
-# Standard Time Declaration Order 2015 (L.N. 15/2015)
-# http://online.fliphtml5.com/fizd/czin/#p=2
-#
-# Standard Time Declaration Order 2017 (L.N. 31/2017)
-# http://online.fliphtml5.com/fizd/dmcu/#p=2
-#
-# From Tim Parenti (2020-12-05):
-# Although L.N. 31/2017 reads that it "shall come into operation at 2:00 a.m.
-# on 11th March 2018", a precise interpretation here poses some problems.  The
-# order states that "the standard time to be observed throughout the Turks and
-# Caicos Islands shall be the same time zone as the Eastern United States of
-# America" and further clarifies "[f]or the avoidance of doubt" that it
-# "applies to the Eastern Standard Time as well as any changes thereto for
-# Daylight Saving Time."  However, as clocks in Turks and Caicos approached
-# 02:00 -04, and thus the declared implementation time, it was still 01:00 EST
-# (-05), as DST in the Eastern US would not start until an hour later.
-#
-# Since it is unlikely that those on the islands switched their clocks twice in
-# the span of an hour, we assume instead that the adoption of EDT actually took
-# effect once clocks in the Eastern US had sprung forward, from 03:00 -04.
-# This discrepancy only affects the time zone abbreviation and DST flag for the
-# intervening hour, not wall clock times, as -04 was maintained throughout.
-
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 Zone America/Grand_Turk	-4:44:32 -	LMT	1890
 			-5:07:10 -	KMT	1912 Feb # Kingston Mean Time
 			-5:00	-	EST	1979
-			-5:00	US	E%sT	2015 Mar  8  2:00
-			-4:00	-	AST	2018 Mar 11  3:00
+			-5:00	US	E%sT	2015 Nov Sun>=1 2:00
+			-4:00	-	AST	2018 Mar 11 3:00
 			-5:00	US	E%sT
 
 # British Virgin Is

make/data/tzdata/zone.tab

@@ -79,7 +79,8 @@ AS	-1416-17042	Pacific/Pago_Pago
 AT	+4813+01620	Europe/Vienna
 AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
 AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
-AU	-4253+14719	Australia/Hobart	Tasmania
+AU	-4253+14719	Australia/Hobart	Tasmania (most areas)
+AU	-3956+14352	Australia/Currie	Tasmania (King Island)
 AU	-3749+14458	Australia/Melbourne	Victoria
 AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
 AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
@@ -152,9 +153,9 @@ CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
 CA	+4906-11631	America/Creston	MST - BC (Creston)
 CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
 CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
-CA	+6043-13503	America/Whitehorse	MST - Yukon (east)
-CA	+6404-13925	America/Dawson	MST - Yukon (west)
 CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
+CA	+6043-13503	America/Whitehorse	Pacific - Yukon (east)
+CA	+6404-13925	America/Dawson	Pacific - Yukon (west)
 CC	-1210+09655	Indian/Cocos
 CD	-0418+01518	Africa/Kinshasa	Dem. Rep. of Congo (west)
 CD	-1140+02728	Africa/Lubumbashi	Dem. Rep. of Congo (east)
@@ -359,8 +360,8 @@ RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
 # Programs should use zone1970.tab instead; see above.
 UA	+4457+03406	Europe/Simferopol	Crimea
 RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
-RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd
 RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
+RU	+4844+04425	Europe/Volgograd	MSK+01 - Volgograd
 RU	+5134+04602	Europe/Saratov	MSK+01 - Saratov
 RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
 RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia

make/devkit/createWindowsDevkit2017.sh

@@ -89,23 +89,19 @@ if [ ! -d $DEVKIT_ROOT/VC ]; then
     REDIST_SUBDIR="VC/Redist/MSVC/14.12.25810"
     echo "Copying VC..."
     mkdir -p $DEVKIT_ROOT/VC/bin
-    cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/bin/Hostx64/arm64" $DEVKIT_ROOT/VC/bin/
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/bin/Hostx64/x64" $DEVKIT_ROOT/VC/bin/
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/bin/Hostx86/x86" $DEVKIT_ROOT/VC/bin/
     mkdir -p $DEVKIT_ROOT/VC/lib
-    cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/lib/arm64" $DEVKIT_ROOT/VC/lib/
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/lib/x64" $DEVKIT_ROOT/VC/lib/
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/lib/x86" $DEVKIT_ROOT/VC/lib/
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/include" $DEVKIT_ROOT/VC/
     mkdir -p $DEVKIT_ROOT/VC/atlmfc/lib
-    cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/lib/arm64" $DEVKIT_ROOT/VC/atlmfc/lib/
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/lib/x64" $DEVKIT_ROOT/VC/atlmfc/lib/
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/lib/x86" $DEVKIT_ROOT/VC/atlmfc/lib/
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/include" $DEVKIT_ROOT/VC/atlmfc/
     mkdir -p $DEVKIT_ROOT/VC/Auxiliary
     cp -r "$VS_INSTALL_DIR/VC/Auxiliary/Build" $DEVKIT_ROOT/VC/Auxiliary/
     mkdir -p $DEVKIT_ROOT/VC/redist
-    cp -r "$VS_INSTALL_DIR/$REDIST_SUBDIR/arm64" $DEVKIT_ROOT/VC/redist/
     cp -r "$VS_INSTALL_DIR/$REDIST_SUBDIR/x64" $DEVKIT_ROOT/VC/redist/
     cp -r "$VS_INSTALL_DIR/$REDIST_SUBDIR/x86" $DEVKIT_ROOT/VC/redist/
 
@@ -115,8 +111,6 @@ if [ ! -d $DEVKIT_ROOT/VC ]; then
     cp $DEVKIT_ROOT/VC/redist/x86/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/x86
     cp $DEVKIT_ROOT/VC/redist/x64/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/x64
     cp $DEVKIT_ROOT/VC/redist/x64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/x64
-    cp $DEVKIT_ROOT/VC/redist/arm64/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/arm64
-    cp $DEVKIT_ROOT/VC/redist/arm64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/arm64
 fi
 
 ################################################################################
@@ -134,10 +128,8 @@ if [ ! -d $DEVKIT_ROOT/$SDK_VERSION ]; then
     cp -r "$SDK_INSTALL_DIR/bin/$SDK_FULL_VERSION/x64" $DEVKIT_ROOT/$SDK_VERSION/bin/
     cp -r "$SDK_INSTALL_DIR/bin/$SDK_FULL_VERSION/x86" $DEVKIT_ROOT/$SDK_VERSION/bin/
     mkdir -p $DEVKIT_ROOT/$SDK_VERSION/lib
-    cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/um/arm64" $DEVKIT_ROOT/$SDK_VERSION/lib/
     cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/um/x64" $DEVKIT_ROOT/$SDK_VERSION/lib/
     cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/um/x86" $DEVKIT_ROOT/$SDK_VERSION/lib/
-    cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/ucrt/arm64" $DEVKIT_ROOT/$SDK_VERSION/lib/
     cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/ucrt/x64" $DEVKIT_ROOT/$SDK_VERSION/lib/
     cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/ucrt/x86" $DEVKIT_ROOT/$SDK_VERSION/lib/
     mkdir -p $DEVKIT_ROOT/$SDK_VERSION/Redist
@@ -172,13 +164,6 @@ echo-info "DEVKIT_VS_LIB_x86_64=\"\$DEVKIT_ROOT/VC/lib/x64;\$DEVKIT_ROOT/VC/atlm
 echo-info "DEVKIT_MSVCR_DLL_x86_64=\"\$DEVKIT_ROOT/VC/redist/x64/$MSVCR_DLL\""
 echo-info "DEVKIT_MSVCP_DLL_x86_64=\"\$DEVKIT_ROOT/VC/redist/x64/$MSVCP_DLL\""
 echo-info "DEVKIT_UCRT_DLL_DIR_x86_64=\"\$DEVKIT_ROOT/10/Redist/ucrt/DLLs/x64\""
-echo-info ""
-echo-info "DEVKIT_TOOLCHAIN_PATH_aarch64=\"\$DEVKIT_ROOT/VC/bin/arm64:\$DEVKIT_ROOT/$SDK_VERSION/bin/x64:\$DEVKIT_ROOT/$SDK_VERSION/bin/x86\""
-echo-info "DEVKIT_VS_INCLUDE_aarch64=\"\$DEVKIT_ROOT/VC/include;\$DEVKIT_ROOT/VC/atlmfc/include;\$DEVKIT_ROOT/$SDK_VERSION/include/shared;\$DEVKIT_ROOT/$SDK_VERSION/include/ucrt;\$DEVKIT_ROOT/$SDK_VERSION/include/um;\$DEVKIT_ROOT/$SDK_VERSION/include/winrt\""
-echo-info "DEVKIT_VS_LIB_aarch64=\"\$DEVKIT_ROOT/VC/lib/arm64;\$DEVKIT_ROOT/VC/atlmfc/lib/arm64;\$DEVKIT_ROOT/$SDK_VERSION/lib/arm64\""
-echo-info "DEVKIT_MSVCR_DLL_aarch64=\"\$DEVKIT_ROOT/VC/redist/arm64/$MSVCR_DLL\""
-echo-info "DEVKIT_MSVCP_DLL_aarch64=\"\$DEVKIT_ROOT/VC/redist/arm64/$MSVCP_DLL\""
-echo-info "DEVKIT_UCRT_DLL_DIR_aarch64=\"\$DEVKIT_ROOT/10/Redist/ucrt/DLLs/arm64\""
 
 ################################################################################
 # Copy this script

make/devkit/createWindowsDevkit2019.sh

@@ -1,227 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This script copies parts of a Visual Studio installation into a devkit
-# suitable for building OpenJDK and OracleJDK. Needs to run in Cygwin or WSL.
-# erik.joelsson@oracle.com
-
-VS_VERSION="2019"
-VS_VERSION_NUM_NODOT="160"
-VS_DLL_VERSION="140"
-SDK_VERSION="10"
-SDK_FULL_VERSION="10.0.17763.0"
-MSVC_DIR="Microsoft.VC142.CRT"
-MSVC_FULL_VERSION="14.12.27508"
-REDIST_FULL_VERSION="14.20.27508"
-
-SCRIPT_DIR="$(cd "$(dirname $0)" > /dev/null && pwd)"
-BUILD_DIR="${SCRIPT_DIR}/../../build/devkit"
-
-################################################################################
-# Prepare settings
-
-UNAME_SYSTEM=`uname -s`
-UNAME_RELEASE=`uname -r`
-
-# Detect cygwin or WSL
-IS_CYGWIN=`echo $UNAME_SYSTEM | grep -i CYGWIN`
-IS_WSL=`echo $UNAME_RELEASE | grep Microsoft`
-if test "x$IS_CYGWIN" != "x"; then
-    BUILD_ENV="cygwin"
-elif test "x$IS_WSL" != "x"; then
-    BUILD_ENV="wsl"
-else
-    echo "Unknown environment; only Cygwin and WSL are supported."
-    exit 1
-fi
-
-if test "x$BUILD_ENV" = "xcygwin"; then
-    WINDOWS_PATH_TO_UNIX_PATH="cygpath -u"
-elif test "x$BUILD_ENV" = "xwsl"; then
-    WINDOWS_PATH_TO_UNIX_PATH="wslpath -u"
-fi
-
-# Work around the insanely named ProgramFiles(x86) env variable
-PROGRAMFILES_X86="$($WINDOWS_PATH_TO_UNIX_PATH "$(cmd.exe /c set | sed -n 's/^ProgramFiles(x86)=//p' | tr -d '\r')")"
-
-# Find Visual Studio installation dir
-VSNNNCOMNTOOLS=`cmd.exe /c echo %VS${VS_VERSION_NUM_NODOT}COMNTOOLS% | tr -d '\r'`
-if [ -d "$VSNNNCOMNTOOLS" ]; then
-    VS_INSTALL_DIR="$($WINDOWS_PATH_TO_UNIX_PATH "$VSNNNCOMNTOOLS/../..")"
-else
-    VS_INSTALL_DIR="${PROGRAMFILES_X86}/Microsoft Visual Studio/2019"
-    VS_INSTALL_DIR="$(ls -d "${VS_INSTALL_DIR}/"{Community,Professional,Enterprise} 2>/dev/null | head -n1)"
-fi
-echo "VS_INSTALL_DIR: $VS_INSTALL_DIR"
-
-# Extract semantic version
-POTENTIAL_INI_FILES="Common7/IDE/wdexpress.isolation.ini Common7/IDE/devenv.isolation.ini"
-for f in $POTENTIAL_INI_FILES; do
-    if [ -f "$VS_INSTALL_DIR/$f" ]; then
-        VS_VERSION_SP="$(grep ^SemanticVersion= "$VS_INSTALL_DIR/$f")"
-        # Remove SemnaticVersion=
-        VS_VERSION_SP="${VS_VERSION_SP#*=}"
-        # Remove suffix of too detailed numbering starting with +
-        VS_VERSION_SP="${VS_VERSION_SP%+*}"
-        break
-    fi
-done
-if [ -z "$VS_VERSION_SP" ]; then
-    echo "Failed to find SP version"
-    exit 1
-fi
-echo "Found Version SP: $VS_VERSION_SP"
-
-# Setup output dirs
-DEVKIT_ROOT="${BUILD_DIR}/VS${VS_VERSION}-${VS_VERSION_SP}-devkit"
-DEVKIT_BUNDLE="${DEVKIT_ROOT}.tar.gz"
-
-echo "Creating devkit in $DEVKIT_ROOT"
-
-MSVCR_DLL=${MSVC_DIR}/vcruntime${VS_DLL_VERSION}.dll
-VCRUNTIME_1_DLL=${MSVC_DIR}/vcruntime${VS_DLL_VERSION}_1.dll
-MSVCP_DLL=${MSVC_DIR}/msvcp${VS_DLL_VERSION}.dll
-
-################################################################################
-# Copy Visual Studio files
-
-TOOLS_VERSION="$(ls "$VS_INSTALL_DIR/VC/Tools/MSVC" | sort -r -n | head -n1)"
-echo "Found Tools version: $TOOLS_VERSION"
-VC_SUBDIR="VC/Tools/MSVC/$TOOLS_VERSION"
-REDIST_VERSION="$(ls "$VS_INSTALL_DIR/VC/Redist/MSVC" | sort -r -n | head -n1)"
-echo "Found Redist version: $REDIST_VERSION"
-REDIST_SUBDIR="VC/Redist/MSVC/$REDIST_VERSION"
-echo "Copying VC..."
-rm -rf $DEVKIT_ROOT/VC
-mkdir -p $DEVKIT_ROOT/VC/bin
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/bin/Hostx64/arm64" $DEVKIT_ROOT/VC/bin/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/bin/Hostx64/x64" $DEVKIT_ROOT/VC/bin/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/bin/Hostx86/x86" $DEVKIT_ROOT/VC/bin/
-mkdir -p $DEVKIT_ROOT/VC/lib
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/lib/arm64" $DEVKIT_ROOT/VC/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/lib/x64" $DEVKIT_ROOT/VC/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/lib/x86" $DEVKIT_ROOT/VC/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/include" $DEVKIT_ROOT/VC/
-mkdir -p $DEVKIT_ROOT/VC/atlmfc/lib
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/lib/arm64" $DEVKIT_ROOT/VC/atlmfc/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/lib/x64" $DEVKIT_ROOT/VC/atlmfc/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/lib/x86" $DEVKIT_ROOT/VC/atlmfc/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/include" $DEVKIT_ROOT/VC/atlmfc/
-mkdir -p $DEVKIT_ROOT/VC/Auxiliary
-cp -r "$VS_INSTALL_DIR/VC/Auxiliary/Build" $DEVKIT_ROOT/VC/Auxiliary/
-mkdir -p $DEVKIT_ROOT/VC/redist
-cp -r "$VS_INSTALL_DIR/$REDIST_SUBDIR/arm64" $DEVKIT_ROOT/VC/redist/
-cp -r "$VS_INSTALL_DIR/$REDIST_SUBDIR/x64" $DEVKIT_ROOT/VC/redist/
-cp -r "$VS_INSTALL_DIR/$REDIST_SUBDIR/x86" $DEVKIT_ROOT/VC/redist/
-
-# The redist runtime libs are needed to run the compiler but may not be
-# installed on the machine where the devkit will be used.
-cp $DEVKIT_ROOT/VC/redist/x86/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/x86
-cp $DEVKIT_ROOT/VC/redist/x86/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/x86
-cp $DEVKIT_ROOT/VC/redist/x64/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/x64
-cp $DEVKIT_ROOT/VC/redist/x64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/x64
-cp $DEVKIT_ROOT/VC/redist/arm64/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/arm64
-cp $DEVKIT_ROOT/VC/redist/arm64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/arm64
-
-################################################################################
-# Copy SDK files
-
-SDK_INSTALL_DIR="$PROGRAMFILES_X86/Windows Kits/$SDK_VERSION"
-echo "SDK_INSTALL_DIR: $SDK_INSTALL_DIR"
-
-SDK_FULL_VERSION="$(ls "$SDK_INSTALL_DIR/bin" | sort -r -n | head -n1)"
-echo "Found SDK version: $SDK_FULL_VERSION"
-UCRT_VERSION="$(ls "$SDK_INSTALL_DIR/Redist" | grep $SDK_VERSION | sort -r -n | head -n1)"
-echo "Found UCRT version: $UCRT_VERSION"
-echo "Copying SDK..."
-rm -rf $DEVKIT_ROOT/$SDK_VERSION
-mkdir -p $DEVKIT_ROOT/$SDK_VERSION/bin
-cp -r "$SDK_INSTALL_DIR/bin/$SDK_FULL_VERSION/x64" $DEVKIT_ROOT/$SDK_VERSION/bin/
-cp -r "$SDK_INSTALL_DIR/bin/$SDK_FULL_VERSION/x86" $DEVKIT_ROOT/$SDK_VERSION/bin/
-mkdir -p $DEVKIT_ROOT/$SDK_VERSION/lib
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/um/arm64" $DEVKIT_ROOT/$SDK_VERSION/lib/
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/um/x64" $DEVKIT_ROOT/$SDK_VERSION/lib/
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/um/x86" $DEVKIT_ROOT/$SDK_VERSION/lib/
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/ucrt/arm64" $DEVKIT_ROOT/$SDK_VERSION/lib/
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/ucrt/x64" $DEVKIT_ROOT/$SDK_VERSION/lib/
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/ucrt/x86" $DEVKIT_ROOT/$SDK_VERSION/lib/
-mkdir -p $DEVKIT_ROOT/$SDK_VERSION/Redist
-cp -r "$SDK_INSTALL_DIR/Redist/$UCRT_VERSION/ucrt" $DEVKIT_ROOT/$SDK_VERSION/Redist/
-mkdir -p $DEVKIT_ROOT/$SDK_VERSION/include
-cp -r "$SDK_INSTALL_DIR/include/$SDK_FULL_VERSION/"* $DEVKIT_ROOT/$SDK_VERSION/include/
-
-################################################################################
-# Generate devkit.info
-
-echo-info() {
-    echo "$1" >> $DEVKIT_ROOT/devkit.info
-}
-
-echo "Generating devkit.info..."
-rm -f $DEVKIT_ROOT/devkit.info
-echo-info "# This file describes to configure how to interpret the contents of this devkit"
-echo-info "DEVKIT_NAME=\"Microsoft Visual Studio $VS_VERSION $VS_VERSION_SP (devkit)\""
-echo-info "DEVKIT_VS_VERSION=\"$VS_VERSION\""
-echo-info ""
-echo-info "DEVKIT_TOOLCHAIN_PATH_x86=\"\$DEVKIT_ROOT/VC/bin/x86:\$DEVKIT_ROOT/$SDK_VERSION/bin/x86\""
-echo-info "DEVKIT_VS_INCLUDE_x86=\"\$DEVKIT_ROOT/VC/include;\$DEVKIT_ROOT/VC/atlmfc/include;\$DEVKIT_ROOT/$SDK_VERSION/include/shared;\$DEVKIT_ROOT/$SDK_VERSION/include/ucrt;\$DEVKIT_ROOT/$SDK_VERSION/include/um;\$DEVKIT_ROOT/$SDK_VERSION/include/winrt\""
-echo-info "DEVKIT_VS_LIB_x86=\"\$DEVKIT_ROOT/VC/lib/x86;\$DEVKIT_ROOT/VC/atlmfc/lib/x86;\$DEVKIT_ROOT/$SDK_VERSION/lib/x86\""
-echo-info "DEVKIT_MSVCR_DLL_x86=\"\$DEVKIT_ROOT/VC/redist/x86/$MSVCR_DLL\""
-echo-info "DEVKIT_MSVCP_DLL_x86=\"\$DEVKIT_ROOT/VC/redist/x86/$MSVCP_DLL\""
-echo-info "DEVKIT_UCRT_DLL_DIR_x86=\"\$DEVKIT_ROOT/10/Redist/ucrt/DLLs/x86\""
-echo-info ""
-echo-info "DEVKIT_TOOLCHAIN_PATH_x86_64=\"\$DEVKIT_ROOT/VC/bin/x64:\$DEVKIT_ROOT/$SDK_VERSION/bin/x64:\$DEVKIT_ROOT/$SDK_VERSION/bin/x86\""
-echo-info "DEVKIT_VS_INCLUDE_x86_64=\"\$DEVKIT_ROOT/VC/include;\$DEVKIT_ROOT/VC/atlmfc/include;\$DEVKIT_ROOT/$SDK_VERSION/include/shared;\$DEVKIT_ROOT/$SDK_VERSION/include/ucrt;\$DEVKIT_ROOT/$SDK_VERSION/include/um;\$DEVKIT_ROOT/$SDK_VERSION/include/winrt\""
-echo-info "DEVKIT_VS_LIB_x86_64=\"\$DEVKIT_ROOT/VC/lib/x64;\$DEVKIT_ROOT/VC/atlmfc/lib/x64;\$DEVKIT_ROOT/$SDK_VERSION/lib/x64\""
-echo-info "DEVKIT_MSVCR_DLL_x86_64=\"\$DEVKIT_ROOT/VC/redist/x64/$MSVCR_DLL\""
-echo-info "DEVKIT_VCRUNTIME_1_DLL_x86_64=\"\$DEVKIT_ROOT/VC/redist/x64/$VCRUNTIME_1_DLL\""
-echo-info "DEVKIT_MSVCP_DLL_x86_64=\"\$DEVKIT_ROOT/VC/redist/x64/$MSVCP_DLL\""
-echo-info "DEVKIT_UCRT_DLL_DIR_x86_64=\"\$DEVKIT_ROOT/10/Redist/ucrt/DLLs/x64\""
-echo-info ""
-echo-info "DEVKIT_TOOLCHAIN_PATH_aarch64=\"\$DEVKIT_ROOT/VC/bin/arm64:\$DEVKIT_ROOT/$SDK_VERSION/bin/x64:\$DEVKIT_ROOT/$SDK_VERSION/bin/x86\""
-echo-info "DEVKIT_VS_INCLUDE_aarch64=\"\$DEVKIT_ROOT/VC/include;\$DEVKIT_ROOT/VC/atlmfc/include;\$DEVKIT_ROOT/$SDK_VERSION/include/shared;\$DEVKIT_ROOT/$SDK_VERSION/include/ucrt;\$DEVKIT_ROOT/$SDK_VERSION/include/um;\$DEVKIT_ROOT/$SDK_VERSION/include/winrt\""
-echo-info "DEVKIT_VS_LIB_aarch64=\"\$DEVKIT_ROOT/VC/lib/arm64;\$DEVKIT_ROOT/VC/atlmfc/lib/arm64;\$DEVKIT_ROOT/$SDK_VERSION/lib/arm64\""
-echo-info "DEVKIT_MSVCR_DLL_aarch64=\"\$DEVKIT_ROOT/VC/redist/arm64/$MSVCR_DLL\""
-echo-info "DEVKIT_VCRUNTIME_1_DLL_aarch64=\"\$DEVKIT_ROOT/VC/redist/arm64/$VCRUNTIME_1_DLL\""
-echo-info "DEVKIT_MSVCP_DLL_aarch64=\"\$DEVKIT_ROOT/VC/redist/arm64/$MSVCP_DLL\""
-echo-info "DEVKIT_UCRT_DLL_DIR_aarch64=\"\$DEVKIT_ROOT/10/Redist/ucrt/DLLs/arm64\""
-echo-info ""
-echo-info "DEVKIT_TOOLS_VERSION=\"$TOOLS_VERSION\""
-echo-info "DEVKIT_REDIST_VERSION=\"$REDIST_VERSION\""
-echo-info "DEVKIT_SDK_VERSION=\"$SDK_FULL_VERSION\""
-echo-info "DEVKIT_UCRT_VERSION=\"$UCRT_VERSION\""
-
-################################################################################
-# Copy this script
-
-echo "Copying this script..."
-cp $0 $DEVKIT_ROOT/
-
-################################################################################
-# Create bundle
-
-echo "Creating bundle: $DEVKIT_BUNDLE"
-(cd "$DEVKIT_ROOT" && tar zcf "$DEVKIT_BUNDLE" .)

make/gensrc/GensrcMisc.gmk

@@ -63,12 +63,6 @@ ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang), )
   CPP_FLAGS += -x c
 else ifeq ($(TOOLCHAIN_TYPE), microsoft)
   CPP_FLAGS += -nologo
-
-  ifeq ($(OPENJDK_TARGET_CPU),aarch64)
-    # cl.exe does only recognize few file extensions as valid (ex: .c, .h, .cpp), so
-    # make sure *.java.template files are recognized as valid input files
-    CPP_FILEPREFIX = -Tc
-  endif
 endif
 
 # Generate a java source file from a template through the C preprocessor for the
@@ -81,7 +75,7 @@ endif
 define generate-preproc-src
 	$(call MakeDir, $(@D))
 	( $(NAWK) '/@@END_COPYRIGHT@@/{exit}1' $< && \
-	  $(CPP) $(CPP_FLAGS) $(SYSROOT_CFLAGS) $(CFLAGS_JDKLIB) $(CPP_FILEPREFIX) $< \
+	  $(CPP) $(CPP_FLAGS) $(SYSROOT_CFLAGS) $(CFLAGS_JDKLIB) $< \
 	      2> >($(GREP) -v '^$(<F)$$' >&2) \
 	      | $(NAWK) '/@@START_HERE@@/,0' \
 	      |  $(SED) -e 's/@@START_HERE@@/\/\/ AUTOMATICALLY GENERATED FILE - DO NOT EDIT/' \

make/hotspot/gensrc/GensrcAdlc.gmk

@@ -99,16 +99,6 @@ ifeq ($(call check-jvm-feature, compiler2), true)
     ADLCFLAGS += -DAIX=1
   else ifeq ($(OPENJDK_TARGET_OS), macosx)
     ADLCFLAGS += -D_ALLBSD_SOURCE=1 -D_GNU_SOURCE=1
-    ifeq ($(HOTSPOT_TARGET_CPU_ARCH), aarch64)
-      ADLCFLAGS += -DR18_RESERVED=1
-    endif
-  else ifeq ($(OPENJDK_TARGET_OS), windows)
-    ifeq ($(call isTargetCpuBits, 64), true)
-      ADLCFLAGS += -D_WIN64=1
-    endif
-    ifeq ($(HOTSPOT_TARGET_CPU_ARCH), aarch64)
-      ADLCFLAGS += -DR18_RESERVED=1
-    endif
   endif
 
   ifneq ($(OPENJDK_TARGET_OS), windows)

make/hotspot/lib/CompileGtest.gmk

@@ -78,8 +78,6 @@ $(eval $(call SetupNativeCompilation, BUILD_GTEST_LIBJVM, \
     DISABLED_WARNINGS_clang := undef switch format-nonliteral \
         tautological-undefined-compare $(BUILD_LIBJVM_DISABLED_WARNINGS_clang), \
     DISABLED_WARNINGS_solstudio := identexpected, \
-    DISABLED_WARNINGS_microsoft := 4100 4127 4146 4201 4244 4291 4351 \
-        4511 4512 4514 4624 4996, \
     LDFLAGS := $(JVM_LDFLAGS), \
     LDFLAGS_solaris := -library=stlport4 $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JVM_LIBS), \

make/hotspot/lib/CompileJvm.gmk

@@ -164,8 +164,6 @@ $(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \
     DISABLED_WARNINGS_solstudio := $(DISABLED_WARNINGS_solstudio), \
     DISABLED_WARNINGS_xlc := 1540-0216 1540-0198 1540-1090 1540-1639 \
         1540-1088 1500-010, \
-    DISABLED_WARNINGS_microsoft := 4100 4127 4146 4201 4244 4291 4351 \
-        4511 4512 4514 4624 4996, \
     ASFLAGS := $(JVM_ASFLAGS), \
     LDFLAGS := $(JVM_LDFLAGS), \
     LIBS := $(JVM_LIBS), \

make/jdk/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,12 +33,10 @@ import java.nio.file.Paths;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.stream.Collectors;
 
 /**
  * This tool reads the IANA Language Subtag Registry data file downloaded from
@@ -77,49 +75,32 @@ public class EquivMapsGenerator {
         String type = null;
         String tag = null;
         String preferred = null;
-        String prefix = null;
 
         for (String line : Files.readAllLines(Paths.get(filename),
                                               Charset.forName("UTF-8"))) {
             line = line.toLowerCase(Locale.ROOT);
-            int index = line.indexOf(' ') + 1;
+            int index = line.indexOf(' ')+1;
             if (line.startsWith("file-date:")) {
                 LSRrevisionDate = line.substring(index);
             } else if (line.startsWith("type:")) {
                 type = line.substring(index);
             } else if (line.startsWith("tag:") || line.startsWith("subtag:")) {
                 tag = line.substring(index);
-            } else if (line.startsWith("preferred-value:")) {
+            } else if (line.startsWith("preferred-value:")
+                       && !type.equals("extlang")) {
                 preferred = line.substring(index);
-            } else if (line.startsWith("prefix:")) {
-                prefix = line.substring(index);
+                processDeprecatedData(type, tag, preferred);
             } else if (line.equals("%%")) {
-                processDeprecatedData(type, tag, preferred, prefix);
                 type = null;
                 tag = null;
-                preferred = null;
-                prefix = null;
             }
         }
-
-        // Last entry
-        processDeprecatedData(type, tag, preferred, prefix);
     }
 
     private static void processDeprecatedData(String type,
                                               String tag,
-                                              String preferred,
-                                              String prefix) {
+                                              String preferred) {
         StringBuilder sb;
-
-        if (type == null || tag == null || preferred == null) {
-            return;
-        }
-
-        if (type.equals("extlang") && prefix != null) {
-            tag = prefix + "-" + tag;
-        }
-
         if (type.equals("region") || type.equals("variant")) {
             if (!initialRegionVariantMap.containsKey(preferred)) {
                 sb = new StringBuilder("-");
@@ -132,7 +113,7 @@ public class EquivMapsGenerator {
                     + " A region/variant subtag \"" + preferred
                     + "\" is registered for more than one subtags.");
             }
-        } else { // language, extlang, grandfathered, and redundant
+        } else { // language, grandfahered, and redundant
             if (!initialLanguageMap.containsKey(preferred)) {
                 sb = new StringBuilder(preferred);
                 sb.append(',');
@@ -150,12 +131,7 @@ public class EquivMapsGenerator {
     private static void generateEquivalentMap() {
         String[] subtags;
         for (String preferred : initialLanguageMap.keySet()) {
-            // There are cases where the same tag may appear in two entries, e.g.,
-            // "yue" is defined both as extlang and redundant. Remove the dup.
-            subtags = Arrays.stream(initialLanguageMap.get(preferred).toString().split(","))
-                    .distinct()
-                    .collect(Collectors.toList())
-                    .toArray(new String[0]);
+            subtags = initialLanguageMap.get(preferred).toString().split(",");
 
             if (subtags.length == 2) {
                 sortedLanguageMap1.put(subtags[0], subtags[1]);
@@ -239,7 +215,10 @@ public class EquivMapsGenerator {
         + "    static final Map<String, String[]> multiEquivsMap;\n"
         + "    static final Map<String, String> regionVariantEquivMap;\n\n"
         + "    static {\n"
-        + "        singleEquivMap = new HashMap<>(";
+        + "        singleEquivMap = new HashMap<>();\n"
+        + "        multiEquivsMap = new HashMap<>();\n"
+        + "        regionVariantEquivMap = new HashMap<>();\n\n"
+        + "        // This is an auto-generated file and should not be manually edited.\n";
 
     private static final String footerText =
         "    }\n\n"
@@ -263,12 +242,6 @@ public class EquivMapsGenerator {
                 Paths.get(fileName))) {
             writer.write(getOpenJDKCopyright());
             writer.write(headerText
-                + (int)(sortedLanguageMap1.size() / 0.75f + 1) + ");\n"
-                + "        multiEquivsMap = new HashMap<>("
-                + (int)(sortedLanguageMap2.size() / 0.75f + 1) + ");\n"
-                + "        regionVariantEquivMap = new HashMap<>("
-                + (int)(sortedRegionVariantMap.size() / 0.75f + 1) + ");\n\n"
-                + "        // This is an auto-generated file and should not be manually edited.\n"
                 + "        //   LSR Revision: " + LSRrevisionDate);
             writer.newLine();
 

make/langtools/tools/propertiesparser/gen/ClassGenerator.java

@@ -25,8 +25,6 @@
 
 package propertiesparser.gen;
 
-import static java.util.stream.Collectors.toList;
-
 import propertiesparser.parser.Message;
 import propertiesparser.parser.MessageFile;
 import propertiesparser.parser.MessageInfo;
@@ -46,12 +44,11 @@ import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.TreeSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
+import java.util.Properties;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -153,11 +150,7 @@ public class ClassGenerator {
     public void generateFactory(MessageFile messageFile, File outDir) {
         Map<FactoryKind, List<Map.Entry<String, Message>>> groupedEntries =
                 messageFile.messages.entrySet().stream()
-                        .collect(
-                                Collectors.groupingBy(
-                                        e -> FactoryKind.parseFrom(e.getKey().split("\\.")[1]),
-                                        TreeMap::new,
-                                        toList()));
+                        .collect(Collectors.groupingBy(e -> FactoryKind.parseFrom(e.getKey().split("\\.")[1])));
         //generate nested classes
         List<String> nestedDecls = new ArrayList<>();
         Set<String> importedTypes = new TreeSet<>();

make/lib/Awt2dLibraries.gmk

@@ -245,6 +245,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
     LIBS_macosx := -lmlib_image \
         -framework Cocoa \
         -framework OpenGL \
+        -framework JavaNativeFoundation \
         -framework JavaRuntimeSupport \
         -framework ApplicationServices \
         -framework AudioToolbox, \
@@ -390,7 +391,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
         common/awt/debug \
         libawt/java2d, \
     HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
-    DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation stringop-truncation, \
+    DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation, \
     DISABLED_WARNINGS_clang := tautological-compare, \
     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
     DISABLED_WARNINGS_microsoft := 4819, \
@@ -571,43 +572,105 @@ endif
 ###########################################################################
 
 ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
-   LIBFONTMANAGER_EXTRA_SRC =
-   BUILD_LIBFONTMANAGER_FONTLIB += $(LIBHARFBUZZ_LIBS)
+  LIBHARFBUZZ_LIBS := $(HARFBUZZ_LIBS)
 else
-   LIBFONTMANAGER_EXTRA_SRC = libharfbuzz
-   HARFBUZZ_CFLAGS := -DHAVE_OT -DHAVE_FALLBACK -DHAVE_UCDN -DHAVE_ROUND
-   ifneq ($(OPENJDK_TARGET_OS), windows)
-     HARFBUZZ_CFLAGS += -DGETPAGESIZE -DHAVE_MPROTECT -DHAVE_PTHREAD \
-                        -DHAVE_SYSCONF -DHAVE_SYS_MMAN_H -DHAVE_UNISTD_H \
-                        -DHB_NO_PRAGMA_GCC_DIAGNOSTIC
-   endif
-   ifneq (, $(findstring $(OPENJDK_TARGET_OS), linux macosx))
-     HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES
-   endif
+  HARFBUZZ_CFLAGS := -DHAVE_OT -DHAVE_FALLBACK -DHAVE_UCDN -DHAVE_ROUND
+  # This is better than adding EXPORT_ALL_SYMBOLS
+  ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang solstudio), )
+    HARFBUZZ_CFLAGS += -DHB_EXTERN=__attribute__\(\(visibility\(\"default\"\)\)\)
+  else ifeq ($(TOOLCHAIN_TYPE), microsoft)
+    HARFBUZZ_CFLAGS += -DHB_EXTERN=__declspec\(dllexport\)
+  endif
 
-   # hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later.
-   LIBFONTMANAGER_EXCLUDE_FILES += libharfbuzz/hb-ft.cc \
-                                   libharfbuzz/hb-coretext.cc
+  LIBHARFBUZZ_LDFLAGS := $(LDFLAGS_JDKLIB) \
+                         $(call SET_SHARED_LIBRARY_ORIGIN)
+  ifeq ($(TOOLCHAIN_TYPE), gcc)
+    ifeq ($(CC_VERSION_NUMBER), 4.4.7)
+      LIBHARFBUZZ_LDFLAGS := $(subst -Xlinker -z -Xlinker defs,, \
+        $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB))) \
+        $(call SET_SHARED_LIBRARY_ORIGIN)
+    endif
+  endif
 
-  HARFBUZZ_EXTRA_HEADER_DIRS := \
-    libharfbuzz/hb-ucdn
+  ifneq ($(OPENJDK_TARGET_OS), windows)
+    HARFBUZZ_CFLAGS += -DGETPAGESIZE -DHAVE_MPROTECT -DHAVE_PTHREAD \
+                       -DHAVE_SYSCONF -DHAVE_SYS_MMAN_H -DHAVE_UNISTD_H \
+                       -DHB_NO_PRAGMA_GCC_DIAGNOSTIC
+  endif
+  ifneq (, $(findstring $(OPENJDK_TARGET_OS), linux macosx))
+    HARFBUZZ_CFLAGS += -DHAVE_INTEL_ATOMIC_PRIMITIVES
+  endif
+  ifeq ($(OPENJDK_TARGET_OS), solaris)
+    HARFBUZZ_CFLAGS += -DHAVE_SOLARIS_ATOMIC_OPS
+  endif
 
-   HARFBUZZ_DISABLED_WARNINGS_gcc := type-limits missing-field-initializers strict-aliasing
-   HARFBUZZ_DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \
-        maybe-uninitialized class-memaccess
-   HARFBUZZ_DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \
-        tautological-constant-out-of-range-compare int-to-pointer-cast \
-        undef missing-field-initializers range-loop-analysis
-   HARFBUZZ_DISABLED_WARNINGS_microsoft := 4267 4244 4090 4146 4334 4819 4101 4068 4805 4138
+  LIBHARFBUZZ_EXCLUDE_FILES += harfbuzz/hb-coretext.cc
 
-   LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
+  # hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later.
+  LIBHARFBUZZ_EXCLUDE_FILES += harfbuzz/hb-ft.cc
+
+  LIBHARFBUZZ_CFLAGS += $(HARFBUZZ_CFLAGS)
+
+  # For use by libfontmanager:
+  ifeq ($(OPENJDK_TARGET_OS), windows)
+    LIBHARFBUZZ_LIBS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjharfbuzz/jharfbuzz.lib
+  else ifeq ($(OPENJDK_TARGET_OS), macosx)
+    LIBHARFBUZZ_LIBS := -ljharfbuzz
+  endif
+
+  LIBHARFBUZZ_EXTRA_HEADER_DIRS := \
+    libjharfbuzz/hb-ucdn \
+    #
+
+  LIBHARFBUZZ_OPTIMIZATION := HIGH
+
+  LIBHARFBUZZ_CFLAGS += $(X_CFLAGS) -DLE_STANDALONE -DHEADLESS
+
+  $(eval $(call SetupJdkLibrary, BUILD_LIBHARFBUZZ, \
+      NAME := jharfbuzz, \
+      EXCLUDE_FILES := $(LIBHARFBUZZ_EXCLUDE_FILES), \
+      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
+      CFLAGS := $(CFLAGS_JDKLIB) $(LIBHARFBUZZ_CFLAGS), \
+      CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBHARFBUZZ_CFLAGS), \
+      OPTIMIZATION := $(LIBHARFBUZZ_OPTIMIZATION), \
+      CFLAGS_windows = -DCC_NOEX, \
+      EXTRA_HEADER_DIRS := $(LIBHARFBUZZ_EXTRA_HEADER_DIRS), \
+      WARNINGS_AS_ERRORS_xlc := false, \
+      DISABLED_WARNINGS_gcc := type-limits missing-field-initializers strict-aliasing, \
+      DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \
+          maybe-uninitialized class-memaccess, \
+      DISABLED_WARNINGS_clang := unused-value incompatible-pointer-types \
+          tautological-constant-out-of-range-compare int-to-pointer-cast \
+          undef missing-field-initializers, \
+      DISABLED_WARNINGS_C_solstudio := \
+          E_INTEGER_OVERFLOW_DETECTED \
+          E_ARG_INCOMPATIBLE_WITH_ARG_L \
+          E_ENUM_VAL_OVERFLOWS_INT_MAX, \
+      DISABLED_WARNINGS_CXX_solstudio := \
+          truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \
+          hidevf w_novirtualdescr arrowrtn2 unknownpragma, \
+      DISABLED_WARNINGS_microsoft := 4267 4244 4090 4146 4334 4819 4101 4068 4805 4138, \
+      LDFLAGS := $(LIBHARFBUZZ_LDFLAGS), \
+      LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
+      LDFLAGS_aix := -Wl$(COMMA)-berok, \
+      LIBS := $(BUILD_LIBHARFBUZZ), \
+      LIBS_unix := $(LIBM) $(LIBCXX), \
+      LIBS_macosx := -framework CoreText -framework CoreFoundation -framework CoreGraphics, \
+      LIBS_windows := user32.lib, \
+  ))
+
+  ifeq ($(FREETYPE_TO_USE), bundled)
+    $(BUILD_LIBHARFBUZZ): $(BUILD_LIBFREETYPE)
+  endif
+
+  TARGETS += $(BUILD_LIBHARFBUZZ)
 
 endif
 
 ###########################################################################
 
 LIBFONTMANAGER_EXTRA_HEADER_DIRS := \
-    libharfbuzz \
+    libjharfbuzz \
     common/awt \
     common/font \
     libawt/java2d \
@@ -615,10 +678,10 @@ LIBFONTMANAGER_EXTRA_HEADER_DIRS := \
     libawt/java2d/loops \
     #
 
-LIBFONTMANAGER_CFLAGS += $(LIBFREETYPE_CFLAGS)
-BUILD_LIBFONTMANAGER_FONTLIB +=  $(LIBFREETYPE_LIBS)
+LIBFONTMANAGER_CFLAGS += $(LIBFREETYPE_CFLAGS) $(HARFBUZZ_FLAGS)
+BUILD_LIBFONTMANAGER_FONTLIB += $(LIBHARFBUZZ_LIBS) $(LIBFREETYPE_LIBS)
 
-LIBFONTMANAGER_OPTIMIZATION := HIGHEST
+LIBFONTMANAGER_OPTIMIZATION := HIGH
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
@@ -657,13 +720,18 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \
     OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
     CFLAGS_windows = -DCC_NOEX, \
-    EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS) $(HARFBUZZ_EXTRA_HEADER_DIRS), \
-    EXTRA_SRC := $(LIBFONTMANAGER_EXTRA_SRC), \
+    EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \
     WARNINGS_AS_ERRORS_xlc := false, \
-    DISABLED_WARNINGS_gcc := $(HARFBUZZ_DISABLED_WARNINGS_gcc), \
-    DISABLED_WARNINGS_CXX_gcc := $(HARFBUZZ_DISABLED_WARNINGS_CXX_gcc), \
-    DISABLED_WARNINGS_clang := $(HARFBUZZ_DISABLED_WARNINGS_clang), \
-    DISABLED_WARNINGS_microsoft := $(HARFBUZZ_DISABLED_WARNINGS_microsoft), \
+    DISABLED_WARNINGS_gcc := sign-compare unused-function int-to-pointer-cast, \
+    DISABLED_WARNINGS_clang := sign-compare, \
+    DISABLED_WARNINGS_C_solstudio := \
+        E_INTEGER_OVERFLOW_DETECTED \
+        E_ARG_INCOMPATIBLE_WITH_ARG_L \
+        E_ENUM_VAL_OVERFLOWS_INT_MAX, \
+    DISABLED_WARNINGS_CXX_solstudio := \
+        truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \
+        hidevf w_novirtualdescr arrowrtn2 unknownpragma, \
+    DISABLED_WARNINGS_microsoft := 4018 4146 4244 4996 4996 4146 4334 4819 4101 4068 4805 4138, \
     LDFLAGS := $(subst -Xlinker -z -Xlinker defs,, \
         $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -671,13 +739,17 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
     LDFLAGS_aix := -Wl$(COMMA)-berok, \
     LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
     LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
-    LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation -framework CoreGraphics, \
+    LIBS_macosx := -lawt_lwawt, \
     LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
         $(WIN_AWT_LIB), \
 ))
 
 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
 
+ifeq ($(USE_EXTERNAL_HARFBUZZ), false)
+  $(BUILD_LIBFONTMANAGER): $(BUILD_LIBHARFBUZZ)
+endif
+
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   $(BUILD_LIBFONTMANAGER): $(call FindLib, $(MODULE), awt_lwawt)
 endif
@@ -864,7 +936,8 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
         $(LIBM) -lpthread -liconv -losxapp \
         -framework ApplicationServices \
         -framework Foundation \
-        -framework Cocoa
+        -framework Cocoa \
+        -framework JavaNativeFoundation
   else ifeq ($(OPENJDK_TARGET_OS), windows)
     LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
   else
@@ -960,6 +1033,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
           -framework Cocoa \
           -framework Security \
           -framework ExceptionHandling \
+          -framework JavaNativeFoundation \
           -framework JavaRuntimeSupport \
           -framework OpenGL \
           -framework QuartzCore -ljava, \
@@ -997,6 +1071,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
           -framework Cocoa \
           -framework Carbon \
           -framework ApplicationServices \
+          -framework JavaNativeFoundation \
           -framework JavaRuntimeSupport \
           -ljava -ljvm, \
   ))

make/lib/Lib-java.base.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, 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
@@ -110,9 +110,9 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
             $(call SET_SHARED_LIBRARY_ORIGIN), \
         LIBS := \
             -lobjc \
+            -framework JavaNativeFoundation \
             -framework CoreServices \
             -framework Security \
-            -framework Foundation \
             $(JDKLIB_LIBS), \
     ))
 

make/lib/Lib-java.desktop.gmk

@@ -96,7 +96,6 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := \
-          -ljava \
           -framework Accelerate \
           -framework ApplicationServices \
           -framework AudioToolbox \
@@ -104,14 +103,13 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
           -framework Cocoa \
           -framework Security \
           -framework ExceptionHandling \
+          -framework JavaNativeFoundation \
           -framework JavaRuntimeSupport \
           -framework OpenGL \
           -framework IOSurface \
           -framework QuartzCore, \
   ))
 
-  $(BUILD_LIBOSXAPP): $(call FindLib, java.base, java)
-
   TARGETS += $(BUILD_LIBOSXAPP)
 
   ##############################################################################
@@ -129,6 +127,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
           -losxapp \
           -framework Cocoa \
           -framework ApplicationServices \
+          -framework JavaNativeFoundation \
           -framework JavaRuntimeSupport \
           -framework SystemConfiguration \
           $(JDKLIB_LIBS), \

make/lib/Lib-java.security.jgss.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, 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
@@ -78,8 +78,8 @@ ifneq ($(BUILD_CRYPTO), false)
         DISABLED_WARNINGS_clang := deprecated-declarations, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN), \
-        LIBS := -framework Cocoa -framework SystemConfiguration \
-            -framework Kerberos, \
+        LIBS := -framework JavaNativeFoundation -framework Cocoa \
+            -framework SystemConfiguration -framework Kerberos, \
     ))
 
     TARGETS += $(BUILD_LIBOSXKRB5)

make/lib/Lib-jdk.hotspot.agent.gmk

@@ -67,7 +67,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(SA_LDFLAGS), \
     LIBS_linux := -lthread_db $(LIBDL), \
     LIBS_solaris := -ldl -ldemangle -lthread -lproc, \
-    LIBS_macosx := -framework Foundation \
+    LIBS_macosx := -framework Foundation -framework JavaNativeFoundation \
         -framework JavaRuntimeSupport -framework Security -framework CoreFoundation, \
     LIBS_windows := dbgeng.lib, \
 ))

make/test/JtregNativeJdk.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, 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
@@ -76,13 +76,11 @@ else
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
-  BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestMainKeyWindow := \
-      -framework Cocoa
-  BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestDynamicStore := \
-      -framework Cocoa -framework SystemConfiguration
+  BUILD_JDK_JTREG_LIBRARIES_CFLAGS_libTestMainKeyWindow := -ObjC
+  BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestMainKeyWindow := -framework Cocoa \
+      -framework JavaNativeFoundation
 else
-  BUILD_JDK_JTREG_EXCLUDE += libTestMainKeyWindow.m
-  BUILD_JDK_JTREG_EXCLUDE += libTestDynamicStore.m
+  BUILD_JDK_JTREG_EXCLUDE += libTestMainKeyWindow.c
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)