Merge
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 4fe77eb..b6d73ca 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -104,3 +104,4 @@
bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127
57d702105b23fb90e40beaf00f8f8aeae5e249e7 jdk7-b128
a6b015b59fbc2518762c17ccc35702f03ef7713a jdk7-b129
+cc58c11af15411042719e9c82707fdbef60a9e0f jdk7-b130
diff --git a/LICENSE b/LICENSE
index eeab58c..b40a0f4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -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 --git a/corba/.hgtags b/corba/.hgtags
index 17e1c75..36bf49b 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -104,3 +104,4 @@
64775e83f4df894355f45555f50c410de6727b4e jdk7-b127
9baa8f94a11d6c5cab3f9f0e5a20106326d0932e jdk7-b128
66fa0fcc779296c99746b09efce6109944f82f30 jdk7-b129
+563a8f8b5be3940e9346cffac4eff9ed02b3c69f jdk7-b130
diff --git a/corba/LICENSE b/corba/LICENSE
index eeab58c..b40a0f4 100644
--- a/corba/LICENSE
+++ b/corba/LICENSE
@@ -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 --git a/hotspot/.hgtags b/hotspot/.hgtags
index b18bf3d..83b71af 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -148,3 +148,4 @@
9a5762f448595794d449a8e17342abd81a3fadaf jdk7-b128
ae4b185f2ed14af7bab610738c333840598cdcc4 jdk7-b129
ae4b185f2ed14af7bab610738c333840598cdcc4 hs21-b01
+e9aa2ca89ad6c53420623d579765f9706ec523d7 jdk7-b130
diff --git a/hotspot/LICENSE b/hotspot/LICENSE
index b53eb1f..b40a0f4 100644
--- a/hotspot/LICENSE
+++ b/hotspot/LICENSE
@@ -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 --git a/jaxp/.hgtags b/jaxp/.hgtags
index add6fe9..9de4729 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -104,3 +104,4 @@
c532d6dbc8d18d55b5d693599ee5cd8250e16eb4 jdk7-b127
a42c6132c746c86e9fc27ec80cbd699f6ee5edca jdk7-b128
f5b60c5a310f992c6ca627d17ca3e042f0e0b2c3 jdk7-b129
+ab107c1bc4b918404b191838c455e9b2892389f3 jdk7-b130
diff --git a/jaxp/LICENSE b/jaxp/LICENSE
index eeab58c..b40a0f4 100644
--- a/jaxp/LICENSE
+++ b/jaxp/LICENSE
@@ -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 --git a/jaxws/.hgtags b/jaxws/.hgtags
index 300f7bc..c0e9eb3 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -104,3 +104,4 @@
ef19f173578c804772d586a959fa3ab8a12c0598 jdk7-b127
88d74afc55938033e744b537a22714bb2c82c9c0 jdk7-b128
0f7b39ad902424e949e3d2dca8411b884888a76f jdk7-b129
+ba1fac1c2083196422a12130db174334179a4d44 jdk7-b130
diff --git a/jaxws/LICENSE b/jaxws/LICENSE
index eeab58c..b40a0f4 100644
--- a/jaxws/LICENSE
+++ b/jaxws/LICENSE
@@ -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 --git a/jdk/.hgtags b/jdk/.hgtags
index 3cd8441..453018d 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -104,3 +104,4 @@
29e09de1d0b4f84faea114cf10b3ec08b59acc4e jdk7-b127
f08682e23279d6cccbdcafda1eb0647ba4900874 jdk7-b128
14cd5d54a8d0b9c368d60ea83a066735b9931015 jdk7-b129
+bdc069d3f9101f89ec3f81c2950ee2d68fa846d3 jdk7-b130
diff --git a/jdk/LICENSE b/jdk/LICENSE
index eeab58c..b40a0f4 100644
--- a/jdk/LICENSE
+++ b/jdk/LICENSE
@@ -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 --git a/jdk/make/common/Defs-windows.gmk b/jdk/make/common/Defs-windows.gmk
index 7899b0e..87bc793 100644
--- a/jdk/make/common/Defs-windows.gmk
+++ b/jdk/make/common/Defs-windows.gmk
@@ -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 --git a/jdk/make/common/Release.gmk b/jdk/make/common/Release.gmk
index 9af023f..224dcd1 100644
--- a/jdk/make/common/Release.gmk
+++ b/jdk/make/common/Release.gmk
@@ -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 --git a/jdk/make/common/shared/Defs-windows.gmk b/jdk/make/common/shared/Defs-windows.gmk
index 461913a..d928448 100644
--- a/jdk/make/common/shared/Defs-windows.gmk
+++ b/jdk/make/common/shared/Defs-windows.gmk
@@ -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 --git a/langtools/.hgtags b/langtools/.hgtags
index 93db802..d29cef2 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -104,3 +104,4 @@
1e6094c33187f6c3dca55ced3701ee1f9d73a77d jdk7-b127
d7225b476a5d1aebffb8827e7c72ba2e1651f4e7 jdk7-b128
1383d1ee8b5db13d5df9523d1760df17b9d228d4 jdk7-b129
+7a98db8cbfce77a619057aa4fdde69d2a06d4101 jdk7-b130
diff --git a/langtools/LICENSE b/langtools/LICENSE
index eeab58c..b40a0f4 100644
--- a/langtools/LICENSE
+++ b/langtools/LICENSE
@@ -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 --git a/make/deploy-rules.gmk b/make/deploy-rules.gmk
index 1308d51..d05d409 100644
--- a/make/deploy-rules.gmk
+++ b/make/deploy-rules.gmk
@@ -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
