JBR-1929 Improve rendering of San Francisco font of macOS Catalina

Reverting gamma correction because of rendering artifacts in the light theme

This reverts commit 5016db51

(cherry picked from commit c1d644a004)

.hgtags

@@ -587,14 +587,3 @@ f56b853d452bd339e3f4360cf4be42cc90f9284c jdk-11.0.7+7
 7201cd0c64776aa574d252b03a4c92b25d0a7d7f jdk-11.0.7+9
 44ce940b344b9f240be4807f5b8f06e178e3aecd jdk-11.0.7+10
 44ce940b344b9f240be4807f5b8f06e178e3aecd jdk-11.0.7-ga
-2eb415c82056bdc308d23ee6761f422de46dc5e5 jdk-11.0.8+1
-88eaa453331e9aeca979d58509538ebb74831ce4 jdk-11.0.8+2
-2c0c9cfe2a4e1340f7db106e2220dbd0d5b86092 jdk-11.0.8+3
-aa6c93b4f1acf4166d74d0252b35c53ad71d8540 jdk-11.0.8+4
-8df1a601187c0b4cb9e525075bd7b85ee3d72595 jdk-11.0.8+5
-e42c6d1a1993c720a4643140190bb1ba6f1bbf9f jdk-11.0.8+6
-46d4984bb3c6dd1b0f5135505b77921d23c69841 jdk-11.0.8+7
-40b646e9d8fbb2d70992b61e4f4b08ca5652c907 jdk-11.0.8+8
-59f8565ee5e224697a9e09ee2c557836733bc579 jdk-11.0.8+9
-0b0d55cb09b29360ab254edeef32a3b386e9713e jdk-11.0.8+10
-0b0d55cb09b29360ab254edeef32a3b386e9713e jdk-11.0.8-ga

doc/building.html

@@ -277,7 +277,7 @@
 </tr>
 <tr class="even">
 <td style="text-align: left;">Windows</td>
-<td style="text-align: left;">Microsoft Visual Studio 2017 update 15.9.16</td>
+<td style="text-align: left;">Microsoft Visual Studio 2017 update 15.5.5</td>
 </tr>
 </tbody>
 </table>

doc/building.md

@@ -293,7 +293,7 @@ issues.
  Linux              gcc 7.3.0
  macOS              Apple Xcode 9.4 (using clang 9.1.0)
  Solaris            Oracle Solaris Studio 12.4 (with compiler version 5.13)
- Windows            Microsoft Visual Studio 2017 update 15.9.16
+ Windows            Microsoft Visual Studio 2017 update 15.5.5
 
 ### gcc
 

jb/project/java-common.cmake

@@ -29,43 +29,32 @@ add_custom_target(configure_debug
         COMMAND bash configure --disable-warnings-as-errors --enable-debug
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../)
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  set(JDK_RELEASE_TARGET "linux-x86_64-normal-server-release")
-  set(JDK_DEBUG_TARGET "linux-x86_64-normal-server-fastdebug")
-endif ()
-
-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    set(JDK_RELEASE_TARGET "macosx-x86_64-normal-server-release")
-    set(JDK_DEBUG_TARGET "macosx-x86_64-normal-server-fastdebug")
-    add_compile_definitions(MACOSX)
-endif ()
-
 add_custom_target(build
-        COMMAND make CONF=${JDK_RELEASE_TARGET}
+        COMMAND make CONF=macosx-x86_64-normal-server-release
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
         DEPENDS ${SOURCE_FILES})
 
 add_custom_target(build_images
-        COMMAND make images CONF=${JDK_RELEASE_TARGET}
+        COMMAND make images CONF=macosx-x86_64-normal-server-release
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
         DEPENDS ${SOURCE_FILES})
 
 add_custom_target(build_debug
-        COMMAND make CONF=${JDK_DEBUG_TARGET}
+        COMMAND make CONF=macosx-x86_64-normal-server-fastdebug
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
         DEPENDS ${SOURCE_FILES})
 
 add_custom_target(build_images_debug
-        COMMAND make images CONF=${JDK_DEBUG_TARGET}
+        COMMAND make images CONF=macosx-x86_64-normal-server-fastdebug
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
         DEPENDS ${SOURCE_FILES})
 
 add_custom_target(make_clean
-        COMMAND make clean CONF=${JDK_RELEASE_TARGET}
+        COMMAND make clean CONF=macosx-x86_64-normal-server-release
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
         DEPENDS ${SOURCE_FILES})
 
 add_custom_target(make_clean_debug
-        COMMAND make clean CONF=${JDK_DEBUG_TARGET}
+        COMMAND make clean CONF=macosx-x86_64-normal-server-fastdebug
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
         DEPENDS ${SOURCE_FILES})

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

@@ -16,19 +16,12 @@
 # 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 where JCEF binaries are located.
-#               By default imported modules should be located in ./jcef_linux_x64
 
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 bundle_type=$4
 JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
-WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=./modular-sdk}"
-JCEF_PATH=${JCEF_PATH:=./jcef_linux_x64}
 
 source jb/project/tools/common.sh
 
