Merge

2026-05-11 14:11:36 +00:00 · 2020-04-30 10:32:23 -07:00 · 2020-04-30 10:32:23 -07:00 · b3e1ea0407
commit b3e1ea0407
parent 188106be4d 7f877f6384
1471 changed files with 13791 additions and 6367 deletions
--- a/.hgtags
+++ b/.hgtags
@ -631,3 +631,4 @@ dd5198db2e5b1ebcafe065d987c03ba9fcb50fc3 jdk-15+17
 44aef192b488a48cce12422394691a6b1d16b98e jdk-15+18
 7cc27caabe6e342151e8baf549beb07a9c755ec2 jdk-15+19
 46bca5e5e6fb26efd07245d26fe96a9c3260f51e jdk-15+20
+12b55fad80f30d24b1f8fdb3b947ea6465ef9518 jdk-15+21
--- a/bin/idea.sh
+++ b/bin/idea.sh
@ -197,13 +197,15 @@ CP=$ANT_HOME/lib/ant.jar
 rm -rf $CLASSES; mkdir $CLASSES

 if [ "x$CYGPATH" = "x" ] ; then ## CYGPATH may be set in env.cfg
-  JAVAC_SOURCE_FILE=$IDEA_OUTPUT/src/idea/JdkIdeaAntLogger.java
+  JAVAC_SOURCE_FILE=$IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java
+  JAVAC_SOURCE_PATH=$IDEA_OUTPUT/src
  JAVAC_CLASSES=$CLASSES
  JAVAC_CP=$CP
 else
-  JAVAC_SOURCE_FILE=`cygpath -am $IDEA_OUTPUT/src/idea/JdkIdeaAntLogger.java`
+  JAVAC_SOURCE_FILE=`cygpath -am $IDEA_OUTPUT/src/idea/IdeaLoggerWrapper.java`
+  JAVAC_SOURCE_PATH=`cygpath -am $IDEA_OUTPUT/src`
  JAVAC_CLASSES=`cygpath -am $CLASSES`
  JAVAC_CP=`cygpath -am $CP`
 fi

-$BOOT_JDK/bin/javac -d $JAVAC_CLASSES -cp $JAVAC_CP $JAVAC_SOURCE_FILE
+$BOOT_JDK/bin/javac -d $JAVAC_CLASSES -sourcepath $JAVAC_SOURCE_PATH -cp $JAVAC_CP $JAVAC_SOURCE_FILE
--- a/doc/building.html
+++ b/doc/building.html
@ -578,7 +578,7 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30</code></pre>
 </ul>
 <h2 id="running-tests">Running Tests</h2>
 <p>Most of the JDK tests are using the <a href="http://openjdk.java.net/jtreg">JTReg</a> test framework. Make sure that your configuration knows where to find your installation of JTReg. If this is not picked up automatically, use the <code>--with-jtreg=&lt;path to jtreg home&gt;</code> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc.</p>
-<p>The <a href="https://wiki.openjdk.java.net/display/Adoption">Adoption Group</a> provides recent builds of jtreg <a href="https://adopt-openjdk.ci.cloudbees.com/job/jtreg/lastSuccessfulBuild/artifact">here</a>. Download the latest <code>.tar.gz</code> file, unpack it, and point <code>--with-jtreg</code> to the <code>jtreg</code> directory that you just unpacked.</p>
+<p>The <a href="https://wiki.openjdk.java.net/display/Adoption">Adoption Group</a> provides recent builds of jtreg <a href="https://ci.adoptopenjdk.net/view/Dependencies/job/jtreg/lastSuccessfulBuild/artifact">here</a>. Download the latest <code>.tar.gz</code> file, unpack it, and point <code>--with-jtreg</code> to the <code>jtreg</code> directory that you just unpacked.</p>
 <p>To execute the most basic tests (tier 1), use:</p>
 <pre><code>make run-test-tier1</code></pre>
 <p>For more details on how to run tests, please see the <a href="testing.html">Testing the JDK</a> document.</p>
--- a/doc/building.md
+++ b/doc/building.md
@ -891,7 +891,7 @@ containing `lib/jtreg.jar` etc.

 The [Adoption Group](https://wiki.openjdk.java.net/display/Adoption) provides
 recent builds of jtreg [here](
-https://adopt-openjdk.ci.cloudbees.com/job/jtreg/lastSuccessfulBuild/artifact).
+https://ci.adoptopenjdk.net/view/Dependencies/job/jtreg/lastSuccessfulBuild/artifact).
 Download the latest `.tar.gz` file, unpack it, and point `--with-jtreg` to the
 `jtreg` directory that you just unpacked.

--- a/doc/testing.html
+++ b/doc/testing.html
@ -56,7 +56,7 @@
 $ make test-jdk_lang JTREG=&quot;JOBS=8&quot;
 $ make test TEST=jdk_lang
 $ make test-only TEST=&quot;gtest:LogTagSet gtest:LogTagSetDescriptions&quot; GTEST=&quot;REPEAT=-1&quot;
-$ make test TEST=&quot;hotspot:hotspot_gc&quot; JTREG=&quot;JOBS=1;TIMEOUT_FACTOR=8;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;
+$ make test TEST=&quot;hotspot:hotspot_gc&quot; JTREG=&quot;JOBS=1;TIMEOUT_FACTOR=8;JAVA_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;
 $ make test TEST=&quot;jtreg:test/hotspot:hotspot_gc test/hotspot/jtreg/native_sanity/JniVersion.java&quot;
 $ make test TEST=&quot;micro:java.lang.reflect&quot; MICRO=&quot;FORK=1;WARMUP_ITER=2&quot;
 $ make exploded-test TEST=tier2</code></pre>
@ -106,8 +106,8 @@ TEST FAILURE</code></pre>
 <h2 id="test-suite-control">Test suite control</h2>
 <p>It is possible to control various aspects of the test suites using make control variables.</p>
 <p>These variables use a keyword=value approach to allow multiple values to be set. So, for instance, <code>JTREG=&quot;JOBS=1;TIMEOUT_FACTOR=8&quot;</code> will set the JTReg concurrency level to 1 and the timeout factor to 8. This is equivalent to setting <code>JTREG_JOBS=1 JTREG_TIMEOUT_FACTOR=8</code>, but using the keyword format means that the <code>JTREG</code> variable is parsed and verified for correctness, so <code>JTREG=&quot;TMIEOUT_FACTOR=8&quot;</code> would give an error, while <code>JTREG_TMIEOUT_FACTOR=8</code> would just pass unnoticed.</p>
-<p>To separate multiple keyword=value pairs, use <code>;</code> (semicolon). Since the shell normally eats <code>;</code>, the recommended usage is to write the assignment inside qoutes, e.g. <code>JTREG=&quot;...;...&quot;</code>. This will also make sure spaces are preserved, as in <code>JTREG=&quot;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;</code>.</p>
-<p>(Other ways are possible, e.g. using backslash: <code>JTREG=JOBS=1\;TIMEOUT_FACTOR=8</code>. Also, as a special technique, the string <code>%20</code> will be replaced with space for certain options, e.g. <code>JTREG=VM_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug</code>. This can be useful if you have layers of scripts and have trouble getting proper quoting of command line arguments through.)</p>
+<p>To separate multiple keyword=value pairs, use <code>;</code> (semicolon). Since the shell normally eats <code>;</code>, the recommended usage is to write the assignment inside qoutes, e.g. <code>JTREG=&quot;...;...&quot;</code>. This will also make sure spaces are preserved, as in <code>JTREG=&quot;JAVA_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;</code>.</p>
+<p>(Other ways are possible, e.g. using backslash: <code>JTREG=JOBS=1\;TIMEOUT_FACTOR=8</code>. Also, as a special technique, the string <code>%20</code> will be replaced with space for certain options, e.g. <code>JTREG=JAVA_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug</code>. This can be useful if you have layers of scripts and have trouble getting proper quoting of command line arguments through.)</p>
 <p>As far as possible, the names of the keywords have been standardized between test suites.</p>
 <h3 id="general-keywords-test_opts">General keywords (TEST_OPTS)</h3>
 <p>Some keywords are valid across different test suites. If you want to run tests from multiple test suites, or just don't want to care which test suite specific control variable to use, then you can use the general TEST_OPTS control variable.</p>
@ -116,16 +116,16 @@ TEST FAILURE</code></pre>
 <p>Currently only applies to JTReg.</p>
 <h4 id="timeout_factor">TIMEOUT_FACTOR</h4>
 <p>Currently only applies to JTReg.</p>
-<h4 id="vm_options">VM_OPTIONS</h4>
-<p>Applies to JTReg, GTest and Micro.</p>
 <h4 id="java_options">JAVA_OPTIONS</h4>
 <p>Applies to JTReg, GTest and Micro.</p>
+<h4 id="vm_options">VM_OPTIONS</h4>
+<p>Applies to JTReg, GTest and Micro.</p>
 <h4 id="aot_modules">AOT_MODULES</h4>
 <p>Applies to JTReg and GTest.</p>
 <h4 id="jcov">JCOV</h4>
 <p>This keywords applies globally to the test runner system. If set to <code>true</code>, it enables JCov coverage reporting for all tests run. To be useful, the JDK under test must be run with a JDK built with JCov instrumentation (<code>configure --with-jcov=&lt;path to directory containing lib/jcov.jar&gt;</code>, <code>make jcov-image</code>).</p>
 <p>The simplest way to run tests with JCov coverage report is to use the special target <code>jcov-test</code> instead of <code>test</code>, e.g. <code>make jcov-test TEST=jdk_lang</code>. This will make sure the JCov image is built, and that JCov reporting is enabled.</p>
-<p>The JCov report is stored in <code>build/$BUILD/test-results/jcov-output</code>.</p>
+<p>The JCov report is stored in <code>build/$BUILD/test-results/jcov-output/report</code>.</p>
 <p>Please note that running with JCov reporting can be very memory intensive.</p>
 <h4 id="jcov_diff_changeset">JCOV_DIFF_CHANGESET</h4>
 <p>While collecting code coverage with JCov, it is also possible to find coverage for only recently changed code. JCOV_DIFF_CHANGESET specifies a source revision. A textual report will be generated showing coverage of the diff between the specified revision and the repository tip.</p>
@ -166,9 +166,10 @@ TEST FAILURE</code></pre>
 <p>Additional options to the JTReg test framework.</p>
 <p>Use <code>JTREG=&quot;OPTIONS=--help all&quot;</code> to see all available JTReg options.</p>
 <h4 id="java_options-1">JAVA_OPTIONS</h4>
-<p>Additional Java options to JTReg (<code>-javaoption</code>).</p>
+<p>Additional Java options for running test classes (sent to JTReg as <code>-javaoption</code>).</p>
 <h4 id="vm_options-1">VM_OPTIONS</h4>
-<p>Additional VM options to JTReg (<code>-vmoption</code>).</p>
+<p>Additional Java options to be used when compiling and running classes (sent to JTReg as <code>-vmoption</code>).</p>
+<p>This option is only needed in special circumstances. To pass Java options to your test classes, use <code>JAVA_OPTIONS</code>.</p>
 <h4 id="aot_modules-1">AOT_MODULES</h4>
 <p>Generate AOT modules before testing for the specified module, or set of modules. If multiple modules are specified, they should be separated by space (or, to help avoid quoting issues, the special value <code>%20</code>).</p>
 <h4 id="retry_count">RETRY_COUNT</h4>
--- a/doc/testing.md
+++ b/doc/testing.md
@ -23,7 +23,7 @@ Some example command-lines:
    $ make test-jdk_lang JTREG="JOBS=8"
    $ make test TEST=jdk_lang
    $ make test-only TEST="gtest:LogTagSet gtest:LogTagSetDescriptions" GTEST="REPEAT=-1"
-    $ make test TEST="hotspot:hotspot_gc" JTREG="JOBS=1;TIMEOUT_FACTOR=8;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"
+    $ make test TEST="hotspot:hotspot_gc" JTREG="JOBS=1;TIMEOUT_FACTOR=8;JAVA_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"
    $ make test TEST="jtreg:test/hotspot:hotspot_gc test/hotspot/jtreg/native_sanity/JniVersion.java"
    $ make test TEST="micro:java.lang.reflect" MICRO="FORK=1;WARMUP_ITER=2"
    $ make exploded-test TEST=tier2
@ -190,11 +190,11 @@ pass unnoticed.
 To separate multiple keyword=value pairs, use `;` (semicolon). Since the shell
 normally eats `;`, the recommended usage is to write the assignment inside
 qoutes, e.g. `JTREG="...;..."`. This will also make sure spaces are preserved,
-as in `JTREG="VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"`.
+as in `JTREG="JAVA_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"`.

 (Other ways are possible, e.g. using backslash: `JTREG=JOBS=1\;TIMEOUT_FACTOR=8`.
 Also, as a special technique, the string `%20` will be replaced with space for
-certain options, e.g. `JTREG=VM_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug`.
+certain options, e.g. `JTREG=JAVA_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug`.
 This can be useful if you have layers of scripts and have trouble getting
 proper quoting of command line arguments through.)

@ -218,11 +218,11 @@ Currently only applies to JTReg.

 Currently only applies to JTReg.

-#### VM_OPTIONS
+#### JAVA_OPTIONS

 Applies to JTReg, GTest and Micro.

-#### JAVA_OPTIONS
+#### VM_OPTIONS

 Applies to JTReg, GTest and Micro.

@ -250,7 +250,7 @@ Please note that running with JCov reporting can be very memory intensive.
 While collecting code coverage with JCov, it is also possible to find coverage
 for only recently changed code. JCOV_DIFF_CHANGESET specifies a source
 revision. A textual report will be generated showing coverage of the diff
-between the specified revision and the repository tip. 
+between the specified revision and the repository tip.

 The report is stored in `build/$BUILD/test-results/jcov-output/diff_coverage_report`
 file.
@ -331,10 +331,15 @@ Additional options to the JTReg test framework.
 Use `JTREG="OPTIONS=--help all"` to see all available JTReg options.

 #### JAVA_OPTIONS
-Additional Java options to JTReg (`-javaoption`).
+Additional Java options for running test classes (sent to JTReg as
+`-javaoption`).

 #### VM_OPTIONS
-Additional VM options to JTReg (`-vmoption`).
+Additional Java options to be used when compiling and running classes (sent to
+JTReg as `-vmoption`).
+
+This option is only needed in special circumstances. To pass Java options to
+your test classes, use `JAVA_OPTIONS`.

 #### AOT_MODULES

--- a/make/CompileDemos.gmk
+++ b/make/CompileDemos.gmk
@ -33,7 +33,6 @@ include $(SPEC)
 include MakeBase.gmk
 include JavaCompilation.gmk
 include NativeCompilation.gmk
-include SetupJavaCompilers.gmk
 include TextFileProcessing.gmk
 include ZipArchive.gmk

@ -93,7 +92,6 @@ COPY_TO_IMAGE := *.html *.txt *.png *.xml README*
 # EXTRA_COPY_TO_IMAGE   Additional files to copy to images (as wildcards)
 # EXTRA_MANIFEST_ATTR   Extra manifest attribute
 # SKIP_COMPILATION   Skip Java compilation iff true
-# DISABLE_SJAVAC   Passed to SetupJavaCompilation
 # DISABLED_WARNINGS Additional disabled warnings
 SetupBuildDemo = $(NamedParamsMacroTemplate)
 define SetupBuildDemoBody
@ -126,7 +124,7 @@ define SetupBuildDemoBody

  ifneq ($$($1_SKIP_COMPILATION), true)
    $$(eval $$(call SetupJavaCompilation, BUILD_DEMO_$1, \
-        SETUP := GENERATE_USINGJDKBYTECODE, \
+        TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
        SRC := $$($1_MAIN_SRC) $$($1_EXTRA_SRC_DIR), \
        BIN := $(SUPPORT_OUTPUTDIR)/demos/classes/$$($1_DEMO_SUBDIR)/$1, \
        COPY := $(COPY_TO_JAR) $$($1_EXTRA_COPY_TO_JAR), \
@ -137,7 +135,6 @@ define SetupBuildDemoBody
        SRCZIP := $(SUPPORT_OUTPUTDIR)/demos/image/$$($1_DEMO_SUBDIR)/$1/src.zip, \
        EXCLUDE_FILES := $$($1_EXCLUDE_FILES), \
        DISABLED_WARNINGS := $$($1_DISABLED_WARNINGS), \
-        DISABLE_SJAVAC := $$($1_DISABLE_SJAVAC), \
    ))

    $1 += $$(BUILD_DEMO_$1)
@ -183,7 +180,6 @@ $(eval $(call SetupBuildDemo, SwingSet2, \
    EXTRA_COPY_TO_JAR := .java, \
    EXTRA_MANIFEST_ATTR := SplashScreen-Image: resources/images/splash.png, \
    DISABLED_WARNINGS := rawtypes deprecation unchecked static serial cast, \
-    DISABLE_SJAVAC := true, \
 ))

 $(eval $(call SetupBuildDemo, Font2DTest, \
--- a/make/CompileInterimLangtools.gmk
+++ b/make/CompileInterimLangtools.gmk
@ -29,7 +29,6 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 include JavaCompilation.gmk
-include SetupJavaCompilers.gmk
 include Modules.gmk

 ################################################################################
@ -66,8 +65,8 @@ TARGETS += $(COPY_PREVIEW_FEATURES)
 # Param 1 - Name of module to compile
 define SetupInterimModule
  $$(eval $$(call SetupJavaCompilation, BUILD_$1.interim, \
-      SETUP := BOOT_JAVAC, \
-      DISABLE_SJAVAC := true, \
+      COMPILER := bootjdk, \
+      TARGET_RELEASE := $$(TARGET_RELEASE_BOOTJDK), \
      SRC := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim \
          $$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$1) \
          $(TOPDIR)/src/$1/share/classes, \
@ -77,8 +76,9 @@ define SetupInterimModule
      EXTRA_FILES := $(BUILDTOOLS_OUTPUTDIR)/gensrc/$1.interim/module-info.java, \
      COPY := .gif .png .xml .css .js javax.tools.JavaCompilerTool, \
      BIN := $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules/$1.interim, \
-      DISABLED_WARNINGS := module, \
-      ADD_JAVAC_FLAGS := --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
+      DISABLED_WARNINGS := module options, \
+      JAVAC_FLAGS := \
+          --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
          $$(INTERIM_LANGTOOLS_ADD_EXPORTS) \
          --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
          --add-exports java.base/jdk.internal=java.compiler.interim \
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@ -30,7 +30,6 @@ include $(SPEC)
 include MakeBase.gmk
 include Modules.gmk
 include JavaCompilation.gmk
-include SetupJavaCompilers.gmk

 # Hook to include the corresponding custom file, if present.
 $(eval $(call IncludeCustomExtension, CompileJavaModules.gmk))
@ -38,8 +37,11 @@ $(eval $(call IncludeCustomExtension, CompileJavaModules.gmk))
 ################################################################################
 # Module specific build settings

-java.base_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference,-accessibility '-Xdoclint/package:java.*,javax.*' -XDstringConcat=inline
-java.base_COPY += .icu .dat .spp .nrm content-types.properties hijrah-config-Hijrah-umalqura_islamic-umalqura.properties
+java.base_DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'
+java.base_JAVAC_FLAGS += -XDstringConcat=inline
+java.base_COPY += .icu .dat .spp .nrm content-types.properties \
+    hijrah-config-Hijrah-umalqura_islamic-umalqura.properties
 java.base_CLEAN += intrinsic.properties

 java.base_EXCLUDE_FILES += \
@ -70,18 +72,19 @@ endif

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

-java.compiler_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
+java.compiler_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'

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

-java.datatransfer_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference '-Xdoclint/package:java.*,javax.*'
+java.datatransfer_DOCLINT += -Xdoclint:all/protected,-reference \
+    '-Xdoclint/package:java.*,javax.*'
 java.datatransfer_COPY += flavormap.properties

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

-java.desktop_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference \
-    '-Xdoclint/package:java.*,javax.*' \
-    --doclint-format html4
+java.desktop_DOCLINT += -Xdoclint:all/protected,-reference \
+    '-Xdoclint/package:java.*,javax.*'
 java.desktop_COPY += .gif .png .wav .txt .xml .css .pf
 java.desktop_CLEAN += iio-plugin.properties cursors.properties

@ -214,75 +217,89 @@ java.desktop_EXCLUDE_FILES += \

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

-java.scripting_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
+java.scripting_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'
 java.scripting_COPY += .js
 java.scripting_CLEAN += .properties

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

-java.instrument_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*'
+java.instrument_DOCLINT += -Xdoclint:all/protected,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'

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

-java.logging_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference,-accessibility '-Xdoclint/package:java.*,javax.*'
+java.logging_DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'

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

-java.management_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-reference,-accessibility '-Xdoclint/package:java.*,javax.*'
+java.management_DOCLINT += -Xdoclint:all/protected,-reference,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'

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

-java.management.rmi_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:javax.*'
+java.management.rmi_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:javax.*'

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

-java.prefs_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
+java.prefs_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'

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

-java.transaction.xa_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:javax.*'
+java.transaction.xa_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:javax.*'

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

-java.sql_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
+java.sql_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'

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

-java.sql.rowset_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*'
+java.sql.rowset_DOCLINT += -Xdoclint:all/protected,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'
 java.sql.rowset_CLEAN_FILES += $(wildcard \
    $(TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \
    $(TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)

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

-java.rmi_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
+java.rmi_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'
 java.rmi_CLEAN_FILES += $(wildcard \
    $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \
    $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties)

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

-java.xml_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility \
+java.xml_DOCLINT += -Xdoclint:all/protected,-accessibility \
    '-Xdoclint/package:$(call CommaList, javax.xml.catalog javax.xml.datatype \
    javax.xml.transform javax.xml.validation javax.xml.xpath)'
 java.xml_CLEAN += .properties

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

-java.naming_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*'
+java.naming_DOCLINT += -Xdoclint:all/protected,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'
 java.naming_CLEAN += jndiprovider.properties

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

-java.security.jgss_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
+java.security.jgss_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'

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

-java.smartcardio_ADD_JAVAC_FLAGS += -Xdoclint:all/protected,-accessibility '-Xdoclint/package:java.*,javax.*'
+java.smartcardio_DOCLINT += -Xdoclint:all/protected,-accessibility \
+    '-Xdoclint/package:java.*,javax.*'

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

-java.xml.crypto_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
+java.xml.crypto_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:java.*,javax.*'
 java.xml.crypto_COPY += .dtd .xml
 java.xml.crypto_CLEAN += .properties

@ -294,9 +311,9 @@ jdk.charsets_COPY += .dat

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

-jdk.compiler_ADD_JAVAC_FLAGS += -Xdoclint:all/protected \
-    '-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*,sun.tools.serialver.resources.*' \
-    -XDstringConcat=inline
+jdk.compiler_DOCLINT += -Xdoclint:all/protected \
+    '-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*,sun.tools.serialver.resources.*'
+jdk.compiler_JAVAC_FLAGS += -XDstringConcat=inline
 jdk.compiler_CLEAN_FILES += $(wildcard \
    $(patsubst %, $(TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
        sun/tools/serialver/resources))
@ -337,17 +354,7 @@ jdk.javadoc_COPY += .xml .css .js .png

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

-jdk.jartool_ADD_JAVAC_FLAGS += -XDstringConcat=inline
-
-################################################################################
-
-jdk.scripting.nashorn_DISABLED_WARNINGS += removal
-jdk.scripting.nashorn_COPY := .properties .js
-
-################################################################################
-
-jdk.scripting.nashorn.shell_DISABLED_WARNINGS += removal
-jdk.scripting.nashorn.shell_COPY += .js .properties
+jdk.jartool_JAVAC_FLAGS += -XDstringConcat=inline

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

@ -375,8 +382,9 @@ endif

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

-jdk.incubator.jpackage_COPY += .gif .png .txt .spec .script .prerm .preinst .postrm .postinst .list .sh \
-    .desktop .copyright .control .plist .template .icns .scpt .entitlements .wxs .wxl .wxi .ico .bmp .tiff
+jdk.incubator.jpackage_COPY += .gif .png .txt .spec .script .prerm .preinst \
+    .postrm .postinst .list .sh .desktop .copyright .control .plist .template \
+    .icns .scpt .entitlements .wxs .wxl .wxi .ico .bmp .tiff

 jdk.incubator.jpackage_CLEAN += .properties

@ -426,11 +434,11 @@ jdk.internal.jvmstat_COPY += aliasmap
 # The exports are needed since JVMCI is dynamically exported (see
 # jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo).

-jdk.internal.vm.ci_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline
+jdk.internal.vm.ci_JAVAC_FLAGS += -parameters -XDstringConcat=inline

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

-jdk.internal.vm.compiler_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
+jdk.internal.vm.compiler_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
    --add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler \
    --add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler \
    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler \
@ -464,6 +472,7 @@ jdk.internal.vm.compiler_EXCLUDES += \
    org.graalvm.compiler.graph.test \
    org.graalvm.compiler.hotspot.aarch64.test \
    org.graalvm.compiler.hotspot.amd64.test \
+    org.graalvm.compiler.hotspot.jdk15.test \
    org.graalvm.compiler.hotspot.jdk9.test \
    org.graalvm.compiler.hotspot.lir.test \
    org.graalvm.compiler.hotspot.sparc.test \
@ -498,7 +507,7 @@ jdk.internal.vm.compiler_EXCLUDES += \
 # The exports are needed since JVMCI is dynamically exported (see
 # jdk.vm.ci.services.internal.ReflectionAccessJDK::openJVMCITo).

-jdk.aot_ADD_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
+jdk.aot_JAVAC_FLAGS += -parameters -XDstringConcat=inline \
    --add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.internal.vm.compiler,jdk.aot \
    --add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.internal.vm.compiler,jdk.aot \
    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code=jdk.internal.vm.compiler,jdk.aot \
@ -533,7 +542,7 @@ jdk.localedata_KEEP_ALL_TRANSLATIONS := true

 jdk.jfr_DISABLED_WARNINGS += exports
 jdk.jfr_COPY := .xsd .xml .dtd
-jdk.jfr_ADD_JAVAC_FLAGS := -XDstringConcat=inline
+jdk.jfr_JAVAC_FLAGS := -XDstringConcat=inline

 ################################################################################
 # If this is an imported module that has prebuilt classes, only compile
@ -596,7 +605,7 @@ ifeq ($(MODULE), jdk.aot)
 endif

 $(eval $(call SetupJavaCompilation, $(MODULE), \
-    SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \
+    SMALL_JAVA := false, \
    MODULE := $(MODULE), \
    SRC := $(wildcard $(MODULE_SRC_DIRS)), \
    INCLUDES := $(JDK_USER_DEFINED_FILTER), \
@ -604,8 +613,9 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
    BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \
    HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
    CREATE_API_DIGEST := true, \
-    ADD_JAVAC_FLAGS := \
-        $($(MODULE)_ADD_JAVAC_FLAGS) \
+    JAVAC_FLAGS := \
+        $($(MODULE)_DOCLINT) \
+        $($(MODULE)_JAVAC_FLAGS) \
        --module-source-path $(MODULESOURCEPATH) \
        --module-path $(MODULEPATH) \
        --system none, \
--- a/make/CompileModuleTools.gmk
+++ b/make/CompileModuleTools.gmk
@ -28,14 +28,13 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 include JavaCompilation.gmk
-include SetupJavaCompilers.gmk

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

 TOOLS_CLASSES_DIR := $(BUILDTOOLS_OUTPUTDIR)/tools_jigsaw_classes

-$(eval $(call SetupJavaCompilation,BUILD_JIGSAW_TOOLS, \
-    SETUP := GENERATE_USINGJDKBYTECODE, \
+$(eval $(call SetupJavaCompilation, BUILD_JIGSAW_TOOLS, \
+    TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
    SRC := $(TOPDIR)/make/jdk/src/classes, \
    INCLUDES := build/tools/deps \
                build/tools/docs \
@ -43,10 +42,10 @@ $(eval $(call SetupJavaCompilation,BUILD_JIGSAW_TOOLS, \
    COPY := .properties .html, \
    BIN := $(TOOLS_CLASSES_DIR), \
    DISABLED_WARNINGS := fallthrough, \
-    ADD_JAVAC_FLAGS := \
+    JAVAC_FLAGS := \
        --add-modules jdk.jdeps \
        --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
-        --add-exports jdk.jdeps/com.sun.tools.jdeps=ALL-UNNAMED \
+        --add-exports jdk.jdeps/com.sun.tools.jdeps=ALL-UNNAMED, \
 ))

 TARGETS += $(BUILD_JIGSAW_TOOLS)
--- a/make/CompileToolsHotspot.gmk
+++ b/make/CompileToolsHotspot.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -30,7 +30,6 @@ include $(SPEC)
 include MakeBase.gmk

 include JavaCompilation.gmk
-include SetupJavaCompilers.gmk

 TARGETS :=

@ -45,7 +44,7 @@ ifeq ($(INCLUDE_GRAAL), true)
  ##############################################################################
  # Compile the annotation processors
  $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_MATCH_PROCESSOR, \
-      SETUP := GENERATE_OLDBYTECODE, \
+      TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
      SRC := \
          $(SRC_DIR)/org.graalvm.compiler.processor/src \
          $(SRC_DIR)/org.graalvm.compiler.core.match.processor/src \
@ -53,6 +52,7 @@ ifeq ($(INCLUDE_GRAAL), true)
      EXCLUDE_FILES := $(EXCLUDE_FILES), \
      BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.match.processor, \
      JAR := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.match.processor.jar, \
+      DISABLED_WARNINGS := options, \
  ))

  TARGETS += $(BUILD_VM_COMPILER_MATCH_PROCESSOR)
@ -60,13 +60,14 @@ ifeq ($(INCLUDE_GRAAL), true)
  ##############################################################################

  $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_NODEINFO_PROCESSOR, \
-      SETUP := GENERATE_OLDBYTECODE, \
+      TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
      SRC := \
          $(SRC_DIR)/org.graalvm.compiler.processor/src \
          $(SRC_DIR)/org.graalvm.compiler.nodeinfo.processor/src \
          , \
      BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.nodeinfo.processor, \
      JAR := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.nodeinfo.processor.jar, \
+      DISABLED_WARNINGS := options, \
  ))

  TARGETS += $(BUILD_VM_COMPILER_NODEINFO_PROCESSOR)
@ -74,7 +75,8 @@ ifeq ($(INCLUDE_GRAAL), true)
  ##############################################################################

  $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_OPTIONS_PROCESSOR, \
-      SETUP := GENERATE_OLDBYTECODE, \
+      TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
+      DISABLED_WARNINGS := options, \
      SRC := \
          $(SRC_DIR)/org.graalvm.compiler.processor/src \
          $(SRC_DIR)/org.graalvm.compiler.options.processor/src \
@ -88,7 +90,7 @@ ifeq ($(INCLUDE_GRAAL), true)
  ##############################################################################

  $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_REPLACEMENTS_PROCESSOR, \
-      SETUP := GENERATE_OLDBYTECODE, \
+      TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
      SRC := \
          $(SRC_DIR)/org.graalvm.compiler.processor/src \
          $(SRC_DIR)/org.graalvm.compiler.replacements.processor/src \
@ -96,6 +98,7 @@ ifeq ($(INCLUDE_GRAAL), true)
      EXCLUDE_FILES := $(EXCLUDE_FILES), \
      BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier, \
      JAR := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier.jar, \
+      DISABLED_WARNINGS := options, \
  ))

  TARGETS += $(BUILD_VM_COMPILER_REPLACEMENTS_PROCESSOR)
@ -103,7 +106,7 @@ ifeq ($(INCLUDE_GRAAL), true)
  ##############################################################################

  $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_SERVICEPROVIDER_PROCESSOR, \
-      SETUP := GENERATE_OLDBYTECODE, \
+      TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
      SRC := \
          $(SRC_DIR)/org.graalvm.compiler.processor/src \
          $(SRC_DIR)/org.graalvm.compiler.serviceprovider.processor/src \
@ -111,6 +114,7 @@ ifeq ($(INCLUDE_GRAAL), true)
      EXCLUDE_FILES := $(EXCLUDE_FILES), \
      BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.serviceprovider.processor, \
      JAR := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.serviceprovider.processor.jar, \
+      DISABLED_WARNINGS := options, \
  ))

  TARGETS += $(BUILD_VM_COMPILER_SERVICEPROVIDER_PROCESSOR)
--- a/make/CompileToolsJdk.gmk
+++ b/make/CompileToolsJdk.gmk
@ -28,7 +28,6 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 include JavaCompilation.gmk
-include SetupJavaCompilers.gmk
 include TextFileProcessing.gmk

 ################################################################################
@ -44,7 +43,7 @@ BUILD_TOOLS_SRC_DIRS += \
    #

 $(eval $(call SetupJavaCompilation, BUILD_TOOLS_JDK, \
-    SETUP := GENERATE_OLDBYTECODE, \
+    TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
    SRC := $(BUILD_TOOLS_SRC_DIRS), \
    EXCLUDES := \
        build/tools/classlist \
@ -54,10 +53,10 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_JDK, \
        build/tools/depend \
        , \
    BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \
-    ADD_JAVAC_FLAGS := \
+    DISABLED_WARNINGS := options, \
+    JAVAC_FLAGS := \
        --add-exports java.desktop/sun.awt=ALL-UNNAMED \
-        --add-exports java.base/sun.text=ALL-UNNAMED \
-        , \
+        --add-exports java.base/sun.text=ALL-UNNAMED, \
 ))

 TARGETS += $(BUILD_TOOLS_JDK)
@ -72,10 +71,11 @@ TARGETS += $(COPY_NIMBUS_TEMPLATES)
 ################################################################################

 $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \
-    SETUP := GENERATE_OLDBYTECODE, \
+    TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
    SRC := $(TOPDIR)/make/jdk/src/classes, \
    INCLUDES := build/tools/depend, \
    BIN := $(BUILDTOOLS_OUTPUTDIR)/depend, \
+    DISABLED_WARNINGS := options, \
 ))

 DEPEND_SERVICE_PROVIDER := $(BUILDTOOLS_OUTPUTDIR)/depend/META-INF/services/com.sun.source.util.Plugin
--- a/make/GenerateLinkOptData.gmk
+++ b/make/GenerateLinkOptData.gmk
@ -31,14 +31,14 @@ default: all

 include $(SPEC)
 include MakeBase.gmk
-include SetupJavaCompilers.gmk
+include JavaCompilation.gmk

 ################################################################################
 # Create a jar with our generator class. Using a jar is intentional since it
 # will load more classes

 $(eval $(call SetupJavaCompilation, CLASSLIST_JAR, \
-    SETUP := GENERATE_JDKBYTECODE, \
+    SMALL_JAVA := false, \
    SRC := $(TOPDIR)/make/jdk/src/classes, \
    INCLUDES := build/tools/classlist, \
    BIN := $(BUILDTOOLS_OUTPUTDIR)/classlist_classes, \
--- a/make/Images.gmk
+++ b/make/Images.gmk
@ -85,6 +85,8 @@ ifeq ($(JLINK_KEEP_PACKAGED_MODULES), true)
  JLINK_JDK_EXTRA_OPTS := --keep-packaged-modules $(JDK_IMAGE_DIR)/jmods
 endif

+JLINK_DISABLE_WARNINGS := | ( $(GREP) -v -e "WARNING: Using incubator module" || test "$$?" = "1" )
+
 $(eval $(call SetupExecute, jlink_jdk, \
    WARN := Creating jdk image, \
    DEPS := $(JMODS) $(BASE_RELEASE_FILE) \
@ -93,7 +95,8 @@ $(eval $(call SetupExecute, jlink_jdk, \
    SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jdk, \
    PRE_COMMAND := $(RM) -r $(JDK_IMAGE_DIR), \
    COMMAND := $(JLINK_TOOL) --add-modules $(JDK_MODULES_LIST) \
-        $(JLINK_JDK_EXTRA_OPTS) --output $(JDK_IMAGE_DIR), \
+        $(JLINK_JDK_EXTRA_OPTS) --output $(JDK_IMAGE_DIR) \
+        $(JLINK_DISABLE_WARNINGS), \
 ))

 JLINK_JDK_TARGETS := $(jlink_jdk)
--- a/make/JrtfsJar.gmk
+++ b/make/JrtfsJar.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -27,8 +27,8 @@ default: all

 include $(SPEC)
 include MakeBase.gmk
+include JavaCompilation.gmk
 include JarArchive.gmk
-include SetupJavaCompilers.gmk
 include TextFileProcessing.gmk

 # This rule will be depended on due to the MANIFEST line
@ -47,11 +47,13 @@ JIMAGE_PKGS := \
    #

 $(eval $(call SetupJavaCompilation, BUILD_JRTFS, \
-    SETUP := GENERATE_8_BYTECODE, \
+    COMPILER := bootjdk, \
+    TARGET_RELEASE := $(TARGET_RELEASE_JDK8), \
    SRC := $(TOPDIR)/src/java.base/share/classes, \
    EXCLUDE_FILES := module-info.java, \
    INCLUDES := $(JIMAGE_PKGS), \
-    BIN := $(SUPPORT_OUTPUTDIR)/jrtfs_classes))
+    BIN := $(SUPPORT_OUTPUTDIR)/jrtfs_classes, \
+))

 # Because of the explicit INCLUDES in the compilation setup above, the service provider
 # file will not be copied unless META-INF/services would also be added to the INCLUDES.
@ -62,7 +64,7 @@ $(eval $(call SetupCopyFiles, COPY_JIMAGE_SERVICE_PROVIDER, \
    DEST := $(SUPPORT_OUTPUTDIR)/jrtfs_classes, \
    FILES := META-INF/services/java.nio.file.spi.FileSystemProvider))

-$(eval $(call SetupJarArchive,BUILD_JRTFS_JAR, \
+$(eval $(call SetupJarArchive, BUILD_JRTFS_JAR, \
    DEPENDENCIES := $(BUILD_JRTFS) $(COPY_JIMAGE_SERVICE_PROVIDER), \
    SRCS := $(SUPPORT_OUTPUTDIR)/jrtfs_classes, \
    JAR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/jrt-fs.jar, \
--- a/make/Main.gmk
+++ b/make/Main.gmk
@ -127,7 +127,7 @@ GENSRC_TARGETS += $(sort $(GENSRC_MODULEINFO_TARGETS) \
 define DeclareModuleInfoRecipe
  $1-gensrc-moduleinfo:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
-	    -f gensrc/GensrcModuleInfo.gmk MODULE=$1)
+	    -f common/modules/GensrcModuleInfo.gmk MODULE=$1)

  $1-gensrc: $1-gensrc-moduleinfo
 endef
--- a/make/MainSupport.gmk
+++ b/make/MainSupport.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -129,18 +129,17 @@ define DeclareRecipeForModuleMakefile
  $2-$$($1_TARGET_SUFFIX):
        ifeq ($$($1_USE_WRAPPER), true)
 	  +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
-	      -f ModuleWrapper.gmk \
+	      -f ModuleWrapper.gmk -I $$(TOPDIR)/make/common/modules  \
 	      $$(addprefix -I, $$(PHASE_MAKEDIRS) \
-	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(PHASE_MAKEDIRS)) \
+	          $$(addsuffix /modules/$2, $$(PHASE_MAKEDIRS)) \
 	      ) \
 	      MODULE=$2 MAKEFILE_PREFIX=$$($1_FILE_PREFIX) $$($1_EXTRA_ARGS))
        else
-	  +($(CD) $$(dir $$(firstword $$(wildcard $$(addsuffix \
-	      /$$($1_MAKE_SUBDIR)/$$($1_FILE_PREFIX)-$2.gmk, $$(PHASE_MAKEDIRS))))) \
+	  +($(CD) $$(TOPDIR)/make \
 	  && $(MAKE) $(MAKE_ARGS) \
-	      -f $$($1_FILE_PREFIX)-$2.gmk \
+	      -f modules/$2/$$($1_FILE_PREFIX).gmk -I $$(TOPDIR)/make/common/modules \
 	      $$(addprefix -I, $$(PHASE_MAKEDIRS) \
-	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(PHASE_MAKEDIRS)) \
+	          $$(addsuffix /modules/$2, $$(PHASE_MAKEDIRS)) \
 	      ) \
 	      MODULE=$2 $$($1_EXTRA_ARGS) \
 	  )
@ -153,7 +152,7 @@ endef
 # Param 2: Module name
 define DeclareRecipesForPhaseAndModule
  $1_$2_MAKEFILES := $$(strip $$(wildcard \
-      $$(addsuffix /$$($1_MAKE_SUBDIR)/$$($1_FILE_PREFIX)-$2.gmk, $$(PHASE_MAKEDIRS))))
+      $$(addsuffix /modules/$2/$$($1_FILE_PREFIX).gmk, $$(PHASE_MAKEDIRS))))

  # Only declare recipes if there are makefiles to call
  ifneq ($$($1_$2_MAKEFILES), )
--- a/make/ModuleTools.gmk
+++ b/make/ModuleTools.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -44,7 +44,7 @@ TOOL_GENGRAPHS := $(BUILD_JAVA) -esa -ea -cp $(TOOLS_CLASSES_DIR) \
 TOOL_MODULESUMMARY := $(BUILD_JAVA) -esa -ea -cp $(TOOLS_CLASSES_DIR) \
    build.tools.jigsaw.ModuleSummary

-TOOL_ADD_PACKAGES_ATTRIBUTE := $(BUILD_JAVA) $(JAVA_FLAGS_SMALL) \
+TOOL_ADD_PACKAGES_ATTRIBUTE := $(BUILD_JAVA) $(JAVA_FLAGS_SMALL_BUILDJDK) \
    -cp $(TOOLS_CLASSES_DIR) \
    --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
    build.tools.jigsaw.AddPackagesAttribute
--- a/make/ModuleWrapper.gmk
+++ b/make/ModuleWrapper.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -39,7 +39,7 @@ include MakeBase.gmk
 TARGETS :=

 # Include the file being wrapped.
-include $(MAKEFILE_PREFIX)-$(MODULE).gmk
+include modules/$(MODULE)/$(MAKEFILE_PREFIX).gmk

 # Setup copy rules from the modules directories to the jdk image directory.
 ifeq ($(call isTargetOs, windows), true)
--- a/make/RunTestsPrebuiltSpec.gmk
+++ b/make/RunTestsPrebuiltSpec.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -63,8 +63,9 @@ TEST_JOBS ?= 0

 # Use hard-coded values for java flags (one size, fits all!)
 JAVA_FLAGS := -Duser.language=en -Duser.country=US
-JAVA_FLAGS_BIG:= -Xms64M -Xmx1600M -XX:ThreadStackSize=1536
-JAVA_FLAGS_SMALL:= -XX:+UseSerialGC -Xms32M -Xmx512M -XX:TieredStopAtLevel=1
+JAVA_FLAGS_BIG := -Xms64M -Xmx1600M
+JAVA_FLAGS_SMALL := -XX:+UseSerialGC -Xms32M -Xmx512M -XX:TieredStopAtLevel=1
+BUILDJDK_JAVA_FLAGS_SMALL := -Xms32M -Xmx512M -XX:TieredStopAtLevel=1
 BUILD_JAVA_FLAGS := $(JAVA_FLAGS_BIG)

 ################################################################################
@ -120,7 +121,7 @@ JARSIGNER_CMD := $(BOOT_JDK)/bin/jarsigner

 JAVA := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
 JAVA_SMALL := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
-JAVA_JAVAC := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
+JAVA_DETACH := $(FIXPATH) $(FIXPATH_DETACH_FLAG) $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
 JAVAC := $(FIXPATH) $(JAVAC_CMD)
 JAR := $(FIXPATH) $(JAR_CMD)
 JLINK := $(FIXPATH) $(JLINK_CMD)
--- a/make/ToolsLangtools.gmk
+++ b/make/ToolsLangtools.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -29,18 +29,17 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 include JavaCompilation.gmk
-include SetupJavaCompilers.gmk

 ################################################################################
 # Setup the compilation of the properties compilation tool. You can depend
 # upon $(BUILD_TOOLS_LANGTOOLS) to trigger a compilation of the tools.
-$(eval $(call SetupJavaCompilation,BUILD_TOOLS_LANGTOOLS, \
-    SETUP := BOOT_JAVAC, \
-    DISABLE_SJAVAC := true, \
-    ADD_JAVAC_FLAGS := -Xprefer:source, \
+$(eval $(call SetupJavaCompilation, BUILD_TOOLS_LANGTOOLS, \
+    COMPILER := bootjdk, \
+    TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
    SRC := $(TOPDIR)/make/langtools/tools, \
    INCLUDES := compileproperties propertiesparser, \
    COPY := .properties, \
-    BIN := $(BUILDTOOLS_OUTPUTDIR)/langtools_tools_classes))
+    BIN := $(BUILDTOOLS_OUTPUTDIR)/langtools_tools_classes, \
+))

 all: $(BUILD_TOOLS_LANGTOOLS)
--- a/make/autoconf/boot-jdk.m4
+++ b/make/autoconf/boot-jdk.m4
@ -347,11 +347,10 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
  # oldest supported bootjdk.
  OLDEST_BOOT_JDK=`$ECHO $DEFAULT_ACCEPTABLE_BOOT_VERSIONS \
      | $TR " " "\n" | $SORT -n | $HEAD -n1`
-  BOOT_JDK_SOURCETARGET="-source $OLDEST_BOOT_JDK -target $OLDEST_BOOT_JDK"
+  # -Xlint:-options is added to avoid "warning: [options] system modules path not set in conjunction with -source"
+  BOOT_JDK_SOURCETARGET="-source $OLDEST_BOOT_JDK -target $OLDEST_BOOT_JDK -Xlint:-options"
  AC_SUBST(BOOT_JDK_SOURCETARGET)

-  AC_SUBST(JAVAC_FLAGS)
-
  # Check if the boot jdk is 32 or 64 bit
  if "$JAVA" -version 2>&1 | $GREP -q "64-Bit"; then
    BOOT_JDK_BITS="64"
@ -433,12 +432,10 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
  UTIL_ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs_big,[$JAVA])
  BOOTCYCLE_JVM_ARGS_BIG=-Xms64M

-  # Maximum amount of heap memory and stack size.
+  # Maximum amount of heap memory.
  JVM_HEAP_LIMIT_32="768"
  # Running a 64 bit JVM allows for and requires a bigger heap
  JVM_HEAP_LIMIT_64="1600"
-  STACK_SIZE_32=768
-  STACK_SIZE_64=1536
  JVM_HEAP_LIMIT_GLOBAL=`expr $MEMORY_SIZE / 2`
  if test "$JVM_HEAP_LIMIT_GLOBAL" -lt "$JVM_HEAP_LIMIT_32"; then
    JVM_HEAP_LIMIT_32=$JVM_HEAP_LIMIT_GLOBAL
@ -452,14 +449,11 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
  fi

  if test "x$BOOT_JDK_BITS" = "x32"; then
-    STACK_SIZE=$STACK_SIZE_32
    JVM_MAX_HEAP=$JVM_HEAP_LIMIT_32
  else
-    STACK_SIZE=$STACK_SIZE_64
    JVM_MAX_HEAP=$JVM_HEAP_LIMIT_64
  fi
  UTIL_ADD_JVM_ARG_IF_OK([-Xmx${JVM_MAX_HEAP}M],boot_jdk_jvmargs_big,[$JAVA])
-  UTIL_ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs_big,[$JAVA])

  AC_MSG_RESULT([$boot_jdk_jvmargs_big])

@ -468,21 +462,14 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],

  if test "x$OPENJDK_TARGET_CPU_BITS" = "x32"; then
    BOOTCYCLE_MAX_HEAP=$JVM_HEAP_LIMIT_32
-    BOOTCYCLE_STACK_SIZE=$STACK_SIZE_32
  else
    BOOTCYCLE_MAX_HEAP=$JVM_HEAP_LIMIT_64
-    BOOTCYCLE_STACK_SIZE=$STACK_SIZE_64
  fi
  BOOTCYCLE_JVM_ARGS_BIG="$BOOTCYCLE_JVM_ARGS_BIG -Xmx${BOOTCYCLE_MAX_HEAP}M"
-  BOOTCYCLE_JVM_ARGS_BIG="$BOOTCYCLE_JVM_ARGS_BIG -XX:ThreadStackSize=$BOOTCYCLE_STACK_SIZE"
  AC_MSG_CHECKING([flags for bootcycle boot jdk java command for big workloads])
  AC_MSG_RESULT([$BOOTCYCLE_JVM_ARGS_BIG])
  AC_SUBST(BOOTCYCLE_JVM_ARGS_BIG)

-  # By default, the main javac compilations use big
-  JAVA_FLAGS_JAVAC="$JAVA_FLAGS_BIG"
-  AC_SUBST(JAVA_FLAGS_JAVAC)
-
  AC_MSG_CHECKING([flags for boot jdk java command for small workloads])

  # Use serial gc for small short lived tools if possible
@ -496,6 +483,11 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
  JAVA_FLAGS_SMALL=$boot_jdk_jvmargs_small
  AC_SUBST(JAVA_FLAGS_SMALL)

+  # Don't presuppose SerialGC is present in the buildjdk. Also, we cannot test
+  # the buildjdk, but on the other hand we know what it will support.
+  BUILDJDK_JAVA_FLAGS_SMALL="-Xms32M -Xmx512M -XX:TieredStopAtLevel=1"
+  AC_SUBST(BUILDJDK_JAVA_FLAGS_SMALL)
+
  JAVA_TOOL_FLAGS_SMALL=""
  for f in $JAVA_FLAGS_SMALL; do
    JAVA_TOOL_FLAGS_SMALL="$JAVA_TOOL_FLAGS_SMALL -J$f"
--- a/make/autoconf/bootcycle-spec.gmk.in
+++ b/make/autoconf/bootcycle-spec.gmk.in
@ -35,10 +35,6 @@ ifeq ($(firstword $(JAVA)),$(FIXPATH))
 else
  JAVA_EXEC_POS=1
 endif
-ifneq ($(word $(JAVA_EXEC_POS),$(SJAVAC_SERVER_JAVA)),$(word $(JAVA_EXEC_POS),$(JAVA)))
-  $(error Bootcycle builds are not possible if --with-sjavac-server-java is specified)
-endif
-

 # Override specific values to do a boot cycle build

@ -54,12 +50,6 @@ JAVA_CMD:=$(BOOT_JDK)/bin/java
 JAVAC_CMD:=$(BOOT_JDK)/bin/javac
 JAR_CMD:=$(BOOT_JDK)/bin/jar
 JARSIGNER_CMD:=$(BOOT_JDK)/bin/jarsigner
-SJAVAC_SERVER_JAVA_CMD:=$(JAVA_CMD)
-# When building a 32bit target, make sure the sjavac server flags are compatible
-# with a 32bit JVM.
-ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
-  SJAVAC_SERVER_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
-endif
 # The bootcycle JVM arguments may differ from the original boot jdk.
 JAVA_FLAGS_BIG := @BOOTCYCLE_JVM_ARGS_BIG@
 # Any CDS settings generated for the bootjdk are invalid in the bootcycle build.
--- a/make/autoconf/build-performance.m4
+++ b/make/autoconf/build-performance.m4
@ -393,72 +393,11 @@ AC_DEFUN_ONCE([BPERF_SETUP_PRECOMPILED_HEADERS],
 ])


-AC_DEFUN_ONCE([BPERF_SETUP_SMART_JAVAC],
+AC_DEFUN_ONCE([BPERF_SETUP_JAVAC_SERVER],
 [
-  AC_ARG_WITH(sjavac-server-java, [AS_HELP_STRING([--with-sjavac-server-java],
-      [use this java binary for running the sjavac background server @<:@Boot JDK java@:>@])])
-
-  if test "x$with_sjavac_server_java" != x; then
-    SJAVAC_SERVER_JAVA="$with_sjavac_server_java"
-    FOUND_VERSION=`$SJAVAC_SERVER_JAVA -version 2>&1 | grep " version \""`
-    if test "x$FOUND_VERSION" = x; then
-      AC_MSG_ERROR([Could not execute server java: $SJAVAC_SERVER_JAVA])
-    fi
-  else
-    SJAVAC_SERVER_JAVA="$JAVA"
-  fi
-  AC_SUBST(SJAVAC_SERVER_JAVA)
-
-  if test "$MEMORY_SIZE" -gt "3000"; then
-    if "$JAVA" -version 2>&1 | $GREP -q "64-Bit"; then
-      JVM_64BIT=true
-    fi
-  fi
-
-  MX_VALUE=`expr $MEMORY_SIZE / 2`
-  if test "$JVM_64BIT" = true; then
-    # Set ms lower than mx since more than one instance of the server might
-    # get launched at the same time before they figure out which instance won.
-    MS_VALUE=512
-    if test "$MX_VALUE" -gt "2048"; then
-      MX_VALUE=2048
-    fi
-  else
-    MS_VALUE=256
-    if test "$MX_VALUE" -gt "1500"; then
-      MX_VALUE=1500
-    fi
-  fi
-  if test "$MX_VALUE" -lt "512"; then
-    MX_VALUE=512
-  fi
-
-  JAVAC_SERVER_AVAILABLE=true
-  SJAVAC_MEMORY_OPT="-Xms${MS_VALUE}M -Xmx${MX_VALUE}M"
-  UTIL_ADD_JVM_ARG_IF_OK([$SJAVAC_MEMORY_OPT],SJAVAC_SERVER_JAVA_FLAGS,[$SJAVAC_SERVER_JAVA])
-  if test "x$JVM_ARG_OK" = "xfalse"; then
-    AC_MSG_WARN([Could not set '$SJAVAC_MEMORY_OPT' on bootjdk, disabling sjavac and javac server])
-    JAVAC_SERVER_AVAILABLE=false
-  fi
-  AC_SUBST(SJAVAC_SERVER_JAVA_FLAGS)
-
-  UTIL_ARG_ENABLE(NAME: sjavac, DEFAULT: false, AVAILABLE: $JAVAC_SERVER_AVAILABLE,
-      DESC: [use sjavac to do fast incremental compiles],
-      CHECKING_MSG: [whether to use sjavac],
-      IF_ENABLED: [ ENABLE_SJAVAC="yes" ],
-      IF_DISABLED: [ ENABLE_SJAVAC="no" ])
-  AC_SUBST(ENABLE_SJAVAC)
-
-  UTIL_ARG_ENABLE(NAME: javac-server, DEFAULT: true, AVAILABLE: $JAVAC_SERVER_AVAILABLE,
+  UTIL_ARG_ENABLE(NAME: javac-server, DEFAULT: true,
+      RESULT: ENABLE_JAVAC_SERVER,
      DESC: [enable javac server],
-      CHECKING_MSG: [whether to use javac server],
-      IF_ENABLED: [ ENABLE_JAVAC_SERVER="yes" ],
-      IF_DISABLED: [ ENABLE_JAVAC_SERVER="no" ])
+      CHECKING_MSG: [whether to use javac server])
  AC_SUBST(ENABLE_JAVAC_SERVER)
-
-  if test "x$ENABLE_JAVAC_SERVER" = "xyes" || test "x$ENABLE_SJAVAC" = "xyes"; then
-    # When using a server javac, the small client instances do not need much
-    # resources.
-    JAVA_FLAGS_JAVAC="$JAVA_FLAGS_SMALL"
-  fi
 ])
--- a/make/autoconf/configure.ac
+++ b/make/autoconf/configure.ac
@ -261,13 +261,11 @@ BPERF_SETUP_BUILD_CORES
 BPERF_SETUP_BUILD_MEMORY
 BPERF_SETUP_BUILD_JOBS
 BPERF_SETUP_TEST_JOBS
+BPERF_SETUP_JAVAC_SERVER

 # Setup arguments for the boot jdk (after cores and memory have been setup)
 BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS

-# Setup smart javac (after cores and memory have been setup)
-BPERF_SETUP_SMART_JAVAC
-
 # Setup use of icecc if requested
 BPERF_SETUP_ICECC

--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@ -355,9 +355,6 @@ BOOT_JDK_SOURCETARGET:=@BOOT_JDK_SOURCETARGET@
 # Information about the build system
 NUM_CORES:=@NUM_CORES@
 MEMORY_SIZE:=@MEMORY_SIZE@
-# Enable sjavac support = use a javac server,
-# multi core javac compilation and dependency tracking.
-ENABLE_SJAVAC:=@ENABLE_SJAVAC@
 ENABLE_JAVAC_SERVER:=@ENABLE_JAVAC_SERVER@
 # Store sjavac server synchronization files here, and
 # the sjavac server log files.
@ -620,9 +617,8 @@ STRIPFLAGS:=@STRIPFLAGS@
 JAVA_FLAGS:=@JAVA_FLAGS@
 JAVA_FLAGS_BIG:=@JAVA_FLAGS_BIG@
 JAVA_FLAGS_SMALL:=@JAVA_FLAGS_SMALL@
-JAVA_FLAGS_JAVAC:=@JAVA_FLAGS_JAVAC@
+BUILDJDK_JAVA_FLAGS_SMALL:=@BUILDJDK_JAVA_FLAGS_SMALL@
 JAVA_TOOL_FLAGS_SMALL:=@JAVA_TOOL_FLAGS_SMALL@
-SJAVAC_SERVER_JAVA_FLAGS:=@SJAVAC_SERVER_JAVA_FLAGS@

 # The *_CMD variables are defined separately to be easily overridden in bootcycle-spec.gmk
 # for bootcycle-images build. Make sure to keep them in sync. Do not use the *_CMD
@ -635,12 +631,11 @@ JLINK_CMD := @JLINK@
 JMOD_CMD := @JMOD@
 JARSIGNER_CMD:=@JARSIGNER@
 JJS_CMD:=@JJS@
-SJAVAC_SERVER_JAVA_CMD:=@SJAVAC_SERVER_JAVA@
 # These variables are meant to be used. They are defined with = instead of := to make
 # it possible to override only the *_CMD variables.
 JAVA=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
 JAVA_SMALL=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
-JAVA_JAVAC=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_JAVAC) $(JAVA_FLAGS)
+JAVA_DETACH =@FIXPATH@ @FIXPATH_DETACH_FLAG@ $(JAVA_CMD) $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
 JAVAC=@FIXPATH@ $(JAVAC_CMD)
 JAVADOC=@FIXPATH@ $(JAVADOC_CMD)
 JAR=@FIXPATH@ $(JAR_CMD)
@ -648,15 +643,6 @@ JLINK = @FIXPATH@ $(JLINK_CMD) $(JAVA_TOOL_FLAGS_SMALL)
 JMOD = @FIXPATH@ $(JMOD_CMD) $(JAVA_TOOL_FLAGS_SMALL)
 JARSIGNER=@FIXPATH@ $(JARSIGNER_CMD)
 JJS=@FIXPATH@ $(JJS_CMD) $(JAVA_TOOL_FLAGS_SMALL)
-# A specific java binary with specific options can be used to run
-# the long running background sjavac servers and other long running tasks.
-SJAVAC_SERVER_JAVA=@FIXPATH@ @FIXPATH_DETACH_FLAG@ $(SJAVAC_SERVER_JAVA_CMD) \
-    $(SJAVAC_SERVER_JAVA_FLAGS)
-
-# Hotspot sets this variable before reading the SPEC when compiling sa-jdi.jar. Avoid
-# overriding that value by using ?=.
-JAVAC_FLAGS?=@JAVAC_FLAGS@
-

 BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
 BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
--- a/make/common/JavaCompilation.gmk
+++ b/make/common/JavaCompilation.gmk
@ -23,10 +23,6 @@
 # questions.
 #

-# When you read this source. Remember that $(sort ...) has the side effect
-# of removing duplicates. It is actually this side effect that is
-# desired whenever sort is used below!
-
 ifndef _JAVA_COMPILATION_GMK
 _JAVA_COMPILATION_GMK := 1

@ -39,30 +35,22 @@ endif
 include JarArchive.gmk
 include ZipArchive.gmk

-# Setup make rules for defining a Java compiler, which is needed to compile
-# Java code. This rule generates no output.
-#
-# Parameter 1 is the name of the compiler definition. This name needs to be
-# passed to SetupJavaCompilation. This name is used as variable prefix.
-#
-# Remaining parameters are named arguments. These include:
-#   JVM:=The jvm used to run the javac command
-#   JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out
-#   FLAGS:=Flags to be supplied to javac
-#   SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here
-#   SERVER_JVM:=Use this JVM for the server. Defaults to the JVM above.
-#   DISABLE_SJAVAC:=Set to true if this setup does not support sjavac
-SetupJavaCompiler = $(NamedParamsMacroTemplate)
-define SetupJavaCompilerBody
-  # The port file contains the tcp/ip on which the server listens
-  # and the cookie necessary to talk to the server.
-  $1_SJAVAC_PORTFILE:=$$($1_SERVER_DIR)/server.port
-  # You can use a different JVM to run the background javac server.
-  ifeq ($$($1_SERVER_JVM),)
-    # It defaults to the same JVM that is used to start the javac command.
-    $1_SERVER_JVM:=$$($1_JVM)
-  endif
-endef
+###
+### Definitions for common release targets
+###
+
+# Create classes that can run on the bootjdk
+TARGET_RELEASE_BOOTJDK := $(BOOT_JDK_SOURCETARGET)
+
+# Create classes that can be used in (or be a part of) the new jdk we're building
+TARGET_RELEASE_NEWJDK := -source $(JDK_SOURCE_TARGET_VERSION) -target $(JDK_SOURCE_TARGET_VERSION)
+
+# Create classes that can be used in JDK 8, for legacy support
+TARGET_RELEASE_JDK8 := --release 8
+
+# Create classes for the new jdk, relying only on the modules of the new jdk
+TARGET_RELEASE_NEWJDK_UPGRADED := $(TARGET_RELEASE_NEWJDK) \
+    --upgrade-module-path $(JDK_OUTPUTDIR)/modules --system none

 define add_file_to_copy
  # param 1 = BUILD_MYPACKAGE
@ -76,7 +64,7 @@ define add_file_to_copy
    $1_COPY_$$($2_TARGET) := 1
    # Now we can setup the dependency that will trigger the copying.
    $$($1_BIN)$$($1_MODULE_SUBDIR)$$($2_TARGET) : $2
-	$$(call LogInfo, Copying $$(patsubst $(OUTPUTDIR)/%,%, $$@))
+	$$(call LogInfo, Copying $$(patsubst $$(OUTPUTDIR)/%,%, $$@))
 	$$(install-file)
 	$(CHMOD) -f ug+w $$@

@ -86,10 +74,7 @@ define add_file_to_copy
 endef

 # This macro is used only for properties files that are to be
-# copied over to the classes directory in cleaned form:
-# Previously this was inconsistently done in different repositories.
-# This is the new clean standard. Though it is to be superseded by
-# a standard annotation processor from with sjavac.
+# copied over to the classes directory in cleaned form.
 #
 # An empty echo ensures that the input to sed always ends with a newline.
 # Certain implementations (e.g. Solaris) will skip the last line without
@ -120,12 +105,12 @@ define add_file_to_clean
  ifneq ($$($1_CLEAN_$$($2_TARGET)), 1)
    $1_CLEAN_$$($2_TARGET) := 1
    $$($1_BIN)$$($1_MODULE_SUBDIR)$$($2_TARGET) : $2
-	$$(call LogInfo, Cleaning $$(patsubst $(OUTPUTDIR)/%,%, $$@))
+	$$(call LogInfo, Cleaning $$(patsubst $$(OUTPUTDIR)/%,%, $$@))
 	$$(call MakeTargetDir)
 	( $(CAT) $$< && $(ECHO) "" ) \
 	    | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' \
 	        -e 's/\([^\\]\)!/\1\\!/g' -e 's/^[ 	]*#.*/#/g' \
-	    | $(SED) -f "$(TOPDIR)/make/common/support/unicode2x.sed" \
+	    | $(SED) -f "$$(TOPDIR)/make/common/support/unicode2x.sed" \
 	    | $(SED) -e '/^#/d' -e '/^$$$$/d' \
 	        -e :a -e '/\\$$$$/N; s/\\\n//; ta' \
 	        -e 's/^[ 	]*//;s/[ 	]*$$$$//' \
@ -151,9 +136,12 @@ endef
 # The target for public API digest is returned in $1_API_TARGET.
 #
 # Remaining parameters are named arguments. These include:
-#   SETUP:=must point to a previously setup java compiler, for example: SETUP:=BOOTJAVAC
-#   JVM:=path to ..bin/java
-#   ADD_JAVAC_FLAGS:=javac flags to append to the default ones.
+#   SMALL_JAVA:=set to false to run javac as a "big" java app
+#   COMPILER:=bootjdk or interim, the latter is default
+#   TARGET_RELEASE:=javac flags to set the targeted jdk release (-source/-target or --release)
+#   Defaults to $(TARGET_RELEASE_NEWJDK).
+#   JAVAC_FLAGS:=javac flags to append to the default ones.
+#   JAVA_FLAGS:=flags to be appended to the java launching the compiler
 #   DISABLED_WARNINGS:=list of Xlint warnings that should be disabled
 #   SRC:=one or more directories to search for sources. The order of the source roots
 #        is significant. The first found file of a certain name has priority.
@ -174,14 +162,12 @@ endef
 #       specify files that need to be generated by other rules first.
 #   HEADERS:=path to directory where all generated c-headers are written.
 #   DEPENDS:=Extra dependecy
-#   DISABLE_SJAVAC:=Explicitly disable the use of sjavac for this compilation unit.
 #   KEEP_DUPS:=Do not remove duplicate file names from different source roots.
 #   FAIL_NO_SRC:=Set to false to not fail the build if no source files are found,
 #        default is true.
-#   DEBUG_SYMBOLS:=Set to false to disable generation of debug symbols.
 #   CREATE_API_DIGEST:=Set to true to use a javac plugin to generate a public API
 #        hash which can be used for down stream dependencies to only rebuild
-#        when the API changes. Implicitly used in sjavac.
+#        when the API changes.
 #   KEEP_ALL_TRANSLATIONS:=Set to true to skip translation filtering
 SetupJavaCompilation = $(NamedParamsMacroTemplate)
 define SetupJavaCompilationBody
@ -191,14 +177,76 @@ define SetupJavaCompilationBody
    $$(error Must specify BIN (in $1))
  endif

-  # Extract the info from the java compiler setup.
-  $1_JVM := $$($$($1_SETUP)_JVM)
-  $1_JAVAC := $$($$($1_SETUP)_JAVAC)
-  $1_FLAGS :=
-  ifneq ($$($1_DEBUG_SYMBOLS), false)
-    $1_FLAGS := -g
+  ifeq ($$($1_SMALL_JAVA), )
+    # If unspecified, default to true
+    $1_SMALL_JAVA := true
  endif
-  $1_FLAGS += $$($$($1_SETUP)_FLAGS) $$($1_ADD_JAVAC_FLAGS) $(JAVAC_FLAGS)
+
+  ifeq ($$($1_COMPILER), )
+    # If unspecified, default to interim compiler
+    $1_COMPILER := interim
+  endif
+
+  ifeq ($$($1_COMPILER), bootjdk)
+    # Javac server is not available when using the bootjdk compiler.
+    $1_JAVAC_CMD := $$(JAVAC)
+
+    ifeq ($$($1_SMALL_JAVA), true)
+      $1_FLAGS += $$(addprefix -J, $$(JAVA_FLAGS_SMALL))
+    endif
+    ifeq ($$($1_JAVA_FLAGS), true)
+      $1_FLAGS += $$(addprefix -J, $$($1_JAVA_FLAGS))
+    endif
+
+    ifeq ($$($1_TARGET_RELEASE), )
+      # If unspecified, default to the new jdk we're building
+      $1_TARGET_RELEASE := $$(TARGET_RELEASE_BOOTJDK)
+    endif
+  else ifeq ($$($1_COMPILER), interim)
+    # Use java server if it is enabled, and the user does not want a specialized
+    # class path.
+    ifeq ($$($1_ENABLE_JAVAC_SERVER+$$($1_CLASSPATH)), true+)
+      $1_JAVAC := $$(INTERIM_LANGTOOLS_ARGS) -m jdk.compiler.interim/com.sun.tools.sjavac.Main
+
+      # How to launch the server. This must use JAVA_DETACH, which is the "big" java
+      # with an ability to detach from fixpath (on Windows)
+      # This will be executed by the client, if needed.
+      $1_JAVAC_SERVER_CMD := $$(JAVA_DETACH) $$($1_JAVA_FLAGS) $$($1_JAVAC)
+      $1_ESCAPED_CMD := $$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_JAVAC_SERVER_CMD))))
+
+      # The port file contains the tcp/ip on which the server listens
+      # and the cookie necessary to talk to the server.
+      $1_JAVA_SERVER_FLAGS := --server:portfile=$$(SJAVAC_SERVER_DIR)/server.port,sjavac=$$($1_ESCAPED_CMD)
+
+      # Always use small to launch client
+      $1_JAVAC_CMD := $$(JAVA_SMALL) $$($1_JAVA_FLAGS) $$($1_JAVAC) $$($1_JAVA_SERVER_FLAGS)
+    else
+      # No javac server
+      $1_JAVAC := $$(INTERIM_LANGTOOLS_ARGS) -m jdk.compiler.interim/com.sun.tools.javac.Main
+
+      ifeq ($$($1_SMALL_JAVA), true)
+       $1_JAVAC_CMD := $$(JAVA_SMALL) $$($1_JAVA_FLAGS) $$($1_JAVAC)
+      else
+       $1_JAVAC_CMD := $$(JAVA) $$($1_JAVA_FLAGS) $$($1_JAVAC)
+      endif
+    endif
+
+    ifeq ($$($1_TARGET_RELEASE), )
+      # If unspecified, default to the new jdk we're building
+      $1_TARGET_RELEASE := $$(TARGET_RELEASE_NEWJDK)
+    endif
+  else
+    $$(error Invalid value for COMPILER in SetupJavaCompilation for $1: '$$($1_COMPILER)')
+  endif
+
+  # Allow overriding on the command line
+  JAVA_WARNINGS_ARE_ERRORS ?= -Werror
+
+  # Tell javac to do exactly as told and no more
+  PARANOIA_FLAGS := -implicit:none -Xprefer:source -XDignore.symbol.file=true -encoding ascii
+
+  $1_FLAGS += -g -Xlint:all --doclint-format html5 $$($1_TARGET_RELEASE) $$(PARANOIA_FLAGS) $$(JAVA_WARNINGS_ARE_ERRORS)
+  $1_FLAGS += $$($1_JAVAC_FLAGS)

  ifneq ($$($1_DISABLED_WARNINGS), )
    $1_FLAGS += -Xlint:$$(call CommaList, $$(addprefix -, $$($1_DISABLED_WARNINGS)))
