comparison make/linux/makefiles/defs.make @ 1010:354d3184f6b2

6890308: integrate zero assembler hotspot changes Reviewed-by: never Contributed-by: gbenson@redhat.com
author never
date Tue, 13 Oct 2009 12:04:21 -0700
parents d1605aabd0a1
children 23862fc517bb
comparison
equal deleted inserted replaced
1009:03b336640699 1010:354d3184f6b2
33 PATH_SEP = : 33 PATH_SEP = :
34 ifeq ($(LP64), 1) 34 ifeq ($(LP64), 1)
35 ARCH_DATA_MODEL ?= 64 35 ARCH_DATA_MODEL ?= 64
36 else 36 else
37 ARCH_DATA_MODEL ?= 32 37 ARCH_DATA_MODEL ?= 32
38 endif
39
40 # zero
41 ifeq ($(ZERO_BUILD), true)
42 ifeq ($(ARCH_DATA_MODEL), 64)
43 MAKE_ARGS += LP64=1
44 endif
45 PLATFORM = linux-zero
46 VM_PLATFORM = linux_$(subst i386,i486,$(ZERO_LIBARCH))
47 HS_ARCH = zero
48 ARCH = zero
38 endif 49 endif
39 50
40 # ia64 51 # ia64
41 ifeq ($(ARCH), ia64) 52 ifeq ($(ARCH), ia64)
42 ARCH_DATA_MODEL = 64 53 ARCH_DATA_MODEL = 64
95 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html 106 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
96 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server 107 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
97 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 108 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
98 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so 109 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
99 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so 110 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
100 ifeq ($(ARCH_DATA_MODEL), 32) 111 ifneq ($(ZERO_BUILD), true)
101 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client 112 ifeq ($(ARCH_DATA_MODEL), 32)
102 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 113 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
103 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so 114 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
104 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 115 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
105 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so 116 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
106 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 117 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
107 else 118 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
108 ifeq ($(ARCH),ia64) 119 else
109 else 120 ifeq ($(ARCH),ia64)
110 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so 121 else
111 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 122 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
123 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
112 endif 124 endif
125 endif
113 endif 126 endif