@@ -62,7 +55,7 @@ function create_jbr {
 
   if [[ "$bundle_type" == *jcef* ]] || [[ "$bundle_type" == *dcevm* ]]; then
     cp -R $BASE_DIR/$JBR_BUNDLE $BASE_DIR/jbr
-    cp -R ${JCEF_PATH}/* $BASE_DIR/$JBR_BUNDLE/lib || exit $?
+    cp -R jcef_linux_x64/* $BASE_DIR/$JBR_BUNDLE/lib || exit $?
   fi
   grep -v "^JAVA_VERSION" $JSDK/release | grep -v "^MODULES" >> $BASE_DIR/$JBR_BUNDLE/release
 
@@ -75,8 +68,8 @@ function create_jbr {
 }
 
 JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=linux-x86_64-normal-server-release
+
+WITH_IMPORT_MODULES="--with-import-modules=./modular-sdk"
 git checkout -- modules.list src/java.desktop/share/classes/module-info.java
 case "$bundle_type" in
   "jfx")
@@ -97,7 +90,7 @@ esac
 
 sh configure \
   --disable-warnings-as-errors \
-  $WITH_DEBUG_LEVEL \
+  --with-debug-level=release \
   --with-vendor-name="${VENDOR_NAME}" \
   --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
   --with-version-pre= \
@@ -106,22 +99,22 @@ sh configure \
   $WITH_IMPORT_MODULES \
   --enable-cds=yes || exit $?
 
-make images CONF=$RELEASE_NAME || exit $?
+make images CONF=linux-x86_64-normal-server-release || exit $?
 
-JSDK=build/$RELEASE_NAME/images/jdk
+JSDK=build/linux-x86_64-normal-server-release/images/jdk
 JBSDK=$JBRSDK_BASE_NAME-linux-x64-b$build_number
 
 echo Fixing permissions
 chmod -R a+r $JSDK
 
-BASE_DIR=build/$RELEASE_NAME/images
+BASE_DIR=build/linux-x86_64-normal-server-release/images
 JBRSDK_BUNDLE=jbrsdk
 
 rm -rf $BASE_DIR/$JBRSDK_BUNDLE
 cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || exit $?
 
 if [[ "$bundle_type" == *jcef* ]] || [[ "$bundle_type" == *dcevm* ]]; then
-  cp -R ${JCEF_PATH}/* $BASE_DIR/$JBRSDK_BUNDLE/lib || exit $?
+  cp -R jcef_linux_x64/* $BASE_DIR/$JBRSDK_BUNDLE/lib || exit $?
 fi
 if [ "$bundle_type" == "jfx_jcef" ]; then
   echo Creating $JBSDK.tar.gz ...

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

@@ -16,29 +16,21 @@
 # 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 where JCEF binaries are located.
-#               By default imported modules should be located in ./jcef_linux_x64
 
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 
 JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
-WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=./modular-sdk}"
-JCEF_PATH=${JCEF_PATH:=./jcef_linux_x64}
 
 source jb/project/tools/common.sh
 
 
 JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
-WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
 
 sh configure \
   --disable-warnings-as-errors \
-  $WITH_DEBUG_LEVEL \
+  --with-debug-level=fastdebug \
   --with-vendor-name="${VENDOR_NAME}" \
   --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
   --with-version-pre= \

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

@@ -16,19 +16,12 @@
 # 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 where JCEF binaries are located.
-#               By default imported modules should be located in ./jcef_mac
 
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 bundle_type=$4
 JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
-WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=./modular-sdk}"
-JCEF_PATH=${JCEF_PATH:=./jcef_mac}
 
 source jb/project/tools/common.sh
 
@@ -71,7 +64,7 @@ function create_jbr {
 
   if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]]; then
     rm -rf ${JRE_CONTENTS}/Frameworks || exit $?
-    cp -a ${JCEF_PATH}/Frameworks ${JRE_CONTENTS} || exit $?
+    cp -a jcef_mac/Frameworks ${JRE_CONTENTS} || exit $?
   fi
 
   echo Creating ${JBR}.tar.gz ...
@@ -82,8 +75,8 @@ function create_jbr {
 }
 
 JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=macosx-x86_64-normal-server-release
+
+WITH_IMPORT_MODULES="--with-import-modules=./modular-sdk"
 git checkout -- modules.list src/java.desktop/share/classes/module-info.java
 case "$bundle_type" in
   "jfx")
@@ -104,7 +97,7 @@ esac
 
 sh configure \
   --disable-warnings-as-errors \
-  $WITH_DEBUG_LEVEL \
+  --with-debug-level=release \
   --with-vendor-name="${VENDOR_NAME}" \
   --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
   --with-version-pre= \
@@ -114,9 +107,9 @@ sh configure \
   --with-boot-jdk=`/usr/libexec/java_home -v 11` \
   --enable-cds=yes || exit $?
 
-make clean images CONF=$RELEASE_NAME || exit $?
+make clean images CONF=macosx-x86_64-normal-server-release || exit $?
 
-JSDK=build/$RELEASE_NAME/images/jdk-bundle
+JSDK=build/macosx-x86_64-normal-server-release/images/jdk-bundle
 JBSDK=${JBRSDK_BASE_NAME}-osx-x64-b${build_number}
 
 BASE_DIR=jre
@@ -127,7 +120,7 @@ mkdir $BASE_DIR || exit $?
 cp -a $JSDK/jdk-$JBSDK_VERSION_WITH_DOTS.jdk $BASE_DIR/$JBRSDK_BUNDLE || exit $?
 
 if [[ "$bundle_type" == *jcef* ]] || [[ "$bundle_type" == *dcevm* ]]; then
-  cp -a ${JCEF_PATH}/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
+  cp -a jcef_mac/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
 fi
 if [ "$bundle_type" == "jfx_jcef" ]; then
   echo Creating $JBSDK.tar.gz ...

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

@@ -16,11 +16,6 @@
 # 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 where JCEF binaries are located.
-#               By default imported modules should be located in ./jcef_mac
 
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
@@ -28,23 +23,19 @@ build_number=$3
 
 JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
 
-WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=./modular-sdk}"
-JCEF_PATH=${JCEF_PATH:=./jcef_mac}
-
 source jb/project/tools/common.sh
 
 JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
-WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
 
 sh configure \
   --disable-warnings-as-errors \
-  $WITH_DEBUG_LEVEL \
+  --with-debug-level=fastdebug \
   --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-import-modules=./modular-sdk \
   --with-boot-jdk=`/usr/libexec/java_home -v 11` \
   --enable-cds=yes || exit $?
 make clean CONF=macosx-x86_64-normal-server-fastdebug || exit $?
@@ -62,7 +53,7 @@ JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
 cp -a $JSDK/jdk-$JBSDK_VERSION_WITH_DOTS.jdk $BASE_DIR/$JBRSDK_BUNDLE || exit $?
 
 echo Creating $JBSDK.tar.gz ...
-cp -a ${JCEF_PATH}/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
+cp -a jcef_mac/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
 
 sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release > release
 mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release
@@ -92,7 +83,7 @@ $BASE_DIR/$JBRSDK_BUNDLE/Contents/Home/bin/jlink \
 grep -v "^JAVA_VERSION" $BASE_DIR/$JBRSDK_BUNDLE/Contents/Home/release | grep -v "^MODULES" >> $JRE_HOME/release
 cp -R $BASE_DIR/$JBRSDK_BUNDLE/Contents/MacOS $JRE_CONTENTS
 cp $BASE_DIR/$JBRSDK_BUNDLE/Contents/Info.plist $JRE_CONTENTS
-cp -a ${JCEF_PATH}/Frameworks ${JRE_CONTENTS} || exit $?
+cp -a jcef_mac/Frameworks ${JRE_CONTENTS} || exit $?
 
 
 echo Creating $JBR.tar.gz ...

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

@@ -1,7 +1,7 @@
-From 4f9a0ded48f51bdfb3ed7cc18df812c456d48a8c Mon Sep 17 00:00:00 2001
+From 7efd979183409db33e965cf80adf60c9a970c762 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/50] Apply basic dcevm11 patch
+Subject: [PATCH 01/48] Apply basic dcevm11 patch
 
 ---
  src/hotspot/share/ci/ciObjectFactory.cpp      |   25 +
@@ -2207,7 +2207,7 @@ index 18c706187df..4533476ff8f 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 f9a69ef0c8b..231ada3f0ab 100644
+index aed6075b52a..8b0ae584cf4 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

jb/project/tools/patches/dcevm/0002-We-need-to-set-classRedefinitionCount-on-new-class-n.patch

@@ -1,7 +1,7 @@
-From a4b2a34a6c9d477ce339bece718abe992cdd5002 Mon Sep 17 00:00:00 2001
+From 095315ce3f66bcf14ae1d06d84bbeb24bb068ae8 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/50] We need to set classRedefinitionCount on new class, not
+Subject: [PATCH 02/48] We need to set classRedefinitionCount on new class, not
  old class.
 
 ---

jb/project/tools/patches/dcevm/0003-Fix-crashes-in-MetadataOnStackMark-MetadataOnSta.patch

@@ -1,7 +1,7 @@
-From e5c0b2d69ab024ec0469f5c105f13f889b598815 Mon Sep 17 00:00:00 2001
+From 9ddbbcdc73e653af7807ead68705c1c9267c9192 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Wed, 14 Nov 2018 21:22:01 +0100
-Subject: [PATCH 03/50] Fix crashes in MetadataOnStackMark::~MetadataOnSta
+Subject: [PATCH 03/48] Fix crashes in MetadataOnStackMark::~MetadataOnSta
 
 MetadataOnStackMark shoukld not remove dcevm stuff. It was added
 accidentaly in dcevm9,

jb/project/tools/patches/dcevm/0004-Fix-problem-with-nested-members.patch

@@ -1,7 +1,7 @@
-From 360fbbd15357fb3cb19abc6ffb40320efadce616 Mon Sep 17 00:00:00 2001
+From bb3eb4931818c3ef43c48d0781d73b8e2eb6dea9 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Mon, 3 Dec 2018 19:34:53 +0100
-Subject: [PATCH 04/50] Fix problem with nested members
+Subject: [PATCH 04/48] Fix problem with nested members
 
 Reported at : https://stackoverflow.com/questions/53370380/hotswapagent-incompatibleclasschangeerror-type-headerpanel1-is-not-a-nest-mem
 ---

jb/project/tools/patches/dcevm/0005-Use-init_mark_raw.patch

@@ -1,7 +1,7 @@
-From 4e2aef4c3b201e9639acdd39aa9e7ecdc9fb6a86 Mon Sep 17 00:00:00 2001
+From 90746a0267b2de4063667f5423093115f814bf08 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Mon, 10 Dec 2018 20:12:07 +0100
-Subject: [PATCH 05/50] Use init_mark_raw()
+Subject: [PATCH 05/48] Use init_mark_raw()
 
 method changed since j8 - it used init_mark()
 ---

jb/project/tools/patches/dcevm/0006-Fix-methodHandles.patch

@@ -1,7 +1,7 @@
-From 15194627b2573f109aef2cacc6ebfb600d0a20f0 Mon Sep 17 00:00:00 2001
+From 026346bfb72eaaae53e8998900d9f520da5ef74d Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Thu, 13 Dec 2018 20:51:09 +0100
-Subject: [PATCH 06/50] Fix methodHandles
+Subject: [PATCH 06/48] Fix methodHandles
 
 ---
  src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 2 +-

jb/project/tools/patches/dcevm/0007-Fix-field-method.patch

@@ -1,7 +1,7 @@
-From 23a83be457df96d519db8de59a49dd65731efcc4 Mon Sep 17 00:00:00 2001
+From b99ebb71bce6119cd800d69848f84281f2fd2b16 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Sat, 15 Dec 2018 18:23:30 +0100
-Subject: [PATCH 07/50] Fix field method
+Subject: [PATCH 07/48] Fix field method
 
 ---
  .../prims/jvmtiEnhancedRedefineClasses.cpp    | 19 ++++++++++++-------

jb/project/tools/patches/dcevm/0008-Fix-nonstatic-field-handles.patch

@@ -1,7 +1,7 @@
-From 1fe56253f7e63d69f9a12963316889c5e87111eb Mon Sep 17 00:00:00 2001
+From dd57a1b40a83f7691c0fb9aa960f77c4428c0eec Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Sat, 15 Dec 2018 20:16:37 +0100
-Subject: [PATCH 08/50] Fix nonstatic field handles
+Subject: [PATCH 08/48] Fix nonstatic field handles
 
 ---
  src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 7 ++++++-

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

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

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

@@ -1,7 +1,7 @@
-From 11d10158d77512795b1b8ab8378620b95b67f175 Mon Sep 17 00:00:00 2001
+From b9ceda6f7c230750a87e8a686d833ce853d84712 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Sat, 29 Dec 2018 13:22:29 +0100
-Subject: [PATCH 10/50] Code cleanup
+Subject: [PATCH 10/48] Code cleanup
 
 ---
  .../prims/jvmtiEnhancedRedefineClasses.cpp    | 125 ++++++------------

jb/project/tools/patches/dcevm/0011-Fix-check_class.patch

@@ -1,7 +1,7 @@
-From 1765f4c1b2e8958b458fa17d329be98ad025069c Mon Sep 17 00:00:00 2001
+From 1d147a5db94b531fa027d5e13e4dd5cbaef62952 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Sat, 29 Dec 2018 16:05:25 +0100
-Subject: [PATCH 11/50] Fix check_class
+Subject: [PATCH 11/48] Fix check_class
 
 ---
  .../prims/jvmtiEnhancedRedefineClasses.cpp    | 39 +++++++------------

jb/project/tools/patches/dcevm/0012-Fix-force_forward-in-dead-space.patch

@@ -1,7 +1,7 @@
-From 0851d437a65dc9ac6d8355b54689d36e77e104b3 Mon Sep 17 00:00:00 2001
+From 84777c09ddbbbbd6a90de5b1f17a4101c8f076b8 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Sat, 29 Dec 2018 17:58:39 +0100
-Subject: [PATCH 12/50] Fix force_forward in dead space
+Subject: [PATCH 12/48] Fix force_forward in dead space
 
 ---
  src/hotspot/share/gc/shared/space.inline.hpp | 1 +

jb/project/tools/patches/dcevm/0013-Cleanup.patch

@@ -1,7 +1,7 @@
-From 35aba247d8a3e25f5d19403ba5f293bfdaf6539c Mon Sep 17 00:00:00 2001
+From 4d973861fbcd13dc50bd603f731c75d2013034c6 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Fri, 1 Mar 2019 18:45:13 +0100
-Subject: [PATCH 13/50] Cleanup
+Subject: [PATCH 13/48] Cleanup
 
 ---
  src/hotspot/share/gc/shared/space.cpp | 2 +-

jb/project/tools/patches/dcevm/0014-Add-codecache-flush-optimization-but-just-flush-all-.patch

@@ -1,7 +1,7 @@
-From 26a5079eb61a2e23328fbd8ca59ffc2ab6b6193b Mon Sep 17 00:00:00 2001
+From 5f31460556d86fa0233e7998112a65483034fd45 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Sat, 29 Dec 2018 17:38:27 +0100
-Subject: [PATCH 14/50] Add codecache flush optimization, but just flush all
+Subject: [PATCH 14/48] Add codecache flush optimization, but just flush all
  cache.
 
 Redefined class can define a new method that overrides

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

@@ -1,7 +1,7 @@
-From 24a60477aef7098ea23ab50a573332957741ea7b Mon Sep 17 00:00:00 2001
+From d457702275bc47f3f9ea416dc794be403bc6eb94 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Wed, 14 Nov 2018 21:20:08 +0100
-Subject: [PATCH 15/50] HotswapAgent integration
+Subject: [PATCH 15/48] HotswapAgent integration
 
 It include:
 

jb/project/tools/patches/dcevm/0016-Add-dcevm-distro-name.patch

@@ -1,7 +1,7 @@
-From dc397b652d9810f6f261070afbb8519f1c2964ee Mon Sep 17 00:00:00 2001
+From 603b446449aa715aa3f409fb49ed00169b89fd91 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Sun, 16 Dec 2018 09:55:31 +0100
-Subject: [PATCH 16/50] Add dcevm distro name
+Subject: [PATCH 16/48] Add dcevm distro name
 
 ---
  make/autoconf/version-numbers | 2 +-
@@ -17,9 +17,9 @@ index b5a23138213..5c0a3242c80 100644
  COMPANY_NAME=N/A
 -HOTSPOT_VM_DISTRO="OpenJDK"
 +HOTSPOT_VM_DISTRO="Dynamic Code Evolution"
- VENDOR_URL=https://openjdk.java.net/
- VENDOR_URL_BUG=https://bugreport.java.com/bugreport/
- VENDOR_URL_VM_BUG=https://bugreport.java.com/bugreport/crash.jsp
+ 
+ # Might need better names for these
+ MACOSX_BUNDLE_NAME_BASE="OpenJDK"
 -- 
 2.24.3 (Apple Git-128)
 

jb/project/tools/patches/dcevm/0017-java.desktop-com.sun.beans-ALL-UNNAMED.patch

@@ -1,7 +1,7 @@
-From 987645d54a6682f28a733731965d6b377e892974 Mon Sep 17 00:00:00 2001
+From 6869b6f67f8c8db57d91ea0ef9f33aaf44def1db Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Tue, 19 Nov 2019 19:58:27 +0100
-Subject: [PATCH 17/50] java.desktop/com.sun.beans=ALL-UNNAMED
+Subject: [PATCH 17/48] java.desktop/com.sun.beans=ALL-UNNAMED
 
 ---
  src/hotspot/share/runtime/arguments.cpp | 2 ++

jb/project/tools/patches/dcevm/0018-increment_class_counter-using-orig-dcevm-code.patch

@@ -1,7 +1,7 @@
-From 60569257636a2d0b31b04ab2638d81f840d75e58 Mon Sep 17 00:00:00 2001
+From bbcbaa9d5814017565b8f7f0d86844e9f64905c1 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Tue, 19 Nov 2019 21:07:59 +0100
-Subject: [PATCH 18/50] increment_class_counter() using orig dcevm code
+Subject: [PATCH 18/48] increment_class_counter() using orig dcevm code
 
 Probably it is cause of SISEGV on:
 _

jb/project/tools/patches/dcevm/0019-Allow-11715ha-class-initializer-calls.patch

@@ -1,7 +1,7 @@
-From 41d2963b54490601e22cf5309ed73f78566d35ae Mon Sep 17 00:00:00 2001
+From 62c65c226bbc4fadbc598db1a2ac7d05d17ae731 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Thu, 21 Nov 2019 19:30:07 +0100
-Subject: [PATCH 19/50] Allow 11715ha class initializer calls
+Subject: [PATCH 19/48] Allow 11715ha class initializer calls
 
 ---
  src/hotspot/share/classfile/vmSymbols.hpp      | 1 +

jb/project/tools/patches/dcevm/0020-Disable-HA-in-keytool.patch

@@ -1,7 +1,7 @@
-From 09799f079ef1148248ca60c917205003d2a565b3 Mon Sep 17 00:00:00 2001
+From 88b6f7a27e35d9ed3b82418b82c1cb1fe14f61e6 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Tue, 26 Nov 2019 22:13:07 +0100
-Subject: [PATCH 20/50] Disable HA in keytool
+Subject: [PATCH 20/48] Disable HA in keytool
 
 ---
  make/launcher/Launcher-java.base.gmk | 1 +

jb/project/tools/patches/dcevm/0021-Open-jdk-module-to-access-ClassInfo.CACHE.patch

@@ -1,7 +1,7 @@
-From e1d8f42f428d7d18f09f1a7098f56fdce808c3fe Mon Sep 17 00:00:00 2001
+From 7fb12fc40a76a37ce67b051276a7ef582de1b04a Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Thu, 28 Nov 2019 18:53:11 +0100
-Subject: [PATCH 21/50] Open jdk module to access ClassInfo.CACHE
+Subject: [PATCH 21/48] Open jdk module to access ClassInfo.CACHE
 
 ---
  src/hotspot/share/runtime/arguments.cpp | 2 ++

jb/project/tools/patches/dcevm/0022-Open-java.base-java.io-module.patch

@@ -1,7 +1,7 @@
-From 8b7323c57ee07c03a02ba951ce6d453ec4cc1a54 Mon Sep 17 00:00:00 2001
+From d3d53f242337bd3bc79917f922ff569c0a112f3b Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 8 Dec 2019 17:55:01 +0100
-Subject: [PATCH 22/50] Open java.base/java.io module
+Subject: [PATCH 22/48] Open java.base/java.io module
 
 ---
  src/hotspot/share/runtime/arguments.cpp | 2 ++

jb/project/tools/patches/dcevm/0023-Fix-fieldDescriptor.inline.hpp.patch

@@ -1,7 +1,7 @@
-From 14c82a29cbf8254f8da626753ea34086d38e71b4 Mon Sep 17 00:00:00 2001
+From 833ef503677e066b3639e7418a22587992df1829 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@mailprofiler.com>
 Date: Fri, 6 Mar 2020 09:28:24 +0100
-Subject: [PATCH 23/50] Fix fieldDescriptor.inline.hpp
+Subject: [PATCH 23/48] Fix fieldDescriptor.inline.hpp
 
 ---
  .../share/prims/jvmtiEnhancedRedefineClasses.cpp       | 10 ++++++----

jb/project/tools/patches/dcevm/0024-Fix-clear_cpool_cache.patch

@@ -1,7 +1,7 @@
-From 5a56f2278c0a79f4a26f369a55f4c1c4dab2621e Mon Sep 17 00:00:00 2001
+From 1af8b1f3f891388a37cc71076c324d3905ab2a46 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@mailprofiler.com>
 Date: Fri, 6 Mar 2020 15:46:51 +0100
-Subject: [PATCH 24/50] Fix clear_cpool_cache
+Subject: [PATCH 24/48] Fix clear_cpool_cache
 
 ---
  src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 8 +++-----

jb/project/tools/patches/dcevm/0025-Refactor-ClearCpoolCacheAndUnpatch.patch

@@ -1,7 +1,7 @@
-From c1aafaafaf15780d6bca1312162d551da4f63036 Mon Sep 17 00:00:00 2001
+From def550828411b677ed2d7807e51cc5ffe70331fc Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@mailprofiler.com>
 Date: Mon, 9 Mar 2020 09:54:04 +0100
-Subject: [PATCH 25/50] Refactor ClearCpoolCacheAndUnpatch
+Subject: [PATCH 25/48] Refactor ClearCpoolCacheAndUnpatch
 
 Call it after redefinition of all classes
 ---

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

@@ -1,7 +1,7 @@
-From d6a3286b9b57df4c09d859e38833f2e3dc1574d9 Mon Sep 17 00:00:00 2001
+From 5f416d7a25bd23399b9189cc94ab5d5887e6b4d4 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 26/50] Fix class cast exception on redefinition of class A,
+Subject: [PATCH 26/48] Fix class cast exception on redefinition of class A,
  that is superclass of B that has anonymous class C
 
 ---

jb/project/tools/patches/dcevm/0027-Update-klass-reference-in-Klass.implementor.patch

@@ -1,7 +1,7 @@
-From a4ab453f532839ea3b09027736bb6e74d288bf1d Mon Sep 17 00:00:00 2001
+From 9a7abdf08bf207f5265a552500446c3178bf5794 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 10 Apr 2020 23:28:07 +0200
-Subject: [PATCH 27/50] Update klass reference in Klass.implementor()
+Subject: [PATCH 27/48] Update klass reference in Klass.implementor()
 
 If interface X is removed from class Y then old reference to Y could be
 stored in X.implementor()

jb/project/tools/patches/dcevm/0028-Fix-DirectMethodHandle-accessors-klasses.patch

@@ -1,7 +1,7 @@
-From 015c9c88e63f2dde4b8b2a09d2832a8c2a3caf25 Mon Sep 17 00:00:00 2001
+From 8f13d3b4ba9aecd847b7da306055ba53ee2e29d0 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 10 Apr 2020 23:30:21 +0200
-Subject: [PATCH 28/50] Fix DirectMethodHandle accessors klasses
+Subject: [PATCH 28/48] Fix DirectMethodHandle accessors klasses
 
 ---
  src/hotspot/share/classfile/javaClasses.cpp | 28 +++++++++++++++------

jb/project/tools/patches/dcevm/0029-cleanup-direct-method-handles-code.patch

@@ -1,7 +1,7 @@
-From 14005f6176420c16fa1d152c78a3dacd26ecb647 Mon Sep 17 00:00:00 2001
+From cbad9c34bf8920d772c646d041d4fc04fea203cc Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 11 Apr 2020 12:07:43 +0200
-Subject: [PATCH 29/50] cleanup direct method handles code
+Subject: [PATCH 29/48] cleanup direct method handles code
 
 ---
  src/hotspot/share/classfile/javaClasses.hpp        | 10 ++++------

jb/project/tools/patches/dcevm/0030-Add-init_implementor_from_redefine-that-skips-compil.patch

@@ -1,7 +1,7 @@
-From 990ffe4111fe73c3a183f8d35402cbf9e81bd587 Mon Sep 17 00:00:00 2001
+From e3b94671ce5108a91e3a3e92b01eea07731c7639 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 11 Apr 2020 17:52:13 +0200
-Subject: [PATCH 30/50] Add init_implementor_from_redefine, that skips compiler
+Subject: [PATCH 30/48] Add init_implementor_from_redefine, that skips compiler
  lock assert
 
 ---

jb/project/tools/patches/dcevm/0031-not-nullable-oop_store_not_null-method-handle-NULL-i.patch

@@ -1,7 +1,7 @@
-From 9dcddc7c2573c34579161e3ad1240b029dda1e96 Mon Sep 17 00:00:00 2001
+From a95c3daf0a1db23e2dcc977f427faa7be41007c9 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Mon, 13 Apr 2020 20:59:35 +0200
-Subject: [PATCH 31/50] not nullable oop_store_not_null() method+handle NULL in
+Subject: [PATCH 31/48] not nullable oop_store_not_null() method+handle NULL in
  mem_name in dmh
 
 ---

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

@@ -1,7 +1,7 @@
-From 800b44f545c7b99026d203690def30ec4b9ed08e Mon Sep 17 00:00:00 2001
+From 15690197a276a86054e1ec9724c877d6d871ca01 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 32/50] add jvmtiEnhancedRedefineClasses.* to CMakeLists.txt
+Subject: [PATCH 32/48] add jvmtiEnhancedRedefineClasses.* to CMakeLists.txt
 
 ---
  jb/project/hotspot-cmake/CMakeLists.txt | 2 ++

jb/project/tools/patches/dcevm/0033-migrate-DCEVM-to-11.0.7.patch

@@ -1,7 +1,7 @@
-From e009b4fcc48e9719b5b896f7f3838fbc7c579ba7 Mon Sep 17 00:00:00 2001
+From dab6a53de4c25aae95667c78b8e1f1097ab47130 Mon Sep 17 00:00:00 2001
 From: Artem Khvastunov <artem.khvastunov@jetbrains.com>
 Date: Sun, 19 Apr 2020 11:36:12 +0200
-Subject: [PATCH 33/50] migrate DCEVM to 11.0.7
+Subject: [PATCH 33/48] migrate DCEVM to 11.0.7
 
 ---
  src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp | 2 +-

jb/project/tools/patches/dcevm/0034-Fix-11.0.7-compilation-issues.patch

@@ -1,7 +1,7 @@
-From 5653e2a5f05a9693f934b0f9c4d9286c01576807 Mon Sep 17 00:00:00 2001
+From 70d53ce28f9df75d9e50819d2b6654855da0d533 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 8 May 2020 21:07:50 +0200
-Subject: [PATCH 34/50] Fix 11.0.7 compilation issues
+Subject: [PATCH 34/48] Fix 11.0.7 compilation issues
 
 ---
  src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp | 3 ++-

jb/project/tools/patches/dcevm/0035-Use-INCLUDE_CDS-condition-on-UseSharedSpaces-block-f.patch

@@ -1,7 +1,7 @@
-From 0b9b021f889ec001d579d192f1bd9a7a43f63871 Mon Sep 17 00:00:00 2001
+From 805b588bc4bd45e61b81c90e23b71337072e9549 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 9 May 2020 10:08:17 +0200
-Subject: [PATCH 35/50] Use INCLUDE_CDS condition on "UseSharedSpaces" block
+Subject: [PATCH 35/48] Use INCLUDE_CDS condition on "UseSharedSpaces" block
  from master
 
 ---

jb/project/tools/patches/dcevm/0036-Access-com.sun.beans.util-HotswapAgent-patch.patch

@@ -1,7 +1,7 @@
-From 9f4b84339b55187b742682bd84fdb0e6e121917c Mon Sep 17 00:00:00 2001
+From 78619004206d224b319d68493672bee2c97f0946 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 16 May 2020 15:11:40 +0200
-Subject: [PATCH 36/50] Access com.sun.beans.util - HotswapAgent patch
+Subject: [PATCH 36/48] Access com.sun.beans.util - HotswapAgent patch
 
 ---
  src/hotspot/share/runtime/arguments.cpp       |  2 ++

jb/project/tools/patches/dcevm/0037-Skip-verifier-only-in-AllowEnhancedClassRedefinition.patch

@@ -1,7 +1,7 @@
-From 9a662b1367860920095efe79116ef9a2d53fc2c6 Mon Sep 17 00:00:00 2001
+From baf26456579eb0e560471d3bcb150005492f69f4 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 17 May 2020 12:19:18 +0200
-Subject: [PATCH 37/50] Skip verifier only in AllowEnhancedClassRedefinition
+Subject: [PATCH 37/48] Skip verifier only in AllowEnhancedClassRedefinition
 
 ---
  src/hotspot/share/oops/instanceKlass.cpp | 4 ++--

jb/project/tools/patches/dcevm/0038-Use-original-code-for-adjust_method_entries-in-stand.patch

@@ -1,7 +1,7 @@
-From a58ed678218bfb80af164cfe98cdf4a3ab74a682 Mon Sep 17 00:00:00 2001
+From 46dc38a58ac8afafab4e04ee47a1ed2b9e65c1e1 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 17 May 2020 18:18:52 +0200
-Subject: [PATCH 38/50] Use original code for adjust_method_entries in standard
+Subject: [PATCH 38/48] Use original code for adjust_method_entries in standard
  redefinition
 
 ---

jb/project/tools/patches/dcevm/0039-Revert-code-for-AllowEnhancedClassRedefinition.patch

@@ -1,7 +1,7 @@
-From c1e814f2f7d4f2b37abd667d0bec516474f2a119 Mon Sep 17 00:00:00 2001
+From 6ac099d1b07fcc0d3c17ebd5d3335bcb6ceaedc9 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Tue, 19 May 2020 09:41:36 +0200
-Subject: [PATCH 39/50] Revert code for !AllowEnhancedClassRedefinition
+Subject: [PATCH 39/48] Revert code for !AllowEnhancedClassRedefinition
 
 ---
  .../share/classfile/classLoaderData.cpp       | 23 ++++++++++---------

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

@@ -1,7 +1,7 @@
-From 5b36c4798869c5cd4d65f7765a8447b9cf09d76b Mon Sep 17 00:00:00 2001
+From de04154ee21d33c1ac1b74b2740f2fda117c0430 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Tue, 19 May 2020 09:29:39 +0200
-Subject: [PATCH 40/50] Code cleanup
+Subject: [PATCH 40/48] Code cleanup
 
 ---
  src/hotspot/share/classfile/classFileParser.cpp   |  4 +++-

jb/project/tools/patches/dcevm/0041-Activate-cpCache-definition-asserts-for-dcevm.patch

@@ -1,7 +1,7 @@
-From 71f35c41b569f72a1674ccd57118c4fe76ba3d68 Mon Sep 17 00:00:00 2001
+From ab8888737eaed76776b41b28af93a0c47826b8d6 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Tue, 19 May 2020 10:31:15 +0200
-Subject: [PATCH 41/50] Activate cpCache definition asserts for !dcevm
+Subject: [PATCH 41/48] Activate cpCache definition asserts for !dcevm
 
 ---
  src/hotspot/share/oops/cpCache.cpp | 6 ++----

jb/project/tools/patches/dcevm/0042-iterate-old-method-version-only-in-dcevm.patch

@@ -1,7 +1,7 @@
-From 961018a29ddb7eba96aca7fbc385f3c4f29e3a03 Mon Sep 17 00:00:00 2001
+From 8596cf8b677eadcd18b527dd61c891475758bbaa Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Tue, 19 May 2020 10:54:38 +0200
-Subject: [PATCH 42/50] iterate old method version only in dcevm
+Subject: [PATCH 42/48] iterate old method version only in dcevm
 
 ---
  src/hotspot/share/prims/jvmtiImpl.cpp | 6 ++++--

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

@@ -1,7 +1,7 @@
-From 2ab70b495c43c4699ad402a714710566400de99d Mon Sep 17 00:00:00 2001
+From f3c1667fc04abdd9aa556b2c00a23239eba14287 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 22 May 2020 21:23:01 +0200
-Subject: [PATCH 43/50] Support for Lambda class redefinition
+Subject: [PATCH 43/48] Support for Lambda class redefinition
 
 ---
  .../share/classfile/classLoaderData.cpp       |  9 +++

jb/project/tools/patches/dcevm/0044-Skip-GC-runs-for-redefinitions-without-instance-size.patch

@@ -1,7 +1,7 @@
-From 3f53bb48682b17cfbf4781d4fa47055be88baea0 Mon Sep 17 00:00:00 2001
+From b8a3d4249eb97613f796edc709e414900c9a0828 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 22 May 2020 21:43:22 +0200
-Subject: [PATCH 44/50] Skip GC runs for redefinitions without instance size
+Subject: [PATCH 44/48] Skip GC runs for redefinitions without instance size
  change
 
 ---

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

@@ -1,7 +1,7 @@
-From d0d6602fe3d664cb2322d7066bf46fa7e20d5d4e Mon Sep 17 00:00:00 2001
+From 77bdf6253c457ed88436fb4da6a53c7c0c361a1c 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 45/50] Fix "no original bytecode found" error if method with
+Subject: [PATCH 45/48] Fix "no original bytecode found" error if method with
  bkp is missing
 
 Sometimes IDE can deploy class with erroneous method, such method has

jb/project/tools/patches/dcevm/0046-Fix-comments-according-hotspot-formatting-convention.patch

@@ -1,7 +1,7 @@
-From 585f1cb56766be837a34114b1ee5c743aa4e6801 Mon Sep 17 00:00:00 2001
+From d3371d7d52bd4dc66efd4f6a946d5045b8bc8b2b Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 23 May 2020 10:17:56 +0200
-Subject: [PATCH 46/50] Fix comments according hotspot formatting conventions
+Subject: [PATCH 46/48] Fix comments according hotspot formatting conventions
 
 ---
  .../prims/jvmtiEnhancedRedefineClasses.cpp    | 191 +++++++-----------

jb/project/tools/patches/dcevm/0047-Review-threads-cleanup.patch

@@ -1,7 +1,7 @@
-From 79c80c48da4d52f4616f1c6ef37e838d29be9be1 Mon Sep 17 00:00:00 2001
+From 2ad306a4cce06cfccf95a1193daf5b968ec1fa87 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 24 May 2020 12:07:09 +0200
-Subject: [PATCH 47/50] Review threads, cleanup
+Subject: [PATCH 47/48] Review threads, cleanup
 
 ---
  src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 9 ++++-----

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

@@ -1,7 +1,7 @@
-From 8b79e673a3a9d12c97b8b7dd2f4d79c2d4cdd1d6 Mon Sep 17 00:00:00 2001
+From a5586aff03fde654102e2c2e1fc19fdea406b31e 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 48/50] Replace deleted method with
+Subject: [PATCH 48/48] Replace deleted method with
  Universe::throw_no_such_method_error
 
 ---

jb/project/tools/patches/dcevm/0050-G1-Heap-parallel-iterate-method-object_par_iterate-d.patch

@@ -1,214 +0,0 @@
-From 55e30de9a54b2f3bec995a2df42fe14b09d16f06 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Sun, 21 Jun 2020 13:38:45 +0200
-Subject: [PATCH 50/50] G1 Heap parallel iterate method "object_par_iterate" +
- dcevm timers
-
-G1 Heap does not have parallel iterate method, that is usefull in dcevm
-iterate phase. According performance tests the parallel iteration is up
-~25% faster then serial iteration, ratio depends on the size of heap.
-Dcevm's timers did not make sense. Now, there are timers fo prologue,
-doit, gc itarate and full gc phases. Iterate+fullgc time make up most
-the total doit time.
----
- src/hotspot/share/gc/g1/g1CollectedHeap.cpp   | 20 ++++++++
- src/hotspot/share/gc/g1/g1CollectedHeap.hpp   |  2 +
- .../prims/jvmtiEnhancedRedefineClasses.cpp    | 46 +++++++++++++------
- .../prims/jvmtiEnhancedRedefineClasses.hpp    |  5 +-
- 4 files changed, 58 insertions(+), 15 deletions(-)
-
-diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
-index dea8d9fdb0e..33664a30519 100644
---- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
-+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
-@@ -2108,6 +2108,21 @@ public:
-   }
- };
- 
-+class G1IterateObjectClosureTask : public AbstractGangTask {
-+ private:
-+  ObjectClosure* _cl;
-+  G1CollectedHeap* _g1h;
-+  HeapRegionClaimer _hrclaimer;
-+ public:
-+  G1IterateObjectClosureTask(ObjectClosure* cl, G1CollectedHeap* g1h) : AbstractGangTask("IterateObject Closure"),
-+    _cl(cl), _g1h(g1h),  _hrclaimer(g1h->workers()->active_workers()) { }
-+
-+  virtual void work(uint worker_id) {
-+    IterateObjectClosureRegionClosure blk(_cl);
-+    _g1h->heap_region_par_iterate_from_worker_offset(&blk, &_hrclaimer, worker_id);
-+  }
-+};
-+
- void G1CollectedHeap::object_iterate(ObjectClosure* cl) {
-   IterateObjectClosureRegionClosure blk(cl);
-   heap_region_iterate(&blk);
-@@ -2117,6 +2132,11 @@ void G1CollectedHeap::heap_region_iterate(HeapRegionClosure* cl) const {
-   _hrm.iterate(cl);
- }
- 
-+void G1CollectedHeap::object_par_iterate(ObjectClosure* cl) {
-+  G1IterateObjectClosureTask iocl_task(cl, this);
-+  workers()->run_task(&iocl_task);
-+}
-+
- void G1CollectedHeap::heap_region_par_iterate_from_worker_offset(HeapRegionClosure* cl,
-                                                                  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 0735eef0da8..05a068bb2e0 100644
---- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
-+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
-@@ -1117,6 +1117,8 @@ public:
- 
-   // Iteration functions.
- 
-+  void object_par_iterate(ObjectClosure* cl);
-+
-   // Iterate over all objects, calling "cl.do_object" on each.
-   virtual void object_iterate(ObjectClosure* cl);
- 
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 32929b3d7a0..5be9bb74305 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -54,6 +54,7 @@
- #include "utilities/events.hpp"
- #include "oops/constantPool.inline.hpp"
- #include "gc/cms/cmsHeap.hpp"
-+#include "gc/g1/g1CollectedHeap.hpp"
- #include "gc/shared/dcevmSharedGC.hpp"
- 
- Array<Method*>* VM_EnhancedRedefineClasses::_old_methods = NULL;
-@@ -459,6 +460,10 @@ public:
- void VM_EnhancedRedefineClasses::doit() {
-   Thread *thread = Thread::current();
- 
-+  if (log_is_enabled(Info, redefine, class, timer)) {
-+    _timer_vm_op_doit.start();
-+  }
-+
- #if INCLUDE_CDS
-   if (UseSharedSpaces) {
-     // Sharing is enabled so we remap the shared readonly space to
-@@ -523,8 +528,22 @@ void VM_EnhancedRedefineClasses::doit() {
-     }
- 
-     Universe::heap()->ensure_parsability(false);
--    Universe::heap()->object_iterate(&objectClosure);
-+    if (UseG1GC) {
-+      if (log_is_enabled(Info, redefine, class, timer)) {
-+        _timer_heap_iterate.start();
-+      }
-+      G1CollectedHeap::heap()->object_par_iterate(&objectClosure);
-+      _timer_heap_iterate.stop();
-+    } else {
-+      if (log_is_enabled(Info, redefine, class, timer)) {
-+        _timer_heap_iterate.start();
-+      }
-+      Universe::heap()->object_iterate(&objectClosure);
-+      _timer_heap_iterate.stop();
-+    }
-+
-     Universe::root_oops_do(&oopClosureNoBarrier);
-+
-   }
-   log_trace(redefine, class, obsolete, metadata)("After updating instances");
- 
-@@ -577,12 +596,19 @@ void VM_EnhancedRedefineClasses::doit() {
- 
-   if (objectClosure.needs_instance_update()) {
-     // Do a full garbage collection to update the instance sizes accordingly
-+
-+    if (log_is_enabled(Info, redefine, class, timer)) {
-+      _timer_heap_full_gc.start();
-+    }
-+
-     Universe::set_redefining_gc_run(true);
-     notify_gc_begin(true);
-     // TODO: check _metadata_GC_clear_soft_refs with ScavengeRootsInCode
-     Universe::heap()->collect_as_vm_thread(GCCause::_heap_inspection);
-     notify_gc_end();
-     Universe::set_redefining_gc_run(false);
-+
-+    _timer_heap_full_gc.stop();
-   }
- 
-   // Unmark Klass*s as "redefining"
-@@ -630,6 +656,7 @@ void VM_EnhancedRedefineClasses::doit() {
-   }
- #endif
- 
-+  _timer_vm_op_doit.stop();
- }
- 
- // Cleanup - runs in JVM thread
-@@ -653,16 +680,14 @@ void VM_EnhancedRedefineClasses::doit_epilogue() {
-   if (log_is_enabled(Info, redefine, class, timer)) {
-     // Used to have separate timers for "doit" and "all", but the timer
-     // overhead skewed the measurements.
--    jlong doit_time = _timer_rsc_phase1.milliseconds() +
--                      _timer_rsc_phase2.milliseconds();
--    jlong all_time = _timer_vm_op_prologue.milliseconds() + doit_time;
-+    jlong all_time = _timer_vm_op_prologue.milliseconds() + _timer_vm_op_doit.milliseconds();
- 
-     log_info(redefine, class, timer)
-       ("vm_op: all=" JLONG_FORMAT "  prologue=" JLONG_FORMAT "  doit=" JLONG_FORMAT,
--       all_time, _timer_vm_op_prologue.milliseconds(), doit_time);
-+       all_time, _timer_vm_op_prologue.milliseconds(), _timer_vm_op_doit.milliseconds());
-     log_info(redefine, class, timer)
--      ("redefine_single_class: phase1=" JLONG_FORMAT "  phase2=" JLONG_FORMAT,
--       _timer_rsc_phase1.milliseconds(), _timer_rsc_phase2.milliseconds());
-+      ("doit: heap iterate=" JLONG_FORMAT "  fullgc=" JLONG_FORMAT,
-+       _timer_heap_iterate.milliseconds(), _timer_heap_full_gc.milliseconds());
-   }
- }
- 
-@@ -1411,7 +1436,7 @@ void VM_EnhancedRedefineClasses::unpatch_bytecode(Method* method) {
- // arrayKlassOops. See Open Issues in jvmtiRedefineClasses.hpp.
- void VM_EnhancedRedefineClasses::ClearCpoolCacheAndUnpatch::do_klass(Klass* k) {
-   if (!k->is_instance_klass()) {
--	return;
-+    return;
-   }
- 
-   HandleMark hm(_thread);
-@@ -1829,10 +1854,6 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
- 
-   HandleMark hm(THREAD);   // make sure handles from this call are freed
- 
--  if (log_is_enabled(Info, redefine, class, timer)) {
--    _timer_rsc_phase1.start();
--  }
--
-   InstanceKlass* new_class = new_class_oop;
-   InstanceKlass* the_class = InstanceKlass::cast(new_class_oop->old_version());
-   assert(the_class != NULL, "must have old version");
-@@ -1887,7 +1908,6 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
-                              new_class->external_name(),
-                              java_lang_Class::classRedefinedCount(new_class->java_mirror()));
-   }
--  _timer_rsc_phase2.stop();
- } // end redefine_single_class()
- 
- 
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-index 030852b160a..9755944d70b 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-@@ -86,9 +86,10 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
-   // Performance measurement support. These timers do not cover all
-   // the work done for JVM/TI RedefineClasses() but they do cover
-   // the heavy lifting.
--  elapsedTimer  _timer_rsc_phase1;
--  elapsedTimer  _timer_rsc_phase2;
-+  elapsedTimer  _timer_vm_op_doit;
-   elapsedTimer  _timer_vm_op_prologue;
-+  elapsedTimer  _timer_heap_iterate;
-+  elapsedTimer  _timer_heap_full_gc;
- 
-   // These routines are roughly in call order unless otherwise noted.
- 
--- 
-2.24.3 (Apple Git-128)
-

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

@@ -16,19 +16,12 @@
 # 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 where JCEF binaries are located.
-#               By default imported modules should be located in ./jcef_win_x64
 
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 bundle_type=$4
 JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
-WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=${WORK_DIR}/modular-sdk}"
-JCEF_PATH=${JCEF_PATH:=./jcef_win_x64}
 
 source jb/project/tools/common.sh
 
@@ -52,7 +45,7 @@ function create_jbr {
     --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output ${JBR_BUNDLE} || exit $?
   if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]]
   then
-    cp -R ${JCEF_PATH}/* ${JBR_BUNDLE}/bin
+    cp -R jcef_win_x64/* ${JBR_BUNDLE}/bin
   fi
   echo Modifying release info ...
   cat ${JSDK}/release | tr -d '\r' | grep -v 'JAVA_VERSION' | grep -v 'MODULES' >> ${JBR_BUNDLE}/release
@@ -61,8 +54,7 @@ function create_jbr {
 JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
 WORK_DIR=$(pwd)
 
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=windows-x86_64-normal-server-release
+WITH_IMPORT_MODULES="--with-import-modules=${WORK_DIR}/modular-sdk"
 git checkout -- modules.list src/java.desktop/share/classes/module-info.java
 case "$bundle_type" in
   "jfx")
@@ -87,7 +79,7 @@ esac
 PATH="/usr/local/bin:/usr/bin:${PATH}"
 ./configure \
   --disable-warnings-as-errors \
-  $WITH_DEBUG_LEVEL \
+  --disable-debug-symbols \
   --with-target-bits=64 \
   --with-vendor-name="${VENDOR_NAME}" \
   --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
@@ -101,20 +93,20 @@ PATH="/usr/local/bin:/usr/bin:${PATH}"
   --enable-cds=yes || exit 1
 
 if [ "$bundle_type" == "jfx_jcef" ]; then
-  make LOG=info clean images CONF=$RELEASE_NAME test-image || exit 1
+  make LOG=info clean images CONF=windows-x86_64-normal-server-release test-image || exit 1
 else
-  make LOG=info clean images CONF=$RELEASE_NAME || exit 1
+  make LOG=info clean images CONF=windows-x86_64-normal-server-release || exit 1
 fi
 
-JSDK=build/$RELEASE_NAME/images/jdk
+JSDK=build/windows-x86_64-normal-server-release/images/jdk
 if [[ "$bundle_type" == *jcef* ]]; then
   JBSDK=${JBRSDK_BASE_NAME}-windows-x64-b${build_number}
 fi
-BASE_DIR=build/$RELEASE_NAME/images
+BASE_DIR=build/windows-x86_64-normal-server-release/images
 JBRSDK_BUNDLE=jbrsdk
 
 rm -rf ${BASE_DIR}/${JBRSDK_BUNDLE} && rsync -a --exclude demo --exclude sample ${JSDK}/ ${JBRSDK_BUNDLE} || exit 1
-cp -R ${JCEF_PATH}/* ${JBRSDK_BUNDLE}/bin
+cp -R jcef_win_x64/* ${JBRSDK_BUNDLE}/bin
 sed 's/JBR/JBRSDK/g' ${JSDK}/release > release
 mv release ${JBRSDK_BUNDLE}/release
 

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

@@ -48,12 +48,10 @@ function pack_jbr {
   #rm -rf ${BASE_DIR}/${JBR_BUNDLE}
 }
 
-RELEASE_NAME=windows-x86_64-normal-server-release
-
 JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
 JBR_BASE_NAME=jbr-$JBSDK_VERSION
 
-IMAGES_DIR=build/$RELEASE_NAME/images
+IMAGES_DIR=build/windows-x86_64-normal-server-release/images
 JSDK=$IMAGES_DIR/jdk
 JBSDK=$JBRSDK_BASE_NAME-windows-x64-b$build_number
 BASE_DIR=.

make/Bundles.gmk

@@ -50,7 +50,6 @@ $(eval $(call IncludeCustomExtension, Bundles-pre.gmk))
 #     files or directories may contain spaces.
 # BASE_DIRS : Base directories for the root dir in the bundle.
 # SUBDIR : Optional name of root dir in bundle.
-# OUTPUTDIR : Optionally override output dir
 SetupBundleFile = $(NamedParamsMacroTemplate)
 define SetupBundleFileBody
 
@@ -71,10 +70,7 @@ define SetupBundleFileBody
 
   $$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false)
 
-  $$(call SetIfEmpty, $1_OUTPUTDIR, $$(BUNDLES_OUTPUTDIR))
-
-  $$($1_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES)
-	$$(call LogWarn, Creating $$($1_BUNDLE_NAME))
+  $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES)
         # If any of the files contain a space in the file name, FindFiles
         # will have replaced it with ?. Tar does not accept that so need to
         # switch it back.
@@ -125,13 +121,6 @@ define SetupBundleFileBody
 	    && $(TAR) cf - -$(TAR_INCLUDE_PARAM) $$($1_$$d_LIST_FILE) \
 	        $(TAR_IGNORE_EXIT_VALUE) ) \
 	    | ( $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) && $(TAR) xf - )$$(NEWLINE) )
-          # Rename stripped pdb files
-          ifeq ($(OPENJDK_TARGET_OS)+$(SHIP_DEBUG_SYMBOLS), windows+public)
-	    for f in `$(FIND) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) -name "*.stripped.pdb"`; do \
-	      $(ECHO) Renaming $$$${f} to $$$${f%stripped.pdb}pdb $(LOG_INFO); \
-	      $(MV) $$$${f} $$$${f%stripped.pdb}pdb; \
-	    done
-          endif
           # Unzip any zipped debuginfo files
           ifeq ($$($1_UNZIP_DEBUGINFO), true)
 	    for f in `$(FIND) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) -name "*.diz"`; do \
@@ -148,7 +137,7 @@ define SetupBundleFileBody
           endif
         endif
 
-  $1 += $$($1_OUTPUTDIR)/$$($1_BUNDLE_NAME)
+  $1 += $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME)
 
 endef
 
@@ -163,12 +152,6 @@ ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release)
   JRE_IMAGE_HOMEDIR := $(JRE_MACOSX_CONTENTS_DIR)/Home
   JDK_BUNDLE_SUBDIR :=
   JRE_BUNDLE_SUBDIR :=
-  # In certain situations, the JDK_IMAGE_DIR points to an image without the
-  # the symbols and demos. If so, the symobls and demos can be found in a
-  # separate image. These variables allow for overriding from a custom makefile.
-  JDK_SYMBOLS_IMAGE_DIR ?= $(JDK_IMAGE_DIR)
-  JDK_DEMOS_IMAGE_DIR ?= $(JDK_IMAGE_DIR)
-  JDK_DEMOS_IMAGE_HOMEDIR ?= $(JDK_DEMOS_IMAGE_DIR)/$(JDK_MACOSX_CONTENTS_SUBDIR)/Home
 else
   JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR)
   JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR)
@@ -178,56 +161,24 @@ else
     JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
     JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
   endif
-  # In certain situations, the JDK_IMAGE_DIR points to an image without the
-  # the symbols and demos. If so, the symobls and demos can be found in a
-  # separate image. These variables allow for overriding from a custom makefile.
-  JDK_SYMBOLS_IMAGE_DIR ?= $(JDK_IMAGE_DIR)
-  JDK_DEMOS_IMAGE_DIR ?= $(JDK_IMAGE_DIR)
-  JDK_DEMOS_IMAGE_HOMEDIR ?= $(JDK_DEMOS_IMAGE_DIR)
 endif
 
 ################################################################################
 
-ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
+ifneq ($(filter product-bundles legacy-bundles, $(MAKECMDGOALS)), )
 
-  SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.map
+  SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.pdb %.map
 
   # There may be files with spaces in the names, so use ShellFindFiles
   # explicitly.
   ALL_JDK_FILES := $(call ShellFindFiles, $(JDK_IMAGE_DIR))
-  ifneq ($(JDK_IMAGE_DIR), $(JDK_SYMBOLS_IMAGE_DIR))
-    ALL_JDK_SYMBOLS_FILES := $(call ShellFindFiles, $(JDK_SYMBOLS_IMAGE_DIR))
-  else
-    ALL_JDK_SYMBOLS_FILES := $(ALL_JDK_FILES)
-  endif
-  ifneq ($(JDK_IMAGE_DIR), $(JDK_DEMOS_IMAGE_DIR))
-    ALL_JDK_DEMOS_FILES := $(call ShellFindFiles, $(JDK_DEMOS_IMAGE_DIR))
-  else
-    ALL_JDK_DEMOS_FILES := $(ALL_JDK_FILES)
-  endif
 
   # Create special filter rules when dealing with unzipped .dSYM directories on
   # macosx
   ifeq ($(OPENJDK_TARGET_OS), macosx)
     ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
       JDK_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
-          $(call containing, .dSYM/, $(patsubst $(JDK_IMAGE_DIR)/%, %, \
-          $(ALL_JDK_SYMBOLS_FILES))))
-    endif
-  endif
-
-  # Create special filter rules when dealing with debug symbols on windows
-  ifeq ($(OPENJDK_TARGET_OS), windows)
-    ifeq ($(SHIP_DEBUG_SYMBOLS), )
-      JDK_SYMBOLS_EXCLUDE_PATTERN := %.pdb
-    else
-      ifeq ($(SHIP_DEBUG_SYMBOLS), public)
-        JDK_SYMBOLS_EXCLUDE_PATTERN := \
-            $(filter-out \
-                %.stripped.pdb, \
-                $(filter %.pdb, $(ALL_JDK_FILES)) \
-            )
-      endif
+          $(call containing, .dSYM/, $(patsubst $(JDK_IMAGE_DIR)/%, %, $(ALL_JDK_FILES))))
     endif
   endif
 
@@ -240,22 +191,20 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
           , \
           $(ALL_JDK_FILES) \
       )
-
   JDK_SYMBOLS_BUNDLE_FILES := \
       $(filter \
           $(JDK_SYMBOLS_EXCLUDE_PATTERN) \
           $(SYMBOLS_EXCLUDE_PATTERN) \
           , \
           $(filter-out \
-              $(JDK_IMAGE_HOMEDIR)/demo/% %.stripped.pdb \
+              $(JDK_IMAGE_HOMEDIR)/demo/% \
               , \
-              $(ALL_JDK_SYMBOLS_FILES) \
+              $(ALL_JDK_FILES) \
           ) \
       ) \
       $(call FindFiles, $(SYMBOLS_IMAGE_DIR))
 
-  TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_DEMOS_IMAGE_HOMEDIR)/demo/%, \
-      $(ALL_JDK_DEMOS_FILES))
+  TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES))
 
   ALL_JRE_FILES := $(call ShellFindFiles, $(JRE_IMAGE_DIR))
 
@@ -268,21 +217,6 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
     endif
   endif
 
-  # Create special filter rules when dealing with debug symbols on windows
-  ifeq ($(OPENJDK_TARGET_OS), windows)
-    ifeq ($(SHIP_DEBUG_SYMBOLS), )
-      JRE_SYMBOLS_EXCLUDE_PATTERN := %.pdb
-    else
-      ifeq ($(SHIP_DEBUG_SYMBOLS), public)
-        JRE_SYMBOLS_EXCLUDE_PATTERN := \
-            $(filter-out \
-                %.stripped.pdb, \
-                $(filter %.pdb, $(ALL_JRE_FILES)) \
-            )
-      endif
-    endif
-  endif
-
   JRE_BUNDLE_FILES := $(filter-out \
       $(JRE_SYMBOLS_EXCLUDE_PATTERN) \
       $(SYMBOLS_EXCLUDE_PATTERN), \
@@ -379,17 +313,15 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
     LEGACY_TARGETS += $(BUILD_JRE_BUNDLE)
   endif
 
-  ifeq ($(COPY_DEBUG_SYMBOLS), true)
-    $(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \
-        BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \
-        FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \
-        BASE_DIRS := $(JDK_SYMBOLS_IMAGE_DIR) $(wildcard $(SYMBOLS_IMAGE_DIR)), \
-        SUBDIR := $(JDK_BUNDLE_SUBDIR), \
-        UNZIP_DEBUGINFO := true, \
-    ))
+  $(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \
+      BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \
+      FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \
+      BASE_DIRS := $(JDK_IMAGE_DIR) $(wildcard $(SYMBOLS_IMAGE_DIR)), \
+      SUBDIR := $(JDK_BUNDLE_SUBDIR), \
+      UNZIP_DEBUGINFO := true, \
+  ))
 
-    PRODUCT_TARGETS += $(BUILD_JDK_SYMBOLS_BUNDLE)
-  endif
+  PRODUCT_TARGETS += $(BUILD_JDK_SYMBOLS_BUNDLE)
 
   # The demo bundle is only created to support client tests. Ideally it should
   # be built with the main test bundle, but since the prerequisites match
@@ -397,7 +329,7 @@ ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
   $(eval $(call SetupBundleFile, BUILD_TEST_DEMOS_BUNDLE, \
       BUNDLE_NAME := $(TEST_DEMOS_BUNDLE_NAME), \
       FILES := $(TEST_DEMOS_BUNDLE_FILES), \
-      BASE_DIRS := $(JDK_DEMOS_IMAGE_DIR), \
+      BASE_DIRS := $(JDK_IMAGE_DIR), \
       SUBDIR := $(JDK_BUNDLE_SUBDIR), \
   ))
 
@@ -435,27 +367,6 @@ endif
 
 ################################################################################
 
-ifneq ($(filter static-libs-bundles, $(MAKECMDGOALS)), )
-  STATIC_LIBS_BUNDLE_FILES := $(call FindFiles, $(STATIC_LIBS_IMAGE_DIR))
-
-  ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release)
-    STATIC_LIBS_BUNDLE_SUBDIR := $(JDK_MACOSX_CONTENTS_SUBDIR)/Home
-  else
-    STATIC_LIBS_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)
-  endif
-
-  $(eval $(call SetupBundleFile, BUILD_STATIC_LIBS_BUNDLE, \
-      BUNDLE_NAME := $(STATIC_LIBS_BUNDLE_NAME), \
-      FILES := $(STATIC_LIBS_BUNDLE_FILES), \
-      BASE_DIRS := $(STATIC_LIBS_IMAGE_DIR), \
-      SUBDIR := $(STATIC_LIBS_BUNDLE_SUBDIR), \
-  ))
-
-  STATIC_LIBS_TARGETS += $(BUILD_STATIC_LIBS_BUNDLE)
-endif
-
-################################################################################
-
 # Hook to include the corresponding custom file, if present.
 $(eval $(call IncludeCustomExtension, Bundles.gmk))
 
@@ -465,7 +376,5 @@ product-bundles: $(PRODUCT_TARGETS)
 legacy-bundles: $(LEGACY_TARGETS)
 test-bundles: $(TEST_TARGETS)
 docs-bundles: $(DOCS_TARGETS)
-static-libs-bundles: $(STATIC_LIBS_TARGETS)
 
-.PHONY: all default product-bundles test-bundles docs-bundles \
-    static-libs-bundles
+.PHONY: all default product-bundles test-bundles docs-bundles

make/CreateJmods.gmk

@@ -1,5 +1,4 @@
-#
-# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -57,58 +56,12 @@ $(call FillFindCache, \
 )
 
 ifneq ($(LIBS_DIR), )
+  JMOD_FLAGS += --libs $(LIBS_DIR)
   DEPS += $(call FindFiles, $(LIBS_DIR))
-  ifeq ($(OPENJDK_TARGET_OS)+$(SHIP_DEBUG_SYMBOLS), windows+public)
-    # For public debug symbols on Windows, we have to use stripped pdbs and rename them
-    rename_stripped = $(patsubst %.stripped.pdb,%.pdb,$1)
-    LIBS_DIR_FILTERED := $(subst modules_libs,modules_libs_filtered, $(LIBS_DIR))
-    FILES_LIBS := $(filter-out %.pdb, $(call FindFiles, $(LIBS_DIR))) \
-        $(filter %.stripped.pdb, $(call FindFiles, $(LIBS_DIR)))
-    $(eval $(call SetupCopyFiles, COPY_FILTERED_LIBS, \
-        SRC := $(LIBS_DIR), \
-        DEST := $(LIBS_DIR_FILTERED), \
-        FILES := $(FILES_LIBS), \
-        NAME_MACRO := rename_stripped, \
-    ))
-    DEPS += $(COPY_FILTERED_LIBS)
-    JMOD_FLAGS += --libs $(LIBS_DIR_FILTERED)
-  else
-    JMOD_FLAGS += --libs $(LIBS_DIR)
-  endif
 endif
 ifneq ($(CMDS_DIR), )
+  JMOD_FLAGS += --cmds $(CMDS_DIR)
   DEPS += $(call FindFiles, $(CMDS_DIR))
-  ifeq ($(OPENJDK_TARGET_OS)+$(SHIP_DEBUG_SYMBOLS), windows+public)
-    # For public debug symbols on Windows, we have to use stripped pdbs, rename them
-    # and filter out a few launcher pdbs where there's a lib that goes by the same name
-    rename_stripped = $(patsubst %.stripped.pdb,%.pdb,$1)
-    CMDS_DIR_FILTERED := $(subst modules_cmds,modules_cmds_filtered, $(CMDS_DIR))
-    FILES_CMDS := $(filter-out %.pdb, $(call FindFiles, $(CMDS_DIR))) \
-        $(filter-out %jimage.stripped.pdb %jpackage.stripped.pdb %java.stripped.pdb, \
-            $(filter %.stripped.pdb, $(call FindFiles, $(CMDS_DIR))))
-    $(eval $(call SetupCopyFiles, COPY_FILTERED_CMDS, \
-        SRC := $(CMDS_DIR), \
-        DEST := $(CMDS_DIR_FILTERED), \
-        FILES := $(FILES_CMDS), \
-        NAME_MACRO := rename_stripped, \
-    ))
-    DEPS += $(COPY_FILTERED_CMDS)
-    JMOD_FLAGS += --cmds $(CMDS_DIR_FILTERED)
-  else ifeq ($(OPENJDK_TARGET_OS)+$(SHIP_DEBUG_SYMBOLS), windows+full)
-    # For full debug symbols on Windows, we have to filter out a few launcher pdbs
-    # where there's a lib that goes by the same name
-    CMDS_DIR_FILTERED := $(subst modules_cmds,modules_cmds_filtered, $(CMDS_DIR))
-    $(eval $(call SetupCopyFiles, COPY_FILTERED_CMDS, \
-        SRC := $(CMDS_DIR), \
-        DEST := $(CMDS_DIR_FILTERED), \
-        FILES := $(filter-out %jimage.pdb %jpackage.pdb %java.pdb, \
-            $(call FindFiles, $(CMDS_DIR))), \
-    ))
-    DEPS += $(COPY_FILTERED_CMDS)
-    JMOD_FLAGS += --cmds $(CMDS_DIR_FILTERED)
-  else
-    JMOD_FLAGS += --cmds $(CMDS_DIR)
-  endif
 endif
 ifneq ($(CONF_DIR), )
   JMOD_FLAGS += --config $(CONF_DIR)
@@ -201,15 +154,7 @@ ifeq ($(INTERIM_JMOD), true)
   DEPS := $(filter-out $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/classlist, $(DEPS))
 endif
 
-ifeq ($(OPENJDK_TARGET_OS), windows)
-  ifeq ($(SHIP_DEBUG_SYMBOLS), )
-    JMOD_FLAGS += --exclude '**{_the.*,_*.marker,*.diz,*.pdb,*.map}'
-  else
-    JMOD_FLAGS += --exclude '**{_the.*,_*.marker,*.diz,*.map}'
-  endif
-else
-  JMOD_FLAGS += --exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM}'
-endif
+JMOD_FLAGS += --exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}'
 
 # Create jmods in a temp dir and then move them into place to keep the
 # module path in $(IMAGES_OUTPUTDIR)/jmods valid at all times.

make/GenerateLinkOptData.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 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
@@ -84,17 +84,6 @@ $(eval $(call SetupCopyFiles, COPY_CLASSLIST, \
 
 TARGETS += $(COPY_CLASSLIST)
 
-# In case of shipping public debug symbols on windows, there is another temporary
-# location from where jmods are compiled - need to deploy classlist there, too.
-ifeq ($(OPENJDK_TARGET_OS)+$(SHIP_DEBUG_SYMBOLS), windows+public)
-  $(eval $(call SetupCopyFiles, COPY_CLASSLIST_TO_FILTERED, \
-      FILES := $(CLASSLIST_FILE), \
-      DEST := $(SUPPORT_OUTPUTDIR)/modules_libs_filtered/java.base, \
-  ))
-
-  TARGETS += $(COPY_CLASSLIST_TO_FILTERED)
-endif
-
 # Copy the default_jli_trace.txt file into jdk.jlink
 $(eval $(call SetupCopyFiles, COPY_JLI_TRACE, \
     FILES := $(JLI_TRACE_FILE), \

make/GraalBuilderImage.gmk

@@ -1,57 +0,0 @@
-#
-# Copyright (c) 2020, Red Hat Inc.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This makefile creates a jdk image overlayed with statically linked core
-# libraries.
-
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-
-################################################################################
-
-TARGETS :=
-
-$(eval $(call SetupCopyFiles, COPY_JDK_IMG, \
-      SRC := $(JDK_IMAGE_DIR)/, \
-      DEST := $(GRAAL_BUILDER_IMAGE_DIR)/, \
-      FILES := $(call FindFiles, $(JDK_IMAGE_DIR)/), \
-))
-TARGETS += $(COPY_JDK_IMG)
-
-$(eval $(call SetupCopyFiles, COPY_STATIC_LIBS, \
-      SRC := $(STATIC_LIBS_IMAGE_DIR)/lib, \
-      DEST := $(GRAAL_BUILDER_IMAGE_DIR)/lib, \
-      FILES := $(filter %$(STATIC_LIBRARY_SUFFIX), \
-          $(call FindFiles, $(STATIC_LIBS_IMAGE_DIR)/lib)), \
-))
-TARGETS += $(COPY_STATIC_LIBS)
-
-################################################################################
-
-all: $(TARGETS)
-
-.PHONY: all

make/Help.gmk

@@ -43,7 +43,7 @@ help:
 	$(info $(_) make images            # Create a complete jdk image)
 	$(info $(_)                        # (alias for product-images))
 	$(info $(_) make <name>-image      # Build just the image for any of: )
-	$(info $(_)                        # jdk, test, docs, symbols, legacy-jre, static-libs)
+	$(info $(_)                        # jdk, test, docs, symbols, legacy-jre)
 	$(info $(_) make <phase>           # Build the specified phase and everything it depends on)
 	$(info $(_)                        # (gensrc, java, copy, libs, launchers, gendata, rmic))
 	$(info $(_) make *-only            # Applies to most targets and disables building the)

make/Images.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -301,7 +301,6 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
 else
   LIBS_TARGET_SUBDIR := lib
 endif
-CMDS_TARGET_SUBDIR := bin
 
 # Param 1 - dir to find debuginfo files in
 FindDebuginfoFiles = \
@@ -318,15 +317,12 @@ else
   # dirs.
   ifeq ($(OPENJDK_TARGET_OS), macosx)
     $(call FillFindCache, \
-        $(SUPPORT_OUTPUTDIR)/modules_libs $(SUPPORT_OUTPUTDIR)/modules_cmds)
+        $(SUPPORT_OUTPUTDIR)/modules_cmds $(SUPPORT_OUTPUTDIR)/modules_libs)
     FindDebuginfoFiles = \
         $(if $(wildcard $1), $(call containing, .dSYM/, $(call FindFiles, $1)))
   endif
 endif
 
-FILTERED_PDBS := %jimage.stripped.pdb %jpackage.stripped.pdb %java.stripped.pdb \
-    %jimage.pdb %jpackage.pdb %java.pdb %jimage.map %jpackage.map %java.map
-
 # Param 1 - either JDK or JRE
 SetupCopyDebuginfo = \
     $(foreach m, $(ALL_$1_MODULES), \
@@ -337,13 +333,6 @@ SetupCopyDebuginfo = \
               $(SUPPORT_OUTPUTDIR)/modules_libs/$m), \
       )) \
       $(eval $1_TARGETS += $$(COPY_$1_LIBS_DEBUGINFO_$m)) \
-      $(eval $(call SetupCopyFiles, COPY_$1_CMDS_DEBUGINFO_$m, \
-          SRC := $(SUPPORT_OUTPUTDIR)/modules_cmds/$m, \
-          DEST := $($1_IMAGE_DIR)/$(CMDS_TARGET_SUBDIR), \
-          FILES := $(filter-out $(FILTERED_PDBS), $(call FindDebuginfoFiles, \
-              $(SUPPORT_OUTPUTDIR)/modules_cmds/$m)), \
-      )) \
-      $(eval $1_TARGETS += $$(COPY_$1_CMDS_DEBUGINFO_$m)) \
     )
 
 # No space before argument to avoid having to put $(strip ) everywhere in

make/Main.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -225,21 +225,6 @@ $(eval $(call DeclareRecipesForPhase, LIBS, \
 
 ALL_TARGETS += $(LIBS_TARGETS)
 
-################################################################################
-# Targets for compiling static versions of certain native libraries. These do
-# not end up in the jmods or the normal JDK image, but are instead bundled into
-# a special deliverable.
-$(eval $(call DeclareRecipesForPhase, STATIC_LIBS, \
-    TARGET_SUFFIX := static-libs, \
-    FILE_PREFIX := Lib, \
-    MAKE_SUBDIR := lib, \
-    CHECK_MODULES := $(STATIC_LIBS_MODULES), \
-    USE_WRAPPER := true, \
-    EXTRA_ARGS := STATIC_LIBS=true, \
-))
-
-ALL_TARGETS += $(STATIC_LIBS_TARGETS)
-
 ################################################################################
 # Targets for compiling native executables
 $(eval $(call DeclareRecipesForPhase, LAUNCHER, \
@@ -399,9 +384,6 @@ legacy-jre-image:
 symbols-image:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols)
 
-static-libs-image:
-	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f StaticLibsImage.gmk)
-
 mac-jdk-bundle:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk jdk-bundle)
 
@@ -414,13 +396,10 @@ release-file:
 exploded-image-optimize:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ExplodedImageOptimize.gmk)
 
-graal-builder-image:
-	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f GraalBuilderImage.gmk)
-
 ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-images zip-security \
     zip-source jrtfs-jar jdk-image legacy-jre-image \
-    symbols-image static-libs-image mac-jdk-bundle mac-legacy-jre-bundle \
-    release-file exploded-image-optimize graal-builder-image
+    symbols-image mac-jdk-bundle mac-legacy-jre-bundle \
+    release-file exploded-image-optimize
 
 ################################################################################
 # Docs targets
@@ -652,11 +631,7 @@ test-bundles:
 docs-bundles:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk docs-bundles)
 
-static-libs-bundles:
-	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk static-libs-bundles)
-
-ALL_TARGETS += product-bundles legacy-bundles test-bundles docs-bundles \
-    static-libs-bundles
+ALL_TARGETS += product-bundles legacy-bundles test-bundles docs-bundles
 
 ################################################################################
 # Install targets
@@ -829,15 +804,9 @@ else
   $(foreach m, $(GENSRC_MODULES), $(eval $m-libs-compile-commands: $m-gensrc))
   $(foreach m, $(filter $(JAVA_MODULES), $(LIBS_MODULES)), $(eval $m-libs-compile-commands: $m-java))
 
-  $(COMPILE_COMMANDS_TARGETS_HOTSPOT): clean-compile-commands
-  $(COMPILE_COMMANDS_TARGETS_JDK): clean-compile-commands
   compile-commands-hotspot: $(COMPILE_COMMANDS_TARGETS_HOTSPOT)
   compile-commands: $(COMPILE_COMMANDS_TARGETS_HOTSPOT) $(COMPILE_COMMANDS_TARGETS_JDK)
 
-  # The -static-libs targets depend on -java as well as java.base-copy.
-  $(foreach m, $(filter $(JAVA_MODULES), $(STATIC_LIBS_MODULES)), \
-    $(eval $m-static-libs: $m-java java.base-copy))
-
   vscode-project: compile-commands
   vscode-project-clangd: compile-commands
   vscode-project-rtags: compile-commands
@@ -905,10 +874,6 @@ else
   legacy-jre-image: jmods release-file
   symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS)
 
-  static-libs-image: $(STATIC_LIBS_TARGETS)
-
-  graal-builder-image: jdk-image static-libs-image
-
   mac-jdk-bundle: jdk-image
   mac-legacy-jre-bundle: legacy-jre-image
 
@@ -1002,8 +967,6 @@ else
 
   docs-bundles: docs-image
 
-  static-libs-bundles: static-libs-image
-
   generate-summary: jmods buildtools-modules
 
   update-x11wrappers: java.base-copy buildtools-jdk
@@ -1042,8 +1005,6 @@ rmic: $(RMIC_TARGETS)
 
 libs: $(LIBS_TARGETS)
 
-static-libs: $(STATIC_LIBS_TARGETS)
-
 launchers: $(LAUNCHER_TARGETS)
 
 jmods: $(JMOD_TARGETS)
@@ -1150,10 +1111,10 @@ test-image: prepare-test-image \
 all-images: product-images test-image docs-image
 
 # all-bundles packages all our deliverables as tar.gz bundles.
-all-bundles: product-bundles test-bundles docs-bundles static-libs-bundles
+all-bundles: product-bundles test-bundles docs-bundles
 
 ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \
-    copy java rmic libs static-libs launchers jmods \
+    copy java rmic libs launchers jmods \
     jdk.jdwp.agent-gensrc $(ALL_MODULES) demos \
     exploded-image-base exploded-image \
     create-buildjdk docs-jdk-api docs-javase-api docs-reference-api docs-jdk \
@@ -1206,9 +1167,6 @@ clean: $(CLEAN_DIR_TARGETS)
 clean-docs:
 	$(call CleanDocs)
 
-clean-compile-commands:
-	$(call CleanMakeSupportDir,compile-commands)
-
 $(CLEAN_DIR_TARGETS):
 	$(call CleanDir,$(patsubst clean-%, %, $@))
 
@@ -1250,9 +1208,9 @@ dist-clean: clean
 	)
 	$(ECHO) Cleaned everything, you will have to re-run configure.
 
-ALL_TARGETS += clean clean-docs clean-compile-commands dist-clean $(CLEAN_DIR_TARGETS) \
-    $(CLEAN_SUPPORT_DIR_TARGETS) $(CLEAN_TEST_TARGETS) $(CLEAN_PHASE_TARGETS) \
-    $(CLEAN_MODULE_TARGETS) $(CLEAN_MODULE_PHASE_TARGETS)
+ALL_TARGETS += clean clean-docs dist-clean $(CLEAN_DIR_TARGETS) $(CLEAN_SUPPORT_DIR_TARGETS) \
+    $(CLEAN_TEST_TARGETS) $(CLEAN_PHASE_TARGETS) $(CLEAN_MODULE_TARGETS) \
+    $(CLEAN_MODULE_PHASE_TARGETS)
 
 ################################################################################
 # Declare *-only targets for each normal target

make/MainSupport.gmk

@@ -65,13 +65,6 @@ define CleanSupportDir
 	@$(PRINTF) " done\n"
 endef
 
-define CleanMakeSupportDir
-	@$(PRINTF) "Cleaning $(strip $1) make support artifacts ..."
-	@$(PRINTF) "\n" $(LOG_DEBUG)
-	$(RM) -r $(MAKESUPPORT_OUTPUTDIR)/$(strip $1)
-	@$(PRINTF) " done\n"
-endef
-
 define CleanTest
 	@$(PRINTF) "Cleaning test $(strip $1) ..."
 	@$(PRINTF) "\n" $(LOG_DEBUG)
@@ -144,7 +137,7 @@ define DeclareRecipeForModuleMakefile
 	      $$(addprefix -I, $$(PHASE_MAKEDIRS) \
 	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(PHASE_MAKEDIRS)) \
 	      ) \
-	      MODULE=$2 MAKEFILE_PREFIX=$$($1_FILE_PREFIX) $$($1_EXTRA_ARGS))
+	      MODULE=$2 MAKEFILE_PREFIX=$$($1_FILE_PREFIX))
         else
 	  +($(CD) $$(dir $$(firstword $$(wildcard $$(addsuffix \
 	      /$$($1_MAKE_SUBDIR)/$$($1_FILE_PREFIX)-$2.gmk, $$(PHASE_MAKEDIRS))))) \
@@ -153,7 +146,7 @@ define DeclareRecipeForModuleMakefile
 	      $$(addprefix -I, $$(PHASE_MAKEDIRS) \
 	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(PHASE_MAKEDIRS)) \
 	      ) \
-	      MODULE=$2 $$($1_EXTRA_ARGS) \
+	      MODULE=$2 \
 	  )
         endif
 
@@ -193,13 +186,12 @@ endef
 # CHECK_MODULES : List of modules to try
 # MULTIPLE_MAKEFILES : Set to true to handle makefiles for the same module and
 #                      phase in multiple repos
-# EXTRA_ARGS : Add extra make args to each makefile call
 # Exported variables:
 # $1_MODULES : All modules that had rules generated
 # $1_TARGETS : All targets generated
 define DeclareRecipesForPhase
-  $(foreach i,2 3 4 5 6 7 8, $(if $(strip $($i)),$(strip $1)_$(strip $($i)))$(NEWLINE))
-  $(if $(9),$(error Internal makefile error: Too many arguments to \
+  $(foreach i,2 3 4 5 6 7, $(if $(strip $($i)),$(strip $1)_$(strip $($i)))$(NEWLINE))
+  $(if $(8),$(error Internal makefile error: Too many arguments to \
       DeclareRecipesForPhase, please update MakeHelper.gmk))
 
   $$(foreach m, $$($(strip $1)_CHECK_MODULES), \

make/StaticLibsImage.gmk

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

make/autoconf/basics.m4

@@ -1231,25 +1231,12 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
       AC_MSG_CHECKING([if codesign certificate is present])
       $RM codesign-testfile
       $TOUCH codesign-testfile
-      $CODESIGN -s "$MACOSX_CODESIGN_IDENTITY" codesign-testfile 2>&AS_MESSAGE_LOG_FD \
-          >&AS_MESSAGE_LOG_FD || CODESIGN=
+      $CODESIGN -s "$MACOSX_CODESIGN_IDENTITY" codesign-testfile 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN=
       $RM codesign-testfile
       if test "x$CODESIGN" = x; then
         AC_MSG_RESULT([no])
       else
         AC_MSG_RESULT([yes])
-        # Verify that the codesign has --option runtime
-        AC_MSG_CHECKING([if codesign has --option runtime])
-        $RM codesign-testfile
-        $TOUCH codesign-testfile
-        $CODESIGN --option runtime -s "$MACOSX_CODESIGN_IDENTITY" codesign-testfile \
-            2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN=
-        $RM codesign-testfile
-        if test "x$CODESIGN" = x; then
-          AC_MSG_ERROR([codesign does not have --option runtime. macOS 10.13.6 and above is required.])
-        else
-          AC_MSG_RESULT([yes])
-        fi
       fi
     fi
     BASIC_REQUIRE_PROGS(SETFILE, SetFile)

make/autoconf/flags-cflags.m4

@@ -221,20 +221,6 @@ AC_DEFUN([FLAGS_SETUP_QUALITY_CHECKS],
       ;;
     esac
   fi
-
-  # Extra flags needed when building optional static versions of certain
-  # JDK libraries.
-  STATIC_LIBS_CFLAGS="-DSTATIC_BUILD=1"
-  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-    STATIC_LIBS_CFLAGS="$STATIC_LIBS_CFLAGS -ffunction-sections -fdata-sections"
-  fi
-  if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    # Disable relax-relocation to enable compatibility with older linkers
-    RELAX_RELOCATIONS_FLAG="-Xassembler -mrelax-relocations=no"
-    FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${RELAX_RELOCATIONS_FLAG}],
-        IF_TRUE: [STATIC_LIBS_CFLAGS="$STATIC_LIBS_CFLAGS ${RELAX_RELOCATIONS_FLAG}"])
-  fi
-  AC_SUBST(STATIC_LIBS_CFLAGS)
 ])
 
 AC_DEFUN([FLAGS_SETUP_OPTIMIZATION],

make/autoconf/flags-ldflags.m4

@@ -72,9 +72,8 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     fi
 
     # Add -z defs, to forbid undefined symbols in object files.
-    # add -z,relro (mark relocations read only) for all libs
-    # add -z,now ("full relro" - more of the Global Offset Table GOT is marked read only)
-    BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,-z,defs -Wl,-z,relro -Wl,-z,now"
+    # add relro (mark relocations read only) for all libs
+    BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,-z,defs -Wl,-z,relro"
     # s390x : remove unused code+data in link step
     if test "x$OPENJDK_TARGET_CPU" = xs390x; then
       BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,--gc-sections -Wl,--print-gc-sections"
@@ -128,6 +127,10 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
       if test x$DEBUG_LEVEL = xrelease; then
         DEBUGLEVEL_LDFLAGS_JDK_ONLY="$DEBUGLEVEL_LDFLAGS_JDK_ONLY -Wl,-O1"
       fi
+      if test x$DEBUG_LEVEL = xslowdebug; then
+        # do relocations at load
+        DEBUGLEVEL_LDFLAGS="-Wl,-z,now"
+      fi
     fi
 
   elif test "x$TOOLCHAIN_TYPE" = xxlc; then

make/autoconf/hotspot.m4

@@ -47,8 +47,8 @@ AC_DEFUN([HOTSPOT_CHECK_JVM_VARIANT],
 [ [ [[ " $JVM_VARIANTS " =~ " $1 " ]] ] ])
 
 ###############################################################################
-# Check if the specified JVM feature is enabled. To be used in shell if
-# constructs, like this:
+# Check if the specified JVM features are explicitly enabled. To be used in
+# shell if constructs, like this:
 # if HOTSPOT_CHECK_JVM_FEATURE(jvmti); then
 #
 # Only valid to use after HOTSPOT_SETUP_JVM_FEATURES has setup features.
@@ -58,20 +58,6 @@ AC_DEFUN([HOTSPOT_CHECK_JVM_VARIANT],
 AC_DEFUN([HOTSPOT_CHECK_JVM_FEATURE],
 [ [ [[ " $JVM_FEATURES " =~ " $1 " ]] ] ])
 
-###############################################################################
-# Check if the specified JVM feature is explicitly disabled. To be used in
-# shell if constructs, like this:
-# if HOTSPOT_IS_JVM_FEATURE_DISABLED(jvmci); then
-#
-# This function is internal to hotspot.m4, and is only used when constructing
-# the valid set of enabled JVM features. Users outside of hotspot.m4 should just
-# use HOTSPOT_CHECK_JVM_FEATURE to check if a feature is enabled or not.
-
-# Definition kept in one line to allow inlining in if statements.
-# Additional [] needed to keep m4 from mangling shell constructs.
-AC_DEFUN([HOTSPOT_IS_JVM_FEATURE_DISABLED],
-[ [ [[ " $DISABLED_JVM_FEATURES " =~ " $1 " ]] ] ])
-
 ###############################################################################
 # Check which variants of the JVM that we want to build. Available variants are:
 #   server: normal interpreter, and a tiered C1/C2 compiler
@@ -391,7 +377,8 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
 
   AC_MSG_CHECKING([if jvmci module jdk.internal.vm.ci should be built])
   # Check if jvmci is diabled
-  if HOTSPOT_IS_JVM_FEATURE_DISABLED(jvmci); then
+  DISABLE_JVMCI=`$ECHO $DISABLED_JVM_FEATURES | $GREP jvmci`
+  if test "x$DISABLE_JVMCI" = "xjvmci"; then
     AC_MSG_RESULT([no, forced])
     JVM_FEATURES_jvmci=""
     INCLUDE_JVMCI="false"
@@ -417,7 +404,8 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
 
   AC_MSG_CHECKING([if graal module jdk.internal.vm.compiler should be built])
   # Check if graal is diabled
-  if HOTSPOT_IS_JVM_FEATURE_DISABLED(graal); then
+  DISABLE_GRAAL=`$ECHO $DISABLED_JVM_FEATURES | $GREP graal`
+  if test "x$DISABLE_GRAAL" = "xgraal"; then
     AC_MSG_RESULT([no, forced])
     JVM_FEATURES_graal=""
     INCLUDE_GRAAL="false"
@@ -449,7 +437,8 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
   AC_SUBST(INCLUDE_GRAAL)
 
   # Disable aot with '--with-jvm-features=-aot'
-  if HOTSPOT_IS_JVM_FEATURE_DISABLED(aot); then
+  DISABLE_AOT=`$ECHO $DISABLED_JVM_FEATURES | $GREP aot`
+  if test "x$DISABLE_AOT" = "xaot"; then
     ENABLE_AOT="false"
   fi
 
@@ -473,7 +462,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
       JVM_FEATURES_aot="aot"
     fi
   else
-    if test "x$enable_aot" = "xno" || HOTSPOT_IS_JVM_FEATURE_DISABLED(aot); then
+    if test "x$enable_aot" = "xno" || test "x$DISABLE_AOT" = "xaot"; then
       AC_MSG_RESULT([no, forced])
     else
       AC_MSG_RESULT([no])

make/autoconf/jdk-options.m4

@@ -283,7 +283,7 @@ AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
 AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
 [
   #
-  # Native debug symbols.
+  # NATIVE_DEBUG_SYMBOLS
   # This must be done after the toolchain is setup, since we're looking at objcopy.
   #
   AC_MSG_CHECKING([what type of native debug symbols to use])
@@ -295,9 +295,11 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
           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])
+        else
+          if 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
           fi
         fi
       ],
@@ -313,17 +315,18 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
           fi
         fi
       ])
-  AC_MSG_RESULT([$with_native_debug_symbols])
+  NATIVE_DEBUG_SYMBOLS=$with_native_debug_symbols
+  AC_MSG_RESULT([$NATIVE_DEBUG_SYMBOLS])
 
-  if test "x$with_native_debug_symbols" = xnone; then
+  if test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then
     COMPILE_WITH_DEBUG_SYMBOLS=false
     COPY_DEBUG_SYMBOLS=false
     ZIP_EXTERNAL_DEBUG_SYMBOLS=false
-  elif test "x$with_native_debug_symbols" = xinternal; then
+  elif test "x$NATIVE_DEBUG_SYMBOLS" = xinternal; then
     COMPILE_WITH_DEBUG_SYMBOLS=true
     COPY_DEBUG_SYMBOLS=false
     ZIP_EXTERNAL_DEBUG_SYMBOLS=false
-  elif test "x$with_native_debug_symbols" = xexternal; then
+  elif test "x$NATIVE_DEBUG_SYMBOLS" = xexternal; then
 
     if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
       if test "x$OBJCOPY" = x; then
@@ -336,7 +339,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
     COMPILE_WITH_DEBUG_SYMBOLS=true
     COPY_DEBUG_SYMBOLS=true
     ZIP_EXTERNAL_DEBUG_SYMBOLS=false
-  elif test "x$with_native_debug_symbols" = xzipped; then
+  elif test "x$NATIVE_DEBUG_SYMBOLS" = xzipped; then
 
     if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
       if test "x$OBJCOPY" = x; then
@@ -366,33 +369,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
   AC_SUBST(COMPILE_WITH_DEBUG_SYMBOLS)
   AC_SUBST(COPY_DEBUG_SYMBOLS)
   AC_SUBST(ZIP_EXTERNAL_DEBUG_SYMBOLS)
-
-  # Should we add external native debug symbols to the shipped bundles?
-  AC_MSG_CHECKING([if we should add external native debug symbols to the shipped bundles])
-  AC_ARG_WITH([external-symbols-in-bundles],
-      [AS_HELP_STRING([--with-external-symbols-in-bundles],
-      [which type of external native debug symbol information shall be shipped in product bundles (none, public, full)
-      (e.g. ship full/stripped pdbs on Windows) @<:@none@:>@])])
-
-  if test "x$with_external_symbols_in_bundles" = x || test "x$with_external_symbols_in_bundles" = xnone ; then
-    AC_MSG_RESULT([no])
-  elif test "x$with_external_symbols_in_bundles" = xfull || test "x$with_external_symbols_in_bundles" = xpublic ; then
-    if test "x$OPENJDK_TARGET_OS" != xwindows ; then
-      AC_MSG_ERROR([--with-external-symbols-in-bundles currently only works on windows!])
-    elif test "x$COPY_DEBUG_SYMBOLS" != xtrue ; then
-      AC_MSG_ERROR([--with-external-symbols-in-bundles only works when --with-native-debug-symbols=external is used!])
-    elif test "x$with_external_symbols_in_bundles" = xfull ; then
-      AC_MSG_RESULT([full])
-      SHIP_DEBUG_SYMBOLS=full
-    else
-      AC_MSG_RESULT([public])
-      SHIP_DEBUG_SYMBOLS=public
-    fi
-  else
-    AC_MSG_ERROR([$with_external_symbols_in_bundles is an unknown value for --with-external-symbols-in-bundles])
-  fi
-
-  AC_SUBST(SHIP_DEBUG_SYMBOLS)
 ])
 
 ################################################################################

make/autoconf/jdk-version.m4

@@ -143,9 +143,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     AC_MSG_ERROR([--with-vendor-url must have a value])
   elif [ ! [[ $with_vendor_url =~ ^[[:print:]]*$ ]] ]; then
     AC_MSG_ERROR([--with-vendor-url contains non-printing characters: $with_vendor_url])
-  elif test "x$with_vendor_url" != x; then
-    # Only set VENDOR_URL if '--with-vendor-url' was used and is not empty.
-    # Otherwise we will use the value from "version-numbers" included above.
+  else
     VENDOR_URL="$with_vendor_url"
   fi
   AC_SUBST(VENDOR_URL)
@@ -157,9 +155,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     AC_MSG_ERROR([--with-vendor-bug-url must have a value])
   elif [ ! [[ $with_vendor_bug_url =~ ^[[:print:]]*$ ]] ]; then
     AC_MSG_ERROR([--with-vendor-bug-url contains non-printing characters: $with_vendor_bug_url])
-  elif test "x$with_vendor_bug_url" != x; then
-    # Only set VENDOR_URL_BUG if '--with-vendor-bug-url' was used and is not empty.
-    # Otherwise we will use the value from "version-numbers" included above.
+  else
     VENDOR_URL_BUG="$with_vendor_bug_url"
   fi
   AC_SUBST(VENDOR_URL_BUG)
@@ -171,9 +167,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     AC_MSG_ERROR([--with-vendor-vm-bug-url must have a value])
   elif [ ! [[ $with_vendor_vm_bug_url =~ ^[[:print:]]*$ ]] ]; then
     AC_MSG_ERROR([--with-vendor-vm-bug-url contains non-printing characters: $with_vendor_vm_bug_url])
-  elif test "x$with_vendor_vm_bug_url" != x; then
-    # Only set VENDOR_URL_VM_BUG if '--with-vendor-vm-bug-url' was used and is not empty.
-    # Otherwise we will use the value from "version-numbers" included above.
+  else
     VENDOR_URL_VM_BUG="$with_vendor_vm_bug_url"
   fi
   AC_SUBST(VENDOR_URL_VM_BUG)

make/autoconf/spec.gmk.in

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -230,8 +230,7 @@ ifneq ($(COMPANY_NAME),)
   # Only export "VENDOR" to the build if COMPANY_NAME contains a real value.
   # Otherwise the default value for VENDOR, which is used to set the "java.vendor"
   # and "java.vm.vendor" properties is hard-coded into the source code (i.e. in
-  # VersionProps.java.template in the jdk for "java.vendor" and
-  # vm_version.cpp in the VM for "java.vm.vendor")
+  # System.c in the jdk for "vm.vendor" and vm_version.cpp in the VM for "java.vm.vendor")
   ifneq ($(COMPANY_NAME), N/A)
     VERSION_CFLAGS += -DVENDOR='"$(COMPANY_NAME)"'
   endif
@@ -287,9 +286,6 @@ USE_PRECOMPILED_HEADER := @USE_PRECOMPILED_HEADER@
 # Only build headless support or not
 ENABLE_HEADLESS_ONLY := @ENABLE_HEADLESS_ONLY@
 
-# Ship debug symbols (e.g. pdbs on Windows)
-SHIP_DEBUG_SYMBOLS := @SHIP_DEBUG_SYMBOLS@
-
 ENABLE_FULL_DOCS := @ENABLE_FULL_DOCS@
 
 # JDK_OUTPUTDIR specifies where a working jvm is built.
@@ -366,8 +362,6 @@ LIBFFI_LIB_FILE:=@LIBFFI_LIB_FILE@
 GRAALUNIT_LIB := @GRAALUNIT_LIB@
 FILE_MACRO_CFLAGS := @FILE_MACRO_CFLAGS@
 
-STATIC_LIBS_CFLAGS := @STATIC_LIBS_CFLAGS@
-
 PACKAGE_PATH=@PACKAGE_PATH@
 
 # Source file for cacerts
@@ -875,14 +869,6 @@ DOCS_IMAGE_DIR = $(IMAGES_OUTPUTDIR)/$(DOCS_IMAGE_SUBDIR)
 # Output docs directly into image
 DOCS_OUTPUTDIR := $(DOCS_IMAGE_DIR)
 
-# Static libs image
-STATIC_LIBS_IMAGE_SUBDIR := static-libs
-STATIC_LIBS_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(STATIC_LIBS_IMAGE_SUBDIR)
-
-# Graal builder image
-GRAAL_BUILDER_IMAGE_SUBDIR := graal-builder-jdk
-GRAAL_BUILDER_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/$(GRAAL_BUILDER_IMAGE_SUBDIR)
-
 # Macosx bundles directory definitions
 JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle
 JRE_MACOSX_BUNDLE_SUBDIR=jre-bundle
@@ -917,7 +903,6 @@ JDK_SYMBOLS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin$(DEBUG_PART)-symbols.tar.gz
 TEST_DEMOS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests-demos$(DEBUG_PART).tar.gz
 TEST_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-tests$(DEBUG_PART).tar.gz
 DOCS_BUNDLE_NAME := jdk-$(BASE_NAME)_doc-api-spec$(DEBUG_PART).tar.gz
-STATIC_LIBS_BUNDLE_NAME := jdk-$(BASE_NAME)_bin-static-libs$(DEBUG_PART).tar.gz
 
 JDK_BUNDLE := $(BUNDLES_OUTPUTDIR)/$(JDK_BUNDLE_NAME)
 JRE_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JRE_BUNDLE_NAME)

make/autoconf/toolchain.m4

@@ -429,10 +429,9 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
     # There is no specific version flag, but all output starts with a version string.
     # First line typically looks something like:
     # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86
-    # but the compiler name may vary depending on locale.
     COMPILER_VERSION_OUTPUT=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
     # Check that this is likely to be Microsoft CL.EXE.
-    $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Microsoft" > /dev/null
+    $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Microsoft.*Compiler" > /dev/null
     if test $? -ne 0; then
       AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.])
       AC_MSG_NOTICE([The result from running it was: "$COMPILER_VERSION_OUTPUT"])
@@ -461,7 +460,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
     COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
         $SED -e 's/ *Copyright .*//'`
     COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
-        $SED -e 's/^.* \(@<:@1-9@:>@<:@0-9@:>@*\.@<:@0-9.@:>@*\)@<:@^0-9.@:>@.*$/\1/'`
+        $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\)@<:@^0-9.@:>@.*$/\1/'`
   elif test  "x$TOOLCHAIN_TYPE" = xclang; then
     # clang --version output typically looks like
     #    Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)

make/autoconf/version-numbers

@@ -23,17 +23,16 @@
 # questions.
 #
 
-# Default version, product, and vendor information to use,
-# unless overridden by configure
+# Default version numbers to use unless overridden by configure
 
 DEFAULT_VERSION_FEATURE=11
 DEFAULT_VERSION_INTERIM=0
-DEFAULT_VERSION_UPDATE=8
+DEFAULT_VERSION_UPDATE=7
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2020-07-14
+DEFAULT_VERSION_DATE=2020-04-14
 DEFAULT_VERSION_CLASSFILE_MAJOR=55  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="10 11"
@@ -45,9 +44,6 @@ PRODUCT_SUFFIX="Runtime Environment"
 JDK_RC_PLATFORM_NAME=Platform
 COMPANY_NAME=N/A
 HOTSPOT_VM_DISTRO="OpenJDK"
-VENDOR_URL=https://openjdk.java.net/
-VENDOR_URL_BUG=https://bugreport.java.com/bugreport/
-VENDOR_URL_VM_BUG=https://bugreport.java.com/bugreport/crash.jsp
 
 # Might need better names for these
 MACOSX_BUNDLE_NAME_BASE="OpenJDK"

make/common/JdkNativeCompilation.gmk

@@ -47,8 +47,7 @@ FindSrcDirsForComponent += \
       $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/$(strip $2) \
       $(TOPDIR)/src/$(strip $1)/share/native/$(strip $2)))
 
