Mercurial > hg > graal-jvmci-8
comparison make/Makefile @ 6022:74c359c4a9e5
Merge
author | dcubed |
---|---|
date | Tue, 24 Apr 2012 15:20:40 -0700 |
parents | 3d7ea1dbe0de 744728c16316 |
children | 957c266d8bc5 fb19af007ffc |
comparison
equal
deleted
inserted
replaced
6019:f33c4d0f4c9e | 6022:74c359c4a9e5 |
---|---|
134 # Build or export docs | 134 # Build or export docs |
135 docs: | 135 docs: |
136 ifeq ($(OSNAME),windows) | 136 ifeq ($(OSNAME),windows) |
137 @$(ECHO) "No docs ($(VM_TARGET)) for windows" | 137 @$(ECHO) "No docs ($(VM_TARGET)) for windows" |
138 else | 138 else |
139 # We specify 'BUILD_FLAVOR=product' so that the proper | |
140 # ENABLE_FULL_DEBUG_SYMBOLS value is used. | |
139 $(CD) $(OUTPUTDIR); \ | 141 $(CD) $(OUTPUTDIR); \ |
140 $(MAKE) -f $(ABS_OS_MAKEFILE) \ | 142 $(MAKE) -f $(ABS_OS_MAKEFILE) \ |
141 $(MAKE_ARGS) docs | 143 $(MAKE_ARGS) BUILD_FLAVOR=product docs |
142 endif | 144 endif |
143 | 145 |
144 # Build variation of hotspot | 146 # Build variation of hotspot |
145 $(C1_VM_TARGETS): | 147 $(C1_VM_TARGETS): |
146 $(CD) $(GAMMADIR)/make; \ | 148 $(CD) $(GAMMADIR)/make; \ |
147 $(MAKE) VM_TARGET=$@ generic_build1 $(ALT_OUT) | 149 $(MAKE) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT) |
148 | 150 |
149 $(C2_VM_TARGETS): | 151 $(C2_VM_TARGETS): |
150 $(CD) $(GAMMADIR)/make; \ | 152 $(CD) $(GAMMADIR)/make; \ |
151 $(MAKE) VM_TARGET=$@ generic_build2 $(ALT_OUT) | 153 $(MAKE) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT) |
152 | 154 |
153 $(KERNEL_VM_TARGETS): | 155 $(KERNEL_VM_TARGETS): |
154 $(CD) $(GAMMADIR)/make; \ | 156 $(CD) $(GAMMADIR)/make; \ |
155 $(MAKE) VM_TARGET=$@ generic_buildkernel $(ALT_OUT) | 157 $(MAKE) BUILD_FLAVOR=$(@:%kernel=%) VM_TARGET=$@ \ |
158 generic_buildkernel $(ALT_OUT) | |
156 | 159 |
157 $(ZERO_VM_TARGETS): | 160 $(ZERO_VM_TARGETS): |
158 $(CD) $(GAMMADIR)/make; \ | 161 $(CD) $(GAMMADIR)/make; \ |
159 $(MAKE) VM_TARGET=$@ generic_buildzero $(ALT_OUT) | 162 $(MAKE) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ \ |
163 generic_buildzero $(ALT_OUT) | |
160 | 164 |
161 $(SHARK_VM_TARGETS): | 165 $(SHARK_VM_TARGETS): |
162 $(CD) $(GAMMADIR)/make; \ | 166 $(CD) $(GAMMADIR)/make; \ |
163 $(MAKE) VM_TARGET=$@ generic_buildshark $(ALT_OUT) | 167 $(MAKE) BUILD_FLAVOR=$(@:%shark=%) VM_TARGET=$@ \ |
168 generic_buildshark $(ALT_OUT) | |
164 | 169 |
165 # Build compiler1 (client) rule, different for platforms | 170 # Build compiler1 (client) rule, different for platforms |
166 generic_build1: | 171 generic_build1: |
167 $(MKDIR) -p $(OUTPUTDIR) | 172 $(MKDIR) -p $(OUTPUTDIR) |
168 ifeq ($(OSNAME),windows) | 173 ifeq ($(OSNAME),windows) |
235 $(MAKE_ARGS) $(VM_TARGET) | 240 $(MAKE_ARGS) $(VM_TARGET) |
236 | 241 |
237 # Export file rule | 242 # Export file rule |
238 generic_export: $(EXPORT_LIST) | 243 generic_export: $(EXPORT_LIST) |
239 export_product: | 244 export_product: |
240 $(MAKE) VM_SUBDIR=product generic_export | 245 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ |
246 generic_export | |
241 export_fastdebug: | 247 export_fastdebug: |
242 $(MAKE) VM_SUBDIR=fastdebug EXPORT_SUBDIR=/fastdebug generic_export | 248 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ |
249 EXPORT_SUBDIR=/$(@:export_%=%) \ | |
250 generic_export | |
243 export_debug: | 251 export_debug: |
244 $(MAKE) VM_SUBDIR=${VM_DEBUG} EXPORT_SUBDIR=/debug generic_export | 252 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=${VM_DEBUG} \ |
253 EXPORT_SUBDIR=/$(@:export_%=%) \ | |
254 generic_export | |
245 export_optimized: | 255 export_optimized: |
246 $(MAKE) VM_SUBDIR=optimized EXPORT_SUBDIR=/optimized generic_export | 256 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ |
257 EXPORT_SUBDIR=/$(@:export_%=%) \ | |
258 generic_export | |
247 export_product_jdk:: | 259 export_product_jdk:: |
248 $(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \ | 260 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \ |
249 VM_SUBDIR=product generic_export | 261 VM_SUBDIR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \ |
262 generic_export | |
250 export_optimized_jdk:: | 263 export_optimized_jdk:: |
251 $(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \ | 264 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \ |
252 VM_SUBDIR=optimized generic_export | 265 VM_SUBDIR=$(@:export_%_jdk=%) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \ |
266 generic_export | |
253 export_fastdebug_jdk:: | 267 export_fastdebug_jdk:: |
254 $(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/fastdebug \ | 268 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \ |
255 VM_SUBDIR=fastdebug generic_export | 269 VM_SUBDIR=$(@:export_%_jdk=%) \ |
270 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \ | |
271 generic_export | |
256 export_debug_jdk:: | 272 export_debug_jdk:: |
257 $(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/debug \ | 273 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=${VM_DEBUG} \ |
258 VM_SUBDIR=${VM_DEBUG} generic_export | 274 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \ |
275 generic_export | |
259 | 276 |
260 # Export file copy rules | 277 # Export file copy rules |
261 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt | 278 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt |
262 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs | 279 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs |
263 C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1 | 280 C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1 |
298 # Get jvm.lib | 315 # Get jvm.lib |
299 $(EXPORT_LIB_DIR)/%.lib: $(MISC_DIR)/%.lib | 316 $(EXPORT_LIB_DIR)/%.lib: $(MISC_DIR)/%.lib |
300 $(install-file) | 317 $(install-file) |
301 | 318 |
302 # Other libraries (like SA) | 319 # Other libraries (like SA) |
320 $(EXPORT_JRE_BIN_DIR)/%.diz: $(MISC_DIR)/%.diz | |
321 $(install-file) | |
303 $(EXPORT_JRE_BIN_DIR)/%.dll: $(MISC_DIR)/%.dll | 322 $(EXPORT_JRE_BIN_DIR)/%.dll: $(MISC_DIR)/%.dll |
304 $(install-file) | 323 $(install-file) |
305 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(MISC_DIR)/%.pdb | 324 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(MISC_DIR)/%.pdb |
306 $(install-file) | 325 $(install-file) |
307 $(EXPORT_JRE_BIN_DIR)/%.map: $(MISC_DIR)/%.map | 326 $(EXPORT_JRE_BIN_DIR)/%.map: $(MISC_DIR)/%.map |
308 $(install-file) | 327 $(install-file) |
309 | 328 |
310 # Client files always come from C1 area | 329 # Client files always come from C1 area |
330 $(EXPORT_CLIENT_DIR)/%.diz: $(C1_DIR)/%.diz | |
331 $(install-file) | |
311 $(EXPORT_CLIENT_DIR)/%.dll: $(C1_DIR)/%.dll | 332 $(EXPORT_CLIENT_DIR)/%.dll: $(C1_DIR)/%.dll |
312 $(install-file) | 333 $(install-file) |
313 $(EXPORT_CLIENT_DIR)/%.pdb: $(C1_DIR)/%.pdb | 334 $(EXPORT_CLIENT_DIR)/%.pdb: $(C1_DIR)/%.pdb |
314 $(install-file) | 335 $(install-file) |
315 $(EXPORT_CLIENT_DIR)/%.map: $(C1_DIR)/%.map | 336 $(EXPORT_CLIENT_DIR)/%.map: $(C1_DIR)/%.map |
316 $(install-file) | 337 $(install-file) |
317 | 338 |
318 # Server files always come from C2 area | 339 # Server files always come from C2 area |
340 $(EXPORT_SERVER_DIR)/%.diz: $(C2_DIR)/%.diz | |
341 $(install-file) | |
319 $(EXPORT_SERVER_DIR)/%.dll: $(C2_DIR)/%.dll | 342 $(EXPORT_SERVER_DIR)/%.dll: $(C2_DIR)/%.dll |
320 $(install-file) | 343 $(install-file) |
321 $(EXPORT_SERVER_DIR)/%.pdb: $(C2_DIR)/%.pdb | 344 $(EXPORT_SERVER_DIR)/%.pdb: $(C2_DIR)/%.pdb |
322 $(install-file) | 345 $(install-file) |
323 $(EXPORT_SERVER_DIR)/%.map: $(C2_DIR)/%.map | 346 $(EXPORT_SERVER_DIR)/%.map: $(C2_DIR)/%.map |
324 $(install-file) | 347 $(install-file) |
325 | 348 |
326 # Kernel files always come from kernel area | 349 # Kernel files always come from kernel area |
350 $(EXPORT_KERNEL_DIR)/%.diz: $(KERNEL_DIR)/%.diz | |
351 $(install-file) | |
327 $(EXPORT_KERNEL_DIR)/%.dll: $(KERNEL_DIR)/%.dll | 352 $(EXPORT_KERNEL_DIR)/%.dll: $(KERNEL_DIR)/%.dll |
328 $(install-file) | 353 $(install-file) |
329 $(EXPORT_KERNEL_DIR)/%.pdb: $(KERNEL_DIR)/%.pdb | 354 $(EXPORT_KERNEL_DIR)/%.pdb: $(KERNEL_DIR)/%.pdb |
330 $(install-file) | 355 $(install-file) |
331 $(EXPORT_KERNEL_DIR)/%.map: $(KERNEL_DIR)/%.map | 356 $(EXPORT_KERNEL_DIR)/%.map: $(KERNEL_DIR)/%.map |
345 $(install-file) | 370 $(install-file) |
346 $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo | 371 $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo |
347 $(install-file) | 372 $(install-file) |
348 $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo | 373 $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo |
349 $(install-file) | 374 $(install-file) |
375 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_DIR)/%.diz | |
376 $(install-file) | |
377 $(EXPORT_SERVER_DIR)/%.diz: $(C2_DIR)/%.diz | |
378 $(install-file) | |
379 $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_DIR)/%.diz | |
380 $(install-file) | |
350 endif | 381 endif |
351 ifeq ($(JVM_VARIANT_CLIENT), true) | 382 ifeq ($(JVM_VARIANT_CLIENT), true) |
352 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) | 383 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) |
353 $(install-file) | 384 $(install-file) |
354 $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) | 385 $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) |
358 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo | 389 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo |
359 $(install-file) | 390 $(install-file) |
360 $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo | 391 $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo |
361 $(install-file) | 392 $(install-file) |
362 $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo | 393 $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo |
394 $(install-file) | |
395 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_DIR)/%.diz | |
396 $(install-file) | |
397 $(EXPORT_CLIENT_DIR)/%.diz: $(C1_DIR)/%.diz | |
398 $(install-file) | |
399 $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_DIR)/%.diz | |
363 $(install-file) | 400 $(install-file) |
364 endif | 401 endif |
365 ifeq ($(JVM_VARIANT_ZEROSHARK), true) | 402 ifeq ($(JVM_VARIANT_ZEROSHARK), true) |
366 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX) | 403 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX) |
367 $(install-file) | 404 $(install-file) |