Mercurial > hg > graal-compiler
comparison make/windows/makefiles/projectcreator.make @ 12355:cefad50507d8
Merge with hs25-b53
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 10:38:03 +0200 |
parents | 3cce976666d9 c062a6e1fa33 |
children | edb2e6bd6a01 |
comparison
equal
deleted
inserted
replaced
12058:ccb4f2af2319 | 12355:cefad50507d8 |
---|---|
91 -disablePch bytecodeInterpreter.cpp \ | 91 -disablePch bytecodeInterpreter.cpp \ |
92 -disablePch bytecodeInterpreterWithChecks.cpp \ | 92 -disablePch bytecodeInterpreterWithChecks.cpp \ |
93 -disablePch getThread_windows_$(Platform_arch).cpp \ | 93 -disablePch getThread_windows_$(Platform_arch).cpp \ |
94 -disablePch_compiler2 opcodes.cpp | 94 -disablePch_compiler2 opcodes.cpp |
95 | 95 |
96 !if "$(BUILD_WIN_SA)" != "1" | |
97 BUILD_VM_DEF_FLAG=-nosa | |
98 !endif | |
99 | |
96 # Common options for the IDE builds for c1, and c2 | 100 # Common options for the IDE builds for c1, and c2 |
97 ProjectCreatorIDEOptions=\ | 101 ProjectCreatorIDEOptions=\ |
98 $(ProjectCreatorIDEOptions) \ | 102 $(ProjectCreatorIDEOptions) \ |
99 -sourceBase $(HOTSPOTWORKSPACE) \ | 103 -sourceBase $(HOTSPOTWORKSPACE) \ |
100 -buildBase $(HOTSPOTBUILDSPACE)\%f\%b \ | 104 -buildBase $(HOTSPOTBUILDSPACE)\%f\%b \ |
103 -compiler $(VcVersion) \ | 107 -compiler $(VcVersion) \ |
104 -projectFileName $(HOTSPOTBUILDSPACE)\$(ProjectFile) \ | 108 -projectFileName $(HOTSPOTBUILDSPACE)\$(ProjectFile) \ |
105 -jdkTargetRoot $(HOTSPOTJDKDIST) \ | 109 -jdkTargetRoot $(HOTSPOTJDKDIST) \ |
106 -define ALIGN_STACK_FRAMES \ | 110 -define ALIGN_STACK_FRAMES \ |
107 -define VM_LITTLE_ENDIAN \ | 111 -define VM_LITTLE_ENDIAN \ |
108 -prelink "" "Generating vm.def..." "cd %o set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) set JAVA_HOME=$(HOTSPOTJDKDIST) $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(LD_VER)" \ | 112 -prelink "" "Generating vm.def..." "cd %o set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) set JAVA_HOME=$(HOTSPOTJDKDIST) $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(BUILD_VM_DEF_FLAG) $(LD_VER)" \ |
109 -postbuild "" "Building hotspot.exe..." "cd %o set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) nmake -f $(HOTSPOTWORKSPACE)\make\windows\projectfiles\common\Makefile LOCAL_MAKE=$(HOTSPOTBUILDSPACE)\%f\local.make JAVA_HOME=$(HOTSPOTJDKDIST) launcher" \ | 113 -postbuild "" "Building hotspot.exe..." "cd %o set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) nmake -f $(HOTSPOTWORKSPACE)\make\windows\projectfiles\common\Makefile LOCAL_MAKE=$(HOTSPOTBUILDSPACE)\%f\local.make JAVA_HOME=$(HOTSPOTJDKDIST) launcher" \ |
110 -ignoreFile jsig.c \ | 114 -ignoreFile jsig.c \ |
111 -ignoreFile jvmtiEnvRecommended.cpp \ | 115 -ignoreFile jvmtiEnvRecommended.cpp \ |
112 -ignoreFile jvmtiEnvStub.cpp \ | 116 -ignoreFile jvmtiEnvStub.cpp \ |
113 -ignoreFile globalDefinitions_gcc.hpp \ | 117 -ignoreFile globalDefinitions_gcc.hpp \ |
187 ################################################## | 191 ################################################## |
188 #NOTE! This list must be kept in sync with GENERATED_NAMES in adlc.make. | 192 #NOTE! This list must be kept in sync with GENERATED_NAMES in adlc.make. |
189 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ | 193 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ |
190 -define_compiler2 COMPILER2 \ | 194 -define_compiler2 COMPILER2 \ |
191 -define_compiler2 GRAAL \ | 195 -define_compiler2 GRAAL \ |
192 -define_compiler2 TIERED \ | |
193 -ignorePath_compiler2 graal/generated \ | 196 -ignorePath_compiler2 graal/generated \ |
194 -additionalFile_compiler2 $(Platform_arch_model).ad \ | 197 -additionalFile_compiler2 $(Platform_arch_model).ad \ |
195 -additionalFile_compiler2 ad_$(Platform_arch_model).cpp \ | 198 -additionalFile_compiler2 ad_$(Platform_arch_model).cpp \ |
196 -additionalFile_compiler2 ad_$(Platform_arch_model).hpp \ | 199 -additionalFile_compiler2 ad_$(Platform_arch_model).hpp \ |
197 -additionalFile_compiler2 ad_$(Platform_arch_model)_clone.cpp \ | 200 -additionalFile_compiler2 ad_$(Platform_arch_model)_clone.cpp \ |