JBR-2041: Logging & recovery

.hgtags

@@ -576,14 +576,3 @@ aa260c24480a2bd7d21ad1c863e6fe9a3973011e jdk-11.0.6+6
 1859de77ee6cd7e10ac0b9e71027d9f974a6e481 jdk-11.0.6+9
 837b7afec083aaddeef0a6c3e6501b2200eaf1d4 jdk-11.0.6+10
 837b7afec083aaddeef0a6c3e6501b2200eaf1d4 jdk-11.0.6-ga
-8cdfd6139b1efc9064b10f24a82848b1bb4a0550 jdk-11.0.7+1
-15cc1c8a63718c394e9cd1f35d735bb74a850084 jdk-11.0.7+2
-f2d8162261ae3c1e50eb0667b3c9669caa67c652 jdk-11.0.7+3
-d3d1f7f67de13fd5c227424b9ddc514c0ca32aff jdk-11.0.7+4
-f03574cfc0d728ca7b5146ca22c707717f9f899f jdk-11.0.7+5
-17d2e0c27889a00a3df7de9bcea0e8caf0d1771a jdk-11.0.7+6
-f56b853d452bd339e3f4360cf4be42cc90f9284c jdk-11.0.7+7
-3c570d183ab2afc0b204a8e980be69e7fbe761ef jdk-11.0.7+8
-7201cd0c64776aa574d252b03a4c92b25d0a7d7f jdk-11.0.7+9
-44ce940b344b9f240be4807f5b8f06e178e3aecd jdk-11.0.7+10
-44ce940b344b9f240be4807f5b8f06e178e3aecd jdk-11.0.7-ga

doc/building.html

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

doc/building.md

@@ -436,8 +436,8 @@ If a required library is not detected by `configure`, you need to provide the
 path to it. There are two forms of the `configure` arguments to point to an
 external library: `--with-<LIB>=<path>` or `--with-<LIB>-include=<path to
 include> --with-<LIB>-lib=<path to lib>`. The first variant is more concise,
-but require the include files and library files to reside in a default
-hierarchy under this directory. In most cases, it works fine.
+but require the include files an library files to reside in a default hierarchy
+under this directory. In most cases, it works fine.
 
 As a fallback, the second version allows you to point to the include directory
 and the lib directory separately.
@@ -447,7 +447,7 @@ and the lib directory separately.
 FreeType2 from [The FreeType Project](http://www.freetype.org/) is not required
 on any platform. The exception is on Unix-based platforms when configuring such
 that the build artifacts will reference a system installed library,
-rather than bundling the JDK's own copy.
+rather than bundling the JDK’s own copy.
 
   * To install on an apt-based Linux, try running `sudo apt-get install
     libfreetype6-dev`.
@@ -586,8 +586,8 @@ bash configure [options]
 
 This will create an output directory containing the configuration and setup an
 area for the build result. This directory typically looks like
-`build/linux-x64-server-release`, but the actual name depends on your specific
-configuration. (It can also be set directly, see [Using Multiple
+`build/linux-x64-normal-server-release`, but the actual name depends on your
+specific configuration. (It can also be set directly, see [Using Multiple
 Configurations](#using-multiple-configurations)). This directory is referred to
 as `$BUILD` in this documentation.
 

doc/ide.html

@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
-<head>
-  <meta charset="utf-8" />
-  <meta name="generator" content="pandoc" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-  <title>IDE support in the JDK</title>
-  <style type="text/css">
-      code{white-space: pre-wrap;}
-      span.smallcaps{font-variant: small-caps;}
-      span.underline{text-decoration: underline;}
-      div.column{display: inline-block; vertical-align: top; width: 50%;}
-  </style>
-  <link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css" />
-  <!--[if lt IE 9]>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
-  <![endif]-->
-</head>
-<body>
-<header id="title-block-header">
-<h1 class="title">IDE support in the JDK</h1>
-</header>
-<nav id="TOC">
-<ul>
-<li><a href="#introduction">Introduction</a><ul>
-<li><a href="#ide-support-for-native-code">IDE support for native code</a></li>
-<li><a href="#ide-support-for-java-code">IDE support for Java code</a></li>
-</ul></li>
-</ul>
-</nav>
-<h2 id="introduction">Introduction</h2>
-<p>When you are familiar with building and testing the JDK, you may want to configure an IDE to work with the source code. The instructions differ a bit depending on whether you are interested in working with the native (C/C++) or the Java code.</p>
-<h3 id="ide-support-for-native-code">IDE support for native code</h3>
-<p>There are a few ways to generate IDE configuration for the native sources, depending on which IDE to use.</p>
-<h4 id="visual-studio-code">Visual Studio Code</h4>
-<p>The make system can generate a <a href="https://code.visualstudio.com">Visual Studio Code</a> workspace that has C/C++ source indexing configured correctly, as well as launcher targets for tests and the Java launcher. After configuring, a workspace for the configuration can be generated using:</p>
-<pre class="shell"><code>make vscode-project</code></pre>
-<p>This creates a file called <code>jdk.code-workspace</code> in the build output folder. The full location will be printed after the workspace has been generated. To use it, choose <code>File -&gt; Open Workspace...</code> in Visual Studio Code.</p>
-<h5 id="alternative-indexers">Alternative indexers</h5>
-<p>The main <code>vscode-project</code> target configures the default C++ support in Visual Studio Code. There are also other source indexers that can be installed, that may provide additional features. It's currently possible to generate configuration for two such indexers, <a href="https://clang.llvm.org/extra/clangd/">clangd</a> and <a href="https://github.com/Andersbakken/rtags">rtags</a>. These can be configured by appending the name of the indexer to the make target, such as:</p>
-<pre class="shell"><code>make vscode-project-clangd</code></pre>
-<p>Additional instructions for configuring the given indexer will be displayed after the workspace has been generated.</p>
-<h4 id="visual-studio">Visual Studio</h4>
-<p>This section is a work in progress.</p>
-<pre class="shell"><code>make ide-project</code></pre>
-<h4 id="compilation-database">Compilation Database</h4>
-<p>The make system can generate generic native code indexing support in the form of a <a href="https://clang.llvm.org/docs/JSONCompilationDatabase.html">Compilation Database</a> that can be used by many different IDEs and source code indexers.</p>
-<pre class="shell"><code>make compile-commands</code></pre>
-<p>It's also possible to generate the Compilation Database for the HotSpot source code only, which is a bit faster as it includes less information.</p>
-<pre class="shell"><code>make compile-commands-hotspot</code></pre>
-<h3 id="ide-support-for-java-code">IDE support for Java code</h3>
-<p>This section is a work in progress.</p>
-</body>
-</html>

doc/ide.md

@@ -1,73 +0,0 @@
-% IDE support in the JDK
-
-## Introduction
-
-When you are familiar with building and testing the JDK, you may want to
-configure an IDE to work with the source code. The instructions differ a bit
-depending on whether you are interested in working with the native (C/C++) or
-the Java code.
-
-### IDE support for native code
-
-There are a few ways to generate IDE configuration for the native sources,
-depending on which IDE to use.
-
-#### Visual Studio Code
-
-The make system can generate a [Visual Studio Code](https://code.visualstudio.com)
-workspace that has C/C++ source indexing configured correctly, as well as
-launcher targets for tests and the Java launcher. After configuring, a workspace
-for the configuration can be generated using:
-
-```shell
-make vscode-project
-```
-
-This creates a file called `jdk.code-workspace` in the build output folder. The
-full location will be printed after the workspace has been generated. To use it,
-choose `File -> Open Workspace...` in Visual Studio Code.
-
-##### Alternative indexers
-
-The main `vscode-project` target configures the default C++ support in Visual
-Studio Code. There are also other source indexers that can be installed, that
-may provide additional features. It's currently possible to generate
-configuration for two such indexers, [clangd](https://clang.llvm.org/extra/clangd/)
-and [rtags](https://github.com/Andersbakken/rtags). These can be configured by
-appending the name of the indexer to the make target, such as:
-
-```shell
-make vscode-project-clangd
-```
-
-Additional instructions for configuring the given indexer will be displayed
-after the workspace has been generated.
-
-#### Visual Studio
-
-This section is a work in progress.
-
-```shell
-make ide-project
-```
-
-#### Compilation Database
-
-The make system can generate generic native code indexing support in the form of
-a [Compilation Database](https://clang.llvm.org/docs/JSONCompilationDatabase.html)
-that can be used by many different IDEs and source code indexers.
-
-```shell
-make compile-commands
-```
-
-It's also possible to generate the Compilation Database for the HotSpot source
-code only, which is a bit faster as it includes less information.
-
-```shell
-make compile-commands-hotspot
-```
-
-### IDE support for Java code
-
-This section is a work in progress.

doc/testing.html

@@ -11,14 +11,14 @@
       span.underline{text-decoration: underline;}
       div.column{display: inline-block; vertical-align: top; width: 50%;}
   </style>
-  <link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css" />
+  <link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css">
   <!--[if lt IE 9]>
     <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
   <![endif]-->
   <style type="text/css">pre, code, tt { color: #1d6ae5; }</style>
 </head>
 <body>
-<header id="title-block-header">
+<header>
 <h1 class="title">Testing the JDK</h1>
 </header>
 <nav id="TOC">
@@ -32,13 +32,11 @@
 </ul></li>
 <li><a href="#test-results-and-summary">Test results and summary</a></li>
 <li><a href="#test-suite-control">Test suite control</a><ul>
-<li><a href="#general-keywords-test_opts">General keywords (TEST_OPTS)</a></li>
 <li><a href="#jtreg-keywords">JTReg keywords</a></li>
 <li><a href="#gtest-keywords">Gtest keywords</a></li>
 </ul></li>
 <li><a href="#notes-for-specific-tests">Notes for Specific Tests</a><ul>
 <li><a href="#docker-tests">Docker Tests</a></li>
-<li><a href="#client-ui-tests">Client UI Tests</a></li>
 </ul></li>
 </ul>
 </nav>
@@ -91,24 +89,11 @@ TEST FAILURE</code></pre>
 <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=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>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>
-<p>There are also some keywords that applies globally to the test runner system, not to any specific test suites. These are also available as TEST_OPTS keywords.</p>
-<h4 id="jobs">JOBS</h4>
-<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="aot_modules">AOT_MODULES</h4>
-<p>Applies to JTReg and GTest.</p>
 <h3 id="jtreg-keywords">JTReg keywords</h3>
-<h4 id="jobs-1">JOBS</h4>
+<h4 id="jobs">JOBS</h4>
 <p>The test concurrency (<code>-concurrency</code>).</p>
 <p>Defaults to TEST_JOBS (if set by <code>--with-test-jobs=</code>), otherwise it defaults to JOBS, except for Hotspot, where the default is <em>number of CPU cores/2</em>, but never more than 12.</p>
-<h4 id="timeout_factor-1">TIMEOUT_FACTOR</h4>
+<h4 id="timeout">TIMEOUT</h4>
 <p>The timeout factor (<code>-timeoutFactor</code>).</p>
 <p>Defaults to 4.</p>
 <h4 id="test_mode">TEST_MODE</h4>
@@ -127,21 +112,13 @@ TEST FAILURE</code></pre>
 <p>Limit memory consumption (<code>-Xmx</code> and <code>-vmoption:-Xmx</code>, or none).</p>
 <p>Limit memory consumption for JTReg test framework and VM under test. Set to 0 to disable the limits.</p>
 <p>Defaults to 512m, except for hotspot, where it defaults to 0 (no limit).</p>
-<h4 id="keywords">KEYWORDS</h4>
-<p>JTReg kewords sent to JTReg using <code>-k</code>. Please be careful in making sure that spaces and special characters (like <code>!</code>) are properly quoted. To avoid some issues, the special value <code>%20</code> can be used instead of space.</p>
-<h4 id="extra_problem_lists">EXTRA_PROBLEM_LISTS</h4>
-<p>Use additional problem lists file or files, in addition to the default ProblemList.txt located at the JTReg test roots.</p>
-<p>If multiple file names are specified, they should be separated by space (or, to help avoid quoting issues, the special value <code>%20</code>).</p>
-<p>The file names should be either absolute, or relative to the JTReg test root of the tests to be run.</p>
 <h4 id="options">OPTIONS</h4>
 <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>
+<h4 id="java_options">JAVA_OPTIONS</h4>
 <p>Additional Java options to JTReg (<code>-javaoption</code>).</p>
-<h4 id="vm_options-1">VM_OPTIONS</h4>
+<h4 id="vm_options">VM_OPTIONS</h4>
 <p>Additional VM options to JTReg (<code>-vmoption</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>
 <h3 id="gtest-keywords">Gtest keywords</h3>
 <h4 id="repeat">REPEAT</h4>
 <p>The number of times to repeat the tests (<code>--gtest_repeat</code>).</p>
@@ -149,23 +126,11 @@ TEST FAILURE</code></pre>
 <h4 id="options-1">OPTIONS</h4>
 <p>Additional options to the Gtest test framework.</p>
 <p>Use <code>GTEST=&quot;OPTIONS=--help&quot;</code> to see all available Gtest options.</p>
-<h4 id="aot_modules-2">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>
 <h2 id="notes-for-specific-tests">Notes for Specific Tests</h2>
 <h3 id="docker-tests">Docker Tests</h3>
 <p>Docker tests with default parameters may fail on systems with glibc versions not compatible with the one used in the default docker image (e.g., Oracle Linux 7.6 for x86). For example, they pass on Ubuntu 16.04 but fail on Ubuntu 18.04 if run like this on x86:</p>
 <pre><code>$ make run-test TEST=&quot;jtreg:test/hotspot/jtreg/containers/docker&quot;</code></pre>
 <p>To run these tests correctly, additional parameters for the correct docker image are required on Ubuntu 18.04 by using <code>JAVA_OPTIONS</code>.</p>
 <pre><code>$ make run-test TEST=&quot;jtreg:test/hotspot/jtreg/containers/docker&quot; JTREG=&quot;JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest&quot;</code></pre>
-<h3 id="client-ui-tests">Client UI Tests</h3>
-<p>Some Client UI tests use key sequences which may be reserved by the operating system. Usually that causes the test failure. So it is highly recommended to disable system key shortcuts prior testing. The steps to access and disable system key shortcuts for various platforms are provided below.</p>
-<h4 id="macos">MacOS</h4>
-<p>Choose Apple menu; System Preferences, click Keyboard, then click Shortcuts; select or deselect desired shortcut.</p>
-<p>For example, test/jdk/javax/swing/TooltipManager/JMenuItemToolTipKeyBindingsTest/JMenuItemToolTipKeyBindingsTest.java fails on MacOS because it uses <code>CTRL + F1</code> key sequence to show or hide tooltip message but the key combination is reserved by the operating system. To run the test correctly the default global key shortcut should be disabled using the steps described above, and then deselect “Turn keyboard access on or off” option which is responsible for <code>CTRL + F1</code> combination.</p>
-<h4 id="linux">Linux</h4>
-<p>Open the Activities overview and start typing Settings; Choose Settings, click Devices, then click Keyboard; set or override desired shortcut.</p>
-<h4 id="windows">Windows</h4>
-<p>Type <code>gpedit</code> in the Search and then click Edit group policy; navigate to User Configuration -&gt; Administrative Templates -&gt; Windows Components -&gt; File Explorer; in the right-side pane look for “Turn off Windows key hotkeys” and double click on it; enable or disable hotkeys.</p>
-<p>Note: restart is required to make the settings take effect.</p>
 </body>
 </html>

doc/testing.md

@@ -162,35 +162,6 @@ proper quoting of command line arguments through.)
 As far as possible, the names of the keywords have been standardized between
 test suites.
 
-### General keywords (TEST_OPTS)
-
-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.
-
-There are also some keywords that applies globally to the test runner system,
-not to any specific test suites. These are also available as TEST_OPTS keywords.
-
-#### JOBS
-
-Currently only applies to JTReg.
-
-#### TIMEOUT_FACTOR
-
-Currently only applies to JTReg.
-
-#### VM_OPTIONS
-
-Applies to JTReg, GTest and Micro.
-
-#### JAVA_OPTIONS
-
-Applies to JTReg, GTest and Micro.
-
-#### AOT_MODULES
-
-Applies to JTReg and GTest.
-
 ### JTReg keywords
 
 #### JOBS
@@ -200,7 +171,7 @@ Defaults to TEST_JOBS (if set by `--with-test-jobs=`), otherwise it defaults to
 JOBS, except for Hotspot, where the default is *number of CPU cores/2*, but
 never more than 12.
 
-#### TIMEOUT_FACTOR
+#### TIMEOUT
 The timeout factor (`-timeoutFactor`).
 
 Defaults to 4.
@@ -234,24 +205,6 @@ to disable the limits.
 
 Defaults to 512m, except for hotspot, where it defaults to 0 (no limit).
 
-#### KEYWORDS
-
-JTReg kewords sent to JTReg using `-k`. Please be careful in making sure that
-spaces and special characters (like `!`) are properly quoted. To avoid some
-issues, the special value `%20` can be used instead of space.
-
-#### EXTRA_PROBLEM_LISTS
-
-Use additional problem lists file or files, in addition to the default
-ProblemList.txt located at the JTReg test roots.
-
-If multiple file names are specified, they should be separated by space (or, to
-help avoid quoting issues, the special value `%20`).
-
-The file names should be either absolute, or relative to the JTReg test root of
-the tests to be run.
-
-
 #### OPTIONS
 Additional options to the JTReg test framework.
 
@@ -263,12 +216,6 @@ Additional Java options to JTReg (`-javaoption`).
 #### VM_OPTIONS
 Additional VM options to JTReg (`-vmoption`).
 
-#### AOT_MODULES
-
-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 `%20`).
-
 ### Gtest keywords
 
 #### REPEAT
@@ -283,12 +230,6 @@ Additional options to the Gtest test framework.
 
 Use `GTEST="OPTIONS=--help"` to see all available Gtest options.
 
-#### AOT_MODULES
-
-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 `%20`).
-
 ## Notes for Specific Tests
 
 ### Docker Tests
@@ -304,35 +245,6 @@ required on Ubuntu 18.04 by using `JAVA_OPTIONS`.
 
     $ make run-test TEST="jtreg:test/hotspot/jtreg/containers/docker" JTREG="JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest"
 
-### Client UI Tests
-
-Some Client UI tests use key sequences which may be reserved by the operating
-system. Usually that causes the test failure. So it is highly recommended to disable
-system key shortcuts prior testing. The steps to access and disable system key shortcuts
-for various platforms are provided below.
-
-#### MacOS
-Choose Apple menu; System Preferences, click Keyboard, then click Shortcuts;
-select or deselect desired shortcut.
-
-For example, test/jdk/javax/swing/TooltipManager/JMenuItemToolTipKeyBindingsTest/JMenuItemToolTipKeyBindingsTest.java fails
-on MacOS because it uses `CTRL + F1` key sequence to show or hide tooltip message
-but the key combination is reserved by the operating system. To run the test correctly
-the default global key shortcut should be disabled using the steps described above, and then deselect
-"Turn keyboard access on or off" option which is responsible for `CTRL + F1` combination.
-
-#### Linux
-Open the Activities overview and start typing Settings; Choose Settings, click Devices,
-then click Keyboard; set or override desired shortcut.
-
-#### Windows
-Type `gpedit` in the Search and then click Edit group policy; navigate to
-User Configuration -> Administrative Templates -> Windows Components -> File Explorer;
-in the right-side pane look for "Turn off Windows key hotkeys" and double click on it;
-enable or disable hotkeys.
-
-Note: restart is required to make the settings take effect.
-
 ---
 # Override some definitions in the global css file that are not optimal for
 # this document.

jb/project/docker/Dockerfile

@@ -1,10 +1,9 @@
-# jetbrains/runtime:jbr11dev8env
+# jetbrains/runtime:jbr11env
 FROM centos:7
-RUN yum -y install centos-release-scl
-RUN yum -y install devtoolset-8
-RUN yum -y install zip bzip2 unzip tar wget make autoconf automake libtool alsa-devel cups-devel xorg-x11-devel libjpeg62-devel giflib-devel freetype-devel file which libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel libXrandr-devel libXi-devel git
+
+RUN yum -y install zip bzip2 unzip tar wget make autoconf automake libtool gcc gcc-c++ libstdc++-devel alsa-devel cups-devel xorg-x11-devel libjpeg62-devel giflib-devel freetype-devel file which libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel libXrandr-devel libXi-devel
 # Install Java 11
 RUN wget https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_3-linux-x64-b360.2.tar.gz \
 -O - | tar xz -C /
 ENV JAVA_HOME /jbrsdk
-ENV PATH $JAVA_HOME/bin:/opt/rh/devtoolset-8/root/usr/bin:$PATH
+ENV PATH $JAVA_HOME/bin:$PATH

jb/project/hotspot-cmake/CMakeLists.txt

@@ -495,6 +495,7 @@ set(SOURCE_FILES
 ../../../src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
+../../../src/hotspot/cpu/aarch64/cpustate_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/immediate_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/vmreg_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp
@@ -519,6 +520,7 @@ set(SOURCE_FILES
 ../../../src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp
+../../../src/hotspot/cpu/aarch64/decode_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp
@@ -527,6 +529,7 @@ set(SOURCE_FILES
 ../../../src/hotspot/cpu/aarch64/assembler_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/register_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/vm_version_ext_aarch64.cpp
+../../../src/hotspot/cpu/aarch64/aarch64_call.cpp
 ../../../src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp
@@ -1172,11 +1175,13 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.hpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.cpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp
+../../../src/hotspot/share/jfr/recorder/repository/jfrChunkSizeNotifier.hpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrChunkState.hpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrRepository.cpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrChunkState.cpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrRepository.hpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.hpp
+../../../src/hotspot/share/jfr/recorder/repository/jfrChunkSizeNotifier.cpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp
 ../../../src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointBlob.hpp
 ../../../src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.cpp
@@ -1249,6 +1254,7 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp
+../../../src/hotspot/share/jfr/leakprofiler/emitEventOperation.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/sampling/sampleList.cpp
@@ -1264,6 +1270,7 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/utilities/unifiedOop.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/startOperation.hpp
+../../../src/hotspot/share/jfr/leakprofiler/emitEventOperation.cpp
 ../../../src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.cpp
 ../../../src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp
 ../../../src/hotspot/share/jfr/leakprofiler/chains/edge.hpp
@@ -1474,6 +1481,7 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/runtime/basicLock.hpp
 ../../../src/hotspot/share/runtime/compilationPolicy.cpp
 ../../../src/hotspot/share/runtime/java.hpp
+../../../src/hotspot/share/runtime/simpleThresholdPolicy.cpp
 ../../../src/hotspot/share/runtime/objectMonitor.inline.hpp
 ../../../src/hotspot/share/runtime/mutexLocker.cpp
 ../../../src/hotspot/share/runtime/serviceThread.cpp
@@ -1516,6 +1524,7 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/runtime/compilationPolicy.hpp
 ../../../src/hotspot/share/runtime/basicLock.cpp
 ../../../src/hotspot/share/runtime/java.cpp
+../../../src/hotspot/share/runtime/simpleThresholdPolicy.hpp
 ../../../src/hotspot/share/runtime/perfData.inline.hpp
 ../../../src/hotspot/share/runtime/statSampler.hpp
 ../../../src/hotspot/share/runtime/vm_operations.cpp
@@ -1548,6 +1557,7 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/runtime/handshake.hpp
 ../../../src/hotspot/share/runtime/thread.inline.hpp
 ../../../src/hotspot/share/runtime/perfMemory.hpp
+../../../src/hotspot/share/runtime/simpleThresholdPolicy.inline.hpp
 ../../../src/hotspot/share/runtime/javaCalls.cpp
 ../../../src/hotspot/share/runtime/reflection.cpp
 ../../../src/hotspot/share/runtime/icache.cpp

jb/project/jdk-cmake/CMakeLists.txt

@@ -1088,6 +1088,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.h
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.h
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsConfig.m
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/CDesktopPeer.m
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.h
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.m
@@ -1341,6 +1342,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux"
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/multi_font.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/multiVis.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.c
+            ../../../src/java.desktop/unix/native/libawt_xawt/awt/robot_common.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/list.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h
@@ -1353,6 +1355,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux"
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/canvas.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/multi_font.h
+            ../../../src/java.desktop/unix/native/libawt_xawt/awt/robot_common.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c

jb/project/tools/common.sh

@@ -1,3 +0,0 @@
-VENDOR_NAME="JetBrains s.r.o."
-VENDOR_VERSION_STRING="JBR-${JBSDK_VERSION_WITH_DOTS}.${JDK_BUILD_NUMBER}-${build_number}"
-[ -z ${bundle_type} ] || VENDOR_VERSION_STRING="${VENDOR_VERSION_STRING}-${bundle_type}"

jb/project/tools/exclude_jcef_module.patch

@@ -1,33 +0,0 @@
-Index: modules.list
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
---- modules.list	(revision 8ff658704ad572469e293cf84de8295a01340673)
-+++ modules.list	(date 1592803808421)
-@@ -61,5 +61,4 @@
- jdk.unsupported,
- jdk.xml.dom,
- jdk.zipfs,
--jdk.hotspot.agent,
--jcef
-+jdk.hotspot.agent
-Index: src/java.desktop/share/classes/module-info.java
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
---- src/java.desktop/share/classes/module-info.java	(revision 8ff658704ad572469e293cf84de8295a01340673)
-+++ src/java.desktop/share/classes/module-info.java	(date 1592803808412)
-@@ -109,10 +109,7 @@
-     // see make/GensrcModuleInfo.gmk
-     exports sun.awt to
-         jdk.accessibility,
--        jdk.unsupported.desktop,
--        jcef;
--
--    exports java.awt.peer to jcef;
-+        jdk.unsupported.desktop;
- 
-     exports java.awt.dnd.peer to jdk.unsupported.desktop;
-     exports sun.awt.dnd to jdk.unsupported.desktop;

jb/project/tools/exclude_jfx_module.patch

@@ -1,21 +0,0 @@
-Index: modules.list
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
---- modules.list	(revision 8ff658704ad572469e293cf84de8295a01340673)
-+++ modules.list	(date 1592804013230)
-@@ -20,13 +20,6 @@
- java.transaction.xa,
- java.xml,
- java.xml.crypto,
--javafx.base,
--javafx.controls,
--javafx.fxml,
--javafx.graphics,
--javafx.media,
--javafx.swing,
--javafx.web,
- jdk.accessibility,
- jdk.aot,
- jdk.attach,

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

@@ -1,9 +0,0 @@
-#!/bin/bash -x
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-script_dir=jb/project/tools/linux/scripts
-${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
-${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
-${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx_jcef" || exit $?

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

@@ -1,131 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
-#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-bundle_type=$4
-JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
-
-source jb/project/tools/common.sh
-
-function create_jbr {
-
-  case "$1" in
-  "${bundle_type}_lw")
-    JBR_BASE_NAME=jbr_${bundle_type}_lw-${JBSDK_VERSION}
-    grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
-    ;;
-  "jfx_jcef" | "jcef")
-    JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
-    cat modules.list > modules_tmp.list
-    ;;
-  "jfx")
-    JBR_BASE_NAME=jbr-${JBSDK_VERSION}
-    cat modules.list > modules_tmp.list
-    ;;
-  *)
-    echo "***ERR*** bundle was not specified" && exit 1
-    ;;
-  esac
-  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
-
-  JBR=$JBR_BASE_NAME-linux-x64-b$build_number
-
-  echo Running jlink....
-  $JSDK/bin/jlink \
-    --module-path $JSDK/jmods --no-man-pages --compress=2 \
-    --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output $BASE_DIR/$JBR_BUNDLE
-
-  if [[ "$bundle_type" == *jcef* ]]; then
-    cp -R $BASE_DIR/$JBR_BUNDLE $BASE_DIR/jbr
-    cp -R jcef_linux_x64/* $BASE_DIR/$JBR_BUNDLE/lib || exit $?
-  fi
-  grep -v "^JAVA_VERSION" $JSDK/release | grep -v "^MODULES" >> $BASE_DIR/$JBR_BUNDLE/release
-
-  echo Creating $JBR.tar.gz ...
-  rm -rf ${BASE_DIR}/jbr
-  cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
-  tar -pcf $JBR.tar -C $BASE_DIR jbr || exit $?
-  gzip $JBR.tar || exit $?
-  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
-}
-
-JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
-
-git checkout -- modules.list src/java.desktop/share/classes/module-info.java
-case "$bundle_type" in
-  "jfx")
-    git apply -p0 < jb/project/tools/exclude_jcef_module.patch
-    ;;
-  "jcef")
-    git apply -p0 < jb/project/tools/exclude_jfx_module.patch
-    ;;
-esac
-
-sh configure \
-  --disable-warnings-as-errors \
-  --with-debug-level=release \
-  --with-vendor-name="${VENDOR_NAME}" \
-  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-  --with-version-pre= \
-  --with-version-build=${JDK_BUILD_NUMBER} \
-  --with-version-opt=b${build_number} \
-  --with-import-modules=./modular-sdk \
-  --enable-cds=yes || exit $?
-
-make images CONF=linux-x86_64-normal-server-release || exit $?
-
-JSDK=build/linux-x86_64-normal-server-release/images/jdk
-JBSDK=$JBRSDK_BASE_NAME-linux-x64-b$build_number
-
-echo Fixing permissions
-chmod -R a+r $JSDK
-
-BASE_DIR=build/linux-x86_64-normal-server-release/images
-JBRSDK_BUNDLE=jbrsdk
-
-rm -rf $BASE_DIR/$JBRSDK_BUNDLE
-cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || exit $?
-
-if [[ "$bundle_type" == *jcef* ]]; then
-  cp -R jcef_linux_x64/* $BASE_DIR/$JBRSDK_BUNDLE/lib || exit $?
-fi
-if [ "$bundle_type" == "jfx_jcef" ]; then
-  echo Creating $JBSDK.tar.gz ...
-  sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/release > release
-  mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/release
-
-  tar -pcf $JBSDK.tar --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man \
-    -C $BASE_DIR $JBRSDK_BUNDLE || exit $?
-  gzip $JBSDK.tar || exit $?
-fi
-
-JBR_BUNDLE=jbr_${bundle_type}
-create_jbr ${bundle_type}
-
-if [ "$bundle_type" == "jfx_jcef" ]; then
-  make test-image || exit $?
-
-  JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-test-x64-b$build_number
-
-  echo Creating $JBSDK_TEST.tar.gz ...
-  tar -pcf $JBRSDK_TEST.tar -C $BASE_DIR --exclude='test/jdk/demos' test || exit $?
-  gzip $JBRSDK_TEST.tar || exit $?
-fi

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

@@ -1,9 +0,0 @@
-#!/bin/bash -x
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-script_dir=jb/project/tools/mac/scripts
-${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
-${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
-${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx_jcef" || exit $?

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

@@ -1,140 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
-#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-bundle_type=$4
-JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
-
-source jb/project/tools/common.sh
-
-function create_jbr {
-
-  case "$1" in
-  "${bundle_type}_lw")
-    JBR_BASE_NAME=jbr_${bundle_type}_lw-${JBSDK_VERSION}
-    grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
-    ;;
-  "jfx_jcef" | "jcef")
-    JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
-    cat modules.list > modules_tmp.list
-    ;;
-  "jfx")
-    JBR_BASE_NAME=jbr-${JBSDK_VERSION}
-    cat modules.list > modules_tmp.list
-    ;;
-  *)
-    echo "***ERR*** bundle was not specified" && exit 1
-    ;;
-  esac
-  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
-
-  JRE_CONTENTS=${BASE_DIR}/${JBR_BUNDLE}/Contents
-  JRE_HOME=${JRE_CONTENTS}/Home
-  if [ -d "${JRE_CONTENTS}" ]; then
-    rm -rf ${JRE_CONTENTS}
-  fi
-  mkdir -p ${JRE_CONTENTS}
-
-  JBR=${JBR_BASE_NAME}-osx-x64-b${build_number}
-
-  ${BASE_DIR}/$JBRSDK_BUNDLE/Contents/Home/bin/jlink \
-      --module-path ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/jmods --no-man-pages --compress=2 \
-      --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output ${JRE_HOME}  || exit $?
-  grep -v "^JAVA_VERSION" ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release | grep -v "^MODULES" >> ${JRE_HOME}/release
-  cp -R ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/MacOS ${JRE_CONTENTS}
-  cp ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Info.plist ${JRE_CONTENTS}
-
-  if [[ "${bundle_type}" == *jcef* ]]; then
-    rm -rf ${JRE_CONTENTS}/Frameworks || exit $?
-    rm -rf ${JRE_CONTENTS}/Helpers    || exit $?
-    cp -a jcef_mac/Frameworks ${JRE_CONTENTS} || exit $?
-    cp -a jcef_mac/Helpers    ${JRE_CONTENTS} || exit $?
-  fi
-
-  echo Creating ${JBR}.tar.gz ...
-  rm -rf ${BASE_DIR}/jbr
-  cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
-  COPYFILE_DISABLE=1 tar -pczf ${JBR}.tar.gz --exclude='*.dSYM' --exclude='man' -C ${BASE_DIR} jbr || exit $?
-  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
-}
-
-JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
-
-git checkout -- modules.list src/java.desktop/share/classes/module-info.java
-case "$bundle_type" in
-  "jfx")
-    git apply -p0 < jb/project/tools/exclude_jcef_module.patch || exit $?
-    ;;
-  "jcef")
-    git apply -p0 < jb/project/tools/exclude_jfx_module.patch || exit $?
-    ;;
-esac
-
-sh configure \
-  --disable-warnings-as-errors \
-  --with-debug-level=release \
-  --with-vendor-name="${VENDOR_NAME}" \
-  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-  --with-version-pre= \
-  --with-version-build=${JDK_BUILD_NUMBER} \
-  --with-version-opt=b${build_number} \
-  --with-import-modules=./modular-sdk \
-  --with-boot-jdk=`/usr/libexec/java_home -v 11` \
-  --enable-cds=yes || exit $?
-
-make images CONF=macosx-x86_64-normal-server-release || exit $?
-
-JSDK=build/macosx-x86_64-normal-server-release/images/jdk-bundle
-JBSDK=${JBRSDK_BASE_NAME}-osx-x64-b${build_number}
-
-BASE_DIR=jre
-JBRSDK_BUNDLE=jbrsdk
-
-rm -rf $BASE_DIR
-mkdir $BASE_DIR || exit $?
-cp -a $JSDK/jdk-$JBSDK_VERSION_WITH_DOTS.jdk $BASE_DIR/$JBRSDK_BUNDLE || exit $?
-
-if [[ "$bundle_type" == *jcef* ]]; then
-  cp -a jcef_mac/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
-  cp -a jcef_mac/Helpers    $BASE_DIR/$JBRSDK_BUNDLE/Contents/
-fi
-if [ "$bundle_type" == "jfx_jcef" ]; then
-  echo Creating $JBSDK.tar.gz ...
-  sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release > release
-  mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release
-  COPYFILE_DISABLE=1 tar -pczf $JBSDK.tar.gz -C $BASE_DIR \
-    --exclude='._*' --exclude='.DS_Store' --exclude='*~' \
-    --exclude='Home/demo' --exclude='Home/man' --exclude='Home/sample' \
-    $JBRSDK_BUNDLE || exit $?
-fi
-
-JBR_BUNDLE=jbr_${bundle_type}
-create_jbr "${bundle_type}" || exit $?
-
-if [ "$bundle_type" == "jfx_jcef" ]; then
-  make test-image || exit $?
-
-  JBRSDK_TEST=$JBRSDK_BASE_NAME-osx-test-x64-b$build_number
-
-  echo Creating $JBRSDK_TEST.tar.gz ...
-  COPYFILE_DISABLE=1 tar -pczf $JBRSDK_TEST.tar.gz -C build/macosx-x86_64-normal-server-release/images \
-    --exclude='test/jdk/demos' test || exit $?
-fi

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

@@ -26,9 +26,7 @@ log "Signing libraries and executables..."
 # -perm +111 searches for executables
 for f in \
    "Contents/Home/bin" \
-   "Contents/Home/lib" \
-   "Contents/Frameworks" \
-   "Contents/Helpers"; do
+   "Contents/Home/lib"; do
   if [ -d "$APP_DIRECTORY/$f" ]; then
     find "$APP_DIRECTORY/$f" \
       -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -perm +111 \) \

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

@@ -37,7 +37,11 @@ BUILD_NAME="$(ls "$EXPLODED")"
 if test -d $EXPLODED/$BUILD_NAME/Contents/Home/jmods; then
   mv $EXPLODED/$BUILD_NAME/Contents/Home/jmods $BACKUP_JMODS
 fi
+if test -d $EXPLODED/$BUILD_NAME/Contents/Home/Frameworks; then
+  mv $EXPLODED/$BUILD_NAME/Contents/Home/Frameworks $BACKUP_JMODS
+fi
 
+#log "$INPUT_FILE unzipped and removed"
 log "$INPUT_FILE extracted and removed"
 
 APPLICATION_PATH="$EXPLODED/$BUILD_NAME"
@@ -124,6 +128,9 @@ log "Zipping $BUILD_NAME to $INPUT_FILE ..."
   if test -d $BACKUP_JMODS/jmods; then
     mv $BACKUP_JMODS/jmods $EXPLODED/$BUILD_NAME/Contents/Home
   fi
+  if test -d $BACKUP_JMODS/Frameworks; then
+    mv $BACKUP_JMODS/Frameworks $EXPLODED/$BUILD_NAME/Contents/Home
+  fi
 
   COPYFILE_DISABLE=1 tar -pczf $INPUT_FILE --exclude='*.dSYM' --exclude='man' -C $EXPLODED $BUILD_NAME
   log "Finished zipping"

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

@@ -1,9 +0,0 @@
-#!/bin/bash -x
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-script_dir=jb/project/tools/windows/scripts
-${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
-${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
-${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx_jcef" || exit $?

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

@@ -1,104 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
-#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-bundle_type=$4
-JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
-
-source jb/project/tools/common.sh
-
-function create_jbr {
-
-  case "$1" in
-  "${bundle_type}_lw")
-    grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
-    ;;
-  "jfx" | "jcef" | "jfx_jcef")
-    cat modules.list > modules_tmp.list
-    ;;
-  *)
-    echo "***ERR*** bundle was not specified" && exit 1
-    ;;
-  esac
-  rm -rf ${JBR_BUNDLE}
-
-  ${JSDK}/bin/jlink \
-    --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
-    --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output ${JBR_BUNDLE} || exit $?
-  if [[ "${bundle_type}" == *jcef* ]]
-  then
-    cp -R jcef_win_x64/* ${JBR_BUNDLE}/bin
-  fi
-  echo Modifying release info ...
-  cat ${JSDK}/release | tr -d '\r' | grep -v 'JAVA_VERSION' | grep -v 'MODULES' >> ${JBR_BUNDLE}/release
-}
-
-JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
-WORK_DIR=$(pwd)
-
-git checkout -- modules.list src/java.desktop/share/classes/module-info.java
-case "$bundle_type" in
-  "jfx")
-    echo "Excluding jcef modules"
-    git apply -p0 < jb/project/tools/exclude_jcef_module.patch
-    ;;
-  "jcef")
-    echo "Excluding jfx modules"
-    git apply -p0 < jb/project/tools/exclude_jfx_module.patch
-    ;;
-esac
-
-PATH="/usr/local/bin:/usr/bin:${PATH}"
-./configure \
-  --disable-warnings-as-errors \
-  --disable-debug-symbols \
-  --with-target-bits=64 \
-  --with-vendor-name="${VENDOR_NAME}" \
-  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-  --with-version-pre= \
-  --with-version-build=${JDK_BUILD_NUMBER} \
-  --with-version-opt=b${build_number} \
-  --with-import-modules=${WORK_DIR}/modular-sdk \
-  --with-toolchain-version=2015 \
-  --with-boot-jdk=${BOOT_JDK} \
-  --disable-ccache \
-  --enable-cds=yes || exit 1
-
-if [ "$bundle_type" == "jfx_jcef" ]; then
-  make LOG=info images CONF=windows-x86_64-normal-server-release test-image || exit 1
-else
-  make LOG=info images CONF=windows-x86_64-normal-server-release || exit 1
-fi
-
-JSDK=build/windows-x86_64-normal-server-release/images/jdk
-if [[ "$bundle_type" == *jcef* ]]; then
-  JBSDK=${JBRSDK_BASE_NAME}-windows-x64-b${build_number}
-fi
-BASE_DIR=build/windows-x86_64-normal-server-release/images
-JBRSDK_BUNDLE=jbrsdk
-
-rm -rf ${BASE_DIR}/${JBRSDK_BUNDLE} && rsync -a --exclude demo --exclude sample ${JSDK}/ ${JBRSDK_BUNDLE} || exit 1
-cp -R jcef_win_x64/* ${JBRSDK_BUNDLE}/bin
-sed 's/JBR/JBRSDK/g' ${JSDK}/release > release
-mv release ${JBRSDK_BUNDLE}/release
-
-JBR_BUNDLE=jbr_${bundle_type}
-create_jbr ${bundle_type}

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

@@ -1,71 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
-#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-bundle_type=$4
-
-function pack_jbr {
-
-  case "$1" in
-  "${bundle_type}_lw")
-    JBR_BASE_NAME=jbr_${bundle_type}_lw-${JBSDK_VERSION}
-    ;;
-  "jfx_jcef" | "jcef")
-    JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
-    ;;
-  "jfx")
-    JBR_BASE_NAME=jbr-${JBSDK_VERSION}
-    ;;
-  *)
-    echo "***ERR*** bundle was not specified" && exit 1
-    ;;
-  esac
-
-  JBR=$JBR_BASE_NAME-windows-x64-b$build_number
-  echo Creating $JBR.tar.gz ...
-  rm -rf ${BASE_DIR}/jbr
-  cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
-
-  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR jbr || exit 1
-}
-
-JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
-JBR_BASE_NAME=jbr-$JBSDK_VERSION
-
-IMAGES_DIR=build/windows-x86_64-normal-server-release/images
-JSDK=$IMAGES_DIR/jdk
-JBSDK=$JBRSDK_BASE_NAME-windows-x64-b$build_number
-BASE_DIR=.
-
-if [ "$bundle_type" == "jfx_jcef" ]; then
-  JBRSDK_BUNDLE=jbrsdk
-  echo Creating $JBSDK.tar.gz ...
-  /usr/bin/tar -czf $JBSDK.tar.gz $JBRSDK_BUNDLE || exit 1
-fi
-
-JBR_BUNDLE=jbr_${bundle_type}
-pack_jbr $bundle_type
-
-if [ "$bundle_type" == "jfx_jcef" ]; then
-  JBRSDK_TEST=$JBRSDK_BASE_NAME-windows-test-x64-b$build_number
-  echo Creating $JBRSDK_TEST.tar.gz ...
-  /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || exit 1
-fi

make/Bundles.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -71,7 +71,7 @@ define SetupBundleFileBody
   $$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false)
 
   $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES)
-        # If any of the files contain a space in the file name, FindFiles
+        # If any of the files contain a space in the file name, CacheFind
         # will have replaced it with ?. Tar does not accept that so need to
         # switch it back.
 	$$(foreach d, $$($1_BASE_DIRS), \
@@ -166,12 +166,11 @@ endif
 ################################################################################
 
 ifneq ($(filter product-bundles legacy-bundles, $(MAKECMDGOALS)), )
+  $(eval $(call FillCacheFind, $(IMAGES_OUTPUTDIR)))
 
   SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.pdb %.map
 
-  # There may be files with spaces in the names, so use ShellFindFiles
-  # explicitly.
-  ALL_JDK_FILES := $(call ShellFindFiles, $(JDK_IMAGE_DIR))
+  ALL_JDK_FILES := $(call CacheFind, $(JDK_IMAGE_DIR))
 
   # Create special filter rules when dealing with unzipped .dSYM directories on
   # macosx
@@ -202,11 +201,11 @@ ifneq ($(filter product-bundles legacy-bundles, $(MAKECMDGOALS)), )
               $(ALL_JDK_FILES) \
           ) \
       ) \
-      $(call FindFiles, $(SYMBOLS_IMAGE_DIR))
+      $(call CacheFind, $(SYMBOLS_IMAGE_DIR))
 
   TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES))
 
-  ALL_JRE_FILES := $(call ShellFindFiles, $(JRE_IMAGE_DIR))
+  ALL_JRE_FILES := $(call CacheFind, $(JRE_IMAGE_DIR))
 
   # Create special filter rules when dealing with unzipped .dSYM directories on
   # macosx
@@ -222,96 +221,24 @@ ifneq ($(filter product-bundles legacy-bundles, $(MAKECMDGOALS)), )
       $(SYMBOLS_EXCLUDE_PATTERN), \
       $(ALL_JRE_FILES))
 
-  # On Macosx release builds, when there is a code signing certificate available,
-  # the final bundle layout can be signed.
-  SIGN_BUNDLE := false
-  ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release)
-    ifneq ($(CODESIGN), )
-      SIGN_BUNDLE := true
-    endif
-  endif
+  $(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \
+      BUNDLE_NAME := $(JDK_BUNDLE_NAME), \
+      FILES := $(JDK_BUNDLE_FILES), \
+      SPECIAL_INCLUDES := $(JDK_SPECIAL_INCLUDES), \
+      BASE_DIRS := $(JDK_IMAGE_DIR), \
+      SUBDIR := $(JDK_BUNDLE_SUBDIR), \
+  ))
 
-  ifeq ($(SIGN_BUNDLE), true)
-    # Macosx release build and code signing available.
+  PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE)
 
-    ################################################################################
-    # JDK bundle
-    $(eval $(call SetupCopyFiles, CREATE_JDK_BUNDLE_DIR_SIGNED, \
-        SRC := $(JDK_IMAGE_DIR), \
-        FILES := $(JDK_BUNDLE_FILES), \
-        DEST := $(JDK_MACOSX_BUNDLE_DIR_SIGNED), \
-    ))
+  $(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \
+      BUNDLE_NAME := $(JRE_BUNDLE_NAME), \
+      FILES := $(JRE_BUNDLE_FILES), \
+      BASE_DIRS := $(JRE_IMAGE_DIR), \
+      SUBDIR := $(JRE_BUNDLE_SUBDIR), \
+  ))
 
-    JDK_SIGNED_CODE_RESOURCES := \
-        $(JDK_MACOSX_BUNDLE_DIR_SIGNED)/$(JDK_MACOSX_CONTENTS_SUBDIR)/_CodeSignature/CodeResources
-
-    $(JDK_SIGNED_CODE_RESOURCES): $(CREATE_JDK_BUNDLE_DIR_SIGNED)
-	$(call LogWarn, Signing $(JDK_BUNDLE_NAME))
-	$(CODESIGN) -s "$(MACOSX_CODESIGN_IDENTITY)" \
-	    --timestamp --options runtime --deep --force \
-	    $(JDK_MACOSX_BUNDLE_DIR_SIGNED)/$(JDK_MACOSX_BUNDLE_TOP_DIR) $(LOG_DEBUG)
-	$(TOUCH) $@
-
-    $(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \
-        BUNDLE_NAME := $(JDK_BUNDLE_NAME), \
-        FILES := \
-            $(CREATE_JDK_BUNDLE_DIR_SIGNED) \
-            $(JDK_SIGNED_CODE_RESOURCES), \
-        BASE_DIRS := $(JDK_MACOSX_BUNDLE_DIR_SIGNED), \
-        SUBDIR := $(JDK_BUNDLE_SUBDIR), \
-    ))
-
-    PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE)
-
-    ################################################################################
-    # JRE bundle
-    $(eval $(call SetupCopyFiles, CREATE_JRE_BUNDLE_DIR_SIGNED, \
-        SRC := $(JRE_IMAGE_DIR), \
-        FILES := $(JRE_BUNDLE_FILES), \
-        DEST := $(JRE_MACOSX_BUNDLE_DIR_SIGNED), \
-    ))
-
-    JRE_SIGNED_CODE_RESOURCES := \
-        $(JRE_MACOSX_BUNDLE_DIR_SIGNED)/$(JRE_MACOSX_CONTENTS_SUBDIR)/_CodeSignature/CodeResources
-
-    $(JRE_SIGNED_CODE_RESOURCES): $(CREATE_JRE_BUNDLE_DIR_SIGNED)
-	$(call LogWarn, Signing $(JRE_BUNDLE_NAME))
-	$(CODESIGN) -s "$(MACOSX_CODESIGN_IDENTITY)" \
-	    --timestamp --options runtime --deep --force \
-	    $(JRE_MACOSX_BUNDLE_DIR_SIGNED)/$(JRE_MACOSX_BUNDLE_TOP_DIR) $(LOG_DEBUG)
-	$(TOUCH) $@
-
-    $(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \
-        BUNDLE_NAME := $(JRE_BUNDLE_NAME), \
-        FILES := \
-            $(CREATE_JRE_BUNDLE_DIR_SIGNED) \
-            $(JRE_SIGNED_CODE_RESOURCES), \
-        BASE_DIRS := $(JRE_MACOSX_BUNDLE_DIR_SIGNED), \
-        SUBDIR := $(JRE_BUNDLE_SUBDIR), \
-    ))
-
-    LEGACY_TARGETS += $(BUILD_JRE_BUNDLE)
-  else
-    # Not a Macosx release build or code signing not available.
-    $(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \
-        BUNDLE_NAME := $(JDK_BUNDLE_NAME), \
-        FILES := $(JDK_BUNDLE_FILES), \
-        SPECIAL_INCLUDES := $(JDK_SPECIAL_INCLUDES), \
-        BASE_DIRS := $(JDK_IMAGE_DIR), \
-        SUBDIR := $(JDK_BUNDLE_SUBDIR), \
-    ))
-
-    PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE)
-
-    $(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \
-        BUNDLE_NAME := $(JRE_BUNDLE_NAME), \
-        FILES := $(JRE_BUNDLE_FILES), \
-        BASE_DIRS := $(JRE_IMAGE_DIR), \
-        SUBDIR := $(JRE_BUNDLE_SUBDIR), \
-    ))
-
-    LEGACY_TARGETS += $(BUILD_JRE_BUNDLE)
-  endif
+  LEGACY_TARGETS += $(BUILD_JRE_BUNDLE)
 
   $(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \
       BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \
@@ -339,7 +266,7 @@ endif
 ################################################################################
 
 ifneq ($(filter test-bundles, $(MAKECMDGOALS)), )
-  TEST_BUNDLE_FILES := $(call FindFiles, $(TEST_IMAGE_DIR))
+  TEST_BUNDLE_FILES := $(call CacheFind, $(TEST_IMAGE_DIR))
 
   $(eval $(call SetupBundleFile, BUILD_TEST_BUNDLE, \
       BUNDLE_NAME := $(TEST_BUNDLE_NAME), \
@@ -353,7 +280,7 @@ endif
 ################################################################################
 
 ifneq ($(filter docs-bundles, $(MAKECMDGOALS)), )
-  DOCS_BUNDLE_FILES := $(call FindFiles, $(DOCS_IMAGE_DIR))
+  DOCS_BUNDLE_FILES := $(call CacheFind, $(DOCS_IMAGE_DIR))
 
   $(eval $(call SetupBundleFile, BUILD_DOCS_BUNDLE, \
       BUNDLE_NAME := $(DOCS_BUNDLE_NAME), \

make/CompileCommands.gmk

@@ -1,60 +0,0 @@
-#
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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.
-#
-
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-
-# When FIXPATH is set, let it process the file to make sure all paths are usable
-# by system native tools. The FIXPATH tool assumes arguments preceeded by an @
-# character points to a text file containing further arguments (similar to a
-# linker). It replaces any such arguments with a different temporary filename,
-# whose contents has been processed to make any paths native. To obtain a
-# properly processed compile_commands.json, FIXPATH is then made to invoke an
-# AWK script with the unprocessed json file as the only argument, prepended with
-# an @ character. The AWK script simply copies the contents of this processed
-# file.
-#
-# The sed command encloses the fragments inside brackets and removes the final
-# trailing comma.
-$(OUTPUTDIR)/compile_commands.json: $(wildcard $(MAKESUPPORT_OUTPUTDIR)/compile-commands/*.json)
-	$(call LogWarn, Updating compile_commands.json)
-	$(RM) $@
-	$(FIND) $(MAKESUPPORT_OUTPUTDIR)/compile-commands/ -name \*.json | \
-	    $(SORT) | $(XARGS) $(CAT) >> $@.tmp
-	$(if $(FIXPATH),$(FIXPATH) $(AWK) 'BEGIN { \
-	    tmpfile = substr(ARGV[2],2); \
-	    cmd = "$(CP) " "\047" tmpfile "\047" " $@.tmp"; \
-	    system(cmd); \
-	}' -- @$@.tmp)
-	$(SED) -e '1s/^/[\$(NEWLINE)/' -e '$(DOLLAR)s/,\s\{0,\}$(DOLLAR)/\$(NEWLINE)]/' $@.tmp > $@
-	$(RM) $@.tmp
-
-TARGETS += $(OUTPUTDIR)/compile_commands.json
-
-all: $(TARGETS)
-
-.PHONY: all

make/CompileDemos.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
@@ -43,7 +43,7 @@ $(eval $(call IncludeCustomExtension, CompileDemos-pre.gmk))
 # Prepare the find cache.
 DEMO_SRC_DIRS += $(TOPDIR)/src/demo
 
-$(call FillFindCache, $(DEMO_SRC_DIRS))
+$(eval $(call FillCacheFind, $(wildcard $(DEMO_SRC_DIRS))))
 
 # Append demo goals to this variable.
 TARGETS =
@@ -237,11 +237,11 @@ $(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%: $(DEMO_SHARE_SRC)/nbproject/%
 ifeq ($(OPENJDK_TARGET_OS), solaris)
   TARGETS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \
     $(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%, \
-    $(call FindFiles, $(DEMO_SHARE_SRC)/nbproject))
+    $(call CacheFind, $(DEMO_SHARE_SRC)/nbproject))
 else
   TARGETS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \
     $(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%, \
-    $(call FindFiles, $(DEMO_SHARE_SRC)/nbproject))
+    $(call CacheFind, $(DEMO_SHARE_SRC)/nbproject))
 endif
 
 ################################################################################
@@ -250,7 +250,7 @@ ifneq ($(filter images, $(MAKECMDGOALS)), )
   $(eval $(call SetupCopyFiles, COPY_TO_TEST_IMAGE, \
       SRC := $(SUPPORT_OUTPUTDIR)/demos/image, \
       DEST := $(TEST_IMAGE_DIR)/jdk/demos, \
-      FILES := $(call FindFiles, $(SUPPORT_OUTPUTDIR)/demos/image), \
+      FILES := $(call CacheFind, $(SUPPORT_OUTPUTDIR)/demos/image), \
   ))
 
   IMAGES_TARGETS := $(COPY_TO_TEST_IMAGE)

make/CompileJavaModules.gmk

@@ -644,7 +644,7 @@ endif
 
 ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), )
   $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \
-      $(call FindFiles, $(IMPORT_MODULES_CLASSES)/$(MODULE))
+      $(call CacheFind, $(IMPORT_MODULES_CLASSES)/$(MODULE))
 	$(call MakeDir, $(@D))
         # Do not delete marker and build meta data files
 	$(RM) -r $(filter-out $(@D)/_%, $(wildcard $(@D)/*))

make/CopyImportModules.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@ LIBS_DIR := $(wildcard $(addsuffix /$(MODULE), $(IMPORT_MODULES_LIBS)))
 CMDS_DIR := $(wildcard $(addsuffix /$(MODULE), $(IMPORT_MODULES_CMDS)))
 CONF_DIR := $(wildcard $(addsuffix /$(MODULE), $(IMPORT_MODULES_CONF)))
 
-$(call FillFindCache, $(LIBS_DIR) $(CMDS_DIR) $(CONF_DIR))
+$(eval $(call FillCacheFind, $(LIBS_DIR) $(CMDS_DIR) $(CONF_DIR)))
 
 ifneq ($(LIBS_DIR), )
   ifeq ($(OPENJDK_TARGET_OS), windows)
@@ -45,21 +45,21 @@ ifneq ($(LIBS_DIR), )
         SRC := $(LIBS_DIR), \
         DEST := $(JDK_OUTPUTDIR)/bin, \
         FILES := $(filter $(TO_BIN_FILTER), \
-            $(call FindFiles, $(LIBS_DIR))) \
+            $(call CacheFind, $(LIBS_DIR))) \
     ))
 
     $(eval $(call SetupCopyFiles, COPY_LIBS_TO_LIB, \
         SRC := $(LIBS_DIR), \
         DEST := $(JDK_OUTPUTDIR)/lib, \
         FILES := $(filter-out $(TO_BIN_FILTER), \
-            $(call FindFiles, $(LIBS_DIR))) \
+            $(call CacheFind, $(LIBS_DIR))) \
     ))
     TARGETS += $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB)
   else
     $(eval $(call SetupCopyFiles, COPY_LIBS, \
         SRC := $(LIBS_DIR), \
         DEST := $(JDK_OUTPUTDIR)/lib, \
-        FILES := $(filter %$(SHARED_LIBRARY_SUFFIX), $(call FindFiles, $(LIBS_DIR))), \
+        FILES := $(filter %$(SHARED_LIBRARY_SUFFIX), $(call CacheFind, $(LIBS_DIR))), \
     ))
 
     # Use relative links if the import dir is inside the OUTPUTDIR, otherwise
@@ -75,7 +75,7 @@ ifneq ($(LIBS_DIR), )
     $(eval $(call SetupCopyFiles, LINK_LIBS, \
         SRC := $(LIBS_DIR), \
         DEST := $(JDK_OUTPUTDIR)/lib, \
-        FILES := $(filter-out %$(SHARED_LIBRARY_SUFFIX), $(call FindFiles, $(LIBS_DIR))), \
+        FILES := $(filter-out %$(SHARED_LIBRARY_SUFFIX), $(call CacheFind, $(LIBS_DIR))), \
         MACRO := $(LINK_MACRO), \
         LOG_ACTION := $(LOG_ACTION), \
     ))
@@ -87,7 +87,7 @@ ifneq ($(CMDS_DIR), )
   $(eval $(call SetupCopyFiles, COPY_CMDS, \
       SRC := $(CMDS_DIR), \
       DEST := $(JDK_OUTPUTDIR)/bin, \
-      FILES := $(call FindFiles, $(CMDS_DIR)), \
+      FILES := $(call CacheFind, $(CMDS_DIR)), \
   ))
   TARGETS += $(COPY_CMDS)
 endif
@@ -96,7 +96,7 @@ ifneq ($(CONF_DIR), )
   $(eval $(call SetupCopyFiles, COPY_CONF, \
       SRC := $(CONF_DIR), \
       DEST := $(JDK_OUTPUTDIR)/lib, \
-      FILES := $(call FindFiles, $(CONF_DIR)), \
+      FILES := $(call CacheFind, $(CONF_DIR)), \
   ))
   TARGETS += $(COPY_CONF)
 endif

make/CreateBuildJdkCopy.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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 @@ MODULES_TO_COPY := $(sort \
 
 COPY_CLASSES_TARGET := $(BUILDJDK_OUTPUTDIR)/jdk/modules/java.base/_the.buildjdk-copy-marker
 
-$(COPY_CLASSES_TARGET): $(call FindFiles, $(wildcard \
+$(COPY_CLASSES_TARGET): $(call CacheFind, $(wildcard \
     $(addprefix $(JDK_OUTPUTDIR)/modules/, $(MODULES_TO_COPY))))
 	$(ECHO) $(LOG_INFO) "Copying java modules to buildjdk: $(MODULES_TO_COPY)"
 	$(RM) -r $(BUILDJDK_OUTPUTDIR)/jdk/modules
@@ -56,7 +56,7 @@ TARGETS += $(COPY_CLASSES_TARGET)
 $(eval $(call SetupCopyFiles, COPY_SUPPORT_HEADERS, \
     SRC := $(OUTPUTDIR), \
     DEST := $(BUILDJDK_OUTPUTDIR), \
-    FILES := $(call FindFiles, $(wildcard \
+    FILES := $(call CacheFind, $(wildcard \
         $(addprefix $(SUPPORT_OUTPUTDIR)/headers/, $(MODULES_TO_COPY)))), \
 ))
 

make/CreateJmods.gmk

@@ -51,33 +51,33 @@ INCLUDE_HEADERS_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
 MAN_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
     $(SUPPORT_OUTPUTDIR)/modules_man $(IMPORT_MODULES_MAN))))
 
-$(call FillFindCache, \
+$(eval $(call FillCacheFind, \
     $(LIBS_DIR) $(CMDS_DIR) $(CONF_DIR) $(CLASSES_DIR) \
-)
+))
 
 ifneq ($(LIBS_DIR), )
   JMOD_FLAGS += --libs $(LIBS_DIR)
-  DEPS += $(call FindFiles, $(LIBS_DIR))
+  DEPS += $(call CacheFind, $(LIBS_DIR))
 endif
 ifneq ($(CMDS_DIR), )
   JMOD_FLAGS += --cmds $(CMDS_DIR)
-  DEPS += $(call FindFiles, $(CMDS_DIR))
+  DEPS += $(call CacheFind, $(CMDS_DIR))
 endif
 ifneq ($(CONF_DIR), )
   JMOD_FLAGS += --config $(CONF_DIR)
-  DEPS += $(call FindFiles, $(CONF_DIR))
+  DEPS += $(call CacheFind, $(CONF_DIR))
 endif
 ifneq ($(CLASSES_DIR), )
   JMOD_FLAGS += --class-path $(CLASSES_DIR)
-  DEPS += $(call FindFiles, $(CLASSES_DIR))
+  DEPS += $(call CacheFind, $(CLASSES_DIR))
 endif
 ifneq ($(INCLUDE_HEADERS_DIR), )
   JMOD_FLAGS += --header-files $(INCLUDE_HEADERS_DIR)
-  DEPS += $(call FindFiles, $(INCLUDE_HEADERS_DIR))
+  DEPS += $(call CacheFind, $(INCLUDE_HEADERS_DIR))
 endif
 ifneq ($(MAN_DIR), )
   JMOD_FLAGS += --man-pages $(MAN_DIR)
-  DEPS += $(call FindFiles, $(MAN_DIR))
+  DEPS += $(call CacheFind, $(MAN_DIR))
 endif
 
 # If a specific modules_legal dir exists for this module, only pick up files
@@ -91,7 +91,7 @@ LEGAL_NOTICES := \
     )
 
 LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES))
-DEPS += $(call FindFiles, $(LEGAL_NOTICES))
+DEPS += $(call CacheFind, $(LEGAL_NOTICES))
 
 JMOD_FLAGS += --legal-notices $(LEGAL_NOTICES_PATH)
 
@@ -145,7 +145,7 @@ endif
 # the actual command. Filter that out using wildcard before adding to DEPS.
 DEPS += $(wildcard $(JMOD_CMD))
 ifeq ($(EXTERNAL_BUILDJDK), false)
-  DEPS += $(call FindFiles, $(JDK_OUTPUTDIR)/modules/jdk.jlink/jdk/tools/jmod)
+  DEPS += $(call CacheFind, $(JDK_OUTPUTDIR)/modules/jdk.jlink/jdk/tools/jmod)
 endif
 
 # If creating interim versions of jmods, certain files need to be filtered out

make/Docs.gmk

@@ -341,7 +341,7 @@ define SetupApiDocsGenerationBody
       $$(SUPPORT_OUTPUTDIR)/docs/$1.vardeps)
 
   # Get a list of all files in all the source dirs for all included modules
-  $1_SOURCE_DEPS := $$(call FindFiles, $$(wildcard $$(foreach module, \
+  $1_SOURCE_DEPS := $$(call CacheFind, $$(wildcard $$(foreach module, \
       $$($1_ALL_MODULES), $$(call FindModuleSrcDirs, $$(module)))))
 
   # Javadoc creates a lot of files but use index.html as a marker
@@ -496,7 +496,7 @@ JDK_INDEX_TARGETS += $(JDK_INDEX_HTML)
 GLOBAL_SPECS_RESOURCES_DIR := $(TOPDIR)/make/data/docs-resources/
 $(eval $(call SetupCopyFiles, COPY_GLOBAL_RESOURCES, \
     SRC := $(GLOBAL_SPECS_RESOURCES_DIR), \
-    FILES := $(call FindFiles, $(GLOBAL_SPECS_RESOURCES_DIR)), \
+    FILES := $(call CacheFind, $(GLOBAL_SPECS_RESOURCES_DIR)), \
     DEST := $(DOCS_OUTPUTDIR), \
 ))
 JDK_INDEX_TARGETS += $(COPY_GLOBAL_RESOURCES)
@@ -521,10 +521,10 @@ COPY_SPEC_FILTER := %.html %.gif %.jpg %.mib %.css
 $(foreach m, $(ALL_MODULES), \
   $(eval SPECS_$m := $(call FindModuleSpecsDirs, $m)) \
   $(foreach d, $(SPECS_$m), \
-    $(if $(filter $(COPY_SPEC_FILTER), $(call FindFiles, $d)), \
+    $(if $(filter $(COPY_SPEC_FILTER), $(call CacheFind, $d)), \
       $(eval $(call SetupCopyFiles, COPY_$m, \
           SRC := $d, \
-          FILES := $(filter $(COPY_SPEC_FILTER), $(call FindFiles, $d)), \
+          FILES := $(filter $(COPY_SPEC_FILTER), $(call CacheFind, $d)), \
           DEST := $(DOCS_OUTPUTDIR)/specs/, \
       )) \
       $(eval JDK_SPECS_TARGETS += $(COPY_$m)) \
@@ -541,11 +541,11 @@ ifeq ($(ENABLE_FULL_DOCS), true)
   $(foreach m, $(ALL_MODULES), \
     $(eval SPECS_$m := $(call FindModuleSpecsDirs, $m)) \
     $(foreach d, $(SPECS_$m), \
-      $(if $(filter %.md, $(call FindFiles, $d)), \
+      $(if $(filter %.md, $(call CacheFind, $d)), \
         $(eval $m_$d_NAME := CONVERT_MARKDOWN_$m_$(strip $(call RelativePath, $d, $(TOPDIR)))) \
         $(eval $(call SetupProcessMarkdown, $($m_$d_NAME), \
             SRC := $d, \
-            FILES := $(filter %.md, $(call FindFiles, $d)), \
+            FILES := $(filter %.md, $(call CacheFind, $d)), \
             DEST := $(DOCS_OUTPUTDIR)/specs/, \
             CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
         )) \

make/GensrcModuleInfo.gmk

@@ -81,9 +81,7 @@ ifneq ($(MOD_FILES), )
       $(call DependOnVariable, ALL_MODULES)
 		$(MKDIR) -p $(@D)
 		$(RM) $@ $@.tmp
-		$(TOOL_GENMODULEINFOSOURCE) \
-		    $(if $(call equals, $(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT), true), -d) \
-		    -o $@.tmp \
+		$(TOOL_GENMODULEINFOSOURCE) -o $@.tmp \
 		    --source-file $< \
 		    --modules $(call CommaList, $(ALL_MODULES)) \
 		    $(MOD_FILES)

make/Images.gmk

@@ -276,14 +276,21 @@ endif
 
 ifeq ($(GCOV_ENABLED), true)
 
-  $(eval $(call SetupCopyFiles,COPY_GCOV_GCNO, \
+  GCOV_FIND_EXPR := -type f -name "*.gcno"
+
+  $(eval $(call SetupCopyFiles,COPY_HOTSPOT_GCOV_GCNO, \
       SRC := $(OUTPUTDIR), \
       DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
-      FILES := $(call FindFiles, $(HOTSPOT_OUTPUTDIR) \
-          $(SUPPORT_OUTPUTDIR)/native, *.gcno) \
-  ))
+      FILES := $(shell $(FIND) $(HOTSPOT_OUTPUTDIR) $(GCOV_FIND_EXPR))))
 
-  SYMBOLS_TARGETS += $(COPY_GCOV_GCNO)
+  SYMBOLS_TARGETS += $(COPY_HOTSPOT_GCOV_GCNO)
+
+  $(eval $(call SetupCopyFiles,COPY_JDK_GCOV_GCNO, \
+      SRC := $(OUTPUTDIR), \
+      DEST := $(SYMBOLS_IMAGE_DIR)/gcov, \
+      FILES := $(shell $(FIND) $(SUPPORT_OUTPUTDIR)/native $(GCOV_FIND_EXPR))))
+
+  SYMBOLS_TARGETS += $(COPY_JDK_GCOV_GCNO)
 
 endif
 
@@ -316,10 +323,10 @@ else
   # On Macosx, if debug symbols have not been zipped, find all files inside *.dSYM
   # dirs.
   ifeq ($(OPENJDK_TARGET_OS), macosx)
-    $(call FillFindCache, \
-        $(SUPPORT_OUTPUTDIR)/modules_cmds $(SUPPORT_OUTPUTDIR)/modules_libs)
+    $(eval $(call FillCacheFind, \
+        $(SUPPORT_OUTPUTDIR)/modules_cmds $(SUPPORT_OUTPUTDIR)/modules_libs))
     FindDebuginfoFiles = \
-        $(if $(wildcard $1), $(call containing, .dSYM/, $(call FindFiles, $1)))
+        $(if $(wildcard $1), $(call containing, .dSYM/, $(call CacheFind, $1)))
   endif
 endif
 

make/MacBundles.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -52,13 +52,13 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
   $(eval $(call SetupCopyFiles, COPY_JDK_IMAGE, \
       SRC := $(JDK_IMAGE_DIR), \
       DEST := $(JDK_MACOSX_CONTENTS_DIR)/Home, \
-      FILES := $(call FindFiles, $(JDK_IMAGE_DIR)), \
+      FILES := $(call CacheFind, $(JDK_IMAGE_DIR)), \
   ))
 
   $(eval $(call SetupCopyFiles, COPY_JRE_IMAGE, \
       SRC := $(JRE_IMAGE_DIR), \
       DEST := $(JRE_MACOSX_CONTENTS_DIR)/Home, \
-      FILES := $(call FindFiles, $(JRE_IMAGE_DIR)), \
+      FILES := $(call CacheFind, $(JRE_IMAGE_DIR)), \
   ))
 
    $(eval $(call SetupCopyFiles, COPY_LIBJLI_JDK, \

make/Main.gmk

@@ -80,7 +80,7 @@ ifneq ($(CREATING_BUILDJDK), true)
 
   interim-cldrconverter:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
-
+ 
 interim-tzdb:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimTZDB.gmk)
 
@@ -140,7 +140,7 @@ ifneq ($(CREATING_BUILDJDK), true)
   define DeclareModuleInfoRecipe
     $1-gensrc-moduleinfo:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
-	    -f gensrc/GensrcModuleInfo.gmk MODULE=$1)
+	    -f GensrcModuleInfo.gmk MODULE=$1)
 
     $1-gensrc: $1-gensrc-moduleinfo
   endef
@@ -266,52 +266,6 @@ hotspot-ide-project:
 ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
     $(HOTSPOT_VARIANT_LIBS_TARGETS) hotspot-ide-project
 
-################################################################################
-# Generate libs and launcher targets for creating compile_commands.json fragments
-define DeclareCompileCommandsRecipe
-  $1-compile-commands:
-	$$(call LogInfo, Generating compile_commands.json fragments for $1)
-	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Main.gmk $1-only \
-	    GENERATE_COMPILE_COMMANDS_ONLY=true)
-
-  COMPILE_COMMANDS_TARGETS_$2 += $1-compile-commands
-endef
-
-$(foreach t, $(HOTSPOT_VARIANT_LIBS_TARGETS), \
-  $(eval $(call DeclareCompileCommandsRecipe,$t,HOTSPOT)) \
-)
-
-$(foreach t, $(LIBS_TARGETS) $(LAUNCHER_TARGETS), \
-  $(eval $(call DeclareCompileCommandsRecipe,$t,JDK)) \
-)
-
-compile-commands compile-commands-hotspot:
-	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileCommands.gmk)
-
-ALL_TARGETS += $(COMPILE_COMMANDS_TARGETS_HOTSPOT) $(COMPILE_COMMANDS_TARGETS_JDK)
-ALL_TARGETS += compile-commands compile-commands-hotspot
-
-################################################################################
-# VS Code projects
-vscode-project:
-	+($(CD) $(TOPDIR)/make/vscode && $(MAKE) $(MAKE_ARGS) -f CreateVSCodeProject.gmk \
-      VSCODE_INDEXER=cpptools)
-
-vscode-project-clangd:
-	+($(CD) $(TOPDIR)/make/vscode && $(MAKE) $(MAKE_ARGS) -f CreateVSCodeProject.gmk \
-      VSCODE_INDEXER=clangd)
-
-vscode-project-rtags:
-	+($(CD) $(TOPDIR)/make/vscode && $(MAKE) $(MAKE_ARGS) -f CreateVSCodeProject.gmk \
-      VSCODE_INDEXER=rtags)
-
-vscode-project-ccls:
-	+($(CD) $(TOPDIR)/make/vscode && $(MAKE) $(MAKE_ARGS) -f CreateVSCodeProject.gmk \
-      VSCODE_INDEXER=ccls)
-
-ALL_TARGETS += vscode-project vscode-project-clangd vscode-project-rtags \
-  vscode-project-ccls
-
 ################################################################################
 # Build demos targets
 
@@ -609,12 +563,8 @@ test-jdk-jtreg-native:
 test-make:
 	($(CD) $(TOPDIR)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET))
 
-test-compile-commands:
-	($(CD) $(TOPDIR)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk test-compile-commands)
-
 ALL_TARGETS += test test-hotspot-jtreg test-hotspot-jtreg-native \
-    test-hotspot-internal test-hotspot-gtest test-jdk-jtreg-native test-make \
-    test-compile-commands
+    test-hotspot-internal test-hotspot-gtest test-jdk-jtreg-native test-make
 
 ################################################################################
 # Bundles
@@ -686,6 +636,7 @@ else
 
   # Declare dependencies between hotspot-<variant>* targets
   $(foreach v, $(JVM_VARIANTS), \
+      $(eval hotspot-$v: hotspot-$v-gensrc hotspot-$v-libs) \
       $(eval hotspot-$v-gensrc: java.base-copy) \
       $(eval hotspot-$v-libs: hotspot-$v-gensrc java.base-copy) \
   )
@@ -748,17 +699,16 @@ else
   # copied and processed.
   java.desktop-gensrc-src: java.base-gensrc java.base-copy
 
-  # The annotation processing for jdk.internal.vm.compiler
-  # and jdk.internal.vm.compiler.management needs classes from the current JDK.
+  # The annotation processing for jdk.internal.vm.ci and jdk.internal.vm.compiler
+  # needs classes from the current JDK.
+  jdk.internal.vm.ci-gensrc-src: $(addsuffix -java, \
+      $(call FindTransitiveDepsForModule, jdk.internal.vm.ci))
   jdk.internal.vm.compiler-gensrc-src: $(addsuffix -java, \
       $(call FindTransitiveDepsForModule, jdk.internal.vm.compiler))
-  jdk.internal.vm.compiler.management-gensrc-src: $(addsuffix -java, \
-      $(call FindTransitiveDepsForModule, jdk.internal.vm.compiler.management))
 
-  # For these modules, the gensrc step is generating a module-info.java.extra
+  # For jdk.internal.vm.compiler, the gensrc step is generating a module-info.java.extra
   # file to be processed by the gensrc-moduleinfo target.
   jdk.internal.vm.compiler-gensrc-moduleinfo: jdk.internal.vm.compiler-gensrc-src
-  jdk.internal.vm.compiler.management-gensrc-moduleinfo: jdk.internal.vm.compiler.management-gensrc-src
 
   jdk.jdeps-gendata: java rmic
 
@@ -793,25 +743,6 @@ else
   $(foreach m, $(ALL_MODULES), $(eval $m-jmod: $($(m)_JMOD_DEPS)))
   $(foreach m, $(INTERIM_IMAGE_MODULES), $(eval $m-interim-jmod: $($(m)_JMOD_DEPS)))
 
-  # Setup the minimal set of generated native source dependencies for hotspot
-  $(foreach v, $(JVM_VARIANTS), \
-    $(eval hotspot-$v-libs-compile-commands: hotspot-$v-gensrc) \
-    $(foreach m, $(filter java.desktop jdk.hotspot.agent, $(GENSRC_MODULES)), \
-      $(eval hotspot-$v-libs-compile-commands: $m-gensrc)) \
-  )
-
-  # For the full JDK compile commands, create all possible generated sources
-  $(foreach m, $(GENSRC_MODULES), $(eval $m-libs-compile-commands: $m-gensrc))
-  $(foreach m, $(filter $(JAVA_MODULES), $(LIBS_MODULES)), $(eval $m-libs-compile-commands: $m-java))
-
-  compile-commands-hotspot: $(COMPILE_COMMANDS_TARGETS_HOTSPOT)
-  compile-commands: $(COMPILE_COMMANDS_TARGETS_HOTSPOT) $(COMPILE_COMMANDS_TARGETS_JDK)
-
-  vscode-project: compile-commands
-  vscode-project-clangd: compile-commands
-  vscode-project-rtags: compile-commands
-  vscode-project-ccls: compile-commands
-
   # Jmods cannot be created until we have the jmod tool ready to run. During
   # a normal build we run it from the exploded image, but when cross compiling
   # it's run from the buildjdk, which is either created at build time or user
@@ -926,8 +857,6 @@ else
 
   test-make: clean-test-make
 
-  test-compile-commands: compile-commands
-
   build-test-lib: exploded-image-optimize
 
   build-test-failure-handler: interim-langtools
@@ -981,10 +910,6 @@ JVM_TOOLS_TARGETS ?= buildtools-hotspot
 buildtools: buildtools-langtools interim-langtools interim-rmic \
     buildtools-jdk $(JVM_TOOLS_TARGETS)
 
-# Declare dependencies from hotspot-<variant> targets
-$(foreach v, $(JVM_VARIANTS), \
-  $(eval hotspot-$v: hotspot-$v-gensrc hotspot-$v-libs) \
-)
 hotspot: $(HOTSPOT_VARIANT_TARGETS)
 
 # Create targets hotspot-libs and hotspot-gensrc.
@@ -1161,7 +1086,7 @@ CLEAN_MODULE_PHASE_TARGETS := $(addprefix clean-, $(foreach m, $(ALL_MODULES), \
 
 # Remove everything, except the output from configure.
 clean: $(CLEAN_DIR_TARGETS)
-	($(CD) $(OUTPUTDIR) && $(RM) -r build*.log* compile_commands.json)
+	($(CD) $(OUTPUTDIR) && $(RM) -r build*.log*)
 	$(ECHO) Cleaned all build artifacts.
 
 clean-docs:

make/ModuleWrapper.gmk

@@ -100,9 +100,5 @@ $(eval $(call SetupCopyFiles, COPY_CONF, \
         $(TARGETS)), \
 ))
 
-ifeq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
-  all: $(filter $(MAKESUPPORT_OUTPUTDIR)/compile-commands/%, $(TARGETS))
-else
-  all: $(TARGETS) $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB) \
-      $(COPY_INCLUDE) $(COPY_CMDS) $(COPY_CONF) $(LINK_LIBS_TO_LIB)
-endif
+all: $(TARGETS) $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB) \
+    $(COPY_INCLUDE) $(COPY_CMDS) $(COPY_CONF) $(LINK_LIBS_TO_LIB)

make/RunTests.gmk

@@ -83,7 +83,7 @@ endif
 
 $(eval $(call ParseKeywordVariable, TEST_OPTS, \
     SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR, \
-    STRING_KEYWORDS := VM_OPTIONS JAVA_OPTIONS AOT_MODULES, \
+    STRING_KEYWORDS := VM_OPTIONS JAVA_OPTIONS, \
 ))
 
 # Helper function to propagate TEST_OPTS values.
@@ -141,93 +141,8 @@ ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), )
       -timeoutHandlerTimeout:0
 endif
 
-GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher, %, \
-    $(wildcard $(TEST_IMAGE_DIR)/hotspot/gtest/*/gtestLauncher))
-GTEST_VARIANTS := $(strip $(patsubst $(TEST_IMAGE_DIR)/hotspot/gtest/%, %, \
-    $(GTEST_LAUNCHER_DIRS)))
-
-################################################################################
-# Optionally create AOT libraries for specified modules before running tests.
-# Note, this could not be done during JDK build time.
-################################################################################
-
-# Note, this could not be done during JDK build time.
-
-# Parameter 1 is the name of the rule.
-#
-# Remaining parameters are named arguments.
-#   MODULE      The module to generate a library for
-#   BIN         Output directory in which to put the library
-#   VM_OPTIONS  List of JVM arguments to use when creating library
-#   OPTIONS_VAR Name of variable to put AOT java options in
-#   PREREQS_VAR Name of variable to put all AOT prerequisite rule targets in
-#               for test rules to depend on
-#
-SetupAotModule = $(NamedParamsMacroTemplate)
-define SetupAotModuleBody
-  $1_AOT_LIB := $$($1_BIN)/$$(call SHARED_LIBRARY,$$($1_MODULE))
-  $1_AOT_CCLIST := $$(wildcard $$(TOPDIR)/test/hotspot/jtreg/compiler/aot/scripts/$$($1_MODULE)-list.txt)
-
-  # Create jaotc flags.
-  # VM flags which don't affect AOT code generation are filtered out:
-  # -Xcomp, -XX:+-TieredCompilation
-  $1_JAOTC_OPTS := \
-      -J-Xmx4g --info \
-      $$(addprefix -J, $$(filter-out -Xcomp %TieredCompilation, $$($1_VM_OPTIONS))) \
-      $$(addprefix --compile-commands$(SPACE), $$($1_AOT_CCLIST)) \
-      --linker-path $$(LD_JAOTC) \
-      #
-
-  ifneq ($$(filter -ea, $$($1_VM_OPTIONS)), )
-    $1_JAOTC_OPTS += --compile-with-assertions
-  endif
-
-  $$($1_AOT_LIB): $$(JDK_IMAGE_DIR)/release \
-      $$(call DependOnVariable, $1_JAOTC_OPTS) \
-      $$(call DependOnVariable, JDK_IMAGE_DIR)
-	$$(call LogWarn, Generating $$(patsubst $$(OUTPUTDIR)/%, %, $$@))
-	$$(call MakeTargetDir)
-	$$(call ExecuteWithLog, $$@, ( \
-	    $$(FIXPATH) $$(JDK_IMAGE_DIR)/bin/jaotc \
-	        $$($1_JAOTC_OPTS) --output $$@ --module $$($1_MODULE) \
-	))
-	$$(call ExecuteWithLog, $$@.check, ( \
-	    $$(FIXPATH) $$(JDK_IMAGE_DIR)/bin/java \
-	        $$($1_VM_OPTIONS) -XX:+UnlockDiagnosticVMOptions \
-	        -XX:+PrintAOT -XX:+UseAOTStrictLoading \
-	        -XX:AOTLibrary=$$@ -version \
-	         > $$@.verify-aot \
-	))
-
-  $1_AOT_OPTIONS += -XX:AOTLibrary=$$($1_AOT_LIB)
-  $1_AOT_TARGETS += $$($1_AOT_LIB)
-endef
-
-# Parameter 1 is the name of the rule.
-#
-# Remaining parameters are named arguments.
-#   MODULES     The modules to generate a library for
-#   VM_OPTIONS  List of JVM arguments to use when creating libraries
-#
-# After calling this, the following variables are defined
-#   $1_AOT_OPTIONS List of all java options needed to use the AOT libraries
-#   $1_AOT_TARGETS List of all targets that the test rule will need to depend on
-#
-SetupAot = $(NamedParamsMacroTemplate)
-define SetupAotBody
-  $$(info Running with AOTd libraries for $$($1_MODULES))
-  # Put aot libraries in a separate directory so they are not deleted between
-  # test runs and may be reused between make invocations.
-  $$(foreach m, $$($1_MODULES), \
-    $$(eval $$(call SetupAotModule, $1_$$m, \
-        MODULE := $$m, \
-        BIN := $$(TEST_SUPPORT_DIR)/aot/$1, \
-        VM_OPTIONS := $$($1_VM_OPTIONS), \
-    )) \
-    $$(eval $1_AOT_OPTIONS += $$($1_$$m_AOT_OPTIONS)) \
-    $$(eval $1_AOT_TARGETS += $$($1_$$m_AOT_TARGETS)) \
-  )
-endef
+GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher, %, $(wildcard $(TEST_IMAGE_DIR)/hotspot/gtest/*/gtestLauncher))
+GTEST_VARIANTS := $(strip $(patsubst $(TEST_IMAGE_DIR)/hotspot/gtest/%, %, $(GTEST_LAUNCHER_DIRS)))
 
 ################################################################################
 # Setup global test running parameters
@@ -268,17 +183,13 @@ $(eval $(call SetTestOpt,JAVA_OPTIONS,JTREG))
 $(eval $(call SetTestOpt,VM_OPTIONS,GTEST))
 $(eval $(call SetTestOpt,JAVA_OPTIONS,GTEST))
 
-$(eval $(call SetTestOpt,AOT_MODULES,JTREG))
-$(eval $(call SetTestOpt,AOT_MODULES,GTEST))
-
 $(eval $(call SetTestOpt,JOBS,JTREG))
 $(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG))
 
 $(eval $(call ParseKeywordVariable, JTREG, \
-    SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR TEST_MODE ASSERT VERBOSE RETAIN \
-        MAX_MEM, \
-    STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
-        EXTRA_PROBLEM_LISTS AOT_MODULES, \
+    SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM \
+        EXTRA_PROBLEM_LISTS KEYWORDS, \
+    STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS, \
 ))
 
 ifneq ($(JTREG), )
@@ -288,7 +199,7 @@ endif
 
 $(eval $(call ParseKeywordVariable, GTEST, \
     SINGLE_KEYWORDS := REPEAT, \
-    STRING_KEYWORDS := OPTIONS VM_OPTIONS JAVA_OPTIONS AOT_MODULES, \
+    STRING_KEYWORDS := OPTIONS VM_OPTIONS JAVA_OPTIONS, \
 ))
 
 ifneq ($(GTEST), )
@@ -426,7 +337,7 @@ endef
 
 # Helper function to determine if a test specification is a special test
 #
-# It is a special test if it is "special:" followed by a test name,
+# It is a special test if it is "special:" followed by a test name.
 define ParseSpecialTestSelection
   $(if $(filter special:%, $1), \
     $1 \
@@ -517,27 +428,20 @@ define SetupRunGtestTestBody
     $1_GTEST_REPEAT :=--gtest_repeat=$$(GTEST_REPEAT)
   endif
 
-  ifneq ($$(GTEST_AOT_MODULES), )
-    $$(eval $$(call SetupAot, $1, \
-        MODULES := $$(GTEST_AOT_MODULES), \
-        VM_OPTIONS := $$(GTEST_VM_OPTIONS) $$(GTEST_JAVA_OPTIONS), \
-    ))
-  endif
-
-  run-test-$1: $$($1_AOT_TARGETS)
+  run-test-$1: $(TEST_PREREQS)
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
-	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, ( \
+	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/gtest, \
 	    $$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/$$($1_VARIANT)/gtestLauncher \
 	        -jdk $(JDK_IMAGE_DIR) $$($1_GTEST_FILTER) \
 	        --gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \
 	        $$($1_GTEST_REPEAT) $$(GTEST_OPTIONS) $$(GTEST_VM_OPTIONS) \
-	        $$(GTEST_JAVA_OPTIONS) $$($1_AOT_OPTIONS) \
+	        $$($1_GTEST_JAVA_OPTIONS) \
 	        > >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) \
 	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
-	))
+	)
 
   $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt
 
@@ -705,8 +609,7 @@ define SetupRunJtregTestBody
     $1_JTREG_BASIC_OPTIONS += -e:JIB_HOME=$$(JIB_HOME)
   endif
 
-  $1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_DIR=$(TEST_IMAGE_DIR)
-  $1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_GRAAL_DIR=$(TEST_IMAGE_DIR)/hotspot/jtreg/graal
+  $1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_GRAAL_DIR=${TEST_IMAGE_DIR}/hotspot/jtreg/graal
 
   ifneq ($$(JTREG_FAILURE_HANDLER_OPTIONS), )
     $1_JTREG_LAUNCHER_OPTIONS += -Djava.library.path="$(JTREG_FAILURE_HANDLER_DIR)"
@@ -723,25 +626,14 @@ define SetupRunJtregTestBody
     endif
   endif
 
-  ifneq ($$(JTREG_AOT_MODULES), )
-    $$(eval $$(call SetupAot, $1, \
-        MODULES := $$(JTREG_AOT_MODULES), \
-        VM_OPTIONS := $$(JTREG_VM_OPTIONS) $$(JTREG_JAVA_OPTIONS), \
-    ))
-  endif
-
-  ifneq ($$($1_AOT_OPTIONS), )
-    $1_JTREG_BASIC_OPTIONS += -vmoptions:"$$($1_AOT_OPTIONS)"
-  endif
-
   clean-workdir-$1:
 	$$(RM) -r $$($1_TEST_SUPPORT_DIR)
 
-  run-test-$1: clean-workdir-$1 $$($1_AOT_TARGETS)
+  run-test-$1: clean-workdir-$1 $(TEST_PREREQS)
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
-	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, ( \
+	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, \
 	    $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
 	        -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \
 	        $$($1_JTREG_BASIC_OPTIONS) \
@@ -754,7 +646,7 @@ define SetupRunJtregTestBody
 	        $$($1_TEST_NAME) \
 	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
-	))
+	)
 
   $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/text/stats.txt
 
@@ -828,12 +720,12 @@ define SetupRunSpecialTestBody
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
 	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
-	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/test-execution, ( \
+	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/test-execution, \
 	    $$($1_TEST_COMMAND_LINE) \
 	        > >($(TEE) $$($1_TEST_RESULTS_DIR)/test-output.txt) \
 	    && $$(ECHO) $$$$? > $$($1_EXITCODE) \
 	    || $$(ECHO) $$$$? > $$($1_EXITCODE) \
-	))
+	)
 
   $1_RESULT_FILE := $$($1_TEST_RESULTS_DIR)/gtest.txt
 

make/RunTestsPrebuilt.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -95,12 +95,12 @@ endef
 # $1: The output file name
 # $2..$N: The lines to output to the file
 define CreateNewSpec
-  $(if $(strip $(31)), \
+  $(if $(strip $(27)), \
     $(error Internal makefile error: \
       Too many arguments to macro, please update CreateNewSpec in RunTestsPrebuilt.gmk) \
   ) \
   $(shell $(RM) $1) \
-  $(foreach i, $(call sequence, 2, 30), \
+  $(foreach i, $(call sequence, 2, 26), \
     $(if $(strip $($i)), \
       $(call AppendFile, $(strip $($i)), $1) \
     ) \
@@ -250,30 +250,6 @@ ifeq ($(MEMORY_SIZE), )
   MEMORY_SIZE := 1024
 endif
 
-# Setup LD for AOT support
-ifneq ($(DEVKIT_HOME), )
-  ifeq ($(OPENJDK_TARGET_OS), windows)
-    LD_JAOTC := $(DEVKIT_HOME)/VC/bin/x64/link.exe
-    LIBRARY_PREFIX :=
-    SHARED_LIBRARY_SUFFIX := .dll
-  else ifeq ($(OPENJDK_TARGET_OS), linux)
-    LD_JAOTC := $(DEVKIT_HOME)/bin/ld
-    LIBRARY_PREFIX := lib
-    SHARED_LIBRARY_SUFFIX := .so
-  else ifeq ($(OPENJDK_TARGET_OS), macosx)
-    LD_JAOTC := $(DEVKIT_HOME)/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
-    LIBRARY_PREFIX := lib
-    SHARED_LIBRARY_SUFFIX := .dylib
-  else ifeq ($(OPENJDK_TARGET_OS), solaris)
-    # Prefer system linker for AOT on Solaris.
-    LD_JAOTC := ld
-    LIBRARY_PREFIX := lib
-    SHARED_LIBRARY_SUFFIX := .so
-  endif
-else
-  LD := ld
-endif
-
 ################################################################################
 # Generate the ephemeral spec file
 ################################################################################
@@ -310,9 +286,6 @@ $(call CreateNewSpec, $(NEW_SPEC), \
     OPENJDK_TARGET_CPU_ENDIAN := $(OPENJDK_TARGET_CPU_ENDIAN), \
     NUM_CORES := $(NUM_CORES), \
     MEMORY_SIZE := $(MEMORY_SIZE), \
-    LD_JAOTC := $(LD_JAOTC), \
-    LIBRARY_PREFIX := $(LIBRARY_PREFIX), \
-    SHARED_LIBRARY_SUFFIX := $(SHARED_LIBRARY_SUFFIX), \
     include $(TOPDIR)/make/RunTestsPrebuiltSpec.gmk, \
     $(CUSTOM_NEW_SPEC_LINE), \
 )

make/RunTestsPrebuiltSpec.gmk

@@ -186,7 +186,3 @@ endif
 ifeq ($(OPENJDK_BUILD_OS), windows)
   CYGPATH := cygpath
 endif
-
-################################################################################
-# Simple macros from spec.gmk.in
-SHARED_LIBRARY=$(LIBRARY_PREFIX)$1$(SHARED_LIBRARY_SUFFIX)

make/TestImage.gmk

@@ -37,22 +37,10 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
 	$(call install-file)
 endif
 
-BUILD_INFO_PROPERTIES := $(TEST_IMAGE_DIR)/build-info.properties
-
-FIXPATH_ECHO := $(FIXPATH) $(call FixPath, $(ECHO))
-
-$(BUILD_INFO_PROPERTIES):
-	$(call MakeTargetDir)
-	$(ECHO) "# Build info properties for JDK tests" > $@
-	$(FIXPATH_ECHO) "build.workspace.root=$(WORKSPACE_ROOT)" >> $@
-	$(FIXPATH_ECHO) "build.output.root=$(OUTPUTDIR)" >> $@
-
-prepare-test-image: $(FIXPATH_COPY) $(BUILD_INFO_PROPERTIES)
+prepare-test-image: $(FIXPATH_COPY)
 	$(call MakeDir, $(TEST_IMAGE_DIR))
 	$(ECHO) > $(TEST_IMAGE_DIR)/Readme.txt 'JDK test image'
 
-################################################################################
-
 all: prepare-test-image
 
 .PHONY: default all prepare-test-image

make/UpdateBuildDocs.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -45,13 +45,21 @@ GLOBAL_SPECS_DEFAULT_CSS_FILE := $(TOPDIR)/make/data/docs-resources/resources/jd
 
 DOCS_DIR := $(TOPDIR)/doc
 
-$(eval $(call SetupProcessMarkdown, md_docs, \
-  FILES := $(call FindFiles, $(DOCS_DIR), *.md), \
+$(eval $(call SetupProcessMarkdown, building, \
+  FILES := $(DOCS_DIR)/building.md, \
   DEST := $(DOCS_DIR), \
   CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
   OPTIONS := --toc, \
 ))
-TARGETS += $(md_docs)
+TARGETS += $(building)
+
+$(eval $(call SetupProcessMarkdown, testing, \
+  FILES := $(DOCS_DIR)/testing.md, \
+  DEST := $(DOCS_DIR), \
+  CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
+  OPTIONS := --toc, \
+))
+TARGETS += $(testing)
 
 ################################################################################
 

make/ZipSource.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, 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
@@ -87,7 +87,6 @@ ifeq ($(SRC_GENERATED), true)
       EXCLUDE_FILES := $(SRC_ZIP_EXCLUDE_FILES), \
       SUFFIXES := .java, \
       ZIP := $(SUPPORT_OUTPUTDIR)/src.zip, \
-      FOLLOW_SYMLINKS := true, \
   ))
 
   do-zip: $(BUILD_SRC_ZIP)

make/autoconf/basics.m4

@@ -641,13 +641,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
   AC_MSG_RESULT([$TOPDIR])
   AC_SUBST(TOPDIR)
 
-  if test "x$CUSTOM_ROOT" != x; then
-    WORKSPACE_ROOT="${CUSTOM_ROOT}"
-  else
-    WORKSPACE_ROOT="${TOPDIR}"
-  fi
-  AC_SUBST(WORKSPACE_ROOT)
-
   # We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
   BASIC_FIXUP_PATH(CURDIR)
   BASIC_FIXUP_PATH(TOPDIR)
@@ -874,7 +867,11 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
       AC_MSG_RESULT([in build directory with custom name])
     fi
 
-    OUTPUTDIR="${WORKSPACE_ROOT}/build/${CONF_NAME}"
+    if test "x$CUSTOM_ROOT" != x; then
+      OUTPUTDIR="${CUSTOM_ROOT}/build/${CONF_NAME}"
+    else
+      OUTPUTDIR="${TOPDIR}/build/${CONF_NAME}"
+    fi
     $MKDIR -p "$OUTPUTDIR"
     if test ! -d "$OUTPUTDIR"; then
       AC_MSG_ERROR([Could not create build directory $OUTPUTDIR])

make/autoconf/buildjdk-spec.gmk.in

@@ -75,8 +75,6 @@ JVM_LDFLAGS := @OPENJDK_BUILD_JVM_LDFLAGS@
 JVM_ASFLAGS := @OPENJDK_BUILD_JVM_ASFLAGS@
 JVM_LIBS := @OPENJDK_BUILD_JVM_LIBS@
 
-FDLIBM_CFLAGS := @OPENJDK_BUILD_FDLIBM_CFLAGS@
-
 # The compiler for the build platform is likely not warning compatible with the official
 # compiler.
 WARNINGS_AS_ERRORS := false

make/autoconf/configure.ac

@@ -1,5 +1,5 @@
-#
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+SRC#
+# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -98,9 +98,6 @@ HOTSPOT_SETUP_JVM_VARIANTS
 # With basic setup done, call the custom early hook.
 CUSTOM_EARLY_HOOK
 
-# This only needs debug level to be setup
-JDKOPT_ALLOW_ABSOLUTE_PATHS_IN_OUTPUT
-
 # Check if we have devkits, extra paths or sysroot set.
 BASIC_SETUP_DEVKIT
 

make/autoconf/flags-cflags.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -371,7 +371,21 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS],
   FLAGS_CPU_LEGACY=$OPENJDK_BUILD_CPU_LEGACY
   FLAGS_CPU_LEGACY_LIB=$OPENJDK_BUILD_CPU_LEGACY_LIB
 
-  FLAGS_SETUP_CFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_], [BUILD_])
+  FLAGS_SETUP_CFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])
+
+  COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off"
+  # Check that the compiler supports -ffp-contract=off flag
+  # Set FDLIBM_CFLAGS to -ffp-contract=off if it does. Empty
+  # otherwise.
+  # These flags are required for GCC-based builds of
+  # fdlibm with optimization without losing precision.
+  # Notably, -ffp-contract=off needs to be added for GCC >= 4.6.
+  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+    FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${COMPILER_FP_CONTRACT_OFF_FLAG}],
+	IF_TRUE: [FDLIBM_CFLAGS=${COMPILER_FP_CONTRACT_OFF_FLAG}],
+	IF_FALSE: [FDLIBM_CFLAGS=""])
+  fi
+  AC_SUBST(FDLIBM_CFLAGS)
 
   # Tests are only ever compiled for TARGET
   CFLAGS_TESTLIB="$CFLAGS_JDKLIB"
@@ -482,14 +496,15 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
     TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -fcheck-new -fstack-protector"
     TOOLCHAIN_CFLAGS_JDK="-pipe -fstack-protector"
-    # reduce lib size on s390x in link step, this needs also special compile flags
-    if test "x$OPENJDK_TARGET_CPU" = xs390x; then
-      TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM -ffunction-sections -fdata-sections"
-      TOOLCHAIN_CFLAGS_JDK="$TOOLCHAIN_CFLAGS_JDK -ffunction-sections -fdata-sections"
-    fi
-    # technically NOT for CXX (but since this gives *worse* performance, use
-    # no-strict-aliasing everywhere!)
-    TOOLCHAIN_CFLAGS_JDK_CONLY="-fno-strict-aliasing"
+    TOOLCHAIN_CFLAGS_JDK_CONLY="-fno-strict-aliasing" # technically NOT for CXX (but since this gives *worse* performance, use no-strict-aliasing everywhere!)
+
+    CXXSTD_CXXFLAG="-std=gnu++98"
+    FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$CXXSTD_CXXFLAG -Werror],
+    						 IF_FALSE: [CXXSTD_CXXFLAG=""])
+    TOOLCHAIN_CFLAGS_JDK_CXXONLY="$CXXSTD_CXXFLAG"
+    TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM $CXXSTD_CXXFLAG"
+    ADLC_CXXFLAG="$CXXSTD_CXXFLAG"
+
 
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     # Restrict the debug information created by Clang to avoid
@@ -580,7 +595,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
   # Where does this really belong??
   if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
     PICFLAG="-fPIC"
-    PIEFLAG="-fPIE"
   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
     PICFLAG="-KPIC"
   elif test "x$TOOLCHAIN_TYPE" = xxlc; then
@@ -632,13 +646,15 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
       OS_CFLAGS_JVM="$OS_CFLAGS_JVM -DNEEDS_LIBRT"
     fi
   fi
+
+  # EXPORT
+  AC_SUBST(ADLC_CXXFLAG)
 ])
 
 ################################################################################
 # $1 - Either BUILD or TARGET to pick the correct OS/CPU variables to check
 #      conditionals against.
 # $2 - Optional prefix for each variable defined.
-# $3 - Optional prefix for compiler variables (either BUILD_ or nothing).
 AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
 [
   #### CPU DEFINES, these should (in theory) be independent on toolchain
@@ -732,13 +748,6 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
       $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer"
     fi
 
-    $1_CXXSTD_CXXFLAG="-std=gnu++98"
-    FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${$1_CXXSTD_CXXFLAG} -Werror],
-        PREFIX: $3, IF_FALSE: [$1_CXXSTD_CXXFLAG=""])
-    $1_TOOLCHAIN_CFLAGS_JDK_CXXONLY="${$1_CXXSTD_CXXFLAG}"
-    $1_TOOLCHAIN_CFLAGS_JVM="${$1_TOOLCHAIN_CFLAGS_JVM} ${$1_CXXSTD_CXXFLAG}"
-    $2ADLC_CXXFLAG="${$1_CXXSTD_CXXFLAG}"
-
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     if test "x$FLAGS_OS" = xlinux; then
       # ppc test not really needed for clang
@@ -775,44 +784,20 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
   fi
 
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    FLAGS_SETUP_GCC6_COMPILER_FLAGS($1, $3)
+    TOOLCHAIN_CHECK_COMPILER_VERSION(VERSION: 6, PREFIX: $2, IF_AT_LEAST: FLAGS_SETUP_GCC6_COMPILER_FLAGS($1))
     $1_TOOLCHAIN_CFLAGS="${$1_GCC6_CFLAGS}"
 
     $1_WARNING_CFLAGS_JVM="-Wno-format-zero-length -Wtype-limits -Wuninitialized"
   fi
 
-  # Prevent the __FILE__ macro from generating absolute paths into the built
-  # binaries. Depending on toolchain, different mitigations are possible.
-  # * GCC and Clang of new enough versions have -fmacro-prefix-map.
-  # * For most other toolchains, supplying all source files and -I flags as
-  #   relative paths fixes the issue.
-  FILE_MACRO_CFLAGS=
-  if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
-    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-      # Check if compiler supports -fmacro-prefix-map. If so, use that to make
-      # the __FILE__ macro resolve to paths relative to the workspace root.
-      workspace_root_trailing_slash="${WORKSPACE_ROOT%/}/"
-      FILE_MACRO_CFLAGS="-fmacro-prefix-map=${workspace_root_trailing_slash}="
-      FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${FILE_MACRO_CFLAGS}],
-          PREFIX: $3,
-          IF_FALSE: [
-              FILE_MACRO_CFLAGS=
-          ]
-      )
-    fi
-  fi
-  AC_SUBST(FILE_MACRO_CFLAGS)
-
   # EXPORT to API
-  CFLAGS_JVM_COMMON="$ALWAYS_CFLAGS_JVM $ALWAYS_DEFINES_JVM \
-      $TOOLCHAIN_CFLAGS_JVM ${$1_TOOLCHAIN_CFLAGS_JVM} \
+  CFLAGS_JVM_COMMON="$ALWAYS_CFLAGS_JVM $ALWAYS_DEFINES_JVM $TOOLCHAIN_CFLAGS_JVM \
       $OS_CFLAGS $OS_CFLAGS_JVM $CFLAGS_OS_DEF_JVM $DEBUG_CFLAGS_JVM \
-      $WARNING_CFLAGS $WARNING_CFLAGS_JVM $JVM_PICFLAG $FILE_MACRO_CFLAGS"
+      $WARNING_CFLAGS $WARNING_CFLAGS_JVM $JVM_PICFLAG"
 
   CFLAGS_JDK_COMMON="$ALWAYS_CFLAGS_JDK $ALWAYS_DEFINES_JDK $TOOLCHAIN_CFLAGS_JDK \
       $OS_CFLAGS $CFLAGS_OS_DEF_JDK $DEBUG_CFLAGS_JDK $DEBUG_OPTIONS_FLAGS_JDK \
-      $WARNING_CFLAGS $WARNING_CFLAGS_JDK $DEBUG_SYMBOLS_CFLAGS_JDK \
-      $FILE_MACRO_CFLAGS"
+      $WARNING_CFLAGS $WARNING_CFLAGS_JDK $DEBUG_SYMBOLS_CFLAGS_JDK"
 
   # Use ${$2EXTRA_CFLAGS} to block EXTRA_CFLAGS to be added to build flags.
   # (Currently we don't have any OPENJDK_BUILD_EXTRA_CFLAGS, but that might
@@ -820,9 +805,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
 
   CFLAGS_JDK_COMMON_CONLY="$TOOLCHAIN_CFLAGS_JDK_CONLY  \
       $WARNING_CFLAGS_JDK_CONLY ${$2EXTRA_CFLAGS}"
-  CFLAGS_JDK_COMMON_CXXONLY="$ALWAYS_DEFINES_JDK_CXXONLY \
-      $TOOLCHAIN_CFLAGS_JDK_CXXONLY \
-      ${$1_TOOLCHAIN_CFLAGS_JDK_CXXONLY} \
+  CFLAGS_JDK_COMMON_CXXONLY="$ALWAYS_DEFINES_JDK_CXXONLY $TOOLCHAIN_CFLAGS_JDK_CXXONLY \
       $WARNING_CFLAGS_JDK_CXXONLY ${$2EXTRA_CXXFLAGS}"
 
   $1_CFLAGS_JVM="${$1_DEFINES_CPU_JVM} ${$1_CFLAGS_CPU} ${$1_CFLAGS_CPU_JVM} ${$1_TOOLCHAIN_CFLAGS} ${$1_WARNING_CFLAGS_JVM}"
@@ -830,40 +813,21 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
 
   $2JVM_CFLAGS="$CFLAGS_JVM_COMMON ${$1_CFLAGS_JVM} ${$2EXTRA_CXXFLAGS}"
 
-  $2CFLAGS_JDKEXE="$CFLAGS_JDK_COMMON $CFLAGS_JDK_COMMON_CONLY ${$1_CFLAGS_JDK} $PIEFLAG"
-  $2CXXFLAGS_JDKEXE="$CFLAGS_JDK_COMMON $CFLAGS_JDK_COMMON_CXXONLY ${$1_CFLAGS_JDK} $PIEFLAG"
-  $2CFLAGS_JDKLIB="$CFLAGS_JDK_COMMON $CFLAGS_JDK_COMMON_CONLY ${$1_CFLAGS_JDK} \
-      $JDK_PICFLAG ${$1_CFLAGS_CPU_JDK_LIBONLY}"
-  $2CXXFLAGS_JDKLIB="$CFLAGS_JDK_COMMON $CFLAGS_JDK_COMMON_CXXONLY ${$1_CFLAGS_JDK} \
-      $JDK_PICFLAG ${$1_CFLAGS_CPU_JDK_LIBONLY}"
+  $2CFLAGS_JDKEXE="$CFLAGS_JDK_COMMON $CFLAGS_JDK_COMMON_CONLY ${$1_CFLAGS_JDK}"
+  $2CXXFLAGS_JDKEXE="$CFLAGS_JDK_COMMON $CFLAGS_JDK_COMMON_CXXONLY ${$1_CFLAGS_JDK}"
+  $2CFLAGS_JDKLIB="${$2CFLAGS_JDKEXE} $JDK_PICFLAG ${$1_CFLAGS_CPU_JDK_LIBONLY}"
+  $2CXXFLAGS_JDKLIB="${$2CXXFLAGS_JDKEXE} $JDK_PICFLAG ${$1_CFLAGS_CPU_JDK_LIBONLY}"
 
   AC_SUBST($2JVM_CFLAGS)
   AC_SUBST($2CFLAGS_JDKLIB)
   AC_SUBST($2CFLAGS_JDKEXE)
   AC_SUBST($2CXXFLAGS_JDKLIB)
   AC_SUBST($2CXXFLAGS_JDKEXE)
-  AC_SUBST($2ADLC_CXXFLAG)
-
-  COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off"
-  # Check that the compiler supports -ffp-contract=off flag
-  # Set FDLIBM_CFLAGS to -ffp-contract=off if it does. Empty
-  # otherwise.
-  # These flags are required for GCC-based builds of
-  # fdlibm with optimization without losing precision.
-  # Notably, -ffp-contract=off needs to be added for GCC >= 4.6.
-  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-    FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${COMPILER_FP_CONTRACT_OFF_FLAG}],
-        PREFIX: $3,
-        IF_TRUE: [$2FDLIBM_CFLAGS=${COMPILER_FP_CONTRACT_OFF_FLAG}],
-        IF_FALSE: [$2FDLIBM_CFLAGS=""])
-  fi
-  AC_SUBST($2FDLIBM_CFLAGS)
 ])
 
 # FLAGS_SETUP_GCC6_COMPILER_FLAGS([PREFIX])
 # Arguments:
 # $1 - Prefix for each variable defined.
-# $2 - Prefix for compiler variables (either BUILD_ or nothing).
 AC_DEFUN([FLAGS_SETUP_GCC6_COMPILER_FLAGS],
 [
   # These flags are required for GCC 6 builds as undefined behaviour in OpenJDK code
@@ -871,11 +835,14 @@ AC_DEFUN([FLAGS_SETUP_GCC6_COMPILER_FLAGS],
   # Notably, value range propagation now assumes that the this pointer of C++
   # member functions is non-null.
   NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks"
-  FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror],
-      PREFIX: $2, IF_FALSE: [NO_DELETE_NULL_POINTER_CHECKS_CFLAG=""])
+  dnl Argument check is disabled until FLAGS_COMPILER_CHECK_ARGUMENTS handles cross-compilation
+  dnl FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror],
+  dnl					     IF_FALSE: [NO_DELETE_NULL_POINTER_CHECKS_CFLAG=""])
   NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse"
-  FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_LIFETIME_DSE_CFLAG -Werror],
-      PREFIX: $2, IF_FALSE: [NO_LIFETIME_DSE_CFLAG=""])
+  dnl Argument check is disabled until FLAGS_COMPILER_CHECK_ARGUMENTS handles cross-compilation
+  dnl FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_LIFETIME_DSE_CFLAG -Werror],
+  dnl					     IF_FALSE: [NO_LIFETIME_DSE_CFLAG=""])
+  AC_MSG_NOTICE([GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} and ${NO_LIFETIME_DSE_CFLAG}])
   $1_GCC6_CFLAGS="${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
 ])
 

make/autoconf/flags-ldflags.m4

@@ -72,14 +72,12 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     fi
 
     # Add -z defs, to forbid undefined symbols in object files.
-    # add relro (mark relocations read only) for all libs
-    BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,-z,defs -Wl,-z,relro"
-    # s390x : remove unused code+data in link step
-    if test "x$OPENJDK_TARGET_CPU" = xs390x; then
-      BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,--gc-sections -Wl,--print-gc-sections"
-    fi
+    BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,-z,defs"
 
-    BASIC_LDFLAGS_JVM_ONLY="-Wl,-O1"
+    BASIC_LDFLAGS_JVM_ONLY="-Wl,-z,noexecstack -Wl,-O1 -Wl,-z,relro"
+
+    BASIC_LDFLAGS_JDK_LIB_ONLY="-Wl,-z,noexecstack"
+    LIBJSIG_NOEXECSTACK_LDFLAGS="-Wl,-z,noexecstack"
 
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
     BASIC_LDFLAGS_JVM_ONLY="-mno-omit-leaf-frame-pointer -mstack-alignment=16 \
@@ -105,12 +103,6 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     BASIC_LDFLAGS_JVM_ONLY="-opt:icf,8 -subsystem:windows"
   fi
 
-  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-    if test -n "$HAS_NOEXECSTACK"; then
-      BASIC_LDFLAGS="$BASIC_LDFLAGS -Wl,-z,noexecstack"
-    fi
-  fi
-
   # Setup OS-dependent LDFLAGS
   if test "x$TOOLCHAIN_TYPE" = xclang || test "x$TOOLCHAIN_TYPE" = xgcc; then
     if test "x$OPENJDK_TARGET_OS" = xmacosx; then
@@ -126,6 +118,9 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
     if test "x$OPENJDK_TARGET_OS" = xlinux; then
       if test x$DEBUG_LEVEL = xrelease; then
         DEBUGLEVEL_LDFLAGS_JDK_ONLY="$DEBUGLEVEL_LDFLAGS_JDK_ONLY -Wl,-O1"
+      else
+        # mark relocations read only on (fast/slow) debug builds
+        DEBUGLEVEL_LDFLAGS_JDK_ONLY="-Wl,-z,relro"
       fi
       if test x$DEBUG_LEVEL = xslowdebug; then
         # do relocations at load
@@ -145,17 +140,6 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
   # Setup LDFLAGS for linking executables
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
     EXECUTABLE_LDFLAGS="$EXECUTABLE_LDFLAGS -Wl,--allow-shlib-undefined"
-    # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous
-    # java heap.
-    if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then
-      EXECUTABLE_LDFLAGS="$EXECUTABLE_LDFLAGS -pie"
-    fi
-  fi
-
-  if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
-    if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-      BASIC_LDFLAGS="$BASIC_LDFLAGS -pdbaltpath:%_PDB%"
-    fi
   fi
 
   # Export some intermediate variables for compatibility

make/autoconf/flags.m4

@@ -416,20 +416,17 @@ AC_DEFUN([FLAGS_SETUP_FLAGS],
 # ------------------------------------------------------------
 # Check that the C compiler supports an argument
 BASIC_DEFUN_NAMED([FLAGS_C_COMPILER_CHECK_ARGUMENTS],
-    [*ARGUMENT IF_TRUE IF_FALSE PREFIX], [$@],
+    [*ARGUMENT IF_TRUE IF_FALSE], [$@],
 [
-  AC_MSG_CHECKING([if ARG_PREFIX[CC] supports "ARG_ARGUMENT"])
+  AC_MSG_CHECKING([if the C compiler supports "ARG_ARGUMENT"])
   supports=yes
 
   saved_cflags="$CFLAGS"
-  saved_cc="$CC"
   CFLAGS="$CFLAGS ARG_ARGUMENT"
-  CC="$ARG_PREFIX[CC]"
   AC_LANG_PUSH([C])
   AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [],
       [supports=no])
   AC_LANG_POP([C])
-  CC="$saved_cc"
   CFLAGS="$saved_cflags"
 
   AC_MSG_RESULT([$supports])
@@ -447,20 +444,17 @@ BASIC_DEFUN_NAMED([FLAGS_C_COMPILER_CHECK_ARGUMENTS],
 # ------------------------------------------------------------
 # Check that the C++ compiler supports an argument
 BASIC_DEFUN_NAMED([FLAGS_CXX_COMPILER_CHECK_ARGUMENTS],
-    [*ARGUMENT IF_TRUE IF_FALSE PREFIX], [$@],
+    [*ARGUMENT IF_TRUE IF_FALSE], [$@],
 [
-  AC_MSG_CHECKING([if ARG_PREFIX[CXX] supports "ARG_ARGUMENT"])
+  AC_MSG_CHECKING([if the C++ compiler supports "ARG_ARGUMENT"])
   supports=yes
 
   saved_cxxflags="$CXXFLAGS"
-  saved_cxx="$CXX"
   CXXFLAGS="$CXXFLAG ARG_ARGUMENT"
-  CXX="$ARG_PREFIX[CXX]"
   AC_LANG_PUSH([C++])
   AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [],
       [supports=no])
   AC_LANG_POP([C++])
-  CXX="$saved_cxx"
   CXXFLAGS="$saved_cxxflags"
 
   AC_MSG_RESULT([$supports])
@@ -478,22 +472,18 @@ BASIC_DEFUN_NAMED([FLAGS_CXX_COMPILER_CHECK_ARGUMENTS],
 # ------------------------------------------------------------
 # Check that the C and C++ compilers support an argument
 BASIC_DEFUN_NAMED([FLAGS_COMPILER_CHECK_ARGUMENTS],
-    [*ARGUMENT IF_TRUE IF_FALSE PREFIX], [$@],
+    [*ARGUMENT IF_TRUE IF_FALSE], [$@],
 [
   FLAGS_C_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARG_ARGUMENT],
-      IF_TRUE: [C_COMP_SUPPORTS="yes"],
-      IF_FALSE: [C_COMP_SUPPORTS="no"],
-      PREFIX: [ARG_PREFIX])
+  					     IF_TRUE: [C_COMP_SUPPORTS="yes"],
+					     IF_FALSE: [C_COMP_SUPPORTS="no"])
   FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [ARG_ARGUMENT],
-      IF_TRUE: [CXX_COMP_SUPPORTS="yes"],
-      IF_FALSE: [CXX_COMP_SUPPORTS="no"],
-      PREFIX: [ARG_PREFIX])
+  					       IF_TRUE: [CXX_COMP_SUPPORTS="yes"],
+					       IF_FALSE: [CXX_COMP_SUPPORTS="no"])
 
-  AC_MSG_CHECKING([if both ARG_PREFIX[CC] and ARG_PREFIX[CXX] support "ARG_ARGUMENT"])
+  AC_MSG_CHECKING([if both compilers support "ARG_ARGUMENT"])
   supports=no
-  if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then
-    supports=yes;
-  fi
+  if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi
 
   AC_MSG_RESULT([$supports])
   if test "x$supports" = "xyes" ; then

make/autoconf/jdk-options.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -295,21 +295,15 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
           if test "x$withval" = xexternal || test "x$withval" = xzipped; then
             AC_MSG_ERROR([AIX only supports the parameters 'none' and 'internal' for --with-native-debug-symbols])
           fi
-        else
-          if test "x$OPENJDK_TARGET_OS" = xwindows; then
-            if test "x$withval" = xinternal; then
-              AC_MSG_ERROR([Windows does not support the parameter 'internal' for --with-native-debug-symbols])
-            fi
-          fi
         fi
       ],
       [
-        if test "x$STATIC_BUILD" = xtrue; then
-          with_native_debug_symbols="none"
+        if test "x$OPENJDK_TARGET_OS" = xaix; then
+          # AIX doesn't support 'external' so use 'internal' as default
+          with_native_debug_symbols="internal"
         else
-          if test "x$OPENJDK_TARGET_OS" = xaix; then
-            # AIX doesn't support 'external' so use 'internal' as default
-            with_native_debug_symbols="internal"
+          if test "x$STATIC_BUILD" = xtrue; then
+            with_native_debug_symbols="none"
           else
             with_native_debug_symbols="external"
           fi
@@ -318,7 +312,20 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
   NATIVE_DEBUG_SYMBOLS=$with_native_debug_symbols
   AC_MSG_RESULT([$NATIVE_DEBUG_SYMBOLS])
 
-  if test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then
+  if test "x$NATIVE_DEBUG_SYMBOLS" = xzipped; then
+
+    if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
+      if test "x$OBJCOPY" = x; then
+        # enabling of enable-debug-symbols and can't find objcopy
+        # this is an error
+        AC_MSG_ERROR([Unable to find objcopy, cannot enable native debug symbols])
+      fi
+    fi
+
+    COMPILE_WITH_DEBUG_SYMBOLS=true
+    COPY_DEBUG_SYMBOLS=true
+    ZIP_EXTERNAL_DEBUG_SYMBOLS=true
+  elif test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then
     COMPILE_WITH_DEBUG_SYMBOLS=false
     COPY_DEBUG_SYMBOLS=false
     ZIP_EXTERNAL_DEBUG_SYMBOLS=false
@@ -339,19 +346,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
     COMPILE_WITH_DEBUG_SYMBOLS=true
     COPY_DEBUG_SYMBOLS=true
     ZIP_EXTERNAL_DEBUG_SYMBOLS=false
-  elif test "x$NATIVE_DEBUG_SYMBOLS" = xzipped; then
-
-    if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
-      if test "x$OBJCOPY" = x; then
-        # enabling of enable-debug-symbols and can't find objcopy
-        # this is an error
-        AC_MSG_ERROR([Unable to find objcopy, cannot enable native debug symbols])
-      fi
-    fi
-
-    COMPILE_WITH_DEBUG_SYMBOLS=true
-    COPY_DEBUG_SYMBOLS=true
-    ZIP_EXTERNAL_DEBUG_SYMBOLS=true
   else
     AC_MSG_ERROR([Allowed native debug symbols are: none, internal, external, zipped])
   fi
@@ -636,35 +630,3 @@ AC_DEFUN([JDKOPT_ENABLE_DISABLE_MANPAGES],
 
   AC_SUBST(BUILD_MANPAGES)
 ])
-
-################################################################################
-#
-# Disallow any output from containing absolute paths from the build system.
-# This setting defaults to allowed on debug builds and not allowed on release
-# builds.
-#
-AC_DEFUN([JDKOPT_ALLOW_ABSOLUTE_PATHS_IN_OUTPUT],
-[
-  AC_ARG_ENABLE([absolute-paths-in-output],
-      [AS_HELP_STRING([--disable-absolute-paths-in-output],
-       [Set to disable to prevent any absolute paths from the build to end up in
-        any of the build output. @<:@disabled in release builds, otherwise enabled@:>@])
-      ])
-
-  AC_MSG_CHECKING([if absolute paths should be allowed in the build output])
-  if test "x$enable_absolute_paths_in_output" = "xno"; then
-    AC_MSG_RESULT([no, forced])
-    ALLOW_ABSOLUTE_PATHS_IN_OUTPUT="false"
-  elif test "x$enable_absolute_paths_in_output" = "xyes"; then
-    AC_MSG_RESULT([yes, forced])
-    ALLOW_ABSOLUTE_PATHS_IN_OUTPUT="true"
-  elif test "x$DEBUG_LEVEL" = "xrelease"; then
-    AC_MSG_RESULT([no, release build])
-    ALLOW_ABSOLUTE_PATHS_IN_OUTPUT="false"
-  else
-    AC_MSG_RESULT([yes, debug build])
-    ALLOW_ABSOLUTE_PATHS_IN_OUTPUT="true"
-  fi
-
-  AC_SUBST(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT)
-])

make/autoconf/spec.gmk.in

@@ -130,9 +130,8 @@ SYSROOT_LDFLAGS := @SYSROOT_LDFLAGS@
 
 # The top-level directory of the source repository
 TOPDIR:=@TOPDIR@
-# Usually the top level directory, but could be something else if a custom
-# root is defined.
-WORKSPACE_ROOT:=@WORKSPACE_ROOT@
+
+
 IMPORT_MODULES_CLASSES:=@IMPORT_MODULES_CLASSES@
 IMPORT_MODULES_CMDS:=@IMPORT_MODULES_CMDS@
 IMPORT_MODULES_LIBS:=@IMPORT_MODULES_LIBS@
@@ -315,8 +314,6 @@ EXCLUDE_TRANSLATIONS := @EXCLUDE_TRANSLATIONS@
 
 BUILD_MANPAGES := @BUILD_MANPAGES@
 
-ALLOW_ABSOLUTE_PATHS_IN_OUTPUT := @ALLOW_ABSOLUTE_PATHS_IN_OUTPUT@
-
 # The boot jdk to use. This is overridden in bootcycle-spec.gmk. Make sure to keep
 # it in sync.
 BOOT_JDK:=@BOOT_JDK@
@@ -360,7 +357,6 @@ LIBFFI_CFLAGS:=@LIBFFI_CFLAGS@
 ENABLE_LIBFFI_BUNDLING:=@ENABLE_LIBFFI_BUNDLING@
 LIBFFI_LIB_FILE:=@LIBFFI_LIB_FILE@
 GRAALUNIT_LIB := @GRAALUNIT_LIB@
-FILE_MACRO_CFLAGS := @FILE_MACRO_CFLAGS@
 
 PACKAGE_PATH=@PACKAGE_PATH@
 
@@ -478,9 +474,6 @@ CPP:=@FIXPATH@ @CPP@
 # The linker can be gcc or ld on unix systems, or link.exe on windows systems.
 LD:=@FIXPATH@ @LD@
 
-# Linker used by the jaotc tool for AOT compilation.
-LD_JAOTC:=@LD_JAOTC@
-
 # Xcode SDK path
 SDKROOT:=@SDKROOT@
 
@@ -872,16 +865,10 @@ DOCS_OUTPUTDIR := $(DOCS_IMAGE_DIR)
 # Macosx bundles directory definitions
 JDK_MACOSX_BUNDLE_SUBDIR=jdk-bundle
 JRE_MACOSX_BUNDLE_SUBDIR=jre-bundle
-JDK_MACOSX_BUNDLE_SUBDIR_SIGNED=jdk-bundle-signed
-JRE_MACOSX_BUNDLE_SUBDIR_SIGNED=jre-bundle-signed
 JDK_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR)
 JRE_MACOSX_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR)
-JDK_MACOSX_BUNDLE_DIR_SIGNED=$(IMAGES_OUTPUTDIR)/$(JDK_MACOSX_BUNDLE_SUBDIR_SIGNED)
-JRE_MACOSX_BUNDLE_DIR_SIGNED=$(IMAGES_OUTPUTDIR)/$(JRE_MACOSX_BUNDLE_SUBDIR_SIGNED)
-JDK_MACOSX_BUNDLE_TOP_DIR=jdk-$(VERSION_NUMBER).jdk
-JRE_MACOSX_BUNDLE_TOP_DIR=jre-$(VERSION_NUMBER).jre
-JDK_MACOSX_CONTENTS_SUBDIR=$(JDK_MACOSX_BUNDLE_TOP_DIR)/Contents
-JRE_MACOSX_CONTENTS_SUBDIR=$(JRE_MACOSX_BUNDLE_TOP_DIR)/Contents
+JDK_MACOSX_CONTENTS_SUBDIR=jdk-$(VERSION_NUMBER).jdk/Contents
+JRE_MACOSX_CONTENTS_SUBDIR=jre-$(VERSION_NUMBER).jre/Contents
 JDK_MACOSX_CONTENTS_DIR=$(JDK_MACOSX_BUNDLE_DIR)/$(JDK_MACOSX_CONTENTS_SUBDIR)
 JRE_MACOSX_CONTENTS_DIR=$(JRE_MACOSX_BUNDLE_DIR)/$(JRE_MACOSX_CONTENTS_SUBDIR)
 

make/autoconf/toolchain.m4

@@ -589,7 +589,7 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER],
 AC_DEFUN([TOOLCHAIN_EXTRACT_LD_VERSION],
 [
   LINKER=[$]$1
-  LINKER_NAME="$2"
+  LINKER_NAME=$2
 
   if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
     # cc -Wl,-V output typically looks like
@@ -709,18 +709,12 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
       AC_MSG_RESULT([yes])
     fi
     LDCXX="$LD"
-    # jaotc being a windows program expects the linker to be supplied with exe suffix.
-    LD_JAOTC="$LD$EXE_SUFFIX"
   else
     # All other toolchains use the compiler to link.
     LD="$CC"
     LDCXX="$CXX"
-    # jaotc expects 'ld' as the linker rather than the compiler.
-    BASIC_CHECK_TOOLS([LD_JAOTC], ld)
-    BASIC_FIXUP_EXECUTABLE(LD_JAOTC)
   fi
   AC_SUBST(LD)
-  AC_SUBST(LD_JAOTC)
   # FIXME: it should be CXXLD, according to standard (cf CXXCPP)
   AC_SUBST(LDCXX)
 
@@ -1028,12 +1022,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
     # This is later checked when setting flags.
   fi
 
-  if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
-    # Check if linker has -z noexecstack.
-    HAS_NOEXECSTACK=`$CC -Wl,--help 2>/dev/null | $GREP 'z noexecstack'`
-    # This is later checked when setting flags.
-  fi
-
   # Setup hotspot lecagy names for toolchains
   HOTSPOT_TOOLCHAIN_TYPE=$TOOLCHAIN_TYPE
   if test "x$TOOLCHAIN_TYPE" = xclang; then

make/autoconf/toolchain_windows.m4

@@ -185,8 +185,6 @@ AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE],
   eval SDK_INSTALL_DIR="\${VS_SDK_INSTALLDIR_${VS_VERSION}}"
   eval VS_ENV_ARGS="\${VS_ENV_ARGS_${VS_VERSION}}"
 
-  VS_ENV_CMD=""
-
   # When using --with-tools-dir, assume it points to the correct and default
   # version of Visual Studio or that --with-toolchain-version was also set.
   if test "x$with_tools_dir" != x; then
@@ -204,6 +202,8 @@ AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE],
     fi
   fi
 
+  VS_ENV_CMD=""
+
   if test "x$VS_COMNTOOLS" != x; then
     TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}],
         [$VS_COMNTOOLS/../..], [$VS_COMNTOOLS_VAR variable])
@@ -693,7 +693,7 @@ AC_DEFUN([TOOLCHAIN_SETUP_VS_RUNTIME_DLLS],
   if test "x$USE_UCRT" = "xtrue"; then
     AC_MSG_CHECKING([for UCRT DLL dir])
     if test "x$with_ucrt_dll_dir" != x; then
-      if test -z "$(ls -d "$with_ucrt_dll_dir/"*.dll 2> /dev/null)"; then
+      if test -z "$(ls -d "$with_ucrt_dll_dir/*.dll" 2> /dev/null)"; then
         AC_MSG_RESULT([no])
         AC_MSG_ERROR([Could not find any dlls in $with_ucrt_dll_dir])
       else
@@ -713,16 +713,8 @@ AC_DEFUN([TOOLCHAIN_SETUP_VS_RUNTIME_DLLS],
       fi
       UCRT_DLL_DIR="$CYGWIN_WINDOWSSDKDIR/Redist/ucrt/DLLs/$dll_subdir"
       if test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then
-        # Try with version subdir
-        UCRT_DLL_DIR="`ls -d $CYGWIN_WINDOWSSDKDIR/Redist/*/ucrt/DLLs/$dll_subdir \
-            2> /dev/null | $SORT -d | $HEAD -n1`"
-        if test -z "$UCRT_DLL_DIR" \
-            || test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then
-          AC_MSG_RESULT([no])
-          AC_MSG_ERROR([Could not find any dlls in $UCRT_DLL_DIR])
-        else
-          AC_MSG_RESULT($UCRT_DLL_DIR)
-        fi
+        AC_MSG_RESULT([no])
+        AC_MSG_ERROR([Could not find any dlls in $UCRT_DLL_DIR])
       else
         AC_MSG_RESULT($UCRT_DLL_DIR)
       fi

make/autoconf/version-numbers

@@ -27,16 +27,15 @@
 
 DEFAULT_VERSION_FEATURE=11
 DEFAULT_VERSION_INTERIM=0
-DEFAULT_VERSION_UPDATE=7
+DEFAULT_VERSION_UPDATE=6
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2020-04-14
+DEFAULT_VERSION_DATE=2020-01-14
 DEFAULT_VERSION_CLASSFILE_MAJOR=55  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="10 11"
-DEFAULT_PROMOTED_VERSION_PRE=ea
 
 LAUNCHER_NAME=openjdk
 PRODUCT_NAME=OpenJDK

make/common/JarArchive.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
@@ -122,9 +122,9 @@ define SetupJarArchiveBody
   ifeq ($$($1_DEPENDENCIES), )
     # Add all source roots to the find cache since we are likely going to run find
     # on these more than once. The cache will only be updated if necessary.
-    $$(call FillFindCache, $$($1_FIND_LIST))
+    $$(eval $$(call FillCacheFind, $$($1_FIND_LIST)))
     $1_DEPENDENCIES:=$$(filter $$(addprefix %,$$($1_SUFFIXES)), \
-        $$(call FindFiles,$$($1_SRCS)))
+        $$(call CacheFind,$$($1_SRCS)))
     ifneq (,$$($1_GREP_INCLUDE_PATTERNS))
       $1_DEPENDENCIES:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPENDENCIES))
     endif
@@ -135,7 +135,7 @@ define SetupJarArchiveBody
     $1_DEPENDENCIES+=$$(wildcard $$(foreach src, $$($1_SRCS), \
         $$(addprefix $$(src)/, $$($1_EXTRA_FILES))) $$($1_EXTRA_FILES))
     ifeq (,$$($1_SKIP_METAINF))
-      $1_DEPENDENCIES+=$$(call FindFiles,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS))))
+      $1_DEPENDENCIES+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS))))
     endif
   endif
   # The dependency list should never be empty

make/common/JavaCompilation.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -221,12 +221,13 @@ define SetupJavaCompilationBody
     ) \
   )
   $$(call MakeDir,$$($1_BIN))
-  # Order src files according to the order of the src dirs. Correct ordering is
-  # needed for correct overriding between different source roots.
-  $1_ALL_SRC_RAW := $$(call FindFiles, $$($1_SRC))
-  $1_ALL_SRCS := $$($1_EXTRA_FILES) \
-      $$(foreach d, $$($1_SRC), $$(filter $$d%, $$($1_ALL_SRC_RAW)))
-
+  # Add all source roots to the find cache since we are likely going to run find
+  # on these more than once. The cache will only be updated if necessary.
+  $$(eval $$(call FillCacheFind, $$($1_SRC)))
+  # Find all files in the source trees. Preserve order of source roots so that
+  # the first version in case of multiple instances of the same file is selected.
+  # CacheFind does not preserve order so need to call it for each root.
+  $1_ALL_SRCS += $$($1_EXTRA_FILES) $$(foreach s, $$($1_SRC), $$(call CacheFind, $$s))
   # Extract the java files.
   $1_SRCS := $$(filter %.java, $$($1_ALL_SRCS))
 

make/common/JdkNativeCompilation.gmk

@@ -47,29 +47,6 @@ FindSrcDirsForComponent += \
       $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/$(strip $2) \
       $(TOPDIR)/src/$(strip $1)/share/native/$(strip $2)))
 
-# Find a library
-# Param 1 - module name
-# Param 2 - library name
-# Param 3 - optional subdir for library
-FindLib = \
-    $(call FindLibDirForModule, \
-        $(strip $1))$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(SHARED_LIBRARY_SUFFIX)
-
-# Find a static library
-# Param 1 - module name
-# Param 2 - library name
-# Param 3 - optional subdir for library
-FindStaticLib = \
-    $(addprefix $(SUPPORT_OUTPUTDIR)/native/, \
-        $(strip $1)$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(STATIC_LIBRARY_SUFFIX))
-
-# If only generating compile_commands.json, make these return empty to avoid
-# declaring dependencies.
-ifeq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
-  FindLib =
-  FindStaticLib =
-endif
-
 GetJavaHeaderDir = \
   $(wildcard $(SUPPORT_OUTPUTDIR)/headers/$(strip $1))
 

make/common/MakeBase.gmk

@@ -64,12 +64,10 @@ define NEWLINE
 
 endef
 
-# Certain features only work in newer version of GNU Make. The build will still
-# function in 3.81, but will be less performant.
+# In GNU Make 4.0 and higher, there is a file function for writing to files.
 ifeq (4.0, $(firstword $(sort 4.0 $(MAKE_VERSION))))
   HAS_FILE_FUNCTION := true
   CORRECT_FUNCTION_IN_RECIPE_EVALUATION := true
-  RWILDCARD_WORKS := true
 endif
 
 ##############################
@@ -468,8 +466,8 @@ endef
 
 ################################################################################
 # Replace question marks with space in string. This macro needs to be called on
-# files from FindFiles in case any of them contains space in their file name,
-# since FindFiles replaces space with ?.
+# files from CacheFind in case any of them contains space in their file name,
+# since CacheFind replaces space with ?.
 # Param 1 - String to replace in
 DecodeSpace = \
     $(subst ?,$(SPACE),$(strip $1))
@@ -613,8 +611,7 @@ DirToDotDot = \
 # $2 - Directory to compute the relative path from
 RelativePath = \
     $(eval $1_prefix := $(call FindCommonPathPrefix, $1, $2)) \
-    $(eval $1_dotdots := $(call DirToDotDot, $(patsubst $($(strip $1)_prefix)%, %, $2))) \
-    $(eval $1_dotdots := $(if $($(strip $1)_dotdots),$($(strip $1)_dotdots),.)) \
+    $(eval $1_dotdots := $(call DirToDotDot, $(patsubst $($(strip $1)_prefix)/%, %, $2))) \
     $(eval $1_suffix := $(patsubst $($(strip $1)_prefix)/%, %, $1)) \
     $($(strip $1)_dotdots)/$($(strip $1)_suffix)
 
@@ -688,116 +685,73 @@ uppercase = \
 
 ################################################################################
 
-# Recursive wildcard function. Walks down directories recursively and matches
-# files with the search patterns. Patterns use standard file wildcards (* and
-# ?).
-#
-# $1 - Directories to start search in
-# $2 - Search patterns
-rwildcard = \
-    $(strip \
-        $(foreach d, \
-          $(patsubst %/,%,$(sort $(dir $(wildcard $(addsuffix /*/*, $(strip $1)))))), \
-          $(call rwildcard,$d,$2) \
-        ) \
-        $(call DoubleDollar, $(wildcard $(foreach p, $2, $(addsuffix /$(strip $p), $(strip $1))))) \
-    )
+ifneq ($(DISABLE_CACHE_FIND), true)
+  # In Cygwin, finds are very costly, both because of expensive forks and because
+  # of bad file system caching. Find is used extensively in $(shell) commands to
+  # find source files. This makes rerunning make with no or few changes rather
+  # expensive. To speed this up, these two macros are used to cache the results
+  # of simple find commands for reuse.
+  #
+  # Runs a find and stores both the directories where it was run and the results.
+  # This macro can be called multiple times to add to the cache. Only finds files
+  # with no filters.
+  #
+  # Files containing space will get spaces replaced with ? because GNU Make
+  # cannot handle lists of files with space in them. By using ?, make will match
+  # the wildcard to space in many situations so we don't need to replace back
+  # to space on every use. While not a complete solution it does allow some uses
+  # of CacheFind to function with spaces in file names, including for
+  # SetupCopyFiles.
+  #
+  # Needs to be called with $(eval )
+  #
+  # Even if the performance benifit is negligible on other platforms, keep the
+  # functionality active unless explicitly disabled to exercise it more.
+  #
+  # Initialize FIND_CACHE_DIRS with := to make it a non recursively-expanded variable
+  FIND_CACHE_DIRS :=
+  # Param 1 - Dirs to find in
+  # Param 2 - (optional) specialization. Normally "-a \( ... \)" expression.
+  define FillCacheFind
+    # Filter out already cached dirs. The - is needed when FIND_CACHE_DIRS is empty
+    # since filter out will then return empty.
+    FIND_CACHE_NEW_DIRS := $$(filter-out $$(addsuffix /%,\
+        - $(FIND_CACHE_DIRS)) $(FIND_CACHE_DIRS), $1)
+    ifneq ($$(FIND_CACHE_NEW_DIRS), )
+      # Remove any trailing slash from dirs in the cache dir list
+      FIND_CACHE_DIRS += $$(patsubst %/,%, $$(FIND_CACHE_NEW_DIRS))
+      FIND_CACHE := $$(sort $$(FIND_CACHE) \
+          $$(shell $(FIND) $$(wildcard $$(FIND_CACHE_NEW_DIRS)) \
+              \( -type f -o -type l \) $2 | $(TR) ' ' '?'))
+    endif
+  endef
 
-# Find non directories using recursive wildcard function. This function may
-# be used directly when a small amount of directories is expected to be
-# searched and caching is not expected to be of use.
-#
-# $1 - Directory to start search in
-# $2 - Optional search patterns, defaults to '*'.
-WildcardFindFiles = \
-    $(sort $(strip \
-        $(eval WildcardFindFiles_result := $(call rwildcard,$(patsubst %/,%,$1),$(if $(strip $2),$2,*))) \
-        $(filter-out $(patsubst %/,%,$(sort $(dir $(WildcardFindFiles_result)))), \
-            $(WildcardFindFiles_result) \
-        ) \
-    ))
+  # Mimics find by looking in the cache if all of the directories have been cached.
+  # Otherwise reverts to shell find. This is safe to call on all platforms, even if
+  # cache is deactivated.
+  #
+  # $1 can be either a directory or a file. If it's a directory, make
+  # sure we have exactly one trailing slash before the wildcard.
+  # The extra - is needed when FIND_CACHE_DIRS is empty but should be harmless.
+  #
+  # Param 1 - Dirs to find in
+  # Param 2 - (optional) specialization. Normally "-a \( ... \)" expression.
+  define CacheFind
+    $(if $(filter-out $(addsuffix /%,- $(FIND_CACHE_DIRS)) $(FIND_CACHE_DIRS),$1), \
+      $(if $(wildcard $1), $(shell $(FIND) $(wildcard $1) \( -type f -o -type l \) $2 \
+          | $(TR) ' ' '?')), \
+      $(filter $(addsuffix /%,$(patsubst %/,%,$1)) $1,$(FIND_CACHE)))
+  endef
 
-# Find non directories using the find utility in the shell. Safe to call for
-# non existing directories, or directories containing wildcards.
-#
-# Files containing space will get spaces replaced with ? because GNU Make
-# cannot handle lists of files with space in them. By using ?, make will match
-# the wildcard to space in many situations so we don't need to replace back
-# to space on every use. While not a complete solution it does allow some uses
-# of FindFiles to function with spaces in file names, including for
-# SetupCopyFiles. Unfortunately this does not work for WildcardFindFiles so
-# if files with spaces are anticipated, use ShellFindFiles directly.
-#
-# $1 - Directories to start search in.
-# $2 - Optional search patterns, empty means find everything. Patterns use
-#      standard file wildcards (* and ?) and should not be quoted.
-# $3 - Optional options to find.
-ShellFindFiles = \
-    $(if $(wildcard $1), \
-      $(sort \
-          $(shell $(FIND) $3 $(patsubst %/,%,$(wildcard $1)) \( -type f -o -type l \) \
-              $(if $(strip $2), -a \( -name "$(firstword $2)" \
-              $(foreach p, $(filter-out $(firstword $2), $2), -o -name "$(p)") \)) \
-              | $(TR) ' ' '?' \
-          ) \
-      ) \
-    )
-
-# Find non directories using the method most likely to work best for the
-# current build host
-#
-# $1 - Directory to start search in
-# $2 - Optional search patterns, defaults to '*'.
-ifeq ($(OPENJDK_BUILD_OS)-$(RWILDCARD_WORKS), windows-true)
-  DirectFindFiles = $(WildcardFindFiles)
 else
-  DirectFindFiles = $(ShellFindFiles)
-endif
-
-# Finds files using a cache that is populated by FillFindCache below. If any of
-# the directories given have not been cached, DirectFindFiles is used for
-# everything. Caching is especially useful in Cygwin, where file finds are very
-# costly.
-#
-# $1 - Directories to start search in.
-# $2 - Optional search patterns. If used, no caching is done.
-CacheFindFiles_CACHED_DIRS :=
-CacheFindFiles_CACHED_FILES :=
-CacheFindFiles = \
-    $(if $2, \
-      $(call DirectFindFiles, $1, $2) \
-    , \
-      $(if $(filter-out $(addsuffix /%, $(CacheFindFiles_CACHED_DIRS)) \
-          $(CacheFindFiles_CACHED_DIRS), $1), \
-        $(call DirectFindFiles, $1) \
-      , \
-        $(filter $(addsuffix /%,$(patsubst %/,%,$1)) $1,$(CacheFindFiles_CACHED_FILES)) \
-      ) \
+  # If CacheFind is disabled, just run the find command.
+  # Param 1 - Dirs to find in
+  # Param 2 - (optional) specialization. Normally "-a \( ... \)" expression.
+  define CacheFind
+    $(if $(wildcard $1, \
+      $(shell $(FIND) $(wildcard $1) \( -type f -o -type l \) $2 | $(TR) ' ' '?') \
     )
-
-# Explicitly adds files to the find cache used by CacheFindFiles.
-#
-# $1 - Directories to start search in
-FillFindCache = \
-    $(eval CacheFindFiles_NEW_DIRS := $$(filter-out $$(addsuffix /%,\
-        $$(CacheFindFiles_CACHED_DIRS)) $$(CacheFindFiles_CACHED_DIRS), $1)) \
-    $(if $(CacheFindFiles_NEW_DIRS), \
-      $(eval CacheFindFiles_CACHED_DIRS += $$(patsubst %/,%,$$(CacheFindFiles_NEW_DIRS))) \
-      $(eval CacheFindFiles_CACHED_FILES := $$(sort $$(CacheFindFiles_CACHED_FILES) \
-          $$(call DirectFindFiles, $$(CacheFindFiles_NEW_DIRS)))) \
-    )
-
-# Findfiles is the default macro that should be used to find files in the file
-# system. This function does not always support files with spaces in the names.
-# If files with spaces are anticipated, use ShellFindFiles directly.
-#
-# $1 - Directories to start search in.
-# $2 - Optional search patterns, empty means find everything. Patterns use
-#      standard file wildcards (* and ?) and should not be quoted.
-ifeq ($(DISABLE_CACHE_FIND), true)
-  FindFiles = $(DirectFindFiles)
-else
-  FindFiles = $(CacheFindFiles)
+  endef
 endif
 
 ################################################################################
@@ -983,22 +937,6 @@ else
       $(shell $(PRINTF) "%s" $(call ShellQuote, $1) >> $2)
 endif
 
-################################################################################
-# FixPathList
-#
-# On Windows, converts a cygwin/unix style path list (colon-separated) into
-# the native format (mixed mode, semicolon-separated). On other platforms,
-# return the path list unchanged.
-################################################################################
-ifeq ($(OPENJDK_TARGET_OS), windows)
-  FixPathList = \
-      $(subst @,$(SPACE),$(subst $(SPACE),;,$(foreach entry,$(subst :,$(SPACE),\
-      $(subst $(SPACE),@,$(strip $1))),$(call FixPath, $(entry)))))
-else
-  FixPathList = \
-      $1
-endif
-
 ################################################################################
 # DependOnVariable
 #
@@ -1036,16 +974,15 @@ DependOnVariableFileName = \
 # Param 2 - (optional) name of file to store value in
 DependOnVariableHelper = \
     $(strip \
-        $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
-        $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
+        $(eval -include $(call DependOnVariableFileName, $1, $2)) \
         $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
-          $(call MakeDir, $(dir $($1_filename))) \
+          $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
           $(if $(findstring $(LOG_LEVEL), trace), \
               $(info NewVariable $1: >$(strip $($1))<) \
               $(info OldVariable $1: >$(strip $($1_old))<)) \
           $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
-              $($1_filename))) \
-        $($1_filename) \
+              $(call DependOnVariableFileName, $1, $2))) \
+        $(call DependOnVariableFileName, $1, $2) \
     )
 
 # Main macro

make/common/NativeCompilation.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -59,29 +59,6 @@ define GetSymbols
   fi
 endef
 
-################################################################################
-# Creates a recipe that creates a compile_commands.json fragment. Remove any
-# occurences of FIXPATH programs from the command to show the actual invocation.
-#
-# Param 1: Name of file to create
-# Param 2: Working directory
-# Param 3: Source file
-# Param 4: Compile command
-# Param 5: Object name
-################################################################################
-define WriteCompileCommandsFragment
-  $(call LogInfo, Creating compile commands fragment for $(notdir $3))
-  $(call MakeDir, $(dir $1))
-  $(call WriteFile,{ \
-      "directory": "$(strip $2)"$(COMMA) \
-      "file": "$(strip $3)"$(COMMA) \
-      "command": "$(strip $(subst $(DQUOTE),\$(DQUOTE),$(subst \,\\,\
-        $(subst $(FIXPATH),,$4))))"$(COMMA) \
-      "output": "$(strip $5)" \
-    }$(COMMA), \
-    $1)
-endef
-
 ################################################################################
 # Define a native toolchain configuration that can be used by
 # SetupNativeCompilation calls
@@ -206,68 +183,6 @@ DEPENDENCY_TARGET_SED_PATTERN := \
     -e 's/$$$$/ :/' \
     #
 
-################################################################################
-# When absolute paths are not allowed in the output, and the compiler does not
-# support any options to avoid it, we need to rewrite compile commands to use
-# relative paths. By doing this, the __FILE__ macro will resolve to relative
-# paths. The relevant input paths on the command line are the -I flags and the
-# path to the source file itself.
-#
-# The macro MakeCommandRelative is used to rewrite the command line like this:
-# 'CD $(WORKSPACE_ROOT) && <cmd>'
-# and changes all paths in cmd to be relative to the workspace root. This only
-# works properly if the build dir is inside the workspace root. If it's not,
-# relative paths are still calculated, but depending on the distance between the
-# dirs, paths in the build dir may end up as essentially absolute anyway.
-#
-# The fix-deps-file macro is used to adjust the contents of the generated make
-# dependency files to contain paths compatible with make.
-#
-ifeq ($(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT)-$(FILE_MACRO_CFLAGS), false-)
-  # Need to handle -I flags as both '-Ifoo' and '-I foo'.
-  MakeCommandRelative = \
-      $(CD) $(WORKSPACE_ROOT) && \
-      $(foreach o, $1, \
-        $(if $(filter $(WORKSPACE_ROOT)/% $(OUTPUTDIR)/%, $o), \
-          $(call RelativePath, $o, $(WORKSPACE_ROOT)) \
-        , \
-          $(if $(filter -I$(WORKSPACE_ROOT)/%, $o), \
-            -I$(call RelativePath, $(patsubst -I%, %, $o), $(WORKSPACE_ROOT)) \
-          , \
-            $o \
-          ) \
-        ) \
-      )
-
-  # When compiling with relative paths, the deps file comes out with relative
-  # paths.
-  ifeq ($(TOOLCHAIN_TYPE), solstudio)
-    define fix-deps-file
-	$(SED) -e 's|\./|$(WORKSPACE_ROOT)/|g' $1.tmp > $1
-    endef
-  else
-    define fix-deps-file
-	$(SED) -e 's|^\([ ]*\)|\1$(WORKSPACE_ROOT)|' $1.tmp > $1
-    endef
-  endif
-else
-  # By default the MakeCommandRelative macro does nothing.
-  MakeCommandRelative = $1
-
-  # Even with absolute paths on the command line, the Solaris studio compiler
-  # doesn't output the full path to the object file in the generated deps files.
-  # For other toolchains, no adjustment is needed.
-  ifeq ($(TOOLCHAIN_TYPE), solstudio)
-    define fix-deps-file
-	$(SED) 's|^$$(@F):|$$@:|' $1.tmp > $1
-    endef
-  else
-    define fix-deps-file
-	$(MV) $1.tmp $1
-    endef
-  endif
-endif
-
 ################################################################################
 # Create the recipe needed to compile a single native source file.
 #
@@ -278,6 +193,7 @@ endif
 # Remaining parameters are named arguments:
 #   FILE - The full path of the source file to compiler
 #   BASE - The name of the rule for the entire binary to build ($1)
+#   DISABLE_THIS_FILE_DEFINE - Set to true to disable the THIS_FILE define.
 #
 SetupCompileNativeFile = $(NamedParamsMacroTemplate)
 define SetupCompileNativeFileBody
@@ -287,18 +203,17 @@ define SetupCompileNativeFileBody
   $1_OBJ := $$($$($1_BASE)_OBJECT_DIR)/$$(call replace_with_obj_extension, \
       $$($1_FILENAME))
 
-  # Generate the corresponding compile_commands.json fragment.
-  $1_OBJ_JSON = $$(MAKESUPPORT_OUTPUTDIR)/compile-commands/$$(subst /,_,$$(subst \
-      $$(OUTPUTDIR)/,,$$($1_OBJ))).json
-  $$($1_BASE)_ALL_OBJS_JSON += $$($1_OBJ_JSON)
-
   # Only continue if this object file hasn't been processed already. This lets
   # the first found source file override any other with the same name.
-  ifeq ($$($1_OBJ_PROCESSED), )
-    $1_OBJ_PROCESSED := true
+  ifeq ($$(findstring $$($1_OBJ), $$($$($1_BASE)_OBJS_SO_FAR)), )
+    $$($1_BASE)_OBJS_SO_FAR += $$($1_OBJ)
     # This is the definite source file to use for $1_FILENAME.
     $1_SRC_FILE := $$($1_FILE)
 
+    ifneq ($$($1_DISABLE_THIS_FILE_DEFINE), true)
+      $1_THIS_FILE = -DTHIS_FILE='"$$(<F)"'
+    endif
+
     ifeq ($$($1_OPTIMIZATION), )
       $1_OPT_CFLAGS := $$($$($1_BASE)_OPT_CFLAGS)
       $1_OPT_CXXFLAGS := $$($$($1_BASE)_OPT_CXXFLAGS)
@@ -341,13 +256,13 @@ define SetupCompileNativeFileBody
     ifneq ($$(filter %.c, $$($1_FILENAME)), )
       # Compile as a C file
       $1_FLAGS := $(CFLAGS_CCACHE) $$($1_USE_PCH_FLAGS) $$($1_BASE_CFLAGS) \
-          $$($1_OPT_CFLAGS) $$($1_CFLAGS) -c
+          $$($1_OPT_CFLAGS) $$($1_CFLAGS) $$($1_THIS_FILE) -c
       $1_COMPILER := $$($$($1_BASE)_CC)
       $1_DEP_FLAG := $(C_FLAG_DEPS)
     else ifneq ($$(filter %.m, $$($1_FILENAME)), )
       # Compile as an Objective-C file
       $1_FLAGS := -x objective-c $(CFLAGS_CCACHE) $$($1_USE_PCH_FLAGS) \
-          $$($1_BASE_CFLAGS) $$($1_OPT_CFLAGS) $$($1_CFLAGS) -c
+          $$($1_BASE_CFLAGS) $$($1_OPT_CFLAGS) $$($1_CFLAGS) $$($1_THIS_FILE) -c
       $1_COMPILER := $$($$($1_BASE)_CC)
       $1_DEP_FLAG := $(C_FLAG_DEPS)
     else ifneq ($$(filter %.s %.S, $$($1_FILENAME)), )
@@ -358,7 +273,7 @@ define SetupCompileNativeFileBody
     else ifneq ($$(filter %.cpp %.cc %.mm, $$($1_FILENAME)), )
       # Compile as a C++ or Objective-C++ file
       $1_FLAGS := $(CFLAGS_CCACHE) $$($1_USE_PCH_FLAGS) $$($1_BASE_CXXFLAGS) \
-          $$($1_OPT_CXXFLAGS) $$($1_CXXFLAGS) -c
+          $$($1_OPT_CXXFLAGS) $$($1_CXXFLAGS) $$($1_THIS_FILE) -c
       $1_COMPILER := $$($$($1_BASE)_CXX)
       $1_DEP_FLAG := $(CXX_FLAG_DEPS)
     else
@@ -367,18 +282,14 @@ define SetupCompileNativeFileBody
 
     ifeq ($$(filter %.s %.S, $$($1_FILENAME)), )
       # And this is the dependency file for this obj file.
-      $1_DEPS_FILE := $$(patsubst %$(OBJ_SUFFIX),%.d,$$($1_OBJ))
+      $1_DEP := $$(patsubst %$(OBJ_SUFFIX),%.d,$$($1_OBJ))
       # The dependency target file lists all dependencies as empty targets to
       # avoid make error "No rule to make target" for removed files
-      $1_DEPS_TARGETS_FILE := $$(patsubst %$(OBJ_SUFFIX),%.d.targets,$$($1_OBJ))
+      $1_DEP_TARGETS := $$(patsubst %$(OBJ_SUFFIX),%.d.targets,$$($1_OBJ))
 
-      # Only try to load individual dependency information files if the global
-      # file hasn't been loaded (could happen if make was interrupted).
-      ifneq ($$($$($1_BASE)_DEPS_FILE_LOADED), true)
-        # Include previously generated dependency information. (if it exists)
-        -include $$($1_DEPS_FILE)
-        -include $$($1_DEPS_TARGETS_FILE)
-      endif
+      # Include previously generated dependency information. (if it exists)
+      -include $$($1_DEP)
+      -include $$($1_DEP_TARGETS)
     endif
 
     ifneq ($$(strip $$($1_CFLAGS) $$($1_CXXFLAGS) $$($1_OPTIMIZATION)), )
@@ -386,29 +297,28 @@ define SetupCompileNativeFileBody
       $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, $$($1_OBJ).vardeps)
     endif
 
-    $1_OBJ_DEPS := $$($1_SRC_FILE) $$($$($1_BASE)_COMPILE_VARDEPS_FILE) \
-        $$($$($1_BASE)_EXTRA_DEPS) $$($1_VARDEPS_FILE)
-    $1_COMPILE_OPTIONS := $$($1_FLAGS) $(CC_OUT_OPTION)$$($1_OBJ) $$($1_SRC_FILE)
-
-    $$($1_OBJ_JSON): $$($1_OBJ_DEPS)
-	$$(call WriteCompileCommandsFragment, $$@, $$(PWD), $$($1_SRC_FILE), \
-	    $$($1_COMPILER) $$($1_COMPILE_OPTIONS), $$($1_OBJ))
-
-    $$($1_OBJ): $$($1_OBJ_DEPS) | $$($$($1_BASE)_BUILD_INFO)
+    $$($1_OBJ): $$($1_SRC_FILE) $$($$($1_BASE)_COMPILE_VARDEPS_FILE) \
+        $$($$($1_BASE)_EXTRA_DEPS) $$($1_VARDEPS_FILE) | $$($$($1_BASE)_BUILD_INFO)
 	$$(call LogInfo, Compiling $$($1_FILENAME) (for $$($$($1_BASE)_BASENAME)))
 	$$(call MakeDir, $$(@D))
         ifneq ($(TOOLCHAIN_TYPE), microsoft)
-	  $$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
-	      $$($1_COMPILER) $$($1_DEP_FLAG) \
-	      $$(addsuffix .tmp, $$($1_DEPS_FILE)) \
-	      $$($1_COMPILE_OPTIONS)))
-          ifneq ($$($1_DEPS_FILE), )
-	    $$(call fix-deps-file, $$($1_DEPS_FILE))
-            # Create a dependency target file from the dependency file.
-            # Solution suggested by:
-            # http://make.mad-scientist.net/papers/advanced-auto-dependency-generation/
-	    $(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_DEPS_FILE) \
-	        > $$($1_DEPS_TARGETS_FILE)
+          ifeq ($(TOOLCHAIN_TYPE)$$(filter %.s, $$($1_FILENAME)), solstudio)
+            # The Solaris studio compiler doesn't output the full path to the
+            # object file in the generated deps files. Fixing it with sed. If
+            # compiling assembly, don't try this.
+	    $$(call ExecuteWithLog, $$@, \
+	        $$($1_COMPILER) $$($1_FLAGS) $$($1_DEP_FLAG) $$($1_DEP).tmp \
+	            $(CC_OUT_OPTION)$$($1_OBJ) $$($1_SRC_FILE))
+	    $(SED) 's|^$$(@F):|$$@:|' $$($1_DEP).tmp > $$($1_DEP)
+          else
+	    $$(call ExecuteWithLog, $$@, \
+	        $$($1_COMPILER) $$($1_FLAGS) $$($1_DEP_FLAG) $$($1_DEP) \
+	            $(CC_OUT_OPTION)$$($1_OBJ) $$($1_SRC_FILE))
+          endif
+          # Create a dependency target file from the dependency file.
+          # Solution suggested by http://make.mad-scientist.net/papers/advanced-auto-dependency-generation/
+          ifneq ($$($1_DEP), )
+	    $(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_DEP) > $$($1_DEP_TARGETS)
           endif
         else
           # The Visual Studio compiler lacks a feature for generating make
@@ -418,15 +328,15 @@ define SetupCompileNativeFileBody
           # Keep as much as possible on one execution line for best performance
           # on Windows. No need to save exit code from compilation since
           # pipefail is always active on Windows.
-	  $$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
-	      $$($1_COMPILER) -showIncludes $$($1_COMPILE_OPTIONS))) \
+	  $$(call ExecuteWithLog, $$@, \
+	      $$($1_COMPILER) $$($1_FLAGS) -showIncludes \
+	          $(CC_OUT_OPTION)$$($1_OBJ) $$($1_SRC_FILE)) \
 	      | $(TR) -d '\r' | $(GREP) -v -e "^Note: including file:" \
 	          -e "^$$($1_FILENAME)$$$$" || test "$$$$?" = "1" ; \
-	  $(ECHO) $$@: \\ > $$($1_DEPS_FILE) ; \
+	  $(ECHO) $$@: \\ > $$($1_DEP) ; \
 	  $(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_OBJ).log \
-	      | $(SORT) -u >> $$($1_DEPS_FILE) ; \
-	  $(ECHO) >> $$($1_DEPS_FILE) ; \
-	  $(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_DEPS_FILE) > $$($1_DEPS_TARGETS_FILE)
+	      | $(SORT) -u >> $$($1_DEP) ; \
+	  $(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_DEP) > $$($1_DEP_TARGETS)
         endif
   endif
 endef
@@ -546,9 +456,6 @@ define SetupNativeCompilationBody
   $1_NOSUFFIX := $$($1_PREFIX)$$($1_NAME)
   $1_SAFE_NAME := $$(strip $$(subst /,_, $1))
 
-# Need to make sure TARGET is first on list
-  $1 := $$($1_TARGET)
-
   # Setup the toolchain to be used
   $$(call SetIfEmpty, $1_TOOLCHAIN, TOOLCHAIN_DEFAULT)
   $$(call SetIfEmpty, $1_CC, $$($$($1_TOOLCHAIN)_CC))
@@ -569,7 +476,7 @@ define SetupNativeCompilationBody
       $$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
 
   # Find all files in the source trees. Preserve order.
-  $1_SRCS := $$(foreach s, $$($1_SRC), $$(call FindFiles, $$(s)))
+  $1_SRCS := $$(foreach s, $$($1_SRC), $$(call CacheFind, $$(s)))
   $1_SRCS := $$(filter $$(NATIVE_SOURCE_EXTENSIONS), $$($1_SRCS))
   # Extract the C/C++ files.
   ifneq ($$($1_EXCLUDE_PATTERNS), )
@@ -753,6 +660,7 @@ define SetupNativeCompilationBody
             FILE := $$($1_GENERATED_PCH_SRC), \
             BASE := $1, \
             EXTRA_CXXFLAGS := -Fp$$($1_PCH_FILE) -Yc$$(notdir $$($1_PRECOMPILED_HEADER)), \
+            DISABLE_THIS_FILE_DEFINE := true, \
         ))
 
         $1_USE_PCH_FLAGS := \
@@ -775,65 +683,27 @@ define SetupNativeCompilationBody
           $1_PCH_FILE := $$($1_OBJECT_DIR)/precompiled/$$(notdir $$($1_PRECOMPILED_HEADER)).pch
           $1_USE_PCH_FLAGS := -include-pch $$($1_PCH_FILE)
         endif
-        $1_PCH_DEPS_FILE := $$($1_PCH_FILE).d
-        $1_PCH_DEPS_TARGETS_FILE := $$($1_PCH_FILE).d.targets
+        $1_PCH_DEP := $$($1_PCH_FILE).d
+        $1_PCH_DEP_TARGETS := $$($1_PCH_FILE).d.targets
 
-        -include $$($1_PCH_DEPS_FILE)
-        -include $$($1_PCH_DEPS_TARGETS_FILE)
-
-        $1_PCH_COMMAND := $$($1_CC) $$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $$($1_SYSROOT_CFLAGS) \
-            $$($1_OPT_CFLAGS) -x c++-header -c $(C_FLAG_DEPS) $$($1_PCH_DEPS_FILE)
+        -include $$($1_PCH_DEP)
+        -include $$($1_PCH_DEP_TARGETS)
 
         $$($1_PCH_FILE): $$($1_PRECOMPILED_HEADER) $$($1_COMPILE_VARDEPS_FILE)
 		$$(call LogInfo, Generating precompiled header)
 		$$(call MakeDir, $$(@D))
-		$$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
-		    $$($1_PCH_COMMAND) $$< -o $$@))
-		$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_PCH_DEPS_FILE) \
-		    > $$($1_PCH_DEPS_TARGETS_FILE)
+		$$(call ExecuteWithLog, $$@, \
+		    $$($1_CC) $$($1_CFLAGS) $$($1_EXTRA_CFLAGS) $$($1_SYSROOT_CFLAGS) \
+		    $$($1_OPT_CFLAGS) \
+		    -x c++-header -c $(C_FLAG_DEPS) $$($1_PCH_DEP) $$< -o $$@)
+		$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_PCH_DEP) > $$($1_PCH_DEP_TARGETS)
 
         $$($1_ALL_OBJS): $$($1_PCH_FILE)
 
-        # Generate the corresponding compile_commands.json fragment.
-        $1_PCH_FILE_JSON := $$(MAKESUPPORT_OUTPUTDIR)/compile-commands/$$(subst /,_,$$(subst \
-            $$(OUTPUTDIR)/,,$$($1_PCH_FILE))).json
-        $1_ALL_OBJS_JSON += $$($1_PCH_FILE_JSON)
-
-        $$($1_PCH_FILE_JSON): $$($1_PRECOMPILED_HEADER) $$($1_COMPILE_VARDEPS_FILE)
-		$$(call WriteCompileCommandsFragment, $$@, $$(PWD), $$<, \
-		    $$($1_PCH_COMMAND) $$< -o $$($1_PCH_FILE), $$($1_PCH_FILE))
       endif
     endif
   endif
 
-  # Create a rule to collect all the individual make dependency files into a
-  # single makefile.
-  $1_DEPS_FILE := $$($1_OBJECT_DIR)/$1.d
-
-  $$($1_DEPS_FILE): $$($1_ALL_OBJS)
-	$(RM) $$@
-        # CD into dir to reduce risk of hitting command length limits, which
-        # could otherwise happen if TOPDIR is a very long path.
-	$(CD) $$($1_OBJECT_DIR) && $(CAT) *.d > $$@.tmp
-	$(CD) $$($1_OBJECT_DIR) && $(CAT) *.d.targets | $(SORT) -u >> $$@.tmp
-        # After generating the file, which happens after all objects have been
-        # compiled, copy it to .old extension. On the next make invocation, this
-        # .old file will be included by make.
-	$(CP) $$@.tmp $$@.old
-	$(MV) $$@.tmp $$@
-
-  $1 += $$($1_DEPS_FILE)
-
-  # The include must be on the .old file, which represents the state from the
-  # previous invocation of make. The file being included must not have a rule
-  # defined for it as otherwise make will think it has to run the rule before
-  # being able to include the file, which would be wrong since we specifically
-  # need the file as it was generated by a previous make invocation.
-  ifneq ($$(wildcard $$($1_DEPS_FILE).old), )
-    $1_DEPS_FILE_LOADED := true
-    -include $$($1_DEPS_FILE).old
-  endif
-
   # Now call SetupCompileNativeFile for each source file we are going to compile.
   $$(foreach file, $$($1_SRCS), \
       $$(eval $$(call SetupCompileNativeFile, $1_$$(notdir $$(file)),\
@@ -860,10 +730,10 @@ define SetupNativeCompilationBody
   ifeq ($(OPENJDK_TARGET_OS), windows)
     ifneq ($$($1_VERSIONINFO_RESOURCE), )
       $1_RES := $$($1_OBJECT_DIR)/$$($1_BASENAME).res
-      $1_RES_DEPS_FILE := $$($1_RES).d
-      $1_RES_DEPS_TARGETS_FILE := $$($1_RES).d.targets
-      -include $$($1_RES_DEPS_FILE)
-      -include $$($1_RES_DEPS_TARGETS_FILE)
+      $1_RES_DEP := $$($1_RES).d
+      $1_RES_DEP_TARGETS := $$($1_RES).d.targets
+      -include $$($1_RES_DEP)
+      -include $$($1_RES_DEP_TARGETS)
 
       $1_RES_VARDEPS := $$($1_RC) $$($1_RC_FLAGS)
       $1_RES_VARDEPS_FILE := $$(call DependOnVariable, $1_RES_VARDEPS, \
@@ -872,27 +742,24 @@ define SetupNativeCompilationBody
       $$($1_RES): $$($1_VERSIONINFO_RESOURCE) $$($1_RES_VARDEPS_FILE)
 		$$(call LogInfo, Compiling resource $$(notdir $$($1_VERSIONINFO_RESOURCE)) (for $$($1_BASENAME)))
 		$$(call MakeDir, $$(@D) $$($1_OBJECT_DIR))
-		$$(call ExecuteWithLog, $$@, $$(call MakeCommandRelative, \
+		$$(call ExecuteWithLog, $$@, \
 		    $$($1_RC) $$($1_RC_FLAGS) $$($1_SYSROOT_CFLAGS) $(CC_OUT_OPTION)$$@ \
-		    $$($1_VERSIONINFO_RESOURCE) 2>&1 ))
+		    $$($1_VERSIONINFO_RESOURCE) 2>&1 )
                 # Windows RC compiler does not support -showIncludes, so we mis-use CL
                 # for this. Filter out RC specific arguments that are unknown to CL.
                 # For some unknown reason, in this case CL actually outputs the show
                 # includes to stderr so need to redirect it to hide the output from the
                 # main log.
-		$$(call ExecuteWithLog, $$($1_RES_DEPS_FILE).obj, \
+		$$(call ExecuteWithLog, $$($1_RES_DEP).obj, \
 		    $$($1_CC) $$(filter-out -l%, $$($1_RC_FLAGS)) \
 		        $$($1_SYSROOT_CFLAGS) -showIncludes -nologo -TC \
-		        $(CC_OUT_OPTION)$$($1_RES_DEPS_FILE).obj -P -Fi$$($1_RES_DEPS_FILE).pp \
+		        $(CC_OUT_OPTION)$$($1_RES_DEP).obj -P -Fi$$($1_RES_DEP).pp \
 		        $$($1_VERSIONINFO_RESOURCE)) 2>&1 \
 		    | $(TR) -d '\r' | $(GREP) -v -e "^Note: including file:" \
 		        -e "^$$(notdir $$($1_VERSIONINFO_RESOURCE))$$$$" || test "$$$$?" = "1" ; \
-		$(ECHO) $$($1_RES): \\ > $$($1_RES_DEPS_FILE) ; \
-		$(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_RES_DEPS_FILE).obj.log \
-		    >> $$($1_RES_DEPS_FILE) ; \
-		$(ECHO) >> $$($1_RES_DEPS_FILE) ;\
-		$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_RES_DEPS_FILE) \
-		    > $$($1_RES_DEPS_TARGETS_FILE)
+		$(ECHO) $$($1_RES): \\ > $$($1_RES_DEP) ; \
+		$(SED) $(WINDOWS_SHOWINCLUDE_SED_PATTERN) $$($1_RES_DEP).obj.log >> $$($1_RES_DEP) ; \
+		$(SED) $(DEPENDENCY_TARGET_SED_PATTERN) $$($1_RES_DEP) > $$($1_RES_DEP_TARGETS)
     endif
   endif
 
@@ -919,6 +786,9 @@ define SetupNativeCompilationBody
     $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
   endif
 
+  # Need to make sure TARGET is first on list
+  $1 := $$($1_TARGET)
+
   ifneq ($$($1_COPY_DEBUG_SYMBOLS), false)
     $1_COPY_DEBUG_SYMBOLS := $(COPY_DEBUG_SYMBOLS)
   endif
@@ -1149,10 +1019,6 @@ define SetupNativeCompilationBody
 		  --entitlements $(TOPDIR)/make/data/macosxsigning/entitlements.plist $$@
                 endif
   endif
-
-  ifeq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
-    $1 := $$($1_ALL_OBJS_JSON)
-  endif
 endef
 
 endif # _NATIVE_COMPILATION_GMK

make/common/TestFilesCompilation.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -75,7 +75,7 @@ define SetupTestFilesCompilationBody
 
   # Locate all files with the matching prefix
   $1_FILE_LIST := \
-      $$(call FindFiles, $$($1_SOURCE_DIRS), $$($1_PREFIX)*.c)
+      $$(shell $$(FIND) $$($1_SOURCE_DIRS) -type f -name "$$($1_PREFIX)*.c")
 
   $1_EXCLUDE_PATTERN := $$(addprefix %/, $$($1_EXCLUDE))
   $1_FILTERED_FILE_LIST := $$(filter-out $$($1_EXCLUDE_PATTERN), $$($1_FILE_LIST))

make/common/TextFileProcessing.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, 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
@@ -103,7 +103,7 @@ define SetupTextFileProcessingBody
           $$(error SOURCE_DIRS contains directory $$(src) outside \
               SOURCE_BASE_DIR $$($1_SOURCE_BASE_DIR) (in $1))))
     endif
-    $1_SOURCE_FILES := $$(sort $$(call FindFiles,$$($1_SOURCE_DIRS)))
+    $1_SOURCE_FILES := $$(sort $$(call CacheFind,$$($1_SOURCE_DIRS)))
     $1_EXCLUDE_FILES:=$$(foreach i,$$($1_SOURCE_DIRS),$$(addprefix $$i/,$$($1_EXCLUDE_FILES)))
     $1_INCLUDE_FILES:=$$(foreach i,$$($1_SOURCE_DIRS),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
     $1_SOURCE_FILES := $$(filter-out $$($1_EXCLUDE_FILES),$$($1_SOURCE_FILES))

make/common/ZipArchive.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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
@@ -48,8 +48,6 @@ endif
 #                           src dir
 #   SUFFIXES
 #   EXTRA_DEPS
-#   FOLLOW_SYMLINKS - Set to explicitly follow symlinks. Affects performance of
-#                     finding files.
 #   ZIP_OPTIONS extra options to pass to zip
 SetupZipArchive = $(NamedParamsMacroTemplate)
 define SetupZipArchiveBody
@@ -65,13 +63,7 @@ define SetupZipArchiveBody
   endif
 
   # Find all files in the source tree.
-  # If asked to, follow symlinks in this find since that is what zip does. To do
-  # this, we need to call ShellFindFiles directly.
-  ifeq ($$($1_FOLLOW_SYMLINKS), true)
-    $1_ALL_SRCS := $$(call not-containing,_the.,$$(call ShellFindFiles,$$($1_FIND_LIST), , -L))
-  else
-    $1_ALL_SRCS := $$(call not-containing,_the.,$$(call FindFiles,$$($1_FIND_LIST)))
-  endif
+  $1_ALL_SRCS := $$(call not-containing,_the.,$$(call CacheFind,$$($1_FIND_LIST)))
 
   # Filter on suffixes if set
   ifneq ($$($1_SUFFIXES),)

make/conf/jib-profiles.js

@@ -522,7 +522,7 @@ var getJibProfilesProfiles = function (input, common, data) {
         .forEach(function (name) {
             var maketestName = name + "-testmake";
             profiles[maketestName] = concatObjects(profiles[name], testmakeBase);
-            profiles[maketestName].default_make_targets = [ "test-make", "test-compile-commands" ];
+            profiles[maketestName].default_make_targets = [ "test-make" ];
         });
 
     // Profiles for building the zero jvm variant. These are used for verification.
@@ -747,8 +747,7 @@ var getJibProfilesProfiles = function (input, common, data) {
         "run-test-prebuilt": {
             target_os: input.build_os,
             target_cpu: input.build_cpu,
-            dependencies: [
-                "jtreg", "gnumake", "boot_jdk", "devkit", "jib", testedProfile + ".jdk",
+            dependencies: [ "jtreg", "gnumake", "boot_jdk", "jib", testedProfile + ".jdk",
                 testedProfile + ".test"
             ],
             src: "src.conf",
@@ -782,6 +781,7 @@ var getJibProfilesProfiles = function (input, common, data) {
     // This gives us a guaranteed working version of lldb for the jtreg failure handler.
     if (input.build_os == "macosx") {
         macosxRunTestExtra = {
+            dependencies: [ "devkit" ],
             environment_path: input.get("devkit", "install_path")
                 + "/Xcode.app/Contents/Developer/usr/bin"
         };
@@ -844,11 +844,11 @@ var getJibProfilesDependencies = function (input, common) {
         windows_x64: "VS2017-15.5.5+1.0",
         linux_aarch64: (input.profile != null && input.profile.indexOf("arm64") >= 0
                     ? "gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux+1.0"
-                    : "gcc7.3.0-Fedora27+1.1"),
+                    : "gcc7.3.0-Fedora27+1.0"),
         linux_arm: (input.profile != null && input.profile.indexOf("hflt") >= 0
                     ? "gcc-linaro-arm-linux-gnueabihf-raspbian-2012.09-20120921_linux+1.0"
                     : (input.profile != null && input.profile.indexOf("arm32") >= 0
-                       ? "gcc7.3.0-Fedora27+1.1"
+                       ? "gcc7.3.0-Fedora27+1.0"
                        : "arm-linaro-4.7+1.0"
                        )
                     )
@@ -882,10 +882,7 @@ var getJibProfilesDependencies = function (input, common) {
             organization: common.organization,
             ext: "tar.gz",
             module: "devkit-" + devkit_platform,
-            revision: devkit_platform_revisions[devkit_platform],
-            environment: {
-                "DEVKIT_HOME": input.get("devkit", "home_path"),
-            }
+            revision: devkit_platform_revisions[devkit_platform]
         },
 
         build_devkit: {
@@ -986,6 +983,14 @@ var getJibProfilesDependencies = function (input, common) {
         },
     };
 
+    // Need to add a value for the Visual Studio tools variable to make
+    // jaot be able to pick up the Visual Studio linker in testing.
+    if (input.target_os == "windows") {
+        dependencies.devkit.environment = {
+            VS120COMNTOOLS: input.get("devkit", "install_path") + "/Common7/Tools"
+        };
+    }
+
     return dependencies;
 };
 
@@ -1167,16 +1172,10 @@ var versionArgs = function(input, common) {
     var args = ["--with-version-build=" + common.build_number];
     if (input.build_type == "promoted") {
         args = concat(args,
-                      "--with-version-pre=" + version_numbers.get("DEFAULT_PROMOTED_VERSION_PRE"),
+                      // This needs to be changed when we start building release candidates
+                      // with-version-pre must be set to ea for 'ea' and empty for fcs build
+                      "--with-version-pre=",
                       "--without-version-opt");
-    } else if (input.build_type == "ci") {
-        var optString = input.build_id_data.ciBuildNumber;
-        var preString = input.build_id_data.projectName;
-        if (preString == "jdk") {
-            preString = version_numbers.get("DEFAULT_PROMOTED_VERSION_PRE");
-        }
-        args = concat(args, "--with-version-pre=" + preString,
-                     "--with-version-opt=" + optString);
     } else {
         args = concat(args, "--with-version-opt=" + common.build_id);
     }

make/copy/CopyCommon.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@ ifneq ($(wildcard $(INCLUDE_SOURCE_DIR)/*), )
   $(eval $(call SetupCopyFiles, COPY_EXPORTED_INCLUDE, \
       SRC := $(INCLUDE_SOURCE_DIR), \
       DEST := $(INCLUDE_TARGET_DIR), \
-      FILES := $(filter %.h, $(call FindFiles, $(INCLUDE_SOURCE_DIR))), \
+      FILES := $(filter %.h, $(call CacheFind, $(INCLUDE_SOURCE_DIR))), \
   ))
 
   TARGETS += $(COPY_EXPORTED_INCLUDE)
@@ -56,7 +56,7 @@ ifneq ($(wildcard $(INCLUDE_SOURCE_OS_DIR)/*), )
   $(eval $(call SetupCopyFiles, COPY_EXPORTED_INCLUDE_OS, \
       SRC := $(INCLUDE_SOURCE_OS_DIR), \
       DEST := $(INCLUDE_TARGET_DIR)/$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR), \
-      FILES := $(filter %.h, $(call FindFiles, $(INCLUDE_SOURCE_OS_DIR))), \
+      FILES := $(filter %.h, $(call CacheFind, $(INCLUDE_SOURCE_OS_DIR))), \
   ))
 
   TARGETS += $(COPY_EXPORTED_INCLUDE_OS)

make/data/fontconfig/windows.fontconfig.properties

@@ -230,7 +230,7 @@ sequence.dialog.x-MS950-HKSCS-XP=alphabetic,chinese-ms950,chinese-hkscs,dingbats
 sequence.dialoginput.x-MS950-HKSCS-XP=alphabetic,chinese-ms950,chinese-hkscs,dingbats,symbol,chinese-ms950-extb
 
 sequence.allfonts.UTF-8.hi=alphabetic/1252,devanagari,dingbats,symbol
-sequence.allfonts.UTF-8.ja=alphabetic,japanese,devanagari,dingbats,symbol
+sequence.allfonts.UTF-8.ja=alphabetic,japanese,dingbats,symbol
 
 sequence.allfonts.windows-1255=hebrew,alphabetic/1252,dingbats,symbol
 

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

@@ -1,4 +1,4 @@
-File-Date: 2019-09-16
+File-Date: 2019-04-03
 %%
 Type: language
 Subtag: aa
@@ -2096,8 +2096,6 @@ Type: language
 Subtag: ais
 Description: Nataoran Amis
 Added: 2009-07-29
-Deprecated: 2019-04-16
-Comments: see ami, szy
 %%
 Type: language
 Subtag: ait
@@ -2635,7 +2633,6 @@ Added: 2009-07-29
 Type: language
 Subtag: ant
 Description: Antakarinya
-Description: Antikarinya
 Added: 2009-07-29
 %%
 Type: language
@@ -3097,8 +3094,6 @@ Type: language
 Subtag: asd
 Description: Asas
 Added: 2009-07-29
-Deprecated: 2019-04-16
-Preferred-Value: snz
 %%
 Type: language
 Subtag: ase
@@ -4140,7 +4135,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: bck
-Description: Bunuba
+Description: Bunaba
 Added: 2009-07-29
 %%
 Type: language
@@ -6935,7 +6930,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: bym
-Description: Bidjara
+Description: Bidyara
 Added: 2009-07-29
 %%
 Type: language
@@ -7569,11 +7564,6 @@ Description: Centúúm
 Added: 2009-07-29
 %%
 Type: language
-Subtag: cey
-Description: Ekai Chin
-Added: 2019-04-16
-%%
-Type: language
 Subtag: cfa
 Description: Dijim-Bwilim
 Added: 2009-07-29
@@ -9449,7 +9439,6 @@ Added: 2009-07-29
 Type: language
 Subtag: dif
 Description: Dieri
-Description: Diyari
 Added: 2009-07-29
 %%
 Type: language
@@ -9526,8 +9515,6 @@ Type: language
 Subtag: dit
 Description: Dirari
 Added: 2009-07-29
-Deprecated: 2019-04-29
-Preferred-Value: dif
 %%
 Type: language
 Subtag: diu
@@ -9573,7 +9560,6 @@ Added: 2009-07-29
 Type: language
 Subtag: djd
 Description: Djamindjung
-Description: Ngaliwurru
 Added: 2009-07-29
 %%
 Type: language
@@ -9617,7 +9603,6 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: djn
-Description: Jawoyn
 Description: Djauan
 Added: 2009-07-29
 %%
@@ -10206,8 +10191,6 @@ Type: language
 Subtag: dud
 Description: Hun-Saare
 Added: 2009-07-29
-Deprecated: 2019-04-16
-Comments: see uth, uss
 %%
 Type: language
 Subtag: due
@@ -10399,7 +10382,6 @@ Added: 2009-07-29
 Type: language
 Subtag: dyn
 Description: Dyangadi
-Description: Dhanggatti
 Added: 2009-07-29
 %%
 Type: language
@@ -10414,7 +10396,6 @@ Added: 2005-10-16
 %%
 Type: language
 Subtag: dyy
-Description: Djabugay
 Description: Dyaabugay
 Added: 2009-07-29
 %%
@@ -11691,7 +11672,7 @@ Comments: see wny, wrk
 %%
 Type: language
 Subtag: gbd
-Description: Karajarri
+Description: Karadjeri
 Added: 2009-07-29
 %%
 Type: language
@@ -12075,7 +12056,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: gge
-Description: Gurr-goni
+Description: Guragone
 Added: 2009-07-29
 %%
 Type: language
@@ -12188,7 +12169,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: gia
-Description: Kija
+Description: Kitja
 Added: 2009-07-29
 %%
 Type: language
@@ -12974,7 +12955,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: gue
-Description: Gurindji
+Description: Gurinji
 Added: 2009-07-29
 %%
 Type: language
@@ -15311,7 +15292,6 @@ Macrolanguage: ms
 Type: language
 Subtag: jay
 Description: Yan-nhangu
-Description: Nhangu
 Added: 2009-07-29
 %%
 Type: language
@@ -15508,7 +15488,6 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: jig
-Description: Jingulu
 Description: Djingili
 Added: 2009-07-29
 %%
@@ -17243,7 +17222,6 @@ Added: 2009-07-29
 Type: language
 Subtag: kkp
 Description: Gugubera
-Description: Koko-Bera
 Added: 2009-07-29
 %%
 Type: language
@@ -17288,7 +17266,6 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: kky
-Description: Guugu Yimidhirr
 Description: Guguyimidjir
 Added: 2009-07-29
 %%
@@ -18343,7 +18320,6 @@ Added: 2009-07-29
 Type: language
 Subtag: ktd
 Description: Kokata
-Description: Kukatha
 Added: 2009-07-29
 %%
 Type: language
@@ -19365,7 +19341,6 @@ Type: language
 Subtag: lba
 Description: Lui
 Added: 2009-07-29
-Deprecated: 2019-04-16
 %%
 Type: language
 Subtag: lbb
@@ -19421,7 +19396,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: lbn
-Description: Rmeet
+Description: Lamet
 Added: 2009-07-29
 %%
 Type: language
@@ -19471,7 +19446,6 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: lby
-Description: Lamalama
 Description: Lamu-Lamu
 Added: 2009-07-29
 %%
@@ -20188,8 +20162,6 @@ Type: language
 Subtag: llo
 Description: Khlor
 Added: 2009-07-29
-Deprecated: 2019-04-16
-Preferred-Value: ngt
 %%
 Type: language
 Subtag: llp
@@ -20682,11 +20654,6 @@ Added: 2009-07-29
 Macrolanguage: luy
 %%
 Type: language
-Subtag: lsn
-Description: Tibetan Sign Language
-Added: 2019-04-16
-%%
-Type: language
 Subtag: lso
 Description: Laos Sign Language
 Added: 2009-07-29
@@ -20713,11 +20680,6 @@ Description: Trinidad and Tobago Sign Language
 Added: 2009-07-29
 %%
 Type: language
-Subtag: lsv
-Description: Sivia Sign Language
-Added: 2019-04-16
-%%
-Type: language
 Subtag: lsy
 Description: Mauritian Sign Language
 Added: 2010-03-11
@@ -20886,11 +20848,6 @@ Description: Maku'a
 Added: 2009-07-29
 %%
 Type: language
-Subtag: lvi
-Description: Lavi
-Added: 2019-04-16
-%%
-Type: language
 Subtag: lvk
 Description: Lavukaleve
 Added: 2009-07-29
@@ -21497,7 +21454,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: mec
-Description: Marra
+Description: Mara
 Added: 2009-07-29
 %%
 Type: language
@@ -21566,7 +21523,7 @@ Macrolanguage: ms
 %%
 Type: language
 Subtag: mep
-Description: Miriwoong
+Description: Miriwung
 Added: 2009-07-29
 %%
 Type: language
@@ -21703,7 +21660,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: mfr
-Description: Marrithiyel
+Description: Marithiel
 Added: 2009-07-29
 %%
 Type: language
@@ -22896,13 +22853,12 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: mpb
-Description: Malak Malak
 Description: Mullukmulluk
 Added: 2009-07-29
 %%
 Type: language
 Subtag: mpc
-Description: Mangarrayi
+Description: Mangarayi
 Added: 2009-07-29
 %%
 Type: language
@@ -22933,7 +22889,6 @@ Added: 2009-07-29
 Type: language
 Subtag: mpj
 Description: Martu Wangka
-Description: Wangkajunga
 Added: 2009-07-29
 %%
 Type: language
@@ -24060,8 +24015,6 @@ Type: language
 Subtag: myd
 Description: Maramba
 Added: 2009-07-29
-Deprecated: 2019-04-16
-Preferred-Value: aog
 %%
 Type: language
 Subtag: mye
@@ -24087,7 +24040,6 @@ Type: language
 Subtag: myi
 Description: Mina (India)
 Added: 2009-07-29
-Deprecated: 2019-04-16
 %%
 Type: language
 Subtag: myj
@@ -24423,7 +24375,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: nay
-Description: Ngarrindjeri
+Description: Narrinyeri
 Added: 2009-07-29
 %%
 Type: language
@@ -24480,7 +24432,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: nbj
-Description: Ngarinyman
+Description: Ngarinman
 Added: 2009-07-29
 %%
 Type: language
@@ -24515,7 +24467,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: nbr
-Description: Numana
+Description: Numana-Nunku-Gbantu-Numbu
 Added: 2009-07-29
 %%
 Type: language
@@ -24607,7 +24559,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: nck
-Description: Na-kara
+Description: Nakara
 Added: 2009-07-29
 %%
 Type: language
@@ -24979,7 +24931,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: ngh
-Description: Nǁng
+Description: Nǀu
 Added: 2009-07-29
 %%
 Type: language
@@ -25224,7 +25176,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: nig
-Description: Ngalakgan
+Description: Ngalakan
 Added: 2009-07-29
 %%
 Type: language
@@ -25846,8 +25798,6 @@ Type: language
 Subtag: nns
 Description: Ningye
 Added: 2009-07-29
-Deprecated: 2019-04-16
-Preferred-Value: nbr
 %%
 Type: language
 Subtag: nnt
@@ -26708,7 +26658,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: nyh
-Description: Nyikina
+Description: Nyigina
 Added: 2009-07-29
 %%
 Type: language
@@ -26763,7 +26713,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: nys
-Description: Nyungar
+Description: Nyunga
 Added: 2009-07-29
 %%
 Type: language
@@ -28757,11 +28707,6 @@ Description: Pannei
 Added: 2009-07-29
 %%
 Type: language
-Subtag: pnd
-Description: Mpinda
-Added: 2019-04-16
-%%
-Type: language
 Subtag: pne
 Description: Western Penan
 Added: 2009-07-29
@@ -28849,7 +28794,6 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: pnw
-Description: Banyjima
 Description: Panytyima
 Added: 2009-07-29
 %%
@@ -29307,8 +29251,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: pti
-Description: Pindiini
-Description: Wangkatha
+Description: Pintiini
 Added: 2009-07-29
 %%
 Type: language
@@ -30190,7 +30133,6 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: ril
-Description: Riang Lang
 Description: Riang (Myanmar)
 Added: 2009-07-29
 %%
@@ -30211,7 +30153,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: rit
-Description: Ritharrngu
+Description: Ritarungo
 Added: 2009-07-29
 %%
 Type: language
@@ -30277,7 +30219,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: rmb
-Description: Rembarrnga
+Description: Rembarunga
 Added: 2009-07-29
 %%
 Type: language
@@ -30699,7 +30641,6 @@ Added: 2013-09-10
 Type: language
 Subtag: rxw
 Description: Karuwali
-Description: Garuwali
 Added: 2013-09-10
 %%
 Type: language
@@ -32265,7 +32206,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: snz
-Description: Kou
+Description: Sinsauru
 Added: 2009-07-29
 %%
 Type: language
@@ -32942,7 +32883,6 @@ Type: language
 Subtag: suj
 Description: Shubi
 Added: 2009-07-29
-Comments: see also xsj
 %%
 Type: language
 Subtag: suk
@@ -33372,11 +33312,6 @@ Description: Sawai
 Added: 2009-07-29
 %%
 Type: language
-Subtag: szy
-Description: Sakizaya
-Added: 2019-04-16
-%%
-Type: language
 Subtag: taa
 Description: Lower Tanana
 Added: 2009-07-29
@@ -33530,7 +33465,6 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: tbh
-Description: Dharawal
 Description: Thurawal
 Added: 2009-07-29
 %%
@@ -33710,7 +33644,6 @@ Added: 2009-07-29
 Type: language
 Subtag: tcs
 Description: Torres Strait Creole
-Description: Yumplatok
 Added: 2009-07-29
 %%
 Type: language
@@ -34134,7 +34067,6 @@ Preferred-Value: tpo
 %%
 Type: language
 Subtag: thd
-Description: Kuuk Thaayorre
 Description: Thayore
 Added: 2009-07-29
 %%
@@ -34378,11 +34310,6 @@ Description: Northern Tujia
 Added: 2009-07-29
 %%
 Type: language
-Subtag: tjj
-Description: Tjungundji
-Added: 2019-04-16
-%%
-Type: language
 Subtag: tjl
 Description: Tai Laing
 Added: 2012-08-12
@@ -34403,11 +34330,6 @@ Description: Temacine Tamazight
 Added: 2009-07-29
 %%
 Type: language
-Subtag: tjp
-Description: Tjupany
-Added: 2019-04-16
-%%
-Type: language
 Subtag: tjs
 Description: Southern Tujia
 Added: 2009-07-29
@@ -35757,11 +35679,6 @@ Description: Sedoa
 Added: 2009-07-29
 %%
 Type: language
-Subtag: tvx
-Description: Taivoan
-Added: 2019-04-16
-%%
-Type: language
 Subtag: tvy
 Description: Timor Pidgin
 Added: 2009-07-29
@@ -36313,7 +36230,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: ulk
-Description: Meriam Mir
+Description: Meriam
 Added: 2009-07-29
 %%
 Type: language
@@ -36363,7 +36280,6 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: umg
-Description: Morrobalama
 Description: Umbuygamu
 Added: 2009-07-29
 %%
@@ -36634,11 +36550,6 @@ Description: Uspanteco
 Added: 2009-07-29
 %%
 Type: language
-Subtag: uss
-Description: us-Saare
-Added: 2019-04-16
-%%
-Type: language
 Subtag: usu
 Description: Uya
 Added: 2009-07-29
@@ -36654,11 +36565,6 @@ Description: Ute-Southern Paiute
 Added: 2009-07-29
 %%
 Type: language
-Subtag: uth
-Description: ut-Hun
-Added: 2019-04-16
-%%
-Type: language
 Subtag: utp
 Description: Amba (Solomon Islands)
 Added: 2009-07-29
@@ -37272,7 +37178,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: waq
-Description: Wagiman
+Description: Wageman
 Added: 2009-07-29
 %%
 Type: language
@@ -37395,7 +37301,7 @@ Added: 2017-02-23
 %%
 Type: language
 Subtag: wbt
-Description: Warnman
+Description: Wanman
 Added: 2009-07-29
 %%
 Type: language
@@ -37542,7 +37448,6 @@ Added: 2010-03-11
 %%
 Type: language
 Subtag: wgg
-Description: Wangkangurru
 Description: Wangganguru
 Added: 2009-07-29
 %%
@@ -37616,7 +37521,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: wig
-Description: Wik Ngathan
+Description: Wik-Ngathana
 Added: 2009-07-29
 %%
 Type: language
@@ -37720,11 +37625,6 @@ Description: Kalanadi
 Added: 2009-07-29
 %%
 Type: language
-Subtag: wkr
-Description: Keerray-Woorroong
-Added: 2019-04-16
-%%
-Type: language
 Subtag: wku
 Description: Kunduvadi
 Added: 2009-07-29
@@ -37957,12 +37857,10 @@ Added: 2013-09-10
 Type: language
 Subtag: wny
 Description: Wanyi
-Description: Waanyi
 Added: 2012-08-12
 %%
 Type: language
 Subtag: woa
-Description: Kuwema
 Description: Tyaraity
 Added: 2009-07-29
 %%
@@ -38053,7 +37951,6 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: wrb
-Description: Waluwarra
 Description: Warluwara
 Added: 2009-07-29
 %%
@@ -38065,12 +37962,11 @@ Added: 2009-07-29
 Type: language
 Subtag: wrg
 Description: Warungu
-Description: Gudjal
 Added: 2009-07-29
 %%
 Type: language
 Subtag: wrh
-Description: Wiradjuri
+Description: Wiradhuri
 Added: 2009-07-29
 %%
 Type: language
@@ -38543,7 +38439,6 @@ Deprecated: 2016-05-30
 %%
 Type: language
 Subtag: xby
-Description: Batjala
 Description: Batyala
 Added: 2013-09-10
 %%
@@ -39103,7 +38998,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: xmh
-Description: Kugu-Muminh
+Description: Kuku-Muminh
 Added: 2009-07-29
 %%
 Type: language
@@ -39528,7 +39423,8 @@ Type: language
 Subtag: xsj
 Description: Subi
 Added: 2009-07-29
-Comments: see also suj
+Deprecated: 2015-02-12
+Preferred-Value: suj
 %%
 Type: language
 Subtag: xsl
@@ -40362,7 +40258,6 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: yin
-Description: Riang Lai
 Description: Yinchia
 Added: 2009-07-29
 %%
@@ -41667,13 +41562,12 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: zml
-Description: Matngala
+Description: Madngele
 Added: 2009-07-29
 %%
 Type: language
 Subtag: zmm
 Description: Marimanindji
-Description: Marramaninyshi
 Added: 2009-07-29
 %%
 Type: language
@@ -43125,13 +43019,6 @@ Preferred-Value: lsl
 Prefix: sgn
 %%
 Type: extlang
-Subtag: lsn
-Description: Tibetan Sign Language
-Added: 2019-04-16
-Preferred-Value: lsn
-Prefix: sgn
-%%
-Type: extlang
 Subtag: lso
 Description: Laos Sign Language
 Added: 2009-07-29
@@ -43154,13 +43041,6 @@ Preferred-Value: lst
 Prefix: sgn
 %%
 Type: extlang
-Subtag: lsv
-Description: Sivia Sign Language
-Added: 2019-04-16
-Preferred-Value: lsv
-Prefix: sgn
-%%
-Type: extlang
 Subtag: lsy
 Description: Mauritian Sign Language
 Added: 2010-03-11
@@ -44086,11 +43966,6 @@ Description: Cherokee
 Added: 2005-10-16
 %%
 Type: script
-Subtag: Chrs
-Description: Chorasmian
-Added: 2019-09-11
-%%
-Type: script
 Subtag: Cirt
 Description: Cirth
 Added: 2005-10-16
@@ -44127,11 +44002,6 @@ Description: Nagari
 Added: 2005-10-16
 %%
 Type: script
-Subtag: Diak
-Description: Dives Akuru
-Added: 2019-09-11
-%%
-Type: script
 Subtag: Dogr
 Description: Dogra
 Added: 2017-01-13
@@ -44969,11 +44839,6 @@ Description: Sumero-Akkadian cuneiform
 Added: 2005-10-16
 %%
 Type: script
-Subtag: Yezi
-Description: Yezidi
-Added: 2019-09-11
-%%
-Type: script
 Subtag: Yiii
 Description: Yi
 Added: 2005-10-16
@@ -45818,7 +45683,7 @@ Added: 2005-10-16
 %%
 Type: region
 Subtag: MK
-Description: North Macedonia
+Description: The Former Yugoslav Republic of Macedonia
 Added: 2005-10-16
 %%
 Type: region

make/data/publicsuffixlist/VERSION

@@ -1,2 +1,2 @@
-Github: https://raw.githubusercontent.com/publicsuffix/list/33c1c788decfed1052089fa27e3005fe4088dec3/public_suffix_list.dat
-Date: 2019-09-28
+Github: https://raw.githubusercontent.com/publicsuffix/list/ce0d1a5fba657e55adea3abde4b7f1e50636ff10/public_suffix_list.dat
+Date: 2019-01-28

make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 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
@@ -65,9 +65,9 @@ PROC_SRC_SUBDIRS := \
 
 PROC_SRC_DIRS := $(patsubst %, $(SRC_DIR)/%/src, $(PROC_SRC_SUBDIRS))
 
-PROC_SRCS := $(filter %.java, $(call FindFiles, $(PROC_SRC_DIRS)))
+PROC_SRCS := $(filter %.java, $(call CacheFind, $(PROC_SRC_DIRS)))
 
-ALL_SRC_DIRS := $(SRC_DIR) $(wildcard $(SRC_DIR)/*/src)
+ALL_SRC_DIRS := $(wildcard $(SRC_DIR)/*/src)
 SOURCEPATH := $(call PathList, $(ALL_SRC_DIRS))
 
 PROCESSOR_JARS := \
@@ -81,23 +81,23 @@ PROCESSOR_PATH := $(call PathList, $(PROCESSOR_JARS))
 
 ADD_EXPORTS := \
     --add-modules jdk.internal.vm.ci \
-    --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 \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.common=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.events=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspotvmconfig=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.inittimer=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.services=jdk.internal.vm.compiler \
-    --add-exports jdk.internal.vm.ci/jdk.vm.ci.sparc=jdk.internal.vm.compiler \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.aarch64=ALL-UNNAMED \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.amd64=ALL-UNNAMED \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code=ALL-UNNAMED \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.site=ALL-UNNAMED \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.code.stack=ALL-UNNAMED \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.common=ALL-UNNAMED \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot=ALL-UNNAMED \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=ALL-UNNAMED \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=ALL-UNNAMED \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.events=ALL-UNNAMED \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=ALL-UNNAMED \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.hotspotvmconfig=ALL-UNNAMED \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.inittimer=ALL-UNNAMED \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.runtime=ALL-UNNAMED \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.services=ALL-UNNAMED \
+    --add-exports jdk.internal.vm.ci/jdk.vm.ci.sparc=ALL-UNNAMED \
     #
 
 $(GENSRC_DIR)/_gensrc_proc_done: $(PROC_SRCS) $(PROCESSOR_JARS)
@@ -121,7 +121,6 @@ TARGETS += $(GENSRC_DIR)/_gensrc_proc_done
 ################################################################################
 
 $(GENSRC_DIR)/module-info.java.extra: $(GENSRC_DIR)/_gensrc_proc_done
-	$(ECHO) "" > $@;
 	($(CD) $(GENSRC_DIR)/META-INF/providers && \
 	    p=""; \
 	    for i in $$($(LS) | $(SORT)); do \

make/gensrc/Gensrc-jdk.internal.vm.compiler.management.gmk

@@ -1,101 +0,0 @@
-#
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# 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.
-#
-
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-
-GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)
-SRC_DIR := $(TOPDIR)/src/$(MODULE)/share/classes
-
-################################################################################
-
-PROC_SRC_SUBDIRS := \
-    org.graalvm.compiler.hotspot.management \
-    #
-
-PROC_SRC_DIRS := $(patsubst %, $(SRC_DIR)/%/src, $(PROC_SRC_SUBDIRS))
-
-PROC_SRCS := $(filter %.java, $(call FindFiles, $(PROC_SRC_DIRS)))
-
-ALL_SRC_DIRS := $(SRC_DIR) $(wildcard $(SRC_DIR)/*/src)
-SOURCEPATH := $(call PathList, $(ALL_SRC_DIRS))
-
-PROCESSOR_JARS := \
-    $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.serviceprovider.processor.jar \
-    #
-PROCESSOR_PATH := $(call PathList, $(PROCESSOR_JARS))
-
-$(GENSRC_DIR)/_gensrc_proc_done: $(PROC_SRCS) $(PROCESSOR_JARS)
-	$(call MakeDir, $(@D))
-	$(eval $(call ListPathsSafely,PROC_SRCS,$(@D)/_gensrc_proc_files))
-	$(JAVA) $(NEW_JAVAC) \
-	    -XDignore.symbol.file \
-	    --upgrade-module-path $(JDK_OUTPUTDIR)/modules --system none \
-	    -sourcepath $(SOURCEPATH) \
-	    -implicit:none \
-	    -proc:only \
-	    -processorpath $(PROCESSOR_PATH) \
-	    -d $(GENSRC_DIR) \
-	    -s $(GENSRC_DIR) \
-	    @$(@D)/_gensrc_proc_files
-	$(TOUCH) $@
-
-TARGETS += $(GENSRC_DIR)/_gensrc_proc_done
-
-################################################################################
-
-$(GENSRC_DIR)/module-info.java.extra: $(GENSRC_DIR)/_gensrc_proc_done
-	$(ECHO) "" > $@;
-	($(CD) $(GENSRC_DIR)/META-INF/providers && \
-	    p=""; \
-	    impl=""; \
-	    for i in $$($(GREP) '^' * | $(SORT) -t ':' -k 2 | $(SED) 's/:.*//'); do \
-	      c=$$($(CAT) $$i | $(TR) -d '\n\r' | $(TR) '$$' '.' ); \
-	      if test x$$p != x$$c; then \
-                if test x$$p != x; then \
-	          $(ECHO) "    ;" >> $@; \
-	        fi; \
-	        $(ECHO) "provides $$c with" >> $@; \
-                p=$$c; \
-	        impl=""; \
-	      fi; \
-              if test x$$impl != x; then \
-	        $(ECHO) "  , $$i" >> $@; \
-              else \
-	        $(ECHO) "    $$i" >> $@; \
-              fi; \
-              impl=$$i; \
-	    done); \
-	$(ECHO) "    ;" >> $@;
-
-TARGETS += $(GENSRC_DIR)/module-info.java.extra
-
-################################################################################
-
-all: $(TARGETS)
-
-.PHONY: default all

make/gensrc/GensrcCharacterData.gmk

@@ -38,7 +38,6 @@ define SetupCharacterData
 	$$(call LogInfo, Generating $1.java)
 	$$(call MakeDir, $$(@D))
 	$(TOOL_GENERATECHARACTER) $2 \
-	    $(if $(call equals, $(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT), true), -d) \
 	    -template $(CHARACTERDATA)/$1.java.template \
 	    -spec $(UNICODEDATA)/UnicodeData.txt \
 	    -specialcasing $(UNICODEDATA)/SpecialCasing.txt \

make/gensrc/GensrcCommonLangtools.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, 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
@@ -64,7 +64,7 @@ endef
 define SetupCompileProperties
   # Lookup the properties that need to be compiled into resource bundles.
   PROPSOURCES := $2 \
-      $$(call FindFiles, $(TOPDIR)/src/$(MODULE)/share/classes, *.properties)
+      $$(shell $(FIND) $(TOPDIR)/src/$(MODULE)/share/classes -name "*.properties")
 
   # Filter out any excluded translations
   PROPSOURCES := $$(call FilterExcludedTranslations, $$(PROPSOURCES), .properties)

make/gensrc/GensrcLocaleData.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -28,16 +28,16 @@
 # into LocaleDataMetaInfo.java
 
 # First go look for all locale files
-LOCALE_FILES := $(call FindFiles, \
+LOCALE_FILES := $(shell $(FIND) \
     $(TOPDIR)/src/$(MODULE)/share/classes/sun/text/resources \
-    $(TOPDIR)/src/$(MODULE)/share/classes/sun/util/resources, \
-    FormatData_*.java FormatData_*.properties \
-    CollationData_*.java CollationData_*.properties \
-    TimeZoneNames_*.java TimeZoneNames_*.properties \
-    LocaleNames_*.java LocaleNames_*.properties \
-    CurrencyNames_*.java CurrencyNames_*.properties \
-    CalendarData_*.java CalendarData_*.properties \
-    BreakIteratorInfo_*.java BreakIteratorRules_*.java)
+    $(TOPDIR)/src/$(MODULE)/share/classes/sun/util/resources \
+    -name "FormatData_*.java" -o -name "FormatData_*.properties" -o \
+    -name "CollationData_*.java" -o -name "CollationData_*.properties" -o \
+    -name "TimeZoneNames_*.java" -o -name "TimeZoneNames_*.properties" -o \
+    -name "LocaleNames_*.java" -o -name "LocaleNames_*.properties" -o \
+    -name "CurrencyNames_*.java" -o -name "CurrencyNames_*.properties" -o \
+    -name "CalendarData_*.java" -o -name "CalendarData_*.properties" -o \
+    -name "BreakIteratorInfo_*.java" -o -name "BreakIteratorRules_*.java")
 
 # Then translate the locale files into for example: FormatData_sv
 LOCALE_RESOURCES := $(sort $(subst .properties,,$(subst .java,,$(notdir $(LOCALE_FILES)))))

make/gensrc/GensrcProperties.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -68,7 +68,7 @@ define SetupCompilePropertiesBody
   endif
 
   # Locate all properties files in the given source dirs.
-  $1_SRC_FILES := $$(call FindFiles, $$($1_SRC_DIRS), *.properties)
+  $1_SRC_FILES := $$(filter %.properties, $$(call CacheFind, $$($1_SRC_DIRS)))
 
   ifneq ($$($1_EXCLUDE), )
     $1_SRC_FILES := $$(filter-out $$($1_EXCLUDE), $$($1_SRC_FILES))

make/hotspot/gensrc/GensrcAdlc.gmk

@@ -191,9 +191,6 @@ ifeq ($(call check-jvm-feature, compiler2), true)
 	$(NAWK) \
 	    'BEGIN { print "#line 1 \"$*\""; } \
 	     /^#line 999999$$/ {print "#line " (NR+1) " \"$*\""; next} \
-	     $(if $(call equals, $(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT), false), \
-	       /^#line .*$$/ {sub("$(WORKSPACE_ROOT)/","")} \
-	     ) \
 	     {print}' \
 	    < $(ADLC_SUPPORT_DIR)/$* > $@
 

make/hotspot/lib/CompileJvm.gmk

@@ -186,17 +186,15 @@ VM_VERSION_OBJ := $(JVM_OUTPUTDIR)/objs/vm_version$(OBJ_SUFFIX)
 $(VM_VERSION_OBJ): $(filter-out $(VM_VERSION_OBJ) $(JVM_MAPFILE), \
     $(BUILD_LIBJVM_TARGET_DEPS))
 
-ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
-  ifeq ($(OPENJDK_TARGET_OS), windows)
-    # It doesn't matter which jvm.lib file gets exported, but we need
-    # to pick just one.
-    ifeq ($(JVM_VARIANT), $(JVM_VARIANT_MAIN))
-      $(eval $(call SetupCopyFiles, COPY_JVM_LIB, \
-          DEST := $(LIB_OUTPUTDIR), \
-          FILES :=$(BUILD_LIBJVM_IMPORT_LIBRARY), \
-      ))
-      TARGETS += $(COPY_JVM_LIB)
-    endif
+ifeq ($(OPENJDK_TARGET_OS), windows)
+  # It doesn't matter which jvm.lib file gets exported, but we need
+  # to pick just one.
+  ifeq ($(JVM_VARIANT), $(JVM_VARIANT_MAIN))
+    $(eval $(call SetupCopyFiles, COPY_JVM_LIB, \
+        DEST := $(LIB_OUTPUTDIR), \
+        FILES :=$(BUILD_LIBJVM_IMPORT_LIBRARY), \
+    ))
+    TARGETS += $(COPY_JVM_LIB)
   endif
 endif
 
@@ -235,46 +233,44 @@ TARGETS += $(BUILD_LIBJVM)
 # Search the output for the operator(s) of interest, to see where they are
 # referenced.
 
-ifneq ($(GENERATE_COMPILE_COMMANDS_ONLY), true)
-  ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang solstudio), )
+ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang solstudio), )
 
-    DEMANGLED_REGEXP := [^:]operator (new|delete)
+  DEMANGLED_REGEXP := [^:]operator (new|delete)
 
-    # Running c++filt to find offending symbols in all files is too expensive,
-    # especially on Solaris, so use mangled names when looking for symbols.
-    # Save the demangling for when something is actually found.
-    ifeq ($(TOOLCHAIN_TYPE), solstudio)
-      MANGLED_SYMS := \
-          __1c2n6FL_pv_ \
-          __1c2N6FL_pv_ \
-          __1c2k6Fpv_v_ \
-          __1c2K6Fpv_v_ \
-          #
-      UNDEF_PATTERN := UNDEF
-    else
-      MANGLED_SYMS := \
-          _ZdaPv \
-          _ZdlPv \
-          _Znam \
-          _Znwm \
-          #
-      UNDEF_PATTERN := ' U '
-    endif
-
-    define SetupOperatorNewDeleteCheck
-        $1.op_check: $1
-	  if [ -n "`$(NM) $$< | $(GREP) $(addprefix -e , $(MANGLED_SYMS)) \
-	      | $(GREP) $(UNDEF_PATTERN)`" ]; then \
-	    $(ECHO) "$$<: Error: Use of global operators new and delete is not allowed in Hotspot:"; \
-	    $(NM) $$< | $(CXXFILT) | $(EGREP) '$(DEMANGLED_REGEXP)' | $(GREP) $(UNDEF_PATTERN); \
-	    $(ECHO) "See: $(TOPDIR)/make/hotspot/lib/CompileJvm.gmk"; \
-	    exit 1; \
-	  fi
-	  $(TOUCH) $$@
-
-      TARGETS += $1.op_check
-    endef
-
-    $(foreach o, $(BUILD_LIBJVM_ALL_OBJS), $(eval $(call SetupOperatorNewDeleteCheck,$o)))
+  # Running c++filt to find offending symbols in all files is too expensive,
+  # especially on Solaris, so use mangled names when looking for symbols.
+  # Save the demangling for when something is actually found.
+  ifeq ($(TOOLCHAIN_TYPE), solstudio)
+    MANGLED_SYMS := \
+        __1c2n6FL_pv_ \
+        __1c2N6FL_pv_ \
+        __1c2k6Fpv_v_ \
+        __1c2K6Fpv_v_ \
+        #
+    UNDEF_PATTERN := UNDEF
+  else
+    MANGLED_SYMS := \
+        _ZdaPv \
+        _ZdlPv \
+        _Znam \
+        _Znwm \
+        #
+    UNDEF_PATTERN := ' U '
   endif
+
+  define SetupOperatorNewDeleteCheck
+    $1.op_check: $1
+	if [ -n "`$(NM) $$< | $(GREP) $(addprefix -e , $(MANGLED_SYMS)) \
+	    | $(GREP) $(UNDEF_PATTERN)`" ]; then \
+	  $(ECHO) "$$<: Error: Use of global operators new and delete is not allowed in Hotspot:"; \
+	  $(NM) $$< | $(CXXFILT) | $(EGREP) '$(DEMANGLED_REGEXP)' | $(GREP) $(UNDEF_PATTERN); \
+	  $(ECHO) "See: $(TOPDIR)/make/hotspot/lib/CompileJvm.gmk"; \
+	  exit 1; \
+	fi
+	$(TOUCH) $$@
+
+    TARGETS += $1.op_check
+  endef
+
+  $(foreach o, $(BUILD_LIBJVM_ALL_OBJS), $(eval $(call SetupOperatorNewDeleteCheck,$o)))
 endif

make/hotspot/lib/JvmOverrideFiles.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -65,7 +65,7 @@ ifeq ($(OPENJDK_TARGET_OS), linux)
     # significantly reduce the GC pause time on 32 bit Linux/Unix platforms by
     # compiling without the PIC flag (-fPIC on linux).
     # See 6454213 for more details.
-    ALL_SRC := $(call FindFiles, $(TOPDIR)/src/hotspot/share, *.cpp)
+    ALL_SRC := $(filter %.cpp, $(call CacheFind, $(TOPDIR)/src/hotspot/share))
     NONPIC_FILTER := $(addsuffix %, $(addprefix $(TOPDIR)/src/hotspot/share/, \
         memory oops gc))
     # Due to what looks like a bug in the old build implementation of this, add a

make/hotspot/test/GtestImage.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -45,14 +45,12 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
         FLATTEN := true, \
     )) \
     $(eval TARGETS += $$(COPY_GTEST_MSVCR_$v)) \
-    $(if $(call equals, $(COPY_DEBUG_SYMBOLS), true), \
-      $(eval $(call SetupCopyFiles, COPY_GTEST_PDB_$v, \
-          SRC := $(HOTSPOT_OUTPUTDIR)/variant-$v/libjvm/gtest, \
-          DEST := $(TEST_IMAGE_DIR)/hotspot/gtest/$v, \
-          FILES := jvm.pdb gtestLauncher.pdb, \
-      )) \
-      $(eval TARGETS += $$(COPY_GTEST_PDB_$v)) \
-    ) \
+    $(eval $(call SetupCopyFiles, COPY_GTEST_PDB_$v, \
+        SRC := $(HOTSPOT_OUTPUTDIR)/variant-$v/libjvm/gtest, \
+        DEST := $(TEST_IMAGE_DIR)/hotspot/gtest/$v, \
+        FILES := jvm.pdb gtestLauncher.pdb, \
+    )) \
+    $(eval TARGETS += $$(COPY_GTEST_PDB_$v)) \
   )
 endif
 

make/jdk/src/classes/build/tools/generatecharacter/GenerateCharacter.java

@@ -933,15 +933,14 @@ OUTER:  for (int i = 0; i < n; i += m) {
         int n = sizes.length;
         StringBuffer result = new StringBuffer();
         // liu : Add a comment showing the source of this table
-        if (debug) {
-            result.append(commentStart + " The following tables and code generated using:" +
-                    commentEnd + "\n  ");
-            result.append(commentStart + ' ' + commandLineDescription + commentEnd + "\n  ");
-        }
-        if (plane == 0 && bLatin1 == false) {
+        result.append(commentStart + " The following tables and code generated using:" +
+                  commentEnd + "\n  ");
+        result.append(commentStart + ' ' + commandLineDescription + commentEnd + "\n  ");
+
+                if (plane == 0 && bLatin1 == false) {
             genCaseMapTableDeclaration(result);
             genCaseMapTable(initializers, specialCaseMaps);
-        }
+                }
         int totalBytes = 0;
         for (int k = 0; k < n - 1; k++) {
             genTable(result, tableNames[k], tables[k], 0, bytes[k]<<3, sizes[k], preshifted[k],
@@ -1604,7 +1603,6 @@ OUTER:  for (int i = 0; i < n; i += m) {
      */
 
     static boolean verbose = false;
-    static boolean debug = false;
     static boolean nobidi = false;
     static boolean nomirror = false;
     static boolean identifiers = false;
@@ -1684,8 +1682,6 @@ OUTER:  for (int i = 0; i < n; i += m) {
         for (int j = 0; j < args.length; j++) {
             if (args[j].equals("-verbose") || args[j].equals("-v"))
                 verbose = true;
-            else if (args[j].equals("-d"))
-                debug = true;
             else if (args[j].equals("-nobidi"))
                 nobidi = true;
             else if (args[j].equals("-nomirror"))

make/jdk/src/classes/build/tools/module/GenModuleInfoSource.java

@@ -57,14 +57,11 @@ import static java.util.stream.Collectors.*;
  */
 public class GenModuleInfoSource {
     private final static String USAGE =
-            "Usage: GenModuleInfoSource \n" +
-                    " [-d]\n" +
-                    " -o <output file>\n" +
-                    "  --source-file <module-info-java>\n" +
-                    "  --modules <module-name>[,<module-name>...]\n" +
-                    "  <module-info.java.extra> ...\n";
+        "Usage: GenModuleInfoSource -o <output file> \n" +
+        "  --source-file <module-info-java>\n" +
+        "  --modules <module-name>[,<module-name>...]\n" +
+        "  <module-info.java.extra> ...\n";
 
-    static boolean debug = false;
     static boolean verbose = false;
     public static void main(String... args) throws Exception {
         Path outfile = null;
@@ -76,9 +73,6 @@ public class GenModuleInfoSource {
             String option = args[i];
             String arg = i+1 < args.length ? args[i+1] : null;
             switch (option) {
-                case "-d":
-                    debug = true;
-                    break;
                 case "-o":
                     outfile = Paths.get(arg);
                     i++;
@@ -152,12 +146,10 @@ public class GenModuleInfoSource {
             for (String l : lines) {
                 writer.println(l);
                 if (l.trim().startsWith("module ")) {
-                    if (debug) {
-                        // print URI rather than file path to avoid escape
-                        writer.format("    // source file: %s%n", sourceFile.toUri());
-                        for (Path file : extraFiles) {
-                            writer.format("    //              %s%n", file.toUri());
-                        }
+                    // print URI rather than file path to avoid escape
+                    writer.format("    // source file: %s%n", sourceFile.toUri());
+                    for (Path file: extraFiles) {
+                        writer.format("    //              %s%n", file.toUri());
                     }
                     break;
                 }

make/launcher/Launcher-jdk.pack.gmk

@@ -86,15 +86,21 @@ $(eval $(call SetupJdkExecutable, BUILD_UNPACKEXE, \
     CFLAGS_linux := -fPIC, \
     CFLAGS_solaris := -KPIC, \
     CFLAGS_macosx := -fPIC, \
-    LDFLAGS := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
+    LDFLAGS := $(UNPACKEXE_ZIPOBJS) \
+        $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(UNPACKEXE_LIBS) $(LIBCXX), \
     OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpackexe, \
     MANIFEST := $(TOPDIR)/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest, \
     MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
-    EXTRA_OBJECT_FILES := $(UNPACKEXE_ZIPOBJS) \
 ))
 
+ifneq ($(USE_EXTERNAL_LIBZ), true)
+
+  $(BUILD_UNPACKEXE): $(UNPACKEXE_ZIPOBJS)
+
+endif
+
 TARGETS += $(BUILD_UNPACKEXE)
 
 ################################################################################

make/launcher/LauncherCommon.gmk

@@ -152,7 +152,7 @@ define SetupBuildLauncherBody
     $1_LIBS += -lz
   endif
 
-  $1_WINDOWS_JLI_LIB := $(call FindStaticLib, java.base, jli, /libjli)
+  $1_WINDOWS_JLI_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjli/jli.lib
 
   $$(eval $$(call SetupJdkExecutable, BUILD_LAUNCHER_$1, \
       NAME := $1, \
@@ -164,6 +164,7 @@ define SetupBuildLauncherBody
           -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
           -DPROGNAME='"$1"' \
           $$($1_CFLAGS), \
+      CFLAGS_linux := -fPIC, \
       CFLAGS_solaris := -KPIC -DHAVE_GETHRTIME, \
       CFLAGS_windows := $$($1_CFLAGS_windows), \
       LDFLAGS := $$(LDFLAGS_JDKEXE) \
@@ -194,11 +195,11 @@ define SetupBuildLauncherBody
   TARGETS += $$($1)
 
   ifeq ($(OPENJDK_TARGET_OS), aix)
-    $$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, jli_static)
+    $$(BUILD_LAUNCHER_$1): $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a
   endif
 
   ifeq ($(OPENJDK_TARGET_OS), windows)
-    $$(BUILD_LAUNCHER_$1): $(call FindStaticLib, java.base, java, /libjava) \
+    $$(BUILD_LAUNCHER_$1): $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib \
         $$($1_WINDOWS_JLI_LIB)
   endif
 endef

make/lib/Awt2dLibraries.gmk

@@ -736,11 +736,11 @@ else # OPENJDK_TARGET_OS not windows
   ifeq ($(ENABLE_HEADLESS_ONLY), false)
     $(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
   else
-    $(BUILD_LIBJAWT): $(call FindLib, $(MODULE), awt_headless)
+    $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX)
   endif
 
   ifeq ($(OPENJDK_TARGET_OS), macosx)
-   $(BUILD_LIBJAWT): $(call FindLib, $(MODULE), awt_lwawt)
+    $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX)
   endif
 
 endif # OPENJDK_TARGET_OS

make/lib/CoreLibraries.gmk

@@ -148,7 +148,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBZIP, \
     CFLAGS := $(CFLAGS_JDKLIB) \
         $(LIBZ_CFLAGS), \
     CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
-    DISABLED_WARNINGS_gcc := unused-function implicit-fallthrough, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljvm -ljava $(LIBZ_LIBS), \
@@ -239,7 +238,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \
     EXTRA_FILES := $(LIBJLI_EXTRA_FILES), \
     OPTIMIZATION := HIGH, \
     CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
-    DISABLED_WARNINGS_gcc := unused-function implicit-fallthrough, \
     DISABLED_WARNINGS_solstudio := \
         E_ASM_DISABLES_OPTIMIZATION \
         E_STATEMENT_NOT_REACHED, \

make/lib/Lib-java.base.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ include LibCommon.gmk
 $(eval $(call IncludeCustomExtension, lib/Lib-java.base.gmk))
 
 # Prepare the find cache.
-$(call FillFindCache, $(wildcard $(TOPDIR)/src/java.base/*/native))
+$(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/java.base/*/native)))
 
 ################################################################################
 # Create all the core libraries

make/lib/Lib-java.desktop.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@ include LibCommon.gmk
 $(eval $(call IncludeCustomExtension, lib/Lib-java.desktop.gmk))
 
 # Prepare the find cache.
-$(call FillFindCache, $(wildcard $(TOPDIR)/src/java.desktop/*/native))
+$(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/java.desktop/*/native)))
 
 ################################################################################
 # Create the AWT/2D libraries

make/lib/Lib-jdk.accessibility.gmk

@@ -55,7 +55,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
         VERSIONINFO_RESOURCE := $(ROOT_SRCDIR)/common/AccessBridgeStatusWindow.rc, \
     )
 
-    $$(BUILD_JAVAACCESSBRIDGE$1): $(call FindStaticLib, java.desktop, jawt, /libjawt)
+    $$(BUILD_JAVAACCESSBRIDGE$1): $(SUPPORT_OUTPUTDIR)/native/java.desktop/libjawt/jawt.lib
 
     TARGETS += $$(BUILD_JAVAACCESSBRIDGE$1)
   endef

make/lib/LibCommon.gmk

@@ -57,6 +57,24 @@ else ifeq ($(TOOLCHAIN_TYPE), solstudio)
   EXPORT_ALL_SYMBOLS := -xldscope=global
 endif
 
+################################################################################
+# Find a library
+# Param 1 - module name
+# Param 2 - library name
+# Param 3 - optional subdir for library
+FindLib = \
+    $(call FindLibDirForModule, \
+        $(strip $1))$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(SHARED_LIBRARY_SUFFIX)
+
+################################################################################
+# Find a static library
+# Param 1 - module name
+# Param 2 - library name
+# Param 3 - optional subdir for library
+FindStaticLib = \
+    $(addprefix $(SUPPORT_OUTPUTDIR)/native/, \
+        $(strip $1)$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(STATIC_LIBRARY_SUFFIX))
+
 # Put the libraries here.
 INSTALL_LIBRARIES_HERE := $(call FindLibDirForModule, $(MODULE))
 

make/test/JtregNativeHotspot.gmk

@@ -878,7 +878,7 @@ endif
 ifeq ($(OPENJDK_TARGET_OS), windows)
     BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
     BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c
-    BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libatExit := jvm.lib
+
 else
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbootclssearch_agent += -lpthread
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsystemclssearch_agent += -lpthread
@@ -1512,7 +1512,6 @@ else
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetphase001 += -lpthread
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libgetphase002 += -lpthread
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libterminatedThread += -lpthread
-    BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libatExit += -ljvm
 endif
 
 $(eval $(call SetupTestFilesCompilation, BUILD_HOTSPOT_JTREG_LIBRARIES, \

make/test/JtregNativeJdk.gmk

@@ -48,20 +48,12 @@ BUILD_JDK_JTREG_OUTPUT_DIR := $(OUTPUTDIR)/support/test/jdk/jtreg/native
 
 BUILD_JDK_JTREG_IMAGE_DIR := $(TEST_IMAGE_DIR)/jdk/jtreg
 
-BUILD_JDK_JTREG_EXECUTABLES_CFLAGS_exeJliLaunchTest := \
-    -I$(TOPDIR)/src/java.base/share/native/libjli \
-    -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjli \
-    -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjli \
-    -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
-
 # Platform specific setup
 ifeq ($(OPENJDK_TARGET_OS), windows)
   BUILD_JDK_JTREG_EXCLUDE += libDirectIO.c libInheritedChannel.c
 
   WIN_LIB_JAVA := $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib
   BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := $(WIN_LIB_JAVA)
-  WIN_LIB_JLI := $(SUPPORT_OUTPUTDIR)/native/java.base/libjli/jli.lib
-  BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeJliLaunchTest := $(WIN_LIB_JLI)
 else
   BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := -ljava
   BUILD_JDK_JTREG_LIBRARIES_LIBS_libDirectIO := -ljava
@@ -70,9 +62,6 @@ else
   else ifeq ($(OPENJDK_TARGET_OS), solaris)
     BUILD_JDK_JTREG_LIBRARIES_LIBS_libInheritedChannel := -ljava
   endif
-  UNIX_LDFLAGS_JLI := -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/jli
-  BUILD_JDK_JTREG_EXECUTABLES_LDFLAGS_exeJliLaunchTest := $(UNIX_LDFLAGS_JLI)
-  BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeJliLaunchTest := -ljli
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
@@ -83,17 +72,6 @@ else
   BUILD_JDK_JTREG_EXCLUDE += libTestMainKeyWindow.c
 endif
 
-ifeq ($(OPENJDK_TARGET_OS), windows)
-  BUILD_JDK_JTREG_LIBRARIES_LIBS_libwindows_touch_robot := user32.lib
-  BUILD_JDK_JTREG_EXCLUDE += libtouchscreen_device.c
-else
-  ifeq ($(OPENJDK_TARGET_OS), linux)
-    BUILD_JDK_JTREG_EXCLUDE += libwindows_touch_robot.c
-  else
-    BUILD_JDK_JTREG_EXCLUDE += libtouchscreen_device.c libwindows_touch_robot.c
-  endif
-endif
-
 $(eval $(call SetupTestFilesCompilation, BUILD_JDK_JTREG_LIBRARIES, \
     TYPE := LIBRARY, \
     SOURCE_DIRS := $(BUILD_JDK_JTREG_NATIVE_SRC), \

make/vscode/CreateVSCodeProject.gmk

@@ -1,113 +0,0 @@
-#
-# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This must be the first rule
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-
-################################################################################
-# Return the full path to an indexer-specific file fragment.
-#
-# Param 1: Fragment name
-################################################################################
-GetIndexerFragment = \
-    $(TOPDIR)/make/vscode/indexers/$(VSCODE_INDEXER)-$(1).txt
-
-################################################################################
-# Show indexer-specific notes if they exist, otherwise do nothing
-################################################################################
-ifneq (,$(wildcard $(call GetIndexerFragment,notes)))
-  ShowIndexerNotes = $(CAT) $(call GetIndexerFragment,notes)
-else
-  ShowIndexerNotes =
-endif
-
-################################################################################
-# Return the platform-dependent preferred debug engine name.
-################################################################################
-ifeq ($(OPENJDK_TARGET_OS), windows)
-  DebugEngineName = cppvsdbg
-else
-  DebugEngineName = cppdbg
-endif
-
-################################################################################
-# Return an additional configuration fragment if the WORKSPACE_ROOT is different
-# from TOPDIR.
-################################################################################
-ifneq ($(WORKSPACE_ROOT),$(TOPDIR))
-  GetExtraWorkspaceRoot = $(TOPDIR)/make/vscode/template-workspace-folder.txt
-else
-  GetExtraWorkspaceRoot = /dev/null
-endif
-
-################################################################################
-# Create a project configuration from a given template, replacing a known set
-# of variables.
-#
-# Param 1: Template
-# Param 2: Output
-################################################################################
-define CreateFromTemplate
-	$(call LogInfo, Generating $2)
-	$(call MakeDir, $(dir $2))
-	$(SED) -e '/{{INDEXER_EXTENSIONS}}/r $(call GetIndexerFragment,extensions)' \
-	    -e '/{{INDEXER_SETTINGS}}/r $(call GetIndexerFragment,settings)' \
-	    -e '/{{EXTRA_WORKSPACE_ROOT}}/r $(call GetExtraWorkspaceRoot)' $1 | \
-	$(SED) -e 's!{{TOPDIR}}!$(call FixPath,$(TOPDIR))!g' \
-	    -e 's!{{TOPDIR_RELATIVE}}!$(call FixPath,$(strip \
-	        $(call RelativePath,$(OUTPUTDIR),$(TOPDIR))))!g' \
-	    -e 's!{{WORKSPACE_ROOT}}!$(call FixPath,$(WORKSPACE_ROOT))!g' \
-	    -e 's!{{OUTPUTDIR}}!$(call FixPath,$(OUTPUTDIR))!g' \
-	    -e 's!{{CONF_NAME}}!$(CONF_NAME)!g' \
-	    -e 's!{{COMPILER}}!$(call FixPath,$(CXX)) $(SYSROOT_CFLAGS)!g' \
-	    -e 's!{{MAKE}}!$(call FixPath,$(MAKE))!g' \
-	    -e 's!{{PATH}}!$(call FixPathList,$(PATH))!g' \
-	    -e 's!{{DEBUGENGINENAME}}!$(call DebugEngineName)!g' \
-	    -e '/{{INDEXER_EXTENSIONS}}/d' \
-	    -e '/{{INDEXER_SETTINGS}}/d' \
-	    -e '/{{EXTRA_WORKSPACE_ROOT}}/d' \
-	    > $2
-endef
-
-$(OUTPUTDIR)/jdk.code-workspace:
-	$(call LogWarn, Creating workspace $@)
-	$(call CreateFromTemplate, $(TOPDIR)/make/vscode/template-workspace.jsonc, $@)
-	$(call ShowIndexerNotes)
-
-$(OUTPUTDIR)/.vscode/tasks.json:
-	$(call CreateFromTemplate, $(TOPDIR)/make/vscode/template-tasks.jsonc, $@)
-
-$(OUTPUTDIR)/.vscode/launch.json:
-	$(call CreateFromTemplate, $(TOPDIR)/make/vscode/template-launch.jsonc, $@)
-
-TARGETS := $(OUTPUTDIR)/jdk.code-workspace $(OUTPUTDIR)/.vscode/tasks.json \
-    $(OUTPUTDIR)/.vscode/launch.json
-
-all: $(TARGETS)
-
-.PHONY: all $(TARGETS)

make/vscode/indexers/ccls-extensions.txt

@@ -1,2 +0,0 @@
-			"ms-vscode.cpptools",
-			"ccls-project.ccls"

make/vscode/indexers/ccls-notes.txt

@@ -1,3 +0,0 @@
-
-* The "ccls" indexer must be present in PATH, or configured with "ccls.launch.command" in user preferences.
-

make/vscode/indexers/ccls-settings.txt

@@ -1,28 +0,0 @@
-		// Configure cpptools IntelliSense
-		"C_Cpp.intelliSenseCachePath": "{{OUTPUTDIR}}/.vscode",
-		"C_Cpp.default.compileCommands": "{{OUTPUTDIR}}/compile_commands.json",
-		"C_Cpp.default.cppStandard": "c++03",
-		"C_Cpp.default.compilerPath": "{{COMPILER}}",
-
-		// Configure ccls
-		"ccls.misc.compilationDatabaseDirectory": "{{TOPDIR_RELATIVE}}",
-		"ccls.cache.hierarchicalPath": true,
-		"ccls.cache.directory": "{{OUTPUTDIR}}/.vscode/ccls",
-
-		// Avoid issues with precompiled headers
-		"ccls.clang.excludeArgs": [
-			// Windows / MSVC
-			"-Fp{{OUTPUTDIR}}/hotspot/variant-server/libjvm/objs/BUILD_LIBJVM.pch",
-			"-Fp{{OUTPUTDIR}}/hotspot/variant-server/libjvm/gtest/objs/BUILD_GTEST_LIBJVM.pch",
-			"-Yuprecompiled.hpp",
-			// MacOS / clang
-			"{{OUTPUTDIR}}/hotspot/variant-server/libjvm/objs/precompiled/precompiled.hpp.pch",
-			"{{OUTPUTDIR}}/hotspot/variant-server/libjvm/gtest/objs/precompiled/precompiled.hpp.pch",
-			"-include-pch"
-		],
-
-		// Disable conflicting features from cpptools
-		"C_Cpp.autocomplete": "Disabled",
-		"C_Cpp.errorSquiggles": "Disabled",
-		"C_Cpp.formatting": "Disabled",
-		"C_Cpp.intelliSenseEngine": "Disabled",

make/vscode/indexers/clangd-extensions.txt

@@ -1,2 +0,0 @@
-			"ms-vscode.cpptools",
-			"llvm-vs-code-extensions.vscode-clangd"

make/vscode/indexers/clangd-notes.txt

@@ -1,4 +0,0 @@
-
-* The "clangd" indexer must be present in PATH, or configured with "clangd.path" in user preferences.
-* If building with clang (default on OSX), precompiled headers must be disabled.
-

make/vscode/indexers/clangd-settings.txt

@@ -1,17 +0,0 @@
-		// Configure cpptools IntelliSense
-		"C_Cpp.intelliSenseCachePath": "{{OUTPUTDIR}}/.vscode",
-		"C_Cpp.default.compileCommands": "{{OUTPUTDIR}}/compile_commands.json",
-		"C_Cpp.default.cppStandard": "c++03",
-		"C_Cpp.default.compilerPath": "{{COMPILER}}",
-
-		// Configure clangd
-		"clangd.arguments": [
-			"-background-index",
-			"-compile-commands-dir={{OUTPUTDIR}}"
-		],
-
-		// Disable conflicting features from cpptools
-		"C_Cpp.autocomplete": "Disabled",
-		"C_Cpp.errorSquiggles": "Disabled",
-		"C_Cpp.formatting": "Disabled",
-		"C_Cpp.intelliSenseEngine": "Disabled",

make/vscode/indexers/cpptools-extensions.txt

@@ -1 +0,0 @@
-			"ms-vscode.cpptools"

make/vscode/indexers/cpptools-settings.txt

@@ -1,5 +0,0 @@
-		// Configure cpptools IntelliSense
-		"C_Cpp.intelliSenseCachePath": "{{OUTPUTDIR}}/.vscode",
-		"C_Cpp.default.compileCommands": "{{OUTPUTDIR}}/compile_commands.json",
-		"C_Cpp.default.cppStandard": "c++03",
-		"C_Cpp.default.compilerPath": "{{COMPILER}}",

make/vscode/indexers/rtags-extensions.txt

@@ -1,2 +0,0 @@
-			"ms-vscode.cpptools",
-			"jomiller.rtags-client"

make/vscode/indexers/rtags-settings.txt

@@ -1,14 +0,0 @@
-		// Configure cpptools IntelliSense
-		"C_Cpp.intelliSenseCachePath": "{{OUTPUTDIR}}/.vscode",
-		"C_Cpp.default.compileCommands": "{{OUTPUTDIR}}/compile_commands.json",
-		"C_Cpp.default.cppStandard": "c++03",
-		"C_Cpp.default.compilerPath": "{{COMPILER}}",
-
-		// Configure RTags
-		"rtags.misc.compilationDatabaseDirectory": "{{OUTPUTDIR}}",
-
-		// Disable conflicting features from cpptools
-		"C_Cpp.autocomplete": "Disabled",
-		"C_Cpp.errorSquiggles": "Disabled",
-		"C_Cpp.formatting": "Disabled",
-		"C_Cpp.intelliSenseEngine": "Disabled",

make/vscode/template-launch.jsonc

@@ -1,55 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "gtestLauncher",
-            "type": "{{DEBUGENGINENAME}}",
-            "request": "launch",
-            "program": "{{OUTPUTDIR}}/hotspot/variant-server/libjvm/gtest/gtestLauncher",
-            "args": ["-jdk:{{OUTPUTDIR}}/jdk"],
-            "stopAtEntry": false,
-            "cwd": "{{WORKSPACE_ROOT}}",
-            "environment": [],
-            "externalConsole": false,
-            "preLaunchTask": "Make 'exploded-image'",
-            "osx": {
-                "MIMode": "lldb",
-                "internalConsoleOptions": "openOnSessionStart",
-                "args": ["--gtest_color=no", "-jdk:{{OUTPUTDIR}}/jdk"]
-            },
-            "linux": {
-                "MIMode": "gdb",
-                "setupCommands": [
-                    {
-                        "text": "handle SIGSEGV noprint nostop",
-                        "description": "Disable stopping on signals handled by the JVM"
-                    }
-                ]
-            }
-        },
-        {
-            "name": "java",
-            "type": "{{DEBUGENGINENAME}}",
-            "request": "launch",
-            "program": "{{OUTPUTDIR}}/jdk/bin/java",
-            "stopAtEntry": false,
-            "cwd": "{{WORKSPACE_ROOT}}",
-            "environment": [],
-            "externalConsole": false,
-            "preLaunchTask": "Make 'exploded-image'",
-            "osx": {
-                "MIMode": "lldb",
-                "internalConsoleOptions": "openOnSessionStart",
-            },
-            "linux": {
-                "MIMode": "gdb",
-                "setupCommands": [
-                    {
-                        "text": "handle SIGSEGV noprint nostop",
-                        "description": "Disable stopping on signals handled by the JVM"
-                    }
-                ]
-            }
-        }
-    ]
-}