comparison make/bsd/makefiles/defs.make @ 9153:bc63dd2539a4

Merge
author kvn
date Fri, 12 Apr 2013 20:37:18 -0400
parents f36e073d56a4
children f509b8f4699b
comparison
equal deleted inserted replaced
9151:393fd4ef89c4 9153:bc63dd2539a4
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 bsd builds. 25 # The common definitions for hotspot bsd 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.
84 ARCH_DATA_MODEL = 32 84 ARCH_DATA_MODEL = 32
85 PLATFORM = bsd-i586 85 PLATFORM = bsd-i586
86 VM_PLATFORM = bsd_i486 86 VM_PLATFORM = bsd_i486
87 HS_ARCH = x86 87 HS_ARCH = x86
88 # We have to reset ARCH to i386 since SRCARCH relies on it 88 # We have to reset ARCH to i386 since SRCARCH relies on it
89 ARCH = i386 89 ARCH = i386
90 endif 90 endif
91 endif 91 endif
92 92
93 # i386 93 # i386
94 ifeq ($(ARCH), i386) 94 ifeq ($(ARCH), i386)
144 LIBRARY_SUFFIX=dylib 144 LIBRARY_SUFFIX=dylib
145 else 145 else
146 LIBRARY_SUFFIX=so 146 LIBRARY_SUFFIX=so
147 endif 147 endif
148 148
149 # FIXUP: The subdirectory for a debug build is NOT the same on all platforms
150 VM_DEBUG=jvmg
151
152 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html 149 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
153 150
154 # client and server subdirectories have symbolic links to ../libjsig.so 151 # client and server subdirectories have symbolic links to ../libjsig.so
155 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) 152 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
156 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server 153 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
175 ifeq ($(ZIP_DEBUGINFO_FILES),1) 172 ifeq ($(ZIP_DEBUGINFO_FILES),1)
176 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.diz 173 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.diz
177 else 174 else
178 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.debuginfo 175 EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.debuginfo
179 endif 176 endif
180 endif 177 endif
181 endif 178 endif
182 179
183 # Serviceability Binaries 180 # Serviceability Binaries
184 # No SA Support for PPC, IA64, ARM or zero 181 # No SA Support for PPC, IA64, ARM or zero
185 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ 182 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \