Mercurial > hg > graal-jvmci-8

comparison make/linux/makefiles/defs.make @ 3966:5d871c1ff17c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author iveresov
date Fri, 30 Sep 2011 13:48:17 -0700
parents da0999c4b733 f08d439fab8c
children 2d503de963b3 d652a62d6e03
comparison
equal deleted inserted replaced
3956:3607aac85aa9 3966:5d871c1ff17c
175 endif 175 endif
176 endif 176 endif
177 177
178 JDK_INCLUDE_SUBDIR=linux 178 JDK_INCLUDE_SUBDIR=linux
179 179
180 # Library suffix
181 LIBRARY_SUFFIX=so
182
180 # FIXUP: The subdirectory for a debug build is NOT the same on all platforms 183 # FIXUP: The subdirectory for a debug build is NOT the same on all platforms
181 VM_DEBUG=jvmg 184 VM_DEBUG=jvmg
182 185
183 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html 186 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
184 187
185 # client and server subdirectories have symbolic links to ../libjsig.so 188 # client and server subdirectories have symbolic links to ../libjsig.so
186 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so 189 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
187 ifneq ($(OBJCOPY),) 190 ifneq ($(OBJCOPY),)
188 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo 191 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
189 endif 192 endif
190
191 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server 193 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
192 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client 194 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
193 195
194 ifndef BUILD_CLIENT_ONLY 196 ifndef BUILD_CLIENT_ONLY
195 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 197 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
196 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so 198 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
197 ifneq ($(OBJCOPY),) 199 ifneq ($(OBJCOPY),)
198 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo 200 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
199 endif 201 endif
200 endif 202 endif
201 203
202 ifneq ($(ZERO_BUILD), true) 204 ifneq ($(ZERO_BUILD), true)
203 ifeq ($(ARCH_DATA_MODEL), 32) 205 ifeq ($(ARCH_DATA_MODEL), 32)
204 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 206 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
205 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 207 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
206 ifneq ($(OBJCOPY),) 208 ifneq ($(OBJCOPY),)
207 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo 209 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
208 endif 210 endif
209 endif 211 endif
210 endif 212 endif
211 213
212 # Serviceability Binaries 214 # Serviceability Binaries
213 # No SA Support for PPC, IA64, ARM or zero 215 # No SA Support for PPC, IA64, ARM or zero
214 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \ 216 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
215 $(EXPORT_LIB_DIR)/sa-jdi.jar 217 $(EXPORT_LIB_DIR)/sa-jdi.jar
216 ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \ 218 ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
217 $(EXPORT_LIB_DIR)/sa-jdi.jar 219 $(EXPORT_LIB_DIR)/sa-jdi.jar
218 ifneq ($(OBJCOPY),) 220 ifneq ($(OBJCOPY),)
219 ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo 221 ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
220 ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo 222 ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
221 endif 223 endif