--- /dev/null	2016-05-31 09:42:47.975716356 -0700
+++ new/make/gensrc/Gensrc-jdk.vm.compiler.gmk	2016-12-07 13:47:23.350902543 -0800
@@ -0,0 +1,142 @@
+#
+# 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.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include Tools.gmk
+
+$(eval $(call IncludeCustomExtension, hotspot, gensrc/Gensrc-jdk.vm.compiler.gmk))
+
+GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)
+SRC_DIR := $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes
+
+################################################################################
+
+PROC_SRC_SUBDIRS := \
+    org.graalvm.compiler.code \
+    org.graalvm.compiler.common \
+    org.graalvm.compiler.core \
+    org.graalvm.compiler.core.aarch64 \
+    org.graalvm.compiler.core.amd64 \
+    org.graalvm.compiler.core.common \
+    org.graalvm.compiler.core.sparc \
+    org.graalvm.compiler.debug \
+    org.graalvm.compiler.hotspot \
+    org.graalvm.compiler.hotspot.aarch64 \
+    org.graalvm.compiler.hotspot.amd64 \
+    org.graalvm.compiler.hotspot.sparc \
+    org.graalvm.compiler.graph \
+    org.graalvm.compiler.java \
+    org.graalvm.compiler.lir \
+    org.graalvm.compiler.lir.amd64 \
+    org.graalvm.compiler.loop \
+    org.graalvm.compiler.loop.phases \
+    org.graalvm.compiler.nodes \
+    org.graalvm.compiler.replacements \
+    org.graalvm.compiler.replacements.aarch64 \
+    org.graalvm.compiler.replacements.amd64 \
+    org.graalvm.compiler.phases \
+    org.graalvm.compiler.phases.common \
+    org.graalvm.compiler.printer \
+    org.graalvm.compiler.virtual \
+    #
+
+PROC_SRC_DIRS := $(patsubst %, $(SRC_DIR)/%/src, $(PROC_SRC_SUBDIRS))
+
+PROC_SRCS := $(filter %.java, $(call CacheFind, $(PROC_SRC_DIRS)))
+
+ALL_SRC_DIRS := $(wildcard $(SRC_DIR)/*/src)
+SOURCEPATH := $(call PathList, $(ALL_SRC_DIRS))
+
+PROCESSOR_JARS := \
+    $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.match.processor.jar \
+    $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.nodeinfo.processor.jar \
+    $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.options.processor.jar \
+    $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.replacements.verifier.jar \
+    $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.serviceprovider.processor.jar \
+    #
+PROCESSOR_PATH := $(call PathList, $(PROCESSOR_JARS))
+
+ADD_EXPORTS := \
+    --add-exports jdk.vm.ci/jdk.vm.ci.aarch64=ALL-UNNAMED \
+    --add-exports jdk.vm.ci/jdk.vm.ci.amd64=ALL-UNNAMED \
+    --add-exports jdk.vm.ci/jdk.vm.ci.code=ALL-UNNAMED \
+    --add-exports jdk.vm.ci/jdk.vm.ci.code.site=ALL-UNNAMED \
+    --add-exports jdk.vm.ci/jdk.vm.ci.code.stack=ALL-UNNAMED \
+    --add-exports jdk.vm.ci/jdk.vm.ci.common=ALL-UNNAMED \
+    --add-exports jdk.vm.ci/jdk.vm.ci.hotspot=ALL-UNNAMED \
+    --add-exports jdk.vm.ci/jdk.vm.ci.hotspot.aarch64=ALL-UNNAMED \
+    --add-exports jdk.vm.ci/jdk.vm.ci.hotspot.amd64=ALL-UNNAMED \
+    --add-exports jdk.vm.ci/jdk.vm.ci.hotspot.events=ALL-UNNAMED \
+    --add-exports jdk.vm.ci/jdk.vm.ci.hotspot.sparc=ALL-UNNAMED \
+    --add-exports jdk.vm.ci/jdk.vm.ci.hotspotvmconfig=ALL-UNNAMED \
+    --add-exports jdk.vm.ci/jdk.vm.ci.inittimer=ALL-UNNAMED \
+    --add-exports jdk.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED \
+    --add-exports jdk.vm.ci/jdk.vm.ci.runtime=ALL-UNNAMED \
+    --add-exports jdk.vm.ci/jdk.vm.ci.services=ALL-UNNAMED \
+    --add-exports jdk.vm.ci/jdk.vm.ci.sparc=ALL-UNNAMED \
+    #
+
+$(GENSRC_DIR)/_gensrc_proc_done: $(PROC_SRCS) $(PROCESSOR_JARS)
+	$(call MakeDir, $(@D))
+	$(eval $(call ListPathsSafely,PROC_SRCS,$(@D)/_gensrc_proc_files))
+	$(JAVA_SMALL) $(NEW_JAVAC) \
+	    -XDignore.symbol.file \
+	    --upgrade-module-path $(JDK_OUTPUTDIR)/modules --system none \
+	    $(ADD_EXPORTS) \
+	    -sourcepath $(SOURCEPATH) \
+	    -implicit:none \
+	    -proc:only \
+	    -processorpath $(PROCESSOR_PATH) \
+	    -d $(GENSRC_DIR) \
+	    -s $(GENSRC_DIR) \
+	    @$(@D)/_gensrc_proc_files
+	$(TOUCH) $@
+
+TARGETS += $(GENSRC_DIR)/_gensrc_proc_done
+
+################################################################################
+
+$(GENSRC_DIR)/module-info.java.extra: $(GENSRC_DIR)/_gensrc_proc_done
+	($(CD) $(GENSRC_DIR)/META-INF/providers && \
+	    for i in $$($(LS)); do \
+	      c=$$($(CAT) $$i | $(TR) -d '\n\r'); \
+	      $(ECHO) "provides $$c with $$i;" >> $@; \
+	    done); \
+	$(ECHO) "uses org.graalvm.compiler.options.OptionDescriptors;" >> $@; \
+	for i in $$($(FIND) $(GENSRC_DIR) -name '*_OptionDescriptors.java'); do \
+	    c=$$($(ECHO) $$i | $(SED) 's:.*/jdk\.vm\.compiler/\(.*\)\.java:\1:' | $(TR) '/' '.'); \
+	    $(ECHO) "provides org.graalvm.compiler.options.OptionDescriptors with $$c;" >> $@; \
+	done
+
+TARGETS += $(GENSRC_DIR)/module-info.java.extra
+
+################################################################################
+
+all: $(TARGETS)
+
+.PHONY: default all