@ -208,13 +256,6 @@ define SetupJavaCompilationBody
    $1_FLAGS += -cp $$(call PathList, $$($1_CLASSPATH))
  endif

-  ifeq ($$($1_JAVAC),)
-    $$(error The Java compilation $1 refers to a non-existant java compiler setup $$($1_SETUP))
-  endif
-  $1_SJAVAC_PORTFILE := $$($$($1_SETUP)_SJAVAC_PORTFILE)
-  $1_SERVER_JVM := $$($$($1_SETUP)_SERVER_JVM)
-  $1_DISABLE_SJAVAC := $$($$($1_SETUP)_DISABLE_SJAVAC)
-
  ifneq ($$($1_MODULE), )
    $1_MODULE_SUBDIR := /$$($1_MODULE)
  endif
@ -264,13 +305,10 @@ define SetupJavaCompilationBody
    # Remove duplicate source files by keeping the first found of each duplicate.
    # This allows for automatic overrides with custom or platform specific versions
    # source files.
-    #
-    # For the smart javac wrapper case, add each removed file to an extra exclude
-    # file list to prevent sjavac from finding duplicate sources.
    $1_SRCS := $$(strip $$(foreach s, $$($1_SRCS), \
        $$(eval relative_src := $$(call remove-prefixes, $$($1_SRC), $$(s))) \
        $$(if $$($1_$$(relative_src)), \
-          $$(eval $1_SJAVAC_EXCLUDE_FILES += $$(s)), \
+          , \
          $$(eval $1_$$(relative_src) := 1) $$(s))))
  endif

