JRE-1199: added the list of files required for stripped JBR bundle (follow up)

(cherry picked from commit a4e7fdb61c)

.gitignore

@@ -0,0 +1,4 @@
+JTwork
+JTreport
+*.class
+.idea/workspace.xml

.hgtags

@@ -502,34 +502,3 @@ ea900a7dc7d77dee30865c60eabd87fc24b1037c jdk-11+24
 945ba9278a272a5477ffb1b3ea1b04174fed8036 jdk-11+26
 9d7d74c6f2cbe522e39fa22dc557fdd3f79b32ad jdk-11+27
 76072a077ee1d815152d45d1692c4b36c53c5c49 jdk-11+28
-c01cc45790f871adec30acc90742b521d57a2fff jdk-11.0.1+0
-1353ec839c82de926bfacd2c7976b6b652d4afb0 jdk-11.0.1+1
-a285bd7cfedb40cb3086e61e17fc04c96b739d03 jdk-11.0.1+2
-a285bd7cfedb40cb3086e61e17fc04c96b739d03 jdk-11.0.1+2
-0000000000000000000000000000000000000000 jdk-11.0.1+2
-fc55f0667af5ea3b21e40a59e2a88b1b82e65e62 jdk-11.0.1+2
-781b5d8f2f75ae4dfdafc85630e5dbd31e324ed1 jdk-11.0.1+3
-b5b1dd7e6f9d86aedf7141e9279342fae257bd67 jdk-11.0.1+4
-d6efeebf554c918bfab50f89939eb11121e18432 jdk-11.0.1+5
-db768cfe2141b3eb9ef53d7104002a0532c8c977 jdk-11.0.1+6
-88a221c0bad0cee441767106776628550d660a82 jdk-11.0.1+7
-c2b23a17d3ff92235aed8e8d04642d7a6eaecf54 jdk-11.0.1+8
-adb9933aa8c68e6dec6b441133f3955fe7366206 jdk-11.0.1+9
-a86e14193fc8ea98835fd3e2f867447164c7af53 jdk-11.0.1+10
-0343f9aacae2d4a9e6df4e61087837166a6a477c jdk-11.0.1+11
-c0431cf9c38e5c56eedc680e007a94c4279a8f13 jdk-11.0.1+12
-8513ac27b65198d2e6562fb7da6e9c99b9fdcf51 jdk-11.0.1+13
-7da060835810b5fbd4a7493ea1c98e9a4338f30d jdk-11.0.2+0
-2be95a1bf50877cafba791c2f342953bd4a6412e jdk-11.0.2+1
-b4b16f510f48e2dd4bea007b60fddf69af0f6c10 jdk-11.0.2+2
-8a8606a3bdf2dbe0698bef375e6a4b47df0efb1a jdk-11.0.2+3
-0db90dec8c39bc38058afa11b7fda607ee259d01 jdk-11.0.2+4
-ff1f7723c4e88822fd60bcacd55824e1d3da6d36 jdk-11.0.2+5
-c6fd7ff3e96f3e6f4913d026a90c6c454a7a35c8 jdk-11.0.2+6
-a01e0cc0105972acc3b5e213dbe2b84acaee5be3 jdk-11.0.2+7
-a01e0cc0105972acc3b5e213dbe2b84acaee5be3 jdk-11.0.2-ga
-fe85e2f43a1c893cb410308106b0f31b814aebb8 jdk-11.0.2+8
-144d476b6efe527c5e9ebf19af93398913c5450f jdk-11.0.2+9
-a01e0cc0105972acc3b5e213dbe2b84acaee5be3 jdk-11.0.2-ga
-0000000000000000000000000000000000000000 jdk-11.0.2-ga
-144d476b6efe527c5e9ebf19af93398913c5450f jdk-11.0.2-ga

.idea/codeStyles/Project.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="LINE_SEPARATOR" value="&#10;" />
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

.idea/copyright/JetBrains.xml

@@ -0,0 +1,9 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="Copyright 2000-&amp;#36;today.year JetBrains s.r.o.&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+    <option name="keyword" value="Copyright" />
+    <option name="allowReplaceKeyword" value="JetBrains" />
+    <option name="myName" value="JetBrains" />
+    <option name="myLocal" value="true" />
+  </copyright>
+</component>

.idea/copyright/profiles_settings.xml

@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+  <settings default="JetBrains" />
+</component>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

README.md