-# Find a library. Used for declaring dependencies on libraries in different
-# modules.
+# Find a library
 # Param 1 - module name
 # Param 2 - library name
 # Param 3 - optional subdir for library
@@ -70,12 +69,6 @@ ifeq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
   FindLib =
   FindStaticLib =
 endif
-# If building static versions of libraries, make these return empty to avoid
-# declaring dependencies.
-ifeq ($(STATIC_LIBS), true)
-  FindLib =
-  FindStaticLib =
-endif
 
 GetJavaHeaderDir = \
   $(wildcard $(SUPPORT_OUTPUTDIR)/headers/$(strip $1))

make/common/Modules.gmk

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

make/common/NativeCompilation.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, 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
@@ -268,19 +268,6 @@ else
   endif
 endif
 
-################################################################################
-# GetEntitlementsFile
-# Find entitlements file for executable when signing on macosx. If no
-# specialized file is found, returns the default file.
-# $1 Executable to find entitlements file for.
-ENTITLEMENTS_DIR := $(TOPDIR)/make/data/macosxsigning
-DEFAULT_ENTITLEMENTS_FILE := $(ENTITLEMENTS_DIR)/default.plist
-
-GetEntitlementsFile = \
-    $(foreach f, $(ENTITLEMENTS_DIR)/$(strip $(notdir $1)).plist, \
-      $(if $(wildcard $f), $f, $(DEFAULT_ENTITLEMENTS_FILE)) \
-    )
-
 ################################################################################
 # Create the recipe needed to compile a single native source file.
 #
