# HG changeset patch
# User duke
# Date 1499268929 -7200
# Node ID 688aa32a5d59bfc22e66c97530f6fcb67918d38e
# Parent  e0205cb94879413736defc1aa0157d8a830a24a1# Parent  836de2e4bdeea5389116db4c3a4d60cc72d037ff
Merge

diff -r e0205cb94879 -r 688aa32a5d59 .hgtags-top-repo
--- a/.hgtags-top-repo	Wed Feb 23 15:48:46 2011 -0800
+++ b/.hgtags-top-repo	Wed Jul 05 17:35:29 2017 +0200
@@ -104,3 +104,4 @@
 bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127
 57d702105b23fb90e40beaf00f8f8aeae5e249e7 jdk7-b128
 a6b015b59fbc2518762c17ccc35702f03ef7713a jdk7-b129
+cc58c11af15411042719e9c82707fdbef60a9e0f jdk7-b130
diff -r e0205cb94879 -r 688aa32a5d59 LICENSE
--- a/LICENSE	Wed Feb 23 15:48:46 2011 -0800
+++ b/LICENSE	Wed Jul 05 17:35:29 2017 +0200
@@ -325,11 +325,11 @@
 
 "CLASSPATH" EXCEPTION TO THE GPL
 
-Certain source files distributed by Sun Microsystems, Inc.  are subject to
-the following clarification and special exception to the GPL, but only where
-Sun has expressly included in the particular source file's header the words
-"Sun designates this particular file as subject to the "Classpath" exception
-as provided by Sun in the LICENSE file that accompanied this code."
+Certain source files distributed by Oracle America and/or its affiliates are
+subject to the following clarification and special exception to the GPL, but
+only where Oracle has expressly included in the particular source file's header
+the words "Oracle designates this particular file as subject to the "Classpath"
+exception as provided by Oracle in the LICENSE file that accompanied this code."
 
     Linking this library statically or dynamically with other modules is making
     a combined work based on this library.  Thus, the terms and conditions of
diff -r e0205cb94879 -r 688aa32a5d59 make/deploy-rules.gmk
--- a/make/deploy-rules.gmk	Wed Feb 23 15:48:46 2011 -0800
+++ b/make/deploy-rules.gmk	Wed Jul 05 17:35:29 2017 +0200
@@ -64,19 +64,17 @@
     endif
   endif
 endif
-  
-ifneq ($(KERNEL), off)
-  ifeq ($(ARCH_DATA_MODEL), 32)
-    ifeq ($(PLATFORM), windows)
-      # Only set up to use UPX compression if it is available
-      UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
-        $(ECHO) true ; \
-      else \
-        $(ECHO) false ; \
-      fi )
-      ifeq ($(UP_TMP), true)
-        DEPLOY_BUILD_TARGETS += cmd-comp-all
-      endif
+
+ifeq ($(ARCH_DATA_MODEL), 32)
+  ifeq ($(PLATFORM), windows)
+    # Only set up to use UPX compression if it is available
+    UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
+      $(ECHO) true ; \
+    else \
+      $(ECHO) false ; \
+    fi )
+    ifeq ($(UP_TMP), true)
+      DEPLOY_BUILD_TARGETS += cmd-comp-all
     endif
   endif
 endif