@@ -0,0 +1,60 @@
+[![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
+
+# Downloads
+
+|Windows-x64  |macOS        |Linux-x64    |
+|-------------|-------------|-------------|
+|<a href="https://bintray.com/jetbrains/intellij-jdk/openjdk9-windows-x64/_latestVersion"> <img src="https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk9-windows-x64/images/download.svg"/></a>|<a href="https://bintray.com/jetbrains/intellij-jdk/openjdk9-osx-x64/_latestVersion"> <img src="https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk9-osx-x64/images/download.svg"/></a>|<a href="https://bintray.com/jetbrains/intellij-jdk/openjdk9-linux-x64/_latestVersion"><img src="https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk9-linux-x64/images/download.svg"/></a>|
+
+
+# How JetBrains Runtime is organised
+## Workspaces
+
+[github.com/JetBrains/JetBrainsRuntime](https://github.com/JetBrains/JetBrainsRuntime)  
+
+## Getting sources
+__OSX, Linux:__
+```
+git config --global core.autocrlf input
+git clone git@github.com:JetBrains/JetBrainsRuntime.git
+```
+
+__Windows:__
+```
+git config --global core.autocrlf false
+git clone git@github.com:JetBrains/JetBrainsRuntime.git
+```
+
+# Configure Local Build Environment
+## Linux (docker)
+```
+$ cd jb/project/docker
+$ docker build .
+...
+Successfully built 942ea9900054
+
+$ docker run -v `pwd`../../../../:/JetBrainsRuntime -it 942ea9900054
+
+# cd /JetBrainsRuntime
+# sh ./configure
+# make images CONF=linux-x86_64-normal-server-release
+
+```
+
+## Linux (Ubuntu 18.10 desktop)
+```
+$ sudo apt-get install autoconf make build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev install libcups2-dev libfontconfig1-dev libasound2-dev 
+
+$ cd JetBrainsRuntime
+$ sh ./configure --disable-warnings-as-errors
+$ make images
+```
+
+## Windows
+#### TBD
+
+## OSX
+#### TBD
+
+## Contribution
+We will be happy to receive your pull requests. Before you submit one, please sign our Contributor License Agreement (CLA)  https://www.jetbrains.com/agreements/cla/ 

jb/project/docker/Dockerfile

@@ -0,0 +1,9 @@
+FROM centos:7
+
+RUN yum -y install zip bzip2 unzip tar wget make autoconf automake libtool gcc gcc-c++ libstdc++-devel alsa-devel cups-devel xorg-x11-devel libjpeg62-devel giflib-devel freetype-devel file which libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel
+
+# Install Java 11
+RUN wget --no-check-certificate -q --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/11.0.1+13/90cf5d8f270a4347a95050320eef3fb7/jdk-11.0.1_linux-x64_bin.tar.gz" \
+-O - | tar xz -C /
+ENV JAVA_HOME /jdk-11.0.1
+ENV PATH $JAVA_HOME/bin:$PATH

jb/project/java-gradle/.idea/compiler.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel>
+      <module name="java-gradle.main" target="11" />
+      <module name="java-gradle.test" target="11" />
+    </bytecodeTargetLevel>
+  </component>
+</project>

jb/project/java-gradle/.idea/gradle.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="/usr/share/gradle" />
+        <option name="gradleJvm" value="11" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+        <option name="useAutoImport" value="true" />
+        <option name="useQualifiedModuleNames" value="true" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

jb/project/java-gradle/.idea/libraries/Gradle__com_twelvemonkeys_common_common_image_3_3_2.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.twelvemonkeys.common:common-image:3.3.2">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.common/common-image/3.3.2/9c975152864050c6dbb7226ca1100694f0aa099d/common-image-3.3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.common/common-image/3.3.2/e6fb35a9825421ec5a634af328e22546992d536d/common-image-3.3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

jb/project/java-gradle/.idea/libraries/Gradle__com_twelvemonkeys_common_common_io_3_3_2.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.twelvemonkeys.common:common-io:3.3.2">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.common/common-io/3.3.2/e00b1c744993864d3c8dc698ba7d356122019398/common-io-3.3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.common/common-io/3.3.2/dbb242585fdfd353dc4c2c0e8b3d8b0383dffbb2/common-io-3.3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

jb/project/java-gradle/.idea/libraries/Gradle__com_twelvemonkeys_common_common_lang_3_3_2.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.twelvemonkeys.common:common-lang:3.3.2">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.common/common-lang/3.3.2/ffbc5e05208c5c9cb43052438294c3ec5546aecf/common-lang-3.3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.common/common-lang/3.3.2/b695db345614a2b9344fd43a44d9ce722df4b39/common-lang-3.3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

jb/project/java-gradle/.idea/libraries/Gradle__com_twelvemonkeys_imageio_imageio_core_3_3_2.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.twelvemonkeys.imageio:imageio-core:3.3.2">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.imageio/imageio-core/3.3.2/8def41c756831dde3c23f2d525e5667cfbfa1847/imageio-core-3.3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.imageio/imageio-core/3.3.2/abcb2beaf21364467afe0e33824dce5730bef0c3/imageio-core-3.3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

jb/project/java-gradle/.idea/libraries/Gradle__com_twelvemonkeys_imageio_imageio_metadata_3_3_2.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.twelvemonkeys.imageio:imageio-metadata:3.3.2">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.imageio/imageio-metadata/3.3.2/b8a31725bde0dc6f4e6b01711784f5ca0a2275f3/imageio-metadata-3.3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.imageio/imageio-metadata/3.3.2/6fc3b223c81afbd4b829e2c924c096aab3ed0e9e/imageio-metadata-3.3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

jb/project/java-gradle/.idea/libraries/Gradle__com_twelvemonkeys_imageio_imageio_tiff_3_3_2.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: com.twelvemonkeys.imageio:imageio-tiff:3.3.2">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.imageio/imageio-tiff/3.3.2/9bea1214eae7d287dc0c685fb6be75102318d080/imageio-tiff-3.3.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.twelvemonkeys.imageio/imageio-tiff/3.3.2/cae5b3540dc01889dc9560db86f5f61bdc253107/imageio-tiff-3.3.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

jb/project/java-gradle/.idea/libraries/Gradle__junit_junit_4_12.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

jb/project/java-gradle/.idea/libraries/Gradle__net_java_dev_jna_jna_4_4_0.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: net.java.dev.jna:jna:4.4.0">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna/4.4.0/cb208278274bf12ebdb56c61bd7407e6f774d65a/jna-4.4.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna/4.4.0/9d45d3dc35711eef7267d8b4fc2c0dc482ef9fd2/jna-4.4.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

jb/project/java-gradle/.idea/libraries/Gradle__org_apache_commons_commons_lang3_3_0.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.apache.commons:commons-lang3:3.0">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.0/8873bd0bb5cb9ee37f1b04578eb7e26fcdd44cb0/commons-lang3-3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.0/d48f964b56a931ec2712ce5d411a40d114a69753/commons-lang3-3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

jb/project/java-gradle/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.hamcrest:hamcrest-core:1.3">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

jb/project/java-gradle/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="Gradle: org.hamcrest:hamcrest-library:1.3">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/4785a3c21320980282f9f33d0d1264a69040538f/hamcrest-library-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-library/1.3/47a7ee46628ab7133129cd7cef1e92657bc275e/hamcrest-library-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

jb/project/java-gradle/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/classes" />
+  </component>
+</project>

jb/project/java-gradle/.idea/modules.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/java-gradle.iml" filepath="$PROJECT_DIR$/.idea/modules/java-gradle.iml" />
+      <module fileurl="file://$PROJECT_DIR$/java-gradle.iml" filepath="$PROJECT_DIR$/java-gradle.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/java-gradle.main.iml" filepath="$PROJECT_DIR$/.idea/modules/java-gradle.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/java-gradle.test.iml" filepath="$PROJECT_DIR$/.idea/modules/java-gradle.test.iml" />
+    </modules>
+  </component>
+</project>

jb/project/java-gradle/.idea/modules/java-gradle.main.iml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="java-gradle:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
+    <output url="file://$MODULE_DIR$/../../out/production/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src/main" />
+    <content url="file://$MODULE_DIR$/../../../../../src">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.base/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.datatransfer/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.desktop/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.instrument/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.logging/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.management.rmi/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.management/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.naming/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.prefs/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.rmi/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.scripting/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.se/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.security.jgss/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.security.sasl/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.smartcardio/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.sql.rowset/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.sql/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.xml.crypto/share/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.base/macosx/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.datatransfer/macosx/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.desktop/macosx/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../src/java.prefs/macosx/classes" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

jb/project/java-gradle/.idea/modules/java-gradle.test.iml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="java-gradle:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
+    <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../src/test" />
+    <content url="file://$MODULE_DIR$/../../../../../test">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../../test/jdk/jbu" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="java-gradle.main" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: net.java.dev.jna:jna:4.4.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.twelvemonkeys.imageio:imageio-tiff:3.3.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: com.twelvemonkeys.imageio:imageio-metadata:3.3.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.twelvemonkeys.imageio:imageio-core:3.3.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.twelvemonkeys.common:common-image:3.3.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.twelvemonkeys.common:common-io:3.3.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.twelvemonkeys.common:common-lang:3.3.2" level="project" />
+  </component>
+  <component name="TestModuleProperties" production-module="java-gradle.main" />
+</module>

jb/project/java-gradle/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
+  </component>
+</project>

jb/project/java-gradle/build.gradle

@@ -0,0 +1,116 @@
+apply plugin: 'java'
+import org.gradle.internal.os.OperatingSystem
+
+repositories {
+    mavenCentral()
+}
+
+def test_jvm = {
+    if (project.hasProperty('jbsdkhome')) {
+        file(jbsdkhome + (OperatingSystem.current().isWindows()?"/bin/java.exe" : "/bin/java")).absolutePath
+    } else {
+        if (OperatingSystem.current().isMacOsX()) {
+            file('../../../build/macosx-x86_64-normal-server-release/images/jdk-bundle/jdk-11.jdk/Contents/Home/bin/java').absolutePath
+        } else if (OperatingSystem.current().isLinux()) {
+            file('../../../build/linux-x86_64-normal-server-release/images/jdk/bin/java').absolutePath
+        } else {
+            file('../../../build/windows-x86_64-normal-server-release/images/j2sdk-image/bin/java.exe').absolutePath
+        }
+    }
+}
+
+dependencies {
+    testCompile('junit:junit:4.12'){
+        exclude group: 'org.hamcrest'
+    }
+    testCompile 'org.hamcrest:hamcrest-library:1.3'
+    testCompile 'net.java.dev.jna:jna:4.4.0'
+    testCompile 'com.twelvemonkeys.imageio:imageio-tiff:3.3.2'
+    testCompile 'org.apache.commons:commons-lang3:3.0'
+}
+
+def jdk_modules = ["java.base", "java.logging", "java.prefs",
+               "java.se.ee", "java.sql", "java.datatransfer",
+               "java.management", "java.rmi", "java.security.jgss",
+               "java.sql.rowset", "java.desktop", "java.management.rmi",
+               "java.scripting", "java.security.sasl", "java.transaction",
+               "java.instrument", "java.naming", "java.se",
+               "java.smartcardio", "java.xml.crypto"]
+
+def jdk_class_dirs = []
+
+jdk_modules.collect(jdk_class_dirs) {
+    new File("../../../src/" + it + "/share/classes")
+}
+
+if (OperatingSystem.current().isMacOsX())
+    jdk_modules.collect(jdk_class_dirs) {
+        "../../../src/" + it + "/macosx/classes"
+    }
+else if (OperatingSystem.current().isLinux())
+    jdk_modules.collect(jdk_class_dirs) {
+        "../../../src/" + it + "/solaris/classes"
+    }
+else
+    jdk_modules.collect(jdk_class_dirs) {
+        "../../../src/" + it + "/windows/classes"
+    }
+
+sourceSets.main.java.srcDirs = jdk_class_dirs
+
+sourceSets {
+    test {
+        java {
+            srcDir "../../../test/jdk/jbu"
+        }
+    }
+}
+
+test.dependsOn.clear()
+
+test.dependsOn tasks.compileTestJava
+
+test {
+    systemProperty "jb.java2d.metal", "true"
+    systemProperty "testdata", file('../../../jb/tests/testdata').absolutePath
+
+//  Generate golden images for DroidFontTest and MixedTextTest
+//    systemProperty "gentestdata", ""
+
+    outputs.upToDateWhen { false }
+    executable = test_jvm()
+
+//  Enable J2D logging (only in debug build)
+//  Can be turned on for J2D by adding "#define DEBUG 1" into jdk/src/share/native/sun/java2d/Trace.h
+
+//    environment 'J2D_TRACE_LEVEL', '4'
+}
+
+def buildDir = project.buildscript.sourceFile.parentFile.parentFile.parentFile.parentFile
+
+def make_cmd = "make"
+if (OperatingSystem.current().isWindows()) {
+    def cyg_make_cmd = new File("c:/cygwin64/bin/make.exe")
+    if (cyg_make_cmd.exists()) make_cmd = cyg_make_cmd.absolutePath
+}
+
+task make_images << {
+    def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "images")
+    def proc = pb.redirectErrorStream(true).start()
+    proc.inputStream.eachLine {println it}
+    assert proc.waitFor() == 0
+}
+
+task make_clean << {
+    def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "clean")
+    def proc = pb.redirectErrorStream(true).start()
+    proc.inputStream.eachLine {println it}
+    assert proc.waitFor() == 0
+}
+
+
+tasks.compileJava.enabled = false
+tasks.compileTestJava.dependsOn.clear()
+classes.dependsOn.clear()
+classes.dependsOn tasks.make_images
+tasks.cleanClasses.dependsOn tasks.make_clean

jb/project/java-gradle/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Thu Dec 06 20:31:44 MSK 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip

jb/project/java-gradle/gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

jb/tests/tests.iml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../test/java/awt/Graphics2D">
+      <sourceFolder url="file://$MODULE_DIR$/../../../test/java/awt/Graphics2D" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../../test/sun/java2d">
+      <sourceFolder url="file://$MODULE_DIR$/../../../test/sun/java2d" isTestSource="false" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$APPLICATION_HOME_DIR$/lib/junit-4.12.jar" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$APPLICATION_HOME_DIR$/lib/junit-4.12.jar" recursive="false" />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="file://$APPLICATION_HOME_DIR$/lib/junit.jar" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+        <jarDirectory url="file://$APPLICATION_HOME_DIR$/lib/junit.jar" recursive="false" />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="JUnit4">
+        <CLASSES>
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.12.jar!/" />
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>

jbr_file_list_linux.txt

@@ -0,0 +1,167 @@
+bin/jaotc
+bin/java
+bin/jjs
+bin/jrunscript
+bin/keytool
+bin/pack200
+bin/rmid
+bin/rmiregistry
+bin/unpack200
+conf/logging.properties
+conf/management/jmxremote.access
+conf/management/jmxremote.password.template
+conf/management/management.properties
+conf/net.properties
+conf/security/java.policy
+conf/security/java.security
+conf/security/policy/limited/default_local.policy
+conf/security/policy/limited/default_US_export.policy
+conf/security/policy/limited/exempt_local.policy
+conf/security/policy/README.txt
+conf/security/policy/unlimited/default_local.policy
+conf/security/policy/unlimited/default_US_export.policy
+conf/sound.properties
+legal/java.base/ADDITIONAL_LICENSE_INFO
+legal/java.base/aes.md
+legal/java.base/asm.md
+legal/java.base/ASSEMBLY_EXCEPTION
+legal/java.base/c-libutl.md
+legal/java.base/cldr.md
+legal/java.base/icu.md
+legal/java.base/LICENSE
+legal/java.base/public_suffix.md
+legal/java.base/unicode.md
+legal/java.desktop/colorimaging.md
+legal/java.desktop/giflib.md
+legal/java.desktop/harfbuzz.md
+legal/java.desktop/jpeg.md
+legal/java.desktop/lcms.md
+legal/java.desktop/libpng.md
+legal/java.desktop/mesa3d.md
+legal/java.desktop/opengl.md
+legal/java.desktop/xwindows.md
+legal/java.smartcardio/pcsclite.md
+legal/java.xml/bcel.md
+legal/java.xml/dom.md
+legal/java.xml/jcup.md
+legal/java.xml/xalan.md
+legal/java.xml/xerces.md
+legal/java.xml.crypto/santuario.md
+legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md
+legal/jdk.crypto.cryptoki/pkcs11wrapper.md
+legal/jdk.crypto.ec/ecc.md
+legal/jdk.dynalink/dynalink.md
+legal/jdk.internal.le/jline.md
+legal/jdk.localedata/thaidict.md
+legal/jdk.scripting.nashorn/double-conversion.md
+legal/jdk.scripting.nashorn/joni.md
+lib/classlist
+lib/jexec
+lib/jfr/default.jfc
+lib/jfr/profile.jfc
+lib/jli/libjli.so
+lib/jrt-fs.jar
+lib/jvm.cfg
+lib/libawt.so
+lib/libawt_headless.so
+lib/libawt_xawt.so
+lib/libdt_socket.so
+lib/libextnet.so
+lib/libfontmanager.so
+lib/libinstrument.so
+lib/libj2gss.so
+lib/libj2pcsc.so
+lib/libj2pkcs11.so
+lib/libjaas.so
+lib/libjava.so
+lib/libjavajpeg.so
+lib/libjawt.so
+lib/libjdwp.so
+lib/libjimage.so
+lib/libjsig.so
+lib/libjsound.so
+lib/liblcms.so
+lib/libmanagement.so
+lib/libmanagement_agent.so
+lib/libmanagement_ext.so
+lib/libmlib_image.so
+lib/libnet.so
+lib/libnio.so
+lib/libprefs.so
+lib/librmi.so
+lib/libsctp.so
+lib/libsplashscreen.so
+lib/libsunec.so
+lib/libunpack.so
+lib/libverify.so
+lib/libzip.so
+lib/modules
+lib/psfont.properties.ja
+lib/psfontj2d.properties
+lib/security/blacklisted.certs
+lib/security/cacerts
+lib/security/default.policy
+lib/security/public_suffix_list.dat
+lib/server/libjsig.so
+lib/server/libjvm.so
+lib/server/Xusage.txt
+lib/tzdb.dat
+man/ja_JP.UTF-8/man1/java.1
+man/ja_JP.UTF-8/man1/jjs.1
+man/ja_JP.UTF-8/man1/keytool.1
+man/ja_JP.UTF-8/man1/pack200.1
+man/ja_JP.UTF-8/man1/rmid.1
+man/ja_JP.UTF-8/man1/rmiregistry.1
+man/ja_JP.UTF-8/man1/unpack200.1
+man/man1/java.1
+man/man1/jjs.1
+man/man1/keytool.1
+man/man1/pack200.1
+man/man1/rmid.1
+man/man1/rmiregistry.1
+man/man1/unpack200.1
+release
+bin/javapackager
+lib/libjavafx_font_pango.so
+lib/libavplugin-ffmpeg-56.so
+lib/libavplugin-56.so
+lib/libglass.so
+lib/libavplugin-57.so
+lib/libavplugin-ffmpeg-57.so
+lib/libprism_sw.so
+lib/libavplugin-53.so
+lib/libjfxmedia.so
+lib/javafx.properties
+lib/libfxplugins.so
+lib/javafx-swt.jar
+lib/ant-javafx.jar
+lib/libglassgtk3.so
+lib/libjavafx_iio.so
+lib/libgstreamer-lite.so
+lib/libprism_common.so
+lib/libjavafx_font_freetype.so
+lib/libglassgtk2.so
+lib/libavplugin-54.so
+lib/libprism_es2.so
+lib/libjfxwebkit.so
+lib/libdecora_sse.so
+lib/libjavafx_font.so
+lib/libavplugin-55.so
+legal/javafx.media/glib.md
+legal/javafx.media/gstreamer.md
+legal/javafx.media/libffi.md
+legal/javafx.media/applecoreaudio.md
+legal/javafx.web/icu_v51.md
+legal/javafx.web/webkit.md
+legal/javafx.web/libxslt.md
+legal/javafx.web/libxml2.md
+legal/javafx.graphics/jpeg_v7.md
+jmods/javafx.base.jmod
+jmods/javafx.media.jmod
+jmods/javafx.swing.jmod
+jmods/javafx.controls.jmod
+jmods/jdk.packager.services.jmod
+jmods/jdk.packager.jmod
+jmods/javafx.web.jmod
+jmods/javafx.fxml.jmod
+jmods/javafx.graphics.jmod

jbr_file_list_osx.txt

@@ -0,0 +1,167 @@
+jdk/Contents/Home/bin/jaotc
+jdk/Contents/Home/bin/java
+jdk/Contents/Home/bin/jjs
+jdk/Contents/Home/bin/jrunscript
+jdk/Contents/Home/bin/keytool
+jdk/Contents/Home/bin/pack200
+jdk/Contents/Home/bin/rmid
+jdk/Contents/Home/bin/rmiregistry
+jdk/Contents/Home/bin/unpack200
+jdk/Contents/Home/conf/logging.properties
+jdk/Contents/Home/conf/management/jmxremote.access
+jdk/Contents/Home/conf/management/jmxremote.password.template
+jdk/Contents/Home/conf/management/management.properties
+jdk/Contents/Home/conf/net.properties
+jdk/Contents/Home/conf/security/java.policy
+jdk/Contents/Home/conf/security/java.security
+jdk/Contents/Home/conf/security/policy/limited/default_local.policy
+jdk/Contents/Home/conf/security/policy/limited/default_US_export.policy
+jdk/Contents/Home/conf/security/policy/limited/exempt_local.policy
+jdk/Contents/Home/conf/security/policy/README.txt
+jdk/Contents/Home/conf/security/policy/unlimited/default_local.policy
+jdk/Contents/Home/conf/security/policy/unlimited/default_US_export.policy
+jdk/Contents/Home/conf/sound.properties
+jdk/Contents/Home/legal/java.base/ADDITIONAL_LICENSE_INFO
+jdk/Contents/Home/legal/java.base/aes.md
+jdk/Contents/Home/legal/java.base/asm.md
+jdk/Contents/Home/legal/java.base/ASSEMBLY_EXCEPTION
+jdk/Contents/Home/legal/java.base/c-libutl.md
+jdk/Contents/Home/legal/java.base/cldr.md
+jdk/Contents/Home/legal/java.base/icu.md
+jdk/Contents/Home/legal/java.base/LICENSE
+jdk/Contents/Home/legal/java.base/public_suffix.md
+jdk/Contents/Home/legal/java.base/unicode.md
+jdk/Contents/Home/legal/java.desktop/colorimaging.md
+jdk/Contents/Home/legal/java.desktop/freetype.md
+jdk/Contents/Home/legal/java.desktop/giflib.md
+jdk/Contents/Home/legal/java.desktop/harfbuzz.md
+jdk/Contents/Home/legal/java.desktop/jpeg.md
+jdk/Contents/Home/legal/java.desktop/lcms.md
+jdk/Contents/Home/legal/java.desktop/libpng.md
+jdk/Contents/Home/legal/java.desktop/mesa3d.md
+jdk/Contents/Home/legal/java.desktop/opengl.md
+jdk/Contents/Home/legal/java.desktop/xwindows.md
+jdk/Contents/Home/legal/java.smartcardio/pcsclite.md
+jdk/Contents/Home/legal/java.xml/bcel.md
+jdk/Contents/Home/legal/java.xml/dom.md
+jdk/Contents/Home/legal/java.xml/jcup.md
+jdk/Contents/Home/legal/java.xml/xalan.md
+jdk/Contents/Home/legal/java.xml/xerces.md
+jdk/Contents/Home/legal/java.xml.crypto/santuario.md
+jdk/Contents/Home/legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md
+jdk/Contents/Home/legal/jdk.crypto.cryptoki/pkcs11wrapper.md
+jdk/Contents/Home/legal/jdk.crypto.ec/ecc.md
+jdk/Contents/Home/legal/jdk.dynalink/dynalink.md
+jdk/Contents/Home/legal/jdk.internal.le/jline.md
+jdk/Contents/Home/legal/jdk.localedata/thaidict.md
+jdk/Contents/Home/legal/jdk.scripting.nashorn/double-conversion.md
+jdk/Contents/Home/legal/jdk.scripting.nashorn/joni.md
+jdk/Contents/Home/lib/classlist
+jdk/Contents/Home/lib/fontconfig.bfc
+jdk/Contents/Home/lib/fontconfig.properties.src
+jdk/Contents/Home/lib/jfr/default.jfc
+jdk/Contents/Home/lib/jfr/profile.jfc
+jdk/Contents/Home/lib/jli/libjli.dylib
+jdk/Contents/Home/lib/jrt-fs.jar
+jdk/Contents/Home/lib/jspawnhelper
+jdk/Contents/Home/lib/jvm.cfg
+jdk/Contents/Home/lib/libawt.dylib
+jdk/Contents/Home/lib/libawt_lwawt.dylib
+jdk/Contents/Home/lib/libdt_socket.dylib
+jdk/Contents/Home/lib/libextnet.dylib
+jdk/Contents/Home/lib/libfontmanager.dylib
+jdk/Contents/Home/lib/libfreetype.dylib
+jdk/Contents/Home/lib/libinstrument.dylib
+jdk/Contents/Home/lib/libj2gss.dylib
+jdk/Contents/Home/lib/libj2pcsc.dylib
+jdk/Contents/Home/lib/libj2pkcs11.dylib
+jdk/Contents/Home/lib/libjaas.dylib
+jdk/Contents/Home/lib/libjava.dylib
+jdk/Contents/Home/lib/libjavajpeg.dylib
+jdk/Contents/Home/lib/libjawt.dylib
+jdk/Contents/Home/lib/libjdwp.dylib
+jdk/Contents/Home/lib/libjimage.dylib
+jdk/Contents/Home/lib/libjsig.dylib
+jdk/Contents/Home/lib/libjsound.dylib
+jdk/Contents/Home/lib/liblcms.dylib
+jdk/Contents/Home/lib/libmanagement.dylib
+jdk/Contents/Home/lib/libmanagement_agent.dylib
+jdk/Contents/Home/lib/libmanagement_ext.dylib
+jdk/Contents/Home/lib/libmlib_image.dylib
+jdk/Contents/Home/lib/libnet.dylib
+jdk/Contents/Home/lib/libnio.dylib
+jdk/Contents/Home/lib/libosx.dylib
+jdk/Contents/Home/lib/libosxapp.dylib
+jdk/Contents/Home/lib/libosxkrb5.dylib
+jdk/Contents/Home/lib/libosxsecurity.dylib
+jdk/Contents/Home/lib/libosxui.dylib
+jdk/Contents/Home/lib/libprefs.dylib
+jdk/Contents/Home/lib/librmi.dylib
+jdk/Contents/Home/lib/libsplashscreen.dylib
+jdk/Contents/Home/lib/libsunec.dylib
+jdk/Contents/Home/lib/libunpack.dylib
+jdk/Contents/Home/lib/libverify.dylib
+jdk/Contents/Home/lib/libzip.dylib
+jdk/Contents/Home/lib/modules
+jdk/Contents/Home/lib/psfont.properties.ja
+jdk/Contents/Home/lib/psfontj2d.properties
+jdk/Contents/Home/lib/security/blacklisted.certs
+jdk/Contents/Home/lib/security/cacerts
+jdk/Contents/Home/lib/security/default.policy
+jdk/Contents/Home/lib/security/public_suffix_list.dat
+jdk/Contents/Home/lib/server/libjsig.dylib
+jdk/Contents/Home/lib/server/libjvm.dylib
+jdk/Contents/Home/lib/server/Xusage.txt
+jdk/Contents/Home/lib/tzdb.dat
+jdk/Contents/Home/man/ja_JP.UTF-8/man1/java.1
+jdk/Contents/Home/man/ja_JP.UTF-8/man1/jjs.1
+jdk/Contents/Home/man/ja_JP.UTF-8/man1/keytool.1
+jdk/Contents/Home/man/ja_JP.UTF-8/man1/pack200.1
+jdk/Contents/Home/man/ja_JP.UTF-8/man1/rmid.1
+jdk/Contents/Home/man/ja_JP.UTF-8/man1/rmiregistry.1
+jdk/Contents/Home/man/ja_JP.UTF-8/man1/unpack200.1
+jdk/Contents/Home/man/man1/java.1
+jdk/Contents/Home/man/man1/jjs.1
+jdk/Contents/Home/man/man1/keytool.1
+jdk/Contents/Home/man/man1/pack200.1
+jdk/Contents/Home/man/man1/rmid.1
+jdk/Contents/Home/man/man1/rmiregistry.1
+jdk/Contents/Home/man/man1/unpack200.1
+jdk/Contents/Home/release
+jdk/Contents/Info.plist
+jdk/Contents/Home/bin/javapackager
+jdk/Contents/Home/lib/libjavafx_iio.dylib
+jdk/Contents/Home/lib/libjfxmedia_avf.dylib
+jdk/Contents/Home/lib/javafx.properties
+jdk/Contents/Home/lib/libglib-lite.dylib
+jdk/Contents/Home/lib/javafx-swt.jar
+jdk/Contents/Home/lib/libfxplugins.dylib
+jdk/Contents/Home/lib/ant-javafx.jar
+jdk/Contents/Home/lib/libglass.dylib
+jdk/Contents/Home/lib/libjavafx_font.dylib
+jdk/Contents/Home/lib/libgstreamer-lite.dylib
+jdk/Contents/Home/lib/libjfxwebkit.dylib
+jdk/Contents/Home/lib/libprism_common.dylib
+jdk/Contents/Home/lib/libprism_es2.dylib
+jdk/Contents/Home/lib/libdecora_sse.dylib
+jdk/Contents/Home/lib/libjfxmedia.dylib
+jdk/Contents/Home/lib/libprism_sw.dylib
+jdk/Contents/Home/legal/javafx.media/glib.md
+jdk/Contents/Home/legal/javafx.media/gstreamer.md
+jdk/Contents/Home/legal/javafx.media/libffi.md
+jdk/Contents/Home/legal/javafx.media/applecoreaudio.md
+jdk/Contents/Home/legal/javafx.web/icu_v51.md
+jdk/Contents/Home/legal/javafx.web/webkit.md
+jdk/Contents/Home/legal/javafx.web/libxslt.md
+jdk/Contents/Home/legal/javafx.web/libxml2.md
+jdk/Contents/Home/legal/javafx.graphics/jpeg_v7.md
+jdk/Contents/Home/jmods/javafx.base.jmod
+jdk/Contents/Home/jmods/javafx.media.jmod
+jdk/Contents/Home/jmods/javafx.swing.jmod
+jdk/Contents/Home/jmods/javafx.controls.jmod
+jdk/Contents/Home/jmods/jdk.packager.services.jmod
+jdk/Contents/Home/jmods/jdk.packager.jmod
+jdk/Contents/Home/jmods/javafx.web.jmod
+jdk/Contents/Home/jmods/javafx.fxml.jmod
+jdk/Contents/Home/jmods/javafx.graphics.jmod
+jdk/Contents/MacOS/libjli.dylib

jbr_file_list_windows.txt

@@ -0,0 +1,383 @@
+bin/awt.dll
+bin/dt_socket.dll
+bin/fontmanager.dll
+bin/freetype.dll
+bin/instrument.dll
+bin/j2gss.dll
+bin/j2pcsc.dll
+bin/j2pkcs11.dll
+bin/jaas.dll
+bin/jabswitch.exe
+bin/jaccessinspector.exe
+bin/jaccesswalker.exe
+bin/jaotc.exe
+bin/java.dll
+bin/java.exe
+bin/javaaccessbridge.dll
+bin/javajpeg.dll
+bin/javaw.exe
+bin/jawt.dll
+bin/jdwp.dll
+bin/jimage.dll
+bin/jjs.exe
+bin/jli.dll
+bin/jrunscript.exe
+bin/jsound.dll
+bin/keytool.exe
+bin/kinit.exe
+bin/klist.exe
+bin/ktab.exe
+bin/lcms.dll
+bin/le.dll
+bin/management.dll
+bin/management_agent.dll
+bin/management_ext.dll
+bin/mlib_image.dll
+bin/msvcp140.dll
+bin/net.dll
+bin/nio.dll
+bin/pack200.exe
+bin/prefs.dll
+bin/rmi.dll
+bin/rmid.exe
+bin/rmiregistry.exe
+bin/server/jvm.dll
+bin/splashscreen.dll
+bin/sunec.dll
+bin/sunmscapi.dll
+bin/unpack.dll
+bin/unpack200.exe
+bin/verify.dll
+bin/w2k_lsa_auth.dll
+bin/windowsaccessbridge-64.dll
+bin/zip.dll
+conf/logging.properties
+conf/management/jmxremote.access
+conf/management/jmxremote.password.template
+conf/management/management.properties
+conf/net.properties
+conf/security/java.policy
+conf/security/java.security
+conf/security/policy/limited/default_local.policy
+conf/security/policy/limited/default_US_export.policy
+conf/security/policy/limited/exempt_local.policy
+conf/security/policy/README.txt
+conf/security/policy/unlimited/default_local.policy
+conf/security/policy/unlimited/default_US_export.policy
+conf/sound.properties
+legal/java.base/ADDITIONAL_LICENSE_INFO
+legal/java.base/aes.md
+legal/java.base/asm.md
+legal/java.base/ASSEMBLY_EXCEPTION
+legal/java.base/c-libutl.md
+legal/java.base/cldr.md
+legal/java.base/icu.md
+legal/java.base/LICENSE
+legal/java.base/public_suffix.md
+legal/java.base/unicode.md
+legal/java.base/zlib.md
+legal/java.compiler/ADDITIONAL_LICENSE_INFO
+legal/java.compiler/ASSEMBLY_EXCEPTION
+legal/java.compiler/LICENSE
+legal/java.datatransfer/ADDITIONAL_LICENSE_INFO
+legal/java.datatransfer/ASSEMBLY_EXCEPTION
+legal/java.datatransfer/LICENSE
+legal/java.desktop/ADDITIONAL_LICENSE_INFO
+legal/java.desktop/ASSEMBLY_EXCEPTION
+legal/java.desktop/colorimaging.md
+legal/java.desktop/freetype.md
+legal/java.desktop/giflib.md
+legal/java.desktop/harfbuzz.md
+legal/java.desktop/jpeg.md
+legal/java.desktop/lcms.md
+legal/java.desktop/libpng.md
+legal/java.desktop/LICENSE
+legal/java.desktop/mesa3d.md
+legal/java.desktop/opengl.md
+legal/java.instrument/ADDITIONAL_LICENSE_INFO
+legal/java.instrument/ASSEMBLY_EXCEPTION
+legal/java.instrument/LICENSE
+legal/java.logging/ADDITIONAL_LICENSE_INFO
+legal/java.logging/ASSEMBLY_EXCEPTION
+legal/java.logging/LICENSE
+legal/java.management/ADDITIONAL_LICENSE_INFO
+legal/java.management/ASSEMBLY_EXCEPTION
+legal/java.management/LICENSE
+legal/java.management.rmi/ADDITIONAL_LICENSE_INFO
+legal/java.management.rmi/ASSEMBLY_EXCEPTION
+legal/java.management.rmi/LICENSE
+legal/java.naming/ADDITIONAL_LICENSE_INFO
+legal/java.naming/ASSEMBLY_EXCEPTION
+legal/java.naming/LICENSE
+legal/java.net.http/ADDITIONAL_LICENSE_INFO
+legal/java.net.http/ASSEMBLY_EXCEPTION
+legal/java.net.http/LICENSE
+legal/java.prefs/ADDITIONAL_LICENSE_INFO
+legal/java.prefs/ASSEMBLY_EXCEPTION
+legal/java.prefs/LICENSE
+legal/java.rmi/ADDITIONAL_LICENSE_INFO
+legal/java.rmi/ASSEMBLY_EXCEPTION
+legal/java.rmi/LICENSE
+legal/java.scripting/ADDITIONAL_LICENSE_INFO
+legal/java.scripting/ASSEMBLY_EXCEPTION
+legal/java.scripting/LICENSE
+legal/java.se/ADDITIONAL_LICENSE_INFO
+legal/java.se/ASSEMBLY_EXCEPTION
+legal/java.se/LICENSE
+legal/java.security.jgss/ADDITIONAL_LICENSE_INFO
+legal/java.security.jgss/ASSEMBLY_EXCEPTION
+legal/java.security.jgss/LICENSE
+legal/java.security.sasl/ADDITIONAL_LICENSE_INFO
+legal/java.security.sasl/ASSEMBLY_EXCEPTION
+legal/java.security.sasl/LICENSE
+legal/java.smartcardio/ADDITIONAL_LICENSE_INFO
+legal/java.smartcardio/ASSEMBLY_EXCEPTION
+legal/java.smartcardio/LICENSE
+legal/java.sql/ADDITIONAL_LICENSE_INFO
+legal/java.sql/ASSEMBLY_EXCEPTION
+legal/java.sql/LICENSE
+legal/java.sql.rowset/ADDITIONAL_LICENSE_INFO
+legal/java.sql.rowset/ASSEMBLY_EXCEPTION
+legal/java.sql.rowset/LICENSE
+legal/java.transaction.xa/ADDITIONAL_LICENSE_INFO
+legal/java.transaction.xa/ASSEMBLY_EXCEPTION
+legal/java.transaction.xa/LICENSE
+legal/java.xml/ADDITIONAL_LICENSE_INFO
+legal/java.xml/ASSEMBLY_EXCEPTION
+legal/java.xml/bcel.md
+legal/java.xml/dom.md
+legal/java.xml/jcup.md
+legal/java.xml/LICENSE
+legal/java.xml/xalan.md
+legal/java.xml/xerces.md
+legal/java.xml.crypto/ADDITIONAL_LICENSE_INFO
+legal/java.xml.crypto/ASSEMBLY_EXCEPTION
+legal/java.xml.crypto/LICENSE
+legal/java.xml.crypto/santuario.md
+legal/jdk.accessibility/ADDITIONAL_LICENSE_INFO
+legal/jdk.accessibility/ASSEMBLY_EXCEPTION
+legal/jdk.accessibility/LICENSE
+legal/jdk.aot/ADDITIONAL_LICENSE_INFO
+legal/jdk.aot/ASSEMBLY_EXCEPTION
+legal/jdk.aot/LICENSE
+legal/jdk.charsets/ADDITIONAL_LICENSE_INFO
+legal/jdk.charsets/ASSEMBLY_EXCEPTION
+legal/jdk.charsets/LICENSE
+legal/jdk.crypto.cryptoki/ADDITIONAL_LICENSE_INFO
+legal/jdk.crypto.cryptoki/ASSEMBLY_EXCEPTION
+legal/jdk.crypto.cryptoki/LICENSE
+legal/jdk.crypto.cryptoki/pkcs11cryptotoken.md
+legal/jdk.crypto.cryptoki/pkcs11wrapper.md
+legal/jdk.crypto.ec/ADDITIONAL_LICENSE_INFO
+legal/jdk.crypto.ec/ASSEMBLY_EXCEPTION
+legal/jdk.crypto.ec/ecc.md
+legal/jdk.crypto.ec/LICENSE
+legal/jdk.crypto.mscapi/ADDITIONAL_LICENSE_INFO
+legal/jdk.crypto.mscapi/ASSEMBLY_EXCEPTION
+legal/jdk.crypto.mscapi/LICENSE
+legal/jdk.dynalink/ADDITIONAL_LICENSE_INFO
+legal/jdk.dynalink/ASSEMBLY_EXCEPTION
+legal/jdk.dynalink/dynalink.md
+legal/jdk.dynalink/LICENSE
+legal/jdk.httpserver/ADDITIONAL_LICENSE_INFO
+legal/jdk.httpserver/ASSEMBLY_EXCEPTION
+legal/jdk.httpserver/LICENSE
+legal/jdk.internal.ed/ADDITIONAL_LICENSE_INFO
+legal/jdk.internal.ed/ASSEMBLY_EXCEPTION
+legal/jdk.internal.ed/LICENSE
+legal/jdk.internal.le/ADDITIONAL_LICENSE_INFO
+legal/jdk.internal.le/ASSEMBLY_EXCEPTION
+legal/jdk.internal.le/jline.md
+legal/jdk.internal.le/LICENSE
+legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO
+legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION
+legal/jdk.internal.vm.ci/LICENSE
+legal/jdk.internal.vm.compiler/ADDITIONAL_LICENSE_INFO
+legal/jdk.internal.vm.compiler/ASSEMBLY_EXCEPTION
+legal/jdk.internal.vm.compiler/LICENSE
+legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO
+legal/jdk.internal.vm.compiler.management/ASSEMBLY_EXCEPTION
+legal/jdk.internal.vm.compiler.management/LICENSE
+legal/jdk.jdwp.agent/ADDITIONAL_LICENSE_INFO
+legal/jdk.jdwp.agent/ASSEMBLY_EXCEPTION
+legal/jdk.jdwp.agent/LICENSE
+legal/jdk.jfr/ADDITIONAL_LICENSE_INFO
+legal/jdk.jfr/ASSEMBLY_EXCEPTION
+legal/jdk.jfr/LICENSE
+legal/jdk.jsobject/ADDITIONAL_LICENSE_INFO
+legal/jdk.jsobject/ASSEMBLY_EXCEPTION
+legal/jdk.jsobject/LICENSE
+legal/jdk.localedata/ADDITIONAL_LICENSE_INFO
+legal/jdk.localedata/ASSEMBLY_EXCEPTION
+legal/jdk.localedata/cldr.md
+legal/jdk.localedata/LICENSE
+legal/jdk.localedata/thaidict.md
+legal/jdk.management/ADDITIONAL_LICENSE_INFO
+legal/jdk.management/ASSEMBLY_EXCEPTION
+legal/jdk.management/LICENSE
+legal/jdk.management.agent/ADDITIONAL_LICENSE_INFO
+legal/jdk.management.agent/ASSEMBLY_EXCEPTION
+legal/jdk.management.agent/LICENSE
+legal/jdk.management.jfr/ADDITIONAL_LICENSE_INFO
+legal/jdk.management.jfr/ASSEMBLY_EXCEPTION
+legal/jdk.management.jfr/LICENSE
+legal/jdk.naming.dns/ADDITIONAL_LICENSE_INFO
+legal/jdk.naming.dns/ASSEMBLY_EXCEPTION
+legal/jdk.naming.dns/LICENSE
+legal/jdk.naming.rmi/ADDITIONAL_LICENSE_INFO
+legal/jdk.naming.rmi/ASSEMBLY_EXCEPTION
+legal/jdk.naming.rmi/LICENSE
+legal/jdk.net/ADDITIONAL_LICENSE_INFO
+legal/jdk.net/ASSEMBLY_EXCEPTION
+legal/jdk.net/LICENSE
+legal/jdk.pack/ADDITIONAL_LICENSE_INFO
+legal/jdk.pack/ASSEMBLY_EXCEPTION
+legal/jdk.pack/LICENSE
+legal/jdk.scripting.nashorn/ADDITIONAL_LICENSE_INFO
+legal/jdk.scripting.nashorn/ASSEMBLY_EXCEPTION
+legal/jdk.scripting.nashorn/double-conversion.md
+legal/jdk.scripting.nashorn/joni.md
+legal/jdk.scripting.nashorn/LICENSE
+legal/jdk.scripting.nashorn.shell/ADDITIONAL_LICENSE_INFO
+legal/jdk.scripting.nashorn.shell/ASSEMBLY_EXCEPTION
+legal/jdk.scripting.nashorn.shell/LICENSE
+legal/jdk.sctp/ADDITIONAL_LICENSE_INFO
+legal/jdk.sctp/ASSEMBLY_EXCEPTION
+legal/jdk.sctp/LICENSE
+legal/jdk.security.auth/ADDITIONAL_LICENSE_INFO
+legal/jdk.security.auth/ASSEMBLY_EXCEPTION
+legal/jdk.security.auth/LICENSE
+legal/jdk.security.jgss/ADDITIONAL_LICENSE_INFO
+legal/jdk.security.jgss/ASSEMBLY_EXCEPTION
+legal/jdk.security.jgss/LICENSE
+legal/jdk.unsupported/ADDITIONAL_LICENSE_INFO
+legal/jdk.unsupported/ASSEMBLY_EXCEPTION
+legal/jdk.unsupported/LICENSE
+legal/jdk.xml.dom/ADDITIONAL_LICENSE_INFO
+legal/jdk.xml.dom/ASSEMBLY_EXCEPTION
+legal/jdk.xml.dom/LICENSE
+legal/jdk.zipfs/ADDITIONAL_LICENSE_INFO
+legal/jdk.zipfs/ASSEMBLY_EXCEPTION
+legal/jdk.zipfs/LICENSE
+lib/classlist
+lib/fontconfig.bfc
+lib/fontconfig.properties.src
+lib/jawt.lib
+lib/jfr/default.jfc
+lib/jfr/profile.jfc
+lib/jrt-fs.jar
+lib/jvm.cfg
+lib/jvm.lib
+lib/modules
+lib/psfont.properties.ja
+lib/psfontj2d.properties
+lib/security/blacklisted.certs
+lib/security/cacerts
+lib/security/default.policy
+lib/security/public_suffix_list.dat
+lib/server/Xusage.txt
+lib/tzdb.dat
+lib/tzmappings
+release
+bin/fxplugins.dll
+bin/api-ms-win-crt-time-l1-1-0.dll
+bin/api-ms-win-crt-filesystem-l1-1-0.dll
+bin/javafx_iio.dll
+bin/gstreamer-lite.dll
+bin/api-ms-win-crt-utility-l1-1-0.dll
+bin/api-ms-win-core-console-l1-1-0.dll
+bin/glass.dll
+bin/api-ms-win-core-processenvironment-l1-1-0.dll
+bin/prism_common.dll
+bin/ucrtbase.dll
+bin/prism_sw.dll
+bin/api-ms-win-core-file-l1-1-0.dll
+bin/api-ms-win-core-errorhandling-l1-1-0.dll
+bin/api-ms-win-crt-process-l1-1-0.dll
+bin/prism_d3d.dll
+bin/api-ms-win-core-heap-l1-1-0.dll
+bin/glib-lite.dll
+bin/api-ms-win-core-processthreads-l1-1-1.dll
+bin/api-ms-win-core-processthreads-l1-1-0.dll
+bin/javapackager.exe
+bin/api-ms-win-crt-convert-l1-1-0.dll
+bin/api-ms-win-crt-private-l1-1-0.dll
+bin/api-ms-win-core-file-l2-1-0.dll
+bin/jfxwebkit.dll
+bin/api-ms-win-core-debug-l1-1-0.dll
+bin/api-ms-win-crt-stdio-l1-1-0.dll
+bin/api-ms-win-core-localization-l1-2-0.dll
+bin/api-ms-win-core-datetime-l1-1-0.dll
+bin/api-ms-win-crt-math-l1-1-0.dll
+bin/api-ms-win-core-file-l1-2-0.dll
+bin/api-ms-win-core-timezone-l1-1-0.dll
+bin/api-ms-win-core-rtlsupport-l1-1-0.dll
+bin/api-ms-win-core-handle-l1-1-0.dll
+bin/decora_sse.dll
+bin/api-ms-win-core-synch-l1-1-0.dll
+bin/api-ms-win-core-string-l1-1-0.dll
+bin/api-ms-win-core-interlocked-l1-1-0.dll
+bin/api-ms-win-core-memory-l1-1-0.dll
+bin/api-ms-win-core-util-l1-1-0.dll
+bin/api-ms-win-core-namedpipe-l1-1-0.dll
+bin/api-ms-win-crt-conio-l1-1-0.dll
+bin/api-ms-win-crt-runtime-l1-1-0.dll
+bin/api-ms-win-crt-string-l1-1-0.dll
+bin/api-ms-win-crt-multibyte-l1-1-0.dll
+bin/api-ms-win-core-synch-l1-2-0.dll
+bin/api-ms-win-core-profile-l1-1-0.dll
+bin/api-ms-win-crt-locale-l1-1-0.dll
+bin/api-ms-win-crt-heap-l1-1-0.dll
+bin/api-ms-win-core-sysinfo-l1-1-0.dll
+bin/javafx_font.dll
+bin/api-ms-win-core-libraryloader-l1-1-0.dll
+bin/api-ms-win-crt-environment-l1-1-0.dll
+bin/jfxmedia.dll
+lib/javafx.properties
+lib/javafx-swt.jar
+lib/ant-javafx.jar
+legal/jdk.packager.services/LICENSE
+legal/jdk.packager.services/ADDITIONAL_LICENSE_INFO
+legal/jdk.packager.services/ASSEMBLY_EXCEPTION
+legal/jdk.packager/LICENSE
+legal/jdk.packager/ADDITIONAL_LICENSE_INFO
+legal/jdk.packager/ASSEMBLY_EXCEPTION
+legal/javafx.media/glib.md
+legal/javafx.media/gstreamer.md
+legal/javafx.media/libffi.md
+legal/javafx.media/LICENSE
+legal/javafx.media/applecoreaudio.md
+legal/javafx.media/ADDITIONAL_LICENSE_INFO
+legal/javafx.media/ASSEMBLY_EXCEPTION
+legal/javafx.web/icu_v51.md
+legal/javafx.web/LICENSE
+legal/javafx.web/webkit.md
+legal/javafx.web/libxslt.md
+legal/javafx.web/ADDITIONAL_LICENSE_INFO
+legal/javafx.web/ASSEMBLY_EXCEPTION
+legal/javafx.web/libxml2.md
+legal/javafx.swing/LICENSE
+legal/javafx.swing/ADDITIONAL_LICENSE_INFO
+legal/javafx.swing/ASSEMBLY_EXCEPTION
+legal/javafx.graphics/LICENSE
+legal/javafx.graphics/ADDITIONAL_LICENSE_INFO
+legal/javafx.graphics/ASSEMBLY_EXCEPTION
+legal/javafx.graphics/jpeg_v7.md
+legal/javafx.base/LICENSE
+legal/javafx.base/ADDITIONAL_LICENSE_INFO
+legal/javafx.base/ASSEMBLY_EXCEPTION
+legal/javafx.controls/LICENSE
+legal/javafx.controls/ADDITIONAL_LICENSE_INFO
+legal/javafx.controls/ASSEMBLY_EXCEPTION
+legal/javafx.fxml/LICENSE
+legal/javafx.fxml/ADDITIONAL_LICENSE_INFO
+legal/javafx.fxml/ASSEMBLY_EXCEPTION
+jmods/javafx.base.jmod
+jmods/javafx.media.jmod
+jmods/javafx.swing.jmod
+jmods/javafx.controls.jmod
+jmods/jdk.packager.services.jmod
+jmods/jdk.packager.jmod
+jmods/javafx.web.jmod
+jmods/javafx.fxml.jmod
+jmods/javafx.graphics.jmod

make/CompileJavaModules.gmk

@@ -83,7 +83,7 @@ java.datatransfer_COPY += flavormap.properties
 ################################################################################
 
 java.desktop_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference \
-    '-Xdoclint/package:java.*,javax.*' -Xlint:exports \
+    '-Xdoclint/package:java.*,javax.*' -Xlint:exports -Xlint:-serial \
     --doclint-format html4
 java.desktop_COPY += .gif .png .wav .txt .xml .css .pf
 java.desktop_CLEAN += iio-plugin.properties cursors.properties

make/autoconf/flags-cflags.m4

@@ -106,17 +106,11 @@ AC_DEFUN([FLAGS_SETUP_SHARED_LIBS],
 
 AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
 [
-  # By default don't set any specific assembler debug
-  # info flags for toolchains unless we know they work.
-  # See JDK-8207057.
-  ASFLAGS_DEBUG_SYMBOLS=""
   # Debug symbols
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
     CFLAGS_DEBUG_SYMBOLS="-g"
-    ASFLAGS_DEBUG_SYMBOLS="-g"
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     CFLAGS_DEBUG_SYMBOLS="-g"
-    ASFLAGS_DEBUG_SYMBOLS="-g"
   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
     # -g0 enables debug symbols without disabling inlining.
     CFLAGS_DEBUG_SYMBOLS="-g0 -xs"
@@ -127,7 +121,6 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
   fi
 
   AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
-  AC_SUBST(ASFLAGS_DEBUG_SYMBOLS)
 ])
 
 AC_DEFUN([FLAGS_SETUP_WARNINGS],
@@ -373,20 +366,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS],
 
   FLAGS_SETUP_CFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])
 
