diff -r ec60c3290242 -r 7c84df693837 jdk/make/launcher/Launcher-jdk.compiler.gmk
--- a/jdk/make/launcher/Launcher-jdk.compiler.gmk	Thu Apr 28 08:26:38 2016 -0700
+++ b/jdk/make/launcher/Launcher-jdk.compiler.gmk	Tue May 03 09:09:57 2016 +0100
@@ -27,7 +27,8 @@
 
 $(eval $(call SetupBuildLauncher, javac, \
    MAIN_CLASS := com.sun.tools.javac.Main, \
-    CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS \
+   JAVA_ARGS := -addmods ALL-DEFAULT, \
+   CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS \
         -DNEVER_ACT_AS_SERVER_CLASS_MACHINE, \
 ))