@ -343,92 +381,15 @@ define SetupJavaCompilationBody
    # and remove .java at the end.
    $1_REWRITE_INTO_CLASSES:=$$(foreach i,$$($1_SRC),-e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g'

-    # Create SJAVAC variable from JAVAC variable. Expects $1_JAVAC to be
-    # "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main"
-    # and javac is simply replaced with sjavac.
-    $1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC))
-
-    # Set the $1_REMOTE to spawn a background javac server.
-    $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst \
-        $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC))))
-
    $1_COMPILE_TARGET := $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$1_batch
    $1_API_TARGET := $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$1_pubapi

-    ifeq ($$($1_DISABLE_SJAVAC)x$$(ENABLE_SJAVAC),xyes)
-      # Using sjavac to compile.
+    # Put headers in a temp dir to filter out those that actually
+    # changed before copying them to the real header dir.
+    ifneq (,$$($1_HEADERS))
+      $1_HEADERS_ARG := -h $$($1_HEADERS).$1.tmp

-      # Create the sjavac wrapper command line. Sjavac doesn't handle patterns that
-      # match the absolute path, only the part inside each src dir. Instead -i and
-      # -x flags apply only to the next -src arg on the command line.
-      $1_EXCLUDE_FILES_ABS := $$(filter /%, $$($1_EXCLUDE_FILES)) $$($1_SJAVAC_EXCLUDE_FILES)
-      $1_EXCLUDE_FILES_REL := $$(filter-out /%, $$($1_EXCLUDE_FILES))
-      $1_SJAVAC_ARGS_STRING := $$(foreach s, $$(patsubst %/, %, $$($1_SRC)), \
-          $$(addprefix -x ,$$(addsuffix /**,$$($1_EXCLUDES))) \
-          $$(addprefix -i ,$$(addsuffix /**,$$($1_INCLUDES))) \
-          $$(addprefix -x **,$$(strip $$($1_EXCLUDE_FILES_REL))) \
-          $$(addprefix -i **,$$(strip $$($1_INCLUDE_FILES))) \
-          $$(addprefix -x , $$(strip $$(patsubst $$(s)/%, %, $$(filter $$(s)/%, $$($1_EXCLUDE_FILES_ABS))))) \
-          -src $$(s))
-
-      ifneq ($$(word 20, $$($1_SJAVAC_ARGS_STRING)), )
-        $1_SJAVAC_ARGS_FILE := $$($1_BIN)/_the.$1_args
-        $1_SJAVAC_ARGS := @$$($1_SJAVAC_ARGS_FILE)
-      else
-        $1_SJAVAC_ARGS := $$($1_SJAVAC_ARGS_STRING)
-      endif
-
-
-      ifneq (,$$($1_HEADERS))
-        $1_HEADERS_ARG := -h $$($1_HEADERS)
-      endif
-
-      $1_VARDEPS := $$($1_JVM) $$($1_SJAVAC) $$($1_SJAVAC_ARGS_STRING) $$($1_FLAGS) \
-          $$($1_HEADERS_ARG) $$($1_BIN) $$($1_EXCLUDES) $$($1_INCLUDES) \
-          $$($1_EXCLUDE_FILES) $$($1_INCLUDE_FILES)
-      $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
-          $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$1.vardeps)
-
-      $$($1_COMPILE_TARGET): $$($1_SRCS) $$($1_DEPENDS) $$($1_VARDEPS_FILE)
-		$$(call MakeDir, $$(@D) $$(dir $$($1_SJAVAC_PORTFILE)))
-		$$(eval $$(call ListPathsSafely,$1_SRCS, $$@.tmp))
-                ifneq ($$($1_SJAVAC_ARGS_FILE), )
-		  $$(eval $$(call ListPathsSafely,$1_SJAVAC_ARGS_STRING, $$($1_SJAVAC_ARGS_FILE)))
-                endif
-		$$(call LogWarn, Compiling $1)
-		$$(call ExecuteWithLog, $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$$($1_SAFE_NAME)_batch, \
-		    $$($1_JVM) $$($1_SJAVAC) \
-		        $$($1_REMOTE) \
-		        -j 1 \
-		        --permit-unidentified-artifacts \
-		        --permit-sources-without-package \
-		        --compare-found-sources $$@.tmp \
-		        --log=$(LOG_LEVEL) \
-		        --state-dir=$$($1_BIN)$$($1_MODULE_SUBDIR) \
-		        $$($1_SJAVAC_ARGS) \
-		        $$($1_FLAGS) \
-		        $$($1_HEADERS_ARG) \
-		        -d $$($1_BIN)) && \
-		$(MV) $$@.tmp $$@
-                # Create a pubapi file that only changes when the pubapi changes. Dependent
-                # compilations can use this file to only get recompiled when pubapi has changed.
-                # Grep returns 1 if no matching lines are found. Do not fail for this.
-		$(GREP) -e "^I" $$($1_BIN)$$($1_MODULE_SUBDIR)/javac_state \
-		    > $$($1_API_TARGET).tmp || test "$$$$?" = "1"
-		if [ ! -f $$($1_API_TARGET) ] \
-		    || [ "`$(DIFF) $$($1_API_TARGET) $$($1_API_TARGET).tmp`" != "" ]; then \
-		  $(MV) $$($1_API_TARGET).tmp $$($1_API_TARGET); \
-		fi
-
-    else
-      # Using plain javac to batch compile everything.
-
-      # When building in batch, put headers in a temp dir to filter out those that actually
-      # changed before copying them to the real header dir.
-      ifneq (,$$($1_HEADERS))
-        $1_HEADERS_ARG := -h $$($1_HEADERS).$1.tmp
-
-        $$($1_HEADERS)/_the.$1_headers: $$($1_COMPILE_TARGET)
+      $$($1_HEADERS)/_the.$1_headers: $$($1_COMPILE_TARGET)
 		$$(call MakeTargetDir)
 		if [ -d "$$($1_HEADERS).$1.tmp" ]; then \
 		  for f in `$(CD) $$($1_HEADERS).$1.tmp && $(FIND) . -type f`; do \
@ -442,43 +403,35 @@ define SetupJavaCompilationBody
 		$(RM) -r $$($1_HEADERS).$1.tmp
 		$(TOUCH) $$@

-        $1_HEADER_TARGETS := $$($1_HEADERS)/_the.$1_headers
-      endif
+      $1_HEADER_TARGETS := $$($1_HEADERS)/_the.$1_headers
+    endif

-      $1_VARDEPS := $$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) $$($1_BIN) \
-          $$($1_HEADERS_ARG) $$($1_EXCLUDES) $$($1_INCLUDES) \
-          $$($1_EXCLUDE_FILES) $$($1_INCLUDE_FILES)
-      $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
-          $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$1.vardeps)
+    $1_VARDEPS := $$($1_JAVAC_CMD) $$($1_FLAGS) $$($1_BIN) \
+        $$($1_HEADERS_ARG) $$($1_EXCLUDES) $$($1_INCLUDES) \
+        $$($1_EXCLUDE_FILES) $$($1_INCLUDE_FILES)
+    $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
+        $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$1.vardeps)

-      ifeq ($$($1_DISABLE_SJAVAC)x$(ENABLE_JAVAC_SERVER), xyes)
-        $1_JAVAC_CMD := $$($1_SJAVAC) $$($1_REMOTE)
-      else
-        $1_JAVAC_CMD := $$($1_JAVAC)
-      endif
+    ifeq ($$($1_CREATE_API_DIGEST), true)
+      $1_API_DIGEST_FLAGS := \
+          -classpath $$(BUILDTOOLS_OUTPUTDIR)/depend \
+          -Xplugin:"depend $$($1_API_TARGET)" \
+          #

-      ifeq ($$($1_CREATE_API_DIGEST), true)
-        $1_API_DIGEST_FLAGS := \
-            -classpath $(BUILDTOOLS_OUTPUTDIR)/depend \
-            -Xplugin:"depend $$($1_API_TARGET)" \
-            #
+      $1_EXTRA_DEPS := $$(BUILDTOOLS_OUTPUTDIR)/depend/_the.COMPILE_DEPEND_batch
+    endif

-        $1_EXTRA_DEPS := $(BUILDTOOLS_OUTPUTDIR)/depend/_the.COMPILE_DEPEND_batch
-      endif
-
-      # When not using sjavac, pass along all sources to javac using an @file.
-      $$($1_COMPILE_TARGET): $$($1_SRCS) $$($1_DEPENDS) $$($1_VARDEPS_FILE) \
-          $$($1_EXTRA_DEPS)
+    # Pass along all sources to javac using an @file.
+    $$($1_COMPILE_TARGET): $$($1_SRCS) $$($1_DEPENDS) $$($1_VARDEPS_FILE) \
+        $$($1_EXTRA_DEPS)
 		$$(call MakeDir, $$(@D))
 		$$(eval $$(call ListPathsSafely,$1_SRCS, $$@.tmp))
 		$$(call LogWarn, Compiling $$(words $$($1_SRCS)) files for $1)
 		$$(call ExecuteWithLog, $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$$($1_SAFE_NAME)_batch, \
-		    $$($1_JVM) $$($1_JAVAC_CMD) $$($1_FLAGS) \
-		        -implicit:none \
+		    $$($1_JAVAC_CMD) $$($1_FLAGS) \
 		        $$($1_API_DIGEST_FLAGS) \
 		        -d $$($1_BIN) $$($1_HEADERS_ARG) @$$@.tmp) && \
 		$(MV) $$@.tmp $$@
-    endif

    # Add all targets to main variable
    $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_COMPILE_TARGET) \
@ -506,7 +459,6 @@ define SetupJavaCompilationBody
          EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR), \
          JARINDEX:=$$($1_JARINDEX), \
          HEADERS:=$$($1_HEADERS), \
-          SETUP:=$$($1_SETUP), \
      ))

      # Add jar to target list
--- a/make/common/SetupJavaCompilers.gmk
+++ b/make/common/SetupJavaCompilers.gmk
@ -1,104 +0,0 @@
-#
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-ifndef _SETUP_GMK
-_SETUP_GMK := 1
-
-# Include custom extension hook
-$(eval $(call IncludeCustomExtension, common/SetupJavaCompilers.gmk))
-
-include JavaCompilation.gmk
-
-JDK_SOURCE_TARGET_FLAGS := -source $(JDK_SOURCE_TARGET_VERSION) \
-    -target $(JDK_SOURCE_TARGET_VERSION)
-
-# 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
-
-# The BOOT_JAVAC setup uses the boot jdk compiler to compile the tools
-# and the interim javac, to be run by the boot jdk.
-$(eval $(call SetupJavaCompiler,BOOT_JAVAC, \
-    JAVAC := $(JAVAC), \
-    FLAGS := \
-        $(JAVA_TOOL_FLAGS_SMALL) \
-        $(BOOT_JDK_SOURCETARGET) \
-        -XDignore.symbol.file=true -g \
-        $(JAVAC_WARNINGS) -Xlint:-options, \
-    DISABLE_SJAVAC := true, \
-))
-
-# Any java code executed during a JDK build to build other parts of the JDK must be
-# executed by the bootstrap JDK (probably with -Xbootclasspath/p: ) and for this
-# purpose must be built with -target PREVIOUS for bootstrapping purposes, which
-# requires restricting to language level and api of previous JDK.
-#
-# The generate old bytecode javac setup uses the new compiler to compile for the
-# boot jdk to generate tools that need to be run with the boot jdk.
-# Thus we force the target bytecode to the previous JDK version.
-# Add -Xlint:-options to avoid the warning about not setting -bootclasspath. Since
-# it's running on the boot jdk, the default bootclasspath is correct.
-$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \
-    JVM := $(JAVA_SMALL), \
-    JAVAC := $(NEW_JAVAC), \
-    FLAGS := $(BOOT_JDK_SOURCETARGET) -XDignore.symbol.file=true -XDstringConcat=inline \
-        $(JAVAC_WARNINGS) -Xlint:-options, \
-    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
-    SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
-
-# The generate new bytecode javac setup uses the new compiler to compile for the
-# new jdk. This new bytecode might only be possible to run using the new jvm.
-$(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \
-    JVM := $(JAVA_JAVAC), \
-    JAVAC := $(NEW_JAVAC), \
-    FLAGS := $(JDK_SOURCE_TARGET_FLAGS) --doclint-format html5 \
-        -encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS), \
-    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
-    SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
-
-# After the jdk is built, we want to build demos using only the recently
-# generated jdk classes and nothing else, no jdk source, etc etc.
-# I.e. the rt.jar, but since rt.jar has not yet been generated
-# (it will be in "make images") therefore we use classes instead.
-$(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \
-    JVM := $(JAVA_SMALL), \
-    JAVAC := $(NEW_JAVAC), \
-    FLAGS := --upgrade-module-path $(JDK_OUTPUTDIR)/modules --system none \
-        $(JAVAC_WARNINGS), \
-    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
-    SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
-
-# Use boot javac to generate JDK 8 compatible class files explicitly
-$(eval $(call SetupJavaCompiler,GENERATE_8_BYTECODE, \
-    JAVAC := $(JAVAC), \
-    FLAGS := \
-        $(JAVA_TOOL_FLAGS_SMALL) \
-        --release 8 \
-        -XDignore.symbol.file=true -g \
-        $(JAVAC_WARNINGS), \
-    DISABLE_SJAVAC := true, \
-))
-
-endif # _SETUP_GMK
--- a/make/common/modules/CopyCommon.gmk
+++ b/make/common/modules/CopyCommon.gmk
--- a/make/common/modules/GendataCommon.gmk
+++ b/make/common/modules/GendataCommon.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -24,7 +24,5 @@
 #

 include JavaCompilation.gmk
-include SetupJavaCompilers.gmk
-# We need the tools.
 include ToolsJdk.gmk

--- a/make/common/modules/GensrcCommonJdk.gmk
+++ b/make/common/modules/GensrcCommonJdk.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -31,6 +31,4 @@ include Execute.gmk
 include JavaCompilation.gmk
 include NativeCompilation.gmk
 include TextFileProcessing.gmk
-include SetupJavaCompilers.gmk
-# We need the tools.
 include ToolsJdk.gmk
--- a/make/common/modules/GensrcCommonLangtools.gmk
+++ b/make/common/modules/GensrcCommonLangtools.gmk
--- a/make/common/modules/GensrcModuleInfo.gmk
+++ b/make/common/modules/GensrcModuleInfo.gmk
--- a/make/common/modules/GensrcProperties.gmk
+++ b/make/common/modules/GensrcProperties.gmk
--- a/make/common/modules/LauncherCommon.gmk
+++ b/make/common/modules/LauncherCommon.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
--- a/make/common/modules/LibCommon.gmk
+++ b/make/common/modules/LibCommon.gmk
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@ -464,9 +464,12 @@ var getJibProfilesProfiles = function (input, common, data) {
            target_os: "linux",
            target_cpu: "aarch64",
            build_cpu: "x64",
-            dependencies: ["devkit", "build_devkit", "cups"],
+            dependencies: ["devkit", "build_devkit", "pandoc"],
            configure_args: [
                "--openjdk-target=aarch64-linux-gnu",
+		"--disable-jvm-feature-jvmci",
+		"--disable-jvm-feature-graal",
+		"--disable-jvm-feature-aot",
            ],
        },

@ -474,7 +477,7 @@ var getJibProfilesProfiles = function (input, common, data) {
            target_os: "linux",
            target_cpu: "arm",
            build_cpu: "x64",
-            dependencies: ["devkit", "build_devkit", "cups"],
+            dependencies: ["devkit", "build_devkit"],
            configure_args: [
                "--openjdk-target=arm-linux-gnueabihf", "--with-freetype=bundled",
                "--with-abi-profile=arm-vfp-hflt", "--disable-warnings-as-errors"
@ -485,7 +488,7 @@ var getJibProfilesProfiles = function (input, common, data) {
            target_os: "linux",
            target_cpu: "ppc64le",
            build_cpu: "x64",
-            dependencies: ["devkit", "build_devkit", "cups"],
+            dependencies: ["devkit", "build_devkit"],
            configure_args: [
                "--openjdk-target=ppc64le-linux-gnu", "--with-freetype=bundled",
                "--disable-warnings-as-errors"
@ -496,7 +499,7 @@ var getJibProfilesProfiles = function (input, common, data) {
            target_os: "linux",
            target_cpu: "s390x",
            build_cpu: "x64",
-            dependencies: ["devkit", "build_devkit", "cups"],
+            dependencies: ["devkit", "build_devkit"],
            configure_args: [
                "--openjdk-target=s390x-linux-gnu", "--with-freetype=bundled",
                "--disable-warnings-as-errors"
@ -984,7 +987,7 @@ var getJibProfilesDependencies = function (input, common) {
        solaris_x64: "SS12u4-Solaris11u1+1.0",
        solaris_sparcv9: "SS12u6-Solaris11u3+1.0",
        windows_x64: "VS2017-15.9.16+1.0",
-        linux_aarch64: "gcc8.3.0-OL7.6+1.0",
+        linux_aarch64: "gcc9.2.0-OL7.6+1.0",
        linux_arm: "gcc8.2.0-Fedora27+1.0",
        linux_ppc64le: "gcc8.2.0-Fedora27+1.0",
        linux_s390x: "gcc8.2.0-Fedora27+1.0"
@ -1019,7 +1022,7 @@ var getJibProfilesDependencies = function (input, common) {
            organization: common.organization,
            ext: "tar.gz",
            module: "jdk-linux_aarch64",
-            revision: "13+1.0",
+            revision: "14+1.0",
            configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
            environment_path: common.boot_jdk_home + "/bin"
        }
@ -1141,7 +1144,7 @@ var getJibProfilesDependencies = function (input, common) {
        pandoc: {
            organization: common.organization,
            ext: "tar.gz",
-            revision: "2.3.1+1.0",
+            revision: (input.build_cpu == 'aarch64' ? "2.5+1.0" : "2.3.1+1.0"),
            module: "pandoc-" + input.build_platform,
            configure_args: "PANDOC=" + input.get("pandoc", "install_path") + "/pandoc/pandoc",
            environment_path: input.get("pandoc", "install_path") + "/pandoc"
--- a/make/data/tzdata/VERSION
+++ b/make/data/tzdata/VERSION
@ -21,4 +21,4 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-tzdata2019c
+tzdata2020a
--- a/make/data/tzdata/africa
+++ b/make/data/tzdata/africa
@ -890,19 +890,25 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
 # Morocco will be on GMT starting from Sunday, May 5th 2019 at 3am.
 # The switch to GMT+1 will occur on Sunday, June 9th 2019 at 2am....
 # http://fr.le360.ma/societe/voici-la-date-du-retour-a-lheure-legale-au-maroc-188222
+
+# From Semlali Naoufal (2020-04-14):
+# Following the announcement by the Moroccan government, the switch to
+# GMT time will take place on Sunday, April 19, 2020 from 3 a.m. and
+# the return to GMT+1 time will take place on Sunday, May 31, 2020 at 2 a.m....
+# https://maroc-diplomatique.net/maroc-le-retour-a-lheure-gmt-est-prevu-dimanche-prochain/
+# http://aujourdhui.ma/actualite/gmt1-retour-a-lheure-normale-dimanche-prochain-1
 #
-# From Paul Eggert (2019-05-20):
-# This agrees with our 2018-11-01 guess that the Moroccan government
-# would continue the practice of falling back at 03:00 the last Sunday
-# before Ramadan, and of springing forward at 02:00 the first Sunday after
-# Ramadan, as this has been the practice since 2012.  To implement this,
-# transition dates for 2019 through 2087 were determined by running the
-# following program under GNU Emacs 26.2.
-# (let ((islamic-year 1440))
+# From Paul Eggert (2020-04-14):
+# For now, guess that in the future Morocco will fall back at 03:00
+# the last Sunday before Ramadan, and spring forward at 02:00 the
+# first Sunday after the day after Ramadan.  To implement this,
+# transition dates for 2021 through 2087 were determined by running
+# the following program under GNU Emacs 26.3.
+# (let ((islamic-year 1442))
 #   (require 'cal-islam)
 #   (while (< islamic-year 1511)
 #     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
-#           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
+#           (b (1+ (calendar-islamic-to-absolute (list 10 1 islamic-year))))
 #           (sunday 0))
 #       (while (/= sunday (mod (setq a (1- a)) 7)))
 #       (while (/= sunday (mod b 7))
@ -962,7 +968,7 @@ Rule	Morocco	2018	only	-	Jun	17	 2:00	1:00	-
 Rule	Morocco	2019	only	-	May	 5	 3:00	-1:00	-
 Rule	Morocco	2019	only	-	Jun	 9	 2:00	0	-
 Rule	Morocco	2020	only	-	Apr	19	 3:00	-1:00	-
-Rule	Morocco	2020	only	-	May	24	 2:00	0	-
+Rule	Morocco	2020	only	-	May	31	 2:00	0	-
 Rule	Morocco	2021	only	-	Apr	11	 3:00	-1:00	-
 Rule	Morocco	2021	only	-	May	16	 2:00	0	-
 Rule	Morocco	2022	only	-	Mar	27	 3:00	-1:00	-
@ -978,7 +984,7 @@ Rule	Morocco	2026	only	-	Mar	22	 2:00	0	-
 Rule	Morocco	2027	only	-	Feb	 7	 3:00	-1:00	-
 Rule	Morocco	2027	only	-	Mar	14	 2:00	0	-
 Rule	Morocco	2028	only	-	Jan	23	 3:00	-1:00	-
-Rule	Morocco	2028	only	-	Feb	27	 2:00	0	-
+Rule	Morocco	2028	only	-	Mar	 5	 2:00	0	-
 Rule	Morocco	2029	only	-	Jan	14	 3:00	-1:00	-
 Rule	Morocco	2029	only	-	Feb	18	 2:00	0	-
 Rule	Morocco	2029	only	-	Dec	30	 3:00	-1:00	-
@ -994,7 +1000,7 @@ Rule	Morocco	2033	only	-	Dec	25	 2:00	0	-
 Rule	Morocco	2034	only	-	Nov	 5	 3:00	-1:00	-
 Rule	Morocco	2034	only	-	Dec	17	 2:00	0	-
 Rule	Morocco	2035	only	-	Oct	28	 3:00	-1:00	-
-Rule	Morocco	2035	only	-	Dec	 2	 2:00	0	-
+Rule	Morocco	2035	only	-	Dec	 9	 2:00	0	-
 Rule	Morocco	2036	only	-	Oct	19	 3:00	-1:00	-
 Rule	Morocco	2036	only	-	Nov	23	 2:00	0	-
 Rule	Morocco	2037	only	-	Oct	 4	 3:00	-1:00	-
@ -1010,7 +1016,7 @@ Rule	Morocco	2041	only	-	Sep	29	 2:00	0	-
 Rule	Morocco	2042	only	-	Aug	10	 3:00	-1:00	-
 Rule	Morocco	2042	only	-	Sep	21	 2:00	0	-
 Rule	Morocco	2043	only	-	Aug	 2	 3:00	-1:00	-
-Rule	Morocco	2043	only	-	Sep	 6	 2:00	0	-
+Rule	Morocco	2043	only	-	Sep	13	 2:00	0	-
 Rule	Morocco	2044	only	-	Jul	24	 3:00	-1:00	-
 Rule	Morocco	2044	only	-	Aug	28	 2:00	0	-
 Rule	Morocco	2045	only	-	Jul	 9	 3:00	-1:00	-
@ -1026,7 +1032,7 @@ Rule	Morocco	2049	only	-	Jul	 4	 2:00	0	-
 Rule	Morocco	2050	only	-	May	15	 3:00	-1:00	-
 Rule	Morocco	2050	only	-	Jun	26	 2:00	0	-
 Rule	Morocco	2051	only	-	May	 7	 3:00	-1:00	-
-Rule	Morocco	2051	only	-	Jun	11	 2:00	0	-
+Rule	Morocco	2051	only	-	Jun	18	 2:00	0	-
 Rule	Morocco	2052	only	-	Apr	28	 3:00	-1:00	-
 Rule	Morocco	2052	only	-	Jun	 2	 2:00	0	-
 Rule	Morocco	2053	only	-	Apr	13	 3:00	-1:00	-
@ -1042,7 +1048,7 @@ Rule	Morocco	2057	only	-	Apr	 8	 2:00	0	-
 Rule	Morocco	2058	only	-	Feb	17	 3:00	-1:00	-
 Rule	Morocco	2058	only	-	Mar	31	 2:00	0	-
 Rule	Morocco	2059	only	-	Feb	 9	 3:00	-1:00	-
-Rule	Morocco	2059	only	-	Mar	16	 2:00	0	-
+Rule	Morocco	2059	only	-	Mar	23	 2:00	0	-
 Rule	Morocco	2060	only	-	Feb	 1	 3:00	-1:00	-
 Rule	Morocco	2060	only	-	Mar	 7	 2:00	0	-
 Rule	Morocco	2061	only	-	Jan	16	 3:00	-1:00	-
@ -1052,13 +1058,13 @@ Rule	Morocco	2062	only	-	Feb	12	 2:00	0	-
 Rule	Morocco	2062	only	-	Dec	31	 3:00	-1:00	-
 Rule	Morocco	2063	only	-	Feb	 4	 2:00	0	-
 Rule	Morocco	2063	only	-	Dec	16	 3:00	-1:00	-
-Rule	Morocco	2064	only	-	Jan	20	 2:00	0	-
+Rule	Morocco	2064	only	-	Jan	27	 2:00	0	-
 Rule	Morocco	2064	only	-	Dec	 7	 3:00	-1:00	-
 Rule	Morocco	2065	only	-	Jan	11	 2:00	0	-
 Rule	Morocco	2065	only	-	Nov	22	 3:00	-1:00	-
 Rule	Morocco	2066	only	-	Jan	 3	 2:00	0	-
 Rule	Morocco	2066	only	-	Nov	14	 3:00	-1:00	-
-Rule	Morocco	2066	only	-	Dec	19	 2:00	0	-
+Rule	Morocco	2066	only	-	Dec	26	 2:00	0	-
 Rule	Morocco	2067	only	-	Nov	 6	 3:00	-1:00	-
 Rule	Morocco	2067	only	-	Dec	11	 2:00	0	-
 Rule	Morocco	2068	only	-	Oct	21	 3:00	-1:00	-
@ -1068,13 +1074,13 @@ Rule	Morocco	2069	only	-	Nov	17	 2:00	0	-
 Rule	Morocco	2070	only	-	Oct	 5	 3:00	-1:00	-
 Rule	Morocco	2070	only	-	Nov	 9	 2:00	0	-
 Rule	Morocco	2071	only	-	Sep	20	 3:00	-1:00	-
-Rule	Morocco	2071	only	-	Oct	25	 2:00	0	-
+Rule	Morocco	2071	only	-	Nov	 1	 2:00	0	-
 Rule	Morocco	2072	only	-	Sep	11	 3:00	-1:00	-
 Rule	Morocco	2072	only	-	Oct	16	 2:00	0	-
 Rule	Morocco	2073	only	-	Aug	27	 3:00	-1:00	-
 Rule	Morocco	2073	only	-	Oct	 8	 2:00	0	-
 Rule	Morocco	2074	only	-	Aug	19	 3:00	-1:00	-
-Rule	Morocco	2074	only	-	Sep	23	 2:00	0	-
+Rule	Morocco	2074	only	-	Sep	30	 2:00	0	-
 Rule	Morocco	2075	only	-	Aug	11	 3:00	-1:00	-
 Rule	Morocco	2075	only	-	Sep	15	 2:00	0	-
 Rule	Morocco	2076	only	-	Jul	26	 3:00	-1:00	-
@ -1084,7 +1090,7 @@ Rule	Morocco	2077	only	-	Aug	22	 2:00	0	-
 Rule	Morocco	2078	only	-	Jul	10	 3:00	-1:00	-
 Rule	Morocco	2078	only	-	Aug	14	 2:00	0	-
 Rule	Morocco	2079	only	-	Jun	25	 3:00	-1:00	-
-Rule	Morocco	2079	only	-	Jul	30	 2:00	0	-
+Rule	Morocco	2079	only	-	Aug	 6	 2:00	0	-
 Rule	Morocco	2080	only	-	Jun	16	 3:00	-1:00	-
 Rule	Morocco	2080	only	-	Jul	21	 2:00	0	-
 Rule	Morocco	2081	only	-	Jun	 1	 3:00	-1:00	-
@ -1100,7 +1106,7 @@ Rule	Morocco	2085	only	-	May	27	 2:00	0	-
 Rule	Morocco	2086	only	-	Apr	14	 3:00	-1:00	-
 Rule	Morocco	2086	only	-	May	19	 2:00	0	-
 Rule	Morocco	2087	only	-	Mar	30	 3:00	-1:00	-
-Rule	Morocco	2087	only	-	May	 4	 2:00	0	-
+Rule	Morocco	2087	only	-	May	11	 2:00	0	-
 # For dates after the somewhat-arbitrary cutoff of 2087, assume that
 # Morocco will no longer observe DST.  At some point this table will
 # need to be extended, though quite possibly Morocco will change the
@ -1202,7 +1208,7 @@ Link Africa/Maputo Africa/Lusaka	# Zambia
 Rule	Namibia	1994	only	-	Mar	21	0:00	-1:00	WAT
 Rule	Namibia	1994	2017	-	Sep	Sun>=1	2:00	0	CAT
 Rule	Namibia	1995	2017	-	Apr	Sun>=1	2:00	-1:00	WAT
-# Rearguard section, for parsers that do not support negative DST.
+# Rearguard section, for parsers lacking negative DST; see ziguard.awk.
 #Rule	Namibia	1994	only	-	Mar	21	0:00	0	WAT
 #Rule	Namibia	1994	2017	-	Sep	Sun>=1	2:00	1:00	CAT
 #Rule	Namibia	1995	2017	-	Apr	Sun>=1	2:00	0	WAT
@ -1216,7 +1222,7 @@ Zone	Africa/Windhoek	1:08:24 -	LMT	1892 Feb 8
 			2:00	-	SAST	1990 Mar 21 # independence
 # Vanguard section, for zic and other parsers that support negative DST.
 			2:00	Namibia	%s
-# Rearguard section, for parsers that do not support negative DST.
+# Rearguard section, for parsers lacking negative DST; see ziguard.awk.
 #			2:00	-	CAT	1994 Mar 21  0:00
 # From Paul Eggert (2017-04-07):
 # The official date of the 2017 rule change was 2017-10-24.  See:
--- a/make/data/tzdata/asia
+++ b/make/data/tzdata/asia
@ -309,6 +309,27 @@ Zone	Asia/Yangon	6:24:47 -	LMT	1880        # or Rangoon

 # China

+# From Phake Nick (2020-04-15):
+# According to this news report:
+# http://news.sina.com.cn/c/2004-09-01/19524201403.shtml
+# on April 11, 1919, newspaper in Shanghai said clocks in Shanghai will spring
+# forward for an hour starting from midnight of that Saturday. The report did
+# not mention what happened in Shanghai thereafter, but it mentioned that a
+# similar trial in Tianjin which ended at October 1st as citizens are told to
+# recede the clock on September 30 from 12:00pm to 11:00pm. The trial at
+# Tianjin got terminated in 1920.
+#
+# From Paul Eggert (2020-04-15):
+# The Returns of Trade and Trade Reports, page 711, says "Daylight saving was
+# given a trial during the year, and from the 12th April to the 1st October
+# the clocks were all set one hour ahead of sun time.  Though the scheme was
+# generally esteemed a success, it was announced early in 1920 that it would
+# not be repeated."
+#
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Shang	1919	only	-	Apr	12	24:00	1:00	D
+Rule	Shang	1919	only	-	Sep	30	24:00	0	S
+
 # From Paul Eggert (2018-10-02):
 # The following comes from Table 1 of:
 # Li Yu. Research on the daylight saving movement in 1940s Shanghai.
@ -317,6 +338,89 @@ Zone	Asia/Yangon	6:24:47 -	LMT	1880        # or Rangoon
 # The table lists dates only; I am guessing 00:00 and 24:00 transition times.
 # Also, the table lists the planned end of DST in 1949, but the corresponding
 # zone line cuts this off on May 28, when the Communists took power.
+
+# From Phake Nick (2020-04-15):
+#
+# For the history of time in Shanghai between 1940-1942, the situation is
+# actually slightly more complex than the table [below]....  At the time,
+# there were three different authorities in Shanghai, including Shanghai
+# International Settlement, a settlement established by western countries with
+# its own westernized form of government, Shanghai French Concession, similar
+# to the international settlement but is controlled by French, and then the
+# rest of the city of Shanghai, which have already been controlled by Japanese
+# force through a puppet local government (Wang Jingwei regime).  It was
+# additionally complicated by the circumstances that, according to the 1940s
+# Shanghai summer time essay cited in the database, some
+# departments/businesses/people in the Shanghai city itself during that time
+# period, refused to change their clock and instead only changed their opening
+# hours.
+#
+# For example, as quoted in the article, in 1940, other than the authority
+# itself, power, tram, bus companies, cinema, department stores, and other
+# public service organizations have all decided to follow the summer time and
+# spring forward the clock.  On the other hand, the custom office refused to
+# spring forward the clock because of worry on mechanical wear to the physical
+# clock, postal office refused to spring forward because of disruption to
+# business and log-keeping, although they did changed their office hour to
+# match rest of the city.  So is travel agents, and also weather
+# observatory.  It is said both time standards had their own supporters in the
+# city at the time, those who prefer new time standard would have moved their
+# clock while those who prefer the old time standard would keep their clock
+# unchange, and there were different clocks that use different time standard
+# in the city at the time for people who use different time standard to adjust
+# their clock to their preferred time.
+#
+# a. For the 1940 May 31 spring forward, the essay claim that it was
+# coordinared between the international settlement authority and the French
+# concession authority and have gathered support from Hong Kong and Xiamen,
+# that it would spring forward an hour from May 31 "midnight", and the essay
+# claim "Hong Kong government implemented the spring forward in the same time
+# on the same date as Shanghai".
+#
+# b. For the 1940 fall back, it was said that they initially intended to do
+# so on September 30 00:59 at night, however they postponed it to October 12
+# after discussion with relevant parties. However schools restored to the
+# original schedule ten days earlier.
+#
+# c. For the 1941 spring forward, it is said to start from March 15
+# "following the previous year's method", and in addition to that the essay
+# cited an announcement in 1941 from the Wang regime which said the Special
+# City of Shanghai under Wang regime control will follow the DST rule set by
+# the Settlements, irrespective of the original DST plan announced by the Wang
+# regime for other area under its control(April 1 to September 30). (no idea
+# to situation before that announcement)
+#
+# d. For the 1941 fall back, it was said that the fall back would occurs at
+# the end of September (A newspaper headline cited by the essay, published on
+# October 1, 1941, have the headlines which said "French Concession would
+# rewind to the old clock this morning), but it ultimately didn't happen due
+# to disagreement between the international settlement authority and the
+# French concession authority, and the fall back ultimately occurred on
+# November 1.
+#
+# e. In 1941 December, Japan have officially started war with the United
+# States and the United Kingdom, and in Shanghai they have marched into the
+# international settlement, taken over its control
+#
+# f. For the 1942 spring forward, the essay said that the spring forward
+# started on January 31. It said this time the custom office and postal
+# department will also change their clocks, unlike before.
+#
+# g. The essay itself didn't cover any specific changes thereafter until the
+# end of the war, it quoted a November 1942 command from the government of the
+# Wang regime, which claim the daylight saving time applies year round during
+# the war. However, the essay ambiguously said the period is "February 1 to
+# September 30", which I don't really understand what is the meaning of such
+# period in the context of year round implementation here.. More researches
+# might be needed to show exactly what happened during that period of time.
+
+# From Phake Nick (2020-04-15):
+# According to a Japanese tour bus pamphlet in Nanjing area believed to be
+# from around year 1941: http://www.tt-museum.jp/tairiku_0280_nan1941.html ,
+# the schedule listed was in the format of Japanese time.  Which indicate some
+# use of the Japanese time (instead of syncing by DST) might have occurred in
+# the Yangtze river delta area during that period of time although the scope
+# of such use will need to be investigated to determine.
 #
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Shang	1940	only	-	Jun	 1	 0:00	1:00	D
@ -595,7 +699,7 @@ Zone	Asia/Urumqi	5:50:20	-	LMT	1928
 			6:00	-	+06


-# Hong Kong (Xianggang)
+# Hong Kong

 # Milne gives 7:36:41.7; round this.

@ -605,9 +709,7 @@ Zone	Asia/Urumqi	5:50:20	-	LMT	1928
 # it is not [an] observatory, but the official meteorological agency of HK,
 # and also serves as the official timing agency), there are some missing
 # and incorrect rules. Although the exact switch over time is missing, I
-# think 3:30 is correct. The official DST record for Hong Kong can be
-# obtained from
-# http://www.hko.gov.hk/gts/time/Summertime.htm
+# think 3:30 is correct.

 # From Phake Nick (2018-10-27):
 # According to Singaporean newspaper
@ -718,10 +820,10 @@ Zone	Asia/Urumqi	5:50:20	-	LMT	1928
 #   Resolution of the Legislative Council passed on 9 May 1979
 #	https://www.legco.gov.hk/yr78-79/english/lc_sitg/hansard/h790509.pdf#page=39

-# From Paul Eggert (2019-05-31):
+# From Paul Eggert (2020-04-15):
 # Here are the dates given at
-# https://www.hko.gov.hk/gts/time/Summertime.htm
-# as of 2014-06-19:
+# https://www.hko.gov.hk/en/gts/time/Summertime.htm
+# as of 2020-02-10:
 # Year        Period
 # 1941        15 Jun to 30 Sep
 # 1942        Whole year
@ -1851,6 +1953,47 @@ Zone	Asia/Jerusalem	2:20:54 -	LMT	1880

 # '9:00' and 'JST' is from Guy Harris.

+# From Paul Eggert (2020-01-19):
+# Starting in the 7th century, Japan generally followed an ancient Chinese
+# timekeeping system that divided night and day into six hours each,
+# with hour length depending on season.  In 1873 the government
+# started requiring the use of a Western style 24-hour clock.  See:
+# Yulia Frumer, "Making Time: Astronomical Time Measurement in Tokugawa Japan"
+# <https://www.worldcat.org/oclc/1043907065>.  As the tzdb code and
+# data support only 24-hour clocks, its tables model timestamps before
+# 1873 using Western-style local mean time.
+
+# From Hideyuki Suzuki (1998-11-09):
+# 'Tokyo' usually stands for the former location of Tokyo Astronomical
+# Observatory: 139° 44' 40.90" E (9h 18m 58.727s), 35° 39' 16.0" N.
+# This data is from 'Rika Nenpyou (Chronological Scientific Tables) 1996'
+# edited by National Astronomical Observatory of Japan....
+# JST (Japan Standard Time) has been used since 1888-01-01 00:00 (JST).
+# The law is enacted on 1886-07-07.
+
+# From Hideyuki Suzuki (1998-11-16):
+# The ordinance No. 51 (1886) established "standard time" in Japan,
+# which stands for the time on 135° E.
+# In the ordinance No. 167 (1895), "standard time" was renamed to "central
+# standard time".  And the same ordinance also established "western standard
+# time", which stands for the time on 120° E....  But "western standard
+# time" was abolished in the ordinance No. 529 (1937).  In the ordinance No.
+# 167, there is no mention regarding for what place western standard time is
+# standard....
+#
+# I wrote "ordinance" above, but I don't know how to translate.
+# In Japanese it's "chokurei", which means ordinance from emperor.
+
+# From Yu-Cheng Chuang (2013-07-12):
+# ...the Meiji Emperor announced Ordinance No. 167 of Meiji Year 28 "The clause
+# about standard time" ... The adoption began from Jan 1, 1896.
+# https://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時)
+#
+# ...the Showa Emperor announced Ordinance No. 529 of Showa Year 12 ... which
+# means the whole Japan territory, including later occupations, adopt Japan
+# Central Time (UT+9). The adoption began on Oct 1, 1937.
+# https://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
+
 # From Paul Eggert (1995-03-06):
 # Today's _Asahi Evening News_ (page 4) reports that Japan had
 # daylight saving between 1948 and 1951, but "the system was discontinued
@ -1899,37 +2042,6 @@ Rule	Japan	1948	1951	-	Sep	Sat>=8	25:00	0	S
 Rule	Japan	1949	only	-	Apr	Sat>=1	24:00	1:00	D
 Rule	Japan	1950	1951	-	May	Sat>=1	24:00	1:00	D

-# From Hideyuki Suzuki (1998-11-09):
-# 'Tokyo' usually stands for the former location of Tokyo Astronomical
-# Observatory: 139° 44' 40.90" E (9h 18m 58.727s), 35° 39' 16.0" N.
-# This data is from 'Rika Nenpyou (Chronological Scientific Tables) 1996'
-# edited by National Astronomical Observatory of Japan....
-# JST (Japan Standard Time) has been used since 1888-01-01 00:00 (JST).
-# The law is enacted on 1886-07-07.
-
-# From Hideyuki Suzuki (1998-11-16):
-# The ordinance No. 51 (1886) established "standard time" in Japan,
-# which stands for the time on 135° E.
-# In the ordinance No. 167 (1895), "standard time" was renamed to "central
-# standard time".  And the same ordinance also established "western standard
-# time", which stands for the time on 120° E....  But "western standard
-# time" was abolished in the ordinance No. 529 (1937).  In the ordinance No.
-# 167, there is no mention regarding for what place western standard time is
-# standard....
-#
-# I wrote "ordinance" above, but I don't know how to translate.
-# In Japanese it's "chokurei", which means ordinance from emperor.
-
-# From Yu-Cheng Chuang (2013-07-12):
-# ...the Meiji Emperor announced Ordinance No. 167 of Meiji Year 28 "The clause
-# about standard time" ... The adoption began from Jan 1, 1896.
-# https://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時)
-#
-# ...the Showa Emperor announced Ordinance No. 529 of Showa Year 12 ... which
-# means the whole Japan territory, including later occupations, adopt Japan
-# Central Time (UT+9). The adoption began on Oct 1, 1937.
-# https://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
-
 # Zone	NAME		STDOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tokyo	9:18:59	-	LMT	1887 Dec 31 15:00u
 			9:00	Japan	J%sT
@ -3109,22 +3221,9 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # [T]he Palestinian cabinet decision (Mar 8th 2016) published on
 # http://www.palestinecabinet.gov.ps/WebSite/Upload/Decree/GOV_17/16032016134830.pdf
 # states that summer time will end on Oct 29th at 01:00.
-#
-# From Tim Parenti (2016-10-19):
-# Predict fall transitions on October's last Saturday at 01:00 from now on.
-# This is consistent with the 2016 transition as well as our spring
-# predictions.
-#
-# From Paul Eggert (2016-10-19):
-# It's also consistent with predictions in the following URLs today:
-# https://www.timeanddate.com/time/change/gaza-strip/gaza
-# https://www.timeanddate.com/time/change/west-bank/hebron

 # From Sharef Mustafa (2018-03-16):
-# Palestine summer time will start on Mar 24th 2018 by advancing the
-# clock by 60 minutes as per Palestinian cabinet decision published on
-# the official website, though the decree did not specify the exact
-# time of the time shift.
+# Palestine summer time will start on Mar 24th 2018 ...
 # http://www.palestinecabinet.gov.ps/Website/AR/NDecrees/ViewFile.ashx?ID=e7a42ab7-ee23-435a-b9c8-a4f7e81f3817

 # From Even Scharning (2019-03-23):
@ -3134,15 +3233,20 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # From Sharif Mustafa (2019-03-26):
 # The Palestinian cabinet announced today that the switch to DST will
 # be on Fri Mar 29th 2019 by advancing the clock by 60 minutes.
-# The decree signing date is Mar 12th but it was not published till today.
-# The decree does not specify the exact time of switch.
 # http://palestinecabinet.gov.ps/Website/AR/NDecrees/ViewFile.ashx?ID=e54e9ea1-50ee-4137-84df-0d6c78da259b
 #
 # From Even Scharning (2019-04-10):
 # Our source in Palestine said it happened Friday 29 at 00:00 local time....
+
+# From Sharef Mustafa (2019-10-18):
+# Palestine summer time will end on midnight Oct 26th 2019 ...
+# http://www.palestinecabinet.gov.ps/website/ar/ViewDetails?ID=43948
 #
 # From Paul Eggert (2019-04-10):
 # For now, guess spring-ahead transitions are March's last Friday at 00:00.
+#
+# From Tim Parenti (2016-10-19):
+# Predict fall transitions on October's last Saturday at 01:00 from now on.

 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
--- a/make/data/tzdata/backward
+++ b/make/data/tzdata/backward
@ -40,6 +40,7 @@ Link	America/Atikokan	America/Coral_Harbour
 Link	America/Argentina/Cordoba	America/Cordoba
 Link	America/Tijuana		America/Ensenada
 Link	America/Indiana/Indianapolis	America/Fort_Wayne
+Link	America/Nuuk		America/Godthab
 Link	America/Indiana/Indianapolis	America/Indianapolis
 Link	America/Argentina/Jujuy	America/Jujuy
 Link	America/Indiana/Knox	America/Knox_IN
--- a/make/data/tzdata/europe
+++ b/make/data/tzdata/europe
@ -572,12 +572,13 @@ Zone	Europe/Dublin	-0:25:00 -	LMT	1880 Aug  2
 			 0:00	1:00	IST	1947 Nov  2  2:00s
 			 0:00	-	GMT	1948 Apr 18  2:00s
 			 0:00	GB-Eire	GMT/IST	1968 Oct 27
-# The next line is for when negative SAVE values are used.
+# Vanguard section, for zic and other parsers that support negative DST.
 			 1:00	Eire	IST/GMT
-# These three lines are for when SAVE values are always nonnegative.
+# Rearguard section, for parsers lacking negative DST; see ziguard.awk.
 #			 1:00	-	IST	1971 Oct 31  2:00u
 #			 0:00	GB-Eire	GMT/IST	1996
 #			 0:00	EU	GMT/IST
+# End of rearguard section.


 ###############################################################################
@ -1041,7 +1042,7 @@ Zone	Europe/Prague	0:57:44 -	LMT	1850
 			1:00	Czech	CE%sT	1946 Dec  1  3:00
 # Vanguard section, for zic and other parsers that support negative DST.
 			1:00	-1:00	GMT	1947 Feb 23  2:00
-# Rearguard section, for parsers that do not support negative DST.
+# Rearguard section, for parsers lacking negative DST; see ziguard.awk.
 #			0:00	-	GMT	1947 Feb 23  2:00
 # End of rearguard section.
 			1:00	Czech	CE%sT	1979
@ -1198,14 +1199,17 @@ Zone America/Danmarkshavn -1:14:40 -	LMT	1916 Jul 28
 			-3:00	-	-03	1980 Apr  6  2:00
 			-3:00	EU	-03/-02	1996
 			0:00	-	GMT
+#
+# Use the old name Scoresbysund, as the current name Ittoqqortoormiit
+# exceeds tzdb's 14-letter limit and has no common English abbreviation.
 Zone America/Scoresbysund -1:27:52 -	LMT	1916 Jul 28 # Ittoqqortoormiit
 			-2:00	-	-02	1980 Apr  6  2:00
 			-2:00	C-Eur	-02/-01	1981 Mar 29
 			-1:00	EU	-01/+00
-Zone America/Godthab	-3:26:56 -	LMT	1916 Jul 28 # Nuuk
+Zone America/Nuuk	-3:26:56 -	LMT	1916 Jul 28 # Godthåb
 			-3:00	-	-03	1980 Apr  6  2:00
 			-3:00	EU	-03/-02
-Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pituffik air base
+Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pituffik
 			-4:00	Thule	A%sT

 # Estonia
@ -1575,7 +1579,7 @@ Zone	Europe/Budapest	1:16:20 -	LMT	1890 Oct
 #
 # From January 1st, 1908 the whole of Iceland was standardised at 1 hour
 # behind GMT. Previously, local mean solar time was used in different parts
-# of Iceland, the almanak had been based on Reykjavik mean solar time which
+# of Iceland, the almanak had been based on Reykjavík mean solar time which
 # was 1 hour and 28 minutes behind GMT.
 #
 # "first day of winter" referred to [below] means the first day of the 26 weeks
--- a/make/data/tzdata/leapseconds
+++ b/make/data/tzdata/leapseconds
@ -87,9 +87,15 @@ Leap	2012	Jun	30	23:59:60	+	S
 Leap	2015	Jun	30	23:59:60	+	S
 Leap	2016	Dec	31	23:59:60	+	S

+# UTC timestamp when this leap second list expires.
+# Any additional leap seconds will come after this.
+# This Expires line is commented out for now,
+# so that pre-2020a zic implementations do not reject this file.
+#Expires 2020	Dec	28	00:00:00
+
 # POSIX timestamps for the data in this file:
 #updated 1467936000 (2016-07-08 00:00:00 UTC)
-#expires 1593302400 (2020-06-28 00:00:00 UTC)
+#expires 1609113600 (2020-12-28 00:00:00 UTC)

-#	Updated through IERS Bulletin C58
-#	File expires on:  28 June 2020
+#	Updated through IERS Bulletin C59
+#	File expires on:  28 December 2020
--- a/make/data/tzdata/northamerica
+++ b/make/data/tzdata/northamerica
@ -109,7 +109,7 @@
 # For more about the first ten years of DST in the United States, see
 # Robert Garland, Ten years of daylight saving from the Pittsburgh standpoint
 # (Carnegie Library of Pittsburgh, 1927).
-# http://www.clpgh.org/exhibit/dst.html
+# https://web.archive.org/web/20160517155308/http://www.clpgh.org/exhibit/dst.html
 #
 # Shanks says that DST was called "War Time" in the US in 1918 and 1919.
 # However, DST was imposed by the Standard Time Act of 1918, which
@ -1493,7 +1493,8 @@ Zone America/Goose_Bay	-4:01:40 -	LMT	1884 # Happy Valley-Goose Bay
 			-4:00	Canada	A%sT


-# west Labrador, Nova Scotia, Prince Edward I
+# west Labrador, Nova Scotia, Prince Edward I,
+# Îles-de-la-Madeleine, Listuguj reserve

 # From Brian Inglis (2015-07-20):
 # From the historical weather station records available at:
@ -1512,6 +1513,13 @@ Zone America/Goose_Bay	-4:01:40 -	LMT	1884 # Happy Valley-Goose Bay
 # in Canada to observe DST in 1971 but not 1970; for now we'll assume
 # this is a typo.

+# From Jeffery Nichols (2020-01-09):
+# America/Halifax ... also applies to Îles-de-la-Madeleine and the Listuguj
+# reserve in Quebec. Officially, this came into effect on January 1, 2007
+# (Legal Time Act, CQLR c T-5.1), but the legislative debates surrounding that
+# bill say that it is "accommodating the customs and practices" of those
+# regions, which suggests that they have always been in-line with Halifax.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Halifax	1916	only	-	Apr	 1	0:00	1:00	D
 Rule	Halifax	1916	only	-	Oct	 1	0:00	0	S
@ -1605,19 +1613,20 @@ Zone America/Moncton	-4:19:08 -	LMT	1883 Dec  9

 # Quebec

-# From Paul Eggert (2015-03-24):
+# From Paul Eggert (2020-01-10):
 # See America/Toronto for most of Quebec, including Montreal.
+# See America/Halifax for the Îles de la Madeleine and the Listuguj reserve.
 #
 # Matthews and Vincent (1998) also write that Quebec east of the -63
 # meridian is supposed to observe AST, but residents as far east as
 # Natashquan use EST/EDT, and residents east of Natashquan use AST.
 # The Quebec department of justice writes in
 # "The situation in Minganie and Basse-Côte-Nord"
-# http://www.justice.gouv.qc.ca/english/publications/generale/temps-minganie-a.htm
+# https://www.justice.gouv.qc.ca/en/department/ministre/functions-and-responsabilities/legal-time-in-quebec/the-situation-in-minganie-and-basse-cote-nord/
 # that the coastal strip from just east of Natashquan to Blanc-Sablon
 # observes Atlantic standard time all year round.
-# https://www.assnat.qc.ca/Media/Process.aspx?MediaId=ANQ.Vigie.Bll.DocumentGenerique_8845en
-# says this common practice was codified into law as of 2007.
+# This common practice was codified into law as of 2007; see Legal Time Act,
+# CQLR c T-5.1 <http://legisquebec.gouv.qc.ca/en/ShowDoc/cs/T-5.1>.
 # For lack of better info, guess this practice began around 1970, contra to
 # Shanks & Pottenger who have this region observing AST/ADT.

@ -1636,6 +1645,15 @@ Zone America/Blanc-Sablon -3:48:28 -	LMT	1884
 # Nipigon (EST) and Rainy River (CST) are the largest that we know of.
 # Far west Ontario is like Winnipeg; far east Quebec is like Halifax.

+# From Jeffery Nichols (2020-02-06):
+# According to the [Shanks] atlas, those western Ontario zones are huge,
+# covering most of Ontario northwest of Sault Ste Marie and Timmins.
+# The zones seem to include towns bigger than the ones they're named after,
+# like Dryden in America/Rainy_River and Wawa (and maybe Attawapiskat) in
+# America/Nipigon.  I assume it's too much trouble to change the name of the
+# zone (like when you found out that America/Glace_Bay includes Sydney, Nova
+# Scotia)....
+
 # From Mark Brader (2003-07-26):
 # [According to the Toronto Star] Orillia, Ontario, adopted DST
 # effective Saturday, 1912-06-22, 22:00; the article mentions that
@ -2442,6 +2460,18 @@ Zone America/Creston	-7:46:04 -	LMT	1884
 # obtained in November 2008 should be ignored...
 # I apologize for reporting incorrect information in 2008.

+# From Tim Parenti (2020-03-05):
+# The government of Yukon announced [yesterday] the cessation of seasonal time
+# changes.  "After clocks are pushed ahead one hour on March 8, the territory
+# will remain on [UTC-07].  ... [The government] found 93 per cent of
+# respondents wanted to end seasonal time changes and, of that group, 70 per
+# cent wanted 'permanent Pacific Daylight Saving Time.'"
+# https://www.cbc.ca/news/canada/north/yukon-end-daylight-saving-time-1.5486358
+#
+# Although the government press release prefers PDT, we prefer MST for
+# consistency with nearby Dawson Creek, Creston, and Fort Nelson.
+# https://yukon.ca/en/news/yukon-end-seasonal-time-change
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	NT_YK	1918	only	-	Apr	14	2:00	1:00	D
 Rule	NT_YK	1918	only	-	Oct	27	2:00	0	S
@ -2496,11 +2526,13 @@ Zone America/Inuvik	0	-	-00	1953 # Inuvik founded
 Zone America/Whitehorse	-9:00:12 -	LMT	1900 Aug 20
 			-9:00	NT_YK	Y%sT	1967 May 28  0:00
 			-8:00	NT_YK	P%sT	1980
-			-8:00	Canada	P%sT
+			-8:00	Canada	P%sT	2020 Mar  8  2:00
+			-7:00	-	MST
 Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
 			-9:00	NT_YK	Y%sT	1973 Oct 28  0:00
 			-8:00	NT_YK	P%sT	1980
-			-8:00	Canada	P%sT
+			-8:00	Canada	P%sT	2020 Mar  8  2:00
+			-7:00	-	MST


 ###############################################################################
--- a/make/data/tzdata/zone.tab
+++ b/make/data/tzdata/zone.tab
@ -154,8 +154,8 @@ CA	+4906-11631	America/Creston	MST - BC (Creston)
 CA	+5946-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
 CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
 CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
-CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
-CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
+CA	+6043-13503	America/Whitehorse	Pacific - Yukon (east)
+CA	+6404-13925	America/Dawson	Pacific - Yukon (west)
 CC	-1210+09655	Indian/Cocos
 CD	-0418+01518	Africa/Kinshasa	Dem. Rep. of Congo (west)
 CD	-1140+02728	Africa/Lubumbashi	Dem. Rep. of Congo (east)
@ -212,7 +212,7 @@ GF	+0456-05220	America/Cayenne
 GG	+492717-0023210	Europe/Guernsey
 GH	+0533-00013	Africa/Accra
 GI	+3608-00521	Europe/Gibraltar
-GL	+6411-05144	America/Godthab	Greenland (most areas)
+GL	+6411-05144	America/Nuuk	Greenland (most areas)
 GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
 GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
 GL	+7634-06847	America/Thule	Thule/Pituffik
@ -358,7 +358,7 @@ RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
 # The obsolescent zone.tab format cannot represent Europe/Simferopol well.
 # Put it in RU section and list as UA.  See "territorial claims" above.
 # Programs should use zone1970.tab instead; see above.
-UA	+4457+03406	Europe/Simferopol	MSK+00 - Crimea
+UA	+4457+03406	Europe/Simferopol	Crimea
 RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
 RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
 RU	+4844+04425	Europe/Volgograd	MSK+01 - Volgograd
@ -422,8 +422,8 @@ TV	-0831+17913	Pacific/Funafuti
 TW	+2503+12130	Asia/Taipei
 TZ	-0648+03917	Africa/Dar_es_Salaam
 UA	+5026+03031	Europe/Kiev	Ukraine (most areas)
-UA	+4837+02218	Europe/Uzhgorod	Ruthenia
-UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east)
+UA	+4837+02218	Europe/Uzhgorod	Transcarpathia
+UA	+4750+03510	Europe/Zaporozhye	Zaporozhye and east Lugansk
 UG	+0019+03225	Africa/Kampala
 UM	+2813-17722	Pacific/Midway	Midway Islands
 UM	+1917+16637	Pacific/Wake	Wake Island
--- a/make/hotspot/gensrc/GensrcJfr.gmk
+++ b/make/hotspot/gensrc/GensrcJfr.gmk
@ -29,16 +29,9 @@
 JFR_TOOLS_SRCDIR := $(TOPDIR)/make/src/classes
 JFR_TOOLS_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/buildtools/tools_classes

-$(eval $(call SetupJavaCompiler, GENERATE_JFRBYTECODE, \
-    JAVAC := $(JAVAC), \
-    FLAGS := -Xlint:all -Werror, \
-    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
-    SERVER_JVM := $(SJAVAC_SERVER_JAVA), \
-    DISABLE_SJAVAC := true, \
-))
-
 $(eval $(call SetupJavaCompilation, BUILD_JFR_TOOLS, \
-    SETUP := GENERATE_JFRBYTECODE, \
+    COMPILER := bootjdk, \
+    SMALL_JAVA := false, \
    SRC := $(JFR_TOOLS_SRCDIR), \
    BIN := $(JFR_TOOLS_OUTPUTDIR), \
    DISABLED_WARNINGS := try, \
--- a/make/hotspot/gensrc/GensrcJvmti.gmk
+++ b/make/hotspot/gensrc/GensrcJvmti.gmk
@ -32,16 +32,9 @@ $(eval $(call IncludeCustomExtension, hotspot/gensrc/GensrcJvmti.gmk))
 JVMTI_TOOLS_SRCDIR := $(TOPDIR)/src/hotspot/share/prims
 JVMTI_TOOLS_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/tools/jvmti

-$(eval $(call SetupJavaCompiler, GENERATE_OLDBYTECODE, \
-    JAVAC := $(JAVAC), \
-    FLAGS := -Xlint:all -Werror, \
-    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
-    SERVER_JVM := $(SJAVAC_SERVER_JAVA), \
-    DISABLE_SJAVAC := true, \
-))
-
 $(eval $(call SetupJavaCompilation, BUILD_JVMTI_TOOLS, \
-    SETUP := GENERATE_OLDBYTECODE, \
+    COMPILER := bootjdk, \
+    SMALL_JAVA := false, \
    SRC := $(JVMTI_TOOLS_SRCDIR), \
    DISABLED_WARNINGS := rawtypes cast, \
    INCLUDE_FILES := jvmtiGen.java jvmtiEnvFill.java, \
--- a/make/hotspot/ide/CreateVSProject.gmk
+++ b/make/hotspot/ide/CreateVSProject.gmk
@ -29,7 +29,6 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 include JavaCompilation.gmk
-include SetupJavaCompilers.gmk
 include Execute.gmk

 ifeq ($(call isTargetOs, windows), true)
@ -97,10 +96,11 @@ ifeq ($(call isTargetOs, windows), true)
  TOOLS_OUTPUTDIR := $(HOTSPOT_OUTPUTDIR)/support/tools_classes

  $(eval $(call SetupJavaCompilation, BUILD_PROJECT_CREATOR, \
-      SETUP := GENERATE_OLDBYTECODE, \
-      DISABLED_WARNINGS := auxiliaryclass deprecation rawtypes unchecked cast, \
+      TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
+      DISABLED_WARNINGS := auxiliaryclass deprecation rawtypes unchecked cast options, \
      SRC := $(TOPDIR)/make/hotspot/src/classes, \
      BIN := $(TOOLS_OUTPUTDIR), \
+      JAVAC_FLAGS := -XDstringConcat=inline, \
  ))

  TARGETS += $(BUILD_PROJECT_CREATOR)
--- a/make/hotspot/lib/JvmFeatures.gmk
+++ b/make/hotspot/lib/JvmFeatures.gmk
@ -55,6 +55,10 @@ ifeq ($(call check-jvm-feature, zero), true)
  endif
 endif

+ifeq ($(JVM_VARIANT), custom)
+  JVM_CFLAGS_FEATURES += -DVMTYPE=\"Custom\"
+endif
+
 ifeq ($(call check-jvm-feature, minimal), true)
  JVM_CFLAGS_FEATURES += -DMINIMAL_JVM -DVMTYPE=\"Minimal\"
  ifeq ($(call isTargetOs, linux), true)
@ -151,8 +155,6 @@ endif
 ifneq ($(call check-jvm-feature, serialgc), true)
  JVM_CFLAGS_FEATURES += -DINCLUDE_SERIALGC=0
  JVM_EXCLUDE_PATTERNS += gc/serial
-  # If serial is disabled, we cannot use serial as OldGC in parallel
-  JVM_EXCLUDE_FILES += psMarkSweep.cpp psMarkSweepDecorator.cpp
 endif

 ifneq ($(call check-jvm-feature, epsilongc), true)
--- a/make/idea/build.xml
+++ b/make/idea/build.xml
@ -1,10 +1,9 @@
 <!-- importing.xml -->
 <project name="jdk">

-    <script language="javascript" classpath="${idea.dir}/classes">
-        var JdkLogger = Java.type("idea.JdkIdeaAntLogger");
-        new JdkLogger(project)
-    </script>
+    <taskdef name="wrapLogger" classname="idea.IdeaLoggerWrapper" classpath="${idea.dir}/classes"/>
+
+    <wrapLogger/>

    <macrodef name="call-make">
        <attribute name="dir"/>
--- a/make/idea/template/src/idea/IdeaLoggerWrapper.java
+++ b/make/idea/template/src/idea/IdeaLoggerWrapper.java
@ -0,0 +1,13 @@
+package idea;
+
+import org.apache.tools.ant.Task;
+
+/**
+ * This class implements a custom Ant task which replaces the standard Intellij IDEA Ant logger
+ * with a custom one which generates tighter output.
+ */
+public class IdeaLoggerWrapper extends Task {
+    public void execute() {
+        new JdkIdeaAntLogger(getProject());
+    }
+}
--- a/make/jdk/src/classes/build/tools/generatecharacter/GenerateCharacter.java
+++ b/make/jdk/src/classes/build/tools/generatecharacter/GenerateCharacter.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -700,7 +700,7 @@ OUTER:  for (int i = 0; i < n; i += m) {
        PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(theOutputFileName)));
        out.println(commentStart +
            " This file was generated AUTOMATICALLY from a template file " +
-            new java.util.Date() + commentEnd);
+            commentEnd);
        int marklen = commandMarker.length();
        LOOP: while(true) {
            try {
--- a/make/jdk/src/classes/build/tools/jigsaw/AddPackagesAttribute.java
+++ b/make/jdk/src/classes/build/tools/jigsaw/AddPackagesAttribute.java
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@ -34,6 +34,7 @@ import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
 import java.util.Optional;
 import java.util.Set;

@ -83,7 +84,10 @@ public class AddPackagesAttribute {
            bytes = baos.toByteArray();
        }

-        Files.write(mi, bytes);
+        byte[] currentBytes = Files.readAllBytes(mi);
+        if (!Arrays.equals(bytes, currentBytes)) {
+            Files.write(mi, bytes);
+        }
    }

 }
--- a/make/langtools/build.xml
+++ b/make/langtools/build.xml
@ -88,21 +88,11 @@
    <pathconvert pathsep="," property="src.module.dirs" refid="src.module.dirset"/>

    <pathconvert property="xpatch.rest" pathsep=" --patch-module=" refid="src.module.dirset">
-        <scriptmapper language="javascript">
-            fs = project.getProperty("file.separator");
-            path = project.getProperty("build.modules");
-            mod = source.substr(source.lastIndexOf(fs)+1);
-            self.addMappedName(mod + "=\"" + path + fs + mod + "\"");
-        </scriptmapper>
+        <regexpmapper from="^.*(/|\\)([^/\\]*)$" to='\2="${build.modules}\1\2"' />
    </pathconvert>

    <pathconvert property="xpatch.noquotes.rest" pathsep=" --patch-module=" refid="src.module.dirset">
-        <scriptmapper language="javascript">
-            fs = project.getProperty("file.separator");
-            path = project.getProperty("build.modules");
-            mod = source.substr(source.lastIndexOf(fs)+1);
-            self.addMappedName(mod + "=" + path + fs + mod);
-        </scriptmapper>
+        <regexpmapper from="^([^/\\]*)(/|\\).*" to="\1=${build.modules}\2\1" />
    </pathconvert>

    <property name="xpatch.cmd" value="--patch-module=${xpatch.rest}"/>
@ -212,14 +202,7 @@

    <target name="build-all-classes" depends="generate-sources">
        <pathconvert property="xpatch.src.rest" pathsep=" --patch-module=" refid="src.module.dirset">
-            <scriptmapper language="javascript">
-                fs = project.getProperty("file.separator");
-                path_src = project.getProperty("src.dir");
-                path_sep = project.getProperty("path.separator");
-                path_gensrc = project.getProperty("build.gensrc");
-                mod = source.substr(source.lastIndexOf(fs)+1);
-                self.addMappedName(mod + "=" + path_src + fs + mod + path_sep + path_gensrc + fs + mod);
-            </scriptmapper>
+            <regexpmapper from="^.*(/|\\)([^/\\]*)$" to="\2=${src.dir}\1\2/share/classes${path.separator}${build.gensrc}\1\2" />
        </pathconvert>
        <property name="xpatch.src.cmd" value="--patch-module=${xpatch.src.rest}"/>
        <pathconvert pathsep="," property="gensrc.module.dirs">
--- a/make/langtools/intellij/build.xml
+++ b/make/langtools/intellij/build.xml
@ -1,10 +1,9 @@
 <!-- importing.xml -->
 <project name="langtools" basedir = "../../..">

-    <script language="javascript" classpath=".idea/classes">
-        var LangtoolsLogger = Java.type("idea.LangtoolsIdeaAntLogger");
-        new LangtoolsLogger(project)
-    </script>
+    <taskdef name="wrapLogger" classname="idea.IdeaLoggerWrapper" classpath=".idea/classes"/>
+
+    <wrapLogger/>

    <import file="../build.xml"/>

--- a/make/langtools/intellij/template/src/idea/IdeaLoggerWrapper.java
+++ b/make/langtools/intellij/template/src/idea/IdeaLoggerWrapper.java
@ -0,0 +1,13 @@
+package idea;
+
+import org.apache.tools.ant.Task;
+
+/**
+ * This class implements a custom Ant task which replaces the standard Intellij IDEA Ant logger
+ * with a custom one which generates tighter output.
+ */
+public class IdeaLoggerWrapper extends Task {
+    public void execute() {
+        new LangtoolsIdeaAntLogger(getProject());
+    }
+}
--- a/make/modules/java.base/Copy.gmk
+++ b/make/modules/java.base/Copy.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -27,7 +27,8 @@ include CopyCommon.gmk
 include Modules.gmk
 include TextFileProcessing.gmk

-$(eval $(call IncludeCustomExtension, copy/Copy-java.base.gmk))
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, modules/java.base/Copy.gmk))

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

