Changeset 309 for trunk/openjdk/hotspot/make/windows/makefiles
- Timestamp:
- Feb 13, 2012, 10:07:12 PM (14 years ago)
- Location:
- trunk/openjdk
- Files:
-
- 1 deleted
- 11 edited
- 2 copied
-
. (modified) (1 prop)
-
hotspot/make/windows/makefiles/adlc.make (modified) (5 diffs)
-
hotspot/make/windows/makefiles/compile.make (modified) (3 diffs)
-
hotspot/make/windows/makefiles/debug.make (modified) (5 diffs)
-
hotspot/make/windows/makefiles/defs.make (modified) (1 diff)
-
hotspot/make/windows/makefiles/fastdebug.make (modified) (5 diffs)
-
hotspot/make/windows/makefiles/generated.make (modified) (3 diffs)
-
hotspot/make/windows/makefiles/launcher.make (copied) (copied from branches/vendor/oracle/openjdk6/b24/hotspot/make/windows/makefiles/launcher.make )
-
hotspot/make/windows/makefiles/makedeps.make (deleted)
-
hotspot/make/windows/makefiles/product.make (modified) (5 diffs)
-
hotspot/make/windows/makefiles/projectcreator.make (copied) (copied from branches/vendor/oracle/openjdk6/b24/hotspot/make/windows/makefiles/projectcreator.make )
-
hotspot/make/windows/makefiles/rules.make (modified) (3 diffs)
-
hotspot/make/windows/makefiles/sanity.make (modified) (1 diff)
-
hotspot/make/windows/makefiles/vm.make (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/openjdk
- Property svn:mergeinfo changed
/branches/vendor/oracle/openjdk6/b24 (added) merged: 308 /branches/vendor/oracle/openjdk6/current merged: 307
- Property svn:mergeinfo changed
-
trunk/openjdk/hotspot/make/windows/makefiles/adlc.make
r278 r309 1 1 # 2 # Copyright (c) 1999, 20 09, Oracle and/or its affiliates. All rights reserved.2 # Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 23 23 # 24 24 25 !include $(WorkSpace)/make/windows/makefiles/compile.make26 25 27 26 # Rules for building adlc.exe … … 47 46 !endif 48 47 49 CPP_FLAGS=$(CPP_FLAGS) /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE 48 ADLC_CPP_FLAGS=$(CPP_FLAGS) /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE 50 49 51 50 CPP_INCLUDE_DIRS=\ 52 /I "..\generated" \ 53 /I "$(WorkSpace)\src\share\vm\compiler" \ 54 /I "$(WorkSpace)\src\share\vm\code" \ 55 /I "$(WorkSpace)\src\share\vm\interpreter" \ 56 /I "$(WorkSpace)\src\share\vm\classfile" \ 57 /I "$(WorkSpace)\src\share\vm\asm" \ 58 /I "$(WorkSpace)\src\share\vm\memory" \ 59 /I "$(WorkSpace)\src\share\vm\oops" \ 60 /I "$(WorkSpace)\src\share\vm\prims" \ 61 /I "$(WorkSpace)\src\share\vm\runtime" \ 62 /I "$(WorkSpace)\src\share\vm\utilities" \ 63 /I "$(WorkSpace)\src\share\vm\libadt" \ 64 /I "$(WorkSpace)\src\share\vm\opto" \ 65 /I "$(WorkSpace)\src\os\windows\vm" \ 51 /I "..\generated" \ 52 /I "$(WorkSpace)\src\share\vm" \ 53 /I "$(WorkSpace)\src\os\windows\vm" \ 66 54 /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm" 67 55 68 # NOTE! If you add any files here, you must also update GENERATED_NAMES_IN_ INCL69 # and MakeDepsIDEOptions in makedeps.make.56 # NOTE! If you add any files here, you must also update GENERATED_NAMES_IN_DIR 57 # and ProjectCreatorIDEOptions in projectcreator.make. 70 58 GENERATED_NAMES=\ 71 59 ad_$(Platform_arch_model).cpp \ … … 82 70 83 71 # NOTE! This must be kept in sync with GENERATED_NAMES 84 GENERATED_NAMES_IN_ INCL=\85 incls/ad_$(Platform_arch_model).cpp \86 incls/ad_$(Platform_arch_model).hpp \87 incls/ad_$(Platform_arch_model)_clone.cpp \88 incls/ad_$(Platform_arch_model)_expand.cpp \89 incls/ad_$(Platform_arch_model)_format.cpp \90 incls/ad_$(Platform_arch_model)_gen.cpp \91 incls/ad_$(Platform_arch_model)_misc.cpp \92 incls/ad_$(Platform_arch_model)_peephole.cpp \93 incls/ad_$(Platform_arch_model)_pipeline.cpp \94 incls/adGlobals_$(Platform_arch_model).hpp \95 incls/dfa_$(Platform_arch_model).cpp72 GENERATED_NAMES_IN_DIR=\ 73 $(AdlcOutDir)\ad_$(Platform_arch_model).cpp \ 74 $(AdlcOutDir)\ad_$(Platform_arch_model).hpp \ 75 $(AdlcOutDir)\ad_$(Platform_arch_model)_clone.cpp \ 76 $(AdlcOutDir)\ad_$(Platform_arch_model)_expand.cpp \ 77 $(AdlcOutDir)\ad_$(Platform_arch_model)_format.cpp \ 78 $(AdlcOutDir)\ad_$(Platform_arch_model)_gen.cpp \ 79 $(AdlcOutDir)\ad_$(Platform_arch_model)_misc.cpp \ 80 $(AdlcOutDir)\ad_$(Platform_arch_model)_peephole.cpp \ 81 $(AdlcOutDir)\ad_$(Platform_arch_model)_pipeline.cpp \ 82 $(AdlcOutDir)\adGlobals_$(Platform_arch_model).hpp \ 83 $(AdlcOutDir)\dfa_$(Platform_arch_model).cpp 96 84 97 85 {$(WorkSpace)\src\share\vm\adlc}.cpp.obj:: 98 $(CPP) $( CPP_FLAGS) $(EXH_FLAGS) $(CPP_INCLUDE_DIRS) /c $<86 $(CPP) $(ADLC_CPP_FLAGS) $(EXH_FLAGS) $(CPP_INCLUDE_DIRS) /c $< 99 87 100 88 {$(WorkSpace)\src\share\vm\opto}.cpp.obj:: 101 $(CPP) $( CPP_FLAGS) $(EXH_FLAGS) $(CPP_INCLUDE_DIRS) /c $<89 $(CPP) $(ADLC_CPP_FLAGS) $(EXH_FLAGS) $(CPP_INCLUDE_DIRS) /c $< 102 90 103 91 adlc.exe: main.obj adlparse.obj archDesc.obj arena.obj dfa.obj dict2.obj filebuff.obj \ … … 111 99 !endif 112 100 113 $(GENERATED_NAMES_IN_ INCL): $(Platform_arch_model).ad adlc.exe includeDB.current101 $(GENERATED_NAMES_IN_DIR): $(Platform_arch_model).ad adlc.exe 114 102 rm -f $(GENERATED_NAMES) 103 if exist $(AdlcOutDir) rmdir /s /q $(AdlcOutDir) 104 mkdir $(AdlcOutDir) 115 105 $(ADLC) $(ADLCFLAGS) $(Platform_arch_model).ad 116 mv $(GENERATED_NAMES) incls/106 mv $(GENERATED_NAMES) $(AdlcOutDir)/ 117 107 118 108 $(Platform_arch_model).ad: $(WorkSpace)/src/cpu/$(Platform_arch)/vm/$(Platform_arch_model).ad $(WorkSpace)/src/os_cpu/windows_$(Platform_arch)/vm/windows_$(Platform_arch_model).ad -
trunk/openjdk/hotspot/make/windows/makefiles/compile.make
r278 r309 1 1 # 2 # Copyright (c) 1997, 20 09, Oracle and/or its affiliates. All rights reserved.2 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 80 80 CPP=ARCH_ERROR 81 81 !endif 82 83 CPP_FLAGS=$(CPP_FLAGS) /D "WIN32" /D "_WINDOWS" 84 85 # Must specify this for sharedRuntimeTrig.cpp 86 CPP_FLAGS=$(CPP_FLAGS) /D "VM_LITTLE_ENDIAN" 87 88 # Used for platform dispatching 89 CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_FAMILY_windows 90 CPP_FLAGS=$(CPP_FLAGS) /D TARGET_ARCH_$(Platform_arch) 91 CPP_FLAGS=$(CPP_FLAGS) /D TARGET_ARCH_MODEL_$(Platform_arch_model) 92 CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_ARCH_windows_$(Platform_arch) 93 CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_ARCH_MODEL_windows_$(Platform_arch_model) 94 CPP_FLAGS=$(CPP_FLAGS) /D TARGET_COMPILER_visCPP 95 82 96 83 97 # MSC_VER is a 4 digit number that tells us what compiler is being used … … 139 153 140 154 # Always add the _STATIC_CPPLIB flag 141 STATIC_CPPLIB_OPTION = /D _STATIC_CPPLIB 155 STATIC_CPPLIB_OPTION = /D _STATIC_CPPLIB /D _DISABLE_DEPRECATE_STATIC_CPPLIB 142 156 MS_RUNTIME_OPTION = $(MS_RUNTIME_OPTION) $(STATIC_CPPLIB_OPTION) 143 157 CPP_FLAGS=$(CPP_FLAGS) $(MS_RUNTIME_OPTION) -
trunk/openjdk/hotspot/make/windows/makefiles/debug.make
r278 r309 1 1 # 2 # Copyright (c) 1997, 20 08, Oracle and/or its affiliates. All rights reserved.2 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 29 29 GENERATED=../generated 30 30 31 default:: _build_pch_file.obj $(AOUT) checkAndBuildSA 31 # Allow the user to turn off precompiled headers from the command line. 32 !if "$(USE_PRECOMPILED_HEADER)" != "0" 33 BUILD_PCH_FILE=_build_pch_file.obj 34 !endif 35 36 default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA 32 37 33 38 !include ../local.make … … 39 44 !include local.make 40 45 41 !include $(GENERATED)/Dependencies42 43 46 HS_BUILD_ID=$(HS_BUILD_VER)-debug 44 47 … … 46 49 $(Res_Files): FORCE 47 50 48 $(AOUT): $(Res_Files)$(Obj_Files)51 vm.def: $(Obj_Files) 49 52 sh $(WorkSpace)/make/windows/build_vm_def.sh 53 54 $(AOUT): $(Res_Files) $(Obj_Files) vm.def 50 55 $(LINK) @<< 51 56 $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) … … 60 65 !include $(WorkSpace)/make/windows/makefiles/shared.make 61 66 !include $(WorkSpace)/make/windows/makefiles/sa.make 67 !include $(WorkSpace)/make/windows/makefiles/launcher.make -
trunk/openjdk/hotspot/make/windows/makefiles/defs.make
r278 r309 1 1 # 2 # Copyright (c) 2006, 20 08, Oracle and/or its affiliates. All rights reserved.2 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # -
trunk/openjdk/hotspot/make/windows/makefiles/fastdebug.make
r278 r309 1 1 # 2 # Copyright (c) 2005, 20 08, Oracle and/or its affiliates. All rights reserved.2 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 29 29 GENERATED=../generated 30 30 31 default:: _build_pch_file.obj $(AOUT) checkAndBuildSA 31 # Allow the user to turn off precompiled headers from the command line. 32 !if "$(USE_PRECOMPILED_HEADER)" != "0" 33 BUILD_PCH_FILE=_build_pch_file.obj 34 !endif 35 36 default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA 32 37 33 38 !include ../local.make … … 39 44 !include local.make 40 45 41 !include $(GENERATED)/Dependencies42 43 46 HS_BUILD_ID=$(HS_BUILD_VER)-fastdebug 44 47 … … 46 49 $(Res_Files): FORCE 47 50 48 $(AOUT): $(Res_Files)$(Obj_Files)51 vm.def: $(Obj_Files) 49 52 sh $(WorkSpace)/make/windows/build_vm_def.sh 53 54 $(AOUT): $(Res_Files) $(Obj_Files) vm.def 50 55 $(LINK) @<< 51 56 $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) … … 58 63 !endif 59 64 60 61 65 !include $(WorkSpace)/make/windows/makefiles/shared.make 62 66 !include $(WorkSpace)/make/windows/makefiles/sa.make 67 !include $(WorkSpace)/make/windows/makefiles/launcher.make -
trunk/openjdk/hotspot/make/windows/makefiles/generated.make
r278 r309 1 1 # 2 # Copyright (c) 2005, 20 08, Oracle and/or its affiliates. All rights reserved.2 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 24 24 25 25 !include ../local.make 26 !include $(WorkSpace)/make/windows/makefiles/ makedeps.make26 !include $(WorkSpace)/make/windows/makefiles/projectcreator.make 27 27 !include local.make 28 28 … … 34 34 !include $(WorkSpace)/make/windows/makefiles/sa.make 35 35 36 AdlcOutDir=adfiles 37 36 38 !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered") 37 default:: includeDB.current Dependencies incls/ad_$(Platform_arch_model).cpp incls/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles)39 default:: $(AdlcOutDir)/ad_$(Platform_arch_model).cpp $(AdlcOutDir)/dfa_$(Platform_arch_model).cpp $(JvmtiGeneratedFiles) buildobjfiles 38 40 !else 39 default:: includeDB.current Dependencies $(JvmtiGeneratedFiles)41 default:: $(JvmtiGeneratedFiles) buildobjfiles 40 42 !endif 41 43 42 # core plus serial gc 43 IncludeDBs_base=$(WorkSpace)/src/share/vm/includeDB_core \ 44 $(WorkSpace)/src/share/vm/includeDB_jvmti \ 45 $(WorkSpace)/src/share/vm/includeDB_gc \ 46 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_serial 44 buildobjfiles: 45 @ sh $(WorkSpace)/make/windows/create_obj_files.sh $(Variant) $(Platform_arch) $(Platform_arch_model) $(WorkSpace) . > objfiles.make 47 46 48 # parallel gc 49 IncludeDBs_gc= $(WorkSpace)/src/share/vm/includeDB_gc_parallel \ 50 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge \ 51 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_shared \ 52 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parNew \ 53 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep \ 54 $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_g1 55 56 IncludeDBs_core=$(IncludeDBs_base) $(IncludeDBs_gc) \ 57 $(WorkSpace)/src/share/vm/includeDB_features 58 59 !if "$(Variant)" == "core" 60 IncludeDBs=$(IncludeDBs_core) 61 !endif 62 63 !if "$(Variant)" == "kernel" 64 IncludeDBs=$(IncludeDBs_base) $(WorkSpace)/src/share/vm/includeDB_compiler1 65 !endif 66 67 !if "$(Variant)" == "compiler1" 68 IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler1 69 !endif 70 71 72 !if "$(Variant)" == "compiler2" 73 IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler2 74 !endif 75 76 !if "$(Variant)" == "tiered" 77 IncludeDBs=$(IncludeDBs_core) $(WorkSpace)/src/share/vm/includeDB_compiler1 \ 78 $(WorkSpace)/src/share/vm/includeDB_compiler2 79 !endif 80 81 # Note we don't generate a Visual C++ project file using MakeDeps for 82 # the batch build. 83 includeDB.current Dependencies: classes/MakeDeps.class $(IncludeDBs) 84 cat $(IncludeDBs) > includeDB 85 if exist incls rmdir /s /q incls 86 mkdir incls 87 $(RUN_JAVA) -Djava.class.path=classes MakeDeps WinGammaPlatform$(VcVersion) $(WorkSpace)/make/windows/platform_$(BUILDARCH) includeDB $(MakeDepsOptions) 88 rm -f includeDB.current 89 cp includeDB includeDB.current 90 91 classes/MakeDeps.class: $(MakeDepsSources) 47 classes/ProjectCreator.class: $(ProjectCreatorSources) 92 48 if exist classes rmdir /s /q classes 93 49 mkdir classes 94 $(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\ MakeDeps -d classes $(MakeDepsSources)50 $(COMPILE_JAVAC) -classpath $(WorkSpace)\src\share\tools\ProjectCreator -d classes $(ProjectCreatorSources) 95 51 96 52 !if ("$(Variant)" == "compiler2") || ("$(Variant)" == "tiered") 97 53 54 !include $(WorkSpace)/make/windows/makefiles/compile.make 98 55 !include $(WorkSpace)/make/windows/makefiles/adlc.make 99 56 -
trunk/openjdk/hotspot/make/windows/makefiles/product.make
r278 r309 1 1 # 2 # Copyright (c) 2005, 20 08, Oracle and/or its affiliates. All rights reserved.2 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 28 28 GENERATED=../generated 29 29 30 default:: _build_pch_file.obj $(AOUT) checkAndBuildSA 30 # Allow the user to turn off precompiled headers from the command line. 31 !if "$(USE_PRECOMPILED_HEADER)" != "0" 32 BUILD_PCH_FILE=_build_pch_file.obj 33 !endif 34 35 default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA 31 36 32 37 !include ../local.make … … 42 47 !include local.make 43 48 44 !include $(GENERATED)/Dependencies45 46 49 HS_BUILD_ID=$(HS_BUILD_VER) 47 50 … … 56 59 << 57 60 !else 58 $(AOUT): $(Res_Files)$(Obj_Files)61 vm.def: $(Obj_Files) 59 62 sh $(WorkSpace)/make/windows/build_vm_def.sh 63 64 $(AOUT): $(Res_Files) $(Obj_Files) vm.def 60 65 $(LINK) @<< 61 66 $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) … … 71 76 !include $(WorkSpace)/make/windows/makefiles/shared.make 72 77 !include $(WorkSpace)/make/windows/makefiles/sa.make 78 !include $(WorkSpace)/make/windows/makefiles/launcher.make -
trunk/openjdk/hotspot/make/windows/makefiles/rules.make
r278 r309 1 1 # 2 # Copyright (c) 2003, 20 09, Oracle and/or its affiliates. All rights reserved.2 # Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 49 49 BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) 50 50 51 ProjectFile= vm.vcproj51 ProjectFile=jvm.vcproj 52 52 53 53 !if "$(MSC_VER)" == "1200" … … 64 64 VcVersion=VC9 65 65 66 !elseif "$(MSC_VER)" == "1600" 67 68 # for compatibility - we don't yet have a ProjectCreator for VC10 69 VcVersion=VC9 70 66 71 !else 67 72 -
trunk/openjdk/hotspot/make/windows/makefiles/sanity.make
r278 r309 1 1 # 2 # Copyright (c) 2006, 20 09, Oracle and/or its affiliates. All rights reserved.2 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # -
trunk/openjdk/hotspot/make/windows/makefiles/vm.make
r278 r309 1 1 # 2 # Copyright (c) 1997, 20 09, Oracle and/or its affiliates. All rights reserved.2 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. 3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 4 # … … 25 25 # Resource file containing VERSIONINFO 26 26 Res_Files=.\version.res 27 28 !include ..\generated\objfiles.make 27 29 28 30 !ifdef RELEASE … … 70 72 CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\"" 71 73 72 CPP_FLAGS=$(CPP_FLAGS) /D "WIN32" /D "_WINDOWS" $(CPP_INCLUDE_DIRS) 73 74 # Must specify this for sharedRuntimeTrig.cpp 75 CPP_FLAGS=$(CPP_FLAGS) /D "VM_LITTLE_ENDIAN" 74 CPP_FLAGS=$(CPP_FLAGS) $(CPP_INCLUDE_DIRS) 76 75 77 76 # Define that so jni.h is on correct side … … 95 94 !endif 96 95 96 # If you modify exports below please do the corresponding changes in 97 # src/share/tools/ProjectCreator/WinGammaPlatformVC7.java 97 98 LINK_FLAGS=$(LINK_FLAGS) $(STACK_SIZE) /subsystem:windows /dll /base:0x8000000 \ 98 99 /export:JNI_GetDefaultJavaVMInitArgs \ … … 112 113 113 114 CPP_INCLUDE_DIRS=\ 114 /I "..\generated" \ 115 /I "..\generated\jvmtifiles" \ 116 /I "$(WorkSpace)\src\share\vm\c1" \ 117 /I "$(WorkSpace)\src\share\vm\compiler" \ 118 /I "$(WorkSpace)\src\share\vm\code" \ 119 /I "$(WorkSpace)\src\share\vm\interpreter" \ 120 /I "$(WorkSpace)\src\share\vm\ci" \ 121 /I "$(WorkSpace)\src\share\vm\classfile" \ 122 /I "$(WorkSpace)\src\share\vm\gc_implementation\parallelScavenge"\ 123 /I "$(WorkSpace)\src\share\vm\gc_implementation\shared"\ 124 /I "$(WorkSpace)\src\share\vm\gc_implementation\parNew"\ 125 /I "$(WorkSpace)\src\share\vm\gc_implementation\concurrentMarkSweep"\ 126 /I "$(WorkSpace)\src\share\vm\gc_implementation\g1"\ 127 /I "$(WorkSpace)\src\share\vm\gc_interface"\ 128 /I "$(WorkSpace)\src\share\vm\asm" \ 129 /I "$(WorkSpace)\src\share\vm\memory" \ 130 /I "$(WorkSpace)\src\share\vm\oops" \ 131 /I "$(WorkSpace)\src\share\vm\prims" \ 132 /I "$(WorkSpace)\src\share\vm\runtime" \ 133 /I "$(WorkSpace)\src\share\vm\services" \ 134 /I "$(WorkSpace)\src\share\vm\utilities" \ 135 /I "$(WorkSpace)\src\share\vm\libadt" \ 136 /I "$(WorkSpace)\src\share\vm\opto" \ 137 /I "$(WorkSpace)\src\os\windows\vm" \ 115 /I "..\generated" \ 116 /I "$(WorkSpace)\src\share\vm" \ 117 /I "$(WorkSpace)\src\share\vm\prims" \ 118 /I "$(WorkSpace)\src\os\windows\vm" \ 138 119 /I "$(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm" \ 139 120 /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm" 140 121 141 CPP_USE_PCH=/Fp"vm.pch" /Yu"incls/_precompiled.incl" 122 CPP_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER 123 124 !if "$(USE_PRECOMPILED_HEADER)" != "0" 125 CPP_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp" 126 !else 127 CPP_USE_PCH=$(CPP_DONT_USE_PCH) 128 !endif 142 129 143 130 # Where to find the source code for the virtual machine 144 VM_PATH=../generated/incls 131 VM_PATH=../generated 132 VM_PATH=$(VM_PATH);../generated/adfiles 145 133 VM_PATH=$(VM_PATH);../generated/jvmtifiles 146 134 VM_PATH=$(VM_PATH);$(WorkSpace)/src/share/vm/c1 … … 174 162 175 163 c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp 176 $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp164 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp 177 165 178 166 os_windows.obj: $(WorkSpace)\src\os\windows\vm\os_windows.cpp 179 $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp167 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp 180 168 181 169 os_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp 182 $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp170 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp 183 171 184 172 osThread_windows.obj: $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp 185 $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp173 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp 186 174 187 175 conditionVar_windows.obj: $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp 188 $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp176 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp 189 177 190 178 getThread_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp 191 $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp179 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp 192 180 193 181 opcodes.obj: $(WorkSpace)\src\share\vm\opto\opcodes.cpp 194 $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp182 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp 195 183 196 184 bytecodeInterpreter.obj: $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp 197 $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp185 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp 198 186 199 187 bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp 200 $(CPP) $(CPP_FLAGS) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp188 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp 201 189 202 190 # Default rules for the Virtual Machine … … 281 269 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 282 270 271 {..\generated\adfiles}.cpp.obj:: 272 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< 273 283 274 {..\generated\jvmtifiles}.cpp.obj:: 284 275 $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $< … … 287 278 288 279 _build_pch_file.obj: 289 @echo #include " incls/_precompiled.incl" > ../generated/_build_pch_file.cpp290 $(CPP) $(CPP_FLAGS) /Fp"vm.pch" /Yc" incls/_precompiled.incl" /c ../generated/_build_pch_file.cpp280 @echo #include "precompiled.hpp" > ../generated/_build_pch_file.cpp 281 $(CPP) $(CPP_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp
Note:
See TracChangeset
for help on using the changeset viewer.