-  COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off"
-  # Check that the compiler supports -ffp-contract=off flag
-  # Set FDLIBM_CFLAGS to -ffp-contract=off if it does. Empty
-  # otherwise.
-  # These flags are required for GCC-based builds of
-  # fdlibm with optimization without losing precision.
-  # Notably, -ffp-contract=off needs to be added for GCC >= 4.6.
-  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-    FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${COMPILER_FP_CONTRACT_OFF_FLAG}],
-	IF_TRUE: [FDLIBM_CFLAGS=${COMPILER_FP_CONTRACT_OFF_FLAG}],
-	IF_FALSE: [FDLIBM_CFLAGS=""])
-  fi
-  AC_SUBST(FDLIBM_CFLAGS)
-
   # Tests are only ever compiled for TARGET
   CFLAGS_TESTLIB="$CFLAGS_JDKLIB"
   CXXFLAGS_TESTLIB="$CXXFLAGS_JDKLIB"
@@ -494,8 +473,8 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   fi
 
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -fcheck-new -fstack-protector"
-    TOOLCHAIN_CFLAGS_JDK="-pipe -fstack-protector"
+    TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -fcheck-new"
+    TOOLCHAIN_CFLAGS_JDK="-pipe"
     TOOLCHAIN_CFLAGS_JDK_CONLY="-fno-strict-aliasing" # technically NOT for CXX (but since this gives *worse* performance, use no-strict-aliasing everywhere!)
 
     CXXSTD_CXXFLAG="-std=gnu++98"

make/autoconf/hotspot.m4

@@ -338,18 +338,17 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
     fi
   fi
 
-  # Only enable ZGC on supported platforms
-  AC_MSG_CHECKING([if zgc can be built])
-  if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
-    AC_MSG_RESULT([yes])
+  # Only enable ZGC on Linux x86_64
+  AC_MSG_CHECKING([if zgc should be built])
+  if HOTSPOT_CHECK_JVM_FEATURE(zgc); then
+    if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
+      AC_MSG_RESULT([yes])
+    else
+      DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES zgc"
+      AC_MSG_RESULT([no, platform not supported])
+    fi
   else
-    DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES zgc"
-    AC_MSG_RESULT([no, platform not supported])
-  fi
-
-  # Disable unsupported GCs for Zero
-  if HOTSPOT_CHECK_JVM_VARIANT(zero); then
-    DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES epsilongc g1gc zgc"
+    AC_MSG_RESULT([no])
   fi
 
   # Turn on additional features based on other parts of configure
@@ -483,7 +482,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
   fi
 
   # All variants but minimal (and custom) get these features
-  NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc epsilongc jni-check jvmti management nmt services vm-structs zgc"
+  NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc epsilongc jni-check jvmti management nmt services vm-structs"
 
   AC_MSG_CHECKING([if cds should be enabled])
   if test "x$ENABLE_CDS" = "xtrue"; then

make/autoconf/jdk-version.m4

@@ -139,18 +139,15 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     AC_MSG_ERROR([--with-version-string must have a value])
   elif test "x$with_version_string" != x; then
     # Additional [] needed to keep m4 from mangling shell constructs.
-    if [ [[ $with_version_string =~ ^([0-9]+)(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(-([a-zA-Z]+))?((\+)([0-9]+)?(-([-a-zA-Z0-9.]+))?)?$ ]] ]; then
+    if [ [[ $with_version_string =~ ^([0-9]+)(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(-([a-zA-Z]+))?((\+)([0-9]+)?(-([-a-zA-Z0-9.]+))?)?$ ]] ]; then
       VERSION_FEATURE=${BASH_REMATCH[[1]]}
       VERSION_INTERIM=${BASH_REMATCH[[3]]}
       VERSION_UPDATE=${BASH_REMATCH[[5]]}
       VERSION_PATCH=${BASH_REMATCH[[7]]}
-      VERSION_EXTRA1=${BASH_REMATCH[[9]]}
-      VERSION_EXTRA2=${BASH_REMATCH[[11]]}
-      VERSION_EXTRA3=${BASH_REMATCH[[13]]}
-      VERSION_PRE=${BASH_REMATCH[[15]]}
-      version_plus_separator=${BASH_REMATCH[[17]]}
-      VERSION_BUILD=${BASH_REMATCH[[18]]}
-      VERSION_OPT=${BASH_REMATCH[[20]]}
+      VERSION_PRE=${BASH_REMATCH[[9]]}
+      version_plus_separator=${BASH_REMATCH[[11]]}
+      VERSION_BUILD=${BASH_REMATCH[[12]]}
+      VERSION_OPT=${BASH_REMATCH[[14]]}
       # Unspecified numerical fields are interpreted as 0.
       if test "x$VERSION_INTERIM" = x; then
         VERSION_INTERIM=0
@@ -161,15 +158,6 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
       if test "x$VERSION_PATCH" = x; then
         VERSION_PATCH=0
       fi
-      if test "x$VERSION_EXTRA1" = x; then
-        VERSION_EXTRA1=0
-      fi
-      if test "x$VERSION_EXTRA2" = x; then
-        VERSION_EXTRA2=0
-      fi
-      if test "x$VERSION_EXTRA3" = x; then
-        VERSION_EXTRA3=0
-      fi
       if test "x$version_plus_separator" != x \
           && test "x$VERSION_BUILD$VERSION_OPT" = x; then
         AC_MSG_ERROR([Version string contains + but both 'BUILD' and 'OPT' are missing])
@@ -339,72 +327,6 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     fi
   fi
 
-  # The 1st version extra number, if any
-  AC_ARG_WITH(version-extra1, [AS_HELP_STRING([--with-version-extra1],
-      [Set 1st version extra number @<:@not specified@:>@])],
-      [with_version_extra1_present=true], [with_version_extra1_present=false])
-
-  if test "x$with_version_extra1_present" = xtrue; then
-    if test "x$with_version_extra1" = xyes; then
-      AC_MSG_ERROR([--with-version-extra1 must have a value])
-    elif test "x$with_version_extra1" = xno; then
-      # Interpret --without-* as empty string (i.e. 0) instead of the literal "no"
-      VERSION_EXTRA1=0
-    elif test "x$with_version_extra1" = x; then
-      VERSION_EXTRA1=0
-    else
-      JDKVER_CHECK_AND_SET_NUMBER(VERSION_EXTRA1, $with_version_extra1)
-    fi
-  else
-    if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
-      VERSION_EXTRA1=$DEFAULT_VERSION_EXTRA1
-    fi
-  fi
-
-  # The 2nd version extra number, if any
-  AC_ARG_WITH(version-extra2, [AS_HELP_STRING([--with-version-extra2],
-      [Set 2nd version extra number @<:@not specified@:>@])],
-      [with_version_extra2_present=true], [with_version_extra2_present=false])
-
-  if test "x$with_version_extra2_present" = xtrue; then
-    if test "x$with_version_extra2" = xyes; then
-      AC_MSG_ERROR([--with-version-extra2 must have a value])
-    elif test "x$with_version_extra2" = xno; then
-      # Interpret --without-* as empty string (i.e. 0) instead of the literal "no"
-      VERSION_EXTRA2=0
-    elif test "x$with_version_extra2" = x; then
-      VERSION_EXTRA2=0
-    else
-      JDKVER_CHECK_AND_SET_NUMBER(VERSION_EXTRA2, $with_version_extra2)
-    fi
-  else
-    if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
-      VERSION_EXTRA2=$DEFAULT_VERSION_EXTRA2
-    fi
-  fi
-
-  # The 3rd version extra number, if any
-  AC_ARG_WITH(version-extra3, [AS_HELP_STRING([--with-version-extra3],
-      [Set 3rd version extra number @<:@not specified@:>@])],
-      [with_version_extra3_present=true], [with_version_extra3_present=false])
-
-  if test "x$with_version_extra3_present" = xtrue; then
-    if test "x$with_version_extra3" = xyes; then
-      AC_MSG_ERROR([--with-version-extra3 must have a value])
-    elif test "x$with_version_extra3" = xno; then
-      # Interpret --without-* as empty string (i.e. 0) instead of the literal "no"
-      VERSION_EXTRA3=0
-    elif test "x$with_version_extra3" = x; then
-      VERSION_EXTRA3=0
-    else
-      JDKVER_CHECK_AND_SET_NUMBER(VERSION_EXTRA3, $with_version_extra3)
-    fi
-  else
-    if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
-      VERSION_EXTRA3=$DEFAULT_VERSION_EXTRA3
-    fi
-  fi
-
   # Calculate derived version properties
 
   # Set VERSION_IS_GA based on if VERSION_PRE has a value
@@ -417,12 +339,9 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   # VERSION_NUMBER but always with exactly 4 positions, with 0 for empty positions.
   VERSION_NUMBER_FOUR_POSITIONS=$VERSION_FEATURE.$VERSION_INTERIM.$VERSION_UPDATE.$VERSION_PATCH
 
-  # VERSION_NUMBER but always with all positions, with 0 for empty positions.
-  VERSION_NUMBER_ALL_POSITIONS=$VERSION_NUMBER_FOUR_POSITIONS.$VERSION_EXTRA1.$VERSION_EXTRA2.$VERSION_EXTRA3
-
-  stripped_version_number=$VERSION_NUMBER_ALL_POSITIONS
+  stripped_version_number=$VERSION_NUMBER_FOUR_POSITIONS
   # Strip trailing zeroes from stripped_version_number
-  for i in 1 2 3 4 5 6 ; do stripped_version_number=${stripped_version_number%.0} ; done
+  for i in 1 2 3 ; do stripped_version_number=${stripped_version_number%.0} ; done
   VERSION_NUMBER=$stripped_version_number
 
   # The complete version string, with additional build information
@@ -473,9 +392,6 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
   AC_SUBST(VERSION_INTERIM)
   AC_SUBST(VERSION_UPDATE)
   AC_SUBST(VERSION_PATCH)
-  AC_SUBST(VERSION_EXTRA1)
-  AC_SUBST(VERSION_EXTRA2)
-  AC_SUBST(VERSION_EXTRA3)
   AC_SUBST(VERSION_PRE)
   AC_SUBST(VERSION_BUILD)
   AC_SUBST(VERSION_OPT)

make/autoconf/spec.gmk.in

@@ -165,9 +165,6 @@ VERSION_FEATURE := @VERSION_FEATURE@
 VERSION_INTERIM := @VERSION_INTERIM@
 VERSION_UPDATE := @VERSION_UPDATE@
 VERSION_PATCH := @VERSION_PATCH@
-VERSION_EXTRA1 := @VERSION_EXTRA1@
-VERSION_EXTRA2 := @VERSION_EXTRA2@
-VERSION_EXTRA3 := @VERSION_EXTRA3@
 # The pre-release identifier (string)
 VERSION_PRE := @VERSION_PRE@
 # The build number (numerical)
@@ -206,9 +203,6 @@ VERSION_CFLAGS := \
     -DVERSION_INTERIM=$(VERSION_INTERIM) \
     -DVERSION_UPDATE=$(VERSION_UPDATE) \
     -DVERSION_PATCH=$(VERSION_PATCH) \
-    -DVERSION_EXTRA1=$(VERSION_EXTRA1) \
-    -DVERSION_EXTRA2=$(VERSION_EXTRA2) \
-    -DVERSION_EXTRA3=$(VERSION_EXTRA3) \
     -DVERSION_PRE='"$(VERSION_PRE)"' \
     -DVERSION_BUILD=$(VERSION_BUILD) \
     -DVERSION_OPT='"$(VERSION_OPT)"' \
@@ -450,7 +444,6 @@ CXXFLAGS_JDKEXE:=@CXXFLAGS_JDKEXE@
 LIBJSIG_HASHSTYLE_LDFLAGS := @LIBJSIG_HASHSTYLE_LDFLAGS@
 LIBJSIG_NOEXECSTACK_LDFLAGS := @LIBJSIG_NOEXECSTACK_LDFLAGS@
 
-FDLIBM_CFLAGS := @FDLIBM_CFLAGS@
 JVM_CFLAGS := @JVM_CFLAGS@
 JVM_LDFLAGS := @JVM_LDFLAGS@
 JVM_ASFLAGS := @JVM_ASFLAGS@
@@ -541,7 +534,6 @@ COPY_DEBUG_SYMBOLS := @COPY_DEBUG_SYMBOLS@
 ZIP_EXTERNAL_DEBUG_SYMBOLS := @ZIP_EXTERNAL_DEBUG_SYMBOLS@
 
 CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
-ASFLAGS_DEBUG_SYMBOLS:=@ASFLAGS_DEBUG_SYMBOLS@
 
 #
 # Compress (or not) jars

make/autoconf/version-numbers

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, 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
@@ -27,12 +27,9 @@
 
 DEFAULT_VERSION_FEATURE=11
 DEFAULT_VERSION_INTERIM=0
-DEFAULT_VERSION_UPDATE=2
+DEFAULT_VERSION_UPDATE=0
 DEFAULT_VERSION_PATCH=0
-DEFAULT_VERSION_EXTRA1=0
-DEFAULT_VERSION_EXTRA2=0
-DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2019-01-15
+DEFAULT_VERSION_DATE=2018-09-25
 DEFAULT_VERSION_CLASSFILE_MAJOR=55  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="10 11"

make/common/NativeCompilation.gmk

@@ -251,7 +251,6 @@ define SetupCompileNativeFileBody
         $$($$($1_BASE)_SYSROOT_CFLAGS)
     $1_BASE_CXXFLAGS := $$($$($1_BASE)_CXXFLAGS) $$($$($1_BASE)_EXTRA_CXXFLAGS) \
         $$($$($1_BASE)_SYSROOT_CFLAGS) $$($1_EXTRA_CXXFLAGS)
-    $1_BASE_ASFLAGS := $$($$($1_BASE)_ASFLAGS) $$($$($1_BASE)_EXTRA_ASFLAGS)
 
     ifneq ($$(filter %.c, $$($1_FILENAME)), )
       # Compile as a C file
@@ -267,7 +266,7 @@ define SetupCompileNativeFileBody
       $1_DEP_FLAG := $(C_FLAG_DEPS)
     else ifneq ($$(filter %.s %.S, $$($1_FILENAME)), )
       # Compile as assembler file
-      $1_FLAGS := $$($1_BASE_ASFLAGS)
+      $1_FLAGS := $$($$($1_BASE)_ASFLAGS)
       $1_COMPILER := $(AS)
       $1_DEP_FLAG :=
     else ifneq ($$(filter %.cpp %.cc %.mm, $$($1_FILENAME)), )
@@ -577,7 +576,6 @@ define SetupNativeCompilationBody
   ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true)
     $1_EXTRA_CFLAGS += $$(CFLAGS_DEBUG_SYMBOLS)
     $1_EXTRA_CXXFLAGS += $$(CFLAGS_DEBUG_SYMBOLS)
-    $1_EXTRA_ASFLAGS += $$(ASFLAGS_DEBUG_SYMBOLS)
   endif
 
   ifneq ($$($1_REORDER), )

make/common/SetupJavaCompilers.gmk

@@ -35,7 +35,8 @@ DISABLE_WARNINGS ?= -Xlint:all,-deprecation,-removal,-unchecked,-rawtypes,-cast,
 
 # If warnings needs to be non-fatal for testing purposes use a command like:
 # make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000"
-JAVAC_WARNINGS ?= -Xlint:all -Werror
+#JAVAC_WARNINGS := -Xlint:all -Werror
+JAVAC_WARNINGS := -Xlint:all -Xmaxwarns 10000
 
 # The BOOT_JAVAC setup uses the boot jdk compiler to compile the tools
 # and the interim javac, to be run by the boot jdk.

make/common/TestFilesCompilation.gmk

@@ -94,7 +94,7 @@ define SetupTestFilesCompilationBody
         CFLAGS := $$($1_CFLAGS) $$($1_CFLAGS_$$(name)), \
         LDFLAGS := $$($1_LDFLAGS) $$($1_LDFLAGS_$$(name)), \
         LIBS := $$($1_LIBS_$$(name)), \
-        OPTIMIZATION := $$(if $$($1_OPTIMIZATION_$$(name)),$$($1_OPTIMIZATION_$$(name)),LOW), \
+        OPTIMIZATION := LOW, \
         COPY_DEBUG_SYMBOLS := false, \
         STRIP_SYMBOLS := false, \
     )) \

make/conf/jib-profiles.js

@@ -709,6 +709,14 @@ var getJibProfilesProfiles = function (input, common, data) {
                        profiles[openName].artifacts["jdk"].remote));
     });
 
+    // Enable ZGC in linux-x64-open builds
+    [ "linux-x64-open" ].forEach(function (name) {
+        var configureArgs = { configure_args: [ "--with-jvm-features=zgc" ] };
+        var debugName = name + common.debug_suffix;
+        profiles[name] = concatObjects(profiles[name], configureArgs);
+        profiles[debugName] = concatObjects(profiles[debugName], configureArgs);
+    });
+
     // Generate cmp-baseline profiles for each main profile and their
     // corresponding debug profile. This profile does a compare build run with no
     // changes to verify that the compare script has a clean baseline
