8187444: Forest Consolidation: Make build work

Co-authored-by: Maurizio Cimadamore <maurizio.cimadamore@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Reviewed-by: darcy, ihse

.hgignore

@@ -8,3 +8,6 @@ nbproject/private/
 \.DS_Store
 \.metadata/
 \.recommenders/
+test/nashorn/script/external
+test/nashorn/lib
+NashornProfile.txt

README

@@ -4,7 +4,7 @@ Welcome to OpenJDK!
 For information about building OpenJDK, including how to fully retrieve all
 source code, please see either of these:
 
-  * common/doc/building.html   (html version)
-  * common/doc/building.md     (markdown version)
+  * doc/building.html   (html version)
+  * doc/building.md     (markdown version)
 
 See http://openjdk.java.net/ for more information about OpenJDK.

bin/idea.sh

@@ -32,7 +32,7 @@ usage() {
 SCRIPT_DIR=`dirname $0`
 PWD=`pwd`
 cd $SCRIPT_DIR; SCRIPT_DIR=`pwd`
-cd ../../; TOP=`pwd`; cd $PWD
+cd ../; TOP=`pwd`; cd $PWD
 
 IDEA_OUTPUT=$TOP/.idea
 VERBOSE="false"
@@ -70,8 +70,10 @@ IDEA_MAKE="$TOP/make/idea"
 IDEA_TEMPLATE="$IDEA_MAKE/template"
 IML_TEMPLATE="$IDEA_TEMPLATE/jdk.iml"
 ANT_TEMPLATE="$IDEA_TEMPLATE/ant.xml"
+MISC_TEMPLATE="$IDEA_TEMPLATE/misc.xml"
 IDEA_IML="$IDEA_OUTPUT/jdk.iml"
 IDEA_ANT="$IDEA_OUTPUT/ant.xml"
+IDEA_MISC="$IDEA_OUTPUT/misc.xml"
 
 if [ "$VERBOSE" = "true" ] ; then
   echo "output dir: $IDEA_OUTPUT"
@@ -120,7 +122,6 @@ addSourceFolder() {
 }
 
 ### Generate project iml
-RELATIVE_BUILD_DIR="`dirname $SPEC | sed -e s@"$TOP/\(.*$\)"@"\1"@`"
 rm -f $IDEA_IML
 while IFS= read -r line
 do
@@ -131,9 +132,6 @@ do
          addSourceFolder $root
       done
     fi
-  elif echo "$line" | egrep "^ .* <excludeFolder.*####" > /dev/null ; then
-    ul="`echo "$line" | sed -e s@"\(.*/\)####\(.*\)"@"\1$RELATIVE_BUILD_DIR\2"@`"
-    printf "%s\n" "$ul" >> $IDEA_IML 
   else
     printf "%s\n" "$line" >> $IDEA_IML
   fi
@@ -155,14 +153,6 @@ addBuildDir() {
   printf "%s\n" "$mn" >> $IDEA_ANT
 }
 
-JTREG_HOME="        <property name=\"jtreg.home\" value=\"####\" />"
-
-addJtregHome() {
-  DIR=`dirname $SPEC`
-  mn="`echo "$JTREG_HOME" | sed -e s@"\(.*\)####\(.*\)"@"\1$JT_HOME\2"@`"
-  printf "%s\n" "$mn" >> $IDEA_ANT
-}
-
 ### Generate ant.xml
 
 rm -f $IDEA_ANT
@@ -170,8 +160,6 @@ while IFS= read -r line
 do
   if echo "$line" | egrep "^ .* <property name=\"module.name\"" > /dev/null ; then
     addModuleName
-  elif echo "$line" | egrep "^ .* <property name=\"jtreg.home\"" > /dev/null ; then
-    addJtregHome
   elif echo "$line" | egrep "^ .* <property name=\"build.target.dir\"" > /dev/null ; then
     addBuildDir
   else
@@ -179,6 +167,38 @@ do
   fi
 done < "$ANT_TEMPLATE"
 
+### Generate misc.xml
+
+rm -f $IDEA_MISC
+
+JTREG_HOME="    <path>####</path>"
+
+IMAGES_DIR="    <jre alt=\"true\" value=\"####\" />"
+
+addImagesDir() {
+  DIR=`dirname $SPEC`/images/jdk
+  mn="`echo "$IMAGES_DIR" | sed -e s@"\(.*\)####\(.*\)"@"\1$DIR\2"@`"
+  printf "%s\n" "$mn" >> $IDEA_MISC
+}
+
+addJtregHome() {
+  DIR=`dirname $SPEC`
+  mn="`echo "$JTREG_HOME" | sed -e s@"\(.*\)####\(.*\)"@"\1$JT_HOME\2"@`"
+  printf "%s\n" "$mn" >> $IDEA_MISC
+}
+
+rm -f $MISC_ANT
+while IFS= read -r line
+do
+  if echo "$line" | egrep "^ .*<path>jtreg_home</path>" > /dev/null ; then
+	addJtregHome
+  elif echo "$line" | egrep "^ .*<jre alt=\"true\" value=\"images_jdk\"" > /dev/null ; then
+    addImagesDir
+  else
+    printf "%s\n" "$line" >> $IDEA_MISC
+  fi
+done < "$MISC_TEMPLATE"
+
 ### Compile the custom Logger
 
 CLASSES=$IDEA_OUTPUT/classes

bin/jib.sh

@@ -42,7 +42,7 @@ setup_url() {
     jib_revision="2.0-SNAPSHOT"
     jib_ext="jib.sh.gz"
 
-    closed_script="${mydir}/../../closed/conf/jib-install.conf"
+    closed_script="${mydir}/../../../closed/conf/jib-install.conf"
     if [ -f "${closed_script}" ]; then
         source "${closed_script}"
     fi

bin/unshuffle_patch.sh

@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,13 @@
 # Script for updating a patch file as per the shuffled/unshuffled source location.
 
 usage() {
-      echo "Usage: $0 [-h|--help] [-v|--verbose] <repo> <input_patch> <output_patch>"
+  echo "Usage: $0 [-h|--help] [-v|--verbose] [-to9|-to10] [-r <repo>] <input_patch> <output_patch>"
   echo "where:"
-      echo "  <repo>          is one of: corba, jaxp, jaxws, jdk, langtools, nashorn"
-      echo "                  [Note: patches from other repos do not need updating]"
+  echo "  -to9            create patches appropriate for a JDK 9 source tree"
+  echo "                  When going to 9, the output patches will be suffixed with the"
+  echo "                  repo name"
+  echo "  -to10           create patches appropriate for a JDK 10 source tree"
+  echo "  -r <repo>       specify repo for source patch, set to 'top' for top repo"
   echo "  <input_patch>   is the input patch file, that needs shuffling/unshuffling"
   echo "  <output_patch>  is the updated patch file "
   echo " "
@@ -55,6 +58,19 @@ do
       vflag="true"
       ;;
 
+    -r)
+      repo="$2"
+      shift
+      ;;
+
+    -to9)
+      shuffle_to=9
+      ;;
+
+    -to10)
+      shuffle_to=10
+      ;;
+
     -*)  # bad option
       usage
       ;;
@@ -67,28 +83,40 @@ do
 done
 
 # Make sure we have the right number of arguments
-if [ ! $# -eq 3 ] ; then
+if [ ! $# -eq 2 ] ; then
   echo "ERROR: Invalid number of arguments." >&2
   usage
 fi
 
 # Check the given repo
-repos="corba jaxp jaxws jdk langtools nashorn"
-repo="$1"
+repos="top corba jaxp jaxws jdk langtools nashorn hotspot"
 found="false"
-for r in $repos ; do
+if [ -n "$repo" ]; then
+  for r in $repos ; do
     if [ $repo = "$r" ] ; then
       found="true"
       break;
     fi
-done
-if [ $found = "false" ] ; then
+  done
+  if [ $found = "false" ] ; then
     echo "ERROR: Unknown repo: $repo. Should be one of [$repos]." >&2
     usage
+  fi
+fi
+
+if [ "$shuffle_to" != "9" -a "$shuffle_to" != "10" ]; then
+  echo "ERROR: Must pick either -to9 or -to10"
+  exit 1
+fi
+
+# When going to 10, a repo must be specified for the source patch
+if [ "$shuffle_to" = "10" -a -z "$repo" ]; then
+  echo "ERROR: Must specify src repo for JDK 9 patch"
+  exit 1
 fi
 
 # Check given input/output files
-input="$2"
+input="$1"
 if [ "x$input" = "x-" ] ; then
   input="/dev/stdin"
 fi
@@ -98,18 +126,26 @@ if [ ! -f $input -a "x$input" != "x/dev/stdin" ] ; then
   exit 1
 fi
 
-output="$3"
+output="$2"
 if [ "x$output" = "x-" ] ; then
   output="/dev/stdout"
 fi
+base_output="$output"
 
-if [ -f $output -a "x$output" != "x/dev/stdout" ] ; then
+if [ "$shuffle_to" = "10" ]; then
+  if [ -f $output -a "x$output" != "x/dev/stdout" ] ; then
     echo "ERROR: Output patch already exists: $output" >&2
     exit 1
+  fi
+else
+  for r in $repos; do
+    if [ -f "$output.$r" ]; then
+      echo "ERROR: Output patch already exists: $output.$r" >&2
+      exit 1
+    fi
+  done
 fi
 
-what=""  ## shuffle or unshuffle
-
 verbose() {
   if [ ${vflag} = "true" ] ; then
     echo "$@" >&2
@@ -135,30 +171,17 @@ unshuffle() {
   fi
   verbose "Extracted path: \"$path\""
 
-  # Only source can be shuffled, or unshuffled
-  if ! echo "$path" | egrep '^src/.*' > /dev/null ; then
-    verbose "Not a src path, skipping."
-    echo "$line" >> $output
-    return
-  fi
-
-  # Shuffle or unshuffle?
-  if [ "${what}" = "" ] ; then
-    if echo "$path" | egrep '^src/java\..*|^src/jdk\..*' > /dev/null ; then
-      what="unshuffle"
-    else
-      what="shuffle"
-    fi
-    verbose "Shuffle or unshuffle: $what"
-  fi
-
   # Find the most specific matches in the shuffle list
   matches=
+  if [ -n "$repo" -a "$repo" != "top" ]; then
     matchpath="$repo"/"$path"/x
+  else
+    matchpath="$path"/x
+  fi
   while [ "$matchpath" != "" ] ; do
     matchpath="`echo $matchpath | sed s@'\(.*\)/.*$'@'\1'@`"
 
-    if [ "${what}" =  "shuffle" ] ; then
+    if [ "$shuffle_to" =  "10" ] ; then
       pattern=": $matchpath$"
     else
       pattern="^$matchpath :"
@@ -177,12 +200,24 @@ unshuffle() {
 
   # Rewrite the line, if we have a match
   if ! [ "x${matches}" = "x" ] ; then
-    shuffled="`echo "$matches" | sed -e s@' : .*'@@g -e s@'^[a-z]*\/'@@`"
-    unshuffled="`echo "$matches" | sed -e s@'.* : '@@g -e s@'^[a-z]*\/'@@`"
-    if [ "${what}" =  "shuffle" ] ; then
+    shuffled="${matches%% : *}"
+    unshuffled="${matches#* : }"
+    patch_suffix_9=""
+    for r in $repos; do
+      if [ "$unshuffled" != "${unshuffled#$r}" ]; then
+        unshuffled="${unshuffled#$r\/}"
+        patch_suffix_9=".$r"
+      fi
+    done
+    verbose "shuffled: $shuffled"
+    verbose "unshuffled: $unshuffled"
+    verbose "patch_suffix_9: $patch_suffix_9"
+    if [ "$shuffle_to" =  "10" ] ; then
       newline="`echo "$line" | sed -e s@"$unshuffled"@"$shuffled"@g`"
     else
       newline="`echo "$line" | sed -e s@"$shuffled"@"$unshuffled"@g`"
+      output=$base_output$patch_suffix_9
+      verbose "Writing to $output"
     fi
     verbose "Rewriting to \"$newline\""
     echo "$newline" >> $output

configure

@@ -32,4 +32,4 @@ this_script_dir=`cd $this_script_dir > /dev/null && pwd`
 # Delegate to wrapper, forcing wrapper to believe $0 is this script by using -c.
 # This trick is needed to get autoconf to co-operate properly.
 # The ${-:+-$-} construction passes on bash options.
-bash ${-:+-$-} -c ". $this_script_dir/common/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"
+bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"

doc/building.html

@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
   <title>Building OpenJDK</title>
   <style type="text/css">code{white-space: pre;}</style>
-  <link rel="stylesheet" href="../../jdk/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]-->
@@ -22,9 +22,6 @@
 <li><a href="#introduction">Introduction</a></li>
 <li><a href="#getting-the-source-code">Getting the Source Code</a><ul>
 <li><a href="#special-considerations">Special Considerations</a></li>
-<li><a href="#using-get_source.sh">Using get_source.sh</a></li>
-<li><a href="#using-hgforest.sh">Using hgforest.sh</a></li>
-<li><a href="#using-the-trees-extension">Using the Trees Extension</a></li>
 </ul></li>
 <li><a href="#build-hardware-requirements">Build Hardware Requirements</a><ul>
 <li><a href="#building-on-x86">Building on x86</a></li>
@@ -119,7 +116,7 @@
 <p>If you are eager to try out building OpenJDK, these simple steps works most of the time. They assume that you have installed Mercurial (and Cygwin if running on Windows) and cloned the top-level OpenJDK repository that you want to build.</p>
 <ol type="1">
 <li><p><a href="#getting-the-source-code">Get the complete source code</a>:<br />
-<code>bash get_source.sh</code></p></li>
+<code>hg clone http://hg.openjdk.java.net/jdk10/master</code></p></li>
 <li><p><a href="#running-configure">Run configure</a>:<br />
 <code>bash configure</code></p>
 <p>If <code>configure</code> fails due to missing dependencies (to either the <a href="#native-compiler-toolchain-requirements">toolchain</a>, <a href="#external-library-requirements">external libraries</a> or the <a href="#boot-jdk-requirements">boot JDK</a>), most of the time it prints a suggestion on how to resolve the situation on your platform. Follow the instructions, and try running <code>bash configure</code> again.</p></li>
@@ -135,8 +132,7 @@
 <p>OpenJDK is a complex software project. Building it requires a certain amount of technical expertise, a fair number of dependencies on external software, and reasonably powerful hardware.</p>
 <p>If you just want to use OpenJDK and not build it yourself, this document is not for you. See for instance <a href="http://openjdk.java.net/install">OpenJDK installation</a> for some methods of installing a prebuilt OpenJDK.</p>
 <h2 id="getting-the-source-code">Getting the Source Code</h2>
-<p>OpenJDK uses <a href="http://www.mercurial-scm.org">Mercurial</a> for source control. The source code is contained not in a single Mercurial repository, but in a tree (&quot;forest&quot;) of interrelated repositories. You will need to check out all of the repositories to be able to build OpenJDK. To assist you in dealing with this somewhat unusual arrangement, there are multiple tools available, which are explained below.</p>
-<p>In any case, make sure you are getting the correct version. At the <a href="http://hg.openjdk.java.net/">OpenJDK Mercurial server</a> you can see a list of all available forests. If you want to build an older version, e.g. JDK 8, it is recommended that you get the <code>jdk8u</code> forest, which contains incremental updates, instead of the <code>jdk8</code> forest, which was frozen at JDK 8 GA.</p>
+<p>Make sure you are getting the correct version. As of JDK 10, the source is no longer split into separate repositories so you only need to clone one single repository. At the <a href="http://hg.openjdk.java.net/">OpenJDK Mercurial server</a> you can see a list of all available forests. If you want to build an older version, e.g. JDK 8, it is recommended that you get the <code>jdk8u</code> forest, which contains incremental updates, instead of the <code>jdk8</code> forest, which was frozen at JDK 8 GA.</p>
 <p>If you are new to Mercurial, a good place to start is the <a href="http://www.mercurial-scm.org/guide">Mercurial Beginner's Guide</a>. The rest of this document assumes a working knowledge of Mercurial.</p>
 <h3 id="special-considerations">Special Considerations</h3>
 <p>For a smooth building experience, it is recommended that you follow these rules on where and how to check out the source code.</p>
@@ -152,45 +148,6 @@
 </ul>
 <p>Failure to follow this procedure might result in hard-to-debug build problems.</p></li>
 </ul>
-<h3 id="using-get_source.sh">Using get_source.sh</h3>
-<p>The simplest way to get the entire forest is probably to clone the top-level repository and then run the <code>get_source.sh</code> script, like this:</p>
-<pre><code>hg clone http://hg.openjdk.java.net/jdk9/jdk9
-cd jdk9
-bash get_source.sh</code></pre>
-<p>The first time this is run, it will clone all the sub-repositories. Any subsequent execution of the script will update all sub-repositories to the latest revision.</p>
-<h3 id="using-hgforest.sh">Using hgforest.sh</h3>
-<p>The <code>hgforest.sh</code> script is more expressive than <code>get_source.sh</code>. It takes any number of arguments, and runs <code>hg</code> with those arguments on each sub-repository in the forest. The <code>get_source.sh</code> script is basically a simple wrapper that runs either <code>hgforest.sh clone</code> or <code>hgforest.sh pull -u</code>.</p>
-<ul>
-<li><p>Cloning the forest:</p>
-<pre><code>hg clone http://hg.openjdk.java.net/jdk9/jdk9
-cd jdk9
-bash common/bin/hgforest.sh clone</code></pre></li>
-<li><p>Pulling and updating the forest:</p>
-<pre><code>bash common/bin/hgforest.sh pull -u</code></pre></li>
-<li><p>Merging over the entire forest:</p>
-<pre><code>bash common/bin/hgforest.sh merge</code></pre></li>
-</ul>
-<h3 id="using-the-trees-extension">Using the Trees Extension</h3>
-<p>The trees extension is a Mercurial add-on that helps you deal with the forest. More information is available on the <a href="http://openjdk.java.net/projects/code-tools/trees">Code Tools trees page</a>.</p>
-<h4 id="installing-the-extension">Installing the Extension</h4>
-<p>Install the extension by cloning <code>http://hg.openjdk.java.net/code-tools/trees</code> and updating your <code>.hgrc</code> file. Here's one way to do this:</p>
-<pre><code>cd ~
-mkdir hg-ext
-cd hg-ext
-hg clone http://hg.openjdk.java.net/code-tools/trees
-cat &lt;&lt; EOT &gt;&gt; ~/.hgrc
-[extensions]
-trees=~/hg-ext/trees/trees.py
-EOT</code></pre>
-<h4 id="initializing-the-tree">Initializing the Tree</h4>
-<p>The trees extension needs to know the structure of the forest. If you have already cloned the entire forest using another method, you can initialize the forest like this:</p>
-<pre><code>hg tconf --set --walk --depth</code></pre>
-<p>Or you can clone the entire forest at once, if you substitute <code>clone</code> with <code>tclone</code> when cloning the top-level repository, e.g. like this:</p>
-<pre><code>hg tclone http://hg.openjdk.java.net/jdk9/jdk9</code></pre>
-<p>In this case, the forest will be properly initialized from the start.</p>
-<h4 id="other-operations">Other Operations</h4>
-<p>The trees extensions supplement many common operations with a trees version by prefixing a <code>t</code> to the normal Mercurial command, e.g. <code>tcommit</code>, <code>tstatus</code> or <code>tmerge</code>. For instance, to update the entire forest:</p>
-<pre><code>hg tpull -u</code></pre>
 <h2 id="build-hardware-requirements">Build Hardware Requirements</h2>
 <p>OpenJDK is a massive project, and require machines ranging from decent to powerful to be able to build in a reasonable amount of time, or to be able to complete a build at all.</p>
 <p>We <em>strongly</em> recommend usage of an SSD disk for the build, since disk speed is one of the limiting factors for build performance.</p>
@@ -327,8 +284,7 @@ EOT</code></pre>
 </tbody>
 </table>
 <h3 id="gcc">gcc</h3>
-<p>The minimum accepted version of gcc is 4.3. Older versions will not be accepted by <code>configure</code>.</p>
-<p>However, gcc 4.3 is quite old and OpenJDK is not regularly tested on this version, so it is recommended to use a more modern gcc.</p>
+<p>The minimum accepted version of gcc is 4.7. Older versions will generate a warning by <code>configure</code> and are unlikely to work.</p>
 <p>OpenJDK 9 includes patches that should allow gcc 6 to compile, but this should be considered experimental.</p>
 <p>In general, any version between these two should be usable.</p>
 <h3 id="clang">clang</h3>

doc/building.md

@@ -7,7 +7,7 @@ the time. They assume that you have installed Mercurial (and Cygwin if running
 on Windows) and cloned the top-level OpenJDK repository that you want to build.
 
  1. [Get the complete source code](#getting-the-source-code): \
-    `bash get_source.sh`
+    `hg clone http://hg.openjdk.java.net/jdk10/master`
 
  2. [Run configure](#running-configure): \
     `bash configure`
@@ -44,18 +44,12 @@ OpenJDK.
 
 ## Getting the Source Code
 
-OpenJDK uses [Mercurial](http://www.mercurial-scm.org) for source control. The
-source code is contained not in a single Mercurial repository, but in a tree
-("forest") of interrelated repositories. You will need to check out all of the
-repositories to be able to build OpenJDK. To assist you in dealing with this
-somewhat unusual arrangement, there are multiple tools available, which are
-explained below.
-
-In any case, make sure you are getting the correct version. At the [OpenJDK
-Mercurial server](http://hg.openjdk.java.net/) you can see a list of all
-available forests. If you want to build an older version, e.g. JDK 8, it is
-recommended that you get the `jdk8u` forest, which contains incremental
-updates, instead of the `jdk8` forest, which was frozen at JDK 8 GA.
+Make sure you are getting the correct version. As of JDK 10, the source is no
+longer split into separate repositories so you only need to clone one single
+repository. At the [OpenJDK Mercurial server](http://hg.openjdk.java.net/) you
+can see a list of all available forests. If you want to build an older version,
+e.g. JDK 8, it is recommended that you get the `jdk8u` forest, which contains
+incremental updates, instead of the `jdk8` forest, which was frozen at JDK 8 GA.
 
 If you are new to Mercurial, a good place to start is the [Mercurial Beginner's
 Guide](http://www.mercurial-scm.org/guide). The rest of this document assumes a
@@ -101,96 +95,6 @@ on where and how to check out the source code.
     Failure to follow this procedure might result in hard-to-debug build
     problems.
 
-### Using get\_source.sh
-
-The simplest way to get the entire forest is probably to clone the top-level
-repository and then run the `get_source.sh` script, like this:
-
-```
-hg clone http://hg.openjdk.java.net/jdk9/jdk9
-cd jdk9
-bash get_source.sh
-```
-
-The first time this is run, it will clone all the sub-repositories. Any
-subsequent execution of the script will update all sub-repositories to the
-latest revision.
-
-### Using hgforest.sh
-
-The `hgforest.sh` script is more expressive than `get_source.sh`. It takes any
-number of arguments, and runs `hg` with those arguments on each sub-repository
-in the forest. The `get_source.sh` script is basically a simple wrapper that
-runs either `hgforest.sh clone` or `hgforest.sh pull -u`.
-
-  * Cloning the forest:
-    ```
-    hg clone http://hg.openjdk.java.net/jdk9/jdk9
-    cd jdk9
-    bash common/bin/hgforest.sh clone
-    ```
-
-  * Pulling and updating the forest:
-    ```
-    bash common/bin/hgforest.sh pull -u
-    ```
-
-  * Merging over the entire forest:
-    ```
-    bash common/bin/hgforest.sh merge
-    ```
-
-### Using the Trees Extension
-
-The trees extension is a Mercurial add-on that helps you deal with the forest.
-More information is available on the [Code Tools trees page](
-http://openjdk.java.net/projects/code-tools/trees).
-
-#### Installing the Extension
-
-Install the extension by cloning `http://hg.openjdk.java.net/code-tools/trees`
-and updating your `.hgrc` file. Here's one way to do this:
-
-```
-cd ~
-mkdir hg-ext
-cd hg-ext
-hg clone http://hg.openjdk.java.net/code-tools/trees
-cat << EOT >> ~/.hgrc
-[extensions]
-trees=~/hg-ext/trees/trees.py
-EOT
-```
-
-#### Initializing the Tree
-
-The trees extension needs to know the structure of the forest. If you have
-already cloned the entire forest using another method, you can initialize the
-forest like this:
-
-```
-hg tconf --set --walk --depth
-```
-
-Or you can clone the entire forest at once, if you substitute `clone` with
-`tclone` when cloning the top-level repository, e.g. like this:
-
-```
-hg tclone http://hg.openjdk.java.net/jdk9/jdk9
-```
-
-In this case, the forest will be properly initialized from the start.
-
-#### Other Operations
-
-The trees extensions supplement many common operations with a trees version by
-prefixing a `t` to the normal Mercurial command, e.g. `tcommit`, `tstatus` or
-`tmerge`. For instance, to update the entire forest:
-
-```
-hg tpull -u
-```
-
 ## Build Hardware Requirements
 
 OpenJDK is a massive project, and require machines ranging from decent to

doc/testing.html

@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
   <title>Testing OpenJDK</title>
   <style type="text/css">code{white-space: pre;}</style>
-  <link rel="stylesheet" href="../../jdk/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]-->
@@ -43,7 +43,6 @@ $ make run-test-only TEST=&quot;gtest:LogTagSet gtest:LogTagSetDescriptions&quot
 $ make run-test TEST=&quot;hotspot/test:hotspot_gc&quot; JTREG=&quot;JOBS=1;TIMEOUT=8;VM_OTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;
 $ make run-test TEST=&quot;jtreg:hotspot/test:hotspot_gc hotspot/test/native_sanity/JniVersion.java&quot;
 $ make exploded-run-test TEST=hotspot_tier1</code></pre>
-
 <h3 id="configuration">Configuration</h3>
 <p>To be able to run JTReg tests, <code>configure</code> needs to know where to find the JTReg test framework. If it is not picked up automatically by configure, use the <code>--with-jtreg=&lt;path to jtreg home&gt;</code> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc. (An alternative is to set the <code>JT_HOME</code> environment variable to point to the JTReg home before running <code>configure</code>.)</p>
 <h2 id="test-selection">Test selection</h2>

make/BuildNashorn.gmk

@@ -32,18 +32,17 @@ include JarArchive.gmk
 include JavaCompilation.gmk
 include SetupJavaCompilers.gmk
 include TextFileProcessing.gmk
+include Modules.gmk
 
 JDK_CLASSES := $(call PathList, $(strip $(addprefix $(JDK_OUTPUTDIR)/modules/, \
       java.base java.logging java.scripting jdk.dynalink)))
 
-MODULESOURCEPATH := $(NASHORN_TOPDIR)/src/*/share/classes
-
 # Need to use source and target 8 for nasgen to work.
 $(eval $(call SetupJavaCompiler, GENERATE_NEWBYTECODE_DEBUG, \
     JVM := $(JAVA_JAVAC), \
     JAVAC := $(NEW_JAVAC), \
     FLAGS := -g -source 9 -target 9 --upgrade-module-path "$(JDK_OUTPUTDIR)/modules/" \
-         --system none --module-source-path "$(MODULESOURCEPATH)", \
+         --system none --module-source-path $(call GetModuleSrcPath), \
     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
     SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
 
@@ -54,12 +53,12 @@ $(eval $(call SetupJavaCompiler, GENERATE_NEWBYTECODE_DEBUG, \
 $(eval $(call SetupJavaCompilation, jdk.scripting.nashorn, \
     SETUP := GENERATE_NEWBYTECODE_DEBUG, \
     MODULE := jdk.scripting.nashorn, \
-    SRC := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes, \
+    SRC := $(TOPDIR)/src/jdk.scripting.nashorn/share/classes, \
     COPY := .properties .js, \
     BIN := $(SUPPORT_OUTPUTDIR)/special_classes))
 
-NASGEN_SRC := $(NASHORN_TOPDIR)/buildtools/nasgen/src
-ASM_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/org/objectweb/asm
+NASGEN_SRC := $(TOPDIR)/make/nashorn/buildtools/nasgen/src
+ASM_SRC := $(TOPDIR)/src/java.base/share/classes/jdk/internal/org/objectweb/asm
 
 # Build nasgen
 $(eval $(call SetupJavaCompilation, BUILD_NASGEN, \
@@ -94,7 +93,7 @@ $(NASGEN_RUN_FILE): $(BUILD_NASGEN) $(jdk.scripting.nashorn)
 
 # Version file needs to be processed with version numbers
 $(eval $(call SetupTextFileProcessing, BUILD_VERSION_FILE, \
-  SOURCE_FILES := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties.template, \
+  SOURCE_FILES := $(TOPDIR)/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties.template, \
   OUTPUT_FILE := $(JDK_OUTPUTDIR)/modules/jdk.scripting.nashorn/jdk/nashorn/internal/runtime/resources/version.properties, \
   REPLACEMENTS := \
       @@VERSION_STRING@@ => $(VERSION_STRING) ; \

make/Bundles.gmk

@@ -56,7 +56,7 @@ define SetupBundleFileBody
     $$(eval $1_$$d_RELATIVE_FILES := $$$$(patsubst $$d/%, %, \
         $$$$(filter $$d/%, $$$$($1_FILES)))) \
     $$(eval $1_$$d_LIST_FILE := \
-        $(SUPPORT_OUTPUTDIR)/bundles/_$1_$$$$(subst /,_,$$$$(patsubst $(TOPDIR)/%,%,$$d)_files)) \
+        $(SUPPORT_OUTPUTDIR)/bundles/_$1_$$$$(subst /,_,$$$$(patsubst $(OUTPUT_ROOT)/%,%,$$d)_files)) \
   )
 
   ifneq ($$(filter %.tar.gz, $$($1_BUNDLE_NAME)), )

make/CompileDemos.gmk

@@ -38,8 +38,8 @@ include TextFileProcessing.gmk
 include ZipArchive.gmk
 
 # Prepare the find cache.
-$(eval $(call FillCacheFind, $(wildcard $(JDK_TOPDIR)/src/demo \
-    $(JDK_TOPDIR)/src/*/demo)))
+$(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/demo \
+    $(TOPDIR)/src/*/demo)))
 
 # Append demo goals to this variable.
 TARGETS =
@@ -48,15 +48,15 @@ TARGETS =
 # Now every other demo has its own quirks where to put the
 # READMEs and other files.
 
-DEMO_SHARE_SRC := $(JDK_TOPDIR)/src/demo/share
-GLOBAL_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc
+DEMO_SHARE_SRC := $(TOPDIR)/src/demo/share
+GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc
 
 DEMO_MANIFEST := $(SUPPORT_OUTPUTDIR)/demos/java-main-manifest.mf
 
 # This rule will be depended on due to the MANIFEST line in SetupBuildDemo
 # and SetupBuildJvmtiDemo.
 $(eval $(call SetupTextFileProcessing, BUILD_JAVA_MANIFEST, \
-  SOURCE_FILES := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf, \
+  SOURCE_FILES := $(TOPDIR)/make/data/mainmanifest/manifest.mf, \
   OUTPUT_FILE := $(DEMO_MANIFEST), \
   REPLACEMENTS := \
       @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \
@@ -303,7 +303,7 @@ endif
 
 ################################################################################
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, CompileDemos.gmk))
+$(eval $(call IncludeCustomExtension, , CompileDemos.gmk))
 
 all: $(TARGETS)
 images: $(IMAGES_TARGETS)

make/CompileInterimLangtools.gmk

@@ -43,7 +43,7 @@ define SetupInterimModule
   $$(eval $$(call SetupJavaCompilation,BUILD_INTERIM_$(strip $1), \
       SETUP := BOOT_JAVAC, \
       DISABLE_SJAVAC := true, \
-      SRC := $(LANGTOOLS_TOPDIR)/src/$(strip $1)/share/classes \
+      SRC := $(TOPDIR)/src/$(strip $1)/share/classes \
           $$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$(strip $1)), \
       EXCLUDES := sun com/sun/tools/jdeps com/sun/tools/javap \
           com/sun/tools/jdeprscan, \

make/CompileInterimRmic.gmk

@@ -43,7 +43,7 @@ RMIC_PKGS := \
 
 $(eval $(call SetupJavaCompilation,BUILD_INTERIM_RMIC, \
     SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(JDK_TOPDIR)/src/jdk.rmic/share/classes, \
+    SRC := $(TOPDIR)/src/jdk.rmic/share/classes, \
     EXCLUDE_FILES := module-info.java, \
     INCLUDES := $(RMIC_PKGS), \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/override_modules/jdk.rmic, \

make/CompileJavaModules.gmk

@@ -47,7 +47,7 @@ java.base_COPY += .icu .dat .spp content-types.properties hijrah-config-islamic-
 java.base_CLEAN += intrinsic.properties
 
 java.base_EXCLUDE_FILES += \
-  $(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
+  $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
 
 java.base_EXCLUDES += java/lang/doc-files
 
@@ -146,10 +146,10 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
       com/sun/java/swing/plaf/gtk \
       #
   java.desktop_EXCLUDE_FILES += \
-      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \
-      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \
-      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \
-      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \
+      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \
+      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \
+      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \
+      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \
       #
 else
   # TBD: figure out how to eliminate this long list
@@ -267,15 +267,15 @@ java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
 
 java.sql.rowset_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
 java.sql.rowset_CLEAN_FILES += $(wildcard \
-    $(JDK_TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \
-    $(JDK_TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)
+    $(TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \
+    $(TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)
 
 ################################################################################
 
 java.rmi_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
 java.rmi_CLEAN_FILES += $(wildcard \
-    $(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \
-    $(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties)
+    $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \
+    $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties)
 
 ################################################################################
 
@@ -351,10 +351,11 @@ jdk.charsets_COPY += .dat
 
 ################################################################################
 
-jdk.compiler_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*' \
+jdk.compiler_ADD_JAVAC_FLAGS += -Xdoclint:all/protected \
+    '-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*,sun.tools.serialver.resources.*' \
     -XDstringConcat=inline
 jdk.compiler_CLEAN_FILES += $(wildcard \
-    $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
+    $(patsubst %, $(TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
         sun/tools/serialver/resources))
 
 ################################################################################
@@ -399,17 +400,17 @@ jdk.rmic_CLEAN += .properties
 
 # No SCTP implementation on Mac OS X or AIX. These classes should be excluded.
 SCTP_IMPL_CLASSES = \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
@@ -424,15 +425,15 @@ endif
 jdk.jconsole_COPY += .gif .png
 
 jdk.jconsole_CLEAN_FILES += $(wildcard \
-    $(JDK_TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties)
+    $(TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties)
 
 ################################################################################
 
 jdk.jdeps_COPY += .txt
 
 jdk.jdeps_CLEAN_FILES += $(wildcard \
-    $(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \
-    $(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties)
+    $(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \
+    $(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties)
 
 ################################################################################
 
@@ -448,7 +449,7 @@ jdk.jdi_EXCLUDE_FILES += jdi-overview.html
 ################################################################################
 
 jdk.dev_CLEAN_FILES += $(wildcard \
-    $(patsubst %, $(JDK_TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \
+    $(patsubst %, $(TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \
         com/sun/tools/script/shell))
 
 jdk.dev_COPY += .js oqlhelp.html .txt
@@ -601,7 +602,7 @@ ifeq ($(MODULE), jdk.internal.vm.ci)
   ## WORKAROUND jdk.internal.vm.ci source structure issue
   JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \
       $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
-          $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+          $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
   MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH))
 endif
 
@@ -609,7 +610,7 @@ ifeq ($(MODULE), jdk.internal.vm.compiler)
   ## WORKAROUND jdk.internal.vm.compiler source structure issue
   VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \
       $(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src %bench/src %microbenchmarks/src, \
-          $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+          $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
   MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH))
 endif
 
@@ -617,7 +618,7 @@ ifeq ($(MODULE), jdk.aot)
   ## WORKAROUND jdk.aot source structure issue
   AOT_MODULESOURCEPATH := $(MODULESOURCEPATH) \
       $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
-          $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+          $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
   MODULESOURCEPATH := $(call PathList, $(AOT_MODULESOURCEPATH))
 endif
 
@@ -654,7 +655,7 @@ $(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.pr
 	$(install-file)
 
 CreateHkTargets = \
-    $(patsubst $(JDK_TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
+    $(patsubst $(TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
       $(subst /share/classes,, \
         $(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1))))
 

make/CompileModuleTools.gmk

@@ -36,7 +36,7 @@ TOOLS_CLASSES_DIR := $(BUILDTOOLS_OUTPUTDIR)/tools_jigsaw_classes
 
 $(eval $(call SetupJavaCompilation,BUILD_JIGSAW_TOOLS, \
     SETUP := GENERATE_USINGJDKBYTECODE, \
-    SRC := $(JDK_TOPDIR)/make/src/classes, \
+    SRC := $(TOPDIR)/make/jdk/src/classes, \
     INCLUDES := build/tools/deps \
                 build/tools/docs \
                 build/tools/jigsaw, \

make/CompileToolsHotspot.gmk

@@ -35,12 +35,12 @@ include SetupJavaCompilers.gmk
 TARGETS :=
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, hotspot, CompileTools.gmk))
+$(eval $(call IncludeCustomExtension, , hotspot/CompileTools.gmk))
 
 ifeq ($(INCLUDE_GRAAL), true)
-  VM_CI_SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.internal.vm.ci/share/classes
+  VM_CI_SRC_DIR := $(TOPDIR)/src/jdk.internal.vm.ci/share/classes
 
-  SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.internal.vm.compiler/share/classes
+  SRC_DIR := $(TOPDIR)/src/jdk.internal.vm.compiler/share/classes
 
   ##############################################################################
   # Compile the annotation processors

make/CompileToolsJdk.gmk

@@ -32,13 +32,13 @@ include SetupJavaCompilers.gmk
 
 ################################################################################
 
-$(eval $(call IncludeCustomExtension, jdk, CompileTools.gmk))
+$(eval $(call IncludeCustomExtension, , CompileTools.gmk))
 
 ################################################################################
 
 # Use += to be able to add to this from a custom extension
 BUILD_TOOLS_SRC_DIRS += \
-    $(JDK_TOPDIR)/make/src/classes \
+    $(TOPDIR)/make/jdk/src/classes \
     $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes \
     #
 
@@ -53,9 +53,9 @@ $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \
 TARGETS += $(BUILD_TOOLS_JDK)
 
 $(eval $(call SetupCopyFiles,COPY_NIMBUS_TEMPLATES, \
-    SRC := $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus, \
+    SRC := $(TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus, \
     DEST := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/generatenimbus/resources, \
-    FILES := $(wildcard $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/*.template)))
+    FILES := $(wildcard $(TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/*.template)))
 
 TARGETS += $(COPY_NIMBUS_TEMPLATES)
 

make/CopyInterimCLDRConverter.gmk

@@ -42,7 +42,7 @@ define cldrconverter_copytznames
 endef
 
 $(eval $(call SetupCopyFiles,COPY_INTERIM_CLDRCONVERTER, \
-    SRC := $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/resources, \
+    SRC := $(TOPDIR)/src/java.base/share/classes/sun/util/resources, \
     DEST := $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes/build/tools/cldrconverter, \
     FILES := TimeZoneNames.java, \
     MACRO := cldrconverter_copytznames))

make/Docs.gmk

@@ -29,8 +29,8 @@ include MakeBase.gmk
 include Modules.gmk
 include ProcessMarkdown.gmk
 include ZipArchive.gmk
-include $(JDK_TOPDIR)/make/Tools.gmk
-include $(JDK_TOPDIR)/make/ModuleTools.gmk
+include $(TOPDIR)/make/ToolsJdk.gmk
+include $(TOPDIR)/make/ModuleTools.gmk
 
 # This is needed to properly setup DOCS_MODULES.
 $(eval $(call ReadImportMetaData))
@@ -58,7 +58,7 @@ $(eval $(call IncludeCustomExtension, , Docs.gmk))
 # On top of the sources that was used to compile the JDK, we need some
 # extra java.rmi sources that are used just for javadoc.
 MODULES_SOURCE_PATH := $(call PathList, $(call GetModuleSrcPath) \
-    $(SUPPORT_OUTPUTDIR)/rmic/* $(JDK_TOPDIR)/src/*/share/doc/stub)
+    $(SUPPORT_OUTPUTDIR)/rmic/* $(TOPDIR)/src/*/share/doc/stub)
 
 # URLs
 JAVADOC_BASE_URL := http://www.oracle.com/pls/topic/lookup?ctx=javase9&id=homepage
@@ -340,7 +340,7 @@ define SetupApiDocsGenerationBody
     # First we run the GenGraph tool. It will query the module structure of the
     # running JVM and output .dot files for all existing modules.
     GENGRAPHS_PROPS := \
-        $$(JDK_TOPDIR)/make/src/classes/build/tools/jigsaw/javadoc-graphs.properties
+        $$(TOPDIR)/make/jdk/src/classes/build/tools/jigsaw/javadoc-graphs.properties
 
     $1_GENGRAPHS_DIR := $$(SUPPORT_OUTPUTDIR)/docs/$1-gengraphs
     $1_GENGRAPHS_MARKER := $$($1_GENGRAPHS_DIR)/_gengraphs_run.marker
@@ -448,7 +448,7 @@ $(JDK_INDEX_HTML):
 JDK_INDEX_TARGETS += $(JDK_INDEX_HTML)
 
 # Copy the global resources
-GLOBAL_SPECS_RESOURCES_DIR := $(JDK_TOPDIR)/make/data/docs-resources/
+GLOBAL_SPECS_RESOURCES_DIR := $(TOPDIR)/make/data/docs-resources/
 $(eval $(call SetupCopyFiles, COPY_GLOBAL_RESOURCES, \
     SRC := $(GLOBAL_SPECS_RESOURCES_DIR), \
     FILES := $(call CacheFind, $(GLOBAL_SPECS_RESOURCES_DIR)), \
@@ -459,7 +459,7 @@ JDK_INDEX_TARGETS += $(COPY_GLOBAL_RESOURCES)
 # Copy the legal notices distributed with the docs bundle
 DOCS_LEGAL_NOTICES := jquery.md jszip.md pako.md
 $(eval $(call SetupCopyFiles, COPY_DOCS_LEGAL_NOTICES, \
-    SRC := $(LANGTOOLS_TOPDIR)/src/jdk.javadoc/share/legal, \
+    SRC := $(TOPDIR)/src/jdk.javadoc/share/legal, \
     FILES := $(DOCS_LEGAL_NOTICES), \
     DEST := $(DOCS_OUTPUTDIR)/legal, \
 ))
@@ -498,14 +498,15 @@ ifeq ($(ENABLE_FULL_DOCS), true)
     $(eval SPECS_$m := $(call FindModuleSpecsDirs, $m)) \
     $(foreach d, $(SPECS_$m), \
       $(if $(filter %.md, $(call CacheFind, $d)), \
-        $(eval $(call SetupProcessMarkdown, CONVERT_MARKDOWN_$m_$(patsubst $(TOPDIR)/%,%,$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 CacheFind, $d)), \
             DEST := $(DOCS_OUTPUTDIR)/specs/, \
             CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
         )) \
+        $(eval JDK_SPECS_TARGETS += $($($m_$d_NAME))) \
       ) \
-      $(eval JDK_SPECS_TARGETS += $(CONVERT_MARKDOWN_$m_$(patsubst $(TOPDIR)/%,%,$d))) \
     ) \
   )
 endif

make/ExplodedImageOptimize.gmk

@@ -29,7 +29,7 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
-include $(JDK_TOPDIR)/make/ModuleTools.gmk
+include $(TOPDIR)/make/ModuleTools.gmk
 
 ################################################################################
 

make/GenerateModuleSummary.gmk

@@ -32,7 +32,7 @@ include ModuleTools.gmk
 
 GENGRAPHS_DIR := $(IMAGES_OUTPUTDIR)/gengraphs
 SPEC_DOTFILES_DIR := $(GENGRAPHS_DIR)/spec-dotfiles
-TOOLS_MODULE_SRCDIR := $(JDK_TOPDIR)/make/src/classes/build/tools/jigsaw
+TOOLS_MODULE_SRCDIR := $(TOPDIR)/make/jdk/src/classes/build/tools/jigsaw
 
 $(GENGRAPHS_DIR)/jdk.dot: $(BUILD_JIGSAW_TOOLS)
 	$(MKDIR) -p $(@D)

make/Images.gmk

@@ -232,7 +232,7 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
       xjc.1
 
   # This variable is potentially overridden in the closed makefile.
-  MAN_SRC_BASEDIR ?= $(JDK_TOPDIR)/src
+  MAN_SRC_BASEDIR ?= $(TOPDIR)/src
 
   ifeq ($(OPENJDK_TARGET_OS), linux)
     MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/linux/doc

make/Init.gmk

@@ -266,7 +266,7 @@ else # HAS_SPEC=true
 	  $(ECHO) "Re-running configure using default settings"
         endif
 	( cd $(OUTPUT_ROOT) && PATH="$(ORIGINAL_PATH)" \
-	    $(BASH) $(TOPDIR)/configure $(CONFIGURE_COMMAND_LINE) )
+	    $(BASH) $(CONFIGURE_CMD) $(CONFIGURE_COMMAND_LINE) )
 
   ##############################################################################
   # The main target, for delegating into Main.gmk

make/InitSupport.gmk

@@ -69,7 +69,11 @@ ifeq ($(HAS_SPEC),)
       $(subst \ ,\#,$(MAKEOVERRIDES))))
 
   # Setup information about available configurations, if any.
+  ifeq ($(CUSTOM_BUILD_DIR), )
     build_dir=$(topdir)/build
+  else
+    build_dir=$(CUSTOM_BUILD_DIR)
+  endif
   all_spec_files=$(wildcard $(build_dir)/*/spec.gmk)
   # Extract the configuration names from the path
   all_confs=$(patsubst %/spec.gmk, %, $(patsubst $(build_dir)/%, %, $(all_spec_files)))
@@ -342,7 +346,7 @@ else # $(HAS_SPEC)=true
   # proper and existing SPEC is included.
   ##############################################################################
 
-  include $(SRC_ROOT)/make/common/MakeBase.gmk
+  include $(TOPDIR)/make/common/MakeBase.gmk
 
   # Define basic logging setup
   BUILD_LOG := $(OUTPUT_ROOT)/build.log

make/JrtfsJar.gmk

@@ -33,7 +33,7 @@ include TextFileProcessing.gmk
 
 # This rule will be depended on due to the MANIFEST line
 $(eval $(call SetupTextFileProcessing, BUILD_JAVA_MANIFEST, \
-  SOURCE_FILES := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf, \
+  SOURCE_FILES := $(TOPDIR)/make/data/mainmanifest/manifest.mf, \
   OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/java-main-manifest.mf, \
   REPLACEMENTS := \
       @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \
@@ -48,7 +48,7 @@ JIMAGE_PKGS := \
 
 $(eval $(call SetupJavaCompilation, BUILD_JRTFS, \
     SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
+    SRC := $(TOPDIR)/src/java.base/share/classes, \
     EXCLUDE_FILES := module-info.java, \
     INCLUDES := $(JIMAGE_PKGS), \
     BIN := $(SUPPORT_OUTPUTDIR)/jrtfs_classes))
@@ -58,7 +58,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JRTFS, \
 # Adding META-INF/services would include all files in that directory when only the one
 # is needed, which is why this explicit copy is defined instead.
 $(eval $(call SetupCopyFiles, COPY_JIMAGE_SERVICE_PROVIDER, \
-    SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
+    SRC := $(TOPDIR)/src/java.base/share/classes, \
     DEST := $(SUPPORT_OUTPUTDIR)/jrtfs_classes, \
     FILES := META-INF/services/java.nio.file.spi.FileSystemProvider))
 

make/MacBundles.gmk

@@ -36,7 +36,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
 
   # JDK_MACOSX_CONTENTS_DIR and JRE_MACOSX_CONTENTS_DIR are defined in SPEC.
 
-  MACOSX_PLIST_SRC := $(JDK_TOPDIR)/make/data/bundle
+  MACOSX_PLIST_SRC := $(TOPDIR)/make/data/bundle
 
   BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE).$(VERSION_SHORT)
   BUNDLE_NAME := $(MACOSX_BUNDLE_NAME_BASE) $(VERSION_SHORT)

make/Main.gmk

@@ -38,12 +38,12 @@ endif
 # Now load the spec
 include $(SPEC)
 
-include $(SRC_ROOT)/make/MainSupport.gmk
+include $(TOPDIR)/make/MainSupport.gmk
 
 # Load the vital tools for all the makefiles.
-include $(SRC_ROOT)/make/common/MakeBase.gmk
-include $(SRC_ROOT)/make/common/Modules.gmk
-include $(SRC_ROOT)/make/common/FindTests.gmk
+include $(TOPDIR)/make/common/MakeBase.gmk
+include $(TOPDIR)/make/common/Modules.gmk
+include $(TOPDIR)/make/common/FindTests.gmk
 
 # Declare ALL_TARGETS as an immediate variable. This variable is a list of all
 # valid top level targets. It's used to declare them all as PHONY and to
@@ -70,25 +70,25 @@ ALL_MODULES := $(call FindAllModules)
 # been built and should not be built again.
 ifneq ($(CREATING_BUILDJDK), true)
   buildtools-langtools:
-	+($(CD) $(LANGTOOLS_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Tools.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ToolsLangtools.gmk)
 
   interim-langtools:
-	+($(CD) $(LANGTOOLS_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterim.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimLangtools.gmk)
 
   interim-rmic:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
 
   interim-cldrconverter:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
 
   buildtools-jdk:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileTools.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsJdk.gmk)
 
   buildtools-modules:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileModuleTools.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileModuleTools.gmk)
 
   buildtools-hotspot:
-	+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileTools.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsHotspot.gmk)
 endif
 
 ALL_TARGETS += buildtools-langtools interim-langtools \
@@ -99,7 +99,7 @@ ALL_TARGETS += buildtools-langtools interim-langtools \
 # Special targets for certain modules
 
 unpack-sec:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UnpackSecurity.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UnpackSecurity.gmk)
 
 generate-exported-symbols:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildStatic.gmk)
@@ -113,16 +113,19 @@ ALL_TARGETS += unpack-sec generate-exported-symbols
 # into the buildjdk so no need to generate sources.
 ifneq ($(CREATING_BUILDJDK), true)
   $(eval $(call DeclareRecipesForPhase, GENSRC, \
-      TARGET_SUFFIX := gensrc, \
+      TARGET_SUFFIX := gensrc-src, \
       FILE_PREFIX := Gensrc, \
       MAKE_SUBDIR := gensrc, \
       CHECK_MODULES := $(ALL_MODULES), \
-      MULTIPLE_MAKEFILES := true))
+  ))
 
-  JDK_GENSRC_TARGETS := $(filter %-gensrc-jdk, $(GENSRC_TARGETS))
-  LANGTOOLS_GENSRC_TARGETS := $(filter %-gensrc-langtools, $(GENSRC_TARGETS))
-  CORBA_GENSRC_TARGETS := $(filter %-gensrc-corba, $(GENSRC_TARGETS))
-  HOTSPOT_GENSRC_TARGETS := $(filter %-gensrc-hotspot, $(GENSRC_TARGETS))
+  $(foreach m, $(GENSRC_MODULES), $(eval $m-gensrc: $m-gensrc-src))
+
+  LANGTOOLS_GENSRC_TARGETS := $(filter $(addsuffix -%, $(LANGTOOLS_MODULES)), $(GENSRC_TARGETS))
+  CORBA_GENSRC_TARGETS := $(filter $(addsuffix -%, $(CORBA_MODULES)), $(GENSRC_TARGETS))
+  HOTSPOT_GENSRC_TARGETS := $(filter $(addsuffix -%, $(HOTSPOT_MODULES)), $(GENSRC_TARGETS))
+  JDK_GENSRC_TARGETS := $(filter-out $(LANGTOOLS_GENSRC_TARGETS) \
+      $(CORBA_GENSRC_TARGETS) $(HOTSPOT_GENSRC_TARGETS), $(GENSRC_TARGETS))
 
   GENSRC_MODULEINFO_MODULES := $(ALL_MODULES)
   GENSRC_MODULEINFO_TARGETS := $(addsuffix -gensrc-moduleinfo, \
@@ -134,7 +137,7 @@ ifneq ($(CREATING_BUILDJDK), true)
 
   define DeclareModuleInfoRecipe
     $1-gensrc-moduleinfo:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) \
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
 	    -f GensrcModuleInfo.gmk MODULE=$1)
 
     $1-gensrc: $1-gensrc-moduleinfo
@@ -164,7 +167,7 @@ $(eval $(call DeclareRecipesForPhase, COPY, \
     MAKE_SUBDIR := copy, \
     CHECK_MODULES := $(ALL_MODULES), \
     USE_WRAPPER := true, \
-    MULTIPLE_MAKEFILES := true))
+))
 
 ALL_COPY_MODULES += $(COPY_MODULES)
 ALL_COPY_TARGETS += $(COPY_TARGETS)
@@ -176,7 +179,7 @@ ALL_COPY_TARGETS += $(IMPORT_COPY_TARGETS)
 
 define DeclareImportCopyRecipe
   $1-copy:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) \
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
 	    -f CopyImportModules.gmk MODULE=$1)
 endef
 
@@ -191,7 +194,7 @@ JAVA_TARGETS := $(addsuffix -java, $(JAVA_MODULES))
 
 define DeclareCompileJavaRecipe
   $1-java:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) \
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
 	    -f CompileJavaModules.gmk MODULE=$1)
 endef
 
@@ -201,7 +204,7 @@ $(foreach m, $(filter-out jdk.scripting.nashorn, $(JAVA_MODULES)), \
 # Build nashorn. Needs to be compiled separately from the rest of the modules
 # due to nasgen.
 jdk.scripting.nashorn-java:
-	+($(CD) $(NASHORN_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
 	    -f BuildNashorn.gmk compile)
 
 ALL_TARGETS += $(JAVA_TARGETS)
@@ -248,7 +251,7 @@ HOTSPOT_VARIANT_LIBS_TARGETS := $(addsuffix -libs, $(HOTSPOT_VARIANT_TARGETS))
 define DeclareHotspotGensrcRecipe
   hotspot-$1-gensrc:
 	$$(call LogInfo, Building JVM variant '$1' with features '$(JVM_FEATURES_$1)')
-	+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f gensrc/GenerateSources.gmk \
+	+($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f gensrc/GenerateSources.gmk \
 	    JVM_VARIANT=$1)
 endef
 
@@ -256,17 +259,17 @@ $(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotGensrcRecipe,$v)))
 
 define DeclareHotspotLibsRecipe
   hotspot-$1-libs:
-	+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibraries.gmk \
+	+($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibraries.gmk \
 	    JVM_VARIANT=$1)
 endef
 
 $(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v)))
 
 hotspot-jsig:
-	+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibjsig.gmk)
+	+($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibjsig.gmk)
 
 hotspot-ide-project:
-	+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk)
+	+($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk)
 
 ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
     $(HOTSPOT_VARIANT_LIBS_TARGETS) hotspot-jsig hotspot-ide-project
@@ -275,10 +278,10 @@ ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
 # Build demos targets
 
 demos-jdk:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileDemos.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileDemos.gmk)
 
 test-image-demos-jdk:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileDemos.gmk images)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileDemos.gmk images)
 
 ALL_TARGETS += demos-jdk test-image-demos-jdk
 
@@ -286,7 +289,7 @@ ALL_TARGETS += demos-jdk test-image-demos-jdk
 # Jigsaw specific data and analysis targets.
 
 generate-summary:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f GenerateModuleSummary.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f GenerateModuleSummary.gmk)
 
 ALL_TARGETS += generate-summary
 
@@ -298,7 +301,7 @@ JMOD_TARGETS := $(addsuffix -jmod, $(JMOD_MODULES))
 
 define DeclareJmodRecipe
   $1-jmod:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f CreateJmods.gmk \
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateJmods.gmk \
 	    MODULE=$1)
 endef
 
@@ -310,50 +313,50 @@ ALL_TARGETS += $(JMOD_TARGETS)
 # Images targets
 
 store-source-revision:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f SourceRevision.gmk store-source-revision)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f SourceRevision.gmk store-source-revision)
 
 create-source-revision-tracker:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f SourceRevision.gmk create-source-revision-tracker)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f SourceRevision.gmk create-source-revision-tracker)
 
 BOOTCYCLE_TARGET := product-images
 bootcycle-images:
         ifneq ($(COMPILE_TYPE), cross)
 	  $(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
-	  +$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
+	  +$(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
 	      JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
         else
 	  $(call LogWarn, Boot cycle build disabled when cross compiling)
         endif
 
 zip-security:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f ZipSecurity.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ZipSecurity.gmk)
 
 zip-source:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f ZipSource.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ZipSource.gmk)
 
 jrtfs-jar:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f JrtfsJar.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f JrtfsJar.gmk)
 
 jdk-image:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jdk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jdk)
 
 jre-image:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jre)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jre)
 
 symbols-image:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols)
 
 profiles-image:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk profiles)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk profiles)
 
 mac-bundles-jdk:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk)
 
 release-file:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f ReleaseFile.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ReleaseFile.gmk)
 
 exploded-image-optimize:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f ExplodedImageOptimize.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ExplodedImageOptimize.gmk)
 
 ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-images zip-security \
     zip-source jrtfs-jar jdk-image jre-image \
@@ -366,28 +369,28 @@ ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-im
 # If building full docs, to complete docs-*-api we need both the javadoc and
 # modulegraph targets.
 docs-jdk-api-javadoc:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-api-javadoc)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-api-javadoc)
 
 docs-jdk-api-modulegraph:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-api-modulegraph)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-api-modulegraph)
 
 docs-javase-api-javadoc:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-javase-api-javadoc)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-javase-api-javadoc)
 
 docs-javase-api-modulegraph:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-javase-api-modulegraph)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-javase-api-modulegraph)
 
 docs-jdk-specs:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-specs)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-specs)
 
 docs-jdk-index:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-index)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-index)
 
 docs-zip:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-zip)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-zip)
 
 update-build-docs:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f UpdateBuildDocs.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UpdateBuildDocs.gmk)
 
 ALL_TARGETS += docs-jdk-api-javadoc docs-jdk-api-modulegraph \
     docs-javase-api-javadoc docs-javase-api-modulegraph docs-jdk-specs \
@@ -403,10 +406,10 @@ ifeq ($(CREATING_BUILDJDK), true)
 endif
 
 create-buildjdk-copy:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f CreateBuildJdkCopy.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateBuildJdkCopy.gmk)
 
 create-buildjdk-interim-image:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Main.gmk \
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Main.gmk \
 	    $@-helper \
 	    SPEC=$(dir $(SPEC))buildjdk-spec.gmk \
 	    HOTSPOT_SPEC=$(dir $(SPEC))buildjdk-spec.gmk \
@@ -422,7 +425,7 @@ INTERIM_JMOD_TARGETS := $(addsuffix -interim-jmod, $(INTERIM_IMAGE_MODULES))
 
 define DeclareInterimJmodRecipe
   $1-interim-jmod:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f CreateJmods.gmk \
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateJmods.gmk \
 	    MODULE=$1 \
 	    JMODS_DIR=$(INTERIM_JMODS_DIR) \
 	    JMODS_TEMPDIR=$(INTERIM_JMODS_DIR)/temp \
@@ -433,11 +436,11 @@ endef
 $(foreach m, $(INTERIM_IMAGE_MODULES), $(eval $(call DeclareInterimJmodRecipe,$m)))
 
 interim-image:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f InterimImage.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f InterimImage.gmk)
 
 ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
   generate-link-opt-data:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f GenerateLinkOptData.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f GenerateLinkOptData.gmk)
 endif
 
 ALL_TARGETS += $(INTERIM_JMOD_TARGETS) interim-image generate-link-opt-data
@@ -448,10 +451,10 @@ ALL_TARGETS += $(INTERIM_JMOD_TARGETS) interim-image generate-link-opt-data
 
 define DeclareRunTestRecipe
   run-test-$1:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$1")
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$1")
 
   exploded-run-test-$1:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
 	    TEST="$1" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR))
 
 endef
@@ -472,19 +475,19 @@ prepare-test-image:
 	$(ECHO) > $(TEST_IMAGE_DIR)/Readme.txt 'JDK test image'
 
 build-test-hotspot-jtreg-native:
-	+($(CD) $(HOTSPOT_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk \
+	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNativeHotspot.gmk \
 	    build-test-hotspot-jtreg-native)
 
 test-image-hotspot-jtreg-native:
-	+($(CD) $(HOTSPOT_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk \
+	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNativeHotspot.gmk \
 	    test-image-hotspot-jtreg-native)
 
 build-test-jdk-jtreg-native:
-	+($(CD) $(JDK_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk \
+	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNativeJdk.gmk \
 	    build-test-jdk-jtreg-native)
 
 test-image-jdk-jtreg-native:
-	+($(CD) $(JDK_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk \
+	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNativeJdk.gmk \
 	    test-image-jdk-jtreg-native)
 
 run-test:
@@ -496,7 +499,7 @@ exploded-run-test:
 
 ifeq ($(BUILD_GTEST), true)
   test-image-hotspot-gtest:
-	+($(CD) $(HOTSPOT_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f GtestImage.gmk)
+	+($(CD) $(TOPDIR)/make/hotspot/test && $(MAKE) $(MAKE_ARGS) -f GtestImage.gmk)
 endif
 
 build-test-lib:
@@ -548,7 +551,7 @@ test-jdk-jtreg-native:
 	$(call RunTests, "jdk_native_sanity", $(JDK_IMAGE_DIR))
 
 test-make:
-	($(CD) $(SRC_ROOT)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET))
+	($(CD) $(TOPDIR)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET))
 
 ALL_TARGETS += test test-hotspot-jtreg test-hotspot-jtreg-native \
     test-hotspot-internal test-hotspot-gtest test-jdk-jtreg-native test-make
@@ -574,7 +577,7 @@ ALL_TARGETS += product-bundles profiles-bundles test-bundles docs-bundles
 # Install targets
 
 install:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Install.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Install.gmk)
 
 ALL_TARGETS += install
 
@@ -681,18 +684,18 @@ else
 
   # The swing beans need to have java base properly generated to avoid errors
   # in javadoc.
-  java.desktop-gensrc-jdk: java.base-gensrc
+  java.desktop-gensrc-src: java.base-gensrc
 
   # The annotation processing for jdk.internal.vm.ci and jdk.internal.vm.compiler
   # needs classes from the current JDK.
-  jdk.internal.vm.ci-gensrc-hotspot: $(addsuffix -java, \
+  jdk.internal.vm.ci-gensrc-src: $(addsuffix -java, \
       $(call FindTransitiveDepsForModule, jdk.internal.vm.ci))
-  jdk.internal.vm.compiler-gensrc-hotspot: $(addsuffix -java, \
+  jdk.internal.vm.compiler-gensrc-src: $(addsuffix -java, \
       $(call FindTransitiveDepsForModule, jdk.internal.vm.compiler))
 
   # 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-hotspot
+  jdk.internal.vm.compiler-gensrc-moduleinfo: jdk.internal.vm.compiler-gensrc-src
 
   # Explicitly add dependencies for special targets
   java.base-java: unpack-sec
@@ -1084,7 +1087,7 @@ dist-clean: clean
 	  if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \
 	    $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ; \
 	  else \
-	    ($(CD) $(SRC_ROOT) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" \
+	    ($(CD) $(TOPDIR) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" \
 	        && $(RM) -r $(OUTPUT_ROOT)) \
 	  fi \
 	)
@@ -1103,7 +1106,7 @@ ALL_TARGETS += $(addsuffix -only, $(filter-out dist-clean clean%, $(ALL_TARGETS)
 ################################################################################
 
 # Include JPRT targets
-include $(SRC_ROOT)/make/Jprt.gmk
+include $(TOPDIR)/make/Jprt.gmk
 
 ################################################################################
 

make/MainSupport.gmk

@@ -33,7 +33,7 @@ _MAINSUPPORT_GMK := 1
 # Run the tests specified by $1, with PRODUCT_HOME specified by $2
 # JT_JAVA is picked up by the jtreg launcher and used to run Jtreg itself.
 define RunTests
-	($(CD) $(SRC_ROOT)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \
+	($(CD) $(TOPDIR)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \
 	    JT_HOME=$(JT_HOME) PRODUCT_HOME=$(strip $2) \
 	    TEST_IMAGE_DIR=$(TEST_IMAGE_DIR) \
 	    ALT_OUTPUTDIR=$(OUTPUT_ROOT) TEST_JOBS=$(TEST_JOBS) \
@@ -118,42 +118,36 @@ endef
 
 ################################################################################
 
-MAKE_TOPDIR_LIST := $(JDK_TOPDIR) $(CORBA_TOPDIR) $(LANGTOOLS_TOPDIR) \
-    $(HOTSPOT_TOPDIR)
-MAKE_MAKEDIR_LIST := make
+PHASE_MAKEDIRS := $(TOPDIR)/make
 
 # Helper macro for DeclareRecipesForPhase
 # Declare a recipe for calling the module and phase specific makefile.
 # If there are multiple makefiles to call, create a rule for each topdir
 # that contains a makefile with the target $module-$suffix-$repodir,
-# (i.e: java.base-gensrc-jdk)
+# (i.e: java.base-gensrc-src)
 # Normally there is only one makefile, and the target will just be
 # $module-$suffix
 # Param 1: Name of list to add targets to
 # Param 2: Module name
-# Param 3: Topdir
 define DeclareRecipeForModuleMakefile
-  ifeq ($$($1_MULTIPLE_MAKEFILES), true)
-    $2-$$($1_TARGET_SUFFIX): $2-$$($1_TARGET_SUFFIX)-$$(notdir $3)
-
-    $2-$$($1_TARGET_SUFFIX)-$$(notdir $3):
-  else
   $2-$$($1_TARGET_SUFFIX):
-  endif
         ifeq ($$($1_USE_WRAPPER), true)
-	  +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) \
+	  +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
 	      -f ModuleWrapper.gmk \
-	          $$(addprefix -I, $$(wildcard $$(addprefix $3/, $(MAKE_MAKEDIR_LIST)) \
-	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(addprefix $3/, $(MAKE_MAKEDIR_LIST))))) \
+	      $$(addprefix -I, $$(PHASE_MAKEDIRS) \
+	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(PHASE_MAKEDIRS)) \
+	      ) \
 	      MODULE=$2 MAKEFILE_PREFIX=$$($1_FILE_PREFIX))
         else
-	  +($(CD) $$(dir $$(firstword $$(wildcard $$(patsubst %, \
-	          $3/%/$$($1_MAKE_SUBDIR)/$$($1_FILE_PREFIX)-$2.gmk, $(MAKE_MAKEDIR_LIST))))) \
+	  +($(CD) $$(dir $$(firstword $$(wildcard $$(addsuffix \
+	      /$$($1_MAKE_SUBDIR)/$$($1_FILE_PREFIX)-$2.gmk, $$(PHASE_MAKEDIRS))))) \
 	  && $(MAKE) $(MAKE_ARGS) \
 	      -f $$($1_FILE_PREFIX)-$2.gmk \
-	          $$(addprefix -I, $$(wildcard $$(addprefix $3/, $(MAKE_MAKEDIR_LIST)) \
-	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(addprefix $3/, $(MAKE_MAKEDIR_LIST))))) \
-	          MODULE=$2)
+	      $$(addprefix -I, $$(PHASE_MAKEDIRS) \
+	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(PHASE_MAKEDIRS)) \
+	      ) \
+	      MODULE=$2 \
+	  )
         endif
 
 endef
@@ -162,14 +156,11 @@ endef
 # Param 1: Name of list to add targets to
 # Param 2: Module name
 define DeclareRecipesForPhaseAndModule
-  $1_$2_TOPDIRS := $$(strip $$(sort $$(foreach d, $(MAKE_TOPDIR_LIST), \
-      $$(patsubst $$d/%, $$d, $$(filter $$d/%, \
-          $$(wildcard $$(patsubst %, %/$$($1_MAKE_SUBDIR)/$$($1_FILE_PREFIX)-$2.gmk, \
-          $$(foreach s, $(MAKE_MAKEDIR_LIST), \
-              $$(addsuffix /$$s, $(MAKE_TOPDIR_LIST))))))))))
+  $1_$2_MAKEFILES := $$(strip $$(wildcard \
+      $$(addsuffix /$$($1_MAKE_SUBDIR)/$$($1_FILE_PREFIX)-$2.gmk, $$(PHASE_MAKEDIRS))))
 
   # Only declare recipes if there are makefiles to call
-  ifneq ($$($1_$2_TOPDIRS), )
+  ifneq ($$($1_$2_MAKEFILES), )
     # Add the top dir specific target to target list regardless of if recipe
     # generation is disabled.
     ifeq ($$($1_MULTIPLE_MAKEFILES), true)
@@ -177,8 +168,7 @@ define DeclareRecipesForPhaseAndModule
         $$(eval $1 += $2-$$($1_TARGET_SUFFIX)-$$(notdir $$d)))
     endif
     ifeq ($(NO_RECIPES),)
-      $$(foreach d, $$($1_$2_TOPDIRS), \
-          $$(eval $$(call DeclareRecipeForModuleMakefile,$1,$2,$$d)))
+      $$(eval $$(call DeclareRecipeForModuleMakefile,$1,$2))
     endif
     $1 += $2-$$($1_TARGET_SUFFIX)
     $1_MODULES += $2
@@ -200,7 +190,7 @@ endef
 # $1_MODULES : All modules that had rules generated
 # $1_TARGETS : All targets generated
 define DeclareRecipesForPhase
-  $(foreach i,2 3 4 5 6 7, $(if $($i),$(strip $1)_$(strip $($i)))$(NEWLINE))
+  $(foreach i,2 3 4 5 6 7, $(if $(strip $($i)),$(strip $1)_$(strip $($i)))$(NEWLINE))
   $(if $(8),$(error Internal makefile error: Too many arguments to \
       DeclareRecipesForPhase, please update MakeHelper.gmk))
 

make/SourceRevision.gmk

@@ -28,6 +28,8 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
+$(eval $(call IncludeCustomExtension, , SourceRevision.gmk))
+
 ################################################################################
 # Keep track of what source revision is used to create the build, by creating
 # a tracker file in the output directory. This tracker file is included in the

make/ToolsJdk.gmk

@@ -29,7 +29,7 @@ _TOOLS_GMK := 1
 include JavaCompilation.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, Tools.gmk))
+$(eval $(call IncludeCustomExtension, , Tools.gmk))
 
 ################################################################################
 # To avoid reevaluating the compilation setup for the tools each time this file
@@ -60,7 +60,7 @@ TOOL_GENERATECHARACTER = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_cla
 TOOL_CHARACTERNAME = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.generatecharacter.CharacterName
 
-TOOL_DTDBUILDER = $(JAVA_SMALL) -Ddtd_home=$(JDK_TOPDIR)/make/data/dtdbuilder \
+TOOL_DTDBUILDER = $(JAVA_SMALL) -Ddtd_home=$(TOPDIR)/make/data/dtdbuilder \
     -Djava.awt.headless=true \
     -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes build.tools.dtdbuilder.DTDBuilder
 

make/ToolsLangtools.gmk

@@ -38,7 +38,7 @@ $(eval $(call SetupJavaCompilation,BUILD_TOOLS_LANGTOOLS, \
     SETUP := BOOT_JAVAC, \
     DISABLE_SJAVAC := true, \
     ADD_JAVAC_FLAGS := -Xprefer:source, \
-    SRC := $(LANGTOOLS_TOPDIR)/make/tools, \
+    SRC := $(TOPDIR)/make/langtools/tools, \
     INCLUDES := compileproperties propertiesparser, \
     COPY := .properties, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/langtools_tools_classes))

make/UnpackSecurity.gmk

@@ -30,10 +30,10 @@ include MakeBase.gmk
 
 ################################################################################
 # Unpack the binary distributions of the crypto classes if they exist.
-SEC_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/sec-bin.zip
-SEC_FILES_WIN_ZIP := $(JDK_TOPDIR)/make/tools/crypto/sec-windows-bin.zip
-JGSS_WIN32_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/jgss-windows-i586-bin.zip
-JGSS_WIN64_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/jgss-windows-x64-bin.zip
+SEC_FILES_ZIP := $(TOPDIR)/make/tools/crypto/sec-bin.zip
+SEC_FILES_WIN_ZIP := $(TOPDIR)/make/tools/crypto/sec-windows-bin.zip
+JGSS_WIN32_FILES_ZIP := $(TOPDIR)/make/tools/crypto/jgss-windows-i586-bin.zip
+JGSS_WIN64_FILES_ZIP := $(TOPDIR)/make/tools/crypto/jgss-windows-x64-bin.zip
 
 define unzip-sec-file
 	$(ECHO) Unzipping $(<F)

make/UpdateBuildDocs.gmk

@@ -39,11 +39,11 @@ ifeq ($(PANDOC), )
   $(error Cannot continue)
 endif
 
-GLOBAL_SPECS_DEFAULT_CSS_FILE := $(JDK_TOPDIR)/make/data/docs-resources/resources/jdk-default.css
+GLOBAL_SPECS_DEFAULT_CSS_FILE := $(TOPDIR)/make/data/docs-resources/resources/jdk-default.css
 
 ################################################################################
 
-DOCS_DIR := $(TOPDIR)/common/doc
+DOCS_DIR := $(TOPDIR)/doc
 
 $(eval $(call SetupProcessMarkdown, building, \
   FILES := $(DOCS_DIR)/building.md, \

make/autoconf/basics.m4

@@ -577,7 +577,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
   AC_SUBST(CANONICAL_TOPDIR)
 
   # Locate the directory of this script.
-  AUTOCONF_DIR=$TOPDIR/common/autoconf
+  AUTOCONF_DIR=$TOPDIR/make/autoconf
 
   # Setup username (for use in adhoc version strings etc)
   # Outer [ ] to quote m4.
@@ -768,11 +768,14 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
   AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name],
       [use this as the name of the configuration @<:@generated from important configuration options@:>@])],
       [ CONF_NAME=${with_conf_name} ])
+  AC_ARG_WITH(output-base-dir, [AS_HELP_STRING([--with-output-base-dir],
+      [override the default output base directory @<:@./build@:>@])],
+      [ OUTPUT_BASE=${with_output_base_dir} ], [ OUTPUT_BASE="$SRC_ROOT/build" ] )
 
   # Test from where we are running configure, in or outside of src root.
   AC_MSG_CHECKING([where to store configuration])
   if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
-      || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
+      || test "x$CURDIR" = "x$SRC_ROOT/make/autoconf" \
       || test "x$CURDIR" = "x$SRC_ROOT/make" ; then
     # We are running configure from the src root.
     # Create a default ./build/target-variant-debuglevel output root.
@@ -782,7 +785,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
     else
       AC_MSG_RESULT([in build directory with custom name])
     fi
-    OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
+    OUTPUT_ROOT="${OUTPUT_BASE}/${CONF_NAME}"
     $MKDIR -p "$OUTPUT_ROOT"
     if test ! -d "$OUTPUT_ROOT"; then
       AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT])

make/autoconf/basics_windows.m4

@@ -382,7 +382,7 @@ AC_DEFUN_ONCE([BASIC_COMPILE_FIXPATH],
   FIXPATH=
   if test "x$OPENJDK_BUILD_OS" = xwindows; then
     AC_MSG_CHECKING([if fixpath can be created])
-    FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
+    FIXPATH_SRC="$SRC_ROOT/make/src/native/fixpath.c"
     FIXPATH_BIN="$CONFIGURESUPPORT_OUTPUTDIR/bin/fixpath.exe"
     FIXPATH_DIR="$CONFIGURESUPPORT_OUTPUTDIR/fixpath"
     if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then

make/autoconf/compare.sh.in

@@ -88,7 +88,7 @@ if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
 fi
 
 # Now locate the main script and run it.
-REAL_COMPARE_SCRIPT="$SRC_ROOT/common/bin/compare.sh"
+REAL_COMPARE_SCRIPT="$SRC_ROOT/make/scripts/compare.sh"
 if [ ! -e "$REAL_COMPARE_SCRIPT" ]; then
   echo "Error: Cannot locate compare script, it should have been in $REAL_COMPARE_SCRIPT"
   exit 1
@@ -100,4 +100,4 @@ $MV $OUTPUT_ROOT/compare.log $OUTPUT_ROOT/compare.log.old 2> /dev/null
 
 export SCRIPT_DIR="$( cd "$( dirname "$0" )" > /dev/null && pwd )"
 
-$BASH $SRC_ROOT/common/bin/logger.sh $OUTPUT_ROOT/compare.log $BASH "$REAL_COMPARE_SCRIPT" "$@"
+$BASH $SRC_ROOT/make/scripts/logger.sh $OUTPUT_ROOT/compare.log $BASH "$REAL_COMPARE_SCRIPT" "$@"

make/autoconf/configure

@@ -44,7 +44,7 @@ fi
 export CONFIG_SHELL=$BASH
 export _as_can_reexec=no
 
-conf_script_dir="$TOPDIR/common/autoconf"
+conf_script_dir="$TOPDIR/make/autoconf"
 
 if [ "$CUSTOM_CONFIG_DIR" = "" ]; then
   conf_custom_script_dir="$TOPDIR/closed/autoconf"

make/autoconf/configure.ac

@@ -33,7 +33,7 @@
 AC_PREREQ([2.69])
 AC_INIT(OpenJDK, jdk9, build-dev@openjdk.java.net,,http://openjdk.java.net)
 
-AC_CONFIG_AUX_DIR([$TOPDIR/common/autoconf/build-aux])
+AC_CONFIG_AUX_DIR([$TOPDIR/make/autoconf/build-aux])
 m4_include([build-aux/pkg.m4])
 
 # Include these first...

make/autoconf/flags.m4

@@ -1162,11 +1162,11 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER],
   # Setup some hard coded includes
   $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK \
       -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
-      -I${JDK_TOPDIR}/src/java.base/share/native/include \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_$1_OS/native/include \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/include \
-      -I${JDK_TOPDIR}/src/java.base/share/native/libjava \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/libjava"
+      -I${TOPDIR}/src/java.base/share/native/include \
+      -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS/native/include \
+      -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/include \
+      -I${TOPDIR}/src/java.base/share/native/libjava \
+      -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/libjava"
 
   # The shared libraries are compiled using the picflag.
   $2CFLAGS_JDKLIB="[$]$2COMMON_CCXXFLAGS_JDK \

make/autoconf/generated-configure.sh

@@ -871,7 +871,6 @@ IMPORT_MODULES_LIBS
 IMPORT_MODULES_CMDS
 IMPORT_MODULES_CLASSES
 BUILD_OUTPUT
-JDK_TOPDIR
 NASHORN_TOPDIR
 HOTSPOT_TOPDIR
 JAXWS_TOPDIR
@@ -1140,6 +1139,7 @@ with_toolchain_path
 with_extra_path
 with_sdk_name
 with_conf_name
+with_output_base_dir
 with_output_sync
 with_default_make_target
 enable_headless_only
@@ -2059,6 +2059,7 @@ Optional Packages:
   --with-sdk-name         use the platform SDK of the given name. [macosx]
   --with-conf-name        use this as the name of the configuration [generated
                           from important configuration options]
+  --with-output-base-dir  override the default output base directory [./build]
   --with-output-sync      set make output sync type if supported by make.
                           [recurse]
   --with-default-make-target
@@ -3451,7 +3452,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 ac_aux_dir=
-for ac_dir in $TOPDIR/common/autoconf/build-aux "$srcdir"/$TOPDIR/common/autoconf/build-aux; do
+for ac_dir in $TOPDIR/make/autoconf/build-aux "$srcdir"/$TOPDIR/make/autoconf/build-aux; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -3467,7 +3468,7 @@ for ac_dir in $TOPDIR/common/autoconf/build-aux "$srcdir"/$TOPDIR/common/autocon
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $TOPDIR/common/autoconf/build-aux \"$srcdir\"/$TOPDIR/common/autoconf/build-aux" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $TOPDIR/make/autoconf/build-aux \"$srcdir\"/$TOPDIR/make/autoconf/build-aux" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -5161,7 +5162,7 @@ VS_SDK_PLATFORM_NAME_2013=
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1504441177
+DATE_WHEN_GENERATED=1505235832
 
 ###############################################################################
 #
@@ -16905,7 +16906,7 @@ $as_echo "$as_me: The path of TOPDIR, which resolves as \"$path\", is invalid."
 
 
   # Locate the directory of this script.
-  AUTOCONF_DIR=$TOPDIR/common/autoconf
+  AUTOCONF_DIR=$TOPDIR/make/autoconf
 
   # Setup username (for use in adhoc version strings etc)
   # Outer [ ] to quote m4.
@@ -17600,11 +17601,19 @@ if test "${with_conf_name+set}" = set; then :
 fi
 
 
+# Check whether --with-output-base-dir was given.
+if test "${with_output_base_dir+set}" = set; then :
+  withval=$with_output_base_dir;  OUTPUT_BASE=${with_output_base_dir}
+else
+   OUTPUT_BASE="$SRC_ROOT/build"
+fi
+
+
   # Test from where we are running configure, in or outside of src root.
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to store configuration" >&5
 $as_echo_n "checking where to store configuration... " >&6; }
   if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
-      || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
+      || test "x$CURDIR" = "x$SRC_ROOT/make/autoconf" \
       || test "x$CURDIR" = "x$SRC_ROOT/make" ; then
     # We are running configure from the src root.
     # Create a default ./build/target-variant-debuglevel output root.
@@ -17616,7 +17625,7 @@ $as_echo "in default location" >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: in build directory with custom name" >&5
 $as_echo "in build directory with custom name" >&6; }
     fi
-    OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
+    OUTPUT_ROOT="${OUTPUT_BASE}/${CONF_NAME}"
     $MKDIR -p "$OUTPUT_ROOT"
     if test ! -d "$OUTPUT_ROOT"; then
       as_fn_error $? "Could not create build directory $OUTPUT_ROOT" "$LINENO" 5
@@ -51890,11 +51899,11 @@ fi
   # Setup some hard coded includes
   COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
       -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
-      -I${JDK_TOPDIR}/src/java.base/share/native/include \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS/native/include \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_TYPE/native/include \
-      -I${JDK_TOPDIR}/src/java.base/share/native/libjava \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_TYPE/native/libjava"
+      -I${TOPDIR}/src/java.base/share/native/include \
+      -I${TOPDIR}/src/java.base/$OPENJDK_TARGET_OS/native/include \
+      -I${TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_TYPE/native/include \
+      -I${TOPDIR}/src/java.base/share/native/libjava \
+      -I${TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_TYPE/native/libjava"
 
   # The shared libraries are compiled using the picflag.
   CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK \
@@ -52769,11 +52778,11 @@ fi
   # Setup some hard coded includes
   OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK="$OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK \
       -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
-      -I${JDK_TOPDIR}/src/java.base/share/native/include \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_BUILD_OS/native/include \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_BUILD_OS_TYPE/native/include \
-      -I${JDK_TOPDIR}/src/java.base/share/native/libjava \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_BUILD_OS_TYPE/native/libjava"
+      -I${TOPDIR}/src/java.base/share/native/include \
+      -I${TOPDIR}/src/java.base/$OPENJDK_BUILD_OS/native/include \
+      -I${TOPDIR}/src/java.base/$OPENJDK_BUILD_OS_TYPE/native/include \
+      -I${TOPDIR}/src/java.base/share/native/libjava \
+      -I${TOPDIR}/src/java.base/$OPENJDK_BUILD_OS_TYPE/native/libjava"
 
   # The shared libraries are compiled using the picflag.
   OPENJDK_BUILD_CFLAGS_JDKLIB="$OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK \
@@ -54200,19 +54209,19 @@ $as_echo "no, forced" >&6; }
   if test "x$ENABLE_AOT" = "xtrue"; then
     # Only enable AOT on X64 platforms.
     if test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
-      if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then
-        if test -e "$HOTSPOT_TOPDIR/src/jdk.internal.vm.compiler"; then
+      if test -e "${TOPDIR}/src/jdk.aot"; then
+        if test -e "${TOPDIR}/src/jdk.internal.vm.compiler"; then
           ENABLE_AOT="true"
         else
           ENABLE_AOT="false"
           if test "x$enable_aot" = "xyes"; then
-            as_fn_error $? "Cannot build AOT without hotspot/src/jdk.internal.vm.compiler sources. Remove --enable-aot." "$LINENO" 5
+            as_fn_error $? "Cannot build AOT without src/jdk.internal.vm.compiler sources. Remove --enable-aot." "$LINENO" 5
           fi
         fi
       else
         ENABLE_AOT="false"
         if test "x$enable_aot" = "xyes"; then
-          as_fn_error $? "Cannot build AOT without hotspot/src/jdk.aot sources. Remove --enable-aot." "$LINENO" 5
+          as_fn_error $? "Cannot build AOT without src/jdk.aot sources. Remove --enable-aot." "$LINENO" 5
         fi
       fi
     else
@@ -54249,7 +54258,7 @@ if test "${enable_hotspot_gtest+set}" = set; then :
 fi
 
 
-  if test -e "$HOTSPOT_TOPDIR/test/native"; then
+  if test -e "${TOPDIR}/test/hotspot/gtest"; then
     GTEST_DIR_EXISTS="true"
   else
     GTEST_DIR_EXISTS="false"
@@ -54302,7 +54311,7 @@ $as_echo "no" >&6; }
   if test "x$OPENJDK_BUILD_OS" = xwindows; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath can be created" >&5
 $as_echo_n "checking if fixpath can be created... " >&6; }
-    FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
+    FIXPATH_SRC="$SRC_ROOT/make/src/native/fixpath.c"
     FIXPATH_BIN="$CONFIGURESUPPORT_OUTPUTDIR/bin/fixpath.exe"
     FIXPATH_DIR="$CONFIGURESUPPORT_OUTPUTDIR/fixpath"
     if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
@@ -65934,7 +65943,7 @@ fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5
 $as_echo_n "checking if elliptic curve crypto implementation is present... " >&6; }
 
-  if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then
+  if test -d "${TOPDIR}/src/jdk.crypto.ec/share/native/libsunec/impl"; then
     ENABLE_INTREE_EC=true
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }

make/autoconf/hotspot.m4

@@ -214,19 +214,19 @@ AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_AOT],
   if test "x$ENABLE_AOT" = "xtrue"; then
     # Only enable AOT on X64 platforms.
     if test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
-      if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then
-        if test -e "$HOTSPOT_TOPDIR/src/jdk.internal.vm.compiler"; then
+      if test -e "${TOPDIR}/src/jdk.aot"; then
+        if test -e "${TOPDIR}/src/jdk.internal.vm.compiler"; then
           ENABLE_AOT="true"
         else
           ENABLE_AOT="false"
           if test "x$enable_aot" = "xyes"; then
-            AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.internal.vm.compiler sources. Remove --enable-aot.])
+            AC_MSG_ERROR([Cannot build AOT without src/jdk.internal.vm.compiler sources. Remove --enable-aot.])
           fi
         fi
       else
         ENABLE_AOT="false"
         if test "x$enable_aot" = "xyes"; then
-          AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.aot sources. Remove --enable-aot.])
+          AC_MSG_ERROR([Cannot build AOT without src/jdk.aot sources. Remove --enable-aot.])
         fi
       fi
     else
@@ -488,7 +488,7 @@ AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_GTEST],
   AC_ARG_ENABLE([hotspot-gtest], [AS_HELP_STRING([--disable-hotspot-gtest],
       [Disables building of the Hotspot unit tests])])
 
-  if test -e "$HOTSPOT_TOPDIR/test/native"; then
+  if test -e "${TOPDIR}/test/hotspot/gtest"; then
     GTEST_DIR_EXISTS="true"
   else
     GTEST_DIR_EXISTS="false"

make/autoconf/jdk-options.m4

@@ -258,7 +258,7 @@ AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
 [
   AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
 
-  if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then
+  if test -d "${TOPDIR}/src/jdk.crypto.ec/share/native/libsunec/impl"; then
     ENABLE_INTREE_EC=true
     AC_MSG_RESULT([yes])
   else

make/autoconf/source-dirs.m4

@@ -39,7 +39,7 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_TOPDIRS],
   AC_SUBST(JAXWS_TOPDIR)
   AC_SUBST(HOTSPOT_TOPDIR)
   AC_SUBST(NASHORN_TOPDIR)
-  AC_SUBST(JDK_TOPDIR)
+  AC_SUBST(TOPDIR)
 ])
 
 AC_DEFUN_ONCE([SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS],

make/autoconf/spec.gmk.in

@@ -857,6 +857,8 @@ JRE_SYMBOLS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JRE_SYMBOLS_BUNDLE_NAME)
 TEST_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
 DOCS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(DOCS_BUNDLE_NAME)
 
+CONFIGURE_CMD := $(TOPDIR)/configure
+
 # This macro is called to allow inclusion of closed source counterparts.
 # Unless overridden in closed sources, it expands to nothing.
 # Usage: This function is called in an open makefile, with the following

make/common/JavaCompilation.gmk

@@ -124,7 +124,7 @@ define add_file_to_clean
 	export LC_ALL=C ; ( $(CAT) $$< && $(ECHO) "" ) \
 	    | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' \
 	        -e 's/\([^\\]\)!/\1\\!/g' -e 's/^[ 	]*#.*/#/g' \
-	    | $(SED) -f "$(SRC_ROOT)/make/common/support/unicode2x.sed" \
+	    | $(SED) -f "$(TOPDIR)/make/common/support/unicode2x.sed" \
 	    | $(SED) -e '/^#/d' -e '/^$$$$/d' \
 	        -e :a -e '/\\$$$$/N; s/\\\n//; ta' \
 	        -e 's/^[ 	]*//;s/[ 	]*$$$$//' \

make/common/MakeBase.gmk

@@ -152,18 +152,18 @@ ifeq ($(HAS_FILE_FUNCTION), true)
 else # HAS_FILE_FUNCTION = false
 
   $(eval compress_paths = \
-      $(strip $(shell $(CAT) $(SRC_ROOT)/make/common/support/ListPathsSafely-pre-compress.incl)))
+      $(strip $(shell $(CAT) $(TOPDIR)/make/common/support/ListPathsSafely-pre-compress.incl)))
   compress_paths += \
-      $(subst $(SRC_ROOT),X97, \
+      $(subst $(TOPDIR),X97, \
       $(subst $(OUTPUT_ROOT),X98, \
       $(subst X,X00, \
       $(subst $(SPACE),\n,$(strip $1)))))
   $(eval compress_paths += \
-      $(strip $(shell $(CAT) $(SRC_ROOT)/make/common/support/ListPathsSafely-post-compress.incl)))
+      $(strip $(shell $(CAT) $(TOPDIR)/make/common/support/ListPathsSafely-post-compress.incl)))
 
-  decompress_paths=$(SED) -f $(SRC_ROOT)/make/common/support/ListPathsSafely-uncompress.sed \
+  decompress_paths=$(SED) -f $(TOPDIR)/make/common/support/ListPathsSafely-uncompress.sed \
       -e 's|X99|\\n|g' \
-      -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
+      -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(TOPDIR)|g' \
       -e 's|X00|X|g'
 
   ListPathsSafely_IfPrintf = \
@@ -344,24 +344,24 @@ SOURCE_REVISION_TRACKER := $(SUPPORT_OUTPUTDIR)/src-rev/source-revision-tracker
 
 # Locate all hg repositories included in the forest, as absolute paths
 FindAllReposAbs = \
-    $(strip $(sort $(dir $(filter-out $(SRC_ROOT)/build/%, $(wildcard \
-        $(addprefix $(SRC_ROOT)/, .hg */.hg */*/.hg */*/*/.hg) \
+    $(strip $(sort $(dir $(filter-out $(TOPDIR)/build/%, $(wildcard \
+        $(addprefix $(TOPDIR)/, .hg */.hg */*/.hg */*/*/.hg */*/*/*/.hg) \
     )))))
 
 # Locate all hg repositories included in the forest, as relative paths
 FindAllReposRel = \
-    $(strip $(subst $(SRC_ROOT)/,.,$(patsubst $(SRC_ROOT)/%/, %, $(FindAllReposAbs))))
+    $(strip $(subst $(TOPDIR)/,.,$(patsubst $(TOPDIR)/%/, %, $(FindAllReposAbs))))
 
 ################################################################################
 
 define SetupLogging
   ifeq ($$(LOG_PROFILE_TIMES_FILE), true)
     ifeq ($$(IS_GNU_TIME), yes)
-      SHELL :=  $$(BASH) $$(SRC_ROOT)/common/bin/shell-profiler.sh \
+      SHELL :=  $$(BASH) $$(TOPDIR)/make/scripts/shell-profiler.sh \
                 gnutime $$(TIME) \
                 $$(OUTPUT_ROOT)/build-profile.log $$(SHELL)
     else ifneq ($$(FLOCK), )
-      SHELL :=  $$(BASH) $$(SRC_ROOT)/common/bin/shell-profiler.sh \
+      SHELL :=  $$(BASH) $$(TOPDIR)/make/scripts/shell-profiler.sh \
                 flock $$(FLOCK) \
                 $$(OUTPUT_ROOT)/build-profile.log $$(SHELL)
     endif
@@ -874,7 +874,7 @@ endif
 # Defines the sub directory structure to store variable value file in
 DependOnVariableDirName = \
     $(strip $(addsuffix $(if $(MODULE),/$(MODULE)), \
-        $(subst $(SRC_ROOT)/,, $(if $(filter /%, $(firstword $(MAKEFILE_LIST))), \
+        $(subst $(TOPDIR)/,, $(if $(filter /%, $(firstword $(MAKEFILE_LIST))), \
           $(firstword $(MAKEFILE_LIST)), \
           $(CURDIR)/$(firstword $(MAKEFILE_LIST))))))
 

make/common/Modules.gmk

@@ -187,6 +187,23 @@ DOCS_MODULES += \
 # before building the real images.
 INTERIM_IMAGE_MODULES := java.base java.logging
 
+LANGTOOLS_MODULES := \
+    java.compiler \
+    jdk.compiler \
+    jdk.javadoc \
+    jdk.jdeps \
+    jdk.jshell \
+    #
+
+CORBA_MODULES := java.corba
+
+HOTSPOT_MODULES := \
+    jdk.aot \
+    jdk.hotspot.agent \
+    jdk.internal.vm.ci \
+    jdk.internal.vm.compiler \
+    #
+
 ################################################################################
 # Some platforms don't have the serviceability agent
 
@@ -218,13 +235,7 @@ GENERATED_SRC_DIRS += \
     #
 
 TOP_SRC_DIRS += \
-    $(CORBA_TOPDIR)/src \
-    $(HOTSPOT_TOPDIR)/src \
-    $(JDK_TOPDIR)/src \
-    $(LANGTOOLS_TOPDIR)/src \
-    $(JAXP_TOPDIR)/src \
-    $(JAXWS_TOPDIR)/src \
-    $(NASHORN_TOPDIR)/src \
+    $(TOPDIR)/src \
     #
 
 SRC_SUBDIRS += $(OPENJDK_TARGET_OS)/classes

make/common/NativeCompilation.gmk

@@ -510,8 +510,8 @@ define SetupNativeCompilationBody
   $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),, \
       $$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
 
-  # Find all files in the source trees. Sort to remove duplicates.
-  $1_SRCS := $$(sort $$(call CacheFind,$$($1_SRC)))
+  # Find all files in the source trees. Preserve order.
+  $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), )

make/conf/jib-profiles.js

@@ -1287,7 +1287,7 @@ var getVersionNumbers = function () {
     // Read version information from common/autoconf/version-numbers
     if (version_numbers == null) {
         version_numbers = new java.util.Properties();
-        var stream = new java.io.FileInputStream(__DIR__ + "/../../common/autoconf/version-numbers");
+        var stream = new java.io.FileInputStream(__DIR__ + "/../autoconf/version-numbers");
         version_numbers.load(stream);
         stream.close();
     }

make/copy/Copy-java.base.gmk

@@ -25,7 +25,7 @@
 
 include CopyCommon.gmk
 
-$(eval $(call IncludeCustomExtension, jdk, copy/Copy-java.base.gmk))
+$(eval $(call IncludeCustomExtension, , copy/Copy-java.base.gmk))
 
 ################################################################################
 #
@@ -38,18 +38,18 @@ TARGETS += \
     $(INCLUDE_DST_OS_DIR)/jni_md.h \
     #
 
-$(INCLUDE_DST_DIR)/%.h: $(JDK_TOPDIR)/src/java.base/share/native/include/%.h
+$(INCLUDE_DST_DIR)/%.h: $(TOPDIR)/src/java.base/share/native/include/%.h
 	$(call install-file)
 
 $(INCLUDE_DST_OS_DIR)/%.h: \
-    $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include/%.h
+    $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include/%.h
 	$(call install-file)
 
 ################################################################################
 
 ifneq ($(findstring $(OPENJDK_TARGET_OS), windows aix),)
 
-  TZMAPPINGS_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/conf
+  TZMAPPINGS_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/conf
 
   $(LIB_DST_DIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings
 	$(call install-file)
@@ -94,9 +94,9 @@ else
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
-  JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/macosx/conf/$(JVMCFG_ARCH)/jvm.cfg
+  JVMCFG_SRC := $(TOPDIR)/src/java.base/macosx/conf/$(JVMCFG_ARCH)/jvm.cfg
 else
-  JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/$(JVMCFG_ARCH)/jvm.cfg
+  JVMCFG_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/$(JVMCFG_ARCH)/jvm.cfg
   # Allow override by ALT_JVMCFG_SRC if it exists
   JVMCFG_SRC := $(if $(wildcard $(ALT_JVMCFG_SRC)),$(ALT_JVMCFG_SRC),$(JVMCFG_SRC))
 endif
@@ -161,7 +161,7 @@ TARGETS += $(JVMCFG)
 
 ################################################################################
 
-POLICY_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.policy
+POLICY_SRC := $(TOPDIR)/src/java.base/share/conf/security/java.policy
 POLICY_DST := $(CONF_DST_DIR)/security/java.policy
 
 POLICY_SRC_LIST := $(POLICY_SRC)
@@ -176,14 +176,14 @@ TARGETS += $(POLICY_DST)
 
 ################################################################################
 
-DEF_POLICY_SRC := $(JDK_TOPDIR)/src/java.base/share/lib/security/default.policy
+DEF_POLICY_SRC := $(TOPDIR)/src/java.base/share/lib/security/default.policy
 DEF_POLICY_DST := $(LIB_DST_DIR)/security/default.policy
 
 DEF_POLICY_SRC_LIST := $(DEF_POLICY_SRC)
 DEF_POLICY_SRC_LIST += $(CUSTOM_POLICY_SRC_LIST)
 
 ifneq ($(filter $(OPENJDK_TARGET_OS), windows solaris), )
-  DEF_POLICY_SRC_LIST += $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/lib/security/default.policy
+  DEF_POLICY_SRC_LIST += $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/lib/security/default.policy
 endif
 
 # Allow imported modules to modify the java.policy
@@ -202,7 +202,7 @@ TARGETS += $(DEF_POLICY_DST)
 ################################################################################
 
 ifeq ($(CACERTS_FILE), )
-  CACERTS_FILE := $(JDK_TOPDIR)/src/java.base/share/lib/security/cacerts
+  CACERTS_FILE := $(TOPDIR)/src/java.base/share/lib/security/cacerts
 endif
 
 CACERTS_DST := $(LIB_DST_DIR)/security/cacerts
@@ -216,7 +216,7 @@ TARGETS += $(CACERTS_DST)
 ################################################################################
 
 $(eval $(call SetupCopyFiles, COPY_NET_PROPERTIES, \
-    FILES := $(JDK_TOPDIR)/src/java.base/share/conf/net.properties, \
+    FILES := $(TOPDIR)/src/java.base/share/conf/net.properties, \
     DEST := $(CONF_DST_DIR), \
 ))
 
@@ -224,7 +224,7 @@ TARGETS += $(COPY_NET_PROPERTIES)
 
 ifeq ($(OPENJDK_TARGET_OS), solaris)
   $(eval $(call SetupCopyFiles, COPY_SDP_CONF, \
-      FILES := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template, \
+      FILES := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template, \
       DEST := $(CONF_DST_DIR)/sdp, \
   ))
 

make/copy/Copy-java.corba.gmk

@@ -26,9 +26,9 @@
 ################################################################################
 # Copy idl files to jdk/lib.
 $(eval $(call SetupCopyFiles,COPY_IDL, \
-    SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl, \
+    SRC := $(TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl, \
     DEST := $(SUPPORT_OUTPUTDIR)/modules_include/$(MODULE), \
-    FILES := $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl/orb.idl \
-        $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ir.idl))
+    FILES := $(TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl/orb.idl \
+        $(TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ir.idl))
 
 TARGETS := $(COPY_IDL)

make/copy/Copy-java.desktop.gmk

@@ -25,7 +25,7 @@
 
 include CopyCommon.gmk
 
-$(eval $(call IncludeCustomExtension, jdk, copy/Copy-java.desktop.gmk))
+$(eval $(call IncludeCustomExtension, , copy/Copy-java.desktop.gmk))
 
 ################################################################################
 
@@ -34,11 +34,11 @@ TARGETS += \
     $(INCLUDE_DST_OS_DIR)/jawt_md.h \
     #
 
-$(INCLUDE_DST_DIR)/%.h: $(JDK_TOPDIR)/src/java.desktop/share/native/include/%.h
+$(INCLUDE_DST_DIR)/%.h: $(TOPDIR)/src/java.desktop/share/native/include/%.h
 	$(call install-file)
 
 $(INCLUDE_DST_OS_DIR)/%.h: \
-    $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include/%.h
+    $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include/%.h
 	$(call install-file)
 
 ################################################################################
@@ -88,7 +88,7 @@ endif
 
 ################################################################################
 
-$(CONF_DST_DIR)/sound.properties: $(JDK_TOPDIR)/src/java.desktop/share/conf/sound.properties
+$(CONF_DST_DIR)/sound.properties: $(TOPDIR)/src/java.desktop/share/conf/sound.properties
 	$(call install-file)
 
 TARGETS += $(CONF_DST_DIR)/sound.properties
@@ -97,7 +97,7 @@ TARGETS += $(CONF_DST_DIR)/sound.properties
 #
 # Copy property files from sun/print to LIB_DST_DIR
 #
-PSFONTPROPFILE_SRC_DIR := $(JDK_TOPDIR)/src/java.desktop/share/conf
+PSFONTPROPFILE_SRC_DIR := $(TOPDIR)/src/java.desktop/share/conf
 PSFONTPROPFILE_SRCS := $(wildcard $(PSFONTPROPFILE_SRC_DIR)/psfont*.properties*)
 PSFONTPROPFILE_TARGET_FILES := $(subst $(PSFONTPROPFILE_SRC_DIR),$(LIB_DST_DIR),$(PSFONTPROPFILE_SRCS))
 

make/copy/Copy-java.logging.gmk

@@ -27,7 +27,7 @@ include CopyCommon.gmk
 
 ################################################################################
 
-LOGGING_LIB_SRC := $(JDK_TOPDIR)/src/java.logging/share/conf
+LOGGING_LIB_SRC := $(TOPDIR)/src/java.logging/share/conf
 
 $(CONF_DST_DIR)/logging.properties: $(LOGGING_LIB_SRC)/logging.properties
 	$(call install-file)

make/copy/Copy-jdk.accessibility.gmk

@@ -33,7 +33,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
       $(INCLUDE_DST_OS_DIR)/bridge/AccessBridgePackages.h
 
   $(INCLUDE_DST_OS_DIR)/bridge/%: \
-      $(JDK_TOPDIR)/src/jdk.accessibility/windows/native/include/bridge/%
+      $(TOPDIR)/src/jdk.accessibility/windows/native/include/bridge/%
 		$(install-file)
 
 endif

make/copy/Copy-jdk.crypto.cryptoki.gmk

@@ -30,7 +30,7 @@ include CopyCommon.gmk
 ifeq ($(OPENJDK_TARGET_OS), solaris)
 
   SUNPKCS11_CFG_SRC := \
-      $(JDK_TOPDIR)/src/jdk.crypto.cryptoki/solaris/conf/security/sunpkcs11-solaris.cfg
+      $(TOPDIR)/src/jdk.crypto.cryptoki/solaris/conf/security/sunpkcs11-solaris.cfg
   SUNPKCS11_CFG_DST := $(CONF_DST_DIR)/security/sunpkcs11-solaris.cfg
 
   $(SUNPKCS11_CFG_DST): $(SUNPKCS11_CFG_SRC)

make/copy/Copy-jdk.crypto.ucrypto.gmk

@@ -29,7 +29,7 @@ include CopyCommon.gmk
 
 ifeq ($(OPENJDK_TARGET_OS), solaris)
 
-  UCRYPTO_CFG_SRC := $(JDK_TOPDIR)/src/jdk.crypto.ucrypto/solaris/conf/security/ucrypto-solaris.cfg
+  UCRYPTO_CFG_SRC := $(TOPDIR)/src/jdk.crypto.ucrypto/solaris/conf/security/ucrypto-solaris.cfg
   UCRYPTO_CFG_DST := $(CONF_DST_DIR)/security/ucrypto-solaris.cfg
 
   $(UCRYPTO_CFG_DST): $(UCRYPTO_CFG_SRC)

make/copy/Copy-jdk.jdwp.agent.gmk

@@ -29,7 +29,7 @@ include CopyCommon.gmk
 
 TARGETS := $(INCLUDE_DST_DIR)/jdwpTransport.h
 
-$(INCLUDE_DST_DIR)/%.h: $(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/include/%.h
+$(INCLUDE_DST_DIR)/%.h: $(TOPDIR)/src/jdk.jdwp.agent/share/native/include/%.h
 	$(call install-file)
 
 ################################################################################

make/copy/Copy-jdk.management.agent.gmk

@@ -28,7 +28,7 @@ include CopyCommon.gmk
 ################################################################################
 
 MGMT_CONF_DIR := $(CONF_DST_DIR)/management
-MGMT_CONF_SRC := $(JDK_TOPDIR)/src/jdk.management.agent/share/conf
+MGMT_CONF_SRC := $(TOPDIR)/src/jdk.management.agent/share/conf
 MGMT_SRC_FILES := $(wildcard $(MGMT_CONF_SRC)/*)
 MGMT_TARGET_FILES := $(subst $(MGMT_CONF_SRC),$(MGMT_CONF_DIR),$(MGMT_SRC_FILES))
 

make/gendata/Gendata-java.base.gmk

@@ -26,7 +26,7 @@
 include GendataCommon.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, gendata/Gendata-java.base.gmk))
+$(eval $(call IncludeCustomExtension, , gendata/Gendata-java.base.gmk))
 
 include GendataBreakIterator.gmk
 
@@ -40,7 +40,7 @@ include GendataCryptoPolicy.gmk
 
 GENDATA_UNINAME := $(JDK_OUTPUTDIR)/modules/java.base/java/lang/uniName.dat
 
-$(GENDATA_UNINAME): $(JDK_TOPDIR)/make/data/unicodedata/UnicodeData.txt $(BUILD_TOOLS_JDK)
+$(GENDATA_UNINAME): $(TOPDIR)/make/data/unicodedata/UnicodeData.txt $(BUILD_TOOLS_JDK)
 	$(call MakeDir, $(@D))
 	$(TOOL_CHARACTERNAME) $< $@
 
@@ -50,7 +50,7 @@ TARGETS += $(GENDATA_UNINAME)
 
 GENDATA_CURDATA := $(JDK_OUTPUTDIR)/modules/java.base/java/util/currency.data
 
-$(GENDATA_CURDATA): $(JDK_TOPDIR)/make/data/currency/CurrencyData.properties $(BUILD_TOOLS_JDK)
+$(GENDATA_CURDATA): $(TOPDIR)/make/data/currency/CurrencyData.properties $(BUILD_TOOLS_JDK)
 	$(call MakeDir, $(@D))
 	$(RM) $@
 	$(TOOL_GENERATECURRENCYDATA) -o $@.tmp < $<
@@ -61,7 +61,7 @@ TARGETS += $(GENDATA_CURDATA)
 
 ################################################################################
 
-GENDATA_JAVA_SECURITY_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.security
+GENDATA_JAVA_SECURITY_SRC := $(TOPDIR)/src/java.base/share/conf/security/java.security
 GENDATA_JAVA_SECURITY := $(SUPPORT_OUTPUTDIR)/modules_conf/java.base/security/java.security
 
 ifeq ($(UNLIMITED_CRYPTO), true)

make/gendata/Gendata-jdk.compiler.gmk

@@ -39,11 +39,11 @@ CT_MODULES := $(DOCS_MODULES)
 # Get the complete module source path:
 CT_MODULESOURCEPATH := $(call GetModuleSrcPath)
 
-CT_DATA_DESCRIPTION ?= $(LANGTOOLS_TOPDIR)/make/data/symbols/symbols
+CT_DATA_DESCRIPTION ?= $(TOPDIR)/make/data/symbols/symbols
 
 $(eval $(call SetupJavaCompilation, COMPILE_CREATE_SYMBOLS, \
     SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(LANGTOOLS_TOPDIR)/make/src/classes, \
+    SRC := $(TOPDIR)/make/langtools/src/classes, \
     INCLUDES := build/tools/symbolgenerator, \
     ADD_JAVAC_FLAGS := -Xbootclasspath/p:"$(INTERIM_LANGTOOLS_JAR)", \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/create_symbols, \
@@ -60,7 +60,7 @@ endif
 
 $(SUPPORT_OUTPUTDIR)/symbols/ct.sym-files/_the.symbols: \
     $(COMPILE_CREATE_SYMBOLS) \
-    $(wildcard $(LANGTOOLS_TOPDIR)/make/data/symbols/*) \
+    $(wildcard $(TOPDIR)/make/data/symbols/*) \
     $(MODULE_INFOS)
 	$(RM) -r $(@D)
 	$(MKDIR) -p $(@D)

make/gendata/GendataBlacklistedCerts.gmk

@@ -23,9 +23,9 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, jdk, gendata/GendataBlacklistedCerts.gmk))
+$(eval $(call IncludeCustomExtension, , gendata/GendataBlacklistedCerts.gmk))
 
-GENDATA_BLACKLISTED_CERTS_SRC += $(JDK_TOPDIR)/make/data/blacklistedcertsconverter/blacklisted.certs.pem
+GENDATA_BLACKLISTED_CERTS_SRC += $(TOPDIR)/make/data/blacklistedcertsconverter/blacklisted.certs.pem
 GENDATA_BLACKLISTED_CERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/security/blacklisted.certs
 
 $(GENDATA_BLACKLISTED_CERTS): $(BUILD_TOOLS) $(GENDATA_BLACKLISTED_CERTS_SRC)

make/gendata/GendataBreakIterator.gmk

@@ -46,7 +46,7 @@ BREAK_ITERATOR_CLASSES := $(BUILDTOOLS_OUTPUTDIR)/break_iterator_classes
 # These two files should be moved out to a build tool!
 $(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR_BASE, \
     SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
+    SRC := $(TOPDIR)/src/java.base/share/classes, \
     INCLUDE_FILES := \
         $(TEXT_PKG)/BreakIteratorRules.java \
         $(TEXT_PKG)/BreakIteratorInfo.java, \
@@ -54,7 +54,7 @@ $(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR_BASE, \
 
 $(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR_LD, \
     SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(JDK_TOPDIR)/src/jdk.localedata/share/classes, \
+    SRC := $(TOPDIR)/src/jdk.localedata/share/classes, \
     INCLUDE_FILES := \
         $(TEXT_PKG_LD)/BreakIteratorRules_th.java \
         $(TEXT_PKG_LD)/BreakIteratorInfo_th.java, \
@@ -76,7 +76,7 @@ endif
 
 # Generate data resource files.
 # input
-UNICODEDATA := $(JDK_TOPDIR)/make/data/unicodedata/UnicodeData.txt
+UNICODEDATA := $(TOPDIR)/make/data/unicodedata/UnicodeData.txt
 
 # output
 BASE_DATA_PKG_DIR := $(JDK_OUTPUTDIR)/modules/java.base/sun/text/resources

make/gendata/GendataCommon.gmk

@@ -26,5 +26,5 @@
 include JavaCompilation.gmk
 include SetupJavaCompilers.gmk
 # We need the tools.
-include Tools.gmk
+include ToolsJdk.gmk
 

make/gendata/GendataCryptoPolicy.gmk

@@ -48,7 +48,7 @@ POLICY_DIR := $(SUPPORT_OUTPUTDIR)/modules_conf/java.base/security/policy
 LIMITED_POLICY_DIR := $(POLICY_DIR)/limited
 UNLIMITED_POLICY_DIR := $(POLICY_DIR)/unlimited
 
-POLICY_SRC_DIR := $(JDK_TOPDIR)/src/java.base/share/conf/security/policy
+POLICY_SRC_DIR := $(TOPDIR)/src/java.base/share/conf/security/policy
 LIMITED_POLICY_SRC_DIR := $(POLICY_SRC_DIR)/limited
 UNLIMITED_POLICY_SRC_DIR := $(POLICY_SRC_DIR)/unlimited
 

make/gendata/GendataFontConfig.gmk

@@ -23,11 +23,11 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, jdk, gendata/GendataFontConfig.gmk))
+$(eval $(call IncludeCustomExtension, , gendata/GendataFontConfig.gmk))
 
 GENDATA_FONT_CONFIG_DST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)
 
-GENDATA_FONT_CONFIG_DATA_DIR ?= $(JDK_TOPDIR)/make/data/fontconfig
+GENDATA_FONT_CONFIG_DATA_DIR ?= $(TOPDIR)/make/data/fontconfig
 
 GENDATA_FONT_CONFIG_SRC_FILES := \
     $(wildcard $(GENDATA_FONT_CONFIG_DATA_DIR)/$(OPENJDK_TARGET_OS).*)

make/gendata/GendataTZDB.gmk

@@ -28,7 +28,7 @@ GENDATA_TZDB :=
 #
 # Time zone data file creation
 #
-TZDATA_DIR := $(JDK_TOPDIR)/make/data/tzdata
+TZDATA_DIR := $(TOPDIR)/make/data/tzdata
 TZDATA_TZFILE := africa antarctica asia australasia europe northamerica pacificnew southamerica backward etcetera gmt jdk11_backward
 TZDATA_TZFILES := $(addprefix $(TZDATA_DIR)/,$(TZDATA_TZFILE))
 

make/gensrc/Gensrc-java.base.gmk

@@ -23,7 +23,7 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 include GensrcLocaleData.gmk
 include GensrcCLDR.gmk
@@ -41,12 +41,12 @@ include GensrcModuleLoaderMap.gmk
 include GensrcProperties.gmk
 
 $(eval $(call SetupCompileProperties, LIST_RESOURCE_BUNDLE, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/java.base/share/classes/sun/launcher/resources, \
+    SRC_DIRS := $(TOPDIR)/src/java.base/share/classes/sun/launcher/resources, \
     CLASS := ListResourceBundle, \
 ))
 
 $(eval $(call SetupCompileProperties, SUN_UTIL, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/resources, \
+    SRC_DIRS := $(TOPDIR)/src/java.base/share/classes/sun/util/resources, \
     CLASS := sun.util.resources.LocaleNamesBundle, \
 ))
 
@@ -55,7 +55,7 @@ GENSRC_JAVA_BASE += $(LIST_RESOURCE_BUNDLE) $(SUN_UTIL)
 # Some resources bundles are already present as java files but still need to be
 # copied to zh_HK locale.
 $(eval $(call SetupCopy-zh_HK,COPY_ZH_HK, \
-    $(addprefix $(JDK_TOPDIR)/src/java.base/share/classes/, \
+    $(addprefix $(TOPDIR)/src/java.base/share/classes/, \
         sun/security/util/AuthResources_zh_TW.java \
         sun/security/util/Resources_zh_TW.java)))
 
@@ -65,7 +65,7 @@ GENSRC_JAVA_BASE += $(COPY_ZH_HK)
 
 GENSRC_LSREQUIVMAPS := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/LocaleEquivalentMaps.java
 
-$(GENSRC_LSREQUIVMAPS): $(JDK_TOPDIR)/make/data/lsrdata/language-subtag-registry.txt $(BUILD_TOOLS_JDK)
+$(GENSRC_LSREQUIVMAPS): $(TOPDIR)/make/data/lsrdata/language-subtag-registry.txt $(BUILD_TOOLS_JDK)
 	$(call MakeDir, $(@D))
 	$(TOOL_GENERATELSREQUIVMAPS) $< $@
 

make/gensrc/Gensrc-java.corba.gmk

@@ -35,7 +35,7 @@ include SetupJavaCompilers.gmk
 
 $(eval $(call SetupJavaCompilation,BUILD_TOOLS_CORBA, \
     SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(CORBA_TOPDIR)/make/src/classes, \
+    SRC := $(TOPDIR)/make/corba/src/classes, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/corba_tools_classes))
 
 TOOL_LOGUTIL_CMD := $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/corba_tools_classes \
@@ -43,7 +43,7 @@ TOOL_LOGUTIL_CMD := $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/corba_tools_classe
 
 $(eval $(call SetupJavaCompilation,BUILD_IDLJ, \
     SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes, \
+    SRC := $(TOPDIR)/src/java.corba/share/classes, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/idlj_classes, \
     COPY := .prp, \
     INCLUDES := com/sun/tools/corba/se/idl, \
@@ -60,7 +60,7 @@ LOGWRAPPER_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.corba/_logwrappers
 
 # Generate LogWrapper classes
 $(EXCEPTION_DIR)/%SystemException.java: \
-    $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
+    $(TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
     $(BUILD_TOOLS_CORBA)
 	$(call LogInfo, Generating class file from $*.mc)
 	$(call MakeDir, $(@D))
@@ -83,7 +83,7 @@ $(EXCEPTION_DIR)/LogStrings.properties: \
 
 # The resources files are generated from lisp-like .mc files.
 $(LOGWRAPPER_DIR)/%SystemException.resource: \
-    $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
+    $(TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
     $(BUILD_TOOLS_CORBA)
 	$(call LogInfo, Generating resource file from $*.mc)
 	$(call MakeDir, $(@D))
@@ -216,7 +216,7 @@ IDL_DELETES := \
 
 $(eval $(call SetupIdlCompilation,BUILD_IDLS, \
     IDLJ := $(TOOL_IDLJ_CMD), \
-    SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes, \
+    SRC := $(TOPDIR)/src/java.corba/share/classes, \
     BIN := $(SUPPORT_OUTPUTDIR)/gensrc/java.corba, \
     EXCLUDES := com/sun/tools/corba/se/idl/% \
         org/omg/CORBA/% \
@@ -233,7 +233,7 @@ $(BUILD_IDLS): $(BUILD_IDLJ)
 # zh_HK is just a copy of zh_TW
 
 $(SUPPORT_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties: \
-    $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties
+    $(TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties
 	$(install-file)
 
 ################################################################################

make/gensrc/Gensrc-java.desktop.gmk

@@ -23,10 +23,10 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, gensrc/Gensrc-java.desktop.gmk))
+$(eval $(call IncludeCustomExtension, , gensrc/Gensrc-java.desktop.gmk))
 
 ifneq ($(OPENJDK_TARGET_OS), windows)
   include GensrcIcons.gmk
@@ -43,29 +43,29 @@ include GensrcSwing.gmk
 include GensrcProperties.gmk
 
 PROP_SRC_DIRS := \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/sun/awt/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/accessibility/internal/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/sun/print/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/sun/awt/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/accessibility/internal/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/sun/print/resources \
     #
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   PROP_SRC_DIRS += \
-      $(JDK_TOPDIR)/src/java.desktop/macosx/classes/com/apple/laf/resources \
-      $(JDK_TOPDIR)/src/java.desktop/macosx/classes/sun/awt/resources \
+      $(TOPDIR)/src/java.desktop/macosx/classes/com/apple/laf/resources \
+      $(TOPDIR)/src/java.desktop/macosx/classes/sun/awt/resources \
       #
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
-  PROP_SRC_DIRS += $(JDK_TOPDIR)/src/java.desktop/windows/classes/sun/awt/windows
+  PROP_SRC_DIRS += $(TOPDIR)/src/java.desktop/windows/classes/sun/awt/windows
 endif
 
 ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx), )
-  PROP_SRC_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources
+  PROP_SRC_DIRS += $(TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources
 endif
 
 $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
@@ -79,7 +79,7 @@ GENSRC_JAVA_DESKTOP += $(COMPILE_PROPERTIES)
 # Some resources bundles are already present as java files but still need to be
 # copied to zh_HK locale.
 $(eval $(call SetupCopy-zh_HK,COPY_ZH_HK, \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java))
+    $(TOPDIR)/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java))
 
 GENSRC_JAVA_DESKTOP += $(COPY_ZH_HK)
 

make/gensrc/Gensrc-java.logging.gmk

@@ -23,14 +23,14 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 ################################################################################
 
 include GensrcProperties.gmk
 
 $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/java.logging/share/classes/sun/util/logging/resources, \
+    SRC_DIRS := $(TOPDIR)/src/java.logging/share/classes/sun/util/logging/resources, \
     CLASS := ListResourceBundle, \
 ))
 

make/gensrc/Gensrc-jdk.charsets.gmk

@@ -23,23 +23,23 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 ################################################################################
 #
 # Generate files using the charsetmapping tool
 #
-CHARSET_DATA_DIR := $(JDK_TOPDIR)/make/data/charsetmapping
+CHARSET_DATA_DIR := $(TOPDIR)/make/data/charsetmapping
 
 CHARSET_GENSRC_JAVA_DIR_CS := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.charsets/sun/nio/cs/ext
 CHARSET_DONE_CS := $(CHARSET_GENSRC_JAVA_DIR_CS)/_the.charsetmapping
-CHARSET_COPYRIGHT_HEADER := $(JDK_TOPDIR)/make/src/classes/build/tools/charsetmapping
+CHARSET_COPYRIGHT_HEADER := $(TOPDIR)/make/jdk/src/classes/build/tools/charsetmapping
 CHARSET_TEMPLATES := \
     $(CHARSET_DATA_DIR)/SingleByte-X.java.template \
     $(CHARSET_DATA_DIR)/DoubleByte-X.java.template
 CHARSET_EXTENDED_JAVA_TEMPLATES := \
-    $(JDK_TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template
-CHARSET_EXTENDED_JAVA_DIR := $(JDK_TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext
+    $(TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template
+CHARSET_EXTENDED_JAVA_DIR := $(TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext
 CHARSET_STANDARD_OS := stdcs-$(OPENJDK_TARGET_OS)
 
 $(CHARSET_DONE_CS)-extcs: $(CHARSET_DATA_DIR)/charsets \

make/gensrc/Gensrc-jdk.compiler.gmk

@@ -23,7 +23,7 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonLangtools.gmk
 
 $(eval $(call SetupVersionProperties,JAVAC_VERSION, \
     com/sun/tools/javac/resources/version.properties))

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

@@ -28,10 +28,10 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
-$(eval $(call IncludeCustomExtension, hotspot, gensrc/Gensrc-jdk.internal.vm.compiler.gmk))
+$(eval $(call IncludeCustomExtension, , gensrc/Gensrc-jdk.internal.vm.compiler.gmk))
 
 GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)
-SRC_DIR := $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes
+SRC_DIR := $(TOPDIR)/src/$(MODULE)/share/classes
 
 ################################################################################
 

make/gensrc/Gensrc-jdk.jartool.gmk

@@ -23,14 +23,14 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 ################################################################################
 
 include GensrcProperties.gmk
 
 $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/jdk.jartool/share/classes/sun/tools/jar/resources, \
+    SRC_DIRS := $(TOPDIR)/src/jdk.jartool/share/classes/sun/tools/jar/resources, \
     CLASS := ListResourceBundle, \
 ))
 

make/gensrc/Gensrc-jdk.javadoc.gmk

@@ -23,7 +23,7 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonLangtools.gmk
 
 $(eval $(call SetupVersionProperties,OLD_JAVADOC_VERSION,\
     com/sun/tools/javadoc/resources/version.properties))

make/gensrc/Gensrc-jdk.jdeps.gmk

@@ -23,7 +23,7 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonLangtools.gmk
 
 $(eval $(call SetupVersionProperties,JAVAP_VERSION, \
     com/sun/tools/javap/resources/version.properties))

make/gensrc/Gensrc-jdk.jdi.gmk

@@ -23,13 +23,13 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 ################################################################################
 # Translate the Java debugger wire protocol (jdwp.spec) file into a JDWP.java file
 # and a JDWPCommands.h C-header file.
 
-JDWP_SPEC_FILE := $(JDK_TOPDIR)/make/data/jdwp/jdwp.spec
+JDWP_SPEC_FILE := $(TOPDIR)/make/data/jdwp/jdwp.spec
 HEADER_FILE := $(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent/JDWPCommands.h
 JAVA_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/com/sun/tools/jdi/JDWP.java
 
@@ -64,7 +64,7 @@ GENSRC_JDK_JDI += $(GENSRC_JDWP)
 include GensrcProperties.gmk
 
 $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources, \
+    SRC_DIRS := $(TOPDIR)/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources, \
     CLASS := ListResourceBundle, \
 ))
 

make/gensrc/Gensrc-jdk.jlink.gmk

@@ -23,24 +23,24 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 ################################################################################
 
 include GensrcProperties.gmk
 
 $(eval $(call SetupCompileProperties, JLINK_PROPERTIES, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/jdk.jlink/share/classes/jdk/tools/jlink/resources, \
+    SRC_DIRS := $(TOPDIR)/src/jdk.jlink/share/classes/jdk/tools/jlink/resources, \
     CLASS := ListResourceBundle, \
 ))
 
 $(eval $(call SetupCompileProperties, JMOD_PROPERTIES, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/jdk.jlink/share/classes/jdk/tools/jmod/resources, \
+    SRC_DIRS := $(TOPDIR)/src/jdk.jlink/share/classes/jdk/tools/jmod/resources, \
     CLASS := ListResourceBundle, \
 ))
 
 $(eval $(call SetupCompileProperties, JIMAGE_PROPERTIES, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/jdk.jlink/share/classes/jdk/tools/jimage/resources, \
+    SRC_DIRS := $(TOPDIR)/src/jdk.jlink/share/classes/jdk/tools/jimage/resources, \
     CLASS := ListResourceBundle, \
 ))
 

make/gensrc/Gensrc-jdk.jshell.gmk

@@ -23,7 +23,7 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonLangtools.gmk
 
 $(eval $(call SetupVersionProperties,JSHELL_VERSION, \
     jdk/internal/jshell/tool/resources/version.properties))

make/gensrc/Gensrc-jdk.localedata.gmk

@@ -23,10 +23,10 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, gensrc/Gensrc-jdk.localedata.gmk))
+$(eval $(call IncludeCustomExtension, , gensrc/Gensrc-jdk.localedata.gmk))
 
 include GensrcLocaleData.gmk
 include GensrcCLDR.gmk
@@ -36,7 +36,7 @@ include GensrcCLDR.gmk
 include GensrcProperties.gmk
 
 $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/jdk.localedata/share/classes/sun/util/resources, \
+    SRC_DIRS := $(TOPDIR)/src/jdk.localedata/share/classes/sun/util/resources, \
     CLASS := sun.util.resources.LocaleNamesBundle, \
 ))
 

make/gensrc/Gensrc-jdk.management.agent.gmk

@@ -23,14 +23,14 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 ################################################################################
 
 include GensrcProperties.gmk
 
 $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/jdk.management.agent/share/classes/jdk/internal/agent/resources, \
+    SRC_DIRS := $(TOPDIR)/src/jdk.management.agent/share/classes/jdk/internal/agent/resources, \
     CLASS := ListResourceBundle, \
 ))
 

make/gensrc/GensrcBuffer.gmk

@@ -27,7 +27,7 @@ GENSRC_BUFFER :=
 
 GENSRC_BUFFER_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/nio
 
-GENSRC_BUFFER_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/java/nio
+GENSRC_BUFFER_SRC := $(TOPDIR)/src/java.base/share/classes/java/nio
 
 ###
 

make/gensrc/GensrcCLDR.gmk

@@ -24,7 +24,7 @@
 #
 
 CLDRVERSION := 29.0.0
-CLDRSRCDIR := $(JDK_TOPDIR)/src/jdk.localedata/share/classes/sun/util/cldr/resources/common
+CLDRSRCDIR := $(TOPDIR)/src/jdk.localedata/share/classes/sun/util/cldr/resources/common
 
 GENSRC_BASEDIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base
 GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata

make/gensrc/GensrcCharacterData.gmk

@@ -29,8 +29,8 @@
 
 GENSRC_CHARACTERDATA :=
 
-CHARACTERDATA = $(JDK_TOPDIR)/make/data/characterdata
-UNICODEDATA = $(JDK_TOPDIR)/make/data/unicodedata
+CHARACTERDATA = $(TOPDIR)/make/data/characterdata
+UNICODEDATA = $(TOPDIR)/make/data/unicodedata
 
 define SetupCharacterData
   $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/$1.java: \

make/gensrc/GensrcCharsetCoder.gmk

@@ -27,7 +27,7 @@ GENSRC_CHARSETCODER :=
 
 GENSRC_CHARSETCODER_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/nio/charset
 
-GENSRC_CHARSETCODER_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/java/nio
+GENSRC_CHARSETCODER_SRC := $(TOPDIR)/src/java.base/share/classes/java/nio
 
 GENSRC_CHARSETCODER_TEMPLATE := $(GENSRC_CHARSETCODER_SRC)/charset/Charset-X-Coder.java.template
 

make/gensrc/GensrcCharsetMapping.gmk

@@ -28,16 +28,16 @@
 # Generate StandardCharsets.java and individul sun.nio.cs charset class using
 # the charsetmapping tool
 #
-CHARSET_DATA_DIR := $(JDK_TOPDIR)/make/data/charsetmapping
-CHARSET_EXTSRC_DIR := $(JDK_TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext
+CHARSET_DATA_DIR := $(TOPDIR)/make/data/charsetmapping
+CHARSET_EXTSRC_DIR := $(TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext
 CHARSET_GENSRC_JAVA_DIR_BASE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/cs
 CHARSET_DONE_BASE := $(CHARSET_GENSRC_JAVA_DIR_BASE)/_the.charsetmapping
-CHARSET_COPYRIGHT_HEADER := $(JDK_TOPDIR)/make/src/classes/build/tools/charsetmapping
+CHARSET_COPYRIGHT_HEADER := $(TOPDIR)/make/jdk/src/classes/build/tools/charsetmapping
 CHARSET_TEMPLATES := \
     $(CHARSET_DATA_DIR)/SingleByte-X.java.template \
     $(CHARSET_DATA_DIR)/DoubleByte-X.java.template
 CHARSET_STANDARD_JAVA_TEMPLATES := \
-    $(JDK_TOPDIR)/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template
+    $(TOPDIR)/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template
 CHARSET_STANDARD_OS := stdcs-$(OPENJDK_TARGET_OS)
 
 $(CHARSET_DONE_BASE)-stdcs: $(CHARSET_DATA_DIR)/charsets \

make/gensrc/GensrcCommonJdk.gmk

@@ -32,4 +32,4 @@ include NativeCompilation.gmk
 include TextFileProcessing.gmk
 include SetupJavaCompilers.gmk
 # We need the tools.
-include Tools.gmk
+include ToolsJdk.gmk

make/gensrc/GensrcCommonLangtools.gmk

@@ -64,13 +64,13 @@ endef
 define SetupCompileProperties
   # Lookup the properties that need to be compiled into resource bundles.
   PROPSOURCES := $2 \
-      $$(shell $(FIND) $(LANGTOOLS_TOPDIR)/src/$(MODULE)/share/classes -name "*.properties")
+      $$(shell $(FIND) $(TOPDIR)/src/$(MODULE)/share/classes -name "*.properties")
 
   # Convert .../src/<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
   # to .../langtools/gensrc/<module>/com/sun/tools/javac/resources/javac_zh_CN.java
   # Strip away prefix and suffix, leaving for example only:
   # "<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN"
-  PROPJAVAS := $$(patsubst $(LANGTOOLS_TOPDIR)/src/%, \
+  PROPJAVAS := $$(patsubst $(TOPDIR)/src/%, \
       $(SUPPORT_OUTPUTDIR)/gensrc/%, \
       $$(patsubst %.properties, %.java, \
       $$(subst /share/classes,, $$(PROPSOURCES))))
@@ -104,9 +104,9 @@ endef
 # Param 2 - Extra properties files to process
 define SetupParseProperties
   # property files to process
-  PARSEPROPSOURCES := $$(addprefix $(LANGTOOLS_TOPDIR)/src/$(MODULE)/share/classes/, $2)
+  PARSEPROPSOURCES := $$(addprefix $(TOPDIR)/src/$(MODULE)/share/classes/, $2)
 
-  PARSEPROPALLDIRS := $$(patsubst $(LANGTOOLS_TOPDIR)/src/$(MODULE)/share/classes/%, \
+  PARSEPROPALLDIRS := $$(patsubst $(TOPDIR)/src/$(MODULE)/share/classes/%, \
       $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/%, \
       $$(dir $$(PARSEPROPSOURCES)))
 

make/gensrc/GensrcExceptions.gmk

@@ -27,8 +27,8 @@ GENSRC_EXCEPTIONS :=
 
 GENSRC_EXCEPTIONS_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/nio
 
-GENSRC_EXCEPTIONS_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/java/nio
-GENSRC_EXCEPTIONS_CMD := $(JDK_TOPDIR)/make/scripts/genExceptions.sh
+GENSRC_EXCEPTIONS_SRC := $(TOPDIR)/src/java.base/share/classes/java/nio
+GENSRC_EXCEPTIONS_CMD := $(TOPDIR)/make/scripts/genExceptions.sh
 
 GENSRC_EXCEPTIONS_SRC_DIRS := . charset channels
 
@@ -36,7 +36,7 @@ $(GENSRC_EXCEPTIONS_DST)/_the.%.marker: $(GENSRC_EXCEPTIONS_SRC)/%/exceptions \
     $(GENSRC_EXCEPTIONS_CMD)
 	$(call LogInfo, Generating exceptions java.nio $*)
 	$(call MakeDir, $(@D)/$*)
-	SCRIPTS="$(JDK_TOPDIR)/make/scripts" NAWK="$(NAWK)" SH="$(SH)" $(SH) \
+	SCRIPTS="$(TOPDIR)/make/scripts" NAWK="$(NAWK)" SH="$(SH)" $(SH) \
 	    $(GENSRC_EXCEPTIONS_CMD) $< $(@D)/$* $(LOG_DEBUG)
 	$(TOUCH) $@
 

make/gensrc/GensrcIcons.gmk

@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, jdk, gensrc/GensrcIcons.gmk))
+$(eval $(call IncludeCustomExtension, , gensrc/GensrcIcons.gmk))
 
 GENSRC_AWT_ICONS :=
 GENSRC_AWT_ICONS_SRC :=
@@ -31,7 +31,7 @@ GENSRC_AWT_ICONS_TMP := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop
 GENSRC_AWT_ICONS_DST := $(GENSRC_AWT_ICONS_TMP)/sun/awt/
 
 # Allow this to be overridden from a custom makefile
-X11_ICONS_PATH_PREFIX ?= $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)
+X11_ICONS_PATH_PREFIX ?= $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)
 
 GENSRC_AWT_ICONS_SRC += \
     $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \
@@ -40,7 +40,7 @@ GENSRC_AWT_ICONS_SRC += \
     $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png
 
 
-AWT_ICONPATH := $(JDK_TOPDIR)/src/java.desktop/share/classes/sun/awt/resources
+AWT_ICONPATH := $(TOPDIR)/src/java.desktop/share/classes/sun/awt/resources
 
 GENSRC_AWT_ICONS_SRC += \
     $(AWT_ICONPATH)/security-icon-bw16.png \
@@ -113,7 +113,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
   GENSRC_OSX_ICONS_DST := $(SUPPORT_OUTPUTDIR)/headers/java.desktop
   GENSRC_OSX_ICONS := $(GENSRC_OSX_ICONS_DST)/AWTIconData.h
 
-  GENSRC_OSX_ICONS_SRC ?= $(JDK_TOPDIR)/make/data/macosxicons/JavaApp.icns
+  GENSRC_OSX_ICONS_SRC ?= $(TOPDIR)/make/data/macosxicons/JavaApp.icns
 
 
   $(GENSRC_OSX_ICONS): $(GENSRC_OSX_ICONS_SRC) $(BUILD_TOOLS_JDK)

make/gensrc/GensrcLocaleData.gmk

@@ -29,8 +29,8 @@
 
 # First go look for all locale files
 LOCALE_FILES := $(shell $(FIND) \
-    $(JDK_TOPDIR)/src/$(MODULE)/share/classes/sun/text/resources \
-    $(JDK_TOPDIR)/src/$(MODULE)/share/classes/sun/util/resources \
+    $(TOPDIR)/src/$(MODULE)/share/classes/sun/text/resources \
+    $(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 \
@@ -129,7 +129,7 @@ SED_BASEARGS += -e 's/$(HASH)AvailableLocales_Locales$(HASH)/$(sort $(ALL_BASE_L
 SED_NONBASEARGS += -e 's/$(HASH)AvailableLocales_Locales$(HASH)/$(sort $(ALL_NON_BASE_LOCALES))/g'
 
 $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java: \
-    $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
+    $(TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
 	$(call LogInfo, Creating sun/util/locale/provider/BaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources)
 	$(MKDIR) -p $(@D)
 	$(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \
@@ -137,7 +137,7 @@ $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMet
 	$(SED) $(SED_BASEARGS) $< > $@
 
 $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java: \
-    $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
+    $(TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
 	$(call LogInfo, Creating sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources)
 	$(MKDIR) -p $(@D)
 	$(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \

make/gensrc/GensrcMisc.gmk

@@ -28,7 +28,7 @@
 # string and the runtime name into the VersionProps.java file.
 
 $(eval $(call SetupTextFileProcessing, BUILD_VERSION_JAVA, \
-    SOURCE_FILES := $(JDK_TOPDIR)/src/java.base/share/classes/java/lang/VersionProps.java.template, \
+    SOURCE_FILES := $(TOPDIR)/src/java.base/share/classes/java/lang/VersionProps.java.template, \
     OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/VersionProps.java, \
     REPLACEMENTS := \
         @@LAUNCHER_NAME@@ => $(LAUNCHER_NAME) ; \
@@ -74,7 +74,7 @@ endef
 GENSRC_SOR_FILE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java
 
 $(GENSRC_SOR_FILE): \
-    $(JDK_TOPDIR)/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template
+    $(TOPDIR)/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template
 	$(generate-preproc-src)
 
 GENSRC_JAVA_BASE += $(GENSRC_SOR_FILE)
@@ -86,7 +86,7 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
   GENSRC_UC_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java
 
   $(GENSRC_UC_FILE): \
-      $(JDK_TOPDIR)/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template
+      $(TOPDIR)/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template
 	$(generate-preproc-src)
 
   GENSRC_JAVA_BASE += $(GENSRC_UC_FILE)
@@ -100,7 +100,7 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
   GENSRC_SC_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/SolarisConstants.java
 
   $(GENSRC_SC_FILE): \
-      $(JDK_TOPDIR)/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template
+      $(TOPDIR)/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template
 	$(generate-preproc-src)
 
   GENSRC_JAVA_BASE += $(GENSRC_SC_FILE)
@@ -116,9 +116,9 @@ else
     JCE_DEFAULT_POLICY = limited
 endif
 
-ifneq ($(wildcard $(JDK_TOPDIR)/src/java.base/share/classes/javax/crypto/JceSecurity.java.template), )
+ifneq ($(wildcard $(TOPDIR)/src/java.base/share/classes/javax/crypto/JceSecurity.java.template), )
   $(eval $(call SetupTextFileProcessing, BUILD_JCESECURITY_JAVA, \
-      SOURCE_FILES := $(JDK_TOPDIR)/src/java.base/share/classes/javax/crypto/JceSecurity.java.template, \
+      SOURCE_FILES := $(TOPDIR)/src/java.base/share/classes/javax/crypto/JceSecurity.java.template, \
       OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/javax/crypto/JceSecurity.java, \
       REPLACEMENTS := \
         @@JCE_DEFAULT_POLICY@@ => $(JCE_DEFAULT_POLICY), \

make/gensrc/GensrcModuleLoaderMap.gmk

@@ -44,7 +44,7 @@ VARDEPS_FILE := $(call DependOnVariable, VARDEPS_VALUE)
 ############################################################################
 
 $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.java: \
-    $(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java \
+    $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java \
     $(VARDEPS_FILE) $(BUILD_TOOLS_JDK)
 	$(MKDIR) -p $(@D)
 	$(RM) $@ $@.tmp
@@ -55,7 +55,7 @@ $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.java:
 GENSRC_JAVA_BASE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.java
 
 $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/vm/cds/resources/ModuleLoaderMap.dat: \
-    $(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/vm/cds/resources/ModuleLoaderMap.dat \
+    $(TOPDIR)/src/java.base/share/classes/jdk/internal/vm/cds/resources/ModuleLoaderMap.dat \
     $(VARDEPS_FILE) $(BUILD_TOOLS_JDK)
 	$(MKDIR) -p $(@D)
 	$(RM) $@ $@.tmp

make/gensrc/GensrcProperties.gmk

@@ -29,7 +29,7 @@
 ################################################################################
 # Helper macro for SetupCopy-zh_HK.
 define SetupOneCopy-zh_HK
-  $1_$2_TARGET := $$(patsubst $(JDK_TOPDIR)/src/$(MODULE)/share/classes/%, \
+  $1_$2_TARGET := $$(patsubst $(TOPDIR)/src/$(MODULE)/share/classes/%, \
       $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/%, \
       $$(subst _zh_TW,_zh_HK, $2))
 
@@ -58,12 +58,12 @@ endef
 # SRC_DIRS   Directories containing properties files to process.
 # EXCLUDE   Exclude files matching this pattern.
 # CLASS   The super class for the generated classes.
-# MODULE_PATH_ROOT   Module path root, defaults to $(JDK_TOPDIR)/src.
+# MODULE_PATH_ROOT   Module path root, defaults to $(TOPDIR)/src.
 SetupCompileProperties = $(NamedParamsMacroTemplate)
 define SetupCompilePropertiesBody
   # Set default value unless overridden
   ifeq ($$($1_MODULE_PATH_ROOT), )
-    $1_MODULE_PATH_ROOT := $(JDK_TOPDIR)/src
+    $1_MODULE_PATH_ROOT := $(TOPDIR)/src
   endif
 
   # Locate all properties files in the given source dirs.

make/gensrc/GensrcSwing.gmk

@@ -28,7 +28,7 @@
 #
 NIMBUS_PACKAGE = javax.swing.plaf
 NIMBUS_GENSRC_DIR = $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/javax/swing/plaf/nimbus
-NIMBUS_SKIN_FILE = $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
+NIMBUS_SKIN_FILE = $(TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
 
 $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_the.generated_nimbus: $(NIMBUS_SKIN_FILE) $(BUILD_TOOLS_JDK)
 	$(call LogInfo, Generating Nimbus source files)

make/gensrc/GensrcVarHandles.gmk

@@ -26,7 +26,7 @@
 GENSRC_VARHANDLES :=
 
 VARHANDLES_GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/invoke
-VARHANDLES_SRC_DIR := $(JDK_TOPDIR)/src/java.base/share/classes/java/lang/invoke
+VARHANDLES_SRC_DIR := $(TOPDIR)/src/java.base/share/classes/java/lang/invoke
 
 ################################################################################
 # Setup a rule for generating a VarHandle java class

make/gensrc/GensrcX11Wrappers.gmk

@@ -42,7 +42,7 @@ GENSRC_X11WRAPPERS_TMP := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_x11wrappers
 GENSRC_X11WRAPPERS_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/sun/awt/X11
 
 # The pre-calculated offset file are stored here:
-GENSRC_SIZER_DIR := $(JDK_TOPDIR)/make/data/x11wrappergen
+GENSRC_SIZER_DIR := $(TOPDIR)/make/data/x11wrappergen
 
 # Normal case is to generate only according to target bits
 GENSRC_X11_VERSION := $(OPENJDK_TARGET_CPU_BITS)
@@ -92,13 +92,13 @@ ifneq ($(COMPILE_TYPE), cross)
   endif
 
   SIZER_CFLAGS := \
-      -I$(JDK_TOPDIR)/src/java.base/share/native/include \
-      -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include \
-      -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
-      -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
-      -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
+      -I$(TOPDIR)/src/java.base/share/native/include \
+      -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include \
+      -I$(TOPDIR)/src/java.base/share/native/libjava \
+      -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
+      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
+      -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
+      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
       #
 
   # Compile the C code into an executable.

make/hotspot/copy/Copy-java.base.gmk

@@ -33,7 +33,7 @@ INCLUDE_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_include/$(MODULE)
 ################################################################################
 # Copy platform-independent .h files
 $(eval $(call SetupCopyFiles, COPY_INCLUDE_FILES, \
-    SRC := $(HOTSPOT_TOPDIR)/src/share/vm, \
+    SRC := $(TOPDIR)/src/hotspot/share, \
     DEST := $(INCLUDE_DST_DIR), \
     FLATTEN := true, \
     FILES := prims/jni.h code/jvmticmlr.h \
@@ -45,7 +45,7 @@ $(eval $(call SetupCopyFiles, COPY_INCLUDE_FILES, \
 # Copy jni_md.h
 
 # This might have been defined in a custom extension
-JNI_MD_H_SRC ?= $(HOTSPOT_TOPDIR)/src/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/vm/jni_$(HOTSPOT_TARGET_CPU_ARCH).h
+JNI_MD_H_SRC ?= $(TOPDIR)/src/hotspot/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/jni_$(HOTSPOT_TARGET_CPU_ARCH).h
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   # NOTE: This should most likely be darwin, but the old hotspot build uses bsd