Mercurial > hg > graal-compiler

comparison make/linux/makefiles/defs.make @ 5946:3d7ea1dbe0de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built Reviewed-by: dholmes, ohair
author erikj
date Mon, 19 Mar 2012 10:09:24 +0100
parents 2d503de963b3
children 74c359c4a9e5
comparison
equal deleted inserted replaced
5945:77591ef8983a 5946:3d7ea1dbe0de
36 else 36 else
37 ARCH_DATA_MODEL ?= 32 37 ARCH_DATA_MODEL ?= 32
38 endif 38 endif
39 39
40 # zero 40 # zero
41 ifeq ($(ZERO_BUILD), true) 41 ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
42 ifeq ($(ARCH_DATA_MODEL), 64) 42 ifeq ($(ARCH_DATA_MODEL), 64)
43 MAKE_ARGS += LP64=1 43 MAKE_ARGS += LP64=1
44 endif 44 endif
45 PLATFORM = linux-zero 45 PLATFORM = linux-zero
46 VM_PLATFORM = linux_$(subst i386,i486,$(ZERO_LIBARCH)) 46 VM_PLATFORM = linux_$(subst i386,i486,$(ZERO_LIBARCH))
110 ifeq ($(ARCH), ppc) 110 ifeq ($(ARCH), ppc)
111 ARCH_DATA_MODEL = 32 111 ARCH_DATA_MODEL = 32
112 PLATFORM = linux-ppc 112 PLATFORM = linux-ppc
113 VM_PLATFORM = linux_ppc 113 VM_PLATFORM = linux_ppc
114 HS_ARCH = ppc 114 HS_ARCH = ppc
115 endif
116
117 # On 32 bit linux we build server and client, on 64 bit just server.
118 ifeq ($(JVM_VARIANTS),)
119 ifeq ($(ARCH_DATA_MODEL), 32)
120 JVM_VARIANTS:=client,server
121 JVM_VARIANT_CLIENT:=true
122 JVM_VARIANT_SERVER:=true
123 else
124 JVM_VARIANTS:=server
125 JVM_VARIANT_SERVER:=true
126 endif
115 endif 127 endif
116 128
117 # determine if HotSpot is being built in JDK6 or earlier version 129 # determine if HotSpot is being built in JDK6 or earlier version
118 JDK6_OR_EARLIER=0 130 JDK6_OR_EARLIER=0
119 ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1" 131 ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1"
193 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server 205 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
194 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client 206 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
195 207
196 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar 208 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
197 209
198 ifndef BUILD_CLIENT_ONLY 210 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
199 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 211 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
200 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) 212 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
201 ifneq ($(OBJCOPY),) 213 ifneq ($(OBJCOPY),)
202 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo 214 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
203 endif 215 endif
204 endif 216 endif
205 217
206 ifneq ($(ZERO_BUILD), true) 218 ifeq ($(JVM_VARIANT_CLIENT),true)
207 ifeq ($(ARCH_DATA_MODEL), 32) 219 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
208 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 220 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
209 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) 221 ifneq ($(OBJCOPY),)
210 ifneq ($(OBJCOPY),) 222 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
211 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo 223 endif
212 endif
213 endif
214 endif 224 endif
215 225
216 # Serviceability Binaries 226 # Serviceability Binaries
217 # No SA Support for PPC, IA64, ARM or zero 227 # No SA Support for PPC, IA64, ARM or zero
218 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ 228 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \