--- a/make/CompileInterim.gmk	Tue Nov 17 16:38:11 2015 +0100
+++ b/make/CompileInterim.gmk	Wed Nov 18 12:52:32 2015 +0100
@@ -44,7 +44,7 @@
       SETUP := BOOT_JAVAC, \
       DISABLE_SJAVAC := true, \
       SRC := $(LANGTOOLS_TOPDIR)/src/$(strip $1)/share/classes \
-          $$(wildcard $(GENSRC_OUTPUTDIR)/$(strip $1)), \
+          $$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$(strip $1)), \
       EXCLUDES := sun jdk, \
       EXCLUDE_FILES := module-info.java, \
       COPY := .gif .xml .css .js javax.tools.JavaCompilerTool, \

--- a/make/gendata/Gendata-jdk.compiler.gmk	Tue Nov 17 16:38:11 2015 +0100
+++ b/make/gendata/Gendata-jdk.compiler.gmk	Wed Nov 18 12:52:32 2015 +0100
@@ -70,7 +70,7 @@
 # Copy ct.sym to the modules libs dir
 $(eval $(call SetupCopyFiles, COPY_TO_LIBS, \
     FILES := $(SUPPORT_OUTPUTDIR)/symbols/ct.sym, \
-    DEST := $(MODULES_LIBS_OUTPUTDIR)/jdk.compiler, \
+    DEST := $(SUPPORT_OUTPUTDIR)/modules_libs/jdk.compiler, \
 ))
 
 TARGETS += $(CREATE_CTSYM) $(COPY_TO_LIBS)

--- a/make/gensrc/GensrcCommon.gmk	Tue Nov 17 16:38:11 2015 +0100
+++ b/make/gensrc/GensrcCommon.gmk	Wed Nov 18 12:52:32 2015 +0100
@@ -48,12 +48,12 @@
 # Param 2 - Name of version.properties file including packages from the src
 #           root.
 define SetupVersionProperties
-  $(GENSRC_OUTPUTDIR)/$(MODULE)/$$(strip $2):
+  $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/$$(strip $2):
 	$(MKDIR) -p $$(@D)
 	$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" \
 	    > $$@
 
-  $$(strip $1) += $(GENSRC_OUTPUTDIR)/$(MODULE)/$$(strip $2)
+  $$(strip $1) += $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/$$(strip $2)
 endef
 
 ################################################################################
@@ -71,7 +71,7 @@
   # 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/%, \
-      $(GENSRC_OUTPUTDIR)/%, \
+      $(SUPPORT_OUTPUTDIR)/gensrc/%, \
       $$(patsubst %.properties, %.java, \
       $$(subst /share/classes,, $$(PROPSOURCES))))
 
@@ -88,14 +88,14 @@
       $$(addprefix _SPACE_, $$(PROPJAVAS)))))
 
   # Now setup the rule for the generation of the resource bundles.
-  $(GENSRC_OUTPUTDIR)/$(MODULE)/_the_props: $$(PROPSOURCES)
+  $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the_props: $$(PROPSOURCES)
 	$(MKDIR) -p $$(@D) $$(PROPDIRS)
 	$(FIND) $$(@D) -name "*.java" -a ! -name "*Properties.java" $(FIND_DELETE)
 	$(ECHO) Compiling $$(words $$(PROPSOURCES)) properties into resource bundles for $(MODULE)
 	$(TOOL_COMPILEPROPS_CMD) $$(PROPCMDLINE)
 	$(TOUCH) $$@
 
-  $$(strip $1) += $(GENSRC_OUTPUTDIR)/$(MODULE)/_the_props
+  $$(strip $1) += $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the_props
 endef
 
 ################################################################################
@@ -107,7 +107,7 @@
   PARSEPROPSOURCES := $$(addprefix $(LANGTOOLS_TOPDIR)/src/$(MODULE)/share/classes/, $2)
 
   PARSEPROPALLDIRS := $$(patsubst $(LANGTOOLS_TOPDIR)/src/$(MODULE)/share/classes/%, \
-      $(GENSRC_OUTPUTDIR)/$(MODULE)/%, \
+      $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/%, \
       $$(dir $$(PARSEPROPSOURCES)))
 
   PARSEPROPDIRS := $$(sort $$(PARSEPROPALLDIRS))
@@ -117,14 +117,14 @@
     $$(addprefix _SPACE_, $$(PARSEPROPALLDIRS))))
 
   # Now setup the rule for the generation of the resource bundles.
-  $(GENSRC_OUTPUTDIR)/$(MODULE)/_the_parsed_props: $(PARSEPROPSOURCES)
+  $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the_parsed_props: $(PARSEPROPSOURCES)
 	$(MKDIR) -p $$(@D) $$(PARSEPROPDIRS)
 	$(FIND) $$(@D) -name "*Properties.java" $(FIND_DELETE)
 	$(ECHO) Parsing $$(words $$(PARSEPROPSOURCES)) properties into enum-like class for $(MODULE)
 	$(TOOL_PARSEPROPS_CMD) $$(PARSEPROPCMDLINE)
 	$(TOUCH) $$@
 
-  $$(strip $1) += $(GENSRC_OUTPUTDIR)/$(MODULE)/_the_parsed_props
+  $$(strip $1) += $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the_parsed_props
 endef
 
 ################################################################################