# HG changeset patch
# User amurillo
# Date 1472660573 25200
# Node ID 2d980815001d08652f9a94bdb3ecf3be4cd94d98
# Parent  de1b99ad6e363e3e3a464d2b32e5f6ab3646e5a9# Parent  cec3daf6324aad42a8685a2e1b28fa3e3931fa31
Merge

diff -r de1b99ad6e36 -r 2d980815001d make/CompileJavaModules.gmk
--- a/make/CompileJavaModules.gmk	Fri Aug 26 10:02:44 2016 -0700
+++ b/make/CompileJavaModules.gmk	Wed Aug 31 09:22:53 2016 -0700
@@ -504,7 +504,7 @@
         $($(MODULE)_ADD_JAVAC_FLAGS) \
         --module-source-path $(MODULESOURCEPATH) \
         --module-path $(MODULEPATH) \
-        -system none, \
+        --system none, \
 ))
 
 TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA)
diff -r de1b99ad6e36 -r 2d980815001d make/Images.gmk
--- a/make/Images.gmk	Fri Aug 26 10:02:44 2016 -0700
+++ b/make/Images.gmk	Wed Aug 31 09:22:53 2016 -0700
@@ -116,8 +116,10 @@
 JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX)
 
 JLINK_ORDER_RESOURCES := **module-info.class
+JLINK_JLI_CLASSES :=
 ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
   JLINK_ORDER_RESOURCES += @$(SUPPORT_OUTPUTDIR)/classlist/classlist
+  JLINK_JLI_CLASSES := --generate-jli-classes=@$(SUPPORT_OUTPUTDIR)/classlist/jli_trace.out
 endif
 JLINK_ORDER_RESOURCES += \
     /java.base/java/** \
@@ -131,6 +133,7 @@
     --endian $(OPENJDK_BUILD_CPU_ENDIAN) \
     --release-info $(BASE_RELEASE_FILE) \
     --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \
+    $(JLINK_JLI_CLASSES) \
     #
 
 ifeq ($(JLINK_KEEP_PACKAGED_MODULES), true)
diff -r de1b99ad6e36 -r 2d980815001d make/common/SetupJavaCompilers.gmk
--- a/make/common/SetupJavaCompilers.gmk	Fri Aug 26 10:02:44 2016 -0700
+++ b/make/common/SetupJavaCompilers.gmk	Wed Aug 31 09:22:53 2016 -0700
@@ -88,7 +88,7 @@
 $(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \
     JVM := $(JAVA_SMALL), \
     JAVAC := $(NEW_JAVAC), \
-    FLAGS := --upgrade-module-path $(JDK_OUTPUTDIR)/modules -system none $(DISABLE_WARNINGS), \
+    FLAGS := --upgrade-module-path $(JDK_OUTPUTDIR)/modules --system none $(DISABLE_WARNINGS), \
     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
     SERVER_JVM := $(SJAVAC_SERVER_JAVA)))