author | rdurbin |
Mon, 10 Feb 2014 12:38:34 -0800 | |
changeset 22754 | 427faa438d2d |
parent 20686 | 1fa9a75192c3 |
child 26691 | 40ea2c41f53b |
permissions | -rw-r--r-- |
10565 | 1 |
# |
17006 | 2 |
# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. |
10565 | 3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
# |
|
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 |
|
7 |
# published by the Free Software Foundation. |
|
8 |
# |
|
9 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
# version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
# accompanied this code). |
|
14 |
# |
|
15 |
# You should have received a copy of the GNU General Public License version |
|
16 |
# 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
# |
|
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 |
|
21 |
# questions. |
|
17006 | 22 |
# |
10565 | 23 |
# |
24 |
||
25 |
# The common definitions for hotspot bsd builds. |
|
26 |
# Include the top level defs.make under make directory instead of this one. |
|
27 |
# This file is included into make/defs.make. |
|
28 |
||
29 |
SLASH_JAVA ?= /java |
|
30 |
||
31 |
# Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name |
|
32 |
ARCH:=$(shell uname -m) |
|
33 |
PATH_SEP = : |
|
34 |
ifeq ($(LP64), 1) |
|
35 |
ARCH_DATA_MODEL ?= 64 |
|
36 |
else |
|
37 |
ARCH_DATA_MODEL ?= 32 |
|
38 |
endif |
|
39 |
||
40 |
# zero |
|
12156
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
41 |
ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) |
10565 | 42 |
ifeq ($(ARCH_DATA_MODEL), 64) |
43 |
MAKE_ARGS += LP64=1 |
|
44 |
endif |
|
45 |
PLATFORM = bsd-zero |
|
46 |
VM_PLATFORM = bsd_$(subst i386,i486,$(ZERO_LIBARCH)) |
|
47 |
HS_ARCH = zero |
|
48 |
ARCH = zero |
|
49 |
endif |
|
50 |
||
51 |
# ia64 |
|
52 |
ifeq ($(ARCH), ia64) |
|
53 |
ARCH_DATA_MODEL = 64 |
|
54 |
MAKE_ARGS += LP64=1 |
|
55 |
PLATFORM = bsd-ia64 |
|
56 |
VM_PLATFORM = bsd_ia64 |
|
57 |
HS_ARCH = ia64 |
|
58 |
endif |
|
59 |
||
60 |
# sparc |
|
61 |
ifeq ($(ARCH), sparc64) |
|
62 |
ifeq ($(ARCH_DATA_MODEL), 64) |
|
63 |
ARCH_DATA_MODEL = 64 |
|
64 |
MAKE_ARGS += LP64=1 |
|
65 |
PLATFORM = bsd-sparcv9 |
|
66 |
VM_PLATFORM = bsd_sparcv9 |
|
67 |
else |
|
68 |
ARCH_DATA_MODEL = 32 |
|
69 |
PLATFORM = bsd-sparc |
|
70 |
VM_PLATFORM = bsd_sparc |
|
71 |
endif |
|
72 |
HS_ARCH = sparc |
|
73 |
endif |
|
74 |
||
75 |
# amd64 |
|
76 |
ifneq (,$(findstring $(ARCH), amd64 x86_64)) |
|
77 |
ifeq ($(ARCH_DATA_MODEL), 64) |
|
78 |
ARCH_DATA_MODEL = 64 |
|
79 |
MAKE_ARGS += LP64=1 |
|
80 |
PLATFORM = bsd-amd64 |
|
81 |
VM_PLATFORM = bsd_amd64 |
|
82 |
HS_ARCH = x86 |
|
83 |
else |
|
84 |
ARCH_DATA_MODEL = 32 |
|
85 |
PLATFORM = bsd-i586 |
|
86 |
VM_PLATFORM = bsd_i486 |
|
87 |
HS_ARCH = x86 |
|
88 |
# We have to reset ARCH to i386 since SRCARCH relies on it |
|
17006 | 89 |
ARCH = i386 |
10565 | 90 |
endif |
91 |
endif |
|
92 |
||
93 |
# i386 |
|
94 |
ifeq ($(ARCH), i386) |
|
95 |
ifeq ($(ARCH_DATA_MODEL), 64) |
|
96 |
ARCH_DATA_MODEL = 64 |
|
97 |
MAKE_ARGS += LP64=1 |
|
98 |
PLATFORM = bsd-amd64 |
|
99 |
VM_PLATFORM = bsd_amd64 |
|
100 |
HS_ARCH = x86 |
|
101 |
# We have to reset ARCH to amd64 since SRCARCH relies on it |
|
102 |
ARCH = amd64 |
|
103 |
else |
|
104 |
ARCH_DATA_MODEL = 32 |
|
105 |
PLATFORM = bsd-i586 |
|
106 |
VM_PLATFORM = bsd_i486 |
|
107 |
HS_ARCH = x86 |
|
108 |
endif |
|
109 |
endif |
|
110 |
||
111 |
# ARM |
|
112 |
ifeq ($(ARCH), arm) |
|
113 |
ARCH_DATA_MODEL = 32 |
|
114 |
PLATFORM = bsd-arm |
|
115 |
VM_PLATFORM = bsd_arm |
|
116 |
HS_ARCH = arm |
|
117 |
endif |
|
118 |
||
119 |
# PPC |
|
120 |
ifeq ($(ARCH), ppc) |
|
121 |
ARCH_DATA_MODEL = 32 |
|
122 |
PLATFORM = bsd-ppc |
|
123 |
VM_PLATFORM = bsd_ppc |
|
124 |
HS_ARCH = ppc |
|
125 |
endif |
|
126 |
||
12156
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
127 |
# On 32 bit bsd we build server and client, on 64 bit just server. |
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
128 |
ifeq ($(JVM_VARIANTS),) |
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
129 |
ifeq ($(ARCH_DATA_MODEL), 32) |
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
130 |
JVM_VARIANTS:=client,server |
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
131 |
JVM_VARIANT_CLIENT:=true |
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
132 |
JVM_VARIANT_SERVER:=true |
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
133 |
else |
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
134 |
JVM_VARIANTS:=server |
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
135 |
JVM_VARIANT_SERVER:=true |
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
136 |
endif |
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
137 |
endif |
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
138 |
|
20686
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
139 |
OS_VENDOR:=$(shell uname -s) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
140 |
|
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
141 |
# determine if HotSpot is being built in JDK6 or earlier version |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
142 |
JDK6_OR_EARLIER=0 |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
143 |
ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1" |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
144 |
# if the longer variable names (newer build style) are set, then check those |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
145 |
ifeq "$(shell expr \( $(JDK_MAJOR_VERSION) = 1 \& $(JDK_MINOR_VERSION) \< 7 \))" "1" |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
146 |
JDK6_OR_EARLIER=1 |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
147 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
148 |
else |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
149 |
# the longer variables aren't set so check the shorter variable names |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
150 |
ifeq "$(shell expr \( '$(JDK_MAJOR_VER)' = 1 \& '$(JDK_MINOR_VER)' \< 7 \))" "1" |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
151 |
JDK6_OR_EARLIER=1 |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
152 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
153 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
154 |
|
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
155 |
ifeq ($(JDK6_OR_EARLIER),0) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
156 |
# Full Debug Symbols is supported on JDK7 or newer. |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
157 |
# The Full Debug Symbols (FDS) default for BUILD_FLAVOR == product |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
158 |
# builds is enabled with debug info files ZIP'ed to save space. For |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
159 |
# BUILD_FLAVOR != product builds, FDS is always enabled, after all a |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
160 |
# debug build without debug info isn't very useful. |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
161 |
# The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled. |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
162 |
# |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
163 |
# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
164 |
# disabled for a BUILD_FLAVOR == product build. |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
165 |
# |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
166 |
# Note: Use of a different variable name for the FDS override option |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
167 |
# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
168 |
# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
169 |
# in options via environment variables, use of distinct variables |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
170 |
# prevents strange behaviours. For example, in a BUILD_FLAVOR != |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
171 |
# product build, the FULL_DEBUG_SYMBOLS environment variable will be |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
172 |
# 0, but the ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
173 |
# the same variable name is used, then different values can be picked |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
174 |
# up by different parts of the build. Just to be clear, we only need |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
175 |
# two variable names because the incoming option value can be |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
176 |
# overridden in some situations, e.g., a BUILD_FLAVOR != product |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
177 |
# build. |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
178 |
|
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
179 |
# Due to the multiple sub-make processes that occur this logic gets |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
180 |
# executed multiple times. We reduce the noise by at least checking that |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
181 |
# BUILD_FLAVOR has been set. |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
182 |
ifneq ($(BUILD_FLAVOR),) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
183 |
ifeq ($(BUILD_FLAVOR), product) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
184 |
FULL_DEBUG_SYMBOLS ?= 1 |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
185 |
ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
186 |
else |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
187 |
# debug variants always get Full Debug Symbols (if available) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
188 |
ENABLE_FULL_DEBUG_SYMBOLS = 1 |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
189 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
190 |
_JUNK_ := $(shell \ |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
191 |
echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)") |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
192 |
# since objcopy is optional, we set ZIP_DEBUGINFO_FILES later |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
193 |
|
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
194 |
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
195 |
ifeq ($(OS_VENDOR), Darwin) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
196 |
# MacOS X doesn't use OBJCOPY or STRIP_POLICY |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
197 |
OBJCOPY= |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
198 |
STRIP_POLICY= |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
199 |
ZIP_DEBUGINFO_FILES ?= 1 |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
200 |
else |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
201 |
# Default OBJCOPY comes from GNU Binutils on BSD |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
202 |
ifeq ($(CROSS_COMPILE_ARCH),) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
203 |
DEF_OBJCOPY=/usr/bin/objcopy |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
204 |
else |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
205 |
# Assume objcopy is part of the cross-compilation toolset |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
206 |
ifneq ($(ALT_COMPILER_PATH),) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
207 |
DEF_OBJCOPY=$(ALT_COMPILER_PATH)/objcopy |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
208 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
209 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
210 |
OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
211 |
ifneq ($(ALT_OBJCOPY),) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
212 |
_JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)") |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
213 |
OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
214 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
215 |
|
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
216 |
ifeq ($(OBJCOPY),) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
217 |
_JUNK_ := $(shell \ |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
218 |
echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo" \ |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
219 |
"files. You may need to set ALT_OBJCOPY.") |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
220 |
ENABLE_FULL_DEBUG_SYMBOLS=0 |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
221 |
_JUNK_ := $(shell \ |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
222 |
echo >&2 "INFO:" \ |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
223 |
"ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)") |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
224 |
else |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
225 |
_JUNK_ := $(shell \ |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
226 |
echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo" \ |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
227 |
"files.") |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
228 |
|
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
229 |
# Library stripping policies for .debuginfo configs: |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
230 |
# all_strip - strips everything from the library |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
231 |
# min_strip - strips most stuff from the library; leaves |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
232 |
# minimum symbols |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
233 |
# no_strip - does not strip the library at all |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
234 |
# |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
235 |
# Oracle security policy requires "all_strip". A waiver was |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
236 |
# granted on 2011.09.01 that permits using "min_strip" in the |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
237 |
# Java JDK and Java JRE. |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
238 |
# |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
239 |
# Currently, STRIP_POLICY is only used when Full Debug Symbols |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
240 |
# is enabled. |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
241 |
# |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
242 |
STRIP_POLICY ?= min_strip |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
243 |
|
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
244 |
_JUNK_ := $(shell \ |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
245 |
echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)") |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
246 |
|
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
247 |
ZIP_DEBUGINFO_FILES ?= 1 |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
248 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
249 |
|
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
250 |
_JUNK_ := $(shell \ |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
251 |
echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)") |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
252 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
253 |
endif # ENABLE_FULL_DEBUG_SYMBOLS=1 |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
254 |
endif # BUILD_FLAVOR |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
255 |
endif # JDK_6_OR_EARLIER |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
256 |
|
10565 | 257 |
JDK_INCLUDE_SUBDIR=bsd |
258 |
||
259 |
# Library suffix |
|
260 |
ifeq ($(OS_VENDOR),Darwin) |
|
261 |
LIBRARY_SUFFIX=dylib |
|
262 |
else |
|
263 |
LIBRARY_SUFFIX=so |
|
264 |
endif |
|
265 |
||
266 |
EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html |
|
267 |
||
268 |
# client and server subdirectories have symbolic links to ../libjsig.so |
|
269 |
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) |
|
20686
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
270 |
|
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
271 |
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
272 |
ifeq ($(ZIP_DEBUGINFO_FILES),1) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
273 |
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
274 |
else |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
275 |
ifeq ($(OS_VENDOR), Darwin) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
276 |
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX).dSYM |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
277 |
else |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
278 |
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
279 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
280 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
281 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
282 |
|
10565 | 283 |
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server |
11593 | 284 |
EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client |
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
12156
diff
changeset
|
285 |
EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal |
10565 | 286 |
|
12156
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
287 |
ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true) |
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
288 |
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt |
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
289 |
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) |
20686
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
290 |
|
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
291 |
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
292 |
ifeq ($(ZIP_DEBUGINFO_FILES),1) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
293 |
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
294 |
else |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
295 |
ifeq ($(OS_VENDOR), Darwin) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
296 |
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX).dSYM |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
297 |
else |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
298 |
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
299 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
300 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
301 |
endif |
10565 | 302 |
endif |
303 |
||
12156
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
304 |
ifeq ($(JVM_VARIANT_CLIENT),true) |
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
305 |
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt |
fb31de03f649
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
12095
diff
changeset
|
306 |
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) |
20686
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
307 |
|
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
308 |
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
309 |
ifeq ($(ZIP_DEBUGINFO_FILES),1) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
310 |
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
311 |
else |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
312 |
ifeq ($(OS_VENDOR), Darwin) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
313 |
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX).dSYM |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
314 |
else |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
315 |
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
316 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
317 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
318 |
endif |
10565 | 319 |
endif |
320 |
||
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
12156
diff
changeset
|
321 |
ifeq ($(JVM_VARIANT_MINIMAL1),true) |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
12156
diff
changeset
|
322 |
EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/Xusage.txt |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
12156
diff
changeset
|
323 |
EXPORT_LIST += $(EXPORT_MINIMAL_DIR)/libjvm.$(LIBRARY_SUFFIX) |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
12156
diff
changeset
|
324 |
endif |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
12156
diff
changeset
|
325 |
|
10565 | 326 |
# Serviceability Binaries |
327 |
# No SA Support for PPC, IA64, ARM or zero |
|
328 |
ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ |
|
329 |
$(EXPORT_LIB_DIR)/sa-jdi.jar |
|
20686
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
330 |
|
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
331 |
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
332 |
ifeq ($(ZIP_DEBUGINFO_FILES),1) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
333 |
ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
334 |
else |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
335 |
ifeq ($(OS_VENDOR), Darwin) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
336 |
ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX).dSYM |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
337 |
else |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
338 |
ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
339 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
340 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
341 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
342 |
|
10565 | 343 |
ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ |
344 |
$(EXPORT_LIB_DIR)/sa-jdi.jar |
|
10739 | 345 |
ADD_SA_BINARIES/universal = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ |
346 |
$(EXPORT_LIB_DIR)/sa-jdi.jar |
|
20686
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
347 |
|
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
348 |
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
349 |
ifeq ($(ZIP_DEBUGINFO_FILES),1) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
350 |
ADD_SA_BINARIES/universal += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
351 |
else |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
352 |
ifeq ($(OS_VENDOR), Darwin) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
353 |
ADD_SA_BINARIES/universal += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX).dSYM |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
354 |
else |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
355 |
ADD_SA_BINARIES/universal += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
356 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
357 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
358 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
359 |
|
10565 | 360 |
ADD_SA_BINARIES/ppc = |
361 |
ADD_SA_BINARIES/ia64 = |
|
362 |
ADD_SA_BINARIES/arm = |
|
363 |
ADD_SA_BINARIES/zero = |
|
364 |
||
365 |
EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH)) |
|
10739 | 366 |
|
11629
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
367 |
# Universal build settings |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
368 |
ifeq ($(OS_VENDOR), Darwin) |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
369 |
# Build universal binaries by default on Mac OS X |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
370 |
MACOSX_UNIVERSAL = true |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
371 |
ifneq ($(ALT_MACOSX_UNIVERSAL),) |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
372 |
MACOSX_UNIVERSAL = $(ALT_MACOSX_UNIVERSAL) |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
373 |
endif |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
374 |
MAKE_ARGS += MACOSX_UNIVERSAL=$(MACOSX_UNIVERSAL) |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
375 |
|
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
376 |
# Universal settings |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
377 |
ifeq ($(MACOSX_UNIVERSAL), true) |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
378 |
|
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
379 |
# Set universal export path but avoid using ARCH or PLATFORM subdirs |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
380 |
EXPORT_PATH=$(OUTPUTDIR)/export-universal$(EXPORT_SUBDIR) |
11649
04e30cc559a9
7142616: MAC: Honor ALT_EXPORT_PATH overrides from JDK control builds
phh
parents:
11629
diff
changeset
|
381 |
ifneq ($(ALT_EXPORT_PATH),) |
04e30cc559a9
7142616: MAC: Honor ALT_EXPORT_PATH overrides from JDK control builds
phh
parents:
11629
diff
changeset
|
382 |
EXPORT_PATH=$(ALT_EXPORT_PATH) |
04e30cc559a9
7142616: MAC: Honor ALT_EXPORT_PATH overrides from JDK control builds
phh
parents:
11629
diff
changeset
|
383 |
endif |
10739 | 384 |
|
11629
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
385 |
# Set universal image dir |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
386 |
JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-universal$(EXPORT_SUBDIR) |
11784
715f58266a42
7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk
twisti
parents:
11649
diff
changeset
|
387 |
ifneq ($(ALT_JDK_IMAGE_DIR),) |
715f58266a42
7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk
twisti
parents:
11649
diff
changeset
|
388 |
JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR) |
715f58266a42
7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk
twisti
parents:
11649
diff
changeset
|
389 |
endif |
11629
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
390 |
|
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
391 |
# Binaries to 'universalize' if built |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
392 |
UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX) |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
393 |
UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX) |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
394 |
UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX) |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
395 |
UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX) |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
396 |
|
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
397 |
# Files to simply copy in place |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
398 |
UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/Xusage.txt |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
399 |
UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/Xusage.txt |
20686
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
400 |
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
401 |
ifeq ($(ZIP_DEBUGINFO_FILES),1) |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
402 |
UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.diz |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
403 |
UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.diz |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
404 |
UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.diz |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
405 |
UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.diz |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
406 |
else |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
407 |
UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX).dSYM |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
408 |
UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX).dSYM |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
409 |
UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX).dSYM |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
410 |
UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX).dSYM |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
411 |
endif |
1fa9a75192c3
7165611: implement Full Debug Symbols on MacOS X hotspot
dcubed
parents:
17006
diff
changeset
|
412 |
endif |
11629
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
413 |
|
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
414 |
endif |
72a73185bdc7
7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents:
11593
diff
changeset
|
415 |
endif |