--- a/make/modules/java.base/Gendata.gmk
+++ b/make/modules/java.base/Gendata.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -25,18 +25,15 @@

 include GendataCommon.gmk

-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, gendata/Gendata-java.base.gmk))
+include gendata/GendataBreakIterator.gmk

-include GendataBreakIterator.gmk
+include gendata/GendataTZDB.gmk

-include GendataTZDB.gmk
+include gendata/GendataBlacklistedCerts.gmk

-include GendataBlacklistedCerts.gmk
+include gendata/GendataCryptoPolicy.gmk

-include GendataCryptoPolicy.gmk
-
-include GendataPublicSuffixList.gmk
+include gendata/GendataPublicSuffixList.gmk

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

--- a/make/modules/java.base/Gensrc.gmk
+++ b/make/modules/java.base/Gensrc.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -25,16 +25,16 @@

 include GensrcCommonJdk.gmk

-include GensrcLocaleData.gmk
-include GensrcCharacterData.gmk
-include GensrcMisc.gmk
-include GensrcCharsetMapping.gmk
-include GensrcCharsetCoder.gmk
-include GensrcBuffer.gmk
-include GensrcExceptions.gmk
-include GensrcVarHandles.gmk
-include GensrcModuleLoaderMap.gmk
-include GensrcEmojiData.gmk
+include gensrc/GensrcLocaleData.gmk
+include gensrc/GensrcCharacterData.gmk
+include gensrc/GensrcMisc.gmk
+include gensrc/GensrcCharsetMapping.gmk
+include gensrc/GensrcCharsetCoder.gmk
+include gensrc/GensrcBuffer.gmk
+include gensrc/GensrcExceptions.gmk
+include gensrc/GensrcVarHandles.gmk
+include gensrc/GensrcModuleLoaderMap.gmk
+include gensrc/GensrcEmojiData.gmk

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

