Mercurial > hg > openjdk > jdk6 > hotspot
changeset 4055:2bf10193a736
OPENJDK6-32: OpenJDK6-b31 isn't compatible with Windows platform
Summary: Fixing broken build in openjdk6 for windows. This change bumps up the VS compiler required for build to VS2010 and brings in multiple changes in awt and network stacks from openjdk7u required for compiler upgrade.
Reviewed-by: andrew
Contributed-by: vladislav@azulsystems.com, ygaevsky@azulsystems.com, ivan@azulsystems.com
| author | ikrylov |
|---|---|
| date | Fri, 30 May 2014 17:10:33 +0400 |
| parents | 942fdd23d6f5 |
| children | 98c2e6dca8f6 |
| files | make/windows/makefiles/compile.make |
| diffstat | 1 files changed, 24 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/make/windows/makefiles/compile.make Thu Apr 10 11:54:00 2014 -0400 +++ b/make/windows/makefiles/compile.make Fri May 30 17:10:33 2014 +0400 @@ -22,8 +22,19 @@ # # +# This file is a derivative work resulting from (and including) modifications +# made by Azul Systems, Inc. The date of such changes is 2014. +# These modification are copyright 2014 Azul Systems, Inc., and are made +# available on the same license terms set forth above. +# +# Please contact Azul Systems, Inc., 1173 Borregas Avenue, Sunnyvale, CA 94089 +# USA or visit www.azulsystems.com if you need additional information or have +# any questions. + # Generic compiler settings +!if "x$(CXX)" == "x" CXX=cl.exe +!endif # CXX Flags: (these vary slightly from VC6->VS2003->VS2005 compilers) # /nologo Supress copyright message at every cl.exe startup @@ -50,7 +61,7 @@ # improving the quality of crash log stack traces involving jvm.dll. # These are always used in all compiles -CXX_FLAGS=/nologo /W3 /WX +CXX_FLAGS=$(EXTRA_CFLAGS) /nologo /W3 /WX # Let's add debug information when Full Debug Symbols is enabled !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" @@ -186,7 +197,9 @@ LD_FLAGS = /manifest $(LD_FLAGS) $(BUFFEROVERFLOWLIB) # Manifest Tool - used in VS2005 and later to adjust manifests stored # as resources inside build artifacts. +!if "x$(MT)" == "x" MT=mt.exe +!endif SAFESEH_FLAG = /SAFESEH !endif @@ -198,7 +211,9 @@ LD_FLAGS = /manifest $(LD_FLAGS) # Manifest Tool - used in VS2005 and later to adjust manifests stored # as resources inside build artifacts. +!if "x$(MT)" == "x" MT=mt.exe +!endif SAFESEH_FLAG = /SAFESEH !endif @@ -210,15 +225,14 @@ LD_FLAGS = /manifest $(LD_FLAGS) # Manifest Tool - used in VS2005 and later to adjust manifests stored # as resources inside build artifacts. +!if "x$(MT)" == "x" MT=mt.exe +!endif SAFESEH_FLAG = /SAFESEH !endif -# Compile for space above time. -!if "$(Variant)" == "kernel" -PRODUCT_OPT_OPTION = /O1 /Oy- -FASTDEBUG_OPT_OPTION = /O1 /Oy- -DEBUG_OPT_OPTION = /Od +!if "$(BUILDARCH)" == "i486" +LD_FLAGS = $(SAFESEH_FLAG) $(LD_FLAGS) !endif # If NO_OPTIMIZATIONS is defined in the environment, turn everything off @@ -228,7 +242,9 @@ !endif # Generic linker settings +!if "x$(LD)" == "x" LD=link.exe +!endif LD_FLAGS= $(LD_FLAGS) kernel32.lib user32.lib gdi32.lib winspool.lib \ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \ uuid.lib Wsock32.lib winmm.lib /nologo /machine:$(MACHINE) /opt:REF \ @@ -236,9 +252,6 @@ !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" LD_FLAGS= $(LD_FLAGS) /map /debug !endif -!if "$(BUILDARCH)" == "i486" -LD_FLAGS = $(SAFESEH_FLAG) $(LD_FLAGS) -!endif !if $(MSC_VER) >= 1600 @@ -246,7 +259,9 @@ !endif # Resource compiler settings +!if "x$(RC)" == "x" RC=rc.exe +!endif RC_FLAGS=/D "HS_VER=$(HS_VER)" \ /D "HS_DOTVER=$(HS_DOTVER)" \ /D "HS_BUILD_ID=$(HS_BUILD_ID)" \