@@ -518,28 +505,6 @@ define SetupNativeCompilationBody
     endif
   endif
 
-  $$(call SetIfEmpty, $1_COMPILE_WITH_DEBUG_SYMBOLS, $$(COMPILE_WITH_DEBUG_SYMBOLS))
-
-  # STATIC_LIBS is set from Main.gmk when building static versions of certain
-  # native libraries.
-  ifeq ($(STATIC_LIBS), true)
-    $1_TYPE := STATIC_LIBRARY
-    # The static versions need to be redirected to different output dirs, both
-    # to not interfere with the main build as well as to not end up inside the
-    # jmods.
-    $1_OBJECT_DIR := $$($1_OBJECT_DIR)/static
-    $1_OUTPUT_DIR := $$($1_OBJECT_DIR)
-    # For release builds where debug symbols are configured to be moved to
-    # separate debuginfo files, disable debug symbols for static libs instead.
-    # We don't currently support this configuration and we don't want symbol
-    # information in release builds unless explicitly asked to provide it.
-    ifeq ($(DEBUG_LEVEL), release)
-      ifeq ($(COPY_DEBUG_SYMBOLS), true)
-        $1_COMPILE_WITH_DEBUG_SYMBOLS := false
-      endif
-    endif
-  endif
-
   ifeq ($$($1_TYPE), EXECUTABLE)
     $1_PREFIX :=
     ifeq ($$($1_SUFFIX), )
