author | ihse |
Tue, 20 Feb 2018 20:41:51 +0100 | |
branch | ihse-cflags-rewrite-branch |
changeset 56161 | a7585ecb9fc2 |
parent 47871 | 5ab3961d20dd |
child 49488 | 1f9dd2360b17 |
permissions | -rw-r--r-- |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1 |
# |
56161
a7585ecb9fc2
Trying to sort out EXTRA_CFLAGS. Moving all flag handling to flags.m4.
ihse
parents:
47871
diff
changeset
|
2 |
# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved. |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
4 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
5 |
# This code is free software; you can redistribute it and/or modify it |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
7 |
# published by the Free Software Foundation. Oracle designates this |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
8 |
# particular file as subject to the "Classpath" exception as provided |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
10 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
15 |
# accompanied this code). |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
16 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
17 |
# You should have received a copy of the GNU General Public License version |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
20 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
22 |
# or visit www.oracle.com if you need additional information or have any |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
23 |
# questions. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
24 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
25 |
|
37402 | 26 |
# All valid JVM features, regardless of platform |
47687 | 27 |
VALID_JVM_FEATURES="compiler1 compiler2 zero minimal dtrace jvmti jvmci \ |
47061 | 28 |
graal vm-structs jni-check services management all-gcs nmt cds \ |
42538 | 29 |
static-build link-time-opt aot" |
37402 | 30 |
|
31 |
# All valid JVM variants |
|
47687 | 32 |
VALID_JVM_VARIANTS="server client minimal core zero custom" |
22460
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
33 |
|
37402 | 34 |
############################################################################### |
35 |
# Check if the specified JVM variant should be built. To be used in shell if |
|
36 |
# constructs, like this: |
|
37 |
# if HOTSPOT_CHECK_JVM_VARIANT(server); then |
|
38 |
# |
|
39 |
# Only valid to use after HOTSPOT_SETUP_JVM_VARIANTS has setup variants. |
|
22460
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
40 |
|
37402 | 41 |
# Definition kept in one line to allow inlining in if statements. |
42 |
# Additional [] needed to keep m4 from mangling shell constructs. |
|
43 |
AC_DEFUN([HOTSPOT_CHECK_JVM_VARIANT], |
|
44 |
[ [ [[ " $JVM_VARIANTS " =~ " $1 " ]] ] ]) |
|
22460
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
45 |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34495
diff
changeset
|
46 |
############################################################################### |
37402 | 47 |
# Check if the specified JVM features are explicitly enabled. To be used in |
48 |
# shell if constructs, like this: |
|
49 |
# if HOTSPOT_CHECK_JVM_FEATURE(jvmti); then |
|
50 |
# |
|
51 |
# Only valid to use after HOTSPOT_SETUP_JVM_FEATURES has setup features. |
|
52 |
||
53 |
# Definition kept in one line to allow inlining in if statements. |
|
54 |
# Additional [] needed to keep m4 from mangling shell constructs. |
|
55 |
AC_DEFUN([HOTSPOT_CHECK_JVM_FEATURE], |
|
56 |
[ [ [[ " $JVM_FEATURES " =~ " $1 " ]] ] ]) |
|
57 |
||
58 |
############################################################################### |
|
59 |
# Check which variants of the JVM that we want to build. Available variants are: |
|
60 |
# server: normal interpreter, and a tiered C1/C2 compiler |
|
61 |
# client: normal interpreter, and C1 (no C2 compiler) |
|
62 |
# minimal: reduced form of client with optional features stripped out |
|
63 |
# core: normal interpreter only, no compiler |
|
64 |
# zero: C++ based interpreter only, no compiler |
|
65 |
# custom: baseline JVM with no default features |
|
66 |
# |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34495
diff
changeset
|
67 |
AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_VARIANTS], |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
68 |
[ |
20363 | 69 |
AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants], |
47687 | 70 |
[JVM variants (separated by commas) to build (server,client,minimal,core,zero,custom) @<:@server@:>@])]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
71 |
|
42538 | 72 |
SETUP_HOTSPOT_TARGET_CPU_PORT |
73 |
||
20363 | 74 |
if test "x$with_jvm_variants" = x; then |
75 |
with_jvm_variants="server" |
|
76 |
fi |
|
37402 | 77 |
JVM_VARIANTS_OPT="$with_jvm_variants" |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
78 |
|
37402 | 79 |
# Has the user listed more than one variant? |
80 |
# Additional [] needed to keep m4 from mangling shell constructs. |
|
81 |
if [ [[ "$JVM_VARIANTS_OPT" =~ "," ]] ]; then |
|
82 |
BUILDING_MULTIPLE_JVM_VARIANTS=true |
|
83 |
else |
|
84 |
BUILDING_MULTIPLE_JVM_VARIANTS=false |
|
85 |
fi |
|
86 |
# Replace the commas with AND for use in the build directory name. |
|
87 |
JVM_VARIANTS_WITH_AND=`$ECHO "$JVM_VARIANTS_OPT" | $SED -e 's/,/AND/g'` |
|
88 |
||
89 |
AC_MSG_CHECKING([which variants of the JVM to build]) |
|
90 |
# JVM_VARIANTS is a space-separated list. |
|
91 |
# Also use minimal, not minimal1 (which is kept for backwards compatibility). |
|
92 |
JVM_VARIANTS=`$ECHO $JVM_VARIANTS_OPT | $SED -e 's/,/ /g' -e 's/minimal1/minimal/'` |
|
93 |
AC_MSG_RESULT([$JVM_VARIANTS]) |
|
94 |
||
95 |
# Check that the selected variants are valid |
|
96 |
||
97 |
# grep filter function inspired by a comment to http://stackoverflow.com/a/1617326 |
|
37953
195cce402934
8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents:
37402
diff
changeset
|
98 |
# Notice that the original variant failes on SLES 10 and 11 |
195cce402934
8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents:
37402
diff
changeset
|
99 |
NEEDLE=${VALID_JVM_VARIANTS// /$'\n'} |
195cce402934
8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents:
37402
diff
changeset
|
100 |
STACK=${JVM_VARIANTS// /$'\n'} |
195cce402934
8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents:
37402
diff
changeset
|
101 |
INVALID_VARIANTS=`$GREP -Fvx "${NEEDLE}" <<< "${STACK}"` |
37402 | 102 |
if test "x$INVALID_VARIANTS" != x; then |
103 |
AC_MSG_NOTICE([Unknown variant(s) specified: $INVALID_VARIANTS]) |
|
104 |
AC_MSG_ERROR([The available JVM variants are: $VALID_JVM_VARIANTS]) |
|
105 |
fi |
|
106 |
||
107 |
# All "special" variants share the same output directory ("server") |
|
108 |
VALID_MULTIPLE_JVM_VARIANTS="server client minimal" |
|
37953
195cce402934
8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents:
37402
diff
changeset
|
109 |
NEEDLE=${VALID_MULTIPLE_JVM_VARIANTS// /$'\n'} |
195cce402934
8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents:
37402
diff
changeset
|
110 |
STACK=${JVM_VARIANTS// /$'\n'} |
195cce402934
8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents:
37402
diff
changeset
|
111 |
INVALID_MULTIPLE_VARIANTS=`$GREP -Fvx "${NEEDLE}" <<< "${STACK}"` |
37402 | 112 |
if test "x$INVALID_MULTIPLE_VARIANTS" != x && test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = xtrue; then |
113 |
AC_MSG_ERROR([You cannot build multiple variants with anything else than $VALID_MULTIPLE_JVM_VARIANTS.]) |
|
114 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
115 |
|
42510
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
116 |
# The "main" variant is the one used by other libs to link against during the |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
117 |
# build. |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
118 |
if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xtrue"; then |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
119 |
MAIN_VARIANT_PRIO_ORDER="server client minimal" |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
120 |
for variant in $MAIN_VARIANT_PRIO_ORDER; do |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
121 |
if HOTSPOT_CHECK_JVM_VARIANT($variant); then |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
122 |
JVM_VARIANT_MAIN="$variant" |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
123 |
break |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
124 |
fi |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
125 |
done |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
126 |
else |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
127 |
JVM_VARIANT_MAIN="$JVM_VARIANTS" |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
128 |
fi |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
129 |
|
37402 | 130 |
AC_SUBST(JVM_VARIANTS) |
131 |
AC_SUBST(VALID_JVM_VARIANTS) |
|
42510
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
132 |
AC_SUBST(JVM_VARIANT_MAIN) |
37402 | 133 |
|
47687 | 134 |
if HOTSPOT_CHECK_JVM_VARIANT(zero); then |
37402 | 135 |
# zero behaves as a platform and rewrites these values. This is really weird. :( |
136 |
# We are guaranteed that we do not build any other variants when building zero. |
|
137 |
HOTSPOT_TARGET_CPU=zero |
|
138 |
HOTSPOT_TARGET_CPU_ARCH=zero |
|
20363 | 139 |
fi |
37402 | 140 |
]) |
141 |
||
142 |
############################################################################### |
|
143 |
# Check if dtrace should be enabled and has all prerequisites present. |
|
144 |
# |
|
145 |
AC_DEFUN_ONCE([HOTSPOT_SETUP_DTRACE], |
|
146 |
[ |
|
147 |
# Test for dtrace dependencies |
|
148 |
AC_ARG_ENABLE([dtrace], [AS_HELP_STRING([--enable-dtrace@<:@=yes/no/auto@:>@], |
|
149 |
[enable dtrace. Default is auto, where dtrace is enabled if all dependencies |
|
150 |
are present.])]) |
|
151 |
||
152 |
DTRACE_DEP_MISSING=false |
|
153 |
||
154 |
AC_MSG_CHECKING([for dtrace tool]) |
|
155 |
if test "x$DTRACE" != "x" && test -x "$DTRACE"; then |
|
156 |
AC_MSG_RESULT([$DTRACE]) |
|
157 |
else |
|
158 |
AC_MSG_RESULT([not found, cannot build dtrace]) |
|
159 |
DTRACE_DEP_MISSING=true |
|
160 |
fi |
|
161 |
||
162 |
AC_CHECK_HEADERS([sys/sdt.h], [DTRACE_HEADERS_OK=yes],[DTRACE_HEADERS_OK=no]) |
|
163 |
if test "x$DTRACE_HEADERS_OK" != "xyes"; then |
|
164 |
DTRACE_DEP_MISSING=true |
|
165 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
166 |
|
37402 | 167 |
AC_MSG_CHECKING([if dtrace should be built]) |
168 |
if test "x$enable_dtrace" = "xyes"; then |
|
169 |
if test "x$DTRACE_DEP_MISSING" = "xtrue"; then |
|
170 |
AC_MSG_RESULT([no, missing dependencies]) |
|
171 |
HELP_MSG_MISSING_DEPENDENCY([dtrace]) |
|
172 |
AC_MSG_ERROR([Cannot enable dtrace with missing dependencies. See above. $HELP_MSG]) |
|
173 |
else |
|
174 |
INCLUDE_DTRACE=true |
|
175 |
AC_MSG_RESULT([yes, forced]) |
|
176 |
fi |
|
177 |
elif test "x$enable_dtrace" = "xno"; then |
|
178 |
INCLUDE_DTRACE=false |
|
179 |
AC_MSG_RESULT([no, forced]) |
|
180 |
elif test "x$enable_dtrace" = "xauto" || test "x$enable_dtrace" = "x"; then |
|
39384
adde8cb7d01b
8003593: build-infra: Paths to optional platform-specific files should not be hardwired to src/closed
erikj
parents:
39191
diff
changeset
|
181 |
if test "x$DTRACE_DEP_MISSING" = "xtrue"; then |
37402 | 182 |
INCLUDE_DTRACE=false |
183 |
AC_MSG_RESULT([no, missing dependencies]) |
|
184 |
else |
|
185 |
INCLUDE_DTRACE=true |
|
186 |
AC_MSG_RESULT([yes, dependencies present]) |
|
187 |
fi |
|
188 |
else |
|
189 |
AC_MSG_ERROR([Invalid value for --enable-dtrace: $enable_dtrace]) |
|
190 |
fi |
|
191 |
]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
192 |
|
42532 | 193 |
################################################################################ |
194 |
# Check if AOT should be enabled |
|
195 |
# |
|
196 |
AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_AOT], |
|
197 |
[ |
|
198 |
AC_ARG_ENABLE([aot], [AS_HELP_STRING([--enable-aot@<:@=yes/no/auto@:>@], |
|
199 |
[enable ahead of time compilation feature. Default is auto, where aot is enabled if all dependencies are present.])]) |
|
200 |
||
201 |
if test "x$enable_aot" = "x" || test "x$enable_aot" = "xauto"; then |
|
202 |
ENABLE_AOT="true" |
|
203 |
elif test "x$enable_aot" = "xyes"; then |
|
204 |
ENABLE_AOT="true" |
|
205 |
elif test "x$enable_aot" = "xno"; then |
|
206 |
ENABLE_AOT="false" |
|
207 |
AC_MSG_CHECKING([if aot should be enabled]) |
|
208 |
AC_MSG_RESULT([no, forced]) |
|
209 |
else |
|
210 |
AC_MSG_ERROR([Invalid value for --enable-aot: $enable_aot]) |
|
211 |
fi |
|
212 |
||
213 |
if test "x$ENABLE_AOT" = "xtrue"; then |
|
46191
7ec14435e850
8172670: AOT Platform Support for Windows and Mac OS X x64
bobv
parents:
42856
diff
changeset
|
214 |
# Only enable AOT on X64 platforms. |
46233
91715f519bb4
8182052: Test compiler/aot/cli/jaotc/CompileJarTest.java fails in JPRT
bobv
parents:
46218
diff
changeset
|
215 |
if test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then |
47217 | 216 |
if test -e "${TOPDIR}/src/jdk.aot"; then |
217 |
if test -e "${TOPDIR}/src/jdk.internal.vm.compiler"; then |
|
42532 | 218 |
ENABLE_AOT="true" |
219 |
else |
|
220 |
ENABLE_AOT="false" |
|
221 |
if test "x$enable_aot" = "xyes"; then |
|
47217 | 222 |
AC_MSG_ERROR([Cannot build AOT without src/jdk.internal.vm.compiler sources. Remove --enable-aot.]) |
42532 | 223 |
fi |
224 |
fi |
|
225 |
else |
|
226 |
ENABLE_AOT="false" |
|
227 |
if test "x$enable_aot" = "xyes"; then |
|
47217 | 228 |
AC_MSG_ERROR([Cannot build AOT without src/jdk.aot sources. Remove --enable-aot.]) |
42532 | 229 |
fi |
230 |
fi |
|
231 |
else |
|
232 |
ENABLE_AOT="false" |
|
233 |
if test "x$enable_aot" = "xyes"; then |
|
46218 | 234 |
AC_MSG_ERROR([AOT is currently only supported on x86_64. Remove --enable-aot.]) |
42532 | 235 |
fi |
236 |
fi |
|
237 |
fi |
|
238 |
||
239 |
AC_SUBST(ENABLE_AOT) |
|
240 |
]) |
|
241 |
||
47060 | 242 |
################################################################################ |
243 |
# Allow to disable CDS |
|
244 |
# |
|
245 |
AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_CDS], |
|
246 |
[ |
|
247 |
AC_ARG_ENABLE([cds], [AS_HELP_STRING([--enable-cds@<:@=yes/no@:>@], |
|
248 |
[enable class data sharing feature in non-minimal VM. Default is yes.])]) |
|
249 |
||
250 |
if test "x$enable_cds" = "x" || test "x$enable_cds" = "xyes"; then |
|
251 |
ENABLE_CDS="true" |
|
252 |
elif test "x$enable_cds" = "xno"; then |
|
253 |
ENABLE_CDS="false" |
|
254 |
else |
|
255 |
AC_MSG_ERROR([Invalid value for --enable-cds: $enable_cds]) |
|
256 |
fi |
|
257 |
||
258 |
AC_SUBST(ENABLE_CDS) |
|
259 |
]) |
|
260 |
||
37402 | 261 |
############################################################################### |
262 |
# Set up all JVM features for each JVM variant. |
|
263 |
# |
|
264 |
AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES], |
|
265 |
[ |
|
266 |
# The user can in some cases supply additional jvm features. For the custom |
|
267 |
# variant, this defines the entire variant. |
|
268 |
AC_ARG_WITH([jvm-features], [AS_HELP_STRING([--with-jvm-features], |
|
269 |
[additional JVM features to enable (separated by comma), use '--help' to show possible values @<:@none@:>@])]) |
|
270 |
if test "x$with_jvm_features" != x; then |
|
271 |
AC_MSG_CHECKING([additional JVM features]) |
|
272 |
JVM_FEATURES=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'` |
|
273 |
AC_MSG_RESULT([$JVM_FEATURES]) |
|
274 |
fi |
|
275 |
||
42538 | 276 |
# Override hotspot cpu definitions for ARM platforms |
277 |
if test "x$OPENJDK_TARGET_CPU" = xarm; then |
|
278 |
HOTSPOT_TARGET_CPU=arm_32 |
|
279 |
HOTSPOT_TARGET_CPU_DEFINE="ARM32" |
|
280 |
elif test "x$OPENJDK_TARGET_CPU" = xaarch64 && test "x$HOTSPOT_TARGET_CPU_PORT" = xarm64; then |
|
281 |
HOTSPOT_TARGET_CPU=arm_64 |
|
282 |
HOTSPOT_TARGET_CPU_ARCH=arm |
|
283 |
fi |
|
284 |
||
37402 | 285 |
# Verify that dependencies are met for explicitly set features. |
286 |
if HOTSPOT_CHECK_JVM_FEATURE(jvmti) && ! HOTSPOT_CHECK_JVM_FEATURE(services); then |
|
287 |
AC_MSG_ERROR([Specified JVM feature 'jvmti' requires feature 'services']) |
|
20363 | 288 |
fi |
37402 | 289 |
|
290 |
if HOTSPOT_CHECK_JVM_FEATURE(management) && ! HOTSPOT_CHECK_JVM_FEATURE(nmt); then |
|
291 |
AC_MSG_ERROR([Specified JVM feature 'management' requires feature 'nmt']) |
|
292 |
fi |
|
293 |
||
39946
c82f919f4454
8159888: [JVMCI] the client VM build is broken when INCLUDE_JVMCI is defined
dnsimon
parents:
39191
diff
changeset
|
294 |
if HOTSPOT_CHECK_JVM_FEATURE(jvmci) && ! (HOTSPOT_CHECK_JVM_FEATURE(compiler1) || HOTSPOT_CHECK_JVM_FEATURE(compiler2)); then |
c82f919f4454
8159888: [JVMCI] the client VM build is broken when INCLUDE_JVMCI is defined
dnsimon
parents:
39191
diff
changeset
|
295 |
AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1']) |
37402 | 296 |
fi |
297 |
||
298 |
if HOTSPOT_CHECK_JVM_FEATURE(compiler2) && ! HOTSPOT_CHECK_JVM_FEATURE(all-gcs); then |
|
299 |
AC_MSG_ERROR([Specified JVM feature 'compiler2' requires feature 'all-gcs']) |
|
300 |
fi |
|
301 |
||
302 |
if HOTSPOT_CHECK_JVM_FEATURE(vm-structs) && ! HOTSPOT_CHECK_JVM_FEATURE(all-gcs); then |
|
303 |
AC_MSG_ERROR([Specified JVM feature 'vm-structs' requires feature 'all-gcs']) |
|
304 |
fi |
|
305 |
||
306 |
# Turn on additional features based on other parts of configure |
|
307 |
if test "x$INCLUDE_DTRACE" = "xtrue"; then |
|
308 |
JVM_FEATURES="$JVM_FEATURES dtrace" |
|
309 |
else |
|
310 |
if HOTSPOT_CHECK_JVM_FEATURE(dtrace); then |
|
311 |
AC_MSG_ERROR([To enable dtrace, you must use --enable-dtrace]) |
|
14810 | 312 |
fi |
20363 | 313 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
314 |
|
37402 | 315 |
if test "x$STATIC_BUILD" = "xtrue"; then |
316 |
JVM_FEATURES="$JVM_FEATURES static-build" |
|
20363 | 317 |
else |
37402 | 318 |
if HOTSPOT_CHECK_JVM_FEATURE(static-build); then |
319 |
AC_MSG_ERROR([To enable static-build, you must use --enable-static-build]) |
|
320 |
fi |
|
321 |
fi |
|
322 |
||
47687 | 323 |
if ! HOTSPOT_CHECK_JVM_VARIANT(zero); then |
37402 | 324 |
if HOTSPOT_CHECK_JVM_FEATURE(zero); then |
47687 | 325 |
AC_MSG_ERROR([To enable zero, you must use --with-jvm-variants=zero]) |
37402 | 326 |
fi |
327 |
fi |
|
328 |
||
39946
c82f919f4454
8159888: [JVMCI] the client VM build is broken when INCLUDE_JVMCI is defined
dnsimon
parents:
39191
diff
changeset
|
329 |
# Only enable jvmci on x86_64, sparcv9 and aarch64. |
37402 | 330 |
if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \ |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
331 |
test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \ |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
332 |
test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then |
37402 | 333 |
JVM_FEATURES_jvmci="jvmci" |
334 |
else |
|
335 |
JVM_FEATURES_jvmci="" |
|
20363 | 336 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
337 |
|
43925 | 338 |
AC_MSG_CHECKING([if jdk.internal.vm.compiler should be built]) |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
339 |
if HOTSPOT_CHECK_JVM_FEATURE(graal); then |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
340 |
AC_MSG_RESULT([yes, forced]) |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
341 |
if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
342 |
AC_MSG_ERROR([Specified JVM feature 'graal' requires feature 'jvmci']) |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
343 |
fi |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
344 |
INCLUDE_GRAAL="true" |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
345 |
else |
47056 | 346 |
# By default enable graal build on linux-x64 or where AOT is available. |
347 |
# graal build requires jvmci. |
|
348 |
if test "x$JVM_FEATURES_jvmci" = "xjvmci" && \ |
|
349 |
(test "x$OPENJDK_TARGET_CPU" = "xx86_64" && \ |
|
350 |
test "x$OPENJDK_TARGET_OS" = "xlinux" || \ |
|
351 |
test "x$ENABLE_AOT" = "xtrue") ; then |
|
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
352 |
AC_MSG_RESULT([yes]) |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
353 |
JVM_FEATURES_graal="graal" |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
354 |
INCLUDE_GRAAL="true" |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
355 |
else |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
356 |
AC_MSG_RESULT([no]) |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
357 |
JVM_FEATURES_graal="" |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
358 |
INCLUDE_GRAAL="false" |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
359 |
fi |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
360 |
fi |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
361 |
|
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
362 |
AC_SUBST(INCLUDE_GRAAL) |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
363 |
|
42532 | 364 |
AC_MSG_CHECKING([if aot should be enabled]) |
365 |
if test "x$ENABLE_AOT" = "xtrue"; then |
|
366 |
if test "x$enable_aot" = "xyes"; then |
|
367 |
AC_MSG_RESULT([yes, forced]) |
|
368 |
else |
|
369 |
AC_MSG_RESULT([yes]) |
|
370 |
fi |
|
371 |
JVM_FEATURES_aot="aot" |
|
372 |
else |
|
373 |
if test "x$enable_aot" = "xno"; then |
|
374 |
AC_MSG_RESULT([no, forced]) |
|
375 |
else |
|
376 |
AC_MSG_RESULT([no]) |
|
377 |
fi |
|
378 |
JVM_FEATURES_aot="" |
|
379 |
fi |
|
380 |
||
42538 | 381 |
if test "x$OPENJDK_TARGET_CPU" = xarm ; then |
382 |
# Default to use link time optimizations on minimal on arm |
|
383 |
JVM_FEATURES_link_time_opt="link-time-opt" |
|
384 |
else |
|
385 |
JVM_FEATURES_link_time_opt="" |
|
386 |
fi |
|
387 |
||
37402 | 388 |
# All variants but minimal (and custom) get these features |
47061 | 389 |
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti vm-structs jni-check services management all-gcs nmt" |
47060 | 390 |
if test "x$ENABLE_CDS" = "xtrue"; then |
391 |
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cds" |
|
47871
5ab3961d20dd
8191204: Post-consolidation cleaning up of the build system
ihse
parents:
47687
diff
changeset
|
392 |
fi |
37402 | 393 |
|
394 |
# Enable features depending on variant. |
|
42532 | 395 |
JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal" |
39946
c82f919f4454
8159888: [JVMCI] the client VM build is broken when INCLUDE_JVMCI is defined
dnsimon
parents:
39191
diff
changeset
|
396 |
JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci" |
37402 | 397 |
JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES" |
42538 | 398 |
JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES $JVM_FEATURES_link_time_opt" |
37402 | 399 |
JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES" |
400 |
JVM_FEATURES_custom="$JVM_FEATURES" |
|
401 |
||
402 |
AC_SUBST(JVM_FEATURES_server) |
|
403 |
AC_SUBST(JVM_FEATURES_client) |
|
404 |
AC_SUBST(JVM_FEATURES_core) |
|
405 |
AC_SUBST(JVM_FEATURES_minimal) |
|
406 |
AC_SUBST(JVM_FEATURES_zero) |
|
407 |
AC_SUBST(JVM_FEATURES_custom) |
|
408 |
||
409 |
# Used for verification of Makefiles by check-jvm-feature |
|
410 |
AC_SUBST(VALID_JVM_FEATURES) |
|
411 |
||
412 |
# We don't support --with-jvm-interpreter anymore, use zero instead. |
|
413 |
BASIC_DEPRECATED_ARG_WITH(jvm-interpreter) |
|
414 |
]) |
|
415 |
||
416 |
############################################################################### |
|
417 |
# Validate JVM features once all setup is complete, including custom setup. |
|
418 |
# |
|
419 |
AC_DEFUN_ONCE([HOTSPOT_VALIDATE_JVM_FEATURES], |
|
420 |
[ |
|
421 |
# Keep feature lists sorted and free of duplicates |
|
422 |
JVM_FEATURES_server="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_server | $SORT -u))" |
|
423 |
JVM_FEATURES_client="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_client | $SORT -u))" |
|
424 |
JVM_FEATURES_core="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_core | $SORT -u))" |
|
425 |
JVM_FEATURES_minimal="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_minimal | $SORT -u))" |
|
426 |
JVM_FEATURES_zero="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_zero | $SORT -u))" |
|
427 |
JVM_FEATURES_custom="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_custom | $SORT -u))" |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34495
diff
changeset
|
428 |
|
37402 | 429 |
# Validate features |
430 |
for variant in $JVM_VARIANTS; do |
|
431 |
AC_MSG_CHECKING([JVM features for JVM variant '$variant']) |
|
432 |
features_var_name=JVM_FEATURES_$variant |
|
433 |
JVM_FEATURES_TO_TEST=${!features_var_name} |
|
434 |
AC_MSG_RESULT([$JVM_FEATURES_TO_TEST]) |
|
37953
195cce402934
8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents:
37402
diff
changeset
|
435 |
NEEDLE=${VALID_JVM_FEATURES// /$'\n'} |
195cce402934
8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents:
37402
diff
changeset
|
436 |
STACK=${JVM_FEATURES_TO_TEST// /$'\n'} |
195cce402934
8154251: ANSI-C Quoting bug in hotspot.m4 during configure on SLES 10 and 11
simonis
parents:
37402
diff
changeset
|
437 |
INVALID_FEATURES=`$GREP -Fvx "${NEEDLE}" <<< "${STACK}"` |
37402 | 438 |
if test "x$INVALID_FEATURES" != x; then |
439 |
AC_MSG_ERROR([Invalid JVM feature(s): $INVALID_FEATURES]) |
|
440 |
fi |
|
441 |
done |
|
442 |
]) |
|
37978
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
443 |
|
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
444 |
################################################################################ |
42538 | 445 |
# |
446 |
# Specify which sources will be used to build the 64-bit ARM port |
|
447 |
# |
|
448 |
# --with-cpu-port=arm64 will use hotspot/src/cpu/arm |
|
449 |
# --with-cpu-port=aarch64 will use hotspot/src/cpu/aarch64 |
|
450 |
# |
|
451 |
AC_DEFUN([SETUP_HOTSPOT_TARGET_CPU_PORT], |
|
452 |
[ |
|
453 |
AC_ARG_WITH(cpu-port, [AS_HELP_STRING([--with-cpu-port], |
|
454 |
[specify sources to use for Hotspot 64-bit ARM port (arm64,aarch64) @<:@aarch64@:>@ ])]) |
|
455 |
||
456 |
if test "x$with_cpu_port" != x; then |
|
457 |
if test "x$OPENJDK_TARGET_CPU" != xaarch64; then |
|
458 |
AC_MSG_ERROR([--with-cpu-port only available on aarch64]) |
|
459 |
fi |
|
460 |
if test "x$with_cpu_port" != xarm64 && \ |
|
461 |
test "x$with_cpu_port" != xaarch64; then |
|
462 |
AC_MSG_ERROR([--with-cpu-port must specify arm64 or aarch64]) |
|
463 |
fi |
|
464 |
HOTSPOT_TARGET_CPU_PORT="$with_cpu_port" |
|
465 |
fi |
|
466 |
]) |
|
467 |
||
468 |
||
469 |
################################################################################ |
|
37978
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
470 |
# Check if gtest should be built |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
471 |
# |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
472 |
AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_GTEST], |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
473 |
[ |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
474 |
AC_ARG_ENABLE([hotspot-gtest], [AS_HELP_STRING([--disable-hotspot-gtest], |
47871
5ab3961d20dd
8191204: Post-consolidation cleaning up of the build system
ihse
parents:
47687
diff
changeset
|
475 |
[Disables building of the Hotspot unit tests @<:@enabled@:>@])]) |
37978
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
476 |
|
47217 | 477 |
if test -e "${TOPDIR}/test/hotspot/gtest"; then |
37978
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
478 |
GTEST_DIR_EXISTS="true" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
479 |
else |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
480 |
GTEST_DIR_EXISTS="false" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
481 |
fi |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
482 |
|
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
483 |
AC_MSG_CHECKING([if Hotspot gtest unit tests should be built]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
484 |
if test "x$enable_hotspot_gtest" = "xyes"; then |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
485 |
if test "x$GTEST_DIR_EXISTS" = "xtrue"; then |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
486 |
AC_MSG_RESULT([yes, forced]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
487 |
BUILD_GTEST="true" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
488 |
else |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
489 |
AC_MSG_ERROR([Cannot build gtest without the test source]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
490 |
fi |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
491 |
elif test "x$enable_hotspot_gtest" = "xno"; then |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
492 |
AC_MSG_RESULT([no, forced]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
493 |
BUILD_GTEST="false" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
494 |
elif test "x$enable_hotspot_gtest" = "x"; then |
42855 | 495 |
if test "x$GTEST_DIR_EXISTS" = "xtrue"; then |
37978
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
496 |
AC_MSG_RESULT([yes]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
497 |
BUILD_GTEST="true" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
498 |
else |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
499 |
AC_MSG_RESULT([no]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
500 |
BUILD_GTEST="false" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
501 |
fi |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
502 |
else |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
503 |
AC_MSG_ERROR([--enable-gtest must be either yes or no]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
504 |
fi |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
505 |
|
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
506 |
AC_SUBST(BUILD_GTEST) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
507 |
]) |