--- a/make/launcher/Launcher-java.base.gmk
+++ b/make/launcher/Launcher-java.base.gmk
@ -25,7 +25,8 @@

 include LauncherCommon.gmk

-$(eval $(call IncludeCustomExtension, launcher/Launcher-java.base.gmk))
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, modules/java.base/Launcher.gmk))

 JAVA_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/launcher/java.rc

--- a/make/modules/java.base/Lib.gmk
+++ b/make/modules/java.base/Lib.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -26,7 +26,7 @@
 include LibCommon.gmk

 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, lib/Lib-java.base.gmk))
+$(eval $(call IncludeCustomExtension, modules/java.base/Lib.gmk))

 # Prepare the find cache.
 $(call FillFindCache, $(wildcard $(TOPDIR)/src/java.base/*/native))
@ -34,7 +34,7 @@ $(call FillFindCache, $(wildcard $(TOPDIR)/src/java.base/*/native))
 ################################################################################
 # Create all the core libraries

-include CoreLibraries.gmk
+include lib/CoreLibraries.gmk

 ################################################################################
 # Create the network library
--- a/make/modules/java.base/gendata/GendataBlacklistedCerts.gmk
+++ b/make/modules/java.base/gendata/GendataBlacklistedCerts.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -23,8 +23,6 @@
 # questions.
 #

