# HG changeset patch
# User duke
# Date 1499268938 -7200
# Node ID 911e751d251930c6cb3a31aa19414c6875eaee5f
# Parent  df8969303f9645175a172e064a42da29152bdf13# Parent  732e04191cd6c4623d79a513713563ec6ee1b569
Merge

diff -r df8969303f96 -r 911e751d2519 .hgtags-top-repo
--- a/.hgtags-top-repo	Wed Feb 23 15:48:59 2011 -0800
+++ b/.hgtags-top-repo	Wed Jul 05 17:35:38 2017 +0200
@@ -104,3 +104,4 @@
 bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127
 57d702105b23fb90e40beaf00f8f8aeae5e249e7 jdk7-b128
 a6b015b59fbc2518762c17ccc35702f03ef7713a jdk7-b129
+cc58c11af15411042719e9c82707fdbef60a9e0f jdk7-b130
diff -r df8969303f96 -r 911e751d2519 LICENSE
--- a/LICENSE	Wed Feb 23 15:48:59 2011 -0800
+++ b/LICENSE	Wed Jul 05 17:35:38 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 df8969303f96 -r 911e751d2519 corba/.hgtags
--- a/corba/.hgtags	Wed Feb 23 15:48:59 2011 -0800
+++ b/corba/.hgtags	Wed Jul 05 17:35:38 2017 +0200
@@ -104,3 +104,4 @@
 64775e83f4df894355f45555f50c410de6727b4e jdk7-b127
 9baa8f94a11d6c5cab3f9f0e5a20106326d0932e jdk7-b128
 66fa0fcc779296c99746b09efce6109944f82f30 jdk7-b129
+563a8f8b5be3940e9346cffac4eff9ed02b3c69f jdk7-b130
diff -r df8969303f96 -r 911e751d2519 corba/LICENSE
--- a/corba/LICENSE	Wed Feb 23 15:48:59 2011 -0800
+++ b/corba/LICENSE	Wed Jul 05 17:35:38 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 df8969303f96 -r 911e751d2519 hotspot/.hgtags
--- a/hotspot/.hgtags	Wed Feb 23 15:48:59 2011 -0800
+++ b/hotspot/.hgtags	Wed Jul 05 17:35:38 2017 +0200
@@ -148,3 +148,4 @@
 9a5762f448595794d449a8e17342abd81a3fadaf jdk7-b128
 ae4b185f2ed14af7bab610738c333840598cdcc4 jdk7-b129
 ae4b185f2ed14af7bab610738c333840598cdcc4 hs21-b01
+e9aa2ca89ad6c53420623d579765f9706ec523d7 jdk7-b130
diff -r df8969303f96 -r 911e751d2519 hotspot/LICENSE
--- a/hotspot/LICENSE	Wed Feb 23 15:48:59 2011 -0800
+++ b/hotspot/LICENSE	Wed Jul 05 17:35:38 2017 +0200
@@ -325,11 +325,11 @@
 
 "CLASSPATH" EXCEPTION TO THE GPL
 
-Certain source files distributed by Oracle 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."
+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 df8969303f96 -r 911e751d2519 jdk/.hgtags
--- a/jdk/.hgtags	Wed Feb 23 15:48:59 2011 -0800
+++ b/jdk/.hgtags	Wed Jul 05 17:35:38 2017 +0200
@@ -104,3 +104,4 @@
 29e09de1d0b4f84faea114cf10b3ec08b59acc4e jdk7-b127
 f08682e23279d6cccbdcafda1eb0647ba4900874 jdk7-b128
 14cd5d54a8d0b9c368d60ea83a066735b9931015 jdk7-b129
+bdc069d3f9101f89ec3f81c2950ee2d68fa846d3 jdk7-b130
diff -r df8969303f96 -r 911e751d2519 jdk/LICENSE
--- a/jdk/LICENSE	Wed Feb 23 15:48:59 2011 -0800
+++ b/jdk/LICENSE	Wed Jul 05 17:35:38 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 df8969303f96 -r 911e751d2519 jdk/make/common/Defs-windows.gmk
--- a/jdk/make/common/Defs-windows.gmk	Wed Feb 23 15:48:59 2011 -0800
+++ b/jdk/make/common/Defs-windows.gmk	Wed Jul 05 17:35:38 2017 +0200
@@ -359,7 +359,13 @@
 
   # VS2008 has bufferoverflow baked in:
   LFLAGS_VS2008 = 
-  LFLAGS_VS2010 = 
+
+  # VS2010, always need safe exception handlers, not needed on 64bit
+  ifeq ($(ARCH_DATA_MODEL), 32)
+    LFLAGS_VS2010 =  -SAFESEH
+  else
+    LFLAGS_VS2010 =
+  endif
 
   # LFLAGS are the flags given to $(LINK) and used to build the actual DLL file
   BASELFLAGS = -nologo /opt:REF /incremental:no
