Mercurial > hg > truffle

comparison make/windows/makefiles/projectcreator.make @ 12044:6aef5b6bbdd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Doug Simon <doug.simon@oracle.com>
date Thu, 10 Oct 2013 18:26:09 +0200
parents 3cce976666d9
children cefad50507d8
comparison
equal deleted inserted replaced
12043:e6fd83e09082 12044:6aef5b6bbdd8
42 $(WorkSpace)\src\share\tools\ProjectCreator\BuildConfig.java \ 42 $(WorkSpace)\src\share\tools\ProjectCreator\BuildConfig.java \
43 $(WorkSpace)\src\share\tools\ProjectCreator\ArgsParser.java 43 $(WorkSpace)\src\share\tools\ProjectCreator\ArgsParser.java
44 44
45 # This is only used internally 45 # This is only used internally
46 ProjectCreatorIncludesPRIVATE=\ 46 ProjectCreatorIncludesPRIVATE=\
47 -relativeInclude src\closed\share\vm \ 47 -relativeAltSrcInclude src\closed \
48 -relativeInclude src\closed\os\windows\vm \ 48 -altRelativeInclude share\vm \
49 -relativeInclude src\closed\os_cpu\windows_$(Platform_arch)\vm \ 49 -altRelativeInclude os\windows\vm \
50 -relativeInclude src\closed\cpu\$(Platform_arch)\vm \ 50 -altRelativeInclude os_cpu\windows_$(Platform_arch)\vm \
51 -altRelativeInclude cpu\$(Platform_arch)\vm \
51 -relativeInclude src\share\vm \ 52 -relativeInclude src\share\vm \
52 -relativeInclude src\share\vm\precompiled \ 53 -relativeInclude src\share\vm\precompiled \
53 -relativeInclude src\share\vm\prims\wbtestmethods \ 54 -relativeInclude src\share\vm\prims\wbtestmethods \
54 -relativeInclude src\share\vm\prims \ 55 -relativeInclude src\share\vm\prims \
55 -relativeInclude src\os\windows\vm \ 56 -relativeInclude src\os\windows\vm \
90 -disablePch bytecodeInterpreter.cpp \ 91 -disablePch bytecodeInterpreter.cpp \
91 -disablePch bytecodeInterpreterWithChecks.cpp \ 92 -disablePch bytecodeInterpreterWithChecks.cpp \
92 -disablePch getThread_windows_$(Platform_arch).cpp \ 93 -disablePch getThread_windows_$(Platform_arch).cpp \
93 -disablePch_compiler2 opcodes.cpp 94 -disablePch_compiler2 opcodes.cpp
94 95
95 # Common options for the IDE builds for core, c1, and c2 96 # Common options for the IDE builds for c1, and c2
96 ProjectCreatorIDEOptions=\ 97 ProjectCreatorIDEOptions=\
97 $(ProjectCreatorIDEOptions) \ 98 $(ProjectCreatorIDEOptions) \
98 -sourceBase $(HOTSPOTWORKSPACE) \ 99 -sourceBase $(HOTSPOTWORKSPACE) \
99 -buildBase $(HOTSPOTBUILDSPACE)\%f\%b \ 100 -buildBase $(HOTSPOTBUILDSPACE)\%f\%b \
100 -buildSpace $(HOTSPOTBUILDSPACE) \ 101 -buildSpace $(HOTSPOTBUILDSPACE) \
163 -ignoreFile_TARGET ciTypeFlow.cpp \ 164 -ignoreFile_TARGET ciTypeFlow.cpp \
164 -ignoreFile_TARGET ciTypeFlow.hpp \ 165 -ignoreFile_TARGET ciTypeFlow.hpp \
165 -ignoreFile_TARGET $(Platform_arch_model).ad 166 -ignoreFile_TARGET $(Platform_arch_model).ad
166 167
167 ################################################## 168 ##################################################
168 # Without compiler(core) specific options
169 ##################################################
170 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
171 $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=core) \
172 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=core)
173
174 ##################################################
175 # Client(C1) compiler specific options 169 # Client(C1) compiler specific options
176 ################################################## 170 ##################################################
177 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ 171 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
178 -define_compiler1 COMPILER1 \ 172 -define_compiler1 COMPILER1 \
179 -define_compiler1 GRAAL \ 173 -define_compiler1 GRAAL \
180 -ignorePath_compiler1 core \
181 -ignorePath_compiler1 graal/generated \ 174 -ignorePath_compiler1 graal/generated \
182 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1) 175 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1)
183 176
184 ################################################## 177 ##################################################
185 # Graal compiler specific options 178 # Graal compiler specific options
186 ################################################## 179 ##################################################
187 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ 180 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
188 -define_graal GRAAL \ 181 -define_graal GRAAL \
189 -ignorePath_graal core \
190 $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=graal) \ 182 $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=graal) \
191 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=graal) 183 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=graal)
192 184
193 ################################################## 185 ##################################################
194 # Server(C2) compiler specific options 186 # Server(C2) compiler specific options
196 #NOTE! This list must be kept in sync with GENERATED_NAMES in adlc.make. 188 #NOTE! This list must be kept in sync with GENERATED_NAMES in adlc.make.
197 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ 189 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
198 -define_compiler2 COMPILER2 \ 190 -define_compiler2 COMPILER2 \
199 -define_compiler2 GRAAL \ 191 -define_compiler2 GRAAL \
200 -define_compiler2 TIERED \ 192 -define_compiler2 TIERED \
201 -ignorePath_compiler2 core \
202 -ignorePath_compiler2 graal/generated \ 193 -ignorePath_compiler2 graal/generated \
203 -additionalFile_compiler2 $(Platform_arch_model).ad \ 194 -additionalFile_compiler2 $(Platform_arch_model).ad \
204 -additionalFile_compiler2 ad_$(Platform_arch_model).cpp \ 195 -additionalFile_compiler2 ad_$(Platform_arch_model).cpp \
205 -additionalFile_compiler2 ad_$(Platform_arch_model).hpp \ 196 -additionalFile_compiler2 ad_$(Platform_arch_model).hpp \
206 -additionalFile_compiler2 ad_$(Platform_arch_model)_clone.cpp \ 197 -additionalFile_compiler2 ad_$(Platform_arch_model)_clone.cpp \