From 52dac61212e5f7907c50e324320ee108e15ace79 Mon Sep 17 00:00:00 2001 From: Paul Klingaman Date: Mon, 14 Feb 2011 14:29:10 -0500 Subject: [PATCH 01/15] 7019371: JDK7 is not building UPX. IFTW wrappers are not compressed Reviewed-by: billyh, jqzuo --- make/deploy-rules.gmk | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/make/deploy-rules.gmk b/make/deploy-rules.gmk index 1308d51518b..d05d4097e3c 100644 --- a/make/deploy-rules.gmk +++ b/make/deploy-rules.gmk @@ -64,19 +64,17 @@ ifneq ($(JQS), off) 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 From 932f3af0eb865e3436062bdd9ae12603945e701f Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Wed, 16 Feb 2011 13:29:01 -0800 Subject: [PATCH 02/15] 7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg --- LICENSE | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index eeab58c21c9..b40a0f457d7 100644 --- a/LICENSE +++ b/LICENSE @@ -325,11 +325,11 @@ License instead of this License. "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 From 5c3ac3b6f6f87cfc5ba6eb98501ff78748db2b61 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Wed, 16 Feb 2011 13:29:20 -0800 Subject: [PATCH 03/15] 7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg --- corba/LICENSE | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/corba/LICENSE b/corba/LICENSE index eeab58c21c9..b40a0f457d7 100644 --- a/corba/LICENSE +++ b/corba/LICENSE @@ -325,11 +325,11 @@ License instead of this License. "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 From 4d9392390fdf6d2a21043a241cd634e01405d080 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Wed, 16 Feb 2011 13:29:39 -0800 Subject: [PATCH 04/15] 7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg --- jaxp/LICENSE | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jaxp/LICENSE b/jaxp/LICENSE index eeab58c21c9..b40a0f457d7 100644 --- a/jaxp/LICENSE +++ b/jaxp/LICENSE @@ -325,11 +325,11 @@ License instead of this License. "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 From 2ae751c338a811df2960a95db57a192f93a941ac Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Wed, 16 Feb 2011 13:29:48 -0800 Subject: [PATCH 05/15] 7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg --- jaxws/LICENSE | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jaxws/LICENSE b/jaxws/LICENSE index eeab58c21c9..b40a0f457d7 100644 --- a/jaxws/LICENSE +++ b/jaxws/LICENSE @@ -325,11 +325,11 @@ License instead of this License. "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 From 246c483c58c09cac862dc34b5b2a2cd6c5ed4137 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Wed, 16 Feb 2011 13:29:58 -0800 Subject: [PATCH 06/15] 7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg --- jdk/LICENSE | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jdk/LICENSE b/jdk/LICENSE index eeab58c21c9..b40a0f457d7 100644 --- a/jdk/LICENSE +++ b/jdk/LICENSE @@ -325,11 +325,11 @@ License instead of this License. "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 From cff49a9152743837431d69e886cba92173e60930 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Wed, 16 Feb 2011 13:30:31 -0800 Subject: [PATCH 07/15] 7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg --- hotspot/LICENSE | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hotspot/LICENSE b/hotspot/LICENSE index b53eb1fd1f4..b40a0f457d7 100644 --- a/hotspot/LICENSE +++ b/hotspot/LICENSE @@ -325,11 +325,11 @@ License instead of this License. "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 From 527e2fedcd44cea218f5823458b3b977be7e071a Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Wed, 16 Feb 2011 14:33:48 -0800 Subject: [PATCH 08/15] 7010594: Add /SAFESEH to links on windows to verify safe exceptions Reviewed-by: alanb --- jdk/make/common/Defs-windows.gmk | 8 +++- jdk/make/common/shared/Defs-windows.gmk | 50 +++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/jdk/make/common/Defs-windows.gmk b/jdk/make/common/Defs-windows.gmk index 7899b0e668d..87bc793596d 100644 --- a/jdk/make/common/Defs-windows.gmk +++ b/jdk/make/common/Defs-windows.gmk @@ -359,7 +359,13 @@ ifeq ($(CC_VERSION),msvc) # 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/shared/Defs-windows.gmk b/jdk/make/common/shared/Defs-windows.gmk index 461913ac9dc..d928448b48f 100644 --- a/jdk/make/common/shared/Defs-windows.gmk +++ b/jdk/make/common/shared/Defs-windows.gmk @@ -772,9 +772,20 @@ else 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 @@ define binary_file_verification # binary_file $(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 @@ define binary_file_verification # binary_file ) 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 From edcd96a12953320e2b2af28ee4601c36a8cc0145 Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Fri, 18 Feb 2011 14:23:28 -0800 Subject: [PATCH 09/15] Added tag jdk7-b130 for changeset 00d174cbd0bb --- .hgtags-top-repo | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 4fe77eb16d4..b6d73caeb29 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -104,3 +104,4 @@ b566d490905691787f8931f69947a92c67c6d5e4 jdk7-b126 bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127 57d702105b23fb90e40beaf00f8f8aeae5e249e7 jdk7-b128 a6b015b59fbc2518762c17ccc35702f03ef7713a jdk7-b129 +cc58c11af15411042719e9c82707fdbef60a9e0f jdk7-b130 From f2249adf60dced8d5759ffcc9df5e9494144b6d7 Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Fri, 18 Feb 2011 14:23:33 -0800 Subject: [PATCH 10/15] Added tag jdk7-b130 for changeset 04b2533d5d44 --- corba/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/corba/.hgtags b/corba/.hgtags index 17e1c755061..36bf49bbda2 100644 --- a/corba/.hgtags +++ b/corba/.hgtags @@ -104,3 +104,4 @@ d7532bcd3742f1576dd07ff9fbb535c9c9a276e9 jdk7-b126 64775e83f4df894355f45555f50c410de6727b4e jdk7-b127 9baa8f94a11d6c5cab3f9f0e5a20106326d0932e jdk7-b128 66fa0fcc779296c99746b09efce6109944f82f30 jdk7-b129 +563a8f8b5be3940e9346cffac4eff9ed02b3c69f jdk7-b130 From 4138cbb7b06d838f8a345652508c6910fc561b9b Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Fri, 18 Feb 2011 14:23:37 -0800 Subject: [PATCH 11/15] Added tag jdk7-b130 for changeset 70ed6d8368bc --- hotspot/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/.hgtags b/hotspot/.hgtags index b18bf3dc7f1..83b71afb041 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -148,3 +148,4 @@ d535bf4c12355a2897e918da9f8910c0aceec4fb hs20-b07 9a5762f448595794d449a8e17342abd81a3fadaf jdk7-b128 ae4b185f2ed14af7bab610738c333840598cdcc4 jdk7-b129 ae4b185f2ed14af7bab610738c333840598cdcc4 hs21-b01 +e9aa2ca89ad6c53420623d579765f9706ec523d7 jdk7-b130 From 5d6d7f29f4dc8de6e9d297c49f30baf28abf00fb Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Fri, 18 Feb 2011 14:23:42 -0800 Subject: [PATCH 12/15] Added tag jdk7-b130 for changeset b0a4325b9ef5 --- jaxp/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/jaxp/.hgtags b/jaxp/.hgtags index add6fe9aec2..9de4729e52b 100644 --- a/jaxp/.hgtags +++ b/jaxp/.hgtags @@ -104,3 +104,4 @@ e2aedea6495d61557326928de20dbb2d78fdd9aa jdk7-b123 c532d6dbc8d18d55b5d693599ee5cd8250e16eb4 jdk7-b127 a42c6132c746c86e9fc27ec80cbd699f6ee5edca jdk7-b128 f5b60c5a310f992c6ca627d17ca3e042f0e0b2c3 jdk7-b129 +ab107c1bc4b918404b191838c455e9b2892389f3 jdk7-b130 From cdb0e033c675f9bfb66f92c30997d72ef3d68a69 Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Fri, 18 Feb 2011 14:23:43 -0800 Subject: [PATCH 13/15] Added tag jdk7-b130 for changeset 1607780fe197 --- jaxws/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/jaxws/.hgtags b/jaxws/.hgtags index 300f7bca8a7..c0e9eb3a6dc 100644 --- a/jaxws/.hgtags +++ b/jaxws/.hgtags @@ -104,3 +104,4 @@ d72eea121c3bc2b649272a37b80d9417855b7146 jdk7-b125 ef19f173578c804772d586a959fa3ab8a12c0598 jdk7-b127 88d74afc55938033e744b537a22714bb2c82c9c0 jdk7-b128 0f7b39ad902424e949e3d2dca8411b884888a76f jdk7-b129 +ba1fac1c2083196422a12130db174334179a4d44 jdk7-b130 From dbe007c7b0b0fdc10fb6bae8a4776c3c2436e9a9 Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Fri, 18 Feb 2011 14:23:48 -0800 Subject: [PATCH 14/15] Added tag jdk7-b130 for changeset 8924242a88c8 --- jdk/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/jdk/.hgtags b/jdk/.hgtags index 3cd8441e11e..453018dc5fe 100644 --- a/jdk/.hgtags +++ b/jdk/.hgtags @@ -104,3 +104,4 @@ ac311eb325bfc763698219252bf3cee9e091f3af jdk7-b122 29e09de1d0b4f84faea114cf10b3ec08b59acc4e jdk7-b127 f08682e23279d6cccbdcafda1eb0647ba4900874 jdk7-b128 14cd5d54a8d0b9c368d60ea83a066735b9931015 jdk7-b129 +bdc069d3f9101f89ec3f81c2950ee2d68fa846d3 jdk7-b130 From a787d57005127d1000146cc5c0b07329f2f753e3 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Wed, 23 Feb 2011 17:10:16 +0000 Subject: [PATCH 15/15] 7021314: Build should not install javaws man page Only install javaws.1 when not building OpenJDK Reviewed-by: alanb, ohair --- jdk/make/common/Release.gmk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jdk/make/common/Release.gmk b/jdk/make/common/Release.gmk index 9af023f2c54..224dcd1650b 100644 --- a/jdk/make/common/Release.gmk +++ b/jdk/make/common/Release.gmk @@ -124,9 +124,11 @@ JRE_MAN_PAGES = \ tnameserv.1 \ unpack200.1 +ifndef OPENJDK ifeq ($(ARCH_DATA_MODEL),32) JRE_MAN_PAGES += javaws.1 endif +endif JDK_MAN_PAGES = \ $(JRE_MAN_PAGES) \