@@ -678,9 +643,6 @@ define SetupNativeCompilationBody
     $1_EXTRA_CFLAGS += $$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release)
     $1_EXTRA_CFLAGS += $$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_release)
   endif
-  ifeq ($(STATIC_LIBS), true)
-    $1_EXTRA_CFLAGS += $$(STATIC_LIBS_CFLAGS)
-  endif
 
   # Pickup extra OPENJDK_TARGET_OS_TYPE and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS.
   $1_EXTRA_CXXFLAGS := $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS))
@@ -694,9 +656,6 @@ define SetupNativeCompilationBody
     $1_EXTRA_CXXFLAGS += $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_TYPE)_release)
     $1_EXTRA_CXXFLAGS += $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
   endif
-  ifeq ($(STATIC_LIBS), true)
-    $1_EXTRA_CXXFLAGS += $$(STATIC_LIB_CFLAGS)
-  endif
 
   # If no C++ flags are explicitly set, default to using the C flags.
   # After that, we can set additional C++ flags that should not interfere
@@ -708,7 +667,7 @@ define SetupNativeCompilationBody
     $1_EXTRA_CXXFLAGS := $$($1_EXTRA_CFLAGS)
   endif
 
-  ifeq ($$($1_COMPILE_WITH_DEBUG_SYMBOLS), true)
+  ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true)
     $1_EXTRA_CFLAGS += $$(CFLAGS_DEBUG_SYMBOLS)
     $1_EXTRA_CXXFLAGS += $$(CFLAGS_DEBUG_SYMBOLS)
     $1_EXTRA_ASFLAGS += $$(ASFLAGS_DEBUG_SYMBOLS)
