comparison make/Makefile @ 9159:43223d3f5dcd

Merge with hsx/hotspot-comp
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 16 Apr 2013 17:39:46 +0200
parents b9a918201d47 f36e073d56a4
children 1d584a42941f
comparison
equal deleted inserted replaced
9158:9d74a0d7b231 9159:43223d3f5dcd
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.
86 86
87 # Directory for shared code (e.g. graal.jar) 87 # Directory for shared code (e.g. graal.jar)
88 SHARED_DIR=$(OUTPUTDIR)/shared 88 SHARED_DIR=$(OUTPUTDIR)/shared
89 89
90 # Typical C1/C2 targets made available with this Makefile 90 # Typical C1/C2 targets made available with this Makefile
91 C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1 91 C1_VM_TARGETS=product1 fastdebug1 optimized1 debug1
92 C2_VM_TARGETS=product fastdebug optimized jvmg 92 C2_VM_TARGETS=product fastdebug optimized debug
93 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero 93 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero
94 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark 94 SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark debugshark
95 MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 jvmgminimal1 95 MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 debugminimal1
96 GRAAL_VM_TARGETS=productgraal fastdebuggraal optimizedgraal jvmggraal 96 GRAAL_VM_TARGETS=productgraal fastdebuggraal optimizedgraal debuggraal
97 97
98 COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product 98 COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product
99 COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 docs export_fastdebug 99 COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 docs export_fastdebug
100 COMMON_VM_DEBUG_TARGETS=jvmg jvmg1 docs export_debug 100 COMMON_VM_DEBUG_TARGETS=debug debug1 docs export_debug
101 101
102 # JDK directory list 102 # JDK directory list
103 JDK_DIRS=bin include jre lib demo 103 JDK_DIRS=bin include jre lib demo
104 104
105 all: all_product all_fastdebug 105 all: all_product all_fastdebug
106 106
107 ifeq ($(JVM_VARIANT_MINIMAL1),true) 107 ifeq ($(JVM_VARIANT_MINIMAL1),true)
108 all_product: productminimal1 108 all_product: productminimal1
109 all_fastdebug: fastdebugminimal1 109 all_fastdebug: fastdebugminimal1
110 all_debug: jvmgminimal1 110 all_debug: debugminimal1
111 endif 111 endif
112 112
113 ifdef BUILD_CLIENT_ONLY 113 ifdef BUILD_CLIENT_ONLY
114 all_product: product1 docs export_product 114 all_product: product1 docs export_product
115 all_fastdebug: fastdebug1 docs export_fastdebug 115 all_fastdebug: fastdebug1 docs export_fastdebug
116 all_debug: jvmg1 docs export_debug 116 all_debug: debug1 docs export_debug
117 else 117 else
118 ifeq ($(MACOSX_UNIVERSAL),true) 118 ifeq ($(MACOSX_UNIVERSAL),true)
119 all_product: universal_product 119 all_product: universal_product
120 all_fastdebug: universal_fastdebug 120 all_fastdebug: universal_fastdebug
121 all_debug: universal_debug 121 all_debug: universal_debug
129 all_optimized: optimized optimized1 docs export_optimized 129 all_optimized: optimized optimized1 docs export_optimized
130 130
131 allzero: all_productzero all_fastdebugzero 131 allzero: all_productzero all_fastdebugzero
132 all_productzero: productzero docs export_product 132 all_productzero: productzero docs export_product
133 all_fastdebugzero: fastdebugzero docs export_fastdebug 133 all_fastdebugzero: fastdebugzero docs export_fastdebug
134 all_debugzero: jvmgzero docs export_debug 134 all_debugzero: debugzero docs export_debug
135 all_optimizedzero: optimizedzero docs export_optimized 135 all_optimizedzero: optimizedzero docs export_optimized
136 136
137 allshark: all_productshark all_fastdebugshark 137 allshark: all_productshark all_fastdebugshark
138 all_productshark: productshark docs export_product 138 all_productshark: productshark docs export_product
139 all_fastdebugshark: fastdebugshark docs export_fastdebug 139 all_fastdebugshark: fastdebugshark docs export_fastdebug
140 all_debugshark: jvmgshark docs export_debug 140 all_debugshark: debugshark docs export_debug
141 all_optimizedshark: optimizedshark docs export_optimized 141 all_optimizedshark: optimizedshark docs export_optimized
142 142
143 allgraal: all_productgraal all_fastdebuggraal 143 allgraal: all_productgraal all_fastdebuggraal
144 all_productgraal: productgraal docs export_product 144 all_productgraal: productgraal docs export_product
145 all_fastdebuggraal: fastdebuggraal docs export_fastdebug 145 all_fastdebuggraal: fastdebuggraal docs export_fastdebug
146 all_debuggraal: jvmggraal docs export_debug 146 all_debuggraal: debuggraal docs export_debug
147 all_optimizedgraal: optimizedgraal docs export_optimized 147 all_optimizedgraal: optimizedgraal docs export_optimized
148 148
149 # Do everything 149 # Do everything
150 world: all create_jdk 150 world: all create_jdk
151 151
236 236
237 generic_buildshark: 237 generic_buildshark:
238 $(MKDIR) -p $(OUTPUTDIR) 238 $(MKDIR) -p $(OUTPUTDIR)
239 $(CD) $(OUTPUTDIR); \ 239 $(CD) $(OUTPUTDIR); \
240 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 240 $(MAKE) -f $(ABS_OS_MAKEFILE) \
241 $(MAKE_ARGS) $(VM_TARGET) 241 $(MAKE_ARGS) $(VM_TARGET)
242 242
243 generic_buildminimal1: 243 generic_buildminimal1:
244 ifeq ($(JVM_VARIANT_MINIMAL1),true) 244 ifeq ($(JVM_VARIANT_MINIMAL1),true)
245 $(MKDIR) -p $(OUTPUTDIR) 245 $(MKDIR) -p $(OUTPUTDIR)
246 ifeq ($(ARCH_DATA_MODEL), 32) 246 ifeq ($(ARCH_DATA_MODEL), 32)
279 export_fastdebug: 279 export_fastdebug:
280 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ 280 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
281 EXPORT_SUBDIR=/$(@:export_%=%) \ 281 EXPORT_SUBDIR=/$(@:export_%=%) \
282 generic_export 282 generic_export
283 export_debug: 283 export_debug:
284 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=${VM_DEBUG} \ 284 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
285 EXPORT_SUBDIR=/$(@:export_%=%) \ 285 EXPORT_SUBDIR=/$(@:export_%=%) \
286 generic_export 286 generic_export
287 export_optimized: 287 export_optimized:
288 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ 288 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
289 EXPORT_SUBDIR=/$(@:export_%=%) \ 289 EXPORT_SUBDIR=/$(@:export_%=%) \
300 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \ 300 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \
301 VM_SUBDIR=$(@:export_%_jdk=%) \ 301 VM_SUBDIR=$(@:export_%_jdk=%) \
302 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \ 302 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
303 generic_export 303 generic_export
304 export_debug_jdk:: 304 export_debug_jdk::
305 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=${VM_DEBUG} \ 305 $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=$(@:export_%_jdk=%) \
306 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \ 306 ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
307 generic_export 307 generic_export
308 308
309 # Export file copy rules 309 # Export file copy rules
310 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt 310 XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
344 endif 344 endif
345 345
346 # Bin files (windows) 346 # Bin files (windows)
347 ifeq ($(OSNAME),windows) 347 ifeq ($(OSNAME),windows)
348 348
349 # Get jvm.lib 349 # Get jvm.lib
350 $(EXPORT_LIB_DIR)/%.lib: $(MISC_DIR)/%.lib 350 $(EXPORT_LIB_DIR)/%.lib: $(MISC_DIR)/%.lib
351 $(install-file) 351 $(install-file)
352 352
353 # Other libraries (like SA) 353 # Other libraries (like SA)
354 $(EXPORT_JRE_BIN_DIR)/%.diz: $(MISC_DIR)/%.diz 354 $(EXPORT_JRE_BIN_DIR)/%.diz: $(MISC_DIR)/%.diz
589 @$(ECHO) "Running with: $(ALTJVM_DIR)" 589 @$(ECHO) "Running with: $(ALTJVM_DIR)"
590 @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -Xinternalversion 590 @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -Xinternalversion
591 @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -showversion -help 591 @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -showversion -help
592 592
593 # C2 test targets 593 # C2 test targets
594 test_product test_optimized test_fastdebug test_jvmg: 594 test_product test_optimized test_fastdebug test_debug:
595 @$(MAKE) generic_test ALTJVM_DIR="$(C2_DIR)/$(@:test_%=%)" 595 @$(MAKE) generic_test ALTJVM_DIR="$(C2_DIR)/$(@:test_%=%)"
596 596
597 # C1 test targets 597 # C1 test targets
598 test_product1 test_optimized1 test_fastdebug1 test_jvmg1: 598 test_product1 test_optimized1 test_fastdebug1 test_debug1:
599 ifeq ($(ARCH_DATA_MODEL), 32) 599 ifeq ($(ARCH_DATA_MODEL), 32)
600 @$(MAKE) generic_test ALTJVM_DIR="$(C1_DIR)/$(@:test_%1=%)" 600 @$(MAKE) generic_test ALTJVM_DIR="$(C1_DIR)/$(@:test_%1=%)"
601 else 601 else
602 @$(ECHO) "No compiler1 ($(@:test_%=%)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)" 602 @$(ECHO) "No compiler1 ($(@:test_%=%)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)"
603 endif 603 endif
604 604
605 # Zero test targets 605 # Zero test targets
606 test_productzero test_optimizedzero test_fastdebugzero test_jvmgzero: 606 test_productzero test_optimizedzero test_fastdebugzero test_debugzero:
607 @$(MAKE) generic_test ALTJVM_DIR="$(ZERO_DIR)/$(@:test_%zero=%)" 607 @$(MAKE) generic_test ALTJVM_DIR="$(ZERO_DIR)/$(@:test_%zero=%)"
608 608
609 # Shark test targets 609 # Shark test targets
610 test_productshark test_optimizedshark test_fastdebugshark test_jvmgshark: 610 test_productshark test_optimizedshark test_fastdebugshark test_debugshark:
611 @$(MAKE) generic_test ALTJVM_DIR="$(SHARK_DIR)/$(@:test_%shark=%)" 611 @$(MAKE) generic_test ALTJVM_DIR="$(SHARK_DIR)/$(@:test_%shark=%)"
612 612
613 # Minimal1 test targets 613 # Minimal1 test targets
614 test_productminimal1 test_optimizedminimal1 test_fastdebugminimal1 test_jvmgminimal1: 614 test_productminimal1 test_optimizedminimal1 test_fastdebugminimal1 test_debugminimal1:
615 @$(MAKE) generic_test ALTJVM_DIR="$(MINIMAL1_DIR)/$(@:test_%minimal1=%)" 615 @$(MAKE) generic_test ALTJVM_DIR="$(MINIMAL1_DIR)/$(@:test_%minimal1=%)"
616 616
617 617
618 test_jdk: 618 test_jdk:
619 ifeq ($(JVM_VARIANT_CLIENT), true) 619 ifeq ($(JVM_VARIANT_CLIENT), true)
674 help: intro_help target_help variable_help notes_help examples_help 674 help: intro_help target_help variable_help notes_help examples_help
675 675
676 # Intro help message 676 # Intro help message
677 intro_help: 677 intro_help:
678 @$(ECHO) \ 678 @$(ECHO) \
679 "Makefile for the Hotspot workspace." 679 "Makefile for the Hotspot workspace."
680 @$(ECHO) \ 680 @$(ECHO) \
681 "Default behavior is to build and create an export area for the j2se builds." 681 "Default behavior is to build and create an export area for the j2se builds."
682 682
683 # Target help 683 # Target help
684 target_help: 684 target_help:
685 @$(ECHO) "help: This help message" 685 @$(ECHO) "help: This help message"
686 @$(ECHO) "all: Same as: all_product all_fastdebug" 686 @$(ECHO) "all: Same as: all_product all_fastdebug"
687 @$(ECHO) "world: Same as: all create_jdk" 687 @$(ECHO) "world: Same as: all create_jdk"
688 @$(ECHO) "all_product: Same as: product product1 export_product" 688 @$(ECHO) "all_product: Same as: product product1 export_product"
689 @$(ECHO) "all_fastdebug: Same as: fastdebug fastdebug1 export_fastdebug" 689 @$(ECHO) "all_fastdebug: Same as: fastdebug fastdebug1 export_fastdebug"
690 @$(ECHO) "all_debug: Same as: jvmg jvmg1 export_debug" 690 @$(ECHO) "all_debug: Same as: debug debug1 export_debug"
691 @$(ECHO) "all_optimized: Same as: optimized optimized1 export_optimized" 691 @$(ECHO) "all_optimized: Same as: optimized optimized1 export_optimized"
692 @$(ECHO) "clean: Clean all areas" 692 @$(ECHO) "clean: Clean all areas"
693 @$(ECHO) "export_product: Export product files to EXPORT_PATH" 693 @$(ECHO) "export_product: Export product files to EXPORT_PATH"
694 @$(ECHO) "export_fastdebug: Export fastdebug files to EXPORT_PATH" 694 @$(ECHO) "export_fastdebug: Export fastdebug files to EXPORT_PATH"
695 @$(ECHO) "export_debug: Export debug files to EXPORT_PATH" 695 @$(ECHO) "export_debug: Export debug files to EXPORT_PATH"
778 @$(ECHO) \ 778 @$(ECHO) \
779 " $(MAKE) all" 779 " $(MAKE) all"
780 @$(ECHO) \ 780 @$(ECHO) \
781 " $(MAKE) world" 781 " $(MAKE) world"
782 @$(ECHO) \ 782 @$(ECHO) \
783 " $(MAKE) ALT_BOOTDIR=/opt/java/jdk$(PREVIOUS_JDK_VERSION)" 783 " $(MAKE) ALT_BOOTDIR=/opt/java/jdk$(PREVIOUS_JDK_VERSION)"
784 @$(ECHO) \ 784 @$(ECHO) \
785 " $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk$(JDK_VERSION)" 785 " $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk$(JDK_VERSION)"
786 786
787 # Universal build support 787 # Universal build support
788 ifeq ($(OS_VENDOR), Darwin) 788 ifeq ($(OS_VENDOR), Darwin)
789 ifeq ($(MACOSX_UNIVERSAL),true) 789 ifeq ($(MACOSX_UNIVERSAL),true)
790 include $(GAMMADIR)/make/$(OSNAME)/makefiles/universal.gmk 790 include $(GAMMADIR)/make/$(OSNAME)/makefiles/universal.gmk
791 endif 791 endif
792 endif 792 endif
793
794 # Compatibility for transition to new naming
795 warn_jvmg_deprecated:
796 echo "Warning: The jvmg target has been replaced with debug"
797 echo "Warning: Please update your usage"
798
799 jvmg: warn_jvmg_deprecated debug
800
801 jvmg1: warn_jvmg_deprecated debug1
802
803 jvmgminimal1: warn_jvmg_deprecated debugminimal1
804
805 jvmgcore: warn_jvmg_deprecated debugcore
806
807 jvmgzero: warn_jvmg_deprecated debugzero
808
809 jvmgshark: warn_jvmg_deprecated debugshark
810
811 jvmggraal: warn_jvmg_deprecated debuggraal
793 812
794 # JPRT rule to build this workspace 813 # JPRT rule to build this workspace
795 include $(GAMMADIR)/make/jprt.gmk 814 include $(GAMMADIR)/make/jprt.gmk
796 815
797 .PHONY: all world clobber clean help $(C1_VM_TARGETS) $(C2_VM_TARGETS) \ 816 .PHONY: all world clobber clean help $(C1_VM_TARGETS) $(C2_VM_TARGETS) \