Merge
authorjwilhelm
Thu, 09 Feb 2017 23:23:58 +0100
changeset 43659 48eece3e9b75
parent 43654 32ee04ab8949 (current diff)
parent 43658 4abbeb6d852d (diff)
child 43660 b37895d05dff
child 43922 3a723d6b2734
Merge
common/autoconf/generated-configure.sh
common/bin/unshuffle_list.txt
make/common/Modules.gmk
--- a/common/autoconf/generated-configure.sh	Tue Feb 07 12:17:59 2017 +0100
+++ b/common/autoconf/generated-configure.sh	Thu Feb 09 23:23:58 2017 +0100
@@ -5170,7 +5170,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1486465953
+DATE_WHEN_GENERATED=1486678910
 
 ###############################################################################
 #
--- a/make/common/Modules.gmk	Tue Feb 07 12:17:59 2017 +0100
+++ b/make/common/Modules.gmk	Thu Feb 09 23:23:58 2017 +0100
@@ -115,6 +115,7 @@
     jdk.scripting.nashorn \
     jdk.security.auth \
     jdk.security.jgss \
+    jdk.vm.compiler \
     jdk.xml.dom \
     jdk.zipfs \
     #