@@ -976,9 +935,6 @@ define SetupNativeCompilationBody
         ifeq ($(OPENJDK_TARGET_OS), windows)
           $1_EXTRA_LDFLAGS += -debug "-pdb:$$($1_OUTPUT_DIR)/$$($1_NOSUFFIX).pdb" \
               "-map:$$($1_OUTPUT_DIR)/$$($1_NOSUFFIX).map"
-          ifeq ($(SHIP_DEBUG_SYMBOLS), public)
-            $1_EXTRA_LDFLAGS += "-pdbstripped:$$($1_OUTPUT_DIR)/$$($1_NOSUFFIX).stripped.pdb"
-          endif
           $1_DEBUGINFO_FILES := $$($1_OUTPUT_DIR)/$$($1_NOSUFFIX).pdb \
               $$($1_OUTPUT_DIR)/$$($1_NOSUFFIX).map
 
@@ -1190,7 +1146,7 @@ define SetupNativeCompilationBody
                 # silently fail otherwise.
                 ifneq ($(CODESIGN), )
 		  $(CODESIGN) -s "$(MACOSX_CODESIGN_IDENTITY)" --timestamp --options runtime \
-		      --entitlements $$(call GetEntitlementsFile, $$@) $$@
+		  --entitlements $(TOPDIR)/make/data/macosxsigning/entitlements.plist $$@
                 endif
   endif
 

make/conf/jib-profiles.js

@@ -240,7 +240,7 @@ var getJibProfilesCommon = function (input, data) {
     // These are the base setttings for all the main build profiles.
     common.main_profile_base = {
         dependencies: ["boot_jdk", "gnumake", "jtreg", "jib", "autoconf"],
-        default_make_targets: ["product-bundles", "test-bundles", "static-libs-bundles"],
+        default_make_targets: ["product-bundles", "test-bundles"],
         configure_args: concat(["--enable-jtreg-failure-handler"],
             "--with-exclude-translations=de,es,fr,it,ko,pt_BR,sv,ca,tr,cs,sk,ja_JP_A,ja_JP_HA,ja_JP_HI,ja_JP_I,zh_TW,zh_HK",
             "--disable-manpages",
@@ -312,14 +312,6 @@ var getJibProfilesCommon = function (input, data) {
                     subdir: jdk_subdir,
                     exploded: "images/jdk"
                 },
-                static_libs: {
-                    local: "bundles/\\(jdk.*bin-static-libs.tar.gz\\)",
-                    remote: [
-                        "bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-static-libs.tar.gz",
-                        "bundles/" + pf + "/\\1"
-                    ],
-                    subdir: jdk_subdir,
-                },
             }
         };
     };
@@ -361,14 +353,6 @@ var getJibProfilesCommon = function (input, data) {
                     subdir: jdk_subdir,
                     exploded: "images/jdk"
                 },
-                static_libs: {
-                    local: "bundles/\\(jdk.*bin-static-libs-debug.tar.gz\\)",
-                    remote: [
-                        "bundles/" + pf + "/jdk-" + data.version + "_" + pf + "_bin-static-libs-debug.tar.gz",
-                        "bundles/" + pf + "/\\1"
-                    ],
-                    subdir: jdk_subdir,
-                },
             }
         };
     };
