JDK-6427930 : Hotspot Makefile changes for Tiger Windows/AMD64 Apr 2005 PSDK support
  • Type: Bug
  • Component: hotspot
  • Sub-Component: runtime
  • Affected Version: 5.0u6
  • Priority: P3
  • Status: Closed
  • Resolution: Fixed
  • OS: windows
  • CPU: x86
  • Submitted: 2006-05-19
  • Updated: 2012-10-08
  • Resolved: 2006-07-26
The Version table provides details related to the release that this issue/RFE will be addressed.

Unresolved : Release in which this issue/RFE will be addressed.
Resolved: Release in which this issue/RFE has been resolved.
Fixed : Release in which this issue/RFE has been fixed. The release containing this fix may be available for download as an Early Access Release or a General Availability Release.

To download the current JDK release, click here.
Other
5.0u8 b03Fixed
Related Reports
Relates :  
Description
Update Hotspot Makefiles to recognize the Windows/AMD64 Apr 2005 PSDK version and to select the correct compiler flags when it's used.

Comments
SUGGESTED FIX *** build/windows/build.make- Sat May 20 02:55:34 2006 --- build/windows/build.make Fri May 19 10:59:33 2006 *************** *** 1,7 **** # ! # @(#)build.make 1.24 05/03/01 # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. # --- 1,7 ---- # ! # @(#)build.make 1.25 06/05/19 # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. # *************** *** 123,132 **** --- 123,133 ---- @ echo HS_COMPANY=$(HS_COMPANY) >> $@ @ echo HS_FILEDESC=$(HS_FILEDESC) >> $@ @ echo HS_COPYRIGHT=$(HS_COPYRIGHT) >> $@ @ echo HS_NAME=$(HS_NAME) >> $@ @ echo HS_BUILD_ID=$(HS_BUILD_ID) >> $@ + @ sh $(WorkSpace)/build/windows/get_msc_ver.sh >> $@ checks: checkVariant checkWorkSpace checkVariant: @ if "$(Variant)"=="" echo Need to specify "Variant=[compiler2|compiler1|core]" && false *** build/windows/build_vm_def.sh- Sat May 20 02:55:34 2006 --- build/windows/build_vm_def.sh Fri May 19 10:59:35 2006 *************** *** 1,7 **** # ! # @(#)build_vm_def.sh 1.11 05/03/01 # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. # --- 1,7 ---- # ! # @(#)build_vm_def.sh 1.12 06/05/19 # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. # *************** *** 31,39 **** GREP="$MKS_HOME/grep.exe" SORT="$MKS_HOME/sort.exe" UNIQ="$MKS_HOME/uniq.exe" CAT="$MKS_HOME/cat.exe" RM="$MKS_HOME/rm.exe" ! dumpbin /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def "$CAT" vm1.def vm2.def > vm.def "$RM" -f vm1.def vm2.def --- 31,40 ---- GREP="$MKS_HOME/grep.exe" SORT="$MKS_HOME/sort.exe" UNIQ="$MKS_HOME/uniq.exe" CAT="$MKS_HOME/cat.exe" RM="$MKS_HOME/rm.exe" + DUMPBIN="link.exe /dump" ! $DUMPBIN /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def "$CAT" vm1.def vm2.def > vm.def "$RM" -f vm1.def vm2.def *** build/windows/makefiles/compile.make- Sat May 20 02:55:34 2006 --- build/windows/makefiles/compile.make Fri May 19 10:59:36 2006 *************** *** 1,22 **** # ! # @(#)compile.make 1.26 05/03/01 # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. # # Generic compiler settings CPP=cl.exe !if "$(ARCH)" == "ia64" MACHINE=IA64 CPP_FLAGS=/nologo /W3 /WX /D "CC_INTERP" /D "_LP64" /D "IA64" !else !if "$(ARCH)" == "amd64" MACHINE=AMD64 CPP_FLAGS=/nologo /W3 /D "_LP64" /D "AMD64" !else CPP_FLAGS=/nologo /W3 /WX /Zi /D "IA32" MACHINE=I386 !endif !endif --- 1,30 ---- # ! # @(#)compile.make 1.27 06/05/19 # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. # # Generic compiler settings CPP=cl.exe + BUFFEROVERFLOWLIB= !if "$(ARCH)" == "ia64" MACHINE=IA64 CPP_FLAGS=/nologo /W3 /WX /D "CC_INTERP" /D "_LP64" /D "IA64" !else !if "$(ARCH)" == "amd64" MACHINE=AMD64 CPP_FLAGS=/nologo /W3 /D "_LP64" /D "AMD64" + !if "$(MSC_VER)" == "1400" + # This VS2005 compiler has /GS as a default and requires bufferoverflowU.lib + # on the link command line, otherwise we get missing __security_check_cookie + # externals at link time. Even with /GS-, you need bufferoverflowU.lib. + # NOTE: Currently we decided to not use /GS- + BUFFEROVERFLOWLIB=bufferoverflowU.lib + !endif !else CPP_FLAGS=/nologo /W3 /WX /Zi /D "IA32" MACHINE=I386 !endif !endif *************** *** 23,34 **** # Generic linker settings LINK=link.exe LINK_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 \ ! /opt:ICF,8 /map /debug RC=rc.exe RC_FLAGS=/D "HS_VER=$(HS_VER)" \ /D "HS_DOTVER=$(HS_DOTVER)" \ /D "HS_BUILD_ID=$(HS_BUILD_ID)" \ --- 31,42 ---- # Generic linker settings LINK=link.exe LINK_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 $(BUFFEROVERFLOWLIB) \ ! /nologo /machine:$(MACHINE) /opt:REF /opt:ICF,8 /map /debug RC=rc.exe RC_FLAGS=/D "HS_VER=$(HS_VER)" \ /D "HS_DOTVER=$(HS_DOTVER)" \ /D "HS_BUILD_ID=$(HS_BUILD_ID)" \ *** build/windows/vm/debug/Makefile- Sat May 20 02:55:35 2006 --- build/windows/vm/debug/Makefile Mon May 22 10:21:17 2006 *************** *** 1,7 **** # ! # @(#)Makefile 1.18 05/03/01 # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. # --- 1,7 ---- # ! # @(#)Makefile 1.19 06/05/22 # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. # *************** *** 38,52 **** WINDBG_INCLUDE=$(WindbgHome)\sdk\inc !if "$(ARCH)" == "ia64" SA_CFLAGS = /nologo /MD /W3 /GX /Od /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c WINDBG_LIB=$(WindbgHome)\sdk\lib\ia64 ! SA_LFLAGS = $(WINDBG_LIB)\dbgeng.lib /nologo /subsystem:console /debug /machine:IA64 !else SA_CFLAGS = /nologo /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c WINDBG_LIB = $(WindbgHome)\sdk\lib\i386 ! SA_LFLAGS = $(WINDBG_LIB)\dbgeng.lib /nologo /subsystem:console /debug /machine:I386 !endif AGENT_DIR = $(WorkSpace)/agent SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp --- 38,52 ---- WINDBG_INCLUDE=$(WindbgHome)\sdk\inc !if "$(ARCH)" == "ia64" SA_CFLAGS = /nologo /MD /W3 /GX /Od /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c WINDBG_LIB=$(WindbgHome)\sdk\lib\ia64 ! SA_LFLAGS = $(WINDBG_LIB)\dbgeng.lib $(BUFFEROVERFLOWLIB) /nologo /subsystem:console /debug /machine:IA64 !else SA_CFLAGS = /nologo /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c WINDBG_LIB = $(WindbgHome)\sdk\lib\i386 ! SA_LFLAGS = $(WINDBG_LIB)\dbgeng.lib $(BUFFEROVERFLOWLIB) /nologo /subsystem:console /debug /machine:I386 !endif AGENT_DIR = $(WorkSpace)/agent SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp *** build/windows/vm/release/Makefile- Sat May 20 02:55:35 2006 --- build/windows/vm/release/Makefile Mon May 22 10:21:18 2006 *************** *** 1,7 **** # ! # @(#)Makefile 1.18 05/03/01 # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. # --- 1,7 ---- # ! # @(#)Makefile 1.19 06/05/22 # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. # *************** *** 36,50 **** WINDBG_INCLUDE=$(WindbgHome)\sdk\inc !if "$(ARCH)" == "ia64" SA_CFLAGS = /nologo /MD /W3 /GX /Od /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c WINDBG_LIB=$(WindbgHome)\sdk\lib\ia64 ! SA_LFLAGS = $(WINDBG_LIB)\dbgeng.lib /nologo /subsystem:console /debug /machine:IA64 !else SA_CFLAGS = /nologo /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c WINDBG_LIB =$(WindbgHome)\sdk\lib\i386 ! SA_LFLAGS = $(WINDBG_LIB)\dbgeng.lib /nologo /subsystem:console /debug /machine:I386 !endif AGENT_DIR = $(WorkSpace)/agent SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp --- 36,50 ---- WINDBG_INCLUDE=$(WindbgHome)\sdk\inc !if "$(ARCH)" == "ia64" SA_CFLAGS = /nologo /MD /W3 /GX /Od /D "WIN32" /D "WIN64" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c WINDBG_LIB=$(WindbgHome)\sdk\lib\ia64 ! SA_LFLAGS = $(WINDBG_LIB)\dbgeng.lib $(BUFFEROVERFLOWLIB) /nologo /subsystem:console /debug /machine:IA64 !else SA_CFLAGS = /nologo /MD /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c WINDBG_LIB =$(WindbgHome)\sdk\lib\i386 ! SA_LFLAGS = $(WINDBG_LIB)\dbgeng.lib $(BUFFEROVERFLOWLIB) /nologo /subsystem:console /debug /machine:I386 !endif AGENT_DIR = $(WorkSpace)/agent SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp
24-05-2006

SUGGESTED FIX http://web-east.east/~sbohne/webrev/6427930
24-05-2006

EVALUATION Fix per description.
19-05-2006