Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
Mon, 19 Mar 2012 10:09:24 +0100
- author
- erikj
- date
- Mon, 19 Mar 2012 10:09:24 +0100
- changeset 3649
- 3d7ea1dbe0de
- parent 3648
- 77591ef8983a
- child 3650
- 80fe40862b02
- child 3774
- 7f410b6ea66c
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
Reviewed-by: dholmes, ohair
1.1 --- a/make/Makefile Mon Mar 19 20:13:17 2012 +0100 1.2 +++ b/make/Makefile Mon Mar 19 10:09:24 2012 +0100 1.3 @@ -271,23 +271,25 @@ 1.4 ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR) 1.5 SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR) 1.6 1.7 -# Misc files and generated files need to come from C1 or C2 area 1.8 -ifeq ($(ZERO_BUILD), true) 1.9 -ifeq ($(SHARK_BUILD), true) 1.10 - MISC_DIR=$(SHARK_DIR) 1.11 - GEN_DIR=$(SHARK_BASE_DIR)/generated 1.12 -else 1.13 - MISC_DIR=$(ZERO_DIR) 1.14 - GEN_DIR=$(ZERO_BASE_DIR)/generated 1.15 +ifeq ($(JVM_VARIANT_SERVER), true) 1.16 + MISC_DIR=$(C2_DIR) 1.17 + GEN_DIR=$(C2_BASE_DIR)/generated 1.18 endif 1.19 -else 1.20 -ifeq ($(ARCH_DATA_MODEL), 32) 1.21 - MISC_DIR=$(C1_DIR) 1.22 - GEN_DIR=$(C1_BASE_DIR)/generated 1.23 -else 1.24 - MISC_DIR=$(C2_DIR) 1.25 - GEN_DIR=$(C2_BASE_DIR)/generated 1.26 +ifeq ($(JVM_VARIANT_CLIENT), true) 1.27 + MISC_DIR=$(C1_DIR) 1.28 + GEN_DIR=$(C1_BASE_DIR)/generated 1.29 endif 1.30 +ifeq ($(JVM_VARIANT_KERNEL), true) 1.31 + MISC_DIR=$(C2_DIR) 1.32 + GEN_DIR=$(C2_BASE_DIR)/generated 1.33 +endif 1.34 +ifeq ($(JVM_VARIANT_ZEROSHARK), true) 1.35 + MISC_DIR=$(SHARK_DIR) 1.36 + GEN_DIR=$(SHARK_BASE_DIR)/generated 1.37 +endif 1.38 +ifeq ($(JVM_VARIANT_ZERO), true) 1.39 + MISC_DIR=$(ZERO_DIR) 1.40 + GEN_DIR=$(ZERO_BASE_DIR)/generated 1.41 endif 1.42 1.43 # Bin files (windows) 1.44 @@ -332,46 +334,46 @@ 1.45 1.46 # Shared Library 1.47 ifneq ($(OSNAME),windows) 1.48 - ifeq ($(ZERO_BUILD), true) 1.49 - ifeq ($(SHARK_BUILD), true) 1.50 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX) 1.51 - $(install-file) 1.52 -$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX) 1.53 - $(install-file) 1.54 - else 1.55 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX) 1.56 - $(install-file) 1.57 -$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX) 1.58 - $(install-file) 1.59 + ifeq ($(JVM_VARIANT_SERVER), true) 1.60 + $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) 1.61 + $(install-file) 1.62 + $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) 1.63 + $(install-file) 1.64 + $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) 1.65 + $(install-file) 1.66 + $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo 1.67 + $(install-file) 1.68 + $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo 1.69 + $(install-file) 1.70 + $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo 1.71 + $(install-file) 1.72 endif 1.73 - else 1.74 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) 1.75 - $(install-file) 1.76 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) 1.77 - $(install-file) 1.78 -$(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) 1.79 - $(install-file) 1.80 -$(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) 1.81 - $(install-file) 1.82 -$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) 1.83 - $(install-file) 1.84 -$(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX) 1.85 - $(install-file) 1.86 - 1.87 -# Debug info for shared library 1.88 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo 1.89 - $(install-file) 1.90 -$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo 1.91 - $(install-file) 1.92 -$(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo 1.93 - $(install-file) 1.94 -$(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo 1.95 - $(install-file) 1.96 -$(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo 1.97 - $(install-file) 1.98 -$(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo 1.99 - $(install-file) 1.100 - endif 1.101 + ifeq ($(JVM_VARIANT_CLIENT), true) 1.102 + $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) 1.103 + $(install-file) 1.104 + $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) 1.105 + $(install-file) 1.106 + $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX) 1.107 + $(install-file) 1.108 + $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo 1.109 + $(install-file) 1.110 + $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo 1.111 + $(install-file) 1.112 + $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo 1.113 + $(install-file) 1.114 + endif 1.115 + ifeq ($(JVM_VARIANT_ZEROSHARK), true) 1.116 + $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX) 1.117 + $(install-file) 1.118 + $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX) 1.119 + $(install-file) 1.120 + endif 1.121 + ifeq ($(JVM_VARIANT_ZERO), true) 1.122 + $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX) 1.123 + $(install-file) 1.124 + $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX) 1.125 + $(install-file) 1.126 + endif 1.127 endif 1.128 1.129 # Jar file (sa-jdi.jar) 1.130 @@ -450,18 +452,19 @@ 1.131 ($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -) 1.132 1.133 test_jdk: 1.134 - ifeq ($(ARCH_DATA_MODEL), 32) 1.135 - ifneq ($(ZERO_BUILD), true) 1.136 - $(JDK_IMAGE_DIR)/bin/java -d32 -client -Xinternalversion 1.137 - $(JDK_IMAGE_DIR)/bin/java -d32 -client -version 1.138 - endif 1.139 - $(JDK_IMAGE_DIR)/bin/java -d32 -server -Xinternalversion 1.140 - $(JDK_IMAGE_DIR)/bin/java -d32 -server -version 1.141 - endif 1.142 - ifeq ($(ARCH_DATA_MODEL), 64) 1.143 - $(JDK_IMAGE_DIR)/bin/java -d64 -server -Xinternalversion 1.144 - $(JDK_IMAGE_DIR)/bin/java -d64 -server -version 1.145 - endif 1.146 + ifeq ($(JVM_VARIANT_CLIENT), true) 1.147 + $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -Xinternalversion 1.148 + $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -version 1.149 + endif 1.150 + ifeq ($(findstring true, $(JVM_VARIANT_SERVER)\ 1.151 + $(JVM_VARIANT_ZERO)$(JVM_VARIANT_ZEROSHARK)), true) 1.152 + $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -server -Xinternalversion 1.153 + $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -server -version 1.154 + endif 1.155 + ifeq ($(JVM_VARIANT_KERNEL), true) 1.156 + $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -kernel -Xinternalversion 1.157 + $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -kernel -version 1.158 + endif 1.159 1.160 copy_product_jdk:: 1.161 $(RM) -r $(JDK_IMAGE_DIR)
2.1 --- a/make/bsd/Makefile Mon Mar 19 20:13:17 2012 +0100 2.2 +++ b/make/bsd/Makefile Mon Mar 19 10:09:24 2012 +0100 2.3 @@ -188,7 +188,7 @@ 2.4 # in the build.sh script: 2.5 TARGETS = debug jvmg fastdebug optimized profiled product 2.6 2.7 -ifeq ($(ZERO_BUILD), true) 2.8 +ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 2.9 SUBDIR_DOCS = $(OSNAME)_$(VARIANTARCH)_docs 2.10 else 2.11 SUBDIR_DOCS = $(OSNAME)_$(BUILDARCH)_docs
3.1 --- a/make/bsd/makefiles/buildtree.make Mon Mar 19 20:13:17 2012 +0100 3.2 +++ b/make/bsd/makefiles/buildtree.make Mon Mar 19 10:09:24 2012 +0100 3.3 @@ -69,7 +69,7 @@ 3.4 # For now, until the compiler is less wobbly: 3.5 TESTFLAGS = -Xbatch -showversion 3.6 3.7 -ifeq ($(ZERO_BUILD), true) 3.8 +ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 3.9 PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero 3.10 else 3.11 ifdef USE_SUNCC
4.1 --- a/make/bsd/makefiles/defs.make Mon Mar 19 20:13:17 2012 +0100 4.2 +++ b/make/bsd/makefiles/defs.make Mon Mar 19 10:09:24 2012 +0100 4.3 @@ -38,7 +38,7 @@ 4.4 endif 4.5 4.6 # zero 4.7 -ifeq ($(ZERO_BUILD), true) 4.8 +ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 4.9 ifeq ($(ARCH_DATA_MODEL), 64) 4.10 MAKE_ARGS += LP64=1 4.11 endif 4.12 @@ -124,6 +124,18 @@ 4.13 HS_ARCH = ppc 4.14 endif 4.15 4.16 +# On 32 bit bsd we build server and client, on 64 bit just server. 4.17 +ifeq ($(JVM_VARIANTS),) 4.18 + ifeq ($(ARCH_DATA_MODEL), 32) 4.19 + JVM_VARIANTS:=client,server 4.20 + JVM_VARIANT_CLIENT:=true 4.21 + JVM_VARIANT_SERVER:=true 4.22 + else 4.23 + JVM_VARIANTS:=server 4.24 + JVM_VARIANT_SERVER:=true 4.25 + endif 4.26 +endif 4.27 + 4.28 JDK_INCLUDE_SUBDIR=bsd 4.29 4.30 # Library suffix 4.31 @@ -146,16 +158,14 @@ 4.32 4.33 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar 4.34 4.35 -ifndef BUILD_CLIENT_ONLY 4.36 -EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 4.37 -EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) 4.38 +ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 4.39 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 4.40 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) 4.41 endif 4.42 4.43 -ifneq ($(ZERO_BUILD), true) 4.44 - ifeq ($(ARCH_DATA_MODEL), 32) 4.45 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 4.46 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) 4.47 - endif 4.48 +ifeq ($(JVM_VARIANT_CLIENT),true) 4.49 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 4.50 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) 4.51 endif 4.52 4.53 # Serviceability Binaries
5.1 --- a/make/bsd/makefiles/gcc.make Mon Mar 19 20:13:17 2012 +0100 5.2 +++ b/make/bsd/makefiles/gcc.make Mon Mar 19 10:09:24 2012 +0100 5.3 @@ -105,11 +105,12 @@ 5.4 VM_PICFLAG/AOUT = 5.5 VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO)) 5.6 5.7 -ifeq ($(ZERO_BUILD), true) 5.8 -CFLAGS += $(LIBFFI_CFLAGS) 5.9 +ifeq ($(JVM_VARIANT_ZERO), true) 5.10 + CFLAGS += $(LIBFFI_CFLAGS) 5.11 endif 5.12 -ifeq ($(SHARK_BUILD), true) 5.13 -CFLAGS += $(LLVM_CFLAGS) 5.14 +ifeq ($(JVM_VARIANT_ZEROSHARK), true) 5.15 + CFLAGS += $(LIBFFI_CFLAGS) 5.16 + CFLAGS += $(LLVM_CFLAGS) 5.17 endif 5.18 CFLAGS += $(VM_PICFLAG) 5.19 CFLAGS += -fno-rtti
6.1 --- a/make/bsd/makefiles/vm.make Mon Mar 19 20:13:17 2012 +0100 6.2 +++ b/make/bsd/makefiles/vm.make Mon Mar 19 10:09:24 2012 +0100 6.3 @@ -42,7 +42,7 @@ 6.4 -include $(DEP_DIR)/*.d 6.5 6.6 # read machine-specific adjustments (%%% should do this via buildtree.make?) 6.7 -ifeq ($(ZERO_BUILD), true) 6.8 +ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 6.9 include $(MAKEFILES_DIR)/zeroshark.make 6.10 else 6.11 include $(MAKEFILES_DIR)/$(BUILDARCH).make 6.12 @@ -271,12 +271,12 @@ 6.13 6.14 LIBS_VM += $(LIBS) 6.15 endif 6.16 -ifeq ($(ZERO_BUILD), true) 6.17 +ifeq ($(JVM_VARIANT_ZERO), true) 6.18 LIBS_VM += $(LIBFFI_LIBS) 6.19 endif 6.20 -ifeq ($(SHARK_BUILD), true) 6.21 +ifeq ($(JVM_VARIANT_ZEROSHARK), true) 6.22 + LIBS_VM += $(LIBFFI_LIBS) $(LLVM_LIBS) 6.23 LFLAGS_VM += $(LLVM_LDFLAGS) 6.24 - LIBS_VM += $(LLVM_LIBS) 6.25 endif 6.26 6.27
7.1 --- a/make/defs.make Mon Mar 19 20:13:17 2012 +0100 7.2 +++ b/make/defs.make Mon Mar 19 10:09:24 2012 +0100 7.3 @@ -55,6 +55,27 @@ 7.4 @$(RM) $@ 7.5 endef 7.6 7.7 +# Default values for JVM_VARIANT* variables if configure hasn't set 7.8 +# it already. 7.9 +ifeq ($(JVM_VARIANTS),) 7.10 + ifeq ($(ZERO_BUILD), true) 7.11 + ifeq ($(SHARK_BUILD), true) 7.12 + JVM_VARIANTS:=zeroshark 7.13 + JVM_VARIANT_ZEROSHARK:=true 7.14 + else 7.15 + JVM_VARIANTS:=zero 7.16 + JVM_VARIANT_ZERO:=true 7.17 + endif 7.18 + else 7.19 + # A default is needed 7.20 + ifeq ($(BUILD_CLIENT_ONLY), true) 7.21 + JVM_VARIANTS:=client 7.22 + JVM_VARIANT_CLIENT:=true 7.23 + endif 7.24 + # Further defaults are platform and arch specific 7.25 + endif 7.26 +endif 7.27 + 7.28 # Directory paths and user name 7.29 # Unless GAMMADIR is set on the command line, search upward from 7.30 # the current directory for a parent directory containing "src/share/vm".
8.1 --- a/make/linux/Makefile Mon Mar 19 20:13:17 2012 +0100 8.2 +++ b/make/linux/Makefile Mon Mar 19 10:09:24 2012 +0100 8.3 @@ -188,7 +188,7 @@ 8.4 # in the build.sh script: 8.5 TARGETS = debug jvmg fastdebug optimized profiled product 8.6 8.7 -ifeq ($(ZERO_BUILD), true) 8.8 +ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 8.9 SUBDIR_DOCS = $(OSNAME)_$(VARIANTARCH)_docs 8.10 else 8.11 SUBDIR_DOCS = $(OSNAME)_$(BUILDARCH)_docs
9.1 --- a/make/linux/makefiles/buildtree.make Mon Mar 19 20:13:17 2012 +0100 9.2 +++ b/make/linux/makefiles/buildtree.make Mon Mar 19 10:09:24 2012 +0100 9.3 @@ -66,7 +66,7 @@ 9.4 # For now, until the compiler is less wobbly: 9.5 TESTFLAGS = -Xbatch -showversion 9.6 9.7 -ifeq ($(ZERO_BUILD), true) 9.8 +ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 9.9 PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero 9.10 else 9.11 ifdef USE_SUNCC
10.1 --- a/make/linux/makefiles/defs.make Mon Mar 19 20:13:17 2012 +0100 10.2 +++ b/make/linux/makefiles/defs.make Mon Mar 19 10:09:24 2012 +0100 10.3 @@ -38,7 +38,7 @@ 10.4 endif 10.5 10.6 # zero 10.7 -ifeq ($(ZERO_BUILD), true) 10.8 +ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 10.9 ifeq ($(ARCH_DATA_MODEL), 64) 10.10 MAKE_ARGS += LP64=1 10.11 endif 10.12 @@ -114,6 +114,18 @@ 10.13 HS_ARCH = ppc 10.14 endif 10.15 10.16 +# On 32 bit linux we build server and client, on 64 bit just server. 10.17 +ifeq ($(JVM_VARIANTS),) 10.18 + ifeq ($(ARCH_DATA_MODEL), 32) 10.19 + JVM_VARIANTS:=client,server 10.20 + JVM_VARIANT_CLIENT:=true 10.21 + JVM_VARIANT_SERVER:=true 10.22 + else 10.23 + JVM_VARIANTS:=server 10.24 + JVM_VARIANT_SERVER:=true 10.25 + endif 10.26 +endif 10.27 + 10.28 # determine if HotSpot is being built in JDK6 or earlier version 10.29 JDK6_OR_EARLIER=0 10.30 ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1" 10.31 @@ -195,22 +207,20 @@ 10.32 10.33 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar 10.34 10.35 -ifndef BUILD_CLIENT_ONLY 10.36 -EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 10.37 -EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) 10.38 +ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 10.39 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 10.40 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) 10.41 ifneq ($(OBJCOPY),) 10.42 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo 10.43 endif 10.44 endif 10.45 10.46 -ifneq ($(ZERO_BUILD), true) 10.47 - ifeq ($(ARCH_DATA_MODEL), 32) 10.48 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 10.49 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) 10.50 - ifneq ($(OBJCOPY),) 10.51 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo 10.52 - endif 10.53 - endif 10.54 +ifeq ($(JVM_VARIANT_CLIENT),true) 10.55 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 10.56 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) 10.57 + ifneq ($(OBJCOPY),) 10.58 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo 10.59 + endif 10.60 endif 10.61 10.62 # Serviceability Binaries
11.1 --- a/make/linux/makefiles/gcc.make Mon Mar 19 20:13:17 2012 +0100 11.2 +++ b/make/linux/makefiles/gcc.make Mon Mar 19 10:09:24 2012 +0100 11.3 @@ -72,10 +72,11 @@ 11.4 VM_PICFLAG/AOUT = 11.5 VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO)) 11.6 11.7 -ifeq ($(ZERO_BUILD), true) 11.8 +ifeq ($(JVM_VARIANT_ZERO), true) 11.9 CFLAGS += $(LIBFFI_CFLAGS) 11.10 endif 11.11 -ifeq ($(SHARK_BUILD), true) 11.12 +ifeq ($(JVM_VARIANT_ZEROSHARK), true) 11.13 +CFLAGS += $(LIBFFI_CFLAGS) 11.14 CFLAGS += $(LLVM_CFLAGS) 11.15 endif 11.16 CFLAGS += $(VM_PICFLAG)
12.1 --- a/make/linux/makefiles/vm.make Mon Mar 19 20:13:17 2012 +0100 12.2 +++ b/make/linux/makefiles/vm.make Mon Mar 19 10:09:24 2012 +0100 12.3 @@ -42,7 +42,7 @@ 12.4 -include $(DEP_DIR)/*.d 12.5 12.6 # read machine-specific adjustments (%%% should do this via buildtree.make?) 12.7 -ifeq ($(ZERO_BUILD), true) 12.8 +ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 12.9 include $(MAKEFILES_DIR)/zeroshark.make 12.10 else 12.11 include $(MAKEFILES_DIR)/$(BUILDARCH).make 12.12 @@ -236,7 +236,7 @@ 12.13 vm.def: $(Res_Files) $(Obj_Files) 12.14 sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@ 12.15 12.16 -ifeq ($(SHARK_BUILD), true) 12.17 +ifeq ($(JVM_VARIANT_ZEROSHARK), true) 12.18 STATIC_CXX = false 12.19 else 12.20 ifeq ($(ZERO_LIBARCH), ppc64) 12.21 @@ -268,12 +268,12 @@ 12.22 12.23 LIBS_VM += $(LIBS) 12.24 endif 12.25 -ifeq ($(ZERO_BUILD), true) 12.26 +ifeq ($(JVM_VARIANT_ZERO), true) 12.27 LIBS_VM += $(LIBFFI_LIBS) 12.28 endif 12.29 -ifeq ($(SHARK_BUILD), true) 12.30 +ifeq ($(JVM_VARIANT_ZEROSHARK), true) 12.31 + LIBS_VM += $(LIBFFI_LIBS) $(LLVM_LIBS) 12.32 LFLAGS_VM += $(LLVM_LDFLAGS) 12.33 - LIBS_VM += $(LLVM_LIBS) 12.34 endif 12.35 12.36 LINK_VM = $(LINK_LIB.CC)
13.1 --- a/make/solaris/makefiles/defs.make Mon Mar 19 20:13:17 2012 +0100 13.2 +++ b/make/solaris/makefiles/defs.make Mon Mar 19 10:09:24 2012 +0100 13.3 @@ -59,6 +59,18 @@ 13.4 endif 13.5 endif 13.6 13.7 +# On 32 bit solaris we build server and client, on 64 bit just server. 13.8 +ifeq ($(JVM_VARIANTS),) 13.9 + ifeq ($(ARCH_DATA_MODEL), 32) 13.10 + JVM_VARIANTS:=client,server 13.11 + JVM_VARIANT_CLIENT:=true 13.12 + JVM_VARIANT_SERVER:=true 13.13 + else 13.14 + JVM_VARIANTS:=server 13.15 + JVM_VARIANT_SERVER:=true 13.16 + endif 13.17 +endif 13.18 + 13.19 # determine if HotSpot is being built in JDK6 or earlier version 13.20 JDK6_OR_EARLIER=0 13.21 ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1" 13.22 @@ -153,37 +165,37 @@ 13.23 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server 13.24 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client 13.25 13.26 -ifneq ($(BUILD_CLIENT_ONLY),true) 13.27 -EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 13.28 -EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) 13.29 -EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.$(LIBRARY_SUFFIX) 13.30 -EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) 13.31 +ifeq ($(JVM_VARIANT_SERVER),true) 13.32 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 13.33 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) 13.34 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.$(LIBRARY_SUFFIX) 13.35 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) 13.36 + ifeq ($(ARCH_DATA_MODEL),32) 13.37 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) 13.38 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) 13.39 + endif 13.40 ifneq ($(OBJCOPY),) 13.41 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo 13.42 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.debuginfo 13.43 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.debuginfo 13.44 endif 13.45 endif 13.46 -ifeq ($(ARCH_DATA_MODEL), 32) 13.47 +ifeq ($(JVM_VARIANT_CLIENT),true) 13.48 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 13.49 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) 13.50 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX) 13.51 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) 13.52 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) 13.53 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) 13.54 + ifeq ($(ARCH_DATA_MODEL),32) 13.55 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) 13.56 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) 13.57 + endif 13.58 ifneq ($(OBJCOPY),) 13.59 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo 13.60 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.debuginfo 13.61 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.debuginfo 13.62 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.debuginfo 13.63 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.debuginfo 13.64 - endif 13.65 - ifneq ($(BUILD_CLIENT_ONLY), true) 13.66 - EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) 13.67 - EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) 13.68 - ifneq ($(OBJCOPY),) 13.69 - EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.debuginfo 13.70 - EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.debuginfo 13.71 + ifeq ($(ARCH_DATA_MODEL),32) 13.72 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.debuginfo 13.73 + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.debuginfo 13.74 endif 13.75 endif 13.76 endif
14.1 --- a/make/windows/makefiles/defs.make Mon Mar 19 20:13:17 2012 +0100 14.2 +++ b/make/windows/makefiles/defs.make Mon Mar 19 10:09:24 2012 +0100 14.3 @@ -107,6 +107,19 @@ 14.4 endif 14.5 endif 14.6 14.7 +# On 32 bit windows we build server, client and kernel, on 64 bit just server. 14.8 +ifeq ($(JVM_VARIANTS),) 14.9 + ifeq ($(ARCH_DATA_MODEL), 32) 14.10 + JVM_VARIANTS:=client,server,kernel 14.11 + JVM_VARIANT_CLIENT:=true 14.12 + JVM_VARIANT_SERVER:=true 14.13 + JVM_VARIANT_KERNEL:=true 14.14 + else 14.15 + JVM_VARIANTS:=server 14.16 + JVM_VARIANT_SERVER:=true 14.17 + endif 14.18 +endif 14.19 + 14.20 JDK_INCLUDE_SUBDIR=win32 14.21 14.22 # Library suffix 14.23 @@ -177,17 +190,20 @@ 14.24 EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client 14.25 EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel 14.26 14.27 -EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 14.28 -EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX) 14.29 -EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb 14.30 -EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map 14.31 -EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib 14.32 -ifeq ($(ARCH_DATA_MODEL), 32) 14.33 +ifeq ($(JVM_VARIANT_SERVER),true) 14.34 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 14.35 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX) 14.36 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb 14.37 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map 14.38 + EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib 14.39 +endif 14.40 +ifeq ($(JVM_VARIANT_CLIENT),true) 14.41 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 14.42 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.$(LIBRARY_SUFFIX) 14.43 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb 14.44 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map 14.45 - # kernel vm 14.46 +endif 14.47 +ifeq ($(JVM_VARIANT_KERNEL),true) 14.48 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt 14.49 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.$(LIBRARY_SUFFIX) 14.50 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb
