*** old/make/CompileJavaModules.gmk	Fri Oct 28 00:28:21 2016
--- new/make/CompileJavaModules.gmk	Fri Oct 28 00:28:20 2016

*** 450,460 ****
--- 450,498 ----
  
  jdk.jvmstat_COPY := aliasmap
  
  ################################################################################
  
! jdk.vm.ci_ADD_JAVAC_FLAGS := -g -Xlint:-exports
+ 
+ ################################################################################
+ 
+ jdk.aot_ADD_JAVAC_FLAGS := -g
+ 
+ ################################################################################
+ 
+ jdk.vm.compiler_ADD_JAVAC_FLAGS := -g
+ 
+ jdk.vm.compiler_EXCLUDES += \
+     com.oracle.graal.compiler.match.processor \
+     com.oracle.graal.nodeinfo.processor \
+     com.oracle.graal.options.processor \
+     com.oracle.graal.serviceprovider.processor \
+     com.oracle.graal.replacements.verifier \
+     com.oracle.graal.api.directives.test \
+     com.oracle.graal.api.test \
+     com.oracle.graal.asm.aarch64.test \
+     com.oracle.graal.asm.amd64.test \
+     com.oracle.graal.asm.sparc.test \
+     com.oracle.graal.asm.test \
+     com.oracle.graal.compiler.amd64.test \
+     com.oracle.graal.compiler.sparc.test \
+     com.oracle.graal.compiler.test \
+     com.oracle.graal.debug.test \
+     com.oracle.graal.graph.test \
+     com.oracle.graal.hotspot.amd64.test \
+     com.oracle.graal.hotspot.lir.test \
+     com.oracle.graal.hotspot.test \
+     com.oracle.graal.jtt \
+     com.oracle.graal.lir.jtt \
+     com.oracle.graal.lir.test \
+     com.oracle.graal.nodes.test \
+     com.oracle.graal.options.test \
+     com.oracle.graal.phases.common.test \
+     com.oracle.graal.replacements.test \
+     com.oracle.graal.test \
+     #
  
  ################################################################################
  
  jdk.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
  jdk.xml.bind_CLEAN := .properties

*** 506,515 ****
--- 544,569 ----
        $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
            $(wildcard $(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes/*/src)))
    MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH))
  endif
  
+ ifeq ($(MODULE), jdk.vm.compiler)
+   ## WORKAROUND jdk.vm.compiler source structure issue
+   VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \
+       $(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src, \
+           $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+   MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH))
+ endif
+ 
+ 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)))
+   MODULESOURCEPATH := $(call PathList, $(AOT_MODULESOURCEPATH))
+ endif
+ 
  $(eval $(call SetupJavaCompilation, $(MODULE), \
      SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \
      MODULE := $(MODULE), \
      SRC := $(wildcard $(MODULE_SRC_DIRS)), \
      INCLUDES := $(JDK_USER_DEFINED_FILTER), \