Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
Merge
Wed, 12 Nov 2008 05:42:59 -0800
- author
- never
- date
- Wed, 12 Nov 2008 05:42:59 -0800
- changeset 864
- 364141474b40
- parent 863
- 334969144810
- parent 862
- 3c07cda72b7d
- child 865
- 4d20a3aaf1ab
Merge
1.1 --- a/make/windows/makefiles/adlc.make Tue Nov 11 23:03:35 2008 -0800 1.2 +++ b/make/windows/makefiles/adlc.make Wed Nov 12 05:42:59 2008 -0800 1.3 @@ -102,6 +102,12 @@ 1.4 adlc.exe: main.obj adlparse.obj archDesc.obj arena.obj dfa.obj dict2.obj filebuff.obj \ 1.5 forms.obj formsopt.obj formssel.obj opcodes.obj output_c.obj output_h.obj 1.6 $(LINK) $(LINK_FLAGS) /subsystem:console /out:$@ $** 1.7 +!if "$(MT)" != "" 1.8 +# The previous link command created a .manifest file that we want to 1.9 +# insert into the linked artifact so we do not need to track it 1.10 +# separately. Use ";#2" for .dll and ";#1" for .exe: 1.11 + $(MT) /manifest $@.manifest /outputresource:$@;#1 1.12 +!endif 1.13 1.14 $(GENERATED_NAMES_IN_INCL): $(Platform_arch_model).ad adlc.exe includeDB.current 1.15 rm -f $(GENERATED_NAMES)
2.1 --- a/make/windows/makefiles/compile.make Tue Nov 11 23:03:35 2008 -0800 2.2 +++ b/make/windows/makefiles/compile.make Wed Nov 12 05:42:59 2008 -0800 2.3 @@ -30,7 +30,7 @@ 2.4 # /W3 Warning level 3 2.5 # /Zi Include debugging information 2.6 # /WX Treat any warning error as a fatal error 2.7 -# /MD Use dynamic multi-threaded runtime (msvcrt.dll or msvc*71.dll) 2.8 +# /MD Use dynamic multi-threaded runtime (msvcrt.dll or msvc*NN.dll) 2.9 # /MTd Use static multi-threaded runtime debug versions 2.10 # /O1 Optimize for size (/Os), skips /Oi 2.11 # /O2 Optimize for speed (/Ot), adds /Oi to /O1 2.12 @@ -80,8 +80,10 @@ 2.13 CPP=ARCH_ERROR 2.14 !endif 2.15 2.16 -# MSC_VER is a 4 digit number that tells us what compiler is being used, it is 2.17 -# generated when the local.make file is created by the script gen_msc_ver.sh. 2.18 +# MSC_VER is a 4 digit number that tells us what compiler is being used 2.19 +# and is generated when the local.make file is created by build.make 2.20 +# via the script get_msc_ver.sh 2.21 +# 2.22 # If MSC_VER is set, it overrides the above default setting. 2.23 # But it should be set. 2.24 # Possible values: 2.25 @@ -89,13 +91,14 @@ 2.26 # 1300 and 1310 is VS2003 or VC7 2.27 # 1399 is our fake number for the VS2005 compiler that really isn't 1400 2.28 # 1400 is for VS2005 2.29 +# 1500 is for VS2008 2.30 # Do not confuse this MSC_VER with the predefined macro _MSC_VER that the 2.31 # compiler provides, when MSC_VER==1399, _MSC_VER will be 1400. 2.32 # Normally they are the same, but a pre-release of the VS2005 compilers 2.33 # in the Windows 64bit Platform SDK said it was 1400 when it was really 2.34 # closer to VS2003 in terms of option spellings, so we use 1399 for that 2.35 # 1400 version that really isn't 1400. 2.36 -# See the file gen_msc_ver.sh for more info. 2.37 +# See the file get_msc_ver.sh for more info. 2.38 !if "x$(MSC_VER)" == "x" 2.39 COMPILER_NAME=$(DEFAULT_COMPILER_NAME) 2.40 !else 2.41 @@ -115,6 +118,9 @@ 2.42 !if "$(MSC_VER)" == "1400" 2.43 COMPILER_NAME=VS2005 2.44 !endif 2.45 +!if "$(MSC_VER)" == "1500" 2.46 +COMPILER_NAME=VS2008 2.47 +!endif 2.48 !endif 2.49 2.50 # Add what version of the compiler we think this is to the compile line 2.51 @@ -160,7 +166,25 @@ 2.52 # externals at link time. Even with /GS-, you need bufferoverflowU.lib. 2.53 # NOTE: Currently we decided to not use /GS- 2.54 BUFFEROVERFLOWLIB = bufferoverflowU.lib 2.55 -LINK_FLAGS = $(LINK_FLAGS) $(BUFFEROVERFLOWLIB) 2.56 +LINK_FLAGS = /manifest $(LINK_FLAGS) $(BUFFEROVERFLOWLIB) 2.57 +# Manifest Tool - used in VS2005 and later to adjust manifests stored 2.58 +# as resources inside build artifacts. 2.59 +MT=mt.exe 2.60 +!if "$(BUILDARCH)" == "i486" 2.61 +# VS2005 on x86 restricts the use of certain libc functions without this 2.62 +CPP_FLAGS=$(CPP_FLAGS) /D _CRT_SECURE_NO_DEPRECATE 2.63 +!endif 2.64 +!endif 2.65 + 2.66 +!if "$(COMPILER_NAME)" == "VS2008" 2.67 +PRODUCT_OPT_OPTION = /O2 /Oy- 2.68 +FASTDEBUG_OPT_OPTION = /O2 /Oy- 2.69 +DEBUG_OPT_OPTION = /Od 2.70 +GX_OPTION = /EHsc 2.71 +LINK_FLAGS = /manifest $(LINK_FLAGS) 2.72 +# Manifest Tool - used in VS2005 and later to adjust manifests stored 2.73 +# as resources inside build artifacts. 2.74 +MT=mt.exe 2.75 !if "$(BUILDARCH)" == "i486" 2.76 # VS2005 on x86 restricts the use of certain libc functions without this 2.77 CPP_FLAGS=$(CPP_FLAGS) /D _CRT_SECURE_NO_DEPRECATE
3.1 --- a/make/windows/makefiles/debug.make Tue Nov 11 23:03:35 2008 -0800 3.2 +++ b/make/windows/makefiles/debug.make Wed Nov 12 05:42:59 2008 -0800 3.3 @@ -50,6 +50,12 @@ 3.4 $(LINK) @<< 3.5 $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) 3.6 << 3.7 +!if "$(MT)" != "" 3.8 +# The previous link command created a .manifest file that we want to 3.9 +# insert into the linked artifact so we do not need to track it 3.10 +# separately. Use ";#2" for .dll and ";#1" for .exe: 3.11 + $(MT) /manifest $@.manifest /outputresource:$@;#2 3.12 +!endif 3.13 3.14 !include $(WorkSpace)/make/windows/makefiles/shared.make 3.15 !include $(WorkSpace)/make/windows/makefiles/sa.make
4.1 --- a/make/windows/makefiles/defs.make Tue Nov 11 23:03:35 2008 -0800 4.2 +++ b/make/windows/makefiles/defs.make Wed Nov 12 05:42:59 2008 -0800 4.3 @@ -25,7 +25,7 @@ 4.4 # The common definitions for hotspot windows builds. 4.5 # Include the top level defs.make under make directory instead of this one. 4.6 # This file is included into make/defs.make. 4.7 -# On windows it is only used to construct parameters for 4.8 +# On windows it is only used to construct parameters for 4.9 # make/windows/build.make when make/Makefile is used to build VM. 4.10 4.11 SLASH_JAVA ?= J: 4.12 @@ -69,7 +69,7 @@ 4.13 4.14 JDK_INCLUDE_SUBDIR=win32 4.15 4.16 -# HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined 4.17 +# HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined 4.18 # and added to MAKE_ARGS list in $(GAMMADIR)/make/defs.make. 4.19 4.20 # next parameters are defined in $(GAMMADIR)/make/defs.make. 4.21 @@ -125,7 +125,7 @@ 4.22 endif 4.23 4.24 ifeq ($(BUILD_WIN_SA), 1) 4.25 - ifeq ($(ARCH),ia64) 4.26 + ifeq ($(ARCH),ia64) 4.27 BUILD_WIN_SA = 0 4.28 endif 4.29 endif 4.30 @@ -154,7 +154,7 @@ 4.31 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.dll 4.32 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb 4.33 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map 4.34 - EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 4.35 + EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 4.36 # Must pass this down to nmake. 4.37 MAKE_ARGS += BUILD_WIN_SA=1 4.38 endif
5.1 --- a/make/windows/makefiles/fastdebug.make Tue Nov 11 23:03:35 2008 -0800 5.2 +++ b/make/windows/makefiles/fastdebug.make Wed Nov 12 05:42:59 2008 -0800 5.3 @@ -50,6 +50,13 @@ 5.4 $(LINK) @<< 5.5 $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) 5.6 << 5.7 +!if "$(MT)" != "" 5.8 +# The previous link command created a .manifest file that we want to 5.9 +# insert into the linked artifact so we do not need to track it 5.10 +# separately. Use ";#2" for .dll and ";#1" for .exe: 5.11 + $(MT) /manifest $@.manifest /outputresource:$@;#2 5.12 +!endif 5.13 + 5.14 5.15 !include $(WorkSpace)/make/windows/makefiles/shared.make 5.16 !include $(WorkSpace)/make/windows/makefiles/sa.make
6.1 --- a/make/windows/makefiles/product.make Tue Nov 11 23:03:35 2008 -0800 6.2 +++ b/make/windows/makefiles/product.make Wed Nov 12 05:42:59 2008 -0800 6.3 @@ -61,6 +61,12 @@ 6.4 $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) 6.5 << 6.6 !endif 6.7 +!if "$(MT)" != "" 6.8 +# The previous link command created a .manifest file that we want to 6.9 +# insert into the linked artifact so we do not need to track it 6.10 +# separately. Use ";#2" for .dll and ";#1" for .exe: 6.11 + $(MT) /manifest $@.manifest /outputresource:$@;#2 6.12 +!endif 6.13 6.14 !include $(WorkSpace)/make/windows/makefiles/shared.make 6.15 !include $(WorkSpace)/make/windows/makefiles/sa.make
7.1 --- a/make/windows/makefiles/sa.make Tue Nov 11 23:03:35 2008 -0800 7.2 +++ b/make/windows/makefiles/sa.make Wed Nov 12 05:42:59 2008 -0800 7.3 @@ -92,13 +92,18 @@ 7.4 !else 7.5 SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 /Gm $(GX_OPTION) /ZI /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c 7.6 !endif 7.7 - 7.8 +!if "$(MT)" != "" 7.9 + SA_LINK_FLAGS = /manifest $(SA_LINK_FLAGS) 7.10 +!endif 7.11 SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp 7.12 SA_LFLAGS = $(SA_LINK_FLAGS) /nologo /subsystem:console /map /debug /machine:$(MACHINE) 7.13 7.14 # Note that we do not keep sawindbj.obj around as it would then 7.15 # get included in the dumpbin command in build_vm_def.sh 7.16 7.17 +# In VS2005 or VS2008 the link command creates a .manifest file that we want 7.18 +# to insert into the linked artifact so we do not need to track it separately. 7.19 +# Use ";#2" for .dll and ";#1" for .exe in the MT command below: 7.20 $(SAWINDBG): $(SASRCFILE) 7.21 set INCLUDE=$(SA_INCLUDE)$(INCLUDE) 7.22 $(CPP) @<< 7.23 @@ -109,6 +114,9 @@ 7.24 << 7.25 set LIB=$(SA_LIB)$(LIB) 7.26 $(LINK) /out:$@ /DLL sawindbg.obj dbgeng.lib $(SA_LFLAGS) 7.27 +!if "$(MT)" != "" 7.28 + $(MT) /manifest $(@F).manifest /outputresource:$(@F);#2 7.29 +!endif 7.30 -@rm -f sawindbg.obj 7.31 7.32 cleanall :
8.1 --- a/src/cpu/x86/vm/register_definitions_x86.cpp Tue Nov 11 23:03:35 2008 -0800 8.2 +++ b/src/cpu/x86/vm/register_definitions_x86.cpp Wed Nov 12 05:42:59 2008 -0800 8.3 @@ -22,9 +22,6 @@ 8.4 * 8.5 */ 8.6 8.7 -// make sure the defines don't screw up the declarations later on in this file 8.8 -#define DONT_USE_REGISTER_DEFINES 8.9 - 8.10 #include "incls/_precompiled.incl" 8.11 #include "incls/_register_definitions_x86.cpp.incl" 8.12