diff -r df8969303f96 -r 911e751d2519 jdk/make/common/Release.gmk
--- a/jdk/make/common/Release.gmk	Wed Feb 23 15:48:59 2011 -0800
+++ b/jdk/make/common/Release.gmk	Wed Jul 05 17:35:38 2017 +0200
@@ -124,9 +124,11 @@
 	tnameserv.1     \
 	unpack200.1
 
+ifndef OPENJDK
 ifeq ($(ARCH_DATA_MODEL),32)
   JRE_MAN_PAGES += javaws.1
 endif
+endif
 
 JDK_MAN_PAGES =            \
 	$(JRE_MAN_PAGES)   \
diff -r df8969303f96 -r 911e751d2519 jdk/make/common/shared/Defs-windows.gmk
--- a/jdk/make/common/shared/Defs-windows.gmk	Wed Feb 23 15:48:59 2011 -0800
+++ b/jdk/make/common/shared/Defs-windows.gmk	Wed Jul 05 17:35:38 2017 +0200
@@ -772,9 +772,20 @@
   BANNED_DLLS=msvcp100[.]dll|msvcr100d[.]dll|msvcrtd[.]dll
 endif
 
-# Macro to check it's input file for banned dependencies and verify the
-#   binary was built properly. Relies on process exit code.
-define binary_file_verification # binary_file
+# Check for /safeseh (only used on 32bit)
+define binary_file_safeseh_verification # binary_file
+( \
+  $(ECHO) "Checking for /SAFESEH usage in: $1" && \
+  if [ "`$(DUMPBIN) /loadconfig $1 | $(EGREP) -i 'Safe Exception Handler Table'`" = "" ] ; then \
+    $(ECHO) "ERROR: Did not find 'Safe Exception Handler Table' in loadconfig: $1" ; \
+    $(DUMPBIN) /loadconfig $1 ; \
+    exit 6 ; \
+  fi ; \
+)
+endef
+
+# Check for /NXCOMPAT usage
+define binary_file_nxcompat_verification # binary_file
 ( \
   $(ECHO) "Checking for /NXCOMPAT usage in: $1" && \
   if [ "`$(DUMPBIN) /headers $1 | $(EGREP) -i 'NX compatible'`" = "" ] ; then \
@@ -782,12 +793,24 @@
     $(DUMPBIN) /headers $1 ; \
     exit 7 ; \
   fi ; \
+)
+endef
+
+# Check for /DYNAMICBASE usage
+define binary_file_dynamicbase_verification # binary_file
+( \
   $(ECHO) "Checking for /DYNAMICBASE usage in: $1" && \
   if [ "`$(DUMPBIN) /headers $1 | $(EGREP) -i 'Dynamic base'`" = "" ] ; then \
     $(ECHO) "ERROR: Did not find 'Dynamic base' in headers: $1" ; \
     $(DUMPBIN) /headers $1 ; \
     exit 8 ; \
   fi ; \
+)
+endef
+
+# Check for banned dll usage
+define binary_file_dll_verification # binary_file
+( \
   $(ECHO) "Checking for banned dependencies in: $1" && \
   if [ "`$(DUMPBIN) /dependents $1 | $(EGREP) -i '$(BANNED_DLLS)'`" != "" ] ; then \
     $(ECHO) "ERROR: Found use of $(BANNED_DLLS)"; \
@@ -797,6 +820,27 @@
 )
 endef
 
+# Macro to check it's input file for properly built executables.
+#   Relies on process exit code. Different for 32bit vs 64bit.
+ifeq ($(ARCH_DATA_MODEL),32)
+define binary_file_verification # binary_file
+( \
+  $(call binary_file_safeseh_verification,$1); \
+  $(call binary_file_nxcompat_verification,$1); \
+  $(call binary_file_dynamicbase_verification,$1); \
+  $(call binary_file_dll_verification,$1); \
+)
+endef
+else
+define binary_file_verification # binary_file
+( \
+  $(call binary_file_nxcompat_verification,$1); \
+  $(call binary_file_dynamicbase_verification,$1); \
+  $(call binary_file_dll_verification,$1); \
+)
+endef
+endif
+
 else
 
 # Macro to check it's input file for banned dependencies and verify the
diff -r df8969303f96 -r 911e751d2519 make/deploy-rules.gmk
--- a/make/deploy-rules.gmk	Wed Feb 23 15:48:59 2011 -0800
+++ b/make/deploy-rules.gmk	Wed Jul 05 17:35:38 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