From 246c483c58c09cac862dc34b5b2a2cd6c5ed4137 Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Wed, 16 Feb 2011 13:29:58 -0800 Subject: [PATCH 1/3] 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 527e2fedcd44cea218f5823458b3b977be7e071a Mon Sep 17 00:00:00 2001 From: Kelly O'Hair Date: Wed, 16 Feb 2011 14:33:48 -0800 Subject: [PATCH 2/3] 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 a787d57005127d1000146cc5c0b07329f2f753e3 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Wed, 23 Feb 2011 17:10:16 +0000 Subject: [PATCH 3/3] 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) \