changeset 2481:5c4f6b099621

Merge
author jwilhelm
date Thu, 09 Feb 2017 23:23:58 +0100
parents 98503c50ee77 5327e511b68d
children 5308bdd50d13 90d549b64f58
files common/autoconf/generated-configure.sh common/bin/unshuffle_list.txt make/common/Modules.gmk
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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 \
     #