Mercurial > hg > truffle

comparison make/Makefile @ 10169:e10e43e58e92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author dlong
date Wed, 24 Apr 2013 21:11:02 -0400
parents 1c6887c9afaa
children aabf54ccedb1
comparison
equal deleted inserted replaced
10168:a6e09d6dd8e5 10169:e10e43e58e92
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 # 18 #
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 # or visit www.oracle.com if you need additional information or have any 20 # or visit www.oracle.com if you need additional information or have any
21 # questions. 21 # questions.
22 # 22 #
23 # 23 #
24 24
25 # Top level gnumake file for hotspot builds 25 # Top level gnumake file for hotspot builds
26 # 26 #
27 # Default is to build the both product images and construct an export dir. 27 # Default is to build the both product images and construct an export dir.
83 else 83 else
84 ALT_OUT= 84 ALT_OUT=
85 endif 85 endif
86 86
87 # Typical C1/C2 targets made available with this Makefile 87 # Typical C1/C2 targets made available with this Makefile
88 C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1 88 C1_VM_TARGETS=product1 fastdebug1 optimized1 debug1
89 C2_VM_TARGETS=product fastdebug optimized jvmg 89 C2_VM_TARGETS=product fastdebug optimized debug
90 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero 90 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero
91 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark 91 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark debugshark
92 MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 jvmgminimal1 92 MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 debugminimal1
93 93
94 COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product 94 COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product
95 COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 docs export_fastdebug 95 COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 docs export_fastdebug
96 COMMON_VM_DEBUG_TARGETS=jvmg jvmg1 docs export_debug 96 COMMON_VM_DEBUG_TARGETS=debug debug1 docs export_debug
97 97
98 # JDK directory list 98 # JDK directory list
99 JDK_DIRS=bin include jre lib demo 99 JDK_DIRS=bin include jre lib demo
100 100
101 all: all_product all_fastdebug 101 all: all_product all_fastdebug
102 102
103 ifeq ($(JVM_VARIANT_MINIMAL1),true) 103 ifeq ($(JVM_VARIANT_MINIMAL1),true)
104 all_product: productminimal1 104 all_product: productminimal1
105 all_fastdebug: fastdebugminimal1 105 all_fastdebug: fastdebugminimal1
106 all_debug: jvmgminimal1 106 all_debug: debugminimal1
107 endif 107 endif
108 108
109 ifdef BUILD_CLIENT_ONLY 109 ifdef BUILD_CLIENT_ONLY
110 all_product: product1 docs export_product 110 all_product: product1 docs export_product
111 all_fastdebug: fastdebug1 docs export_fastdebug 111 all_fastdebug: fastdebug1 docs export_fastdebug
112 all_debug: jvmg1 docs export_debug 112 all_debug: debug1 docs export_debug
113 else 113 else
114 ifeq ($(MACOSX_UNIVERSAL),true) 114 ifeq ($(MACOSX_UNIVERSAL),true)
115 all_product: universal_product 115 all_product: universal_product
116 all_fastdebug: universal_fastdebug 116 all_fastdebug: universal_fastdebug
117 all_debug: universal_debug 117 all_debug: universal_debug
125 all_optimized: optimized optimized1 docs export_optimized 125 all_optimized: optimized optimized1 docs export_optimized
126 126
127 allzero: all_productzero all_fastdebugzero 127 allzero: all_productzero all_fastdebugzero
128 all_productzero: productzero docs export_product 128 all_productzero: productzero docs export_product
129 all_fastdebugzero: fastdebugzero docs export_fastdebug 129 all_fastdebugzero: fastdebugzero docs export_fastdebug
130 all_debugzero: jvmgzero docs export_debug 130 all_debugzero: debugzero docs export_debug
131 all_optimizedzero: optimizedzero docs export_optimized 131 all_optimizedzero: optimizedzero docs export_optimized
132 132
133 allshark: all_productshark all_fastdebugshark 133 allshark: all_productshark all_fastdebugshark
134 all_productshark: productshark docs export_product 134 all_productshark: productshark docs export_product
135 all_fastdebugshark: fastdebugshark docs export_fastdebug 135 all_fastdebugshark: fastdebugshark docs export_fastdebug
136 all_debugshark: jvmgshark docs export_debug 136 all_debugshark: debugshark docs export_debug
137 all_optimizedshark: optimizedshark docs export_optimized 137 all_optimizedshark: optimizedshark docs export_optimized
138 138
139 # Do everything 139 # Do everything
140 world: all create_jdk 140 world: all create_jdk
141 141
225 225
226 generic_buildshark: 226 generic_buildshark:
227 $(MKDIR) -p $(OUTPUTDIR) 227 $(MKDIR) -p $(OUTPUTDIR)
228 $(CD) $(OUTPUTDIR); \ 228 $(CD) $(OUTPUTDIR); \
229 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 229 $(MAKE) -f $(ABS_OS_MAKEFILE) \
230 $(MAKE_ARGS) $(VM_TARGET) 230 $(MAKE_ARGS) $(VM_TARGET)
231 231
232 generic_buildminimal1: 232 generic_buildminimal1:
233 ifeq ($(JVM_VARIANT_MINIMAL1),true) 233 ifeq ($(JVM_VARIANT_MINIMAL1),true)
234 $(MKDIR) -p $(OUTPUTDIR) 234 $(MKDIR) -p $(OUTPUTDIR)
235 ifeq ($(ARCH_DATA_MODEL), 32) 235 ifeq ($(ARCH_DATA_MODEL), 32)
258 export_fastdebug: 258 export_fastdebug:
259 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ 259 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
260 EXPORT_SUBDIR=/$(@:export_%=%) \ 260 EXPORT_SUBDIR=/$(@:export_%=%) \
261 generic_export 261 generic_export
262 export_debug: 262 export_debug:
263 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=${VM_DEBUG} \ 263 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
264 EXPORT_SUBDIR=/$(@:export_%=%) \ 264 EXPORT_SUBDIR=/$(@:export_%=%) \
265 generic_export 265 generic_export
266 export_optimized: 266 export_optimized:
267 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ 267 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
268 EXPORT_SUBDIR=/$(@:export_%=%) \ 268 EXPORT_SUBDIR=/$(@:export_%=%) \
279 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \ 279 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \
280 VM_SUBDIR=$(@:export_%_jdk=%) \ 280 VM_SUBDIR=$(@:export_%_jdk=%) \
281 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \ 281 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
282 generic_export 282 generic_export
283 export_debug_jdk:: 283 export_debug_jdk::
284 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=${VM_DEBUG} \ 284 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=$(@:export_%_jdk=%) \
285 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \ 285 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
286 generic_export 286 generic_export
287 287
288 # Export file copy rules 288 # Export file copy rules
289 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt 289 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
290 DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs 290 DOCS_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_docs
291 C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1 291 C1_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1/$(VM_SUBDIR)
292 C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2 292 C2_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2/$(VM_SUBDIR)
293 ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero 293 MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1/$(VM_SUBDIR)
294 SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark 294 ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero/$(VM_SUBDIR)
295 C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR) 295 SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark/$(VM_SUBDIR)
296 C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR) 296
297 ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR) 297 # Server (C2)
298 SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
299 MINIMAL1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1
300 MINIMAL1_DIR=$(MINIMAL1_BASE_DIR)/$(VM_SUBDIR)
301
302 ifeq ($(JVM_VARIANT_SERVER), true) 298 ifeq ($(JVM_VARIANT_SERVER), true)
303 MISC_DIR=$(C2_DIR) 299 # Common
304 GEN_DIR=$(C2_BASE_DIR)/generated 300 $(EXPORT_SERVER_DIR)/%.diz: $(C2_DIR)/%.diz
305 endif 301 $(install-file)
302 $(EXPORT_LIB_DIR)/%.jar: $(C2_DIR)/../generated/%.jar
303 $(install-file)
304 $(EXPORT_INCLUDE_DIR)/%: $(C2_DIR)/../generated/jvmtifiles/%
305 $(install-file)
306 # Windows
307 $(EXPORT_SERVER_DIR)/%.dll: $(C2_DIR)/%.dll
308 $(install-file)
309 $(EXPORT_SERVER_DIR)/%.pdb: $(C2_DIR)/%.pdb
310 $(install-file)
311 $(EXPORT_SERVER_DIR)/%.map: $(C2_DIR)/%.map
312 $(install-file)
313 $(EXPORT_LIB_DIR)/%.lib: $(C2_DIR)/%.lib
314 $(install-file)
315 $(EXPORT_JRE_BIN_DIR)/%.diz: $(C2_DIR)/%.diz
316 $(install-file)
317 $(EXPORT_JRE_BIN_DIR)/%.dll: $(C2_DIR)/%.dll
318 $(install-file)
319 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(C2_DIR)/%.pdb
320 $(install-file)
321 $(EXPORT_JRE_BIN_DIR)/%.map: $(C2_DIR)/%.map
322 $(install-file)
323 # Unix
324 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
325 $(install-file)
326 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
327 $(install-file)
328 $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
329 $(install-file)
330 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
331 $(install-file)
332 $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
333 $(install-file)
334 $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo
335 $(install-file)
336 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_DIR)/%.diz
337 $(install-file)
338 $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_DIR)/%.diz
339 $(install-file)
340 endif
341
342 # Client (C1)
306 ifeq ($(JVM_VARIANT_CLIENT), true) 343 ifeq ($(JVM_VARIANT_CLIENT), true)
307 MISC_DIR=$(C1_DIR) 344 # Common
308 GEN_DIR=$(C1_BASE_DIR)/generated 345 $(EXPORT_CLIENT_DIR)/%.diz: $(C1_DIR)/%.diz
309 endif 346 $(install-file)
347 $(EXPORT_LIB_DIR)/%.jar: $(C1_DIR)/../generated/%.jar
348 $(install-file)
349 $(EXPORT_INCLUDE_DIR)/%: $(C1_DIR)/../generated/jvmtifiles/%
350 $(install-file)
351 # Windows
352 $(EXPORT_CLIENT_DIR)/%.dll: $(C1_DIR)/%.dll
353 $(install-file)
354 $(EXPORT_CLIENT_DIR)/%.pdb: $(C1_DIR)/%.pdb
355 $(install-file)
356 $(EXPORT_CLIENT_DIR)/%.map: $(C1_DIR)/%.map
357 $(install-file)
358 $(EXPORT_LIB_DIR)/%.lib: $(C1_DIR)/%.lib
359 $(install-file)
360 $(EXPORT_JRE_BIN_DIR)/%.diz: $(C1_DIR)/%.diz
361 $(install-file)
362 $(EXPORT_JRE_BIN_DIR)/%.dll: $(C1_DIR)/%.dll
363 $(install-file)
364 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(C1_DIR)/%.pdb
365 $(install-file)
366 $(EXPORT_JRE_BIN_DIR)/%.map: $(C1_DIR)/%.map
367 $(install-file)
368 # Unix
369 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
370 $(install-file)
371 $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
372 $(install-file)
373 $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
374 $(install-file)
375 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
376 $(install-file)
377 $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
378 $(install-file)
379 $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo
380 $(install-file)
381 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_DIR)/%.diz
382 $(install-file)
383 $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_DIR)/%.diz
384 $(install-file)
385 endif
386
387 # Minimal1
388 ifeq ($(JVM_VARIANT_MINIMAL1), true)
389 # Common
390 $(EXPORT_MINIMAL_DIR)/%.diz: $(MINIMAL1_DIR)/%.diz
391 $(install-file)
392 $(EXPORT_LIB_DIR)/%.jar: $(MINIMAL1_DIR)/../generated/%.jar
393 $(install-file)
394 $(EXPORT_INCLUDE_DIR)/%: $(MINIMAL1_DIR)/../generated/jvmtifiles/%
395 $(install-file)
396 # Windows
397 $(EXPORT_MINIMAL_DIR)/%.dll: $(MINIMAL1_DIR)/%.dll
398 $(install-file)
399 $(EXPORT_MINIMAL_DIR)/%.pdb: $(MINIMAL1_DIR)/%.pdb
400 $(install-file)
401 $(EXPORT_MINIMAL_DIR)/%.map: $(MINIMAL1_DIR)/%.map
402 $(install-file)
403 $(EXPORT_LIB_DIR)/%.lib: $(MINIMAL1_DIR)/%.lib
404 $(install-file)
405 $(EXPORT_JRE_BIN_DIR)/%.diz: $(MINIMAL1_DIR)/%.diz
406 $(install-file)
407 $(EXPORT_JRE_BIN_DIR)/%.dll: $(MINIMAL1_DIR)/%.dll
408 $(install-file)
409 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(MINIMAL1_DIR)/%.pdb
410 $(install-file)
411 $(EXPORT_JRE_BIN_DIR)/%.map: $(MINIMAL1_DIR)/%.map
412 $(install-file)
413 # Unix
414 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
415 $(install-file)
416 $(EXPORT_MINIMAL_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
417 $(install-file)
418 $(EXPORT_MINIMAL_DIR)/64/%.$(LIBRARY_SUFFIX): $(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
419 $(install-file)
420 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(MINIMAL1_DIR)/%.debuginfo
421 $(install-file)
422 $(EXPORT_MINIMAL_DIR)/%.debuginfo: $(MINIMAL1_DIR)/%.debuginfo
423 $(install-file)
424 $(EXPORT_MINIMAL_DIR)/64/%.debuginfo: $(MINIMAL1_DIR)/%.debuginfo
425 $(install-file)
426 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(MINIMAL1_DIR)/%.diz
427 $(install-file)
428 $(EXPORT_MINIMAL_DIR)/64/%.diz: $(MINIMAL1_DIR)/%.diz
429 $(install-file)
430 endif
431
432 # Zero
433 ifeq ($(JVM_VARIANT_ZERO), true)
434 # Common
435 $(EXPORT_LIB_DIR)/%.jar: $(ZERO_DIR)/../generated/%.jar
436 $(install-file)
437 $(EXPORT_INCLUDE_DIR)/%: $(ZERO_DIR)/../generated/jvmtifiles/%
438 $(install-file)
439 # Unix
440 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
441 $(install-file)
442 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(ZERO_DIR)/%.debuginfo
443 $(install-file)
444 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(ZERO_DIR)/%.diz
445 $(install-file)
446 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
447 $(install-file)
448 $(EXPORT_SERVER_DIR)/%.debuginfo: $(ZERO_DIR)/%.debuginfo
449 $(install-file)
450 $(EXPORT_SERVER_DIR)/%.diz: $(ZERO_DIR)/%.diz
451 $(install-file)
452 endif
453
454 # Shark
310 ifeq ($(JVM_VARIANT_ZEROSHARK), true) 455 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
311 MISC_DIR=$(SHARK_DIR) 456 # Common
312 GEN_DIR=$(SHARK_BASE_DIR)/generated 457 $(EXPORT_LIB_DIR)/%.jar: $(SHARK_DIR)/../generated/%.jar
313 endif 458 $(install-file)
314 ifeq ($(JVM_VARIANT_ZERO), true) 459 $(EXPORT_INCLUDE_DIR)/%: $(SHARK_DIR)/../generated/jvmtifiles/%
315 MISC_DIR=$(ZERO_DIR) 460 $(install-file)
316 GEN_DIR=$(ZERO_BASE_DIR)/generated 461 # Unix
317 endif 462 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
318 ifeq ($(JVM_VARIANT_MINIMAL1), true) 463 $(install-file)
319 MISC_DIR=$(MINIMAL1_DIR) 464 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo): $(SHARK_DIR)/%.debuginfo
320 GEN_DIR=$(MINIMAL1_BASE_DIR)/generated 465 $(install-file)
321 endif 466 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(SHARK_DIR)/%.diz
322 467 $(install-file)
323 # Bin files (windows) 468 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
324 ifeq ($(OSNAME),windows) 469 $(install-file)
325 470 $(EXPORT_SERVER_DIR)/%.debuginfo: $(SHARK_DIR)/%.debuginfo
326 # Get jvm.lib 471 $(install-file)
327 $(EXPORT_LIB_DIR)/%.lib: $(MISC_DIR)/%.lib 472 $(EXPORT_SERVER_DIR)/%.diz: $(SHARK_DIR)/%.diz
328 $(install-file) 473 $(install-file)
329 474 endif
330 # Other libraries (like SA)
331 $(EXPORT_JRE_BIN_DIR)/%.diz: $(MISC_DIR)/%.diz
332 $(install-file)
333 $(EXPORT_JRE_BIN_DIR)/%.dll: $(MISC_DIR)/%.dll
334 $(install-file)
335 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(MISC_DIR)/%.pdb
336 $(install-file)
337 $(EXPORT_JRE_BIN_DIR)/%.map: $(MISC_DIR)/%.map
338 $(install-file)
339
340 # Client files always come from C1 area
341 $(EXPORT_CLIENT_DIR)/%.diz: $(C1_DIR)/%.diz
342 $(install-file)
343 $(EXPORT_CLIENT_DIR)/%.dll: $(C1_DIR)/%.dll
344 $(install-file)
345 $(EXPORT_CLIENT_DIR)/%.pdb: $(C1_DIR)/%.pdb
346 $(install-file)
347 $(EXPORT_CLIENT_DIR)/%.map: $(C1_DIR)/%.map
348 $(install-file)
349
350 # Server files always come from C2 area
351 $(EXPORT_SERVER_DIR)/%.diz: $(C2_DIR)/%.diz
352 $(install-file)
353 $(EXPORT_SERVER_DIR)/%.dll: $(C2_DIR)/%.dll
354 $(install-file)
355 $(EXPORT_SERVER_DIR)/%.pdb: $(C2_DIR)/%.pdb
356 $(install-file)
357 $(EXPORT_SERVER_DIR)/%.map: $(C2_DIR)/%.map
358 $(install-file)
359 endif
360
361 # Minimal JVM files always come from minimal area
362 $(EXPORT_MINIMAL_DIR)/%.diz: $(MINIMAL1_DIR)/%.diz
363 $(install-file)
364 $(EXPORT_MINIMAL_DIR)/%.dll: $(MINIMAL1_DIR)/%.dll
365 $(install-file)
366 $(EXPORT_MINIMAL_DIR)/%.pdb: $(MINIMAL1_DIR)/%.pdb
367 $(install-file)
368 $(EXPORT_MINIMAL_DIR)/%.map: $(MINIMAL1_DIR)/%.map
369 $(install-file)
370
371 # Shared Library
372 ifneq ($(OSNAME),windows)
373 ifeq ($(JVM_VARIANT_SERVER), true)
374 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
375 $(install-file)
376 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
377 $(install-file)
378 $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
379 $(install-file)
380 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
381 $(install-file)
382 $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
383 $(install-file)
384 $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo
385 $(install-file)
386 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C2_DIR)/%.diz
387 $(install-file)
388 $(EXPORT_SERVER_DIR)/%.diz: $(C2_DIR)/%.diz
389 $(install-file)
390 $(EXPORT_SERVER_DIR)/64/%.diz: $(C2_DIR)/%.diz
391 $(install-file)
392 endif
393 ifeq ($(JVM_VARIANT_CLIENT), true)
394 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
395 $(install-file)
396 $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
397 $(install-file)
398 $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
399 $(install-file)
400 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
401 $(install-file)
402 $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
403 $(install-file)
404 $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo
405 $(install-file)
406 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(C1_DIR)/%.diz
407 $(install-file)
408 $(EXPORT_CLIENT_DIR)/%.diz: $(C1_DIR)/%.diz
409 $(install-file)
410 $(EXPORT_CLIENT_DIR)/64/%.diz: $(C1_DIR)/%.diz
411 $(install-file)
412 endif
413 ifeq ($(JVM_VARIANT_ZEROSHARK), true)
414 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
415 $(install-file)
416 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo): $(SHARK_DIR)/%.debuginfo
417 $(install-file)
418 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(SHARK_DIR)/%.diz
419 $(install-file)
420 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
421 $(install-file)
422 $(EXPORT_SERVER_DIR)/%.debuginfo: $(SHARK_DIR)/%.debuginfo
423 $(install-file)
424 $(EXPORT_SERVER_DIR)/%.diz: $(SHARK_DIR)/%.diz
425 $(install-file)
426 endif
427 ifeq ($(JVM_VARIANT_ZERO), true)
428 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
429 $(install-file)
430 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(ZERO_DIR)/%.debuginfo
431 $(install-file)
432 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(ZERO_DIR)/%.diz
433 $(install-file)
434 $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
435 $(install-file)
436 $(EXPORT_SERVER_DIR)/%.debuginfo: $(ZERO_DIR)/%.debuginfo
437 $(install-file)
438 $(EXPORT_SERVER_DIR)/%.diz: $(ZERO_DIR)/%.diz
439 $(install-file)
440 endif
441 ifeq ($(JVM_VARIANT_MINIMAL1), true)
442 $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
443 $(install-file)
444 $(EXPORT_MINIMAL_DIR)/%.$(LIBRARY_SUFFIX): $(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
445 $(install-file)
446 $(EXPORT_MINIMAL_DIR)/64/%.$(LIBRARY_SUFFIX): $(MINIMAL1_DIR)/%.$(LIBRARY_SUFFIX)
447 $(install-file)
448 $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(MINIMAL1_DIR)/%.debuginfo
449 $(install-file)
450 $(EXPORT_MINIMAL_DIR)/%.debuginfo: $(MINIMAL1_DIR)/%.debuginfo
451 $(install-file)
452 $(EXPORT_MINIMAL_DIR)/64/%.debuginfo: $(MINIMAL1_DIR)/%.debuginfo
453 $(install-file)
454 $(EXPORT_JRE_LIB_ARCH_DIR)/%.diz: $(MINIMAL1_DIR)/%.diz
455 $(install-file)
456 $(EXPORT_MINIMAL_DIR)/%.diz: $(MINIMAL1_DIR)/%.diz
457 $(install-file)
458 $(EXPORT_MINIMAL_DIR)/64/%.diz: $(MINIMAL1_DIR)/%.diz
459 $(install-file)
460 endif
461 endif
462
463 # Jar file (sa-jdi.jar)
464 $(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
465 $(install-file)
466
467 # Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h, jfr.h)
468 $(EXPORT_INCLUDE_DIR)/%: $(GEN_DIR)/jvmtifiles/%
469 $(install-file)
470 475
471 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/% 476 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/code/%
472 $(install-file) 477 $(install-file)
473 478
474 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/prims/% 479 $(EXPORT_INCLUDE_DIR)/%: $(HS_SRC_DIR)/share/vm/prims/%
539 @$(ECHO) "Running with: $(ALTJVM_DIR)" 544 @$(ECHO) "Running with: $(ALTJVM_DIR)"
540 @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -Xinternalversion 545 @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -Xinternalversion
541 @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -showversion -help 546 @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -showversion -help
542 547
543 # C2 test targets 548 # C2 test targets
544 test_product test_optimized test_fastdebug test_jvmg: 549 test_product test_optimized test_fastdebug test_debug:
545 @$(MAKE) generic_test ALTJVM_DIR="$(C2_DIR)/$(@:test_%=%)" 550 @$(MAKE) generic_test ALTJVM_DIR="$(C2_DIR)/$(@:test_%=%)"
546 551
547 # C1 test targets 552 # C1 test targets
548 test_product1 test_optimized1 test_fastdebug1 test_jvmg1: 553 test_product1 test_optimized1 test_fastdebug1 test_debug1:
549 ifeq ($(ARCH_DATA_MODEL), 32) 554 ifeq ($(ARCH_DATA_MODEL), 32)
550 @$(MAKE) generic_test ALTJVM_DIR="$(C1_DIR)/$(@:test_%1=%)" 555 @$(MAKE) generic_test ALTJVM_DIR="$(C1_DIR)/$(@:test_%1=%)"
551 else 556 else
552 @$(ECHO) "No compiler1 ($(@:test_%=%)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)" 557 @$(ECHO) "No compiler1 ($(@:test_%=%)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)"
553 endif 558 endif
554 559
555 # Zero test targets 560 # Zero test targets
556 test_productzero test_optimizedzero test_fastdebugzero test_jvmgzero: 561 test_productzero test_optimizedzero test_fastdebugzero test_debugzero:
557 @$(MAKE) generic_test ALTJVM_DIR="$(ZERO_DIR)/$(@:test_%zero=%)" 562 @$(MAKE) generic_test ALTJVM_DIR="$(ZERO_DIR)/$(@:test_%zero=%)"
558 563
559 # Shark test targets 564 # Shark test targets
560 test_productshark test_optimizedshark test_fastdebugshark test_jvmgshark: 565 test_productshark test_optimizedshark test_fastdebugshark test_debugshark:
561 @$(MAKE) generic_test ALTJVM_DIR="$(SHARK_DIR)/$(@:test_%shark=%)" 566 @$(MAKE) generic_test ALTJVM_DIR="$(SHARK_DIR)/$(@:test_%shark=%)"
562 567
563 # Minimal1 test targets 568 # Minimal1 test targets
564 test_productminimal1 test_optimizedminimal1 test_fastdebugminimal1 test_jvmgminimal1: 569 test_productminimal1 test_optimizedminimal1 test_fastdebugminimal1 test_debugminimal1:
565 @$(MAKE) generic_test ALTJVM_DIR="$(MINIMAL1_DIR)/$(@:test_%minimal1=%)" 570 @$(MAKE) generic_test ALTJVM_DIR="$(MINIMAL1_DIR)/$(@:test_%minimal1=%)"
566 571
567 572
568 test_jdk: 573 test_jdk:
569 ifeq ($(JVM_VARIANT_CLIENT), true) 574 ifeq ($(JVM_VARIANT_CLIENT), true)
624 help: intro_help target_help variable_help notes_help examples_help 629 help: intro_help target_help variable_help notes_help examples_help
625 630
626 # Intro help message 631 # Intro help message
627 intro_help: 632 intro_help:
628 @$(ECHO) \ 633 @$(ECHO) \
629 "Makefile for the Hotspot workspace." 634 "Makefile for the Hotspot workspace."
630 @$(ECHO) \ 635 @$(ECHO) \
631 "Default behavior is to build and create an export area for the j2se builds." 636 "Default behavior is to build and create an export area for the j2se builds."
632 637
633 # Target help 638 # Target help
634 target_help: 639 target_help:
635 @$(ECHO) "help: This help message" 640 @$(ECHO) "help: This help message"
636 @$(ECHO) "all: Same as: all_product all_fastdebug" 641 @$(ECHO) "all: Same as: all_product all_fastdebug"
637 @$(ECHO) "world: Same as: all create_jdk" 642 @$(ECHO) "world: Same as: all create_jdk"
638 @$(ECHO) "all_product: Same as: product product1 export_product" 643 @$(ECHO) "all_product: Same as: product product1 export_product"
639 @$(ECHO) "all_fastdebug: Same as: fastdebug fastdebug1 export_fastdebug" 644 @$(ECHO) "all_fastdebug: Same as: fastdebug fastdebug1 export_fastdebug"
640 @$(ECHO) "all_debug: Same as: jvmg jvmg1 export_debug" 645 @$(ECHO) "all_debug: Same as: debug debug1 export_debug"
641 @$(ECHO) "all_optimized: Same as: optimized optimized1 export_optimized" 646 @$(ECHO) "all_optimized: Same as: optimized optimized1 export_optimized"
642 @$(ECHO) "clean: Clean all areas" 647 @$(ECHO) "clean: Clean all areas"
643 @$(ECHO) "export_product: Export product files to EXPORT_PATH" 648 @$(ECHO) "export_product: Export product files to EXPORT_PATH"
644 @$(ECHO) "export_fastdebug: Export fastdebug files to EXPORT_PATH" 649 @$(ECHO) "export_fastdebug: Export fastdebug files to EXPORT_PATH"
645 @$(ECHO) "export_debug: Export debug files to EXPORT_PATH" 650 @$(ECHO) "export_debug: Export debug files to EXPORT_PATH"
728 @$(ECHO) \ 733 @$(ECHO) \
729 " $(MAKE) all" 734 " $(MAKE) all"
730 @$(ECHO) \ 735 @$(ECHO) \
731 " $(MAKE) world" 736 " $(MAKE) world"
732 @$(ECHO) \ 737 @$(ECHO) \
733 " $(MAKE) ALT_BOOTDIR=/opt/java/jdk$(PREVIOUS_JDK_VERSION)" 738 " $(MAKE) ALT_BOOTDIR=/opt/java/jdk$(PREVIOUS_JDK_VERSION)"
734 @$(ECHO) \ 739 @$(ECHO) \
735 " $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk$(JDK_VERSION)" 740 " $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk$(JDK_VERSION)"
736 741
737 # Universal build support 742 # Universal build support
738 ifeq ($(OS_VENDOR), Darwin) 743 ifeq ($(OS_VENDOR), Darwin)
739 ifeq ($(MACOSX_UNIVERSAL),true) 744 ifeq ($(MACOSX_UNIVERSAL),true)
740 include $(GAMMADIR)/make/$(OSNAME)/makefiles/universal.gmk 745 include $(GAMMADIR)/make/$(OSNAME)/makefiles/universal.gmk
741 endif 746 endif
742 endif 747 endif
748
749 # Compatibility for transition to new naming
750 warn_jvmg_deprecated:
751 echo "Warning: The jvmg target has been replaced with debug"
752 echo "Warning: Please update your usage"
753
754 jvmg: warn_jvmg_deprecated debug
755
756 jvmg1: warn_jvmg_deprecated debug1
757
758 jvmgminimal1: warn_jvmg_deprecated debugminimal1
759
760 jvmgcore: warn_jvmg_deprecated debugcore
761
762 jvmgzero: warn_jvmg_deprecated debugzero
763
764 jvmgshark: warn_jvmg_deprecated debugshark
743 765
744 # JPRT rule to build this workspace 766 # JPRT rule to build this workspace
745 include $(GAMMADIR)/make/jprt.gmk 767 include $(GAMMADIR)/make/jprt.gmk
746 768
747 .PHONY: all world clobber clean help $(C1_VM_TARGETS) $(C2_VM_TARGETS) \ 769 .PHONY: all world clobber clean help $(C1_VM_TARGETS) $(C2_VM_TARGETS) \