@@ -893,7 +901,7 @@ var getJibProfilesDependencies = function (input, common) {
         jtreg: {
             server: "javare",
             revision: "4.2",
-            build_number: "b13",
+            build_number: "b12",
             checksum_file: "MD5_VALUES",
             file: "jtreg_bin-4.2.zip",
             environment_name: "JT_HOME",

make/copy/Copy-java.desktop.gmk

@@ -80,3 +80,13 @@ $(eval $(call SetupCopyLegalFiles, COPY_LEGAL, \
 TARGETS += $(COPY_LEGAL)
 
 ################################################################################
+
+FONTFILE_SRC_DIR := $(TOPDIR)/src/java.desktop/share
+FONTFILE_SRCS := $(wildcard $(FONTFILE_SRC_DIR)/fonts/*.ttf) $(FONTFILE_SRC_DIR)/fonts/fonts.dir $(FONTFILE_SRC_DIR)/fonts/font.conf
+FONTFILE_TARGET_FILES := $(subst $(FONTFILE_SRC_DIR),$(LIB_DST_DIR),$(FONTFILE_SRCS))
+
+$(LIB_DST_DIR)/fonts/%: $(FONTFILE_SRC_DIR)/fonts/%
+	$(call install-file)
+
+
+TARGETS += $(FONTFILE_TARGET_FILES)

make/data/characterdata/CharacterData00.java.template

@@ -653,21 +653,6 @@ class CharacterData00 extends CharacterData {
         return retval;
     }
 
-    boolean isDigit(int ch) {
-        int props = getProperties(ch);
-        return (props & $$maskType) == Character.DECIMAL_DIGIT_NUMBER;
-    }
-
-    boolean isLowerCase(int ch) {
-        int props = getProperties(ch);
-        return (props & $$maskType) == Character.LOWERCASE_LETTER;
-    }
-
-    boolean isUpperCase(int ch) {
-        int props = getProperties(ch);
-        return (props & $$maskType) == Character.UPPERCASE_LETTER;
-    }
-
     boolean isWhitespace(int ch) {
         int props = getProperties(ch);
         return ((props & $$maskIdentifierInfo) == $$valueJavaWhitespace);

make/data/characterdata/CharacterData01.java.template

@@ -418,21 +418,6 @@ class CharacterData01 extends CharacterData {
         return retval;
     }
 
-    boolean isDigit(int ch) {
-        int props = getProperties(ch);
-        return (props & $$maskType) == Character.DECIMAL_DIGIT_NUMBER;
-    }
-
-    boolean isLowerCase(int ch) {
-        int props = getProperties(ch);
-        return (props & $$maskType) == Character.LOWERCASE_LETTER;
-    }
-
-    boolean isUpperCase(int ch) {
-        int props = getProperties(ch);
-        return (props & $$maskType) == Character.UPPERCASE_LETTER;
-    }
-
     boolean isWhitespace(int ch) {
         int props = getProperties(ch);
         return ((props & $$maskIdentifierInfo) == $$valueJavaWhitespace);

make/data/characterdata/CharacterData02.java.template

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -217,21 +217,6 @@ class CharacterData02 extends CharacterData {
         return retval;
     }
 
-    boolean isDigit(int ch) {
-        int props = getProperties(ch);
-        return (props & $$maskType) == Character.DECIMAL_DIGIT_NUMBER;
-    }
-
-    boolean isLowerCase(int ch) {
-        int props = getProperties(ch);
-        return (props & $$maskType) == Character.LOWERCASE_LETTER;
-    }
-
-    boolean isUpperCase(int ch) {
-        int props = getProperties(ch);
-        return (props & $$maskType) == Character.UPPERCASE_LETTER;
-    }
-
     boolean isWhitespace(int ch) {
         return (getProperties(ch) & $$maskIdentifierInfo) == $$valueJavaWhitespace;
     }

make/data/characterdata/CharacterData0E.java.template

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -217,21 +217,6 @@ class CharacterData0E extends CharacterData {
         return retval;
     }
 
-    boolean isDigit(int ch) {
-        int props = getProperties(ch);
-        return (props & $$maskType) == Character.DECIMAL_DIGIT_NUMBER;
-    }
-
-    boolean isLowerCase(int ch) {
-        int props = getProperties(ch);
-        return (props & $$maskType) == Character.LOWERCASE_LETTER;
-    }
-
-    boolean isUpperCase(int ch) {
-        int props = getProperties(ch);
-        return (props & $$maskType) == Character.UPPERCASE_LETTER;
-    }
-
     boolean isWhitespace(int ch) {
         int props = getProperties(ch);
         return ((props & $$maskIdentifierInfo) == $$valueJavaWhitespace);

make/data/characterdata/CharacterDataLatin1.java.template

@@ -25,8 +25,6 @@
 
 package java.lang;
 
-import jdk.internal.HotSpotIntrinsicCandidate;
-
 /** The CharacterData class encapsulates the large tables found in
     Java.lang.Character. */
 
@@ -80,23 +78,6 @@ class CharacterDataLatin1 extends CharacterData {
         return props;
     }
 
-    @HotSpotIntrinsicCandidate
-    boolean isDigit(int ch) {
-        return '0' <= ch && ch <= '9';
-    }
-
-    @HotSpotIntrinsicCandidate
-    boolean isLowerCase(int ch) {
-        int props = getProperties(ch);
-        return (props & $$maskType) == Character.LOWERCASE_LETTER;
-    }
-
-    @HotSpotIntrinsicCandidate
-    boolean isUpperCase(int ch) {
-        int props = getProperties(ch);
-        return (props & $$maskType) == Character.UPPERCASE_LETTER;
-    }
-
     boolean isOtherLowercase(int ch) {
         int props = getPropertiesEx(ch);
         return (props & $$maskOtherLowercase) != 0;
@@ -233,7 +214,6 @@ class CharacterDataLatin1 extends CharacterData {
         return retval;
     }
 
-    @HotSpotIntrinsicCandidate
     boolean isWhitespace(int ch) {
         int props = getProperties(ch);
         return ((props & $$maskIdentifierInfo) == $$valueJavaWhitespace);

make/data/characterdata/CharacterDataPrivateUse.java.template

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -41,59 +41,47 @@ class CharacterDataPrivateUse extends CharacterData {
     }
 
     boolean isJavaIdentifierStart(int ch) {
-	return false;
+		return false;
     }
 
     boolean isJavaIdentifierPart(int ch) {
-	return false;
+		return false;
     }
 
     boolean isUnicodeIdentifierStart(int ch) {
-        return false;
+		return false;
     }
 
     boolean isUnicodeIdentifierPart(int ch) {
-        return false;
+		return false;
     }
 
     boolean isIdentifierIgnorable(int ch) {
-        return false;
+		return false;
     }
 
     int toLowerCase(int ch) {
-        return ch;
+		return ch;
     }
 
     int toUpperCase(int ch) {
-        return ch;
+		return ch;
     }
 
     int toTitleCase(int ch) {
-        return ch;
+		return ch;
     }
 
     int digit(int ch, int radix) {
-        return -1;
+		return -1;
     }
 
     int getNumericValue(int ch) {
-        return -1;
-    }
-
-    boolean isDigit(int ch) {
-        return false;
-    }
-
-    boolean isLowerCase(int ch) {
-	return false;
-    }
-
-    boolean isUpperCase(int ch) {
-	return false;
+		return -1;
     }
 
     boolean isWhitespace(int ch) {
-	return false;
+		return false;
     }
 
     byte getDirectionality(int ch) {
@@ -103,7 +91,7 @@ class CharacterDataPrivateUse extends CharacterData {
     }
 
     boolean isMirrored(int ch) {
-        return false;
+		return false;
     }
 
     static final CharacterData instance = new CharacterDataPrivateUse();

make/data/characterdata/CharacterDataUndefined.java.template

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, 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
@@ -35,71 +35,59 @@ class CharacterDataUndefined extends CharacterData {
     }
 
     int getType(int ch) {
-        return Character.UNASSIGNED;
+	return Character.UNASSIGNED;
     }
 
     boolean isJavaIdentifierStart(int ch) {
-        return false;
+		return false;
     }
 
     boolean isJavaIdentifierPart(int ch) {
-        return false;
+		return false;
     }
 
     boolean isUnicodeIdentifierStart(int ch) {
-        return false;
+		return false;
     }
 
     boolean isUnicodeIdentifierPart(int ch) {
-        return false;
+		return false;
     }
 
     boolean isIdentifierIgnorable(int ch) {
-        return false;
+		return false;
     }
 
     int toLowerCase(int ch) {
-        return ch;
+		return ch;
     }
 
     int toUpperCase(int ch) {
-        return ch;
+		return ch;
     }
 
     int toTitleCase(int ch) {
-        return ch;
+		return ch;
     }
 
     int digit(int ch, int radix) {
-        return -1;
+		return -1;
     }
 
     int getNumericValue(int ch) {
-        return -1;
-    }
-
-    boolean isDigit(int ch) {
-        return false;
-    }
-
-    boolean isLowerCase(int ch) {
-        return false;
-    }
-
-    boolean isUpperCase(int ch) {
-        return false;
+		return -1;
     }
 
     boolean isWhitespace(int ch) {
-        return false;
+		return false;
     }
 
     byte getDirectionality(int ch) {
-        return Character.DIRECTIONALITY_UNDEFINED;
+		return Character.DIRECTIONALITY_UNDEFINED;
     }
 
     boolean isMirrored(int ch) {
-        return false;
+		return false;
     }
 
     static final CharacterData instance = new CharacterDataUndefined();

make/data/currency/CurrencyData.properties

@@ -32,7 +32,7 @@ formatVersion=3
 # Version of the currency code information in this class.
 # It is a serial number that accompanies with each amendment.
 
-dataVersion=169
+dataVersion=167
 
 # List of all valid ISO 4217 currency codes.
 # To ensure compatibility, do not remove codes.
@@ -54,7 +54,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
     SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\
     SRD968-SRG740-SSP728-STD678-STN930-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
     TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-UYI940-\
-    UYU858-UZS860-VEB862-VEF937-VES928-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
+    UYU858-UZS860-VEB862-VEF937-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
     XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\
     XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWL932-\
     ZWN942-ZWR935
@@ -509,7 +509,7 @@ SR=SRD
 SJ=NOK
 # Sint Maarten (Dutch part)
 SX=ANG
-# ESWATINI
+# SWAZILAND
 SZ=SZL
 # SWEDEN
 SE=SEK
@@ -564,7 +564,7 @@ UZ=UZS
 # VANUATU
 VU=VUV
 # VENEZUELA (BOLIVARIAN REPUBLIC OF)
-VE=VES
+VE=VEF
 # VIET NAM
 VN=VND
 # VIRGIN ISLANDS, BRITISH

make/data/fontconfig/windows.fontconfig.properties

@@ -243,7 +243,7 @@ sequence.fallback=symbols,\
 
 # Exclusion Ranges
 
-exclusion.alphabetic=0700-1cff,1d80-1e9f,1f00-2017,2020-20ab,20ad-20b8,20bb-20bc,20be-f8ff
+exclusion.alphabetic=0700-1cff,1d80-1e9f,1f00-2017,2020-20ab,20ad-20b8,20bb-20bc,20be-24ff,2501-2501,2503-250b,250d-250f,2511-2513,2515-2517,2519-251b,251d-2523,2525-252b,252d-2533,2535-253b,253d-254f,256d-f8ff
 exclusion.chinese-gb18030=0390-03d6,2200-22ef,2701-27be
 exclusion.hebrew=0041-005a,0060-007a,007f-00ff,20ac-20ac
 

make/data/tzdata/VERSION

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

make/data/tzdata/africa

@@ -21,8 +21,6 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-# tzdb data for Africa and environs
-
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -31,7 +29,7 @@
 # tz@iana.org for general use in the future).  For more, please see
 # the file CONTRIBUTING in the tz distribution.
 
-# From Paul Eggert (2018-05-27):
+# From Paul Eggert (2017-04-09):
 #
 # Unless otherwise specified, the source for data through 1990 is:
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -76,15 +74,13 @@
 # I vaguely recall 'WAT' also being used for -01 in the past but
 # cannot now come up with solid citations.
 #
-# I invented the following abbreviations in the 1990s:
-#	 +02	WAST	West Africa Summer Time
-#	 +03	CAST	Central Africa Summer Time
-#	 +03	SAST	South Africa Summer Time
+# I invented the following abbreviations; corrections are welcome!
+#	 +02	WAST	West Africa Summer Time (no longer used)
+#	 +03	CAST	Central Africa Summer Time (no longer used)
+#	 +03	SAST	South Africa Summer Time (no longer used)
 #	 +03	EAT	East Africa Time
-# 'EAT' seems to have caught on and is in current timestamps, and though
-# the other abbreviations are rarer and are only in past timestamps,
-# they are paired with better-attested non-DST abbreviations.
-# Corrections are welcome.
+# 'EAT' also seems to have caught on; the others are rare but are paired
+# with better-attested non-DST abbreviations.
 
 # Algeria
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -389,13 +385,6 @@ Zone	Africa/Cairo	2:05:09 -	LMT	1900 Oct
 # Eritrea
 # Ethiopia
 # See Africa/Nairobi.
-#
-# Unfortunately tzdb records only Western clock time in use in Ethiopia,
-# as the tzdb format is not up to properly recording a common Ethiopian
-# timekeeping practice that is based on solar time.  See:
-# Mortada D. If you have a meeting in Ethiopia, you'd better double
-# check the time. PRI's The World. 2015-01-30 15:15 -05.
-# https://www.pri.org/stories/2015-01-30/if-you-have-meeting-ethiopia-you-better-double-check-time
 
 # Gabon
 # See Africa/Lagos.
@@ -867,61 +856,94 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
 # <https://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/> agrees
 # with the patch.
 
-# From Mohamed Essedik Najd (2018-10-26):
-# Today, a Moroccan government council approved the perpetual addition
-# of 60 minutes to the regular Moroccan timezone.
-# From Brian Inglis (2018-10-26):
-# http://www.maroc.ma/fr/actualites/le-conseil-de-gouvernement-adopte-un-projet-de-decret-relatif-lheure-legale-stipulant-le
+# From Paul Eggert (2015-06-08):
+# For now, guess that later spring and fall transitions will use 2015's rules,
+# and guess that Morocco will switch to standard time at 03:00 the last
+# Sunday before Ramadan, and back to DST at 02:00 the first Sunday after
+# Ramadan.  To implement this, transition dates for 2016 through 2037 were
+# determined by running the following program under GNU Emacs 24.3, with the
+# results integrated by hand into the table below.
+# (let ((islamic-year 1437))
+#   (require 'cal-islam)
+#   (while (< islamic-year 1460)
+#     (let ((a (calendar-islamic-to-absolute (list 9 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))
+#         (setq b (1+ b)))
+#       (setq a (calendar-gregorian-from-absolute a))
+#       (setq b (calendar-gregorian-from-absolute b))
+#       (insert
+#        (format
+#         (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 3:00\t0\t-\n"
+#                 "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 2:00\t1:00\tS\n")
+#         (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
+#         (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
+#     (setq islamic-year (+ 1 islamic-year))))
 
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	-
+
+Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	S
 Rule	Morocco	1939	only	-	Nov	19	 0:00	0	-
-Rule	Morocco	1940	only	-	Feb	25	 0:00	1:00	-
+Rule	Morocco	1940	only	-	Feb	25	 0:00	1:00	S
 Rule	Morocco	1945	only	-	Nov	18	 0:00	0	-
-Rule	Morocco	1950	only	-	Jun	11	 0:00	1:00	-
+Rule	Morocco	1950	only	-	Jun	11	 0:00	1:00	S
 Rule	Morocco	1950	only	-	Oct	29	 0:00	0	-
-Rule	Morocco	1967	only	-	Jun	 3	12:00	1:00	-
+Rule	Morocco	1967	only	-	Jun	 3	12:00	1:00	S
 Rule	Morocco	1967	only	-	Oct	 1	 0:00	0	-
-Rule	Morocco	1974	only	-	Jun	24	 0:00	1:00	-
+Rule	Morocco	1974	only	-	Jun	24	 0:00	1:00	S
 Rule	Morocco	1974	only	-	Sep	 1	 0:00	0	-
-Rule	Morocco	1976	1977	-	May	 1	 0:00	1:00	-
+Rule	Morocco	1976	1977	-	May	 1	 0:00	1:00	S
 Rule	Morocco	1976	only	-	Aug	 1	 0:00	0	-
 Rule	Morocco	1977	only	-	Sep	28	 0:00	0	-
-Rule	Morocco	1978	only	-	Jun	 1	 0:00	1:00	-
+Rule	Morocco	1978	only	-	Jun	 1	 0:00	1:00	S
 Rule	Morocco	1978	only	-	Aug	 4	 0:00	0	-
-Rule	Morocco	2008	only	-	Jun	 1	 0:00	1:00	-
+Rule	Morocco	2008	only	-	Jun	 1	 0:00	1:00	S
 Rule	Morocco	2008	only	-	Sep	 1	 0:00	0	-
-Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:00	-
+Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:00	S
 Rule	Morocco	2009	only	-	Aug	21	 0:00	0	-
-Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	-
+Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
 Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
-Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	-
+Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
 Rule	Morocco	2011	only	-	Jul	31	 0:00	0	-
-Rule	Morocco	2012	2013	-	Apr	lastSun	 2:00	1:00	-
+Rule	Morocco	2012	2013	-	Apr	lastSun	 2:00	1:00	S
 Rule	Morocco	2012	only	-	Jul	20	 3:00	0	-
-Rule	Morocco	2012	only	-	Aug	20	 2:00	1:00	-
+Rule	Morocco	2012	only	-	Aug	20	 2:00	1:00	S
 Rule	Morocco	2012	only	-	Sep	30	 3:00	0	-
 Rule	Morocco	2013	only	-	Jul	 7	 3:00	0	-
-Rule	Morocco	2013	only	-	Aug	10	 2:00	1:00	-
-Rule	Morocco	2013	2018	-	Oct	lastSun	 3:00	0	-
-Rule	Morocco	2014	2018	-	Mar	lastSun	 2:00	1:00	-
+Rule	Morocco	2013	only	-	Aug	10	 2:00	1:00	S
+Rule	Morocco	2013	max	-	Oct	lastSun	 3:00	0	-
+Rule	Morocco	2014	2021	-	Mar	lastSun	 2:00	1:00	S
 Rule	Morocco	2014	only	-	Jun	28	 3:00	0	-
-Rule	Morocco	2014	only	-	Aug	 2	 2:00	1:00	-
+Rule	Morocco	2014	only	-	Aug	 2	 2:00	1:00	S
 Rule	Morocco	2015	only	-	Jun	14	 3:00	0	-
-Rule	Morocco	2015	only	-	Jul	19	 2:00	1:00	-
+Rule	Morocco	2015	only	-	Jul	19	 2:00	1:00	S
 Rule	Morocco	2016	only	-	Jun	 5	 3:00	0	-
-Rule	Morocco	2016	only	-	Jul	10	 2:00	1:00	-
+Rule	Morocco	2016	only	-	Jul	10	 2:00	1:00	S
 Rule	Morocco	2017	only	-	May	21	 3:00	0	-
-Rule	Morocco	2017	only	-	Jul	 2	 2:00	1:00	-
+Rule	Morocco	2017	only	-	Jul	 2	 2:00	1:00	S
 Rule	Morocco	2018	only	-	May	13	 3:00	0	-
-Rule	Morocco	2018	only	-	Jun	17	 2:00	1:00	-
+Rule	Morocco	2018	only	-	Jun	17	 2:00	1:00	S
+Rule	Morocco	2019	only	-	May	 5	 3:00	0	-
+Rule	Morocco	2019	only	-	Jun	 9	 2:00	1:00	S
+Rule	Morocco	2020	only	-	Apr	19	 3:00	0	-
+Rule	Morocco	2020	only	-	May	24	 2:00	1:00	S
+Rule	Morocco	2021	only	-	Apr	11	 3:00	0	-
+Rule	Morocco	2021	only	-	May	16	 2:00	1:00	S
+Rule	Morocco	2022	only	-	May	 8	 2:00	1:00	S
+Rule	Morocco	2023	only	-	Apr	23	 2:00	1:00	S
+Rule	Morocco	2024	only	-	Apr	14	 2:00	1:00	S
+Rule	Morocco	2025	only	-	Apr	 6	 2:00	1:00	S
+Rule	Morocco	2026	max	-	Mar	lastSun	 2:00	1:00	S
+Rule	Morocco	2036	only	-	Oct	19	 3:00	0	-
+Rule	Morocco	2037	only	-	Oct	 4	 3:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
-			 0:00	Morocco	+00/+01	1984 Mar 16
-			 1:00	-	+01	1986
-			 0:00	Morocco	+00/+01	2018 Oct 27
-			 1:00	-	+01
+			 0:00	Morocco	WE%sT	1984 Mar 16
+			 1:00	-	CET	1986
+			 0:00	Morocco	WE%sT
 
 # Western Sahara
 #
@@ -936,8 +958,7 @@ Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 
 Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan # El Aaiún
 			-1:00	-	-01	1976 Apr 14
-			 0:00	Morocco	+00/+01	2018 Oct 27
-			 1:00	-	+01
+			 0:00	Morocco	WE%sT
 
 # Mozambique
 #

make/data/tzdata/antarctica

@@ -21,8 +21,6 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-# tzdb data for Antarctica and environs
-
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

make/data/tzdata/asia

@@ -21,8 +21,6 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-# tzdb data for Asia and environs
-
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -31,7 +29,7 @@
 # tz@iana.org for general use in the future).  For more, please see
 # the file CONTRIBUTING in the tz distribution.
 
-# From Paul Eggert (2018-06-19):
+# From Paul Eggert (2017-01-13):
 #
 # Unless otherwise specified, the source for data through 1990 is:
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -60,8 +58,7 @@
 # A reliable and entertaining source about time zones is
 # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
 #
-# The following alphabetic abbreviations appear in these tables
-# (corrections are welcome):
+# The following alphabetic abbreviations appear in these tables:
 #	     std  dst
 #	     LMT	Local Mean Time
 #	2:00 EET  EEST	Eastern European Time
@@ -70,13 +67,11 @@
 #	7:00 WIB	west Indonesia (Waktu Indonesia Barat)
 #	8:00 WITA	central Indonesia (Waktu Indonesia Tengah)
 #	8:00 CST	China
-#	8:00 PST  PDT*	Philippine Standard Time
 #	8:30 KST  KDT	Korea when at +0830
 #	9:00 WIT	east Indonesia (Waktu Indonesia Timur)
 #	9:00 JST  JDT	Japan
 #	9:00 KST  KDT	Korea when at +09
 #	9:30 ACST	Australian Central Standard Time
-# *I invented the abbreviation PDT; see "Philippines" below.
 # Otherwise, these tables typically use numeric abbreviations like +03
 # and +0330 for integer hour and minute UT offsets.  Although earlier
 # editions invented alphabetic time zone abbreviations for every
@@ -309,29 +304,6 @@ Zone	Asia/Yangon	6:24:47 -	LMT	1880        # or Rangoon
 
 # China
 
-# From Paul Eggert (2018-10-02):
-# The following comes from Table 1 of:
-# Li Yu. Research on the daylight saving movement in 1940s Shanghai.
-# Nanjing Journal of Social Sciences. 2014;(2):144-50.
-# http://oversea.cnki.net/kns55/detail.aspx?dbname=CJFD2014&filename=NJSH201402020
-# 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.
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Shang	1940	only	-	Jun	 1	 0:00	1:00	D
-Rule	Shang	1940	only	-	Oct	12	24:00	0	S
-Rule	Shang	1941	only	-	Mar	15	 0:00	1:00	D
-Rule	Shang	1941	only	-	Nov	 1	24:00	0	S
-Rule	Shang	1942	only	-	Jan	31	 0:00	1:00	D
-Rule	Shang	1945	only	-	Sep	 1	24:00	0	S
-Rule	Shang	1946	only	-	May	15	 0:00	1:00	D
-Rule	Shang	1946	only	-	Sep	30	24:00	0	S
-Rule	Shang	1947	only	-	Apr	15	 0:00	1:00	D
-Rule	Shang	1947	only	-	Oct	31	24:00	0	S
-Rule	Shang	1948	1949	-	May	 1	 0:00	1:00	D
-Rule	Shang	1948	1949	-	Sep	30	24:00	0	S #plan
-
 # From Guy Harris:
 # People's Republic of China.  Yes, they really have only one time zone.
 
@@ -358,33 +330,18 @@ Rule	Shang	1948	1949	-	Sep	30	24:00	0	S #plan
 # time - sort of", Los Angeles Times, 1986-05-05 ... [says] that China began
 # observing daylight saving time in 1986.
 
-# From P Chan (2018-05-07):
-# The start and end time of DST in China [from 1986 on] should be 2:00
-# (i.e. 2:00 to 3:00 at the start and 2:00 to 1:00 at the end)....
-# Government notices about summer time:
-#
-# 1986-04-12 http://www.zj.gov.cn/attach/zfgb/198608.pdf p.21-22
-# (To establish summer time from 1986. On 4 May, set the clocks ahead one hour
-# at 2 am. On 14 September, set the clocks backward one hour at 2 am.)
-#
-# 1987-02-15 http://www.gov.cn/gongbao/shuju/1987/gwyb198703.pdf p.114
-# (Summer time in 1987 to start from 12 April until 13 September)
-#
-# 1987-09-09 http://www.gov.cn/gongbao/shuju/1987/gwyb198721.pdf p.709
-# (From 1988, summer time to start from 2 am of the first Sunday of mid-April
-# until 2 am of the first Sunday of mid-September)
-#
-# 1992-03-03 http://www.gov.cn/gongbao/shuju/1992/gwyb199205.pdf p.152
-# (To suspend summer time from 1992)
-#
-# The first page of People's Daily on 12 April 1988 stating that summer time
-# to begin on 17 April.
-# http://data.people.com.cn/pic/101p/1988/04/1988041201.jpg
-
+# From Paul Eggert (2014-06-30):
+# Shanks & Pottenger have China switching to a single time zone in 1980, but
+# this doesn't seem to be correct.  They also write that China observed summer
+# DST from 1986 through 1991, which seems to match the above commentary, so
+# go with them for DST rules as follows:
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	PRC	1986	only	-	May	 4	 2:00	1:00	D
-Rule	PRC	1986	1991	-	Sep	Sun>=11	 2:00	0	S
-Rule	PRC	1987	1991	-	Apr	Sun>=11	 2:00	1:00	D
+Rule	Shang	1940	only	-	Jun	 3	0:00	1:00	D
+Rule	Shang	1940	1941	-	Oct	 1	0:00	0	S
+Rule	Shang	1941	only	-	Mar	16	0:00	1:00	D
+Rule	PRC	1986	only	-	May	 4	0:00	1:00	D
+Rule	PRC	1986	1991	-	Sep	Sun>=11	0:00	0	S
+Rule	PRC	1987	1991	-	Apr	Sun>=10	0:00	1:00	D
 
 # From Anthony Fok (2001-12-20):
 # BTW, I did some research on-line and found some info regarding these five
@@ -406,11 +363,10 @@ Rule	PRC	1987	1991	-	Apr	Sun>=11	 2:00	1:00	D
 # Alois Treindl kindly sent me translations of the following two sources:
 #
 # (1)
-# Guo Qing-sheng (National Time-Service Center, CAS, Xi'an 710600, China)
+# Guo Qingsheng (National Time-Service Center, CAS, Xi'an 710600, China)
 # Beijing Time at the Beginning of the PRC
 # China Historical Materials of Science and Technology
-# (Zhongguo ke ji shi liao, 中国科技史料). 2003;24(1):5-9.
-# http://oversea.cnki.net/kcms/detail/detail.aspx?filename=ZGKS200301000&dbname=CJFD2003
+# (Zhongguo ke ji shi liao, 中国科技史料), Vol. 24, No. 1 (2003)
 # It gives evidence that at the beginning of the PRC, Beijing time was
 # officially apparent solar time!  However, Guo also says that the
 # evidence is dubious, as the relevant institute of astronomy had not
@@ -587,7 +543,7 @@ Rule	PRC	1987	1991	-	Apr	Sun>=11	 2:00	1:00	D
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 # Beijing time, used throughout China; represented by Shanghai.
 Zone	Asia/Shanghai	8:05:43	-	LMT	1901
-			8:00	Shang	C%sT	1949 May 28
+			8:00	Shang	C%sT	1949
 			8:00	PRC	C%sT
 # Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi
 # / Wulumuqi.  (Please use Asia/Shanghai if you prefer Beijing time.)
@@ -816,140 +772,24 @@ Zone	Asia/Taipei	8:06:00 -	LMT	1896 Jan  1
 			8:00	Taiwan	C%sT
 
 # Macau (Macao, Aomen)
-#
-# From P Chan (2018-05-10):
-# * LegisMac
-#   http://legismac.safp.gov.mo/legismac/descqry/Descqry.jsf?lang=pt
-#   A database for searching titles of legal documents of Macau in
-#   Chinese and Portuguese.  The term "HORÁRIO DE VERÃO" can be used for
-#   searching decrees about summer time.
-# * Archives of Macao
-#   http://www.archives.gov.mo/en/bo/
-#   It contains images of old official gazettes.
-# * The Macao Meteorological and Geophysical Bureau have a page listing the
-#   summer time history.  But it is not complete and has some mistakes.
-#   http://www.smg.gov.mo/smg/geophysics/e_t_Summer%20Time.htm
-# Macau adopted GMT+8 on 30 Oct 1904 to follow Hong Kong.  Clocks were
-# advanced by 25 minutes and 50 seconds.  Which means the LMT used was
-# +7:34:10.  As stated in the "Portaria No. 204" dated 21 October 1904
-# and published in the Official Gazette on 29 October 1904.
-# http://igallery.icm.gov.mo/Images/Archives/BO/MO_AH_PUB_BO_1904_10/MO_AH_PUB_BO_1904_10_00025_Grey.JPG
-#
-# Therefore the 1911 decree of Portugal did not change time in Macau.
-#
-# From LegisMac, here is a list of decrees that changed the time ...
-# [Decree Gazette-no. date; titles omitted in this quotation]
-#	DIL 732 BOCM 51 1941.12.20
-#	DIL 764 BOCM 9S 1942.04.30
-#	DIL 781 BOCM 21 1942.10.10
-#	PT 3434 BOCM 8S 1943.04.17
-#	PT 3504 BOCM 20 1943.09.25
-#	PT 3843 BOCM 39 1945.09.29
-#	PT 3961 BOCM 17 1946.04.27
-#	PT 4026 BOCM 39 1946.09.28
-#	PT 4153 BOCM 16 1947.04.10
-#	PT 4271 BOCM 48 1947.11.29
-#	PT 4374 BOCM 18 1948.05.01
-#	PT 4465 BOCM 44 1948.10.30
-#	PT 4590 BOCM 14 1949.04.02
-#	PT 4666 BOCM 44 1949.10.29
-#	PT 4771 BOCM 12 1950.03.25
-#	PT 4838 BOCM 43 1950.10.28
-#	PT 4946 BOCM 12 1951.03.24
-#	PT 5025 BO 43 1951.10.27
-#	PT 5149 BO 14 1952.04.05
-#	PT 5251 BO 43 1952.10.25
-#	PT 5366 BO 13 1953.03.28
-#	PT 5444 BO 44 1953.10.31
-#	PT 5540 BO 12 1954.03.20
-#	PT 5589 BO 44 1954.10.30
-#	PT 5676 BO 12 1955.03.19
-#	PT 5739 BO 45 1955.11.05
-#	PT 5823 BO 11 1956.03.17
-#	PT 5891 BO 44 1956.11.03
-#	PT 5981 BO 12 1957.03.23
-#	PT 6064 BO 43 1957.10.26
-#	PT 6172 BO 12 1958.03.22
-#	PT 6243 BO 43 1958.10.25
-#	PT 6341 BO 12 1959.03.21
-#	PT 6411 BO 43 1959.10.24
-#	PT 6514 BO 11 1960.03.12
-#	PT 6584 BO 44 1960.10.29
-#	PT 6721 BO 10 1961.03.11
-#	PT 6815 BO 43 1961.10.28
-#	PT 6947 BO 10 1962.03.10
-#	PT 7080 BO 43 1962.10.27
-#	PT 7218 BO 12 1963.03.23
-#	PT 7340 BO 43 1963.10.26
-#	PT 7491 BO 11 1964.03.14
-#	PT 7664 BO 43 1964.10.24
-#	PT 7846 BO 15 1965.04.10
-#	PT 7979 BO 42 1965.10.16
-#	PT 8146 BO 15 1966.04.09
-#	PT 8252 BO 41 1966.10.08
-#	PT 8429 BO 15 1967.04.15
-#	PT 8540 BO 41 1967.10.14
-#	PT 8735 BO 15 1968.04.13
-#	PT 8860 BO 41 1968.10.12
-#	PT 9035 BO 16 1969.04.19
-#	PT 9156 BO 42 1969.10.18
-#	PT 9328 BO 15 1970.04.11
-#	PT 9418 BO 41 1970.10.10
-#	PT 9587 BO 14 1971.04.03
-#	PT 9702 BO 41 1971.10.09
-#	PT 38-A/72 BO 14 1972.04.01
-#	PT 126-A/72 BO 41 1972.10.07
-#	PT 61/73 BO 14 1973.04.07
-#	PT 182/73 BO 40 1973.10.06
-#	PT 282/73 BO 51 1973.12.22
-#	PT 177/74 BO 41 1974.10.12
-#	PT 51/75 BO 15 1975.04.12
-#	PT 173/75 BO 41 1975.10.11
-#	PT 67/76/M BO 14 1976.04.03
-#	PT 169/76/M BO 41 1976.10.09
-#	PT 78/79/M BO 19 1979.05.12
-#	PT 166/79/M BO 42 1979.10.20
-# Note that DIL 732 does not belong to "HORÁRIO DE VERÃO" according to
-# LegisMac.... Note that between 1942 and 1945, the time switched
-# between GMT+9 and GMT+10.  Also in 1965 and 1965 the DST ended at 2:30am.
-
-# From Paul Eggert (2018-05-10):
-# The 1904 decree says that Macau changed from the meridian of
-# Fortaleza do Monte, presumably the basis for the 7:34:10 for LMT.
-
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Macau	1942	1943	-	Apr	30	23:00	1:00	-
-Rule	Macau	1942	only	-	Nov	17	23:00	0	-
-Rule	Macau	1943	only	-	Sep	30	23:00	0	S
-Rule	Macau	1946	only	-	Apr	30	23:00s	1:00	D
-Rule	Macau	1946	only	-	Sep	30	23:00s	0	S
-Rule	Macau	1947	only	-	Apr	19	23:00s	1:00	D
-Rule	Macau	1947	only	-	Nov	30	23:00s	0	S
-Rule	Macau	1948	only	-	May	 2	23:00s	1:00	D
-Rule	Macau	1948	only	-	Oct	31	23:00s	0	S
-Rule	Macau	1949	1950	-	Apr	Sat>=1	23:00s	1:00	D
-Rule	Macau	1949	1950	-	Oct	lastSat	23:00s	0	S
-Rule	Macau	1951	only	-	Mar	31	23:00s	1:00	D
-Rule	Macau	1951	only	-	Oct	28	23:00s	0	S
-Rule	Macau	1952	1953	-	Apr	Sat>=1	23:00s	1:00	D
-Rule	Macau	1952	only	-	Nov	 1	23:00s	0	S
-Rule	Macau	1953	1954	-	Oct	lastSat	23:00s	0	S
-Rule	Macau	1954	1956	-	Mar	Sat>=17	23:00s	1:00	D
-Rule	Macau	1955	only	-	Nov	 5	23:00s	0	S
-Rule	Macau	1956	1964	-	Nov	Sun>=1	03:30	0	S
-Rule	Macau	1957	1964	-	Mar	Sun>=18	03:30	1:00	D
-Rule	Macau	1965	1973	-	Apr	Sun>=16	03:30	1:00	D
-Rule	Macau	1965	1966	-	Oct	Sun>=16	02:30	0	S
-Rule	Macau	1967	1976	-	Oct	Sun>=16	03:30	0	S
-Rule	Macau	1973	only	-	Dec	30	03:30	1:00	D
-Rule	Macau	1975	1976	-	Apr	Sun>=16	03:30	1:00	D
-Rule	Macau	1979	only	-	May	13	03:30	1:00	D
-Rule	Macau	1979	only	-	Oct	Sun>=16	03:30	0	S
-
+Rule	Macau	1961	1962	-	Mar	Sun>=16	3:30	1:00	D
+Rule	Macau	1961	1964	-	Nov	Sun>=1	3:30	0	S
+Rule	Macau	1963	only	-	Mar	Sun>=16	0:00	1:00	D
+Rule	Macau	1964	only	-	Mar	Sun>=16	3:30	1:00	D
+Rule	Macau	1965	only	-	Mar	Sun>=16	0:00	1:00	D
+Rule	Macau	1965	only	-	Oct	31	0:00	0	S
+Rule	Macau	1966	1971	-	Apr	Sun>=16	3:30	1:00	D
+Rule	Macau	1966	1971	-	Oct	Sun>=16	3:30	0	S
+Rule	Macau	1972	1974	-	Apr	Sun>=15	0:00	1:00	D
+Rule	Macau	1972	1973	-	Oct	Sun>=15	0:00	0	S
+Rule	Macau	1974	1977	-	Oct	Sun>=15	3:30	0	S
+Rule	Macau	1975	1977	-	Apr	Sun>=15	3:30	1:00	D
+Rule	Macau	1978	1980	-	Apr	Sun>=15	0:00	1:00	D
+Rule	Macau	1978	1980	-	Oct	Sun>=15	0:00	0	S
+# See Europe/Lisbon for info about the 1912 transition.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Macau	7:34:10 -	LMT	1904 Oct 30
-			8:00	-	CST	1941 Dec 21 23:00
-			9:00	Macau	+09/+10	1945 Sep 30 24:00
+Zone	Asia/Macau	7:34:20 -	LMT	1911 Dec 31 16:00u
 			8:00	Macau	C%sT
 
 
@@ -1654,29 +1494,9 @@ Zone	Asia/Jerusalem	2:20:54 -	LMT	1880
 # http://www.shugiin.go.jp/internet/itdb_housei.nsf/html/houritsu/00719500331039.htm
 # ... In summary, it is written as follows.  From 24:00 on the first Saturday
 # in May, until 0:00 on the day after the second Saturday in September.
-
-# From Phake Nick (2018-09-27):
-# [T]he webpage authored by National Astronomical Observatory of Japan
-# https://eco.mtk.nao.ac.jp/koyomi/wiki/BBFEB9EF2FB2C6BBFEB9EF.html
-# ... mentioned that using Showa 23 (year 1948) as example, 13pm of September
-# 11 in summer time will equal to 0am of September 12 in standard time.
-# It cited a document issued by the Liaison Office which briefly existed
-# during the postwar period of Japan, where the detail on implementation
-# of the summer time is described in the document.
-# https://eco.mtk.nao.ac.jp/koyomi/wiki/BBFEB9EF2FB2C6BBFEB9EFB2C6BBFEB9EFA4CEBCC2BBDCA4CBA4C4A4A4A4C6.pdf
-# The text in the document do instruct a fall back to occur at
-# September 11, 13pm in summer time, while ordinary citizens can
-# change the clock before they sleep.
-#
-# From Paul Eggert (2018-09-27):
-# This instruction is equivalent to "Sat>=8 25:00", so use that.  zic treats
-# it like "Sun>=9 01:00", which is not quite the same but is the best we can
-# do in any POSIX or C platform.  The "25:00" assumes zic from 2007 or later,
-# which should be safe now.
-
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Japan	1948	only	-	May	Sat>=1	24:00	1:00	D
-Rule	Japan	1948	1951	-	Sep	Sun>=9	 1:00	0	S
+Rule	Japan	1948	1951	-	Sep	Sun>=9	 0: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
 
@@ -2058,7 +1878,7 @@ Zone	Asia/Aqtobe	3:48:40	-	LMT	1924 May  2
 			5:00	-	+05
 # Mangghystaū (KZ-MAN)
 # Aqtau was not founded until 1963, but it represents an inhabited region,
-# so include timestamps before 1963.
+# so include time stamps before 1963.
 Zone	Asia/Aqtau	3:21:04	-	LMT	1924 May  2
 			4:00	-	+04	1930 Jun 21
 			5:00	-	+05	1981 Oct  1
@@ -2198,10 +2018,6 @@ Rule	ROK	1987	1988	-	Oct	Sun>=8	3:00	0	S
 # Assembly, as published in Rodong Sinmun.
 # From Tim Parenti (2018-04-29):
 # It appears to be the front page story at the top in the right-most column.
-#
-# From Paul Eggert (2018-05-04):
-# The BBC reported that the transition was from 23:30 to 24:00 today.
-# https://www.bbc.com/news/world-asia-44010705
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Seoul	8:27:52	-	LMT	1908 Apr  1
@@ -2214,7 +2030,7 @@ Zone	Asia/Pyongyang	8:23:00 -	LMT	1908 Apr  1
 			8:30	-	KST	1912 Jan  1
 			9:00	-	JST	1945 Aug 24
 			9:00	-	KST	2015 Aug 15 00:00
-			8:30	-	KST	2018 May  4 23:30
+			8:30	-	KST	2018 May  5
 			9:00	-	KST
 
 ###############################################################################
@@ -2964,35 +2780,19 @@ Zone	Asia/Hebron	2:20:23	-	LMT	1900 Oct
 # Philippine Star 2014-08-05
 # http://www.philstar.com/headlines/2014/08/05/1354152/pnoy-urged-declare-use-daylight-saving-time
 
-# From Paul Goyette (2018-06-15):
-# In the Philippines, there is a national law, Republic Act No. 10535
-# which declares the official time here as "Philippine Standard Time".
-# The act [1] even specifies use of PST as the abbreviation, although
-# the FAQ provided by PAGASA [2] uses the "acronym PhST to distinguish
-# it from the Pacific Standard Time (PST)."
-# [1] http://www.officialgazette.gov.ph/2013/05/15/republic-act-no-10535/
-# [2] https://www1.pagasa.dost.gov.ph/index.php/astronomy/philippine-standard-time#republic-act-10535
-#
-# From Paul Eggert (2018-06-19):
-# I surveyed recent news reports, and my impression is that "PST" is
-# more popular among reliable English-language news sources.  This is
-# not just a measure of Google hit counts: it's also the sizes and
-# influence of the sources.  There is no current abbreviation for DST,
-# so use "PDT", the usual American style.
-
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Phil	1936	only	-	Nov	1	0:00	1:00	D
-Rule	Phil	1937	only	-	Feb	1	0:00	0	S
-Rule	Phil	1954	only	-	Apr	12	0:00	1:00	D
-Rule	Phil	1954	only	-	Jul	1	0:00	0	S
-Rule	Phil	1978	only	-	Mar	22	0:00	1:00	D
-Rule	Phil	1978	only	-	Sep	21	0:00	0	S
+Rule	Phil	1936	only	-	Nov	1	0:00	1:00	-
+Rule	Phil	1937	only	-	Feb	1	0:00	0	-
+Rule	Phil	1954	only	-	Apr	12	0:00	1:00	-
+Rule	Phil	1954	only	-	Jul	1	0:00	0	-
+Rule	Phil	1978	only	-	Mar	22	0:00	1:00	-
+Rule	Phil	1978	only	-	Sep	21	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Manila	-15:56:00 -	LMT	1844 Dec 31
 			8:04:00 -	LMT	1899 May 11
-			8:00	Phil	P%sT	1942 May
-			9:00	-	JST	1944 Nov
-			8:00	Phil	P%sT
+			8:00	Phil	+08/+09	1942 May
+			9:00	-	+09	1944 Nov
+			8:00	Phil	+08/+09
 
 # Qatar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -3003,34 +2803,15 @@ Link Asia/Qatar Asia/Bahrain
 
 # Saudi Arabia
 #
-# From Paul Eggert (2018-08-29):
+# From Paul Eggert (2014-07-15):
 # Time in Saudi Arabia and other countries in the Arabian peninsula was not
-# standardized until 1968 or so; we don't know exactly when, and possibly it
+# standardized until relatively recently; we don't know when, and possibly it
 # has never been made official.  Richard P Hunt, in "Islam city yielding to
 # modern times", New York Times (1961-04-09), p 20, wrote that only airlines
 # observed standard time, and that people in Jeddah mostly observed quasi-solar
 # time, doing so by setting their watches at sunrise to 6 o'clock (or to 12
 # o'clock for "Arab" time).
 #
-# Timekeeping differed depending on who you were and which part of Saudi
-# Arabia you were in.  In 1969, Elias Antar wrote that although a common
-# practice had been to set one's watch to 12:00 (i.e., midnight) at sunset -
-# which meant that the time on one side of a mountain could differ greatly from
-# the time on the other side - many foreigners set their watches to 6pm
-# instead, while airlines instead used UTC +03 (except in Dhahran, where they
-# used UTC +04), Aramco used UTC +03 with DST, and the Trans-Arabian Pipe Line
-# Company used Aramco time in eastern Saudi Arabia and airline time in western.
-# (The American Military Aid Advisory Group used plain UTC.)  Antar writes,
-# "A man named Higgins, so the story goes, used to run a local power
-# station. One day, the whole thing became too much for Higgins and he
-# assembled his staff and laid down the law. 'I've had enough of this,' he
-# shrieked. 'It is now 12 o'clock Higgins Time, and from now on this station is
-# going to run on Higgins Time.' And so, until last year, it did."  See:
-# Antar E. Dinner at When? Saudi Aramco World, 1969 March/April. 2-3.
-# http://archive.aramcoworld.com/issue/196902/dinner.at.when.htm
-# newspapers.com says a similar story about Higgins was published in the Port
-# Angeles (WA) Evening News, 1965-03-10, page 5, but I lack access to the text.
-#
 # The TZ database cannot represent quasi-solar time; airline time is the best
 # we can do.  The 1946 foreign air news digest of the U.S. Civil Aeronautics
 # Board (OCLC 42299995) reported that the "... Arabian Government, inaugurated
@@ -3040,8 +2821,7 @@ Link Asia/Qatar Asia/Bahrain
 #
 # Shanks & Pottenger also state that until 1968-05-01 Saudi Arabia had two
 # time zones; the other zone, at UT +04, was in the far eastern part of
-# the country.  Presumably this is documenting airline time.  Ignore this,
-# as it's before our 1970 cutoff.
+# the country.  Ignore this, as it's before our 1970 cutoff.
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Riyadh	3:06:52 -	LMT	1947 Mar 14

make/data/tzdata/australasia

@@ -21,8 +21,6 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-# tzdb data for Australasia and environs, and for much of the Pacific
-
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -386,15 +384,8 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # Dominic Fok writes (2017-08-20) that DST ends 2018-01-14, citing
 # Extraordinary Government of Fiji Gazette Supplement No. 21 (2017-08-27),
 # [Legal Notice No. 41] of an order of the previous day by J Usamate.
-
-# From Raymond Kumar (2018-07-13):
-# http://www.fijitimes.com/government-approves-2018-daylight-saving/
-# ... The daylight saving period will end at 3am on Sunday January 13, 2019.
-#
-# From Paul Eggert (2018-07-15):
 # For now, guess DST from 02:00 the first Sunday in November to 03:00
-# the first Sunday on or after January 13.  January transitions reportedly
-# depend on when school terms start.  Although the guess is ad hoc, it matches
+# the first Sunday on or after January 14.  Although ad hoc, it matches
 # transitions since late 2014 and seems more likely to match future
 # practice than guessing no DST.
 
@@ -408,7 +399,7 @@ Rule	Fiji	2011	only	-	Mar	Sun>=1	3:00	0	-
 Rule	Fiji	2012	2013	-	Jan	Sun>=18	3:00	0	-
 Rule	Fiji	2014	only	-	Jan	Sun>=18	2:00	0	-
 Rule	Fiji	2014	max	-	Nov	Sun>=1	2:00	1:00	-
-Rule	Fiji	2015	max	-	Jan	Sun>=13	3:00	0	-
+Rule	Fiji	2015	max	-	Jan	Sun>=14	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Pacific/Fiji	11:55:44 -	LMT	1915 Oct 26 # Suva
 			12:00	Fiji	+12/+13

make/data/tzdata/backward

@@ -21,12 +21,10 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-# tzdb links for backward compatibility
-
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
-# This file provides links between current names for timezones
+# This file provides links between current names for time zones
 # and their old names.  Many names changed in late 1993.
 
 # Link	TARGET			LINK-NAME

make/data/tzdata/etcetera

@@ -21,14 +21,12 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-# tzdb data for ships at sea and other miscellany
-
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
 # These entries are mostly present for historical reasons, so that
 # people in areas not otherwise covered by the tz files could "zic -l"
-# to a timezone that was right for their area.  These days, the
+# to a time zone that was right for their area.  These days, the
 # tz files cover almost all the inhabited world, and the only practical
 # need now for the entries that are not on UTC are for ships at sea
 # that cannot use POSIX TZ settings.

make/data/tzdata/europe

@@ -21,8 +21,6 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-# tzdb data for Europe and environs
-
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -542,7 +540,7 @@ Link	Europe/London	Europe/Isle_of_Man
 #
 # To work around this problem, the build procedure can translate the
 # following data into two forms, one with negative SAVE values and the
-# other form with a traditional approximation for Irish timestamps
+# other form with a traditional approximation for Irish time stamps
 # after 1971-10-31 02:00 UTC; although this approximation has tm_isdst
 # flags that are reversed, its UTC offsets are correct and this often
 # suffices.  This source file currently uses only nonnegative SAVE
@@ -2452,33 +2450,6 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
 # administratively part of Sakhalin oblast', they appear to have
 # remained on UTC+11 along with Magadan.
 
-# From Marat Nigametzianov (2018-07-16):
-# this is link to order from 1956 about timezone in USSR
-# http://astro.uni-altai.ru/~orion/blog/2011/11/novyie-granitsyi-chasovyih-poyasov-v-sssr/
-#
-# From Paul Eggert (2018-07-16):
-# Perhaps someone could translate the above-mentioned link and use it
-# to correct our data for the ex-Soviet Union.  It cites the following:
-# «Поясное время и новые границы часовых поясов» / сост. П.Н. Долгов,
-# отв. ред. Г.Д. Бурдун - М: Комитет стандартов, мер и измерительных
-# приборов при Совете Министров СССР, Междуведомственная комиссия
-# единой службы времени, 1956 г.
-# This book looks like it would be a helpful resource for the Soviet
-# Union through 1956.  Although a copy was in the Scientific Library
-# of Tomsk State University, I have not been able to track down a copy nearby.
-#
-# From Stepan Golosunov (2018-07-21):
-# http://astro.uni-altai.ru/~orion/blog/2015/05/center-reforma-ischisleniya-vremeni-br-na-territorii-sssr-v-1957-godu-center/
-# says that the 1956 decision to change time belts' borders was not
-# implemented as planned in 1956 and the change happened in 1957.
-# There is also the problem that actual time zones were different from
-# the official time belts (and from many time belts' maps) as there were
-# numerous exceptions to application of time belt rules.  For example,
-# https://ru.wikipedia.org/wiki/Московское_время#Перемещение_границы_применения_московского_времени_на_восток
-# says that by 1962 there were many regions in the 3rd time belt that
-# were on Moscow time, referring to a 1962 map.  By 1989 number of such
-# exceptions grew considerably.
-
 # From Tim Parenti (2014-07-06):
 # The comments detailing the coverage of each Russian zone are meant to assist
 # with maintenance only and represent our best guesses as to which regions
@@ -2489,6 +2460,9 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
 # future stability.  ISO 3166-2:RU codes are also listed for first-level
 # divisions where available.
 
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+
+
 # From Tim Parenti (2014-07-03):
 # Europe/Kaliningrad covers...
 # 39	RU-KGD	Kaliningrad Oblast
@@ -2756,15 +2730,6 @@ Zone Europe/Astrakhan	 3:12:12 -	LMT	1924 May
 # 34	RU-VGG	Volgograd Oblast
 # The 1988 transition is from USSR act No. 5 (1988-01-04).
 
-# From Alexander Fetisov (2018-09-20):
-# Volgograd region in southern Russia (Europe/Volgograd) change
-# timezone from UTC+3 to UTC+4 from 28oct2018.
-# http://sozd.parliament.gov.ru/bill/452878-7
-#
-# From Stepan Golosunov (2018-10-11):
-# The law has been published today on
-# http://publication.pravo.gov.ru/Document/View/0001201810110037
-
 Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
 			 3:00	-	+03	1930 Jun 21
 			 4:00	-	+04	1961 Nov 11
@@ -2773,8 +2738,7 @@ Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
 			 4:00	-	+04	1992 Mar 29  2:00s
 			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
 			 4:00	-	+04	2014 Oct 26  2:00s
-			 3:00	-	+03	2018 Oct 28  2:00s
-			 4:00	-	+04
+			 3:00	-	+03
 
 # From Paul Eggert (2016-11-11):
 # Europe/Saratov covers:
@@ -3463,8 +3427,7 @@ Rule	Spain	1978	only	-	Oct	 1	 2:00s	0	-
 #Rule NatSpain	1937	only	-	May	22	23:00	1:00	S
 #Rule NatSpain	1937	1938	-	Oct	Sat>=1	24:00s	0	-
 #Rule NatSpain	1938	only	-	Mar	26	23:00	1:00	S
-# The following rules are copied from Morocco from 1967 through 1978,
-# except with "S" letters.
+# The following rules are copied from Morocco from 1967 through 1978.
 Rule SpainAfrica 1967	only	-	Jun	 3	12:00	1:00	S
 Rule SpainAfrica 1967	only	-	Oct	 1	 0:00	0	-
 Rule SpainAfrica 1974	only	-	Jun	24	 0:00	1:00	S
@@ -3484,7 +3447,6 @@ Zone	Africa/Ceuta	-0:21:16 -	LMT	1900 Dec 31 23:38:44
 			 0:00	1:00	WEST	1918 Oct  7 23:00
 			 0:00	-	WET	1924
 			 0:00	Spain	WE%sT	1929
-			 0:00	-	WET	1967 # Help zishrink.awk.
 			 0:00 SpainAfrica WE%sT	1984 Mar 16
 			 1:00	-	CET	1986
 			 1:00	EU	CE%sT
@@ -3670,7 +3632,7 @@ Zone	Europe/Zurich	0:34:08 -	LMT	1853 Jul 16 # See above comment.
 # http://www.resmigazete.gov.tr/eskiler/2001/03/20010324.htm#2  - for 2001
 # http://www.resmigazete.gov.tr/eskiler/2002/03/20020316.htm#2  - for 2002-2006
 # From Paul Eggert (2016-09-25):
-# Prefer the above sources to Shanks & Pottenger for timestamps after 1985.
+# Prefer the above sources to Shanks & Pottenger for time stamps after 1985.
 
 # From Steffen Thorsen (2007-03-09):
 # Starting 2007 though, it seems that they are adopting EU's 1:00 UTC
@@ -3880,29 +3842,10 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
 # * Ukrainian Government's Resolution of 20.03.1992, No. 139.
 # http://www.uazakon.com/documents/date_8u/pg_grcasa.htm
 
-# From Paul Eggert (2018-10-03):
-# As is usual in tzdb, Ukrainian zones use the most common English spellings.
-# For example, tzdb uses Europe/Kiev, as "Kiev" is the most common spelling in
-# English for Ukraine's capital, even though it is certainly wrong as a
-# transliteration of the Ukrainian "Київ".  This is similar to tzdb's use of
-# Europe/Prague, which is certainly wrong as a transliteration of the Czech
-# "Praha".  ("Kiev" came from old Slavic via Russian to English, and "Prague"
-# came from old Slavic via French to English, so the two cases have something
-# in common.)  Admittedly English-language spelling of Ukrainian names is
-# controversial, and some day "Kyiv" may become substantially more popular in
-# English; in the meantime, stick with the traditional English "Kiev" as that
-# means less disruption for our users.
-#
-# Anyway, none of the common English-language spellings (Kiev, Kyiv, Kieff,
-# Kijeff, Kijev, Kiyef, Kiyeff) do justice to the common pronunciation in
-# Ukrainian, namely [ˈkɪjiu̯] (IPA).  This pronunciation has nothing like an
-# English "v" or "f", and instead trails off with what an English-speaker
-# would call a demure "oo" sound, and it would would be better anglicized as
-# "Kuiyu".  Here's a sound file, if you would like to do as the Kuiyuvians do:
-# https://commons.wikimedia.org/wiki/File:Uk-Київ.ogg
-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-# This represents most of Ukraine.  See above for the spelling of "Kiev".
+# Most of Ukraine since 1970 has been like Kiev.
+# "Kyiv" is the transliteration of the Ukrainian name, but
+# "Kiev" is more common in English.
 Zone Europe/Kiev	2:02:04 -	LMT	1880
 			2:02:04	-	KMT	1924 May  2 # Kiev Mean Time
 			2:00	-	EET	1930 Jun 21

make/data/tzdata/factory

@@ -21,13 +21,11 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-# tzdb data for noncommittal factory settings
-
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
-# For distributors who don't want to specify a timezone in their
-# installation procedures.  Users who run 'date' will get the
+# For distributors who don't want to put time zone specification in
+# their installation procedures.  Users that run 'date' will get the
 # time zone abbreviation "-00", indicating that the actual time zone
 # is unknown.
 

make/data/tzdata/leapseconds

@@ -26,25 +26,21 @@
 # This file is in the public domain.
 
 # This file is generated automatically from the data in the public-domain
-# leap-seconds.list file, which can be copied from
-# <ftp://ftp.nist.gov/pub/time/leap-seconds.list>
-# or <ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.list>
-# or <ftp://tycho.usno.navy.mil/pub/ntp/leap-seconds.list>.
+# leap-seconds.list file, which is copied from:
+# ftp://ftp.nist.gov/pub/time/leap-seconds.list
 # For more about leap-seconds.list, please see
 # The NTP Timescale and Leap Seconds
-# <https://www.eecis.udel.edu/~mills/leap.html>.
+# https://www.eecis.udel.edu/~mills/leap.html
 
 # The International Earth Rotation and Reference Systems Service
 # periodically uses leap seconds to keep UTC to within 0.9 s of UT1
-# (which measures the true angular orientation of the earth in space)
-# and publishes leap second data in a copyrighted file
-# <https://hpiers.obspm.fr/iers/bul/bulc/Leap_Second.dat>.
-# See: Levine J. Coordinated Universal Time and the leap second.
+# (which measures the true angular orientation of the earth in space); see
+# Levine J. Coordinated Universal Time and the leap second.
 # URSI Radio Sci Bull. 2016;89(4):30-6. doi:10.23919/URSIRSB.2016.7909995
-# <https://ieeexplore.ieee.org/document/7909995>.
+# http://ieeexplore.ieee.org/document/7909995/
 # There were no leap seconds before 1972, because the official mechanism
 # accounting for the discrepancy between atomic time and the earth's rotation
-# did not exist.
+# did not exist until the early 1970s.
 
 # The correction (+ or -) is made at the given time, so lines
 # will typically look like:
@@ -52,7 +48,10 @@
 # or
 #	Leap	YEAR	MON	DAY	23:59:59	-	R/S
 
-# If the leap second is Rolling (R) the given time is local time (unused here).
+# If the leapsecond is Rolling (R) the given time is local time.
+# If the leapsecond is Stationary (S) the given time is UTC.
+
+# Leap	YEAR	MONTH	DAY	HH:MM:SS	CORR	R/S
 Leap	1972	Jun	30	23:59:60	+	S
 Leap	1972	Dec	31	23:59:60	+	S
 Leap	1973	Dec	31	23:59:60	+	S
@@ -81,9 +80,5 @@ Leap	2012	Jun	30	23:59:60	+	S
 Leap	2015	Jun	30	23:59:60	+	S
 Leap	2016	Dec	31	23:59:60	+	S
 
-# POSIX timestamps for the data in this file:
-#updated 1467936000
-#expires 1561680000
-
-#	Updated through IERS Bulletin C56
-#	File expires on:  28 June 2019
+#	Updated through IERS Bulletin C55
+#	File expires on:  28 December 2018

make/data/tzdata/northamerica

@@ -21,8 +21,6 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-# tzdb data for North and Central America and environs
-
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -73,7 +71,7 @@
 #
 # Most of the US soon followed suit.  See:
 # Bartky IR. The adoption of standard time. Technol Cult 1989 Jan;30(1):25-56.
-# https://dx.doi.org/10.2307/3105430
+# http://dx.doi.org/10.2307/3105430
 
 # From Paul Eggert (2005-04-16):
 # That 1883 transition occurred at 12:00 new time, not at 12:00 old time.
@@ -462,19 +460,6 @@ Zone America/North_Dakota/Beulah -6:47:07 - LMT	1883 Nov 18 12:12:53
 # western South Dakota, far western Texas (El Paso County, Hudspeth County,
 # and Pine Springs and Nickel Creek in Culberson County), Utah, Wyoming
 #
-# From Paul Eggert (2018-10-25):
-# On 1921-03-04 federal law placed all of Texas into the central time zone.
-# However, El Paso ignored the law for decades and continued to observe
-# mountain time, on the grounds that that's what they had always done
-# and they weren't about to let the federal government tell them what to do.
-# Eventually the federal government gave in and changed the law on
-# 1970-04-10 to match what El Paso was actually doing.  Although
-# that's slightly after our 1970 cutoff, there is no need to create a
-# separate zone for El Paso since they were ignoring the law anyway.  See:
-# Long T. El Pasoans were time rebels, fought to stay in Mountain zone.
-# El Paso Times. 2018-10-24 06:40 -06.
-# https://www.elpasotimes.com/story/news/local/el-paso/2018/10/24/el-pasoans-were-time-rebels-fought-stay-mountain-zone/1744509002/
-#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
 Rule	Denver	1920	1921	-	Mar	lastSun	2:00	1:00	D
 Rule	Denver	1920	only	-	Oct	lastSun	2:00	0	S
@@ -744,7 +729,9 @@ Zone America/Adak	 12:13:22 -	LMT	1867 Oct 19 12:44:35
 Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00
 			-10:30	-	HST	1933 Apr 30  2:00
 			-10:30	1:00	HDT	1933 May 21 12:00
-			-10:30	US	H%sT	1947 Jun  8  2:00
+			-10:30	-	HST	1942 Feb  9  2:00
+			-10:30	1:00	HDT	1945 Sep 30  2:00
+			-10:30	-	HST	1947 Jun  8  2:00
 			-10:00	-	HST
 
 # Now we turn to US areas that have diverged from the consensus since 1970.

make/data/tzdata/pacificnew

@@ -21,8 +21,6 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-# tzdb data for proposed US election time (this file is obsolete)
-
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

make/data/tzdata/southamerica

@@ -21,8 +21,6 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-# tzdb data for South America and environs
-
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -417,7 +415,7 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	-
 # standard time, so let's do that here too.  This does not change UTC
 # offsets, only tm_isdst and the time zone abbreviations.  One minor
 # plus is that this silences a zic complaint that there's no POSIX TZ
-# setting for timestamps past 2038.
+# setting for time stamps past 2038.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
@@ -950,14 +948,6 @@ Rule	Brazil	2016	2022	-	Feb	Sun>=15	0:00	0	-
 # ... https://www.timeanddate.com/news/time/brazil-delays-dst-2018.html
 # From Steffen Thorsen (2017-12-20):
 # http://www.planalto.gov.br/ccivil_03/_ato2015-2018/2017/decreto/D9242.htm
-#
-# From Fábio Gomes (2018-10-04):
-# The Brazilian president just announced a new change on this year DST.
-# It was scheduled to start on November 4th and it was changed to November 18th.
-# From Rodrigo Brüning Wessler (2018-10-15):
-# The Brazilian government just announced that the change in DST was
-# canceled....  Maybe the president Michel Temer also woke up one hour
-# earlier today. :)
 Rule	Brazil	2018	max	-	Nov	Sun>=1	0:00	1:00	-
 Rule	Brazil	2023	only	-	Feb	Sun>=22	0:00	0	-
 Rule	Brazil	2024	2025	-	Feb	Sun>=15	0:00	0	-
@@ -1264,24 +1254,6 @@ Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 # they will switch from -03 to -04 one hour after Santiago does that day.
 # For now, assume that they will not revert.
 
-# From Juan Correa (2018-08-13):
-# As of moments ago, the Ministry of Energy in Chile has announced the new
-# schema for DST. ...  Announcement in video (in Spanish):
-# https://twitter.com/MinEnergia/status/1029000399129374720
-# From Yonathan Dossow (2018-08-13):
-# The video says "first Saturday of September", we all know it means Sunday at
-# midnight.
-# From Tim Parenti (2018-08-13):
-# Translating the captions on the video at 0:44-0:55, "We want to announce as
-# Government that from 2019, Winter Time will be increased to 5 months, between
-# the first Saturday of April and the first Saturday of September."
-# At 2:08-2:20, "The Magallanes region will maintain its current time, as
-# decided by the citizens during 2017, but our Government will promote a
-# regional dialogue table to gather their opinion on this matter."
-# https://twitter.com/MinEnergia/status/1029009354001973248
-# "We will keep the new time policy unchanged for at least the next 4 years."
-# So we extend the new rules on Saturdays at 24:00 mainland time indefinitely.
-
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	-
 Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
@@ -1315,10 +1287,8 @@ Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
 Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	-
 Rule	Chile	2012	2014	-	Apr	Sun>=23	3:00u	0	-
 Rule	Chile	2012	2014	-	Sep	Sun>=2	4:00u	1:00	-
-Rule	Chile	2016	2018	-	May	Sun>=9	3:00u	0	-
-Rule	Chile	2016	2018	-	Aug	Sun>=9	4:00u	1:00	-
-Rule	Chile	2019	max	-	Apr	Sun>=2	3:00u	0	-
-Rule	Chile	2019	max	-	Sep	Sun>=2	4:00u	1:00	-
+Rule	Chile	2016	max	-	May	Sun>=9	3:00u	0	-
+Rule	Chile	2016	max	-	Aug	Sun>=9	4:00u	1:00	-
 # IATA SSIM anomalies: (1992-02) says 1992-03-14;
 # (1996-09) says 1998-03-08.  Ignore these.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]

make/data/tzdata/systemv

@@ -21,8 +21,6 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-# tzdb data for System V rules (this file is obsolete)
-
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 

make/data/tzdata/zone.tab

@@ -21,12 +21,12 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-# tzdb timezone descriptions (deprecated version)
+# tz zone descriptions (deprecated version)
 #
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
-# From Paul Eggert (2018-06-27):
+# From Paul Eggert (2014-07-31):
 # This file is intended as a backward-compatibility aid for older programs.
 # New programs should use zone1970.tab.  This file is like zone1970.tab (see
 # zone1970.tab's comments), but with the following additional restrictions:
@@ -35,13 +35,13 @@
 # 2.  The first data column contains exactly one country code.
 #
 # Because of (2), each row stands for an area that is the intersection
-# of a region identified by a country code and of a timezone where civil
+# of a region identified by a country code and of a zone where civil
 # clocks have agreed since 1970; this is a narrower definition than
 # that of zone1970.tab.
 #
-# This table is intended as an aid for users, to help them select timezones
-# appropriate for their practical needs.  It is not intended to take or
-# endorse any position on legal or territorial claims.
+# This table is intended as an aid for users, to help them select time
+# zone data entries appropriate for their practical needs.  It is not
+# intended to take or endorse any position on legal or territorial claims.
 #
 #country-
 #code	coordinates	TZ			comments
@@ -291,7 +291,7 @@ MM	+1647+09610	Asia/Yangon
 MN	+4755+10653	Asia/Ulaanbaatar	Mongolia (most areas)
 MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
 MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
-MO	+221150+1133230	Asia/Macau
+MO	+2214+11335	Asia/Macau
 MP	+1512+14545	Pacific/Saipan
 MQ	+1436-06105	America/Martinique
 MR	+1806-01557	Africa/Nouakchott

make/hotspot/lib/JvmOverrideFiles.gmk

@@ -30,7 +30,7 @@ $(eval $(call IncludeCustomExtension, hotspot/lib/JvmOverrideFiles.gmk))
 # status for individual files on specific platforms.
 
 ifeq ($(TOOLCHAIN_TYPE), gcc)
-  BUILD_LIBJVM_vmStructs.cpp_CXXFLAGS := -fno-var-tracking-assignments
+  BUILD_LIBJVM_vmStructs.cpp_CXXFLAGS := -fno-var-tracking-assignments -O0
   BUILD_LIBJVM_jvmciCompilerToVM.cpp_CXXFLAGS := -fno-var-tracking-assignments
   BUILD_LIBJVM_jvmciCompilerToVMInit.cpp_CXXFLAGS := -fno-var-tracking-assignments
   BUILD_LIBJVM_assembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
@@ -38,26 +38,20 @@ ifeq ($(TOOLCHAIN_TYPE), gcc)
   BUILD_LIBJVM_interp_masm_x86.cpp_CXXFLAGS := -Wno-uninitialized
 endif
 
-LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NONE)
-# If the FDLIBM_CFLAGS variable is non-empty we know
-# that the fdlibm-fork in hotspot can get optimized
-# by using -ffp-contract=off on GCC/Clang platforms.
-ifneq ($(FDLIBM_CFLAGS), )
-  LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NORM)
-endif
-
 ifeq ($(OPENJDK_TARGET_OS), linux)
   BUILD_LIBJVM_ostream.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
   BUILD_LIBJVM_logFileOutput.cpp_CXXFLAGS := -D_FILE_OFFSET_BITS=64
 
-  BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
-  BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := -DNO_PCH $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
+  ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
+    BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := -DNO_PCH $(CXX_O_FLAG_NONE)
+    BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := -DNO_PCH $(CXX_O_FLAG_NONE)
 
-  ifeq ($(TOOLCHAIN_TYPE), clang)
-    JVM_PRECOMPILED_HEADER_EXCLUDE := \
-	sharedRuntimeTrig.cpp \
-	sharedRuntimeTrans.cpp \
-	#
+    ifeq ($(TOOLCHAIN_TYPE), clang)
+      JVM_PRECOMPILED_HEADER_EXCLUDE := \
+          sharedRuntimeTrig.cpp \
+          sharedRuntimeTrans.cpp \
+          #
+    endif
   endif
 
   ifeq ($(OPENJDK_TARGET_CPU), x86)
@@ -126,8 +120,8 @@ else ifeq ($(OPENJDK_TARGET_OS), solaris)
 
 else ifeq ($(OPENJDK_TARGET_OS), macosx)
   # The copied fdlibm routines in these files must not be optimized
-  BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
-  BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := $(FDLIBM_CFLAGS) $(LIBJVM_FDLIBM_COPY_OPT_FLAG)
+  BUILD_LIBJVM_sharedRuntimeTrans.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
+  BUILD_LIBJVM_sharedRuntimeTrig.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
   ifeq ($(TOOLCHAIN_TYPE), clang)
     # NOTE: The old build tested clang version to make sure this workaround
     # for the clang bug was still needed.

make/launcher/Launcher-jdk.pack.gmk

@@ -39,7 +39,7 @@ $(eval $(call SetupBuildLauncher, pack200, \
 # On Mac, we have always exported all symbols, probably due to oversight
 # and/or misunderstanding. To emulate this, don't hide any symbols
 # by default.
-# On AIX/xlc we need at least xlc 13.1 for the symbol hiding (see JDK-8214063)
+# On AIX/xlc we need at least xlc 13.1 for the symbol hiding
 # Also provide an override for non-conformant libraries.
 ifeq ($(TOOLCHAIN_TYPE), gcc)
   CXXFLAGS_JDKEXE += -fvisibility=hidden
@@ -50,6 +50,10 @@ else ifeq ($(TOOLCHAIN_TYPE), clang)
   endif
 else ifeq ($(TOOLCHAIN_TYPE), solstudio)
   CXXFLAGS_JDKEXE += -xldscope=hidden
+else ifeq ($(TOOLCHAIN_TYPE), xlc)
+  ifneq ($(CC_VERSION_NUMBER), 12.1)
+    CXXFLAGS_JDKEXE += -qvisibility=hidden
+  endif
 endif
 
 UNPACKEXE_SRC := $(TOPDIR)/src/jdk.pack/share/native/common-unpack \

make/launcher/LauncherCommon.gmk

@@ -45,7 +45,7 @@ endif
 # On Mac, we have always exported all symbols, probably due to oversight
 # and/or misunderstanding. To emulate this, don't hide any symbols
 # by default.
-# On AIX/xlc we need at least xlc 13.1 for the symbol hiding (see JDK-8214063)
+# On AIX/xlc we need at least xlc 13.1 for the symbol hiding
 # Also provide an override for non-conformant libraries.
 ifeq ($(TOOLCHAIN_TYPE), gcc)
   LAUNCHER_CFLAGS += -fvisibility=hidden
@@ -56,6 +56,10 @@ else ifeq ($(TOOLCHAIN_TYPE), clang)
   endif
 else ifeq ($(TOOLCHAIN_TYPE), solstudio)
   LAUNCHER_CFLAGS += -xldscope=hidden
+else ifeq ($(TOOLCHAIN_TYPE), xlc)
+  ifneq ($(CC_VERSION_NUMBER), 12.1)
+    CXXFLAGS_JDKEXE += -qvisibility=hidden
+  endif
 endif
 
 LAUNCHER_SRC := $(TOPDIR)/src/java.base/share/native/launcher

make/lib/Awt2dLibraries.gmk

@@ -136,6 +136,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
       $(TOPDIR)/src/$(MODULE)/share/native/common/font \
       $(TOPDIR)/src/$(MODULE)/share/native/common/java2d/opengl \
       $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt/systemscale \
+      $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/launcher \
       #
 endif
 
@@ -577,10 +578,12 @@ else ifeq ($(OPENJDK_TARGET_OS), macosx)
   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
       X11TextRenderer.c \
       fontpath.c \
-      lcdglyph.c
+      lcdglyph.c \
+      lcdglyphDW.cpp
 else
   LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
-      lcdglyph.c
+      lcdglyph.c \
+      lcdglyphDW.cpp
 endif
 
 LIBFONTMANAGER_CFLAGS += $(X_CFLAGS) -DLE_STANDALONE -DHEADLESS

make/lib/CoreLibraries.gmk

@@ -39,15 +39,20 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
   BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
 endif
 
-# If FDLIBM_CFLAGS is non-empty we know that we can optimize
-# fdlibm when adding those extra C flags. Currently GCC,
-# and clang only.
-ifneq ($(FDLIBM_CFLAGS), )
-  BUILD_LIBFDLIBM_OPTIMIZATION := LOW
+ifeq ($(OPENJDK_TARGET_OS), linux)
+  ifeq ($(OPENJDK_TARGET_CPU), ppc64)
+    BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+  else ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
+    BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+  else ifeq ($(OPENJDK_TARGET_CPU), s390x)
+    BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+  else ifeq ($(OPENJDK_TARGET_CPU), aarch64)
+    BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
+  endif
 endif
 
 LIBFDLIBM_SRC := $(TOPDIR)/src/java.base/share/native/libfdlibm
-LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC) $(FDLIBM_CFLAGS)
+LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC)
 
 ifneq ($(OPENJDK_TARGET_OS), macosx)
   $(eval $(call SetupNativeCompilation, BUILD_LIBFDLIBM, \
@@ -59,7 +64,11 @@ ifneq ($(OPENJDK_TARGET_OS), macosx)
       CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \
       CFLAGS_windows_debug := -DLOGGING, \
       CFLAGS_aix := -qfloat=nomaf, \
-      DISABLED_WARNINGS_gcc := sign-compare misleading-indentation array-bounds, \
+      CFLAGS_linux_ppc64 := -ffp-contract=off, \
+      CFLAGS_linux_ppc64le := -ffp-contract=off, \
+      CFLAGS_linux_s390x := -ffp-contract=off, \
+      CFLAGS_linux_aarch64 := -ffp-contract=off, \
+      DISABLED_WARNINGS_gcc := sign-compare misleading-indentation, \
       DISABLED_WARNINGS_microsoft := 4146 4244 4018, \
       ARFLAGS := $(ARFLAGS), \
       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libfdlibm, \

make/lib/Lib-java.base.gmk

@@ -55,7 +55,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBNET, \
     LIBS_solaris := -lnsl -lsocket $(LIBDL), \
     LIBS_aix := $(LIBDL),\
     LIBS_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib winhttp.lib \
-        urlmon.lib delayimp.lib $(WIN_JAVA_LIB) advapi32.lib, \
+        delayimp.lib $(WIN_JAVA_LIB) advapi32.lib, \
     LIBS_macosx := -framework CoreFoundation -framework CoreServices, \
 ))
 
@@ -138,7 +138,6 @@ ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
 
     $(eval $(call SetupJdkLibrary, BUILD_LIBJSIG, \
         NAME := jsig, \
-        OPTIMIZATION := LOW, \
         CFLAGS := $(CFLAGS_JDKLIB) $(LIBJSIG_CFLAGS), \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN), \

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

@@ -44,12 +44,7 @@ else ifeq ($(OPENJDK_TARGET_OS), windows)
   ifeq ($(OPENJDK_TARGET_CPU), x86_64)
     SA_CXXFLAGS := -DWIN64
   else
-    # Only add /RTC1 flag for debug builds as it's
-    # incompatible with release type builds. See
-    # https://msdn.microsoft.com/en-us/library/8wtf2dfz.aspx
-    ifeq ($(DEBUG_LEVEL),slowdebug)
-      SA_CXXFLAGS := -RTC1
-    endif
+    SA_CXXFLAGS := -RTC1
   endif
 endif
 
@@ -57,7 +52,7 @@ endif
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
     NAME := saproc, \
-    OPTIMIZATION := HIGH, \
+    OPTIMIZATION := NONE, \
     DISABLED_WARNINGS_microsoft := 4267, \
     DISABLED_WARNINGS_gcc := sign-compare, \
     DISABLED_WARNINGS_CXX_solstudio := truncwarn unknownpragma, \

make/lib/LibCommon.gmk

@@ -38,7 +38,7 @@ WIN_JAVA_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib
 # On Mac, we have always exported all symbols, probably due to oversight
 # and/or misunderstanding. To emulate this, don't hide any symbols
 # by default.
-# On AIX/xlc we need at least xlc 13.1 for the symbol hiding (see JDK-8214063)
+# On AIX/xlc we need at least xlc 13.1 for the symbol hiding
 # Also provide an override for non-conformant libraries.
 ifeq ($(TOOLCHAIN_TYPE), gcc)
   CFLAGS_JDKLIB += -fvisibility=hidden
@@ -55,6 +55,12 @@ else ifeq ($(TOOLCHAIN_TYPE), solstudio)
   CFLAGS_JDKLIB += -xldscope=hidden
   CXXFLAGS_JDKLIB += -xldscope=hidden
   EXPORT_ALL_SYMBOLS := -xldscope=global
+else ifeq ($(TOOLCHAIN_TYPE), xlc)
+  ifneq ($(CC_VERSION_NUMBER), 12.1)
+    CFLAGS_JDKLIB += -qvisibility=hidden
+    CXXFLAGS_JDKLIB += -qvisibility=hidden
+    EXPORT_ALL_SYMBOLS := -qvisibility=default
+  endif
 endif
 
 ################################################################################

make/test/JtregNativeHotspot.gmk

@@ -139,15 +139,6 @@ NSK_AOD_INCLUDES := \
     -I$(VM_TESTBASE_DIR)/nsk/share/native \
     -I$(VM_TESTBASE_DIR)/nsk/share/jni
 
-NO_FRAMEPOINTER_CFLAGS :=
-ifeq ($(OPENJDK_TARGET_OS),linux)
-   NO_FRAMEPOINTER_CFLAGS := -fomit-frame-pointer
-endif
-
-BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libNoFramePointer := $(NO_FRAMEPOINTER_CFLAGS)
-# Optimization -O3 needed, HIGH == -O3
-BUILD_HOTSPOT_JTREG_LIBRARIES_OPTIMIZATION_libNoFramePointer := HIGH
-
 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libProcessUtils := $(VM_SHARE_INCLUDES)
 
 BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libThreadController := $(NSK_MONITORING_INCLUDES)

src/demo/share/java2d/J2DBench/build.xml

@@ -49,7 +49,7 @@
   <target name="compile" depends="init"
         description="compile the source " >
     <!-- Compile the java code from ${src} into ${build} -->
-    <javac debug="off" source="1.6" target="1.6" srcdir="${src}" destdir="${build}"/>
+    <javac debug="on" source="8" target="8" srcdir="${src}" destdir="${build}"/>
   </target>
 
   <target name="run" depends="dist"

src/demo/share/java2d/J2DBench/src/j2dbench/report/TCChartReporter.java

@@ -0,0 +1,320 @@
+package j2dbench.report;
+
+import java.io.IOException;
+import java.nio.file.DirectoryIteratorException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+
+/**
+ * The class reads J2DBench scores and reports them into output stream in format applicable for TeamCity charts.
+ * The directory, where J2DBench result files placed, is specified via command line parameter like follows:
+ * <p>
+ * <code>-basexml | -b <xml file path></code>
+ * </p>
+ * This directory must contain one file with pattern <code>*{openjdk}*.{res}</code> which is considered as a container
+ * of reference scores and several <code>*{jbsdk}*.{res}</code>.
+ * <p>
+ * <p> Names of these files have several mandatory fields separated by <code>"_"</code> and look like
+ * <code>osName_jdkName_renderName_*.res</code>
+ * </p>
+ * <p>
+ * If any of score is less than corresponding reference value by 5% then exit code <code>1</code> is returned otherwise
+ * exit code <code>0</code> is returned.
+ * <p>
+ * Standard output will contain scores in format required for TeamCity charts.
+ * <p>
+ * Created by vprovodin on 13/02/2017.
+ */
+public class TCChartReporter {
+
+    private static boolean printTCValues = false;
+    private static boolean printValues = false;
+
+    private static final DecimalFormat decimalFormat =
+            new DecimalFormat("0.00");
+
+    private static FileSystem defaultFileSystem = FileSystems.getDefault();
+
+    private static double getMeasurementError(String testCaseName, String osName) {
+        if (testCaseName.contains("text.Rendering.tests.drawString") && osName.toLowerCase().contains("lin")  )
+            return 0.18;
+        return 0.1;
+    }
+
+    /**
+     * Level at which tests are grouped to be displayed in summary
+     */
+    private static final int LEVEL = 2;
+
+    /**
+     * Holds the groups and corresponding group-display-names
+     */
+    private static List<String> groups = new ArrayList<>();
+    private static Map<String, Double> referenceValues = new HashMap<>();
+    private static boolean testFailed = false;
+
+    private static void printUsage() {
+        String usage =
+                "\njava TCChartReporter [options]      " +
+                        "                                      \n\n" +
+                        "where options include:                " +
+                        "                                      \n" +
+                        "    -basexml | -b <xml file path>     " +
+                        "path to base-build result";
+        System.out.println(usage);
+        System.exit(0);
+    }
+
+    /**
+     * String = getTestResultsTableForSummary()
+     */
+    private static double generateTestCaseReport(
+            Object key,
+            Map<String, J2DAnalyzer.ResultHolder> testCaseResult,
+            Map<String, Integer> testCaseResultCount) {
+
+        Integer curTestCountObj = testCaseResultCount.get(key.toString());
+        int curTestCount = 0;
+        if (curTestCountObj != null) {
+            curTestCount = curTestCountObj;
+        }
+
+        double totalScore = 0;
+
+        for (int i = 0; i < curTestCount; i++) {
+            J2DAnalyzer.ResultHolder resultTCR = testCaseResult.get(key.toString() + "_" + i);
+            totalScore = totalScore + resultTCR.getScore();
+        }
+
+        return totalScore;
+    }
+
+    /**
+     * Generate Testcase Summary Report for TC - *.out
+     */
+    private static void generateTestCaseSummaryReport(
+            String OJRname,
+            Map<String, Double> consoleResult,
+            Map<String, J2DAnalyzer.ResultHolder> testCaseResult,
+            Map<String, Integer> testCaseResultCount,
+            boolean rememberReference) {
+
+        String curGroupName, curTestName;
+
+        Object[] groupNameArray = groups.toArray();
+
+        Object[] testCaseList = consoleResult.keySet().toArray();
+        Arrays.sort(testCaseList);
+
+        for (Object aGroupNameArray : groupNameArray) {
+
+            double value;
+            curGroupName = aGroupNameArray.toString();
+
+            for (Object aTestCaseList : testCaseList) {
+
+                curTestName = aTestCaseList.toString();
+
+                if (curTestName.contains(curGroupName)) {
+
+                    value = generateTestCaseReport(curTestName, testCaseResult, testCaseResultCount);
+
+                    if (printTCValues)
+                        System.out.println("##teamcity[buildStatisticValue key='" + (OJRname.isEmpty() ? "" : OJRname + ".") + curTestName
+                                + "' value='" + decimalFormat.format(value) + "']");
+                    if (printValues)
+                        System.out.println((OJRname.isEmpty() ? "" : OJRname + ".") + curTestName + "," + decimalFormat.format(value));
+                    if (rememberReference) {
+                        referenceValues.put(curTestName, value);
+                    } else {
+                        double refValue = referenceValues.getOrDefault(curTestName, 0.);
+                        if (Math.abs(value/refValue - 1) >= getMeasurementError(curTestName, OJRname)) {
+                            System.err.println(OJRname);
+                            System.err.println(curTestName);
+                            System.err.println("\treferenceValue=" + refValue);
+                            System.err.println("\t   actualValue=" + value);
+                            System.err.println("\t          diff:" + ((value / refValue - 1) * 100));
+                            testFailed = (value < refValue);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * main
+     */
+    public static void main(String args[]) {
+
+        String baseXML = null;
+        int group = 2;
+
+        /* ---- Analysis Mode ----
+            BEST    = 1;
+            WORST   = 2;
+            AVERAGE = 3;
+            MIDAVG  = 4;
+         ------------------------ */
+        int analyzerMode = 4;
+
+        try {
+
+            for (int i = 0; i < args.length; i++) {
+
+                if (args[i].startsWith("-basexml") ||
+                        args[i].startsWith("-b")) {
+                    i++;
+                    baseXML = args[i];
+                } else if (args[i].startsWith("-tc")) {
+                    printTCValues = true;
+                } else if (args[i].startsWith("-v"))
+                    printValues = true;
+            }
+        } catch (Exception e) {
+            printUsage();
+        }
+
+        XMLHTMLReporter.setGroupLevel(group);
+        J2DAnalyzer.setMode(analyzerMode);
+        if (baseXML != null) {
+            generateComparisonReport(defaultFileSystem.getPath(baseXML));
+        } else {
+            printUsage();
+        }
+
+        if (testFailed)
+            System.exit(1);
+    }
+
+    /**
+     * Add Test Group to the list
+     */
+    private static void addGroup(String testName) {
+
+        String testNameSplit[] = testName.replace('.', '_').split("_");
+        StringBuilder group = new StringBuilder(testNameSplit[0]);
+        for (int i = 1; i < LEVEL; i++) {
+            group.append(".").append(testNameSplit[i]);
+        }
+
+        if (!groups.contains(group.toString()))
+            groups.add(group.toString());
+    }
+
+    private static List<Path> listResFiles(Path dir, String pattern) throws IOException {
+        List<Path> result = new ArrayList<>();
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir, pattern)) {
+            for (Path entry : stream) {
+                result.add(entry);
+            }
+        } catch (DirectoryIteratorException ex) {
+            throw ex.getCause();
+        }
+        return result;
+    }
+
+    /**
+     * Generate the reports from the base & target result XML
+     */
+    private static void generateComparisonReport(Path directoryToResFiles) {
+
+        if (directoryToResFiles.toFile().isDirectory()) {
+            List<Path> jbsdkFiles, openjdkFiles;
+
+            try {
+                jbsdkFiles = listResFiles(directoryToResFiles, "*{jbsdk,jbre}*.{res}");
+                openjdkFiles = listResFiles(directoryToResFiles, "*{openjdk}*.{res}");
+            } catch (IOException e) {
+                e.printStackTrace();
+                return;
+            }
+
+            readScores(openjdkFiles.get(0), true);
+
+            for (Path file : jbsdkFiles) {
+                readScores(file, false);
+            }
+        } else {
+            readScores(directoryToResFiles, true);
+        }
+    }
+
+    private static void readScores(Path file, boolean rememberReference) {
+        String fileName = file.getName(file.getNameCount() - 1).toString();
+        String osName="", jdkName="", renderName="";
+        if (fileName.contains("win") || fileName.contains("linux") || fileName.contains("osx")) {
+            String[] fileNameComponents = fileName.split("_");
+            if (fileNameComponents.length > 0)
+                osName = fileNameComponents[0];
+            if (fileNameComponents.length > 1)
+                jdkName = fileNameComponents[1];
+            if (fileNameComponents.length > 2)
+                renderName = fileNameComponents[2];
+        }
+
+        String resultXMLFileName = file.toString();
+
+        J2DAnalyzer.results = new Vector();
+        J2DAnalyzer.readResults(resultXMLFileName);
+        J2DAnalyzer.SingleResultSetHolder baseSRSH =
+                (J2DAnalyzer.SingleResultSetHolder) J2DAnalyzer.results.elementAt(0);
+        Enumeration baseEnum_ = baseSRSH.getKeyEnumeration();
+        Vector<String> baseKeyvector = new Vector<>();
+        while (baseEnum_.hasMoreElements()) {
+            baseKeyvector.add((String) baseEnum_.nextElement());
+        }
+        String baseKeys[] = new String[baseKeyvector.size()];
+        baseKeyvector.copyInto(baseKeys);
+        J2DAnalyzer.sort(baseKeys);
+
+        Map<String, Double> consoleBaseRes = new HashMap<>();
+
+        Map<String, J2DAnalyzer.ResultHolder> testCaseBaseResult = new HashMap<>();
+        Map<String, Integer> testCaseResultCount = new HashMap<>();
+
+        for (String baseKey : baseKeys) {
+
+            J2DAnalyzer.ResultHolder baseTCR =
+                    baseSRSH.getResultByKey(baseKey);
+
+            Integer curTestCountObj = testCaseResultCount.get(baseTCR.getName());
+            int curTestCount = 0;
+            if (curTestCountObj != null) {
+                curTestCount = curTestCountObj;
+            }
+            curTestCount++;
+            testCaseBaseResult.put(baseTCR.getName() + "_" + (curTestCount - 1), baseTCR);
+            testCaseResultCount.put(baseTCR.getName(), curTestCount);
+
+            addGroup(baseTCR.getName());
+
+            Double curTotalScoreObj = consoleBaseRes.get(baseTCR.getName());
+            double curTotalScore = 0;
+            if (curTotalScoreObj != null) {
+                curTotalScore = curTotalScoreObj;
+            }
+            curTotalScore = curTotalScore + baseTCR.getScore();
+            consoleBaseRes.put(baseTCR.getName(), curTotalScore);
+        }
+
+        String OJRname = osName + "." + jdkName + "." + renderName;
+        generateTestCaseSummaryReport((OJRname.length() == 2? "": OJRname),
+                consoleBaseRes,
+                testCaseBaseResult,
+                testCaseResultCount,
+                rememberReference);
+
+    }
+}

src/demo/share/jfc/J2Ddemo/java2d/DemoInstVarsAccessor.java

@@ -1,34 +1,3 @@
-/*
- *
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- *   - Neither the name of Oracle nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
 package java2d;
 
 import java.awt.Color;

src/demo/share/jfc/J2Ddemo/java2d/DemoInstVarsAccessorImplBase.java

@@ -1,34 +1,3 @@
-/*
- *
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- *   - Neither the name of Oracle nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
 package java2d;
 
 import java.awt.Color;

src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp

@@ -2789,10 +2789,7 @@ void LIR_Assembler::align_backward_branch_target() {
 }
 
 
-void LIR_Assembler::negate(LIR_Opr left, LIR_Opr dest, LIR_Opr tmp) {
-  // tmp must be unused
-  assert(tmp->is_illegal(), "wasting a register if tmp is allocated");
-
+void LIR_Assembler::negate(LIR_Opr left, LIR_Opr dest) {
   if (left->is_single_cpu()) {
     assert(dest->is_single_cpu(), "expect single result reg");
     __ negw(dest->as_register(), left->as_register());

src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp

@@ -5741,18 +5741,15 @@ class StubGenerator: public StubCodeGenerator {
     }
 
     if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dlog)) {
-      // disabled pending fix and retest of generated code via JDK-8210858
-      // StubRoutines::_dlog = generate_dlog();
+      StubRoutines::_dlog = generate_dlog();
     }
 
     if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dsin)) {
-      // disabled pending fix and retest of generated code via JDK-8210461
-      // StubRoutines::_dsin = generate_dsin_dcos(/* isCos = */ false);
+      StubRoutines::_dsin = generate_dsin_dcos(/* isCos = */ false);
     }
 
     if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_dcos)) {
-      // disabled pending fix and retest of generated code via JDK-8210461
-      // StubRoutines::_dcos = generate_dsin_dcos(/* isCos = */ true);
+      StubRoutines::_dcos = generate_dsin_dcos(/* isCos = */ true);
     }
   }
 

src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp

@@ -44,30 +44,24 @@
 #define __ masm->
 
 #ifndef PRODUCT
-extern "C" void bad_compiled_vtable_index(JavaThread* thread, oop receiver, int index);
+extern "C" void bad_compiled_vtable_index(JavaThread* thread,
+                                          oop receiver,
+                                          int index);
 #endif
 
 VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
-  // Read "A word on VtableStub sizing" in share/code/vtableStubs.hpp for details on stub sizing.
-  const int stub_code_length = code_size_limit(true);
-  VtableStub* s = new(stub_code_length) VtableStub(true, vtable_index);
+  const int aarch64_code_length = VtableStub::pd_code_size_limit(true);
+  VtableStub* s = new(aarch64_code_length) VtableStub(true, vtable_index);
   // Can be NULL if there is no free space in the code cache.
   if (s == NULL) {
     return NULL;
   }
 
-  // Count unused bytes in instruction sequences of variable size.
-  // We add them to the computed buffer size in order to avoid
-  // overflow in subsequently generated stubs.
-  address   start_pc;
-  int       slop_bytes = 0;
-  int       slop_delta = 0;
-
-  ResourceMark    rm;
-  CodeBuffer      cb(s->entry_point(), stub_code_length);
+  ResourceMark rm;
+  CodeBuffer cb(s->entry_point(), aarch64_code_length);
   MacroAssembler* masm = new MacroAssembler(&cb);
 
-#if (!defined(PRODUCT) && defined(COMPILER2))
+#ifndef PRODUCT
   if (CountCompiledCalls) {
     __ lea(r16, ExternalAddress((address) SharedRuntime::nof_megamorphic_calls_addr()));
     __ incrementw(Address(r16));
@@ -84,35 +78,21 @@ VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
 #ifndef PRODUCT
   if (DebugVtables) {
     Label L;
-    // TODO: find upper bound for this debug code.
-    start_pc = __ pc();
-
     // check offset vs vtable length
     __ ldrw(rscratch1, Address(r16, Klass::vtable_length_offset()));
     __ cmpw(rscratch1, vtable_index * vtableEntry::size());
     __ br(Assembler::GT, L);
     __ enter();
     __ mov(r2, vtable_index);
-
-    __ call_VM(noreg, CAST_FROM_FN_PTR(address, bad_compiled_vtable_index), j_rarg0, r2);
-    const ptrdiff_t estimate = 256;
-    const ptrdiff_t codesize = __ pc() - start_pc;
-    slop_delta  = estimate - codesize;  // call_VM varies in length, depending on data
-    slop_bytes += slop_delta;
-    assert(slop_delta >= 0, "vtable #%d: Code size estimate (%d) for DebugVtables too small, required: %d", vtable_index, (int)estimate, (int)codesize);
-
+    __ call_VM(noreg,
+               CAST_FROM_FN_PTR(address, bad_compiled_vtable_index), j_rarg0, r2);
     __ leave();
     __ bind(L);
   }
 #endif // PRODUCT
 
-  start_pc = __ pc();
   __ lookup_virtual_method(r16, vtable_index, rmethod);
-  slop_delta  = 8 - (int)(__ pc() - start_pc);
-  slop_bytes += slop_delta;
-  assert(slop_delta >= 0, "negative slop(%d) encountered, adjust code size estimate!", slop_delta);
 
-#ifndef PRODUCT
   if (DebugVtables) {
     Label L;
     __ cbz(rmethod, L);
@@ -121,8 +101,6 @@ VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
     __ stop("Vtable entry is NULL");
     __ bind(L);
   }
-#endif // PRODUCT
-
   // r0: receiver klass
   // rmethod: Method*
   // r2: receiver
@@ -130,46 +108,43 @@ VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
   __ ldr(rscratch1, Address(rmethod, Method::from_compiled_offset()));
   __ br(rscratch1);
 
-  masm->flush();
-  bookkeeping(masm, tty, s, npe_addr, ame_addr, true, vtable_index, slop_bytes, 0);
+  __ flush();
 
+  if (PrintMiscellaneous && (WizardMode || Verbose)) {
+    tty->print_cr("vtable #%d at " PTR_FORMAT "[%d] left over: %d",
+                  vtable_index, p2i(s->entry_point()),
+                  (int)(s->code_end() - s->entry_point()),
+                  (int)(s->code_end() - __ pc()));
+  }
+  guarantee(__ pc() <= s->code_end(), "overflowed buffer");
+
+  s->set_exception_points(npe_addr, ame_addr);
   return s;
 }
 
 
 VtableStub* VtableStubs::create_itable_stub(int itable_index) {
-  // Read "A word on VtableStub sizing" in share/code/vtableStubs.hpp for details on stub sizing.
-  const int stub_code_length = code_size_limit(false);
-  VtableStub* s = new(stub_code_length) VtableStub(false, itable_index);
-  // Can be NULL if there is no free space in the code cache.
-  if (s == NULL) {
-    return NULL;
-  }
-  // Count unused bytes in instruction sequences of variable size.
-  // We add them to the computed buffer size in order to avoid
-  // overflow in subsequently generated stubs.
-  address   start_pc;
-  int       slop_bytes = 0;
-  int       slop_delta = 0;
-
-  ResourceMark    rm;
-  CodeBuffer      cb(s->entry_point(), stub_code_length);
+  // Note well: pd_code_size_limit is the absolute minimum we can get
+  // away with.  If you add code here, bump the code stub size
+  // returned by pd_code_size_limit!
+  const int code_length = VtableStub::pd_code_size_limit(false);
+  VtableStub* s = new(code_length) VtableStub(false, itable_index);
+  ResourceMark rm;
+  CodeBuffer cb(s->entry_point(), code_length);
   MacroAssembler* masm = new MacroAssembler(&cb);
 
-#if (!defined(PRODUCT) && defined(COMPILER2))
+#ifndef PRODUCT
   if (CountCompiledCalls) {
     __ lea(r10, ExternalAddress((address) SharedRuntime::nof_megamorphic_calls_addr()));
     __ incrementw(Address(r10));
   }
 #endif
 
-  // get receiver (need to skip return address on top of stack)
-  assert(VtableStub::receiver_location() == j_rarg0->as_VMReg(), "receiver expected in j_rarg0");
-
   // Entry arguments:
   //  rscratch2: CompiledICHolder
   //  j_rarg0: Receiver
 
+
   // Most registers are in use; we'll use r16, rmethod, r10, r11
   const Register recv_klass_reg     = r10;
   const Register holder_klass_reg   = r16; // declaring interface klass (DECC)
@@ -182,8 +157,8 @@ VtableStub* VtableStubs::create_itable_stub(int itable_index) {
   __ ldr(resolved_klass_reg, Address(icholder_reg, CompiledICHolder::holder_klass_offset()));
   __ ldr(holder_klass_reg,   Address(icholder_reg, CompiledICHolder::holder_metadata_offset()));
 
-  start_pc = __ pc();
-
+  // get receiver (need to skip return address on top of stack)
+  assert(VtableStub::receiver_location() == j_rarg0->as_VMReg(), "receiver expected in j_rarg0");
   // get receiver klass (also an implicit null-check)
   address npe_addr = __ pc();
   __ load_klass(recv_klass_reg, j_rarg0);
@@ -197,25 +172,16 @@ VtableStub* VtableStubs::create_itable_stub(int itable_index) {
                              L_no_such_interface,
                              /*return_method=*/false);
 
-  const ptrdiff_t  typecheckSize = __ pc() - start_pc;
-  start_pc = __ pc();
-
   // Get selected method from declaring class and itable index
   __ load_klass(recv_klass_reg, j_rarg0);   // restore recv_klass_reg
   __ lookup_interface_method(// inputs: rec. class, interface, itable index
-                             recv_klass_reg, holder_klass_reg, itable_index,
-                             // outputs: method, scan temp. reg
-                             rmethod, temp_reg,
-                             L_no_such_interface);
+                       recv_klass_reg, holder_klass_reg, itable_index,
+                       // outputs: method, scan temp. reg
+                       rmethod, temp_reg,
+                       L_no_such_interface);
 
-  const ptrdiff_t lookupSize = __ pc() - start_pc;
-
-  // Reduce "estimate" such that "padding" does not drop below 8.
-  const ptrdiff_t estimate = 152;
-  const ptrdiff_t codesize = typecheckSize + lookupSize;
-  slop_delta  = (int)(estimate - codesize);
-  slop_bytes += slop_delta;
-  assert(slop_delta >= 0, "itable #%d: Code size estimate (%d) for lookup_interface_method too small, required: %d", itable_index, (int)estimate, (int)codesize);
+  // method (rmethod): Method*
+  // j_rarg0: receiver
 
 #ifdef ASSERT
   if (DebugVtables) {
@@ -240,17 +206,92 @@ VtableStub* VtableStubs::create_itable_stub(int itable_index) {
   // We force resolving of the call site by jumping to the "handle
   // wrong method" stub, and so let the interpreter runtime do all the
   // dirty work.
-  assert(SharedRuntime::get_handle_wrong_method_stub() != NULL, "check initialization order");
   __ far_jump(RuntimeAddress(SharedRuntime::get_handle_wrong_method_stub()));
 
-  masm->flush();
-  bookkeeping(masm, tty, s, npe_addr, ame_addr, false, itable_index, slop_bytes, 0);
+  __ flush();
 
+  if (PrintMiscellaneous && (WizardMode || Verbose)) {
+    tty->print_cr("itable #%d at " PTR_FORMAT "[%d] left over: %d",
+                  itable_index, p2i(s->entry_point()),
+                  (int)(s->code_end() - s->entry_point()),
+                  (int)(s->code_end() - __ pc()));
+  }
+  guarantee(__ pc() <= s->code_end(), "overflowed buffer");
+
+  s->set_exception_points(npe_addr, ame_addr);
   return s;
 }
 
-int VtableStub::pd_code_alignment() {
-  // aarch64 cache line size is not an architected constant. We just align on 4 bytes (instruction size).
-  const unsigned int icache_line_size = 4;
-  return icache_line_size;
+
+int VtableStub::pd_code_size_limit(bool is_vtable_stub) {
+  int size = DebugVtables ? 216 : 0;
+  if (CountCompiledCalls)
+    size += 6 * 4;
+  // FIXME: vtable stubs only need 36 bytes
+  if (is_vtable_stub)
+    size += 52;
+  else
+    size += 176;
+  return size;
+
+  // In order to tune these parameters, run the JVM with VM options
+  // +PrintMiscellaneous and +WizardMode to see information about
+  // actual itable stubs.  Run it with -Xmx31G -XX:+UseCompressedOops.
+  //
+  // If Universe::narrow_klass_base is nonzero, decoding a compressed
+  // class can take zeveral instructions.
+  //
+  // The JVM98 app. _202_jess has a megamorphic interface call.
+  // The itable code looks like this:
+
+  //    ldr    xmethod, [xscratch2,#CompiledICHolder::holder_klass_offset]
+  //    ldr    x0, [xscratch2]
+  //    ldr    w10, [x1,#oopDesc::klass_offset_in_bytes]
+  //    mov    xheapbase, #0x3c000000                //   #narrow_klass_base
+  //    movk    xheapbase, #0x3f7, lsl #32
+  //    add    x10, xheapbase, x10
+  //    mov    xheapbase, #0xe7ff0000                //   #heapbase
+  //    movk    xheapbase, #0x3f7, lsl #32
+  //    ldr    w11, [x10,#vtable_length_offset]
+  //    add    x11, x10, x11, uxtx #3
+  //    add    x11, x11, #itableMethodEntry::method_offset_in_bytes
+  //    ldr    x10, [x11]
+  //    cmp    xmethod, x10
+  //    b.eq    found_method
+  // search:
+  //    cbz    x10, no_such_interface
+  //    add    x11, x11, #0x10
+  //    ldr    x10, [x11]
+  //    cmp    xmethod, x10
+  //    b.ne    search
+  // found_method:
+  //    ldr    w10, [x1,#oopDesc::klass_offset_in_bytes]
+  //    mov    xheapbase, #0x3c000000                //   #narrow_klass_base
+  //    movk    xheapbase, #0x3f7, lsl #32
+  //    add    x10, xheapbase, x10
+  //    mov    xheapbase, #0xe7ff0000                //   #heapbase
+  //    movk    xheapbase, #0x3f7, lsl #32
+  //    ldr    w11, [x10,#vtable_length_offset]
+  //    add    x11, x10, x11, uxtx #3
+  //    add    x11, x11, #itableMethodEntry::method_offset_in_bytes
+  //    add    x10, x10, #itentry_off
+  //    ldr    xmethod, [x11]
+  //    cmp    x0, xmethod
+  //    b.eq    found_method2
+  // search2:
+  //    cbz    xmethod, 0x000003ffa872e6cc
+  //    add    x11, x11, #0x10
+  //    ldr    xmethod, [x11]
+  //    cmp    x0, xmethod
+  //    b.ne    search2
+  // found_method2:
+  //    ldr    w11, [x11,#itableOffsetEntry::offset_offset_in_bytes]
+  //    ldr    xmethod, [x10,w11,uxtw]
+  //    ldr    xscratch1, [xmethod,#Method::from_compiled_offset]
+  //    br    xscratch1
+  // no_such_interface:
+  //    b      throw_ICCE_entry
+
 }
+
+int VtableStub::pd_code_alignment() { return 4; }

src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp

@@ -3258,9 +3258,7 @@ void LIR_Assembler::align_backward_branch_target() {
 }
 
 
-void LIR_Assembler::negate(LIR_Opr left, LIR_Opr dest, LIR_Opr tmp) {
-  // tmp must be unused
-  assert(tmp->is_illegal(), "wasting a register if tmp is allocated");
+void LIR_Assembler::negate(LIR_Opr left, LIR_Opr dest) {
 
   if (left->is_single_cpu()) {
     assert (dest->type() == T_INT, "unexpected result type");

src/hotspot/cpu/arm/vtableStubs_arm.cpp

@@ -48,31 +48,17 @@ extern "C" void bad_compiled_vtable_index(JavaThread* thread, oop receiver, int
 #endif
 
 VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
-  // Read "A word on VtableStub sizing" in share/code/vtableStubs.hpp for details on stub sizing.
-  const int stub_code_length = code_size_limit(true);
-  VtableStub* s = new(stub_code_length) VtableStub(true, vtable_index);
+  const int code_length = VtableStub::pd_code_size_limit(true);
+  VtableStub* s = new(code_length) VtableStub(true, vtable_index);
   // Can be NULL if there is no free space in the code cache.
   if (s == NULL) {
     return NULL;
   }
 
-  // Count unused bytes in instruction sequences of variable size.
-  // We add them to the computed buffer size in order to avoid
-  // overflow in subsequently generated stubs.
-  address   start_pc;
-  int       slop_bytes = 0;
-  int       slop_delta = 0;
-
-  ResourceMark    rm;
-  CodeBuffer      cb(s->entry_point(), stub_code_length);
+  ResourceMark rm;
+  CodeBuffer cb(s->entry_point(), code_length);
   MacroAssembler* masm = new MacroAssembler(&cb);
 
-#if (!defined(PRODUCT) && defined(COMPILER2))
-  if (CountCompiledCalls) {
-    // Implementation required?
-  }
-#endif
-
   assert(VtableStub::receiver_location() == R0->as_VMReg(), "receiver expected in R0");
 
   const Register tmp = Rtemp; // Rtemp OK, should be free at call sites
@@ -80,33 +66,17 @@ VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
   address npe_addr = __ pc();
   __ load_klass(tmp, R0);
 
-#ifndef PRODUCT
-  if (DebugVtables) {
-    // Implementation required?
-  }
-#endif
+  {
+  int entry_offset = in_bytes(Klass::vtable_start_offset()) + vtable_index * vtableEntry::size_in_bytes();
+  int method_offset = vtableEntry::method_offset_in_bytes() + entry_offset;
 
-  start_pc = __ pc();
-  { // lookup virtual method
-    int entry_offset = in_bytes(Klass::vtable_start_offset()) + vtable_index * vtableEntry::size_in_bytes();
-    int method_offset = vtableEntry::method_offset_in_bytes() + entry_offset;
-
-    assert ((method_offset & (wordSize - 1)) == 0, "offset should be aligned");
-    int offset_mask = AARCH64_ONLY(0xfff << LogBytesPerWord) NOT_AARCH64(0xfff);
-    if (method_offset & ~offset_mask) {
-      __ add(tmp, tmp, method_offset & ~offset_mask);
-    }
-    __ ldr(Rmethod, Address(tmp, method_offset & offset_mask));
+  assert ((method_offset & (wordSize - 1)) == 0, "offset should be aligned");
+  int offset_mask = AARCH64_ONLY(0xfff << LogBytesPerWord) NOT_AARCH64(0xfff);
+  if (method_offset & ~offset_mask) {
+    __ add(tmp, tmp, method_offset & ~offset_mask);
   }
-  slop_delta  = 8 - (int)(__ pc() - start_pc);
-  slop_bytes += slop_delta;
-  assert(slop_delta >= 0, "negative slop(%d) encountered, adjust code size estimate!", slop_delta);
-
-#ifndef PRODUCT
-  if (DebugVtables) {
-    // Implementation required?
+  __ ldr(Rmethod, Address(tmp, method_offset & offset_mask));
   }
-#endif
 
   address ame_addr = __ pc();
 #ifdef AARCH64
@@ -117,36 +87,35 @@ VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
 #endif // AARCH64
 
   masm->flush();
-  bookkeeping(masm, tty, s, npe_addr, ame_addr, true, vtable_index, slop_bytes, 0);
 
+  if (PrintMiscellaneous && (WizardMode || Verbose)) {
+    tty->print_cr("vtable #%d at " PTR_FORMAT "[%d] left over: %d",
+                  vtable_index, p2i(s->entry_point()),
+                  (int)(s->code_end() - s->entry_point()),
+                  (int)(s->code_end() - __ pc()));
+  }
+  guarantee(__ pc() <= s->code_end(), "overflowed buffer");
+  // FIXME ARM: need correct 'slop' - below is x86 code
+  // shut the door on sizing bugs
+  //int slop = 8;  // 32-bit offset is this much larger than a 13-bit one
+  //assert(vtable_index > 10 || __ pc() + slop <= s->code_end(), "room for 32-bit offset");
+
+  s->set_exception_points(npe_addr, ame_addr);
   return s;
 }
 
 VtableStub* VtableStubs::create_itable_stub(int itable_index) {
-  // Read "A word on VtableStub sizing" in share/code/vtableStubs.hpp for details on stub sizing.
-  const int stub_code_length = code_size_limit(false);
-  VtableStub* s = new(stub_code_length) VtableStub(false, itable_index);
+  const int code_length = VtableStub::pd_code_size_limit(false);
+  VtableStub* s = new(code_length) VtableStub(false, itable_index);
   // Can be NULL if there is no free space in the code cache.
   if (s == NULL) {
     return NULL;
   }
-  // Count unused bytes in instruction sequences of variable size.
-  // We add them to the computed buffer size in order to avoid
-  // overflow in subsequently generated stubs.
-  address   start_pc;
-  int       slop_bytes = 0;
-  int       slop_delta = 0;
 
-  ResourceMark    rm;
-  CodeBuffer      cb(s->entry_point(), stub_code_length);
+  ResourceMark rm;
+  CodeBuffer cb(s->entry_point(), code_length);
   MacroAssembler* masm = new MacroAssembler(&cb);
 
-#if (!defined(PRODUCT) && defined(COMPILER2))
-  if (CountCompiledCalls) {
-    // Implementation required?
-  }
-#endif
-
   assert(VtableStub::receiver_location() == R0->as_VMReg(), "receiver expected in R0");
 
   // R0-R3 / R0-R7 registers hold the arguments and cannot be spoiled
@@ -154,16 +123,15 @@ VtableStub* VtableStubs::create_itable_stub(int itable_index) {
   const Register Rintf   = AARCH64_ONLY(R10) NOT_AARCH64(R5);
   const Register Rscan   = AARCH64_ONLY(R11) NOT_AARCH64(R6);
 
-  Label L_no_such_interface;
-
   assert_different_registers(Ricklass, Rclass, Rintf, Rscan, Rtemp);
 
-  start_pc = __ pc();
-
-  // get receiver klass (also an implicit null-check)
+  // Calculate the start of itable (itable goes after vtable)
+  const int scale = exact_log2(vtableEntry::size_in_bytes());
   address npe_addr = __ pc();
   __ load_klass(Rclass, R0);
 
+  Label L_no_such_interface;
+
   // Receiver subtype check against REFC.
   __ ldr(Rintf, Address(Ricklass, CompiledICHolder::holder_klass_offset()));
   __ lookup_interface_method(// inputs: rec. class, interface, itable index
@@ -172,9 +140,6 @@ VtableStub* VtableStubs::create_itable_stub(int itable_index) {
                              noreg, Rscan, Rtemp,
                              L_no_such_interface);
 
-  const ptrdiff_t  typecheckSize = __ pc() - start_pc;
-  start_pc = __ pc();
-
   // Get Method* and entry point for compiler
   __ ldr(Rintf, Address(Ricklass, CompiledICHolder::holder_metadata_offset()));
   __ lookup_interface_method(// inputs: rec. class, interface, itable index
@@ -183,21 +148,6 @@ VtableStub* VtableStubs::create_itable_stub(int itable_index) {
                              Rmethod, Rscan, Rtemp,
                              L_no_such_interface);
 
-  const ptrdiff_t lookupSize = __ pc() - start_pc;
-
-  // Reduce "estimate" such that "padding" does not drop below 8.
-  const ptrdiff_t estimate = 140;
-  const ptrdiff_t codesize = typecheckSize + lookupSize;
-  slop_delta  = (int)(estimate - codesize);
-  slop_bytes += slop_delta;
-  assert(slop_delta >= 0, "itable #%d: Code size estimate (%d) for lookup_interface_method too small, required: %d", itable_index, (int)estimate, (int)codesize);
-
-#ifndef PRODUCT
-  if (DebugVtables) {
-    // Implementation required?
-  }
-#endif
-
   address ame_addr = __ pc();
 
 #ifdef AARCH64
@@ -208,6 +158,7 @@ VtableStub* VtableStubs::create_itable_stub(int itable_index) {
 #endif // AARCH64
 
   __ bind(L_no_such_interface);
+
   // Handle IncompatibleClassChangeError in itable stubs.
   // More detailed error message.
   // We force resolving of the call site by jumping to the "handle
@@ -217,13 +168,43 @@ VtableStub* VtableStubs::create_itable_stub(int itable_index) {
   __ jump(SharedRuntime::get_handle_wrong_method_stub(), relocInfo::runtime_call_type, Rtemp);
 
   masm->flush();
-  bookkeeping(masm, tty, s, npe_addr, ame_addr, false, itable_index, slop_bytes, 0);
 
+  if (PrintMiscellaneous && (WizardMode || Verbose)) {
+    tty->print_cr("itable #%d at " PTR_FORMAT "[%d] left over: %d",
+                  itable_index, p2i(s->entry_point()),
+                  (int)(s->code_end() - s->entry_point()),
+                  (int)(s->code_end() - __ pc()));
+  }
+  guarantee(__ pc() <= s->code_end(), "overflowed buffer");
+  // FIXME ARM: need correct 'slop' - below is x86 code
+  // shut the door on sizing bugs
+  //int slop = 8;  // 32-bit offset is this much larger than a 13-bit one
+  //assert(itable_index > 10 || __ pc() + slop <= s->code_end(), "room for 32-bit offset");
+
+  s->set_exception_points(npe_addr, ame_addr);
   return s;
 }
 
-int VtableStub::pd_code_alignment() {
-  // ARM32 cache line size is not an architected constant. We just align on word size.
-  const unsigned int icache_line_size = wordSize;
-  return icache_line_size;
+int VtableStub::pd_code_size_limit(bool is_vtable_stub) {
+  int instr_count;
+
+  if (is_vtable_stub) {
+    // vtable stub size
+    instr_count = NOT_AARCH64(4) AARCH64_ONLY(5);
+  } else {
+    // itable stub size
+    instr_count = NOT_AARCH64(31) AARCH64_ONLY(31);
+  }
+
+#ifdef AARCH64
+  if (UseCompressedClassPointers) {
+    instr_count += MacroAssembler::instr_count_for_decode_klass_not_null();
+  }
+#endif // AARCH64
+
+  return instr_count * Assembler::InstructionSize;
+}
+
+int VtableStub::pd_code_alignment() {
+  return 8;
 }

src/hotspot/cpu/ppc/assembler_ppc.hpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
+ * Copyright (c) 2012, 2017 SAP SE. 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
@@ -299,8 +299,6 @@ class Assembler : public AbstractAssembler {
     CMPI_OPCODE   = (11u << OPCODE_SHIFT),
     CMPL_OPCODE   = (31u << OPCODE_SHIFT |  32u << 1),
     CMPLI_OPCODE  = (10u << OPCODE_SHIFT),
-    CMPRB_OPCODE  = (31u << OPCODE_SHIFT | 192u << 1),
-    CMPEQB_OPCODE = (31u << OPCODE_SHIFT | 224u << 1),
 
     ISEL_OPCODE   = (31u << OPCODE_SHIFT |  15u << 1),
 
@@ -338,7 +336,6 @@ class Assembler : public AbstractAssembler {
     MTCRF_OPCODE  = (31u << OPCODE_SHIFT | 144u << 1),
     MFCR_OPCODE   = (31u << OPCODE_SHIFT | 19u << 1),
     MCRF_OPCODE   = (19u << OPCODE_SHIFT | 0u << 1),
-    SETB_OPCODE   = (31u << OPCODE_SHIFT | 128u << 1),
 
     // condition register logic instructions
     CRAND_OPCODE  = (19u << OPCODE_SHIFT | 257u << 1),
@@ -400,7 +397,6 @@ class Assembler : public AbstractAssembler {
     LWAX_OPCODE   = (31u << OPCODE_SHIFT | 341u << XO_21_30_SHIFT), // X-FORM
 
     CNTLZW_OPCODE = (31u << OPCODE_SHIFT |  26u << XO_21_30_SHIFT), // X-FORM
-    CNTTZW_OPCODE = (31u << OPCODE_SHIFT | 538u << XO_21_30_SHIFT), // X-FORM
 
     // 64 bit opcode encodings
 
@@ -432,7 +428,6 @@ class Assembler : public AbstractAssembler {
     DIVD_OPCODE   = (31u << OPCODE_SHIFT | 489u << 1),              // XO-FORM
 
     CNTLZD_OPCODE = (31u << OPCODE_SHIFT |  58u << XO_21_30_SHIFT), // X-FORM
-    CNTTZD_OPCODE = (31u << OPCODE_SHIFT | 570u << XO_21_30_SHIFT), // X-FORM
     NAND_OPCODE   = (31u << OPCODE_SHIFT | 476u << XO_21_30_SHIFT), // X-FORM
     NOR_OPCODE    = (31u << OPCODE_SHIFT | 124u << XO_21_30_SHIFT), // X-FORM
 
@@ -527,9 +522,6 @@ class Assembler : public AbstractAssembler {
     XXLXOR_OPCODE  = (60u << OPCODE_SHIFT |  154u << 3),
     XXLEQV_OPCODE  = (60u << OPCODE_SHIFT |  186u << 3),
 
-    // Deliver A Random Number (introduced with POWER9)
-    DARN_OPCODE    = (31u << OPCODE_SHIFT |  755u << 1),
-
     // Vector Permute and Formatting
     VPKPX_OPCODE   = (4u  << OPCODE_SHIFT |  782u     ),
     VPKSHSS_OPCODE = (4u  << OPCODE_SHIFT |  398u     ),
@@ -1059,8 +1051,7 @@ class Assembler : public AbstractAssembler {
   static int frs(      int         x)  { return  opp_u_field(x,             10,  6); }
   static int frt(      int         x)  { return  opp_u_field(x,             10,  6); }
   static int fxm(      int         x)  { return  opp_u_field(x,             19, 12); }
-  static int l10(      int         x)  { assert(x == 0 || x == 1,  "must be 0 or 1"); return opp_u_field(x, 10, 10); }
-  static int l14(      int         x)  { return  opp_u_field(x,             15, 14); }
+  static int l10(      int         x)  { return  opp_u_field(x,             10, 10); }
   static int l15(      int         x)  { return  opp_u_field(x,             15, 15); }
   static int l910(     int         x)  { return  opp_u_field(x,             10,  9); }
   static int e1215(    int         x)  { return  opp_u_field(x,             15, 12); }
@@ -1426,10 +1417,6 @@ class Assembler : public AbstractAssembler {
   inline void cmplw( ConditionRegister crx, Register a, Register b);
   inline void cmpld( ConditionRegister crx, Register a, Register b);
 
-  // >= Power9
-  inline void cmprb( ConditionRegister bf, int l, Register a, Register b);
-  inline void cmpeqb(ConditionRegister bf, Register a, Register b);
-
   inline void isel(   Register d, Register a, Register b, int bc);
   // Convenient version which takes: Condition register, Condition code and invert flag. Omit b to keep old value.
   inline void isel(   Register d, ConditionRegister cr, Condition cc, bool inv, Register a, Register b = noreg);
@@ -1489,10 +1476,6 @@ class Assembler : public AbstractAssembler {
   inline void cntlzw_( Register a, Register s);
   inline void cntlzd(  Register a, Register s);
   inline void cntlzd_( Register a, Register s);
-  inline void cnttzw(  Register a, Register s);
-  inline void cnttzw_( Register a, Register s);
-  inline void cnttzd(  Register a, Register s);
-  inline void cnttzd_( Register a, Register s);
 
   // PPC 1, section 3.3.12, Fixed-Point Rotate and Shift Instructions
   inline void sld(     Register a, Register s, Register b);
@@ -1629,8 +1612,6 @@ class Assembler : public AbstractAssembler {
   inline void mfcr( Register d);
   inline void mcrf( ConditionRegister crd, ConditionRegister cra);
   inline void mtcr( Register s);
-  // >= Power9
-  inline void setb( Register d, ConditionRegister cra);
 
   // Special purpose registers
   // Exception Register
@@ -2199,9 +2180,6 @@ class Assembler : public AbstractAssembler {
   inline void mtfprwa(  FloatRegister   d, Register a);
   inline void mffprd(   Register        a, FloatRegister d);
 
-  // Deliver A Random Number (introduced with POWER9)
-  inline void darn( Register d, int l = 1 /*L=CRN*/);
-
   // AES (introduced with Power 8)
   inline void vcipher(     VectorRegister d, VectorRegister a, VectorRegister b);
   inline void vcipherlast( VectorRegister d, VectorRegister a, VectorRegister b);

src/hotspot/cpu/ppc/assembler_ppc.inline.hpp

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
+ * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017 SAP SE. 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
@@ -171,8 +171,6 @@ inline void Assembler::cmpi(  ConditionRegister f, int l, Register a, int si16)
 inline void Assembler::cmp(   ConditionRegister f, int l, Register a, Register b) { emit_int32( CMP_OPCODE   | bf(f) | l10(l) | ra(a) | rb(b)); }
 inline void Assembler::cmpli( ConditionRegister f, int l, Register a, int ui16)   { emit_int32( CMPLI_OPCODE | bf(f) | l10(l) | ra(a) | uimm(ui16,16)); }
 inline void Assembler::cmpl(  ConditionRegister f, int l, Register a, Register b) { emit_int32( CMPL_OPCODE  | bf(f) | l10(l) | ra(a) | rb(b)); }
-inline void Assembler::cmprb( ConditionRegister f, int l, Register a, Register b) { emit_int32( CMPRB_OPCODE | bf(f) | l10(l) | ra(a) | rb(b)); }
-inline void Assembler::cmpeqb(ConditionRegister f, Register a, Register b)        { emit_int32( CMPEQB_OPCODE| bf(f) | ra(a)  | rb(b)); }
 
 // extended mnemonics of Compare Instructions
 inline void Assembler::cmpwi( ConditionRegister crx, Register a, int si16)   { Assembler::cmpi( crx, 0, a, si16); }
@@ -237,10 +235,6 @@ inline void Assembler::cntlzw(  Register a, Register s)              { emit_int3
 inline void Assembler::cntlzw_( Register a, Register s)              { emit_int32(CNTLZW_OPCODE | rta(a) | rs(s) | rc(1)); }
 inline void Assembler::cntlzd(  Register a, Register s)              { emit_int32(CNTLZD_OPCODE | rta(a) | rs(s) | rc(0)); }
 inline void Assembler::cntlzd_( Register a, Register s)              { emit_int32(CNTLZD_OPCODE | rta(a) | rs(s) | rc(1)); }
-inline void Assembler::cnttzw(  Register a, Register s)              { emit_int32(CNTTZW_OPCODE | rta(a) | rs(s) | rc(0)); }
-inline void Assembler::cnttzw_( Register a, Register s)              { emit_int32(CNTTZW_OPCODE | rta(a) | rs(s) | rc(1)); }
-inline void Assembler::cnttzd(  Register a, Register s)              { emit_int32(CNTTZD_OPCODE | rta(a) | rs(s) | rc(0)); }
-inline void Assembler::cnttzd_( Register a, Register s)              { emit_int32(CNTTZD_OPCODE | rta(a) | rs(s) | rc(1)); }
 
 // PPC 1, section 3.3.12, Fixed-Point Rotate and Shift Instructions
 inline void Assembler::sld(     Register a, Register s, Register b)  { emit_int32(SLD_OPCODE    | rta(a) | rs(s) | rb(b) | rc(0)); }
@@ -373,8 +367,6 @@ inline void Assembler::mfcr( Register d )         { emit_int32(MFCR_OPCODE  | rt
 inline void Assembler::mcrf( ConditionRegister crd, ConditionRegister cra)
                                                       { emit_int32(MCRF_OPCODE | bf(crd) | bfa(cra)); }
 inline void Assembler::mtcr( Register s)          { Assembler::mtcrf(0xff, s); }
-inline void Assembler::setb(Register d, ConditionRegister cra)
-                                                  { emit_int32(SETB_OPCODE | rt(d) | bfa(cra)); }
 
 // Special purpose registers
 // Exception Register
@@ -967,9 +959,6 @@ inline void Assembler::tsuspend_()                              { emit_int32( TS
 inline void Assembler::tresume_()                               { emit_int32( TSR_OPCODE | /*L=1*/ 1u << (31-10) | rc(1)); }
 inline void Assembler::tcheck(int f)                            { emit_int32( TCHECK_OPCODE | bf(f)); }
 
-// Deliver A Random Number (introduced with POWER9)
-inline void Assembler::darn(Register d, int l /* =1 */) { emit_int32( DARN_OPCODE | rt(d) | l14(l)); }
-
 // ra0 version
 inline void Assembler::lwzx( Register d, Register s2) { emit_int32( LWZX_OPCODE | rt(d) | rb(s2));}
 inline void Assembler::lwz(  Register d, int si16   ) { emit_int32( LWZ_OPCODE  | rt(d) | d1(si16));}