Mercurial > hg > graal-jvmci-8

comparison make/windows/makefiles/projectcreator.make @ 7216:5a95c784febf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed windows make files and VS2012-specific compilation issues
author Christian Haeubl <haeubl@ssw.jku.at>
date Tue, 04 Dec 2012 11:14:23 +0100
parents e522a00b91aa
children 5fc51c1ecdeb
comparison
equal deleted inserted replaced
7215:7c5f7e7cf2c2 7216:5a95c784febf
142 ProjectCreatorIDEOptionsIgnoreCompiler1=\ 142 ProjectCreatorIDEOptionsIgnoreCompiler1=\
143 -ignorePath_TARGET compiler1 \ 143 -ignorePath_TARGET compiler1 \
144 -ignorePath_TARGET tiered \ 144 -ignorePath_TARGET tiered \
145 -ignorePath_TARGET c1_ 145 -ignorePath_TARGET c1_
146 146
147 ProjectCreatorIDEOptionsIgnoreGraal=\
148 -ignorePath_TARGET graal
149
147 ProjectCreatorIDEOptionsIgnoreCompiler2=\ 150 ProjectCreatorIDEOptionsIgnoreCompiler2=\
148 -ignorePath_TARGET compiler2 \ 151 -ignorePath_TARGET compiler2 \
149 -ignorePath_TARGET tiered \ 152 -ignorePath_TARGET tiered \
150 -ignorePath_TARGET src/share/vm/opto \ 153 -ignorePath_TARGET src/share/vm/opto \
151 -ignorePath_TARGET src/share/vm/libadt \ 154 -ignorePath_TARGET src/share/vm/libadt \
228 ################################################## 231 ##################################################
229 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ 232 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
230 -define_compiler1 COMPILER1 \ 233 -define_compiler1 COMPILER1 \
231 -ignorePath_compiler1 core \ 234 -ignorePath_compiler1 core \
232 -ignorePath_compiler1 src/share/vm/graal \ 235 -ignorePath_compiler1 src/share/vm/graal \
233 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1) 236 $(ProjectCreatorIDEOptionsIgnoreGraal:TARGET=compiler1) \
237 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1)
234 238
235 ################################################## 239 ##################################################
236 # Graal compiler specific options 240 # Graal compiler specific options
237 ################################################## 241 ##################################################
238 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ 242 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
239 -define_graal COMPILER1 \
240 -define_graal GRAAL \ 243 -define_graal GRAAL \
241 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=graal) 244 -ignorePath_graal core \
245 -ignorePath_graal src/share/vm/c1 \
246 $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=graal) \
247 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=graal)
242 248
243 ################################################## 249 ##################################################
244 # Server(C2) compiler specific options 250 # Server(C2) compiler specific options
245 ################################################## 251 ##################################################
246 #NOTE! This list must be kept in sync with GENERATED_NAMES in adlc.make. 252 #NOTE! This list must be kept in sync with GENERATED_NAMES in adlc.make.
258 -additionalFile_compiler2 ad_$(Platform_arch_model)_misc.cpp \ 264 -additionalFile_compiler2 ad_$(Platform_arch_model)_misc.cpp \
259 -additionalFile_compiler2 ad_$(Platform_arch_model)_peephole.cpp \ 265 -additionalFile_compiler2 ad_$(Platform_arch_model)_peephole.cpp \
260 -additionalFile_compiler2 ad_$(Platform_arch_model)_pipeline.cpp \ 266 -additionalFile_compiler2 ad_$(Platform_arch_model)_pipeline.cpp \
261 -additionalFile_compiler2 adGlobals_$(Platform_arch_model).hpp \ 267 -additionalFile_compiler2 adGlobals_$(Platform_arch_model).hpp \
262 -additionalFile_compiler2 dfa_$(Platform_arch_model).cpp \ 268 -additionalFile_compiler2 dfa_$(Platform_arch_model).cpp \
269 $(ProjectCreatorIDEOptionsIgnoreGraal:TARGET=compiler2) \
263 $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=compiler2) 270 $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=compiler2)
264 271
265 # Add in the jvmti (JSR-163) options 272 # Add in the jvmti (JSR-163) options
266 # NOTE: do not pull in jvmtiEnvRecommended.cpp. This file is generated 273 # NOTE: do not pull in jvmtiEnvRecommended.cpp. This file is generated
267 # so the programmer can diff it with jvmtiEnv.cpp to be sure the 274 # so the programmer can diff it with jvmtiEnv.cpp to be sure the