Mercurial > hg > graal-compiler

comparison make/linux/makefiles/defs.make @ 18041:52b4284cb496

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 4ca6dc0799b6 56e7f5560e60
children a04b45953250
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
31 # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name 31 # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
32 32
33 # ARCH can be set explicitly in spec.gmk 33 # ARCH can be set explicitly in spec.gmk
34 ifndef ARCH 34 ifndef ARCH
35 ARCH := $(shell uname -m) 35 ARCH := $(shell uname -m)
36 # Fold little endian PowerPC64 into big-endian (if ARCH is set in
37 # hotspot-spec.gmk, this will be done by the configure script).
38 ifeq ($(ARCH),ppc64le)
39 ARCH := ppc64
40 endif
36 endif 41 endif
37 42
38 PATH_SEP ?= : 43 PATH_SEP ?= :
39 44
40 ifeq ($(LP64), 1) 45 ifeq ($(LP64), 1)
115 # PPC 120 # PPC
116 ifeq ($(ARCH), ppc) 121 ifeq ($(ARCH), ppc)
117 ARCH_DATA_MODEL = 32 122 ARCH_DATA_MODEL = 32
118 PLATFORM = linux-ppc 123 PLATFORM = linux-ppc
119 VM_PLATFORM = linux_ppc 124 VM_PLATFORM = linux_ppc
125 HS_ARCH = ppc
126 endif
127
128 # PPC64
129 ifeq ($(ARCH), ppc64)
130 ARCH_DATA_MODEL = 64
131 MAKE_ARGS += LP64=1
132 PLATFORM = linux-ppc64
133 VM_PLATFORM = linux_ppc64
120 HS_ARCH = ppc 134 HS_ARCH = ppc
121 endif 135 endif
122 136
123 # On 32 bit linux we build server and client, on 64 bit just server. 137 # On 32 bit linux we build server and client, on 64 bit just server.
124 ifeq ($(JVM_VARIANTS),) 138 ifeq ($(JVM_VARIANTS),)
253 endif 267 endif
254 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server 268 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
255 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client 269 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
256 EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal 270 EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal
257 271
258 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) 272 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK) $(JVM_VARIANT_CORE)), true)
259 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 273 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
260 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) 274 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
261 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 275 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
262 ifeq ($(ZIP_DEBUGINFO_FILES),1) 276 ifeq ($(ZIP_DEBUGINFO_FILES),1)
263 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz 277 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz