comparison make/linux/makefiles/defs.make @ 9152:f36e073d56a4

7104565: trim jprt build targets Summary: remove JPRT debug builds, remove -DDEBUG -DFASTDEBUG and use ASSERT instead in sources Reviewed-by: dholmes, kvn, coleenp
author drchase
date Fri, 12 Apr 2013 15:53:30 -0700
parents 1b0dc9f87e75
children faf0c78e906b
comparison
equal deleted inserted replaced
9150:b8b081e53312 9152:f36e073d56a4
1 # 1 #
2 # Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 # 18 #
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 # or visit www.oracle.com if you need additional information or have any 20 # or visit www.oracle.com if you need additional information or have any
21 # questions. 21 # questions.
22 # 22 #
23 # 23 #
24 24
25 # The common definitions for hotspot linux builds. 25 # The common definitions for hotspot linux builds.
26 # Include the top level defs.make under make directory instead of this one. 26 # Include the top level defs.make under make directory instead of this one.
27 # This file is included into make/defs.make. 27 # This file is included into make/defs.make.
90 ARCH_DATA_MODEL = 32 90 ARCH_DATA_MODEL = 32
91 PLATFORM = linux-i586 91 PLATFORM = linux-i586
92 VM_PLATFORM = linux_i486 92 VM_PLATFORM = linux_i486
93 HS_ARCH = x86 93 HS_ARCH = x86
94 # We have to reset ARCH to i686 since SRCARCH relies on it 94 # We have to reset ARCH to i686 since SRCARCH relies on it
95 ARCH = i686 95 ARCH = i686
96 endif 96 endif
97 endif 97 endif
98 98
99 # i686/i586 ie 32-bit x86 99 # i686/i586 ie 32-bit x86
100 ifneq (,$(findstring $(ARCH), i686 i586)) 100 ifneq (,$(findstring $(ARCH), i686 i586))
238 JDK_INCLUDE_SUBDIR=linux 238 JDK_INCLUDE_SUBDIR=linux
239 239
240 # Library suffix 240 # Library suffix
241 LIBRARY_SUFFIX=so 241 LIBRARY_SUFFIX=so
242 242
243 # FIXUP: The subdirectory for a debug build is NOT the same on all platforms
244 VM_DEBUG=jvmg
245
246 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html 243 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
247 244
248 # client and server subdirectories have symbolic links to ../libjsig.so 245 # client and server subdirectories have symbolic links to ../libjsig.so
249 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) 246 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
250 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 247 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
277 ifeq ($(ZIP_DEBUGINFO_FILES),1) 274 ifeq ($(ZIP_DEBUGINFO_FILES),1)
278 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz 275 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz
279 else 276 else
280 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo 277 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
281 endif 278 endif
282 endif 279 endif
283 endif 280 endif
284 281
285 ifeq ($(JVM_VARIANT_MINIMAL1),true) 282 ifeq ($(JVM_VARIANT_MINIMAL1),true)
286 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/Xusage.txt 283 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/Xusage.txt
287 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.$(LIBRARY_SUFFIX) 284 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.$(LIBRARY_SUFFIX)
290 ifeq ($(ZIP_DEBUGINFO_FILES),1) 287 ifeq ($(ZIP_DEBUGINFO_FILES),1)
291 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.diz 288 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.diz
292 else 289 else
293 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.debuginfo 290 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.debuginfo
294 endif 291 endif
295 endif 292 endif
296 endif 293 endif
297 294
298 # Serviceability Binaries 295 # Serviceability Binaries
299 # No SA Support for PPC, IA64, ARM or zero 296 # No SA Support for PPC, IA64, ARM or zero
300 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ 297 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
301 $(EXPORT_LIB_DIR)/sa-jdi.jar 298 $(EXPORT_LIB_DIR)/sa-jdi.jar
302 ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ 299 ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
303 $(EXPORT_LIB_DIR)/sa-jdi.jar 300 $(EXPORT_LIB_DIR)/sa-jdi.jar
304 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 301 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
305 ifeq ($(ZIP_DEBUGINFO_FILES),1) 302 ifeq ($(ZIP_DEBUGINFO_FILES),1)
306 ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz 303 ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz
307 ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz 304 ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz
308 else 305 else
309 ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo 306 ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
310 ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo 307 ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
311 endif 308 endif
312 endif 309 endif
313 ADD_SA_BINARIES/ppc = 310 ADD_SA_BINARIES/ppc =
314 ADD_SA_BINARIES/ia64 = 311 ADD_SA_BINARIES/ia64 =
315 ADD_SA_BINARIES/arm = 312 ADD_SA_BINARIES/arm =
316 ADD_SA_BINARIES/zero = 313 ADD_SA_BINARIES/zero =
317 314
318 -include $(HS_ALT_MAKE)/linux/makefiles/defs.make 315 -include $(HS_ALT_MAKE)/linux/makefiles/defs.make
319 316
320 EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH)) 317 EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
321 318