Mercurial > hg > truffle

comparison make/linux/makefiles/defs.make @ 14909:4ca6dc0799b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents faf0c78e906b
children 52b4284cb496
comparison
equal deleted inserted replaced
14908:8db6e76cb658 14909:4ca6dc0799b6
115 # PPC 115 # PPC
116 ifeq ($(ARCH), ppc) 116 ifeq ($(ARCH), ppc)
117 ARCH_DATA_MODEL = 32 117 ARCH_DATA_MODEL = 32
118 PLATFORM = linux-ppc 118 PLATFORM = linux-ppc
119 VM_PLATFORM = linux_ppc 119 VM_PLATFORM = linux_ppc
120 HS_ARCH = ppc
121 endif
122
123 # PPC64
124 ifeq ($(ARCH), ppc64)
125 ARCH_DATA_MODEL = 64
126 MAKE_ARGS += LP64=1
127 PLATFORM = linux-ppc64
128 VM_PLATFORM = linux_ppc64
129 HS_ARCH = ppc 120 HS_ARCH = ppc
130 endif 121 endif
131 122
132 # On 32 bit linux we build server and client, on 64 bit just server. 123 # On 32 bit linux we build server and client, on 64 bit just server.
133 ifeq ($(JVM_VARIANTS),) 124 ifeq ($(JVM_VARIANTS),)
262 endif 253 endif
263 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server 254 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
264 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client 255 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
265 EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal 256 EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal
266 257
267 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK) $(JVM_VARIANT_CORE)), true) 258 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
268 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 259 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
269 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) 260 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
270 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 261 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
271 ifeq ($(ZIP_DEBUGINFO_FILES),1) 262 ifeq ($(ZIP_DEBUGINFO_FILES),1)
272 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz 263 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz