--- /dev/null	2016-05-31 09:42:47.975716356 -0700
+++ new/make/Tools.gmk	2016-12-07 13:47:23.086890942 -0800
@@ -0,0 +1,69 @@
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+################################################################################
+# This file is meant to be included by makefiles using any of the build tools
+# compiled by CompileTools.gmk. It assumes that CompileTools.gmk has already
+# been run in a separate top level target. It should contain definitions for
+# build tools targets without defining the rules to build them so that usage of
+# those tools can define prerequisites to them.
+
+include JavaCompilation.gmk
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, hotspot, Tools.gmk))
+
+ifeq ($(ENABLE_AOT), true)
+  $(eval $(call SetupJavaCompilationCompileTarget, \
+      BUILD_VM_COMPILER_MATCH_PROCESSOR, \
+      BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.match.processor, \
+      SETUP := GENERATE_JDKBYTECODE, \
+  ))
+
+  $(eval $(call SetupJavaCompilationCompileTarget, \
+      BUILD_VM_COMPILER_NODEINFO_PROCESSOR, \
+      BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.nodeinfo.processor, \
+      SETUP := GENERATE_JDKBYTECODE, \
+  ))
+
+  $(eval $(call SetupJavaCompilationCompileTarget, \
+      BUILD_VM_COMPILER_OPTIONS_PROCESSOR, \
+      BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.options.processor, \
+      SETUP := GENERATE_JDKBYTECODE, \
+  ))
+
+  $(eval $(call SetupJavaCompilationCompileTarget, \
+      BUILD_VM_COMPILER_REPLACEMENTS_VERIFIER, \
+      BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier, \
+      SETUP := GENERATE_JDKBYTECODE, \
+  ))
+
+  $(eval $(call SetupJavaCompilationCompileTarget, \
+      BUILD_VM_COMPILER_SERVICEPROVIDER_PROCESSOR, \
+      BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.serviceprovider.processor, \
+      SETUP := GENERATE_JDKBYTECODE, \
+  ))
+endif
+################################################################################