@@ -857,7 +841,7 @@ var getJibProfilesDependencies = function (input, common) {
         macosx_x64: "Xcode9.4-MacOSX10.13+1.0",
         solaris_x64: "SS12u4-Solaris11u1+1.0",
         solaris_sparcv9: "SS12u4-Solaris11u1+1.1",
-        windows_x64: "VS2017-15.9.16+1.0",
+        windows_x64: "VS2017-15.5.5+1.0",
         linux_aarch64: (input.profile != null && input.profile.indexOf("arm64") >= 0
                     ? "gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux+1.0"
                     : "gcc7.3.0-Fedora27+1.1"),

make/data/cacerts/addtrustclass1ca

@@ -0,0 +1,31 @@
+Owner: CN=AddTrust Class 1 CA Root, OU=AddTrust TTP Network, O=AddTrust AB, C=SE
+Issuer: CN=AddTrust Class 1 CA Root, OU=AddTrust TTP Network, O=AddTrust AB, C=SE
+Serial number: 1
+Valid from: Tue May 30 10:38:31 GMT 2000 until: Sat May 30 10:38:31 GMT 2020
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw
+MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD
+VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul
+CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n
+tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl
+dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch
+PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC
++Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O
+BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E
+BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl
+MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk
+ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X
+7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz
+43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
+eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl
+pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA
+WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
+-----END CERTIFICATE-----

make/data/cacerts/keynectisrootca

@@ -0,0 +1,30 @@
+Owner: CN=KEYNECTIS ROOT CA, OU=ROOT, O=KEYNECTIS, C=FR
+Issuer: CN=KEYNECTIS ROOT CA, OU=ROOT, O=KEYNECTIS, C=FR
+Serial number: 1121bc276c5547af584eefd4ced629b2a285
+Valid from: Tue May 26 00:00:00 GMT 2009 until: Tue May 26 00:00:00 GMT 2020
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIID5TCCAs2gAwIBAgISESG8J2xVR69YTu/UztYpsqKFMA0GCSqGSIb3DQEBCwUA
+MEwxCzAJBgNVBAYTAkZSMRIwEAYDVQQKEwlLRVlORUNUSVMxDTALBgNVBAsTBFJP
+T1QxGjAYBgNVBAMTEUtFWU5FQ1RJUyBST09UIENBMB4XDTA5MDUyNjAwMDAwMFoX
+DTIwMDUyNjAwMDAwMFowTDELMAkGA1UEBhMCRlIxEjAQBgNVBAoTCUtFWU5FQ1RJ
+UzENMAsGA1UECxMEUk9PVDEaMBgGA1UEAxMRS0VZTkVDVElTIFJPT1QgQ0EwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDG/bMXhaGtJhuVaTUhPaSI+t7b
+YDZAF2nCFGP7uNnCdBU3LpzQIM1pjYQyooVMFLSb8iWzVCqDPy2+D/M7ZNH/oFDv
+d087TuE/C2SFmrpYftLDYtNkJaLUspc8d11jKjOS/M2CDZtUlYf1teuMzVvRyjAv
+yYhGtc0NEbQYj+7RoT5dFegoz9/DkJtszNEMRXezOuuKkB3pr2RqiXupPUN0+uRn
+IqH73E3E9WLJyiW0yYBgM6nde6ACv5YlCl7JXyl7tBeBi22BGdDZg1wFj0FpGmlD
+gJ+or+DpjJGLJyuiJmDND/KkowKDjhiBwheKQxX5bfMdEKRanERhIyF62PvRAgMB
+AAGjgcAwgb0wEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8EBAMCAQYwVwYD
+VR0fBFAwTjBMoEqgSIZGaHR0cDovL3RydXN0Y2VudGVyLWNybC5jZXJ0aWZpY2F0
+Mi5jb20vS2V5bmVjdGlzL0tFWU5FQ1RJU19ST09UX0NBLmNybDAdBgNVHQ4EFgQU
+77cjl9CokX+mz6YhwDSfzHdB4dAwHwYDVR0jBBgwFoAU77cjl9CokX+mz6YhwDSf
+zHdB4dAwDQYJKoZIhvcNAQELBQADggEBABoxaZlCwuVAhaKfksNj1I8hOagZIf56
+/MNNQPMr6EusW0xZk8bcfguvfF+VhWu9x2+6wb74xjpnS5PGBWk+JC3wG5HGPj/s
+QhiTbAMkim75IGcrfG2rNMkqIjMN132P7tI2ZELINZpuGWHLjWfwaKfQJAXmwxe6
+Ra58Q7WAeANNIHMF/EMQnTVpQnWUJYIrpjuQGN7Bqa/zLZW/lafPGJfhWeKirxoW
+YQ33E3FTkzf9PK8AHWyLFK9Gloy2UnzMLU7N4elLCu6a/nqY5ym6G9ocutxrzQQO
+JkCp63M8/lCoESdVvduOS+9PGO0V/72GmGbumiVxNGxQ8bJRy2adTSk=
+-----END CERTIFICATE-----

make/data/charsetmapping/IBM943.c2b

@@ -1,49 +0,0 @@
-#
-#    source: 34B003AF.RPMAP130
-#    c->b only entries
-#
-815C	2015
-8160	FF5E
-8161	2225
-817C	FF0D
-88A0	555E
-898B	7130
-89A8	9DD7
-8A9A	5699
-8BA0	4FE0
-8BEB	8EC0
-8C71	7E6B
-8C74	8346
-8CB2	9E7C
-8D8D	9EB4
-8DF2	6805
-8EC6	5C62
-8F4A	7E61
-8FD3	8523
-8FDD	91AC
-90E4	87EC
-917E	6414
-9189	7626
-91CB	9A52
-925C	7C1E
-92CD	6451
-9355	5861
-935E	985A
-9398	79B1
-93C0	7006
-9458	56CA
-948D	525D
-94AC	6F51
-94AE	91B1
-966A	9830
-96CB	9EB5
-9789	840A
-9858	881F
-9BA0	5C5B
-9DB7	6522
-9E94	688E
-E379	7E48
-E445	8141
-E8F6	9839
-FA55	FFE4
-FA59	F86F

make/data/charsetmapping/charsets

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
@@ -282,7 +282,6 @@ charset ISO-8859-16 ISO_8859_16
     alias   iso-ir-226
     alias   ISO_8859-16:2001
     alias   ISO_8859-16
-    alias   ISO8859_16
     alias   latin10
     alias   l10
     alias   csISO885916
@@ -703,7 +702,7 @@ charset x-euc-jp-linux EUC_JP_LINUX
 charset x-eucJP-Open EUC_JP_Open
     package sun.nio.cs.ext
     type    template
-    hisname EUC_JP_Solaris
+    hisname EUC_JP_Solari
     ascii   true
     alias   EUC_JP_Solaris       # JDK historical
     alias   eucJP-open
@@ -1397,7 +1396,7 @@ charset x-IBM833 IBM833
 
 charset x-IBM834 IBM834 # EBCDIC DBCS-only Korean
     package sun.nio.cs.ext
-    type    template
+    type    source
     alias   cp834
     alias   ibm834
     alias   834
@@ -1491,7 +1490,7 @@ charset x-IBM949 IBM949
 
 charset x-IBM949C IBM949C
     package sun.nio.cs.ext
-    type    template
+    type    source
     alias   cp949C              # JDK historical
     alias   ibm949C
     alias   ibm-949C

make/data/macosxsigning/java.plist

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>com.apple.security.cs.allow-jit</key>
-    <true/>
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
-    <key>com.apple.security.cs.disable-library-validation</key>
-    <true/>
-    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
-    <true/>
-    <key>com.apple.security.cs.debugger</key>
-    <true/>
-    <key>com.apple.security.device.audio-input</key>
-    <true/>
-</dict>
-</plist>

make/data/macosxsigning/jspawnhelper.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
-    <true/>
-  </dict>
-</plist>

make/data/tzdata/VERSION

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

make/data/tzdata/africa

@@ -890,25 +890,19 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
 # Morocco will be on GMT starting from Sunday, May 5th 2019 at 3am.
 # The switch to GMT+1 will occur on Sunday, June 9th 2019 at 2am....
 # http://fr.le360.ma/societe/voici-la-date-du-retour-a-lheure-legale-au-maroc-188222
-
-# From Semlali Naoufal (2020-04-14):
-# Following the announcement by the Moroccan government, the switch to
-# GMT time will take place on Sunday, April 19, 2020 from 3 a.m. and
-# the return to GMT+1 time will take place on Sunday, May 31, 2020 at 2 a.m....
-# https://maroc-diplomatique.net/maroc-le-retour-a-lheure-gmt-est-prevu-dimanche-prochain/
-# http://aujourdhui.ma/actualite/gmt1-retour-a-lheure-normale-dimanche-prochain-1
 #
-# From Paul Eggert (2020-04-14):
-# For now, guess that in the future Morocco will fall back at 03:00
-# the last Sunday before Ramadan, and spring forward at 02:00 the
-# first Sunday after the day after Ramadan.  To implement this,
-# transition dates for 2021 through 2087 were determined by running
-# the following program under GNU Emacs 26.3.
-# (let ((islamic-year 1442))
+# From Paul Eggert (2019-05-20):
+# This agrees with our 2018-11-01 guess that the Moroccan government
+# would continue the practice of falling back at 03:00 the last Sunday
+# before Ramadan, and of springing forward at 02:00 the first Sunday after
+# Ramadan, as this has been the practice since 2012.  To implement this,
+# transition dates for 2019 through 2087 were determined by running the
+# following program under GNU Emacs 26.2.
+# (let ((islamic-year 1440))
 #   (require 'cal-islam)
 #   (while (< islamic-year 1511)
 #     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
-#           (b (1+ (calendar-islamic-to-absolute (list 10 1 islamic-year))))
+#           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
 #           (sunday 0))
 #       (while (/= sunday (mod (setq a (1- a)) 7)))
 #       (while (/= sunday (mod b 7))
@@ -968,7 +962,7 @@ Rule	Morocco	2018	only	-	Jun	17	 2:00	1:00	-
 Rule	Morocco	2019	only	-	May	 5	 3:00	-1:00	-
 Rule	Morocco	2019	only	-	Jun	 9	 2:00	0	-
 Rule	Morocco	2020	only	-	Apr	19	 3:00	-1:00	-
-Rule	Morocco	2020	only	-	May	31	 2:00	0	-
+Rule	Morocco	2020	only	-	May	24	 2:00	0	-
 Rule	Morocco	2021	only	-	Apr	11	 3:00	-1:00	-
 Rule	Morocco	2021	only	-	May	16	 2:00	0	-
 Rule	Morocco	2022	only	-	Mar	27	 3:00	-1:00	-
@@ -984,7 +978,7 @@ Rule	Morocco	2026	only	-	Mar	22	 2:00	0	-
 Rule	Morocco	2027	only	-	Feb	 7	 3:00	-1:00	-
 Rule	Morocco	2027	only	-	Mar	14	 2:00	0	-
 Rule	Morocco	2028	only	-	Jan	23	 3:00	-1:00	-
-Rule	Morocco	2028	only	-	Mar	 5	 2:00	0	-
+Rule	Morocco	2028	only	-	Feb	27	 2:00	0	-
 Rule	Morocco	2029	only	-	Jan	14	 3:00	-1:00	-
 Rule	Morocco	2029	only	-	Feb	18	 2:00	0	-
 Rule	Morocco	2029	only	-	Dec	30	 3:00	-1:00	-
@@ -1000,7 +994,7 @@ Rule	Morocco	2033	only	-	Dec	25	 2:00	0	-
 Rule	Morocco	2034	only	-	Nov	 5	 3:00	-1:00	-
 Rule	Morocco	2034	only	-	Dec	17	 2:00	0	-
 Rule	Morocco	2035	only	-	Oct	28	 3:00	-1:00	-
-Rule	Morocco	2035	only	-	Dec	 9	 2:00	0	-
+Rule	Morocco	2035	only	-	Dec	 2	 2:00	0	-
 Rule	Morocco	2036	only	-	Oct	19	 3:00	-1:00	-
 Rule	Morocco	2036	only	-	Nov	23	 2:00	0	-
 Rule	Morocco	2037	only	-	Oct	 4	 3:00	-1:00	-
@@ -1016,7 +1010,7 @@ Rule	Morocco	2041	only	-	Sep	29	 2:00	0	-
 Rule	Morocco	2042	only	-	Aug	10	 3:00	-1:00	-
 Rule	Morocco	2042	only	-	Sep	21	 2:00	0	-
 Rule	Morocco	2043	only	-	Aug	 2	 3:00	-1:00	-
-Rule	Morocco	2043	only	-	Sep	13	 2:00	0	-
+Rule	Morocco	2043	only	-	Sep	 6	 2:00	0	-
 Rule	Morocco	2044	only	-	Jul	24	 3:00	-1:00	-
 Rule	Morocco	2044	only	-	Aug	28	 2:00	0	-
 Rule	Morocco	2045	only	-	Jul	 9	 3:00	-1:00	-
@@ -1032,7 +1026,7 @@ Rule	Morocco	2049	only	-	Jul	 4	 2:00	0	-
 Rule	Morocco	2050	only	-	May	15	 3:00	-1:00	-
 Rule	Morocco	2050	only	-	Jun	26	 2:00	0	-
 Rule	Morocco	2051	only	-	May	 7	 3:00	-1:00	-
-Rule	Morocco	2051	only	-	Jun	18	 2:00	0	-
+Rule	Morocco	2051	only	-	Jun	11	 2:00	0	-
 Rule	Morocco	2052	only	-	Apr	28	 3:00	-1:00	-
 Rule	Morocco	2052	only	-	Jun	 2	 2:00	0	-
 Rule	Morocco	2053	only	-	Apr	13	 3:00	-1:00	-
@@ -1048,7 +1042,7 @@ Rule	Morocco	2057	only	-	Apr	 8	 2:00	0	-
 Rule	Morocco	2058	only	-	Feb	17	 3:00	-1:00	-
 Rule	Morocco	2058	only	-	Mar	31	 2:00	0	-
 Rule	Morocco	2059	only	-	Feb	 9	 3:00	-1:00	-
-Rule	Morocco	2059	only	-	Mar	23	 2:00	0	-
+Rule	Morocco	2059	only	-	Mar	16	 2:00	0	-
 Rule	Morocco	2060	only	-	Feb	 1	 3:00	-1:00	-
 Rule	Morocco	2060	only	-	Mar	 7	 2:00	0	-
 Rule	Morocco	2061	only	-	Jan	16	 3:00	-1:00	-
@@ -1058,13 +1052,13 @@ Rule	Morocco	2062	only	-	Feb	12	 2:00	0	-
 Rule	Morocco	2062	only	-	Dec	31	 3:00	-1:00	-
 Rule	Morocco	2063	only	-	Feb	 4	 2:00	0	-
 Rule	Morocco	2063	only	-	Dec	16	 3:00	-1:00	-
-Rule	Morocco	2064	only	-	Jan	27	 2:00	0	-
+Rule	Morocco	2064	only	-	Jan	20	 2:00	0	-
 Rule	Morocco	2064	only	-	Dec	 7	 3:00	-1:00	-
 Rule	Morocco	2065	only	-	Jan	11	 2:00	0	-
 Rule	Morocco	2065	only	-	Nov	22	 3:00	-1:00	-
 Rule	Morocco	2066	only	-	Jan	 3	 2:00	0	-
 Rule	Morocco	2066	only	-	Nov	14	 3:00	-1:00	-
-Rule	Morocco	2066	only	-	Dec	26	 2:00	0	-
+Rule	Morocco	2066	only	-	Dec	19	 2:00	0	-
 Rule	Morocco	2067	only	-	Nov	 6	 3:00	-1:00	-
 Rule	Morocco	2067	only	-	Dec	11	 2:00	0	-
 Rule	Morocco	2068	only	-	Oct	21	 3:00	-1:00	-
@@ -1074,13 +1068,13 @@ Rule	Morocco	2069	only	-	Nov	17	 2:00	0	-
 Rule	Morocco	2070	only	-	Oct	 5	 3:00	-1:00	-
 Rule	Morocco	2070	only	-	Nov	 9	 2:00	0	-
 Rule	Morocco	2071	only	-	Sep	20	 3:00	-1:00	-
-Rule	Morocco	2071	only	-	Nov	 1	 2:00	0	-
+Rule	Morocco	2071	only	-	Oct	25	 2:00	0	-
 Rule	Morocco	2072	only	-	Sep	11	 3:00	-1:00	-
 Rule	Morocco	2072	only	-	Oct	16	 2:00	0	-
 Rule	Morocco	2073	only	-	Aug	27	 3:00	-1:00	-
 Rule	Morocco	2073	only	-	Oct	 8	 2:00	0	-
 Rule	Morocco	2074	only	-	Aug	19	 3:00	-1:00	-
-Rule	Morocco	2074	only	-	Sep	30	 2:00	0	-
+Rule	Morocco	2074	only	-	Sep	23	 2:00	0	-
 Rule	Morocco	2075	only	-	Aug	11	 3:00	-1:00	-
 Rule	Morocco	2075	only	-	Sep	15	 2:00	0	-
 Rule	Morocco	2076	only	-	Jul	26	 3:00	-1:00	-
@@ -1090,7 +1084,7 @@ Rule	Morocco	2077	only	-	Aug	22	 2:00	0	-
 Rule	Morocco	2078	only	-	Jul	10	 3:00	-1:00	-
 Rule	Morocco	2078	only	-	Aug	14	 2:00	0	-
 Rule	Morocco	2079	only	-	Jun	25	 3:00	-1:00	-
-Rule	Morocco	2079	only	-	Aug	 6	 2:00	0	-
+Rule	Morocco	2079	only	-	Jul	30	 2:00	0	-
 Rule	Morocco	2080	only	-	Jun	16	 3:00	-1:00	-
 Rule	Morocco	2080	only	-	Jul	21	 2:00	0	-
 Rule	Morocco	2081	only	-	Jun	 1	 3:00	-1:00	-
@@ -1106,7 +1100,7 @@ Rule	Morocco	2085	only	-	May	27	 2:00	0	-
 Rule	Morocco	2086	only	-	Apr	14	 3:00	-1:00	-
 Rule	Morocco	2086	only	-	May	19	 2:00	0	-
 Rule	Morocco	2087	only	-	Mar	30	 3:00	-1:00	-
-Rule	Morocco	2087	only	-	May	11	 2:00	0	-
+Rule	Morocco	2087	only	-	May	 4	 2:00	0	-
 # For dates after the somewhat-arbitrary cutoff of 2087, assume that
 # Morocco will no longer observe DST.  At some point this table will
 # need to be extended, though quite possibly Morocco will change the
@@ -1208,7 +1202,7 @@ Link Africa/Maputo Africa/Lusaka	# Zambia
 Rule	Namibia	1994	only	-	Mar	21	0:00	-1:00	WAT
 Rule	Namibia	1994	2017	-	Sep	Sun>=1	2:00	0	CAT
 Rule	Namibia	1995	2017	-	Apr	Sun>=1	2:00	-1:00	WAT
-# Rearguard section, for parsers lacking negative DST; see ziguard.awk.
+# Rearguard section, for parsers that do not support negative DST.
 #Rule	Namibia	1994	only	-	Mar	21	0:00	0	WAT
 #Rule	Namibia	1994	2017	-	Sep	Sun>=1	2:00	1:00	CAT
 #Rule	Namibia	1995	2017	-	Apr	Sun>=1	2:00	0	WAT
@@ -1222,7 +1216,7 @@ Zone	Africa/Windhoek	1:08:24 -	LMT	1892 Feb 8
 			2:00	-	SAST	1990 Mar 21 # independence
 # Vanguard section, for zic and other parsers that support negative DST.
 			2:00	Namibia	%s
-# Rearguard section, for parsers lacking negative DST; see ziguard.awk.
+# Rearguard section, for parsers that do not support negative DST.
 #			2:00	-	CAT	1994 Mar 21  0:00
 # From Paul Eggert (2017-04-07):
 # The official date of the 2017 rule change was 2017-10-24.  See:

make/data/tzdata/asia

@@ -309,27 +309,6 @@ Zone	Asia/Yangon	6:24:47 -	LMT	1880        # or Rangoon
 
 # China
 
-# From Phake Nick (2020-04-15):
-# According to this news report:
-# http://news.sina.com.cn/c/2004-09-01/19524201403.shtml
-# on April 11, 1919, newspaper in Shanghai said clocks in Shanghai will spring
-# forward for an hour starting from midnight of that Saturday. The report did
-# not mention what happened in Shanghai thereafter, but it mentioned that a
-# similar trial in Tianjin which ended at October 1st as citizens are told to
-# recede the clock on September 30 from 12:00pm to 11:00pm. The trial at
-# Tianjin got terminated in 1920.
-#
-# From Paul Eggert (2020-04-15):
-# The Returns of Trade and Trade Reports, page 711, says "Daylight saving was
-# given a trial during the year, and from the 12th April to the 1st October
-# the clocks were all set one hour ahead of sun time.  Though the scheme was
-# generally esteemed a success, it was announced early in 1920 that it would
-# not be repeated."
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Shang	1919	only	-	Apr	12	24:00	1:00	D
-Rule	Shang	1919	only	-	Sep	30	24:00	0	S
-
 # From Paul Eggert (2018-10-02):
 # The following comes from Table 1 of:
 # Li Yu. Research on the daylight saving movement in 1940s Shanghai.
@@ -338,89 +317,6 @@ Rule	Shang	1919	only	-	Sep	30	24:00	0	S
 # The table lists dates only; I am guessing 00:00 and 24:00 transition times.
 # Also, the table lists the planned end of DST in 1949, but the corresponding
 # zone line cuts this off on May 28, when the Communists took power.
-
-# From Phake Nick (2020-04-15):
-#
-# For the history of time in Shanghai between 1940-1942, the situation is
-# actually slightly more complex than the table [below]....  At the time,
-# there were three different authorities in Shanghai, including Shanghai
-# International Settlement, a settlement established by western countries with
-# its own westernized form of government, Shanghai French Concession, similar
-# to the international settlement but is controlled by French, and then the
-# rest of the city of Shanghai, which have already been controlled by Japanese
-# force through a puppet local government (Wang Jingwei regime).  It was
-# additionally complicated by the circumstances that, according to the 1940s
-# Shanghai summer time essay cited in the database, some
-# departments/businesses/people in the Shanghai city itself during that time
-# period, refused to change their clock and instead only changed their opening
-# hours.
-#
-# For example, as quoted in the article, in 1940, other than the authority
-# itself, power, tram, bus companies, cinema, department stores, and other
-# public service organizations have all decided to follow the summer time and
-# spring forward the clock.  On the other hand, the custom office refused to
-# spring forward the clock because of worry on mechanical wear to the physical
-# clock, postal office refused to spring forward because of disruption to
-# business and log-keeping, although they did changed their office hour to
-# match rest of the city.  So is travel agents, and also weather
-# observatory.  It is said both time standards had their own supporters in the
-# city at the time, those who prefer new time standard would have moved their
-# clock while those who prefer the old time standard would keep their clock
-# unchange, and there were different clocks that use different time standard
-# in the city at the time for people who use different time standard to adjust
-# their clock to their preferred time.
-#
-# a. For the 1940 May 31 spring forward, the essay claim that it was
-# coordinared between the international settlement authority and the French
-# concession authority and have gathered support from Hong Kong and Xiamen,
-# that it would spring forward an hour from May 31 "midnight", and the essay
-# claim "Hong Kong government implemented the spring forward in the same time
-# on the same date as Shanghai".
-#
-# b. For the 1940 fall back, it was said that they initially intended to do
-# so on September 30 00:59 at night, however they postponed it to October 12
-# after discussion with relevant parties. However schools restored to the
-# original schedule ten days earlier.
-#
-# c. For the 1941 spring forward, it is said to start from March 15
-# "following the previous year's method", and in addition to that the essay
-# cited an announcement in 1941 from the Wang regime which said the Special
-# City of Shanghai under Wang regime control will follow the DST rule set by
-# the Settlements, irrespective of the original DST plan announced by the Wang
-# regime for other area under its control(April 1 to September 30). (no idea
-# to situation before that announcement)
-#
-# d. For the 1941 fall back, it was said that the fall back would occurs at
-# the end of September (A newspaper headline cited by the essay, published on
-# October 1, 1941, have the headlines which said "French Concession would
-# rewind to the old clock this morning), but it ultimately didn't happen due
-# to disagreement between the international settlement authority and the
-# French concession authority, and the fall back ultimately occurred on
-# November 1.
-#
-# e. In 1941 December, Japan have officially started war with the United
-# States and the United Kingdom, and in Shanghai they have marched into the
-# international settlement, taken over its control
-#
-# f. For the 1942 spring forward, the essay said that the spring forward
-# started on January 31. It said this time the custom office and postal
-# department will also change their clocks, unlike before.
-#
-# g. The essay itself didn't cover any specific changes thereafter until the
-# end of the war, it quoted a November 1942 command from the government of the
-# Wang regime, which claim the daylight saving time applies year round during
-# the war. However, the essay ambiguously said the period is "February 1 to
-# September 30", which I don't really understand what is the meaning of such
-# period in the context of year round implementation here.. More researches
-# might be needed to show exactly what happened during that period of time.
-
-# From Phake Nick (2020-04-15):
-# According to a Japanese tour bus pamphlet in Nanjing area believed to be
-# from around year 1941: http://www.tt-museum.jp/tairiku_0280_nan1941.html ,
-# the schedule listed was in the format of Japanese time.  Which indicate some
-# use of the Japanese time (instead of syncing by DST) might have occurred in
-# the Yangtze river delta area during that period of time although the scope
-# of such use will need to be investigated to determine.
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Shang	1940	only	-	Jun	 1	 0:00	1:00	D
@@ -699,7 +595,7 @@ Zone	Asia/Urumqi	5:50:20	-	LMT	1928
 			6:00	-	+06
 
 
-# Hong Kong
+# Hong Kong (Xianggang)
 
 # Milne gives 7:36:41.7; round this.
 
@@ -709,7 +605,9 @@ Zone	Asia/Urumqi	5:50:20	-	LMT	1928
 # it is not [an] observatory, but the official meteorological agency of HK,
 # and also serves as the official timing agency), there are some missing
 # and incorrect rules. Although the exact switch over time is missing, I
-# think 3:30 is correct.
+# think 3:30 is correct. The official DST record for Hong Kong can be
+# obtained from
+# http://www.hko.gov.hk/gts/time/Summertime.htm
 
 # From Phake Nick (2018-10-27):
 # According to Singaporean newspaper
@@ -820,10 +718,10 @@ Zone	Asia/Urumqi	5:50:20	-	LMT	1928
 #   Resolution of the Legislative Council passed on 9 May 1979
 #	https://www.legco.gov.hk/yr78-79/english/lc_sitg/hansard/h790509.pdf#page=39
 
-# From Paul Eggert (2020-04-15):
+# From Paul Eggert (2019-05-31):
 # Here are the dates given at
-# https://www.hko.gov.hk/en/gts/time/Summertime.htm
-# as of 2020-02-10:
+# https://www.hko.gov.hk/gts/time/Summertime.htm
+# as of 2014-06-19:
 # Year        Period
 # 1941        15 Jun to 30 Sep
 # 1942        Whole year
@@ -1953,47 +1851,6 @@ Zone	Asia/Jerusalem	2:20:54 -	LMT	1880
 
 # '9:00' and 'JST' is from Guy Harris.
 
-# From Paul Eggert (2020-01-19):
-# Starting in the 7th century, Japan generally followed an ancient Chinese
-# timekeeping system that divided night and day into six hours each,
-# with hour length depending on season.  In 1873 the government
-# started requiring the use of a Western style 24-hour clock.  See:
-# Yulia Frumer, "Making Time: Astronomical Time Measurement in Tokugawa Japan"
-# <https://www.worldcat.org/oclc/1043907065>.  As the tzdb code and
-# data support only 24-hour clocks, its tables model timestamps before
-# 1873 using Western-style local mean time.
-
-# From Hideyuki Suzuki (1998-11-09):
-# 'Tokyo' usually stands for the former location of Tokyo Astronomical
-# Observatory: 139° 44' 40.90" E (9h 18m 58.727s), 35° 39' 16.0" N.
-# This data is from 'Rika Nenpyou (Chronological Scientific Tables) 1996'
-# edited by National Astronomical Observatory of Japan....
-# JST (Japan Standard Time) has been used since 1888-01-01 00:00 (JST).
-# The law is enacted on 1886-07-07.
-
-# From Hideyuki Suzuki (1998-11-16):
-# The ordinance No. 51 (1886) established "standard time" in Japan,
-# which stands for the time on 135° E.
-# In the ordinance No. 167 (1895), "standard time" was renamed to "central
-# standard time".  And the same ordinance also established "western standard
-# time", which stands for the time on 120° E....  But "western standard
-# time" was abolished in the ordinance No. 529 (1937).  In the ordinance No.
-# 167, there is no mention regarding for what place western standard time is
-# standard....
-#
-# I wrote "ordinance" above, but I don't know how to translate.
-# In Japanese it's "chokurei", which means ordinance from emperor.
-
-# From Yu-Cheng Chuang (2013-07-12):
-# ...the Meiji Emperor announced Ordinance No. 167 of Meiji Year 28 "The clause
-# about standard time" ... The adoption began from Jan 1, 1896.
-# https://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時)
-#
-# ...the Showa Emperor announced Ordinance No. 529 of Showa Year 12 ... which
-# means the whole Japan territory, including later occupations, adopt Japan
-# Central Time (UT+9). The adoption began on Oct 1, 1937.
-# https://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
-
 # From Paul Eggert (1995-03-06):
 # Today's _Asahi Evening News_ (page 4) reports that Japan had
 # daylight saving between 1948 and 1951, but "the system was discontinued
@@ -2042,6 +1899,37 @@ Rule	Japan	1948	1951	-	Sep	Sat>=8	25:00	0	S
 Rule	Japan	1949	only	-	Apr	Sat>=1	24:00	1:00	D
 Rule	Japan	1950	1951	-	May	Sat>=1	24:00	1:00	D
 
+# From Hideyuki Suzuki (1998-11-09):
+# 'Tokyo' usually stands for the former location of Tokyo Astronomical
+# Observatory: 139° 44' 40.90" E (9h 18m 58.727s), 35° 39' 16.0" N.
+# This data is from 'Rika Nenpyou (Chronological Scientific Tables) 1996'
+# edited by National Astronomical Observatory of Japan....
+# JST (Japan Standard Time) has been used since 1888-01-01 00:00 (JST).
+# The law is enacted on 1886-07-07.
+
+# From Hideyuki Suzuki (1998-11-16):
+# The ordinance No. 51 (1886) established "standard time" in Japan,
+# which stands for the time on 135° E.
+# In the ordinance No. 167 (1895), "standard time" was renamed to "central
+# standard time".  And the same ordinance also established "western standard
+# time", which stands for the time on 120° E....  But "western standard
+# time" was abolished in the ordinance No. 529 (1937).  In the ordinance No.
+# 167, there is no mention regarding for what place western standard time is
+# standard....
+#
+# I wrote "ordinance" above, but I don't know how to translate.
+# In Japanese it's "chokurei", which means ordinance from emperor.
+
+# From Yu-Cheng Chuang (2013-07-12):
+# ...the Meiji Emperor announced Ordinance No. 167 of Meiji Year 28 "The clause
+# about standard time" ... The adoption began from Jan 1, 1896.
+# https://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時)
+#
+# ...the Showa Emperor announced Ordinance No. 529 of Showa Year 12 ... which
+# means the whole Japan territory, including later occupations, adopt Japan
+# Central Time (UT+9). The adoption began on Oct 1, 1937.
+# https://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
+
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tokyo	9:18:59	-	LMT	1887 Dec 31 15:00u
 			9:00	Japan	J%sT
@@ -3221,9 +3109,22 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # [T]he Palestinian cabinet decision (Mar 8th 2016) published on
 # http://www.palestinecabinet.gov.ps/WebSite/Upload/Decree/GOV_17/16032016134830.pdf
 # states that summer time will end on Oct 29th at 01:00.
+#
+# From Tim Parenti (2016-10-19):
+# Predict fall transitions on October's last Saturday at 01:00 from now on.
+# This is consistent with the 2016 transition as well as our spring
+# predictions.
+#
+# From Paul Eggert (2016-10-19):
+# It's also consistent with predictions in the following URLs today:
+# https://www.timeanddate.com/time/change/gaza-strip/gaza
+# https://www.timeanddate.com/time/change/west-bank/hebron
 
 # From Sharef Mustafa (2018-03-16):
-# Palestine summer time will start on Mar 24th 2018 ...
+# Palestine summer time will start on Mar 24th 2018 by advancing the
+# clock by 60 minutes as per Palestinian cabinet decision published on
+# the official website, though the decree did not specify the exact
+# time of the time shift.
 # http://www.palestinecabinet.gov.ps/Website/AR/NDecrees/ViewFile.ashx?ID=e7a42ab7-ee23-435a-b9c8-a4f7e81f3817
 
 # From Even Scharning (2019-03-23):
@@ -3233,20 +3134,15 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # From Sharif Mustafa (2019-03-26):
 # The Palestinian cabinet announced today that the switch to DST will
 # be on Fri Mar 29th 2019 by advancing the clock by 60 minutes.
+# The decree signing date is Mar 12th but it was not published till today.
+# The decree does not specify the exact time of switch.
 # http://palestinecabinet.gov.ps/Website/AR/NDecrees/ViewFile.ashx?ID=e54e9ea1-50ee-4137-84df-0d6c78da259b
 #
 # From Even Scharning (2019-04-10):
 # Our source in Palestine said it happened Friday 29 at 00:00 local time....
-
-# From Sharef Mustafa (2019-10-18):
-# Palestine summer time will end on midnight Oct 26th 2019 ...
-# http://www.palestinecabinet.gov.ps/website/ar/ViewDetails?ID=43948
 #
 # From Paul Eggert (2019-04-10):
 # For now, guess spring-ahead transitions are March's last Friday at 00:00.
-#
-# From Tim Parenti (2016-10-19):
-# Predict fall transitions on October's last Saturday at 01:00 from now on.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S

make/data/tzdata/backward

@@ -40,7 +40,6 @@ Link	America/Atikokan	America/Coral_Harbour
 Link	America/Argentina/Cordoba	America/Cordoba
 Link	America/Tijuana		America/Ensenada
 Link	America/Indiana/Indianapolis	America/Fort_Wayne
-Link	America/Nuuk		America/Godthab
 Link	America/Indiana/Indianapolis	America/Indianapolis
 Link	America/Argentina/Jujuy	America/Jujuy
 Link	America/Indiana/Knox	America/Knox_IN

make/data/tzdata/europe

@@ -572,13 +572,12 @@ Zone	Europe/Dublin	-0:25:00 -	LMT	1880 Aug  2
 			 0:00	1:00	IST	1947 Nov  2  2:00s
 			 0:00	-	GMT	1948 Apr 18  2:00s
 			 0:00	GB-Eire	GMT/IST	1968 Oct 27
-# Vanguard section, for zic and other parsers that support negative DST.
+# The next line is for when negative SAVE values are used.
 			 1:00	Eire	IST/GMT
-# Rearguard section, for parsers lacking negative DST; see ziguard.awk.
+# These three lines are for when SAVE values are always nonnegative.
 #			 1:00	-	IST	1971 Oct 31  2:00u
 #			 0:00	GB-Eire	GMT/IST	1996
 #			 0:00	EU	GMT/IST
-# End of rearguard section.
 
 
 ###############################################################################
@@ -1042,7 +1041,7 @@ Zone	Europe/Prague	0:57:44 -	LMT	1850
 			1:00	Czech	CE%sT	1946 Dec  1  3:00
 # Vanguard section, for zic and other parsers that support negative DST.
 			1:00	-1:00	GMT	1947 Feb 23  2:00
-# Rearguard section, for parsers lacking negative DST; see ziguard.awk.
+# Rearguard section, for parsers that do not support negative DST.
 #			0:00	-	GMT	1947 Feb 23  2:00
 # End of rearguard section.
 			1:00	Czech	CE%sT	1979
@@ -1199,17 +1198,14 @@ Zone America/Danmarkshavn -1:14:40 -	LMT	1916 Jul 28
 			-3:00	-	-03	1980 Apr  6  2:00
 			-3:00	EU	-03/-02	1996
 			0:00	-	GMT
-#
-# Use the old name Scoresbysund, as the current name Ittoqqortoormiit
-# exceeds tzdb's 14-letter limit and has no common English abbreviation.
 Zone America/Scoresbysund -1:27:52 -	LMT	1916 Jul 28 # Ittoqqortoormiit
 			-2:00	-	-02	1980 Apr  6  2:00
 			-2:00	C-Eur	-02/-01	1981 Mar 29
 			-1:00	EU	-01/+00
-Zone America/Nuuk	-3:26:56 -	LMT	1916 Jul 28 # Godthåb
+Zone America/Godthab	-3:26:56 -	LMT	1916 Jul 28 # Nuuk
 			-3:00	-	-03	1980 Apr  6  2:00
 			-3:00	EU	-03/-02
-Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pituffik
+Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pituffik air base
 			-4:00	Thule	A%sT
 
 # Estonia
@@ -1579,7 +1575,7 @@ Zone	Europe/Budapest	1:16:20 -	LMT	1890 Oct
 #
 # From January 1st, 1908 the whole of Iceland was standardised at 1 hour
 # behind GMT. Previously, local mean solar time was used in different parts
-# of Iceland, the almanak had been based on Reykjavík mean solar time which
+# of Iceland, the almanak had been based on Reykjavik mean solar time which
 # was 1 hour and 28 minutes behind GMT.
 #
 # "first day of winter" referred to [below] means the first day of the 26 weeks

make/data/tzdata/leapseconds

@@ -87,15 +87,9 @@ Leap	2012	Jun	30	23:59:60	+	S
 Leap	2015	Jun	30	23:59:60	+	S
 Leap	2016	Dec	31	23:59:60	+	S
 
-# UTC timestamp when this leap second list expires.
-# 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 2020	Dec	28	00:00:00
-
 # POSIX timestamps for the data in this file:
 #updated 1467936000 (2016-07-08 00:00:00 UTC)
-#expires 1609113600 (2020-12-28 00:00:00 UTC)
+#expires 1593302400 (2020-06-28 00:00:00 UTC)
 
-#	Updated through IERS Bulletin C59
-#	File expires on:  28 December 2020
+#	Updated through IERS Bulletin C58
+#	File expires on:  28 June 2020

make/data/tzdata/northamerica

@@ -109,7 +109,7 @@
 # For more about the first ten years of DST in the United States, see
 # Robert Garland, Ten years of daylight saving from the Pittsburgh standpoint
 # (Carnegie Library of Pittsburgh, 1927).
-# https://web.archive.org/web/20160517155308/http://www.clpgh.org/exhibit/dst.html
+# http://www.clpgh.org/exhibit/dst.html
 #
 # Shanks says that DST was called "War Time" in the US in 1918 and 1919.
 # However, DST was imposed by the Standard Time Act of 1918, which
@@ -1493,8 +1493,7 @@ Zone America/Goose_Bay	-4:01:40 -	LMT	1884 # Happy Valley-Goose Bay
 			-4:00	Canada	A%sT
 
 
-# west Labrador, Nova Scotia, Prince Edward I,
-# Îles-de-la-Madeleine, Listuguj reserve
+# west Labrador, Nova Scotia, Prince Edward I
 
 # From Brian Inglis (2015-07-20):
 # From the historical weather station records available at:
@@ -1513,13 +1512,6 @@ Zone America/Goose_Bay	-4:01:40 -	LMT	1884 # Happy Valley-Goose Bay
 # in Canada to observe DST in 1971 but not 1970; for now we'll assume
 # this is a typo.
 
-# From Jeffery Nichols (2020-01-09):
-# America/Halifax ... also applies to Îles-de-la-Madeleine and the Listuguj
-# reserve in Quebec. Officially, this came into effect on January 1, 2007
-# (Legal Time Act, CQLR c T-5.1), but the legislative debates surrounding that
-# bill say that it is "accommodating the customs and practices" of those
-# regions, which suggests that they have always been in-line with Halifax.
-
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Halifax	1916	only	-	Apr	 1	0:00	1:00	D
 Rule	Halifax	1916	only	-	Oct	 1	0:00	0	S
@@ -1613,20 +1605,19 @@ Zone America/Moncton	-4:19:08 -	LMT	1883 Dec  9
 
 # Quebec
 
-# From Paul Eggert (2020-01-10):
+# From Paul Eggert (2015-03-24):
 # See America/Toronto for most of Quebec, including Montreal.
-# See America/Halifax for the Îles de la Madeleine and the Listuguj reserve.
 #
 # Matthews and Vincent (1998) also write that Quebec east of the -63
 # meridian is supposed to observe AST, but residents as far east as
 # Natashquan use EST/EDT, and residents east of Natashquan use AST.
 # The Quebec department of justice writes in
 # "The situation in Minganie and Basse-Côte-Nord"
-# https://www.justice.gouv.qc.ca/en/department/ministre/functions-and-responsabilities/legal-time-in-quebec/the-situation-in-minganie-and-basse-cote-nord/
+# http://www.justice.gouv.qc.ca/english/publications/generale/temps-minganie-a.htm
 # that the coastal strip from just east of Natashquan to Blanc-Sablon
 # observes Atlantic standard time all year round.
-# This common practice was codified into law as of 2007; see Legal Time Act,
-# CQLR c T-5.1 <http://legisquebec.gouv.qc.ca/en/ShowDoc/cs/T-5.1>.
+# https://www.assnat.qc.ca/Media/Process.aspx?MediaId=ANQ.Vigie.Bll.DocumentGenerique_8845en
+# says this common practice was codified into law as of 2007.
 # For lack of better info, guess this practice began around 1970, contra to
 # Shanks & Pottenger who have this region observing AST/ADT.
 
@@ -1645,15 +1636,6 @@ Zone America/Blanc-Sablon -3:48:28 -	LMT	1884
 # Nipigon (EST) and Rainy River (CST) are the largest that we know of.
 # Far west Ontario is like Winnipeg; far east Quebec is like Halifax.
 
-# From Jeffery Nichols (2020-02-06):
-# According to the [Shanks] atlas, those western Ontario zones are huge,
-# covering most of Ontario northwest of Sault Ste Marie and Timmins.
-# The zones seem to include towns bigger than the ones they're named after,
-# like Dryden in America/Rainy_River and Wawa (and maybe Attawapiskat) in
-# America/Nipigon.  I assume it's too much trouble to change the name of the
-# zone (like when you found out that America/Glace_Bay includes Sydney, Nova
-# Scotia)....
-
 # From Mark Brader (2003-07-26):
 # [According to the Toronto Star] Orillia, Ontario, adopted DST
 # effective Saturday, 1912-06-22, 22:00; the article mentions that
@@ -2460,18 +2442,6 @@ Zone America/Creston	-7:46:04 -	LMT	1884
 # obtained in November 2008 should be ignored...
 # I apologize for reporting incorrect information in 2008.
 
-# From Tim Parenti (2020-03-05):
-# The government of Yukon announced [yesterday] the cessation of seasonal time
-# changes.  "After clocks are pushed ahead one hour on March 8, the territory
-# will remain on [UTC-07].  ... [The government] found 93 per cent of
-# respondents wanted to end seasonal time changes and, of that group, 70 per
-# cent wanted 'permanent Pacific Daylight Saving Time.'"
-# https://www.cbc.ca/news/canada/north/yukon-end-daylight-saving-time-1.5486358
-#
-# Although the government press release prefers PDT, we prefer MST for
-# consistency with nearby Dawson Creek, Creston, and Fort Nelson.
-# https://yukon.ca/en/news/yukon-end-seasonal-time-change
-
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	NT_YK	1918	only	-	Apr	14	2:00	1:00	D
 Rule	NT_YK	1918	only	-	Oct	27	2:00	0	S
@@ -2526,13 +2496,11 @@ Zone America/Inuvik	0	-	-00	1953 # Inuvik founded
 Zone America/Whitehorse	-9:00:12 -	LMT	1900 Aug 20
 			-9:00	NT_YK	Y%sT	1967 May 28  0:00
 			-8:00	NT_YK	P%sT	1980
-			-8:00	Canada	P%sT	2020 Mar  8  2:00
-			-7:00	-	MST
+			-8:00	Canada	P%sT
 Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
 			-9:00	NT_YK	Y%sT	1973 Oct 28  0:00
 			-8:00	NT_YK	P%sT	1980
-			-8:00	Canada	P%sT	2020 Mar  8  2:00
-			-7:00	-	MST
+			-8:00	Canada	P%sT
 
 
 ###############################################################################

make/data/tzdata/zone.tab

@@ -154,8 +154,8 @@ 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	+4916-12307	America/Vancouver	Pacific - BC (most areas)
-CA	+6043-13503	America/Whitehorse	Pacific - Yukon (east)
-CA	+6404-13925	America/Dawson	Pacific - Yukon (west)
+CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
+CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
 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)
