Merge

e4493760 · duke · 011b22ea · cdb9557b · e4493760 · e4493760
显示空白变更内容
内联并排

Showing with 3 addition and 2 deletion

.hgtags-top-repo .hgtags-top-repo +1 -0

hotspot/.hgtags hotspot/.hgtags +2 -0

make/deploy-rules.gmk make/deploy-rules.gmk +0 -2

未找到文件。
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -94,3 +94,4 @@ e8ebdf41b9c01a26642848f4134f5504e8fb3233 jdk7-b115
 7220e60b097fa027e922f1aeecdd330f3e37409f jdk7-b117
 a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118
 661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119
+366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -131,3 +131,5 @@ bdbc48857210a509b3c50a3291ecb9dd6a72e016 jdk7-b115
 806d0c037e6bbb88dac0699673f4ba55ee8c02da jdk7-b117
 698b7b727e12de44139d8cca6ab9a494ead13253 jdk7-b118
 3ef7426b4deac5dcfd4afb35cabe9ab3d666df91 hs20-b02
+5484e7c53fa7da5e869902437ee08a9ae10c1c69 jdk7-b119
+f5603a6e50422046ebc0d2f1671d55cb8f1bf1e9 jdk7-b120
--- a/make/deploy-rules.gmk
+++ b/make/deploy-rules.gmk
@@ -46,7 +46,6 @@ DEPLOY_BUILD_TARGETS = sanity deploy
 # 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 \
@@ -56,7 +55,6 @@ ifeq ($(ARCH_DATA_MODEL), 32)
        DEPLOY_BUILD_TARGETS += extra-comp-all
      endif
  endif
-  endif
 endif

 ifneq ($(JQS), off)