Mercurial > hg > truffle
comparison make/linux/makefiles/defs.make @ 1696:688a538aa654
Merge
author | trims |
---|---|
date | Fri, 13 Aug 2010 10:55:42 -0700 |
parents | 126ea7725993 |
children | 0a8e0d4345b3 |
comparison
equal
deleted
inserted
replaced
1673:6709c14587c2 | 1696:688a538aa654 |
---|---|
96 PLATFORM = linux-i586 | 96 PLATFORM = linux-i586 |
97 VM_PLATFORM = linux_i486 | 97 VM_PLATFORM = linux_i486 |
98 HS_ARCH = x86 | 98 HS_ARCH = x86 |
99 endif | 99 endif |
100 | 100 |
101 # ARM | |
102 ifeq ($(ARCH), arm) | |
103 ARCH_DATA_MODEL = 32 | |
104 PLATFORM = linux-arm | |
105 VM_PLATFORM = linux_arm | |
106 HS_ARCH = arm | |
107 endif | |
108 | |
109 # PPC | |
110 ifeq ($(ARCH), ppc) | |
111 ARCH_DATA_MODEL = 32 | |
112 PLATFORM = linux-ppc | |
113 VM_PLATFORM = linux_ppc | |
114 HS_ARCH = ppc | |
115 endif | |
116 | |
101 JDK_INCLUDE_SUBDIR=linux | 117 JDK_INCLUDE_SUBDIR=linux |
102 | 118 |
103 # FIXUP: The subdirectory for a debug build is NOT the same on all platforms | 119 # FIXUP: The subdirectory for a debug build is NOT the same on all platforms |
104 VM_DEBUG=jvmg | 120 VM_DEBUG=jvmg |
105 | 121 |
106 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html | 122 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html |
107 | 123 |
108 # client and server subdirectories have symbolic links to ../libjsig.so | 124 # client and server subdirectories have symbolic links to ../libjsig.so |
109 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so | 125 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so |
126 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server | |
110 | 127 |
111 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server | 128 ifndef BUILD_CLIENT_ONLY |
112 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt | 129 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt |
113 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so | 130 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so |
131 endif | |
132 | |
114 ifneq ($(ZERO_BUILD), true) | 133 ifneq ($(ZERO_BUILD), true) |
115 ifeq ($(ARCH_DATA_MODEL), 32) | 134 ifeq ($(ARCH_DATA_MODEL), 32) |
116 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client | 135 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client |
117 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt | 136 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt |
118 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so | 137 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so |
119 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so | |
120 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar | |
121 else | |
122 ifeq ($(ARCH),ia64) | |
123 else | |
124 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so | |
125 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar | |
126 endif | |
127 endif | 138 endif |
128 endif | 139 endif |
140 | |
141 # Serviceability Binaries | |
142 # No SA Support for PPC, IA64, ARM or zero | |
143 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \ | |
144 $(EXPORT_LIB_DIR)/sa-jdi.jar | |
145 ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \ | |
146 $(EXPORT_LIB_DIR)/sa-jdi.jar | |
147 ADD_SA_BINARIES/ppc = | |
148 ADD_SA_BINARIES/ia64 = | |
149 ADD_SA_BINARIES/arm = | |
150 ADD_SA_BINARIES/zero = | |
151 | |
152 EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH)) | |
153 | |
154 |