@@ -212,7 +212,7 @@ GF	+0456-05220	America/Cayenne
 GG	+492717-0023210	Europe/Guernsey
 GH	+0533-00013	Africa/Accra
 GI	+3608-00521	Europe/Gibraltar
-GL	+6411-05144	America/Nuuk	Greenland (most areas)
+GL	+6411-05144	America/Godthab	Greenland (most areas)
 GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
 GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
 GL	+7634-06847	America/Thule	Thule/Pituffik
@@ -358,7 +358,7 @@ RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
 # The obsolescent zone.tab format cannot represent Europe/Simferopol well.
 # Put it in RU section and list as UA.  See "territorial claims" above.
 # Programs should use zone1970.tab instead; see above.
-UA	+4457+03406	Europe/Simferopol	Crimea
+UA	+4457+03406	Europe/Simferopol	MSK+00 - Crimea
 RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
 RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
 RU	+4844+04425	Europe/Volgograd	MSK+01 - Volgograd
@@ -422,8 +422,8 @@ TV	-0831+17913	Pacific/Funafuti
 TW	+2503+12130	Asia/Taipei
 TZ	-0648+03917	Africa/Dar_es_Salaam
 UA	+5026+03031	Europe/Kiev	Ukraine (most areas)
-UA	+4837+02218	Europe/Uzhgorod	Transcarpathia
-UA	+4750+03510	Europe/Zaporozhye	Zaporozhye and east Lugansk
+UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east)
 UG	+0019+03225	Africa/Kampala
 UM	+2813-17722	Pacific/Midway	Midway Islands
 UM	+1917+16637	Pacific/Wake	Wake Island

make/devkit/createWindowsDevkit2017.sh

@@ -32,6 +32,7 @@ VS_VERSION="2017"
 VS_VERSION_NUM_NODOT="150"
 VS_DLL_VERSION="140"
 SDK_VERSION="10"
+SDK_FULL_VERSION="10.0.16299.0"
 MSVC_DIR="Microsoft.VC141.CRT"
 
 SCRIPT_DIR="$(cd "$(dirname $0)" > /dev/null && pwd)"
@@ -119,9 +120,6 @@ fi
 SDK_INSTALL_DIR="$(cygpath "$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"
-
 if [ ! -d $DEVKIT_ROOT/$SDK_VERSION ]; then
     echo "Copying SDK..."
     mkdir -p $DEVKIT_ROOT/$SDK_VERSION/bin

make/gensrc/GensrcMisc.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -40,11 +40,7 @@ $(eval $(call SetupTextFileProcessing, BUILD_VERSION_JAVA, \
         @@VERSION_BUILD@@ => $(VERSION_BUILD) ; \
         @@VERSION_OPT@@ => $(VERSION_OPT) ; \
         @@VERSION_DATE@@ => $(VERSION_DATE) ; \
-        @@VENDOR_VERSION_STRING@@ => $(VENDOR_VERSION_STRING) ; \
-        @@VENDOR@@ => $(COMPANY_NAME) ; \
-        @@VENDOR_URL@@ => $(VENDOR_URL) ; \
-        @@VENDOR_URL_BUG@@ => $(VENDOR_URL_BUG) ; \
-        @@VENDOR_URL_VM_BUG@@ => $(VENDOR_URL_VM_BUG), \
+        @@VENDOR_VERSION_STRING@@ => $(VENDOR_VERSION_STRING), \
 ))
 
 GENSRC_JAVA_BASE += $(BUILD_VERSION_JAVA)

make/launcher/Launcher-java.base.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 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
@@ -32,15 +32,26 @@ JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/launcher/icons
 
 ################################################################################
 
+# On windows, the debuginfo files get the same name as for java.dll. Build
+# into another dir and copy selectively so debuginfo for java.dll isn't
+# overwritten.
 $(eval $(call SetupBuildLauncher, java, \
     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
     LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR), \
     LIBS_windows := user32.lib comctl32.lib, \
     EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \
     VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
+    OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs, \
     OPTIMIZATION := HIGH, \
 ))
 
+$(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java)
+	$(MKDIR) -p $(@D)
+	$(RM) $@
+	$(CP) $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs/java$(EXE_SUFFIX) $@
+
+TARGETS += $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX)
+
 ifeq ($(OPENJDK_TARGET_OS), windows)
   $(eval $(call SetupBuildLauncher, javaw, \
       CFLAGS := -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \