Mercurial > hg > truffle
comparison make/windows/makefiles/projectcreator.make @ 8265:ded5288f5b96
fix windows build of the server and client vms
author | Andreas Woess <andreas.woess@jku.at> |
---|---|
date | Wed, 13 Mar 2013 21:35:44 +0100 |
parents | 5fc51c1ecdeb |
children | 09290d9deab3 |
comparison
equal
deleted
inserted
replaced
8260:b81f42160093 | 8265:ded5288f5b96 |
---|---|
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=\ | 147 ProjectCreatorIDEOptionsIgnoreGraal=\ |
148 -ignorePath_TARGET graal | 148 -ignorePath_TARGET src/share/vm/graal \ |
149 | 149 -ignorePath_TARGET graal/generated \ |
150 -ignorePath_TARGET vm/graal | |
151 | |
150 ProjectCreatorIDEOptionsIgnoreCompiler2=\ | 152 ProjectCreatorIDEOptionsIgnoreCompiler2=\ |
151 -ignorePath_TARGET compiler2 \ | 153 -ignorePath_TARGET compiler2 \ |
152 -ignorePath_TARGET tiered \ | 154 -ignorePath_TARGET tiered \ |
153 -ignorePath_TARGET src/share/vm/opto \ | 155 -ignorePath_TARGET src/share/vm/opto \ |
154 -ignorePath_TARGET src/share/vm/libadt \ | 156 -ignorePath_TARGET src/share/vm/libadt \ |
173 # Client(C1) compiler specific options | 175 # Client(C1) compiler specific options |
174 ################################################## | 176 ################################################## |
175 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ | 177 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ |
176 -define_compiler1 COMPILER1 \ | 178 -define_compiler1 COMPILER1 \ |
177 -ignorePath_compiler1 core \ | 179 -ignorePath_compiler1 core \ |
178 -ignorePath_compiler1 src/share/vm/graal \ | |
179 $(ProjectCreatorIDEOptionsIgnoreGraal:TARGET=compiler1) \ | 180 $(ProjectCreatorIDEOptionsIgnoreGraal:TARGET=compiler1) \ |
180 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1) | 181 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1) |
181 | 182 |
182 ################################################## | 183 ################################################## |
183 # Graal compiler specific options | 184 # Graal compiler specific options |
184 ################################################## | 185 ################################################## |
185 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ | 186 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ |
186 -define_graal GRAAL \ | 187 -define_graal GRAAL \ |
187 -ignorePath_graal core \ | 188 -ignorePath_graal core \ |
188 -ignorePath_graal src/share/vm/c1 \ | |
189 $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=graal) \ | 189 $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=graal) \ |
190 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=graal) | 190 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=graal) |
191 | 191 |
192 ################################################## | 192 ################################################## |
193 # Server(C2) compiler specific options | 193 # Server(C2) compiler specific options |
194 ################################################## | 194 ################################################## |
195 #NOTE! This list must be kept in sync with GENERATED_NAMES in adlc.make. | 195 #NOTE! This list must be kept in sync with GENERATED_NAMES in adlc.make. |
196 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ | 196 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \ |
197 -define_compiler2 COMPILER2 \ | 197 -define_compiler2 COMPILER2 \ |
198 -define_compiler2 GRAAL \ | |
198 -ignorePath_compiler2 core \ | 199 -ignorePath_compiler2 core \ |
199 -ignorePath_compiler2 src/share/vm/graal \ | 200 -ignorePath_compiler2 graal/generated \ |
200 -additionalFile_compiler2 $(Platform_arch_model).ad \ | 201 -additionalFile_compiler2 $(Platform_arch_model).ad \ |
201 -additionalFile_compiler2 ad_$(Platform_arch_model).cpp \ | 202 -additionalFile_compiler2 ad_$(Platform_arch_model).cpp \ |
202 -additionalFile_compiler2 ad_$(Platform_arch_model).hpp \ | 203 -additionalFile_compiler2 ad_$(Platform_arch_model).hpp \ |
203 -additionalFile_compiler2 ad_$(Platform_arch_model)_clone.cpp \ | 204 -additionalFile_compiler2 ad_$(Platform_arch_model)_clone.cpp \ |
204 -additionalFile_compiler2 ad_$(Platform_arch_model)_expand.cpp \ | 205 -additionalFile_compiler2 ad_$(Platform_arch_model)_expand.cpp \ |
207 -additionalFile_compiler2 ad_$(Platform_arch_model)_misc.cpp \ | 208 -additionalFile_compiler2 ad_$(Platform_arch_model)_misc.cpp \ |
208 -additionalFile_compiler2 ad_$(Platform_arch_model)_peephole.cpp \ | 209 -additionalFile_compiler2 ad_$(Platform_arch_model)_peephole.cpp \ |
209 -additionalFile_compiler2 ad_$(Platform_arch_model)_pipeline.cpp \ | 210 -additionalFile_compiler2 ad_$(Platform_arch_model)_pipeline.cpp \ |
210 -additionalFile_compiler2 adGlobals_$(Platform_arch_model).hpp \ | 211 -additionalFile_compiler2 adGlobals_$(Platform_arch_model).hpp \ |
211 -additionalFile_compiler2 dfa_$(Platform_arch_model).cpp \ | 212 -additionalFile_compiler2 dfa_$(Platform_arch_model).cpp \ |
212 $(ProjectCreatorIDEOptionsIgnoreGraal:TARGET=compiler2) \ | |
213 $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=compiler2) | 213 $(ProjectCreatorIDEOptionsIgnoreCompiler1:TARGET=compiler2) |
214 | 214 |
215 # Add in the jvmti (JSR-163) options | 215 # Add in the jvmti (JSR-163) options |
216 # NOTE: do not pull in jvmtiEnvRecommended.cpp. This file is generated | 216 # NOTE: do not pull in jvmtiEnvRecommended.cpp. This file is generated |
217 # so the programmer can diff it with jvmtiEnv.cpp to be sure the | 217 # so the programmer can diff it with jvmtiEnv.cpp to be sure the |