--- a/.hgtags-top-repo Wed Dec 08 00:35:33 2010 -0800
+++ b/.hgtags-top-repo Wed Jul 05 17:28:33 2017 +0200
@@ -94,3 +94,4 @@
7220e60b097fa027e922f1aeecdd330f3e37409f jdk7-b117
a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118
661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119
+366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120
--- a/hotspot/.hgtags Wed Dec 08 00:35:33 2010 -0800
+++ b/hotspot/.hgtags Wed Jul 05 17:28:33 2017 +0200
@@ -131,3 +131,5 @@
806d0c037e6bbb88dac0699673f4ba55ee8c02da jdk7-b117
698b7b727e12de44139d8cca6ab9a494ead13253 jdk7-b118
3ef7426b4deac5dcfd4afb35cabe9ab3d666df91 hs20-b02
+5484e7c53fa7da5e869902437ee08a9ae10c1c69 jdk7-b119
+f5603a6e50422046ebc0d2f1671d55cb8f1bf1e9 jdk7-b120
--- a/make/deploy-rules.gmk Wed Dec 08 00:35:33 2010 -0800
+++ b/make/deploy-rules.gmk Wed Jul 05 17:28:33 2017 +0200
@@ -46,7 +46,6 @@
# Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available
ifeq ($(ARCH_DATA_MODEL), 32)
ifeq ($(PLATFORM), windows)
- ifneq ($(KERNEL), off)
EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \
$(ECHO) true ; \
else \
@@ -55,7 +54,6 @@
ifeq ($(EC_TMP), true)
DEPLOY_BUILD_TARGETS += extra-comp-all
endif
- endif
endif
endif