-$(eval $(call IncludeCustomExtension, gendata/GendataBlacklistedCerts.gmk))
-
 GENDATA_BLACKLISTED_CERTS_SRC += $(TOPDIR)/make/data/blacklistedcertsconverter/blacklisted.certs.pem
 GENDATA_BLACKLISTED_CERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/security/blacklisted.certs

--- a/make/modules/java.base/gendata/GendataBreakIterator.gmk
+++ b/make/modules/java.base/gendata/GendataBreakIterator.gmk
@ -1,5 +1,5 @@

-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -44,21 +44,25 @@ TEXT_SOURCES := $(TEXT_PKG)/BreakIteratorRules.java \
 BREAK_ITERATOR_CLASSES := $(BUILDTOOLS_OUTPUTDIR)/break_iterator_classes

 # These two files should be moved out to a build tool!
-$(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR_BASE, \
-    SETUP := GENERATE_OLDBYTECODE, \
+$(eval $(call SetupJavaCompilation, BUILD_BREAKITERATOR_BASE, \
+    TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
    SRC := $(TOPDIR)/src/java.base/share/classes, \
    INCLUDE_FILES := \
        $(TEXT_PKG)/BreakIteratorRules.java \
        $(TEXT_PKG)/BreakIteratorInfo.java, \
-    BIN := $(BREAK_ITERATOR_CLASSES)/java.base))
+    BIN := $(BREAK_ITERATOR_CLASSES)/java.base, \
+    DISABLED_WARNINGS := options, \
+))

-$(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR_LD, \
-    SETUP := GENERATE_OLDBYTECODE, \
+$(eval $(call SetupJavaCompilation, BUILD_BREAKITERATOR_LD, \
+    TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
    SRC := $(TOPDIR)/src/jdk.localedata/share/classes, \
    INCLUDE_FILES := \
        $(TEXT_PKG_LD)/BreakIteratorRules_th.java \
        $(TEXT_PKG_LD)/BreakIteratorInfo_th.java, \
-    BIN := $(BREAK_ITERATOR_CLASSES)/jdk.localedata))
+    BIN := $(BREAK_ITERATOR_CLASSES)/jdk.localedata, \
+    DISABLED_WARNINGS := options, \
+))

 BREAK_ITERATOR_BOOTCLASSPATH := \
    --patch-module java.base=$(BREAK_ITERATOR_CLASSES)/java.base \
--- a/make/modules/java.base/gendata/GendataCryptoPolicy.gmk
+++ b/make/modules/java.base/gendata/GendataCryptoPolicy.gmk
--- a/make/modules/java.base/gendata/GendataPublicSuffixList.gmk
+++ b/make/modules/java.base/gendata/GendataPublicSuffixList.gmk
--- a/make/modules/java.base/gendata/GendataTZDB.gmk
+++ b/make/modules/java.base/gendata/GendataTZDB.gmk
--- a/make/modules/java.base/gensrc/GensrcBuffer.gmk
+++ b/make/modules/java.base/gensrc/GensrcBuffer.gmk
--- a/make/modules/java.base/gensrc/GensrcCharacterData.gmk
+++ b/make/modules/java.base/gensrc/GensrcCharacterData.gmk
--- a/make/modules/java.base/gensrc/GensrcCharsetCoder.gmk
+++ b/make/modules/java.base/gensrc/GensrcCharsetCoder.gmk
--- a/make/modules/java.base/gensrc/GensrcCharsetMapping.gmk
+++ b/make/modules/java.base/gensrc/GensrcCharsetMapping.gmk
--- a/make/modules/java.base/gensrc/GensrcEmojiData.gmk
+++ b/make/modules/java.base/gensrc/GensrcEmojiData.gmk
--- a/make/modules/java.base/gensrc/GensrcExceptions.gmk
+++ b/make/modules/java.base/gensrc/GensrcExceptions.gmk
--- a/make/modules/java.base/gensrc/GensrcLocaleData.gmk
+++ b/make/modules/java.base/gensrc/GensrcLocaleData.gmk
--- a/make/modules/java.base/gensrc/GensrcMisc.gmk
+++ b/make/modules/java.base/gensrc/GensrcMisc.gmk
--- a/make/modules/java.base/gensrc/GensrcModuleLoaderMap.gmk
+++ b/make/modules/java.base/gensrc/GensrcModuleLoaderMap.gmk
--- a/make/modules/java.base/gensrc/GensrcVarHandles.gmk
+++ b/make/modules/java.base/gensrc/GensrcVarHandles.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -277,6 +277,3 @@ $(foreach t, $(VARHANDLES_MEMORY_ADDRESS_TYPES), \
  $(eval $(call GenerateVarHandleMemoryAddress,VAR_HANDLE_MEMORY_ADDRESS_$t,$t)))

 GENSRC_JAVA_BASE += $(GENSRC_VARHANDLES)
-
-# Include custom extension post hook
-$(eval $(call IncludeCustomExtension, gensrc/GensrcVarHandles-post.gmk))
--- a/make/modules/java.base/lib/CoreLibraries.gmk
+++ b/make/modules/java.base/lib/CoreLibraries.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -23,10 +23,6 @@
 # questions.
 #

-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, lib/CoreLibraries.gmk))
-
-
 ##########################################################################################
 # libfdlibm is statically linked with libjava below and not delivered into the
 # product on its own.
--- a/make/modules/java.desktop/Copy.gmk
+++ b/make/modules/java.desktop/Copy.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -26,8 +26,6 @@
 include CopyCommon.gmk
 include Modules.gmk

-$(eval $(call IncludeCustomExtension, copy/Copy-java.desktop.gmk))
-
 ################################################################################

 $(CONF_DST_DIR)/sound.properties: $(TOPDIR)/src/java.desktop/share/conf/sound.properties
--- a/make/modules/java.desktop/Gendata.gmk
+++ b/make/modules/java.desktop/Gendata.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -25,6 +25,6 @@

 include GendataCommon.gmk

-include GendataFontConfig.gmk
+include gendata/GendataFontConfig.gmk

-include GendataHtml32dtd.gmk
+include gendata/GendataHtml32dtd.gmk
--- a/make/modules/java.desktop/Gensrc.gmk
+++ b/make/modules/java.desktop/Gensrc.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -26,17 +26,17 @@
 include GensrcCommonJdk.gmk

 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, gensrc/Gensrc-java.desktop.gmk))
+$(eval $(call IncludeCustomExtension, modules/java.desktop/Gensrc.gmk))

 ifeq ($(call isTargetOs, windows), false)
-  include GensrcIcons.gmk
+  include gensrc/GensrcIcons.gmk
 endif

 ifeq ($(call isTargetOs, linux solaris aix), true)
-  include GensrcX11Wrappers.gmk
+  include gensrc/GensrcX11Wrappers.gmk
 endif

-include GensrcSwing.gmk
+include gensrc/GensrcSwing.gmk

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

--- a/make/modules/java.desktop/Lib.gmk
+++ b/make/modules/java.desktop/Lib.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -26,7 +26,7 @@
 include LibCommon.gmk

 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, lib/Lib-java.desktop.gmk))
+$(eval $(call IncludeCustomExtension, modules/java.desktop/Lib.gmk))

 # Prepare the find cache.
 $(call FillFindCache, $(wildcard $(TOPDIR)/src/java.desktop/*/native))
@ -34,7 +34,7 @@ $(call FillFindCache, $(wildcard $(TOPDIR)/src/java.desktop/*/native))
 ################################################################################
 # Create the AWT/2D libraries

-include Awt2dLibraries.gmk
+include lib/Awt2dLibraries.gmk

 ################################################################################
 # Create the libjsound library
--- a/make/modules/java.desktop/gendata/GendataFontConfig.gmk
+++ b/make/modules/java.desktop/gendata/GendataFontConfig.gmk
--- a/make/modules/java.desktop/gendata/GendataHtml32dtd.gmk
+++ b/make/modules/java.desktop/gendata/GendataHtml32dtd.gmk
--- a/make/modules/java.desktop/gensrc/GensrcIcons.gmk
+++ b/make/modules/java.desktop/gensrc/GensrcIcons.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -23,8 +23,6 @@
 # questions.
 #

-$(eval $(call IncludeCustomExtension, gensrc/GensrcIcons.gmk))
-
 GENSRC_AWT_ICONS :=
 GENSRC_AWT_ICONS_SRC :=
 GENSRC_AWT_ICONS_TMP := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop
--- a/make/modules/java.desktop/gensrc/GensrcSwing.gmk
+++ b/make/modules/java.desktop/gensrc/GensrcSwing.gmk
--- a/make/modules/java.desktop/gensrc/GensrcX11Wrappers.gmk
+++ b/make/modules/java.desktop/gensrc/GensrcX11Wrappers.gmk
--- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk
+++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -23,8 +23,6 @@
 # questions.
 #

-$(eval $(call IncludeCustomExtension, lib/Awt2dLibraries-pre.gmk))
-
 WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib

 LIBAWT_DEFAULT_HEADER_DIRS := \
@ -900,8 +898,3 @@ ifeq ($(call isTargetOs, macosx), true)
  $(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT)

 endif
-
-################################################################################
-
-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, lib/Awt2dLibraries.gmk))
--- a/make/modules/java.instrument/Lib.gmk
+++ b/make/modules/java.instrument/Lib.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -25,9 +25,6 @@

 include LibCommon.gmk

-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, lib/Lib-java.instrument.gmk))
-
 ################################################################################

 ifeq ($(call isTargetOs, windows), true)
--- a/make/modules/java.logging/Copy.gmk
+++ b/make/modules/java.logging/Copy.gmk
--- a/make/modules/java.logging/Gensrc.gmk
+++ b/make/modules/java.logging/Gensrc.gmk
--- a/make/modules/java.management/Lib.gmk
+++ b/make/modules/java.management/Lib.gmk
@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@ -25,9 +25,6 @@

 include LibCommon.gmk

-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, lib/Lib-java.management.gmk))
-
 ################################################################################

 LIBMANAGEMENT_OPTIMIZATION := HIGH
@ -52,8 +49,3 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT, \
 $(BUILD_LIBMANAGEMENT): $(call FindLib, java.base, java)

 TARGETS += $(BUILD_LIBMANAGEMENT)
-
-################################################################################
-
-# Include custom extension post hook
-$(eval $(call IncludeCustomExtension, lib/Lib-java.management-post.gmk))
--- a/make/modules/java.prefs/Lib.gmk
+++ b/make/modules/java.prefs/Lib.gmk
--- a/make/launcher/Launcher-java.rmi.gmk
+++ b/make/launcher/Launcher-java.rmi.gmk
--- a/make/modules/java.rmi/Lib.gmk
+++ b/make/modules/java.rmi/Lib.gmk
--- a/make/launcher/Launcher-java.scripting.gmk
+++ b/make/launcher/Launcher-java.scripting.gmk
--- a/make/launcher/Launcher-java.security.jgss.gmk
+++ b/make/launcher/Launcher-java.security.jgss.gmk
--- a/make/modules/java.security.jgss/Lib.gmk
+++ b/make/modules/java.security.jgss/Lib.gmk
--- a/make/modules/java.smartcardio/Lib.gmk
+++ b/make/modules/java.smartcardio/Lib.gmk
--- a/make/modules/jdk.accessibility/Copy.gmk
+++ b/make/modules/jdk.accessibility/Copy.gmk
--- a/make/launcher/Launcher-jdk.accessibility.gmk
+++ b/make/launcher/Launcher-jdk.accessibility.gmk
--- a/Show More
+++ b/Show More