# HG changeset patch
# User jwilhelm
# Date 1486679721 -3600
# Node ID b37895d05dff462f1a1c746d58aeb42675ae03fe
# Parent  48eece3e9b75415f83268d2787bad77d6a0241c4# Parent  c1c65cd3859867467c856f8a11a1167e28816cc3
Merge

diff -r 48eece3e9b75 -r b37895d05dff .hgtags-top-repo
--- a/.hgtags-top-repo	Thu Feb 09 23:23:58 2017 +0100
+++ b/.hgtags-top-repo	Thu Feb 09 23:35:21 2017 +0100
@@ -398,3 +398,4 @@
 816a6d03a7c44edfbd8780110529f1bdc3964fb9 jdk-9+153
 8d26916eaa21b689835ffc1c0dbf12470aa9be61 jdk-9+154
 688a3863c00ebc089ab17ee1fc46272cbbd96815 jdk-9+155
+783ec7542cf7154e5d2b87f55bb97d28f81e9ada jdk-9+156
diff -r 48eece3e9b75 -r b37895d05dff common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Thu Feb 09 23:23:58 2017 +0100
+++ b/common/autoconf/generated-configure.sh	Thu Feb 09 23:35:21 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=1486678910
+DATE_WHEN_GENERATED=1486679715
 
 ###############################################################################
 #
diff -r 48eece3e9b75 -r b37895d05dff make/Main.gmk
--- a/make/Main.gmk	Thu Feb 09 23:23:58 2017 +0100
+++ b/make/Main.gmk	Thu Feb 09 23:35:21 2017 +0100
@@ -654,8 +654,7 @@
   # When creating a BUILDJDK, we don't need to add hashes to java.base, thus
   # we don't need to depend on all other jmods
   ifneq ($(CREATING_BUILDJDK), true)
-    java.base-jmod: jrtfs-jar $(filter-out java.base-jmod \
-        $(addsuffix -jmod, $(call FindAllUpgradeableModules)), $(JMOD_TARGETS))
+    java.base-jmod: jrtfs-jar $(filter-out java.base-jmod, $(JMOD_TARGETS))
   endif
 
   # Building java.base-jmod requires all of hotspot to be built.