*** old/make/Main.gmk	Wed Feb 15 16:54:03 2017
--- new/make/Main.gmk	Wed Feb 15 16:54:03 2017

*** 631,650 ****
--- 631,650 ----
  
    # The swing beans need to have java base properly generated to avoid errors
    # in javadoc.
    java.desktop-gensrc-jdk: java.base-gensrc
  
!   # The annotation processing for jdk.vm.ci and jdk.vm.compiler needs classes
!   # from the current JDK.
!   jdk.vm.ci-gensrc-hotspot: $(addsuffix -java, \
!       $(call FindTransitiveDepsForModule, jdk.vm.ci))
!   jdk.vm.compiler-gensrc-hotspot: $(addsuffix -java, \
!       $(call FindTransitiveDepsForModule, jdk.vm.compiler))
!   # 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, \
!       $(call FindTransitiveDepsForModule, jdk.internal.vm.ci))
!   jdk.internal.vm.compiler-gensrc-hotspot: $(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
  
    # Explicitly add dependencies for special targets
    java.base-java: unpack-sec
  
    jdk.jdeps-gendata: java rmic