author | manc |
Fri, 08 Mar 2019 18:21:52 -0800 | |
changeset 54646 | 5b1eec609909 |
parent 53434 | ddfa4bfabdec |
child 54669 | ad45b3802d4e |
permissions | -rw-r--r-- |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1 |
# |
49120 | 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 \ |
52925
9c18c9d839d3
8214259: Implementation: JEP 189: Shenandoah: A Low-Pause-Time Garbage Collector (Experimental)
rkennke
parents:
52798
diff
changeset
|
28 |
graal vm-structs jni-check services management cmsgc epsilongc g1gc parallelgc serialgc shenandoahgc zgc nmt cds \ |
50113 | 29 |
static-build link-time-opt aot jfr" |
37402 | 30 |
|
50266 | 31 |
# Deprecated JVM features (these are ignored, but with a warning) |
32 |
DEPRECATED_JVM_FEATURES="trace" |
|
33 |
||
37402 | 34 |
# All valid JVM variants |
47687 | 35 |
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
|
36 |
|
37402 | 37 |
############################################################################### |
38 |
# Check if the specified JVM variant should be built. To be used in shell if |
|
39 |
# constructs, like this: |
|
40 |
# if HOTSPOT_CHECK_JVM_VARIANT(server); then |
|
41 |
# |
|
42 |
# 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
|
43 |
|
37402 | 44 |
# Definition kept in one line to allow inlining in if statements. |
45 |
# Additional [] needed to keep m4 from mangling shell constructs. |
|
46 |
AC_DEFUN([HOTSPOT_CHECK_JVM_VARIANT], |
|
47 |
[ [ [[ " $JVM_VARIANTS " =~ " $1 " ]] ] ]) |
|
22460
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
48 |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34495
diff
changeset
|
49 |
############################################################################### |
53434
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
50 |
# Check if the specified JVM feature is enabled. To be used in shell if |
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
51 |
# constructs, like this: |
37402 | 52 |
# if HOTSPOT_CHECK_JVM_FEATURE(jvmti); then |
53 |
# |
|
54 |
# Only valid to use after HOTSPOT_SETUP_JVM_FEATURES has setup features. |
|
55 |
||
56 |
# Definition kept in one line to allow inlining in if statements. |
|
57 |
# Additional [] needed to keep m4 from mangling shell constructs. |
|
58 |
AC_DEFUN([HOTSPOT_CHECK_JVM_FEATURE], |
|
59 |
[ [ [[ " $JVM_FEATURES " =~ " $1 " ]] ] ]) |
|
60 |
||
61 |
############################################################################### |
|
53434
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
62 |
# Check if the specified JVM feature is explicitly disabled. To be used in |
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
63 |
# shell if constructs, like this: |
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
64 |
# if HOTSPOT_IS_JVM_FEATURE_DISABLED(jvmci); then |
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
65 |
# |
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
66 |
# This function is internal to hotspot.m4, and is only used when constructing |
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
67 |
# the valid set of enabled JVM features. Users outside of hotspot.m4 should just |
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
68 |
# use HOTSPOT_CHECK_JVM_FEATURE to check if a feature is enabled or not. |
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
69 |
|
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
70 |
# Definition kept in one line to allow inlining in if statements. |
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
71 |
# Additional [] needed to keep m4 from mangling shell constructs. |
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
72 |
AC_DEFUN([HOTSPOT_IS_JVM_FEATURE_DISABLED], |
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
73 |
[ [ [[ " $DISABLED_JVM_FEATURES " =~ " $1 " ]] ] ]) |
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
74 |
|
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
75 |
############################################################################### |
37402 | 76 |
# Check which variants of the JVM that we want to build. Available variants are: |
77 |
# server: normal interpreter, and a tiered C1/C2 compiler |
|
78 |
# client: normal interpreter, and C1 (no C2 compiler) |
|
79 |
# minimal: reduced form of client with optional features stripped out |
|
80 |
# core: normal interpreter only, no compiler |
|
81 |
# zero: C++ based interpreter only, no compiler |
|
82 |
# custom: baseline JVM with no default features |
|
83 |
# |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34495
diff
changeset
|
84 |
AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_VARIANTS], |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
85 |
[ |
20363 | 86 |
AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants], |
47687 | 87 |
[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
|
88 |
|
20363 | 89 |
if test "x$with_jvm_variants" = x; then |
90 |
with_jvm_variants="server" |
|
91 |
fi |
|
37402 | 92 |
JVM_VARIANTS_OPT="$with_jvm_variants" |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
93 |
|
37402 | 94 |
# Has the user listed more than one variant? |
95 |
# Additional [] needed to keep m4 from mangling shell constructs. |
|
96 |
if [ [[ "$JVM_VARIANTS_OPT" =~ "," ]] ]; then |
|
97 |
BUILDING_MULTIPLE_JVM_VARIANTS=true |
|
98 |
else |
|
99 |
BUILDING_MULTIPLE_JVM_VARIANTS=false |
|
100 |
fi |
|
101 |
# Replace the commas with AND for use in the build directory name. |
|
102 |
JVM_VARIANTS_WITH_AND=`$ECHO "$JVM_VARIANTS_OPT" | $SED -e 's/,/AND/g'` |
|
103 |
||
104 |
AC_MSG_CHECKING([which variants of the JVM to build]) |
|
105 |
# JVM_VARIANTS is a space-separated list. |
|
106 |
# Also use minimal, not minimal1 (which is kept for backwards compatibility). |
|
107 |
JVM_VARIANTS=`$ECHO $JVM_VARIANTS_OPT | $SED -e 's/,/ /g' -e 's/minimal1/minimal/'` |
|
108 |
AC_MSG_RESULT([$JVM_VARIANTS]) |
|
109 |
||
110 |
# Check that the selected variants are valid |
|
49582 | 111 |
BASIC_GET_NON_MATCHING_VALUES(INVALID_VARIANTS, $JVM_VARIANTS, $VALID_JVM_VARIANTS) |
37402 | 112 |
if test "x$INVALID_VARIANTS" != x; then |
49582 | 113 |
AC_MSG_NOTICE([Unknown variant(s) specified: "$INVALID_VARIANTS"]) |
114 |
AC_MSG_NOTICE([The available JVM variants are: "$VALID_JVM_VARIANTS"]) |
|
115 |
AC_MSG_ERROR([Cannot continue]) |
|
37402 | 116 |
fi |
117 |
||
118 |
# All "special" variants share the same output directory ("server") |
|
119 |
VALID_MULTIPLE_JVM_VARIANTS="server client minimal" |
|
49582 | 120 |
BASIC_GET_NON_MATCHING_VALUES(INVALID_MULTIPLE_VARIANTS, $JVM_VARIANTS, $VALID_MULTIPLE_JVM_VARIANTS) |
37402 | 121 |
if test "x$INVALID_MULTIPLE_VARIANTS" != x && test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = xtrue; then |
122 |
AC_MSG_ERROR([You cannot build multiple variants with anything else than $VALID_MULTIPLE_JVM_VARIANTS.]) |
|
123 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
124 |
|
42510
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
125 |
# 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
|
126 |
# build. |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
127 |
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
|
128 |
MAIN_VARIANT_PRIO_ORDER="server client minimal" |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
129 |
for variant in $MAIN_VARIANT_PRIO_ORDER; do |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
130 |
if HOTSPOT_CHECK_JVM_VARIANT($variant); then |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
131 |
JVM_VARIANT_MAIN="$variant" |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
132 |
break |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
133 |
fi |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
134 |
done |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
135 |
else |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
136 |
JVM_VARIANT_MAIN="$JVM_VARIANTS" |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
137 |
fi |
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
138 |
|
37402 | 139 |
AC_SUBST(JVM_VARIANTS) |
140 |
AC_SUBST(VALID_JVM_VARIANTS) |
|
42510
406dfb60de57
8170284: Move fine granular hotspot make targets to top level
erikj
parents:
39947
diff
changeset
|
141 |
AC_SUBST(JVM_VARIANT_MAIN) |
37402 | 142 |
|
47687 | 143 |
if HOTSPOT_CHECK_JVM_VARIANT(zero); then |
37402 | 144 |
# zero behaves as a platform and rewrites these values. This is really weird. :( |
145 |
# We are guaranteed that we do not build any other variants when building zero. |
|
146 |
HOTSPOT_TARGET_CPU=zero |
|
147 |
HOTSPOT_TARGET_CPU_ARCH=zero |
|
20363 | 148 |
fi |
37402 | 149 |
]) |
150 |
||
151 |
############################################################################### |
|
152 |
# Check if dtrace should be enabled and has all prerequisites present. |
|
153 |
# |
|
154 |
AC_DEFUN_ONCE([HOTSPOT_SETUP_DTRACE], |
|
155 |
[ |
|
156 |
# Test for dtrace dependencies |
|
157 |
AC_ARG_ENABLE([dtrace], [AS_HELP_STRING([--enable-dtrace@<:@=yes/no/auto@:>@], |
|
158 |
[enable dtrace. Default is auto, where dtrace is enabled if all dependencies |
|
159 |
are present.])]) |
|
160 |
||
161 |
DTRACE_DEP_MISSING=false |
|
162 |
||
163 |
AC_MSG_CHECKING([for dtrace tool]) |
|
164 |
if test "x$DTRACE" != "x" && test -x "$DTRACE"; then |
|
165 |
AC_MSG_RESULT([$DTRACE]) |
|
166 |
else |
|
167 |
AC_MSG_RESULT([not found, cannot build dtrace]) |
|
168 |
DTRACE_DEP_MISSING=true |
|
169 |
fi |
|
170 |
||
171 |
AC_CHECK_HEADERS([sys/sdt.h], [DTRACE_HEADERS_OK=yes],[DTRACE_HEADERS_OK=no]) |
|
172 |
if test "x$DTRACE_HEADERS_OK" != "xyes"; then |
|
173 |
DTRACE_DEP_MISSING=true |
|
174 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
175 |
|
37402 | 176 |
AC_MSG_CHECKING([if dtrace should be built]) |
177 |
if test "x$enable_dtrace" = "xyes"; then |
|
178 |
if test "x$DTRACE_DEP_MISSING" = "xtrue"; then |
|
179 |
AC_MSG_RESULT([no, missing dependencies]) |
|
180 |
HELP_MSG_MISSING_DEPENDENCY([dtrace]) |
|
181 |
AC_MSG_ERROR([Cannot enable dtrace with missing dependencies. See above. $HELP_MSG]) |
|
182 |
else |
|
183 |
INCLUDE_DTRACE=true |
|
184 |
AC_MSG_RESULT([yes, forced]) |
|
185 |
fi |
|
186 |
elif test "x$enable_dtrace" = "xno"; then |
|
187 |
INCLUDE_DTRACE=false |
|
188 |
AC_MSG_RESULT([no, forced]) |
|
189 |
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
|
190 |
if test "x$DTRACE_DEP_MISSING" = "xtrue"; then |
37402 | 191 |
INCLUDE_DTRACE=false |
192 |
AC_MSG_RESULT([no, missing dependencies]) |
|
193 |
else |
|
194 |
INCLUDE_DTRACE=true |
|
195 |
AC_MSG_RESULT([yes, dependencies present]) |
|
196 |
fi |
|
197 |
else |
|
198 |
AC_MSG_ERROR([Invalid value for --enable-dtrace: $enable_dtrace]) |
|
199 |
fi |
|
200 |
]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
201 |
|
42532 | 202 |
################################################################################ |
203 |
# Check if AOT should be enabled |
|
204 |
# |
|
205 |
AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_AOT], |
|
206 |
[ |
|
207 |
AC_ARG_ENABLE([aot], [AS_HELP_STRING([--enable-aot@<:@=yes/no/auto@:>@], |
|
208 |
[enable ahead of time compilation feature. Default is auto, where aot is enabled if all dependencies are present.])]) |
|
209 |
||
210 |
if test "x$enable_aot" = "x" || test "x$enable_aot" = "xauto"; then |
|
211 |
ENABLE_AOT="true" |
|
212 |
elif test "x$enable_aot" = "xyes"; then |
|
213 |
ENABLE_AOT="true" |
|
214 |
elif test "x$enable_aot" = "xno"; then |
|
215 |
ENABLE_AOT="false" |
|
216 |
else |
|
217 |
AC_MSG_ERROR([Invalid value for --enable-aot: $enable_aot]) |
|
218 |
fi |
|
219 |
||
220 |
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
|
221 |
# Only enable AOT on X64 platforms. |
50104 | 222 |
if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then |
47217 | 223 |
if test -e "${TOPDIR}/src/jdk.aot"; then |
224 |
if test -e "${TOPDIR}/src/jdk.internal.vm.compiler"; then |
|
42532 | 225 |
ENABLE_AOT="true" |
226 |
else |
|
227 |
ENABLE_AOT="false" |
|
228 |
if test "x$enable_aot" = "xyes"; then |
|
47217 | 229 |
AC_MSG_ERROR([Cannot build AOT without src/jdk.internal.vm.compiler sources. Remove --enable-aot.]) |
42532 | 230 |
fi |
231 |
fi |
|
232 |
else |
|
233 |
ENABLE_AOT="false" |
|
234 |
if test "x$enable_aot" = "xyes"; then |
|
47217 | 235 |
AC_MSG_ERROR([Cannot build AOT without src/jdk.aot sources. Remove --enable-aot.]) |
42532 | 236 |
fi |
237 |
fi |
|
238 |
else |
|
239 |
ENABLE_AOT="false" |
|
240 |
if test "x$enable_aot" = "xyes"; then |
|
51030
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
241 |
AC_MSG_ERROR([AOT is currently only supported on x86_64 and aarch64. Remove --enable-aot.]) |
42532 | 242 |
fi |
243 |
fi |
|
244 |
fi |
|
245 |
||
246 |
AC_SUBST(ENABLE_AOT) |
|
247 |
]) |
|
248 |
||
47060 | 249 |
################################################################################ |
250 |
# Allow to disable CDS |
|
251 |
# |
|
252 |
AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_CDS], |
|
253 |
[ |
|
50625
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
254 |
AC_ARG_ENABLE([cds], [AS_HELP_STRING([--enable-cds@<:@=yes/no/auto@:>@], |
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
255 |
[enable class data sharing feature in non-minimal VM. Default is auto, where cds is enabled if supported on the platform.])]) |
47060 | 256 |
|
50625
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
257 |
if test "x$enable_cds" = "x" || test "x$enable_cds" = "xauto"; then |
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
258 |
ENABLE_CDS="true" |
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
259 |
elif test "x$enable_cds" = "xyes"; then |
47060 | 260 |
ENABLE_CDS="true" |
261 |
elif test "x$enable_cds" = "xno"; then |
|
262 |
ENABLE_CDS="false" |
|
263 |
else |
|
264 |
AC_MSG_ERROR([Invalid value for --enable-cds: $enable_cds]) |
|
265 |
fi |
|
266 |
||
267 |
AC_SUBST(ENABLE_CDS) |
|
268 |
]) |
|
269 |
||
37402 | 270 |
############################################################################### |
271 |
# Set up all JVM features for each JVM variant. |
|
272 |
# |
|
273 |
AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES], |
|
274 |
[ |
|
49582 | 275 |
# Prettify the VALID_JVM_FEATURES string |
276 |
BASIC_SORT_LIST(VALID_JVM_FEATURES, $VALID_JVM_FEATURES) |
|
277 |
||
37402 | 278 |
# The user can in some cases supply additional jvm features. For the custom |
279 |
# variant, this defines the entire variant. |
|
280 |
AC_ARG_WITH([jvm-features], [AS_HELP_STRING([--with-jvm-features], |
|
49582 | 281 |
[JVM features to enable (foo) or disable (-foo), separated by comma. Use '--help' to show possible values @<:@none@:>@])]) |
37402 | 282 |
if test "x$with_jvm_features" != x; then |
49582 | 283 |
AC_MSG_CHECKING([user specified JVM feature list]) |
284 |
USER_JVM_FEATURE_LIST=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'` |
|
285 |
AC_MSG_RESULT([$user_jvm_feature_list]) |
|
286 |
# These features will be added to all variant defaults |
|
50266 | 287 |
JVM_FEATURES=`$ECHO $USER_JVM_FEATURE_LIST | $AWK '{ for (i=1; i<=NF; i++) if (!match($i, /^-.*/)) printf("%s ", $i) }'` |
49582 | 288 |
# These features will be removed from all variant defaults |
50266 | 289 |
DISABLED_JVM_FEATURES=`$ECHO $USER_JVM_FEATURE_LIST | $AWK '{ for (i=1; i<=NF; i++) if (match($i, /^-.*/)) printf("%s ", substr($i, 2))}'` |
49582 | 290 |
|
291 |
# Verify that the user has provided valid features |
|
50266 | 292 |
BASIC_GET_NON_MATCHING_VALUES(INVALID_FEATURES, $JVM_FEATURES $DISABLED_JVM_FEATURES, $VALID_JVM_FEATURES $DEPRECATED_JVM_FEATURES) |
49582 | 293 |
if test "x$INVALID_FEATURES" != x; then |
294 |
AC_MSG_NOTICE([Unknown JVM features specified: "$INVALID_FEATURES"]) |
|
295 |
AC_MSG_NOTICE([The available JVM features are: "$VALID_JVM_FEATURES"]) |
|
296 |
AC_MSG_ERROR([Cannot continue]) |
|
297 |
fi |
|
298 |
||
50266 | 299 |
# Check if the user has provided deprecated features |
300 |
BASIC_GET_MATCHING_VALUES(DEPRECATED_FEATURES, $JVM_FEATURES $DISABLED_JVM_FEATURES, $DEPRECATED_JVM_FEATURES) |
|
301 |
if test "x$DEPRECATED_FEATURES" != x; then |
|
302 |
AC_MSG_WARN([Deprecated JVM features specified (will be ignored): "$DEPRECATED_FEATURES"]) |
|
303 |
# Filter out deprecated features |
|
304 |
BASIC_GET_NON_MATCHING_VALUES(JVM_FEATURES, $JVM_FEATURES, $DEPRECATED_FEATURES) |
|
305 |
BASIC_GET_NON_MATCHING_VALUES(DISABLED_JVM_FEATURES, $DISABLED_JVM_FEATURES, $DEPRECATED_FEATURES) |
|
306 |
fi |
|
307 |
||
37402 | 308 |
fi |
309 |
||
42538 | 310 |
# Override hotspot cpu definitions for ARM platforms |
311 |
if test "x$OPENJDK_TARGET_CPU" = xarm; then |
|
312 |
HOTSPOT_TARGET_CPU=arm_32 |
|
313 |
HOTSPOT_TARGET_CPU_DEFINE="ARM32" |
|
314 |
fi |
|
315 |
||
37402 | 316 |
# Verify that dependencies are met for explicitly set features. |
317 |
if HOTSPOT_CHECK_JVM_FEATURE(jvmti) && ! HOTSPOT_CHECK_JVM_FEATURE(services); then |
|
318 |
AC_MSG_ERROR([Specified JVM feature 'jvmti' requires feature 'services']) |
|
20363 | 319 |
fi |
37402 | 320 |
|
321 |
if HOTSPOT_CHECK_JVM_FEATURE(management) && ! HOTSPOT_CHECK_JVM_FEATURE(nmt); then |
|
322 |
AC_MSG_ERROR([Specified JVM feature 'management' requires feature 'nmt']) |
|
323 |
fi |
|
324 |
||
39946
c82f919f4454
8159888: [JVMCI] the client VM build is broken when INCLUDE_JVMCI is defined
dnsimon
parents:
39191
diff
changeset
|
325 |
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
|
326 |
AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1']) |
37402 | 327 |
fi |
328 |
||
49982 | 329 |
if HOTSPOT_CHECK_JVM_FEATURE(cmsgc) && ! HOTSPOT_CHECK_JVM_FEATURE(serialgc); then |
330 |
AC_MSG_ERROR([Specified JVM feature 'cmsgc' requires feature 'serialgc']) |
|
37402 | 331 |
fi |
332 |
||
50216 | 333 |
# Enable JFR by default, except for Zero, linux-sparcv9 and on minimal. |
334 |
if ! HOTSPOT_CHECK_JVM_VARIANT(zero); then |
|
51214 | 335 |
if test "x$OPENJDK_TARGET_OS" != xaix; then |
336 |
if test "x$OPENJDK_TARGET_OS" != xlinux || test "x$OPENJDK_TARGET_CPU" != xsparcv9; then |
|
337 |
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jfr" |
|
338 |
fi |
|
50216 | 339 |
fi |
50113 | 340 |
fi |
341 |
||
52925
9c18c9d839d3
8214259: Implementation: JEP 189: Shenandoah: A Low-Pause-Time Garbage Collector (Experimental)
rkennke
parents:
52798
diff
changeset
|
342 |
# Only enable Shenandoah on supported arches |
9c18c9d839d3
8214259: Implementation: JEP 189: Shenandoah: A Low-Pause-Time Garbage Collector (Experimental)
rkennke
parents:
52798
diff
changeset
|
343 |
AC_MSG_CHECKING([if shenandoah can be built]) |
53021
cc4098b3bc10
8215356: Disable x86_32 Shenandoah build to avoid hotspot/tier1 failures
shade
parents:
52925
diff
changeset
|
344 |
if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then |
52925
9c18c9d839d3
8214259: Implementation: JEP 189: Shenandoah: A Low-Pause-Time Garbage Collector (Experimental)
rkennke
parents:
52798
diff
changeset
|
345 |
AC_MSG_RESULT([yes]) |
9c18c9d839d3
8214259: Implementation: JEP 189: Shenandoah: A Low-Pause-Time Garbage Collector (Experimental)
rkennke
parents:
52798
diff
changeset
|
346 |
else |
9c18c9d839d3
8214259: Implementation: JEP 189: Shenandoah: A Low-Pause-Time Garbage Collector (Experimental)
rkennke
parents:
52798
diff
changeset
|
347 |
DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES shenandoahgc" |
9c18c9d839d3
8214259: Implementation: JEP 189: Shenandoah: A Low-Pause-Time Garbage Collector (Experimental)
rkennke
parents:
52798
diff
changeset
|
348 |
AC_MSG_RESULT([no, platform not supported]) |
9c18c9d839d3
8214259: Implementation: JEP 189: Shenandoah: A Low-Pause-Time Garbage Collector (Experimental)
rkennke
parents:
52798
diff
changeset
|
349 |
fi |
9c18c9d839d3
8214259: Implementation: JEP 189: Shenandoah: A Low-Pause-Time Garbage Collector (Experimental)
rkennke
parents:
52798
diff
changeset
|
350 |
|
52798 | 351 |
# Only enable ZGC on supported platforms |
352 |
AC_MSG_CHECKING([if zgc can be built]) |
|
353 |
if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then |
|
354 |
AC_MSG_RESULT([yes]) |
|
50525
767cdb97f103
8204210: Implementation: JEP 333: ZGC: A Scalable Low-Latency Garbage Collector (Experimental)
pliden
parents:
50523
diff
changeset
|
355 |
else |
52798 | 356 |
DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES zgc" |
357 |
AC_MSG_RESULT([no, platform not supported]) |
|
50525
767cdb97f103
8204210: Implementation: JEP 333: ZGC: A Scalable Low-Latency Garbage Collector (Experimental)
pliden
parents:
50523
diff
changeset
|
358 |
fi |
767cdb97f103
8204210: Implementation: JEP 333: ZGC: A Scalable Low-Latency Garbage Collector (Experimental)
pliden
parents:
50523
diff
changeset
|
359 |
|
51954 | 360 |
# Disable unsupported GCs for Zero |
361 |
if HOTSPOT_CHECK_JVM_VARIANT(zero); then |
|
52925
9c18c9d839d3
8214259: Implementation: JEP 189: Shenandoah: A Low-Pause-Time Garbage Collector (Experimental)
rkennke
parents:
52798
diff
changeset
|
362 |
DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES epsilongc g1gc zgc shenandoahgc" |
51954 | 363 |
fi |
364 |
||
37402 | 365 |
# Turn on additional features based on other parts of configure |
366 |
if test "x$INCLUDE_DTRACE" = "xtrue"; then |
|
367 |
JVM_FEATURES="$JVM_FEATURES dtrace" |
|
368 |
else |
|
369 |
if HOTSPOT_CHECK_JVM_FEATURE(dtrace); then |
|
370 |
AC_MSG_ERROR([To enable dtrace, you must use --enable-dtrace]) |
|
14810 | 371 |
fi |
20363 | 372 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
373 |
|
37402 | 374 |
if test "x$STATIC_BUILD" = "xtrue"; then |
375 |
JVM_FEATURES="$JVM_FEATURES static-build" |
|
20363 | 376 |
else |
37402 | 377 |
if HOTSPOT_CHECK_JVM_FEATURE(static-build); then |
378 |
AC_MSG_ERROR([To enable static-build, you must use --enable-static-build]) |
|
379 |
fi |
|
380 |
fi |
|
381 |
||
47687 | 382 |
if ! HOTSPOT_CHECK_JVM_VARIANT(zero); then |
37402 | 383 |
if HOTSPOT_CHECK_JVM_FEATURE(zero); then |
47687 | 384 |
AC_MSG_ERROR([To enable zero, you must use --with-jvm-variants=zero]) |
37402 | 385 |
fi |
386 |
fi |
|
387 |
||
51030
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
388 |
AC_MSG_CHECKING([if jvmci module jdk.internal.vm.ci should be built]) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
389 |
# Check if jvmci is diabled |
53434
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
390 |
if HOTSPOT_IS_JVM_FEATURE_DISABLED(jvmci); then |
51030
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
391 |
AC_MSG_RESULT([no, forced]) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
392 |
JVM_FEATURES_jvmci="" |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
393 |
INCLUDE_JVMCI="false" |
37402 | 394 |
else |
51030
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
395 |
# Only enable jvmci on x86_64, sparcv9 and aarch64 |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
396 |
if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \ |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
397 |
test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \ |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
398 |
test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
399 |
AC_MSG_RESULT([yes]) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
400 |
JVM_FEATURES_jvmci="jvmci" |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
401 |
INCLUDE_JVMCI="true" |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
402 |
else |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
403 |
AC_MSG_RESULT([no]) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
404 |
JVM_FEATURES_jvmci="" |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
405 |
INCLUDE_JVMCI="false" |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
406 |
if HOTSPOT_CHECK_JVM_FEATURE(jvmci); then |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
407 |
AC_MSG_ERROR([JVMCI is currently not supported on this platform.]) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
408 |
fi |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
409 |
fi |
20363 | 410 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
411 |
|
51030
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
412 |
AC_SUBST(INCLUDE_JVMCI) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
413 |
|
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
414 |
AC_MSG_CHECKING([if graal module jdk.internal.vm.compiler should be built]) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
415 |
# Check if graal is diabled |
53434
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
416 |
if HOTSPOT_IS_JVM_FEATURE_DISABLED(graal); then |
51030
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
417 |
AC_MSG_RESULT([no, forced]) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
418 |
JVM_FEATURES_graal="" |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
419 |
INCLUDE_GRAAL="false" |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
420 |
else |
51030
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
421 |
if HOTSPOT_CHECK_JVM_FEATURE(graal); then |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
422 |
AC_MSG_RESULT([yes, forced]) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
423 |
if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
424 |
AC_MSG_ERROR([Specified JVM feature 'graal' requires feature 'jvmci']) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
425 |
fi |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
426 |
JVM_FEATURES_graal="graal" |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
427 |
INCLUDE_GRAAL="true" |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
428 |
else |
51030
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
429 |
# By default enable graal build on x64 or where AOT is available. |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
430 |
# graal build requires jvmci. |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
431 |
if test "x$JVM_FEATURES_jvmci" = "xjvmci" && \ |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
432 |
(test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \ |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
433 |
test "x$ENABLE_AOT" = "xtrue") ; then |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
434 |
AC_MSG_RESULT([yes]) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
435 |
JVM_FEATURES_graal="graal" |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
436 |
INCLUDE_GRAAL="true" |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
437 |
else |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
438 |
AC_MSG_RESULT([no]) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
439 |
JVM_FEATURES_graal="" |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
440 |
INCLUDE_GRAAL="false" |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
441 |
fi |
42531
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
442 |
fi |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
443 |
fi |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
444 |
|
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
445 |
AC_SUBST(INCLUDE_GRAAL) |
37ee95196b17
8166417: Integrate Graal-core into JDK for AOT compiler
kvn
parents:
42510
diff
changeset
|
446 |
|
51030
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
447 |
# Disable aot with '--with-jvm-features=-aot' |
53434
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
448 |
if HOTSPOT_IS_JVM_FEATURE_DISABLED(aot); then |
51030
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
449 |
ENABLE_AOT="false" |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
450 |
fi |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
451 |
|
42532 | 452 |
AC_MSG_CHECKING([if aot should be enabled]) |
453 |
if test "x$ENABLE_AOT" = "xtrue"; then |
|
51030
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
454 |
if test "x$JVM_FEATURES_graal" != "xgraal"; then |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
455 |
if test "x$enable_aot" = "xyes" || HOTSPOT_CHECK_JVM_FEATURE(aot); then |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
456 |
AC_MSG_RESULT([yes, forced]) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
457 |
AC_MSG_ERROR([Specified JVM feature 'aot' requires feature 'graal']) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
458 |
else |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
459 |
AC_MSG_RESULT([no]) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
460 |
fi |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
461 |
JVM_FEATURES_aot="" |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
462 |
ENABLE_AOT="false" |
42532 | 463 |
else |
51030
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
464 |
if test "x$enable_aot" = "xyes" || HOTSPOT_CHECK_JVM_FEATURE(aot); then |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
465 |
AC_MSG_RESULT([yes, forced]) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
466 |
else |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
467 |
AC_MSG_RESULT([yes]) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
468 |
fi |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
469 |
JVM_FEATURES_aot="aot" |
42532 | 470 |
fi |
471 |
else |
|
53434
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
472 |
if test "x$enable_aot" = "xno" || HOTSPOT_IS_JVM_FEATURE_DISABLED(aot); then |
42532 | 473 |
AC_MSG_RESULT([no, forced]) |
474 |
else |
|
475 |
AC_MSG_RESULT([no]) |
|
476 |
fi |
|
477 |
JVM_FEATURES_aot="" |
|
51030
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
478 |
if HOTSPOT_CHECK_JVM_FEATURE(aot); then |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
479 |
AC_MSG_ERROR([To enable aot, you must use --enable-aot]) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
480 |
fi |
42532 | 481 |
fi |
482 |
||
51030
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
483 |
AC_SUBST(ENABLE_AOT) |
33be1da67b11
8206135: Building jvm with AOT but without JVMCI should fail at configure time
kvn
parents:
50625
diff
changeset
|
484 |
|
42538 | 485 |
if test "x$OPENJDK_TARGET_CPU" = xarm ; then |
486 |
# Default to use link time optimizations on minimal on arm |
|
487 |
JVM_FEATURES_link_time_opt="link-time-opt" |
|
488 |
else |
|
489 |
JVM_FEATURES_link_time_opt="" |
|
490 |
fi |
|
491 |
||
37402 | 492 |
# All variants but minimal (and custom) get these features |
52925
9c18c9d839d3
8214259: Implementation: JEP 189: Shenandoah: A Low-Pause-Time Garbage Collector (Experimental)
rkennke
parents:
52798
diff
changeset
|
493 |
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc epsilongc shenandoahgc jni-check jvmti management nmt services vm-structs zgc" |
50625
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
494 |
|
52039
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
495 |
# Disable CDS on AIX. |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
496 |
if test "x$OPENJDK_TARGET_OS" = "xaix"; then |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
497 |
ENABLE_CDS="false" |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
498 |
if test "x$enable_cds" = "xyes"; then |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
499 |
AC_MSG_ERROR([CDS is currently not supported on AIX. Remove --enable-cds.]) |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
500 |
fi |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
501 |
fi |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
502 |
|
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
503 |
# Disable CDS if user requested it with --with-jvm-features=-cds. |
53434
ddfa4bfabdec
8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled
ihse
parents:
53021
diff
changeset
|
504 |
if HOTSPOT_IS_JVM_FEATURE_DISABLED(cds); then |
52039
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
505 |
ENABLE_CDS="false" |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
506 |
if test "x$enable_cds" = "xyes"; then |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
507 |
AC_MSG_ERROR([CDS was disabled by --with-jvm-features=-cds. Remove --enable-cds.]) |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
508 |
fi |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
509 |
fi |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
510 |
|
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
511 |
# Disable CDS for zero, minimal, core.. |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
512 |
if HOTSPOT_CHECK_JVM_VARIANT(zero) || HOTSPOT_CHECK_JVM_VARIANT(minimal) || HOTSPOT_CHECK_JVM_VARIANT(core); then |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
513 |
# ..except when the user explicitely requested it with --enable-jvm-features |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
514 |
if ! HOTSPOT_CHECK_JVM_FEATURE(cds); then |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
515 |
ENABLE_CDS="false" |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
516 |
if test "x$enable_cds" = "xyes"; then |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
517 |
AC_MSG_ERROR([CDS not implemented for variants zero, minimal, core. Remove --enable-cds.]) |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
518 |
fi |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
519 |
fi |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
520 |
fi |
15a9f90aa00f
8211837: Creation of the default CDS Archive should depend on ENABLE_CDS
simonis
parents:
51954
diff
changeset
|
521 |
|
50625
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
522 |
AC_MSG_CHECKING([if cds should be enabled]) |
47060 | 523 |
if test "x$ENABLE_CDS" = "xtrue"; then |
50625
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
524 |
if test "x$enable_cds" = "xyes"; then |
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
525 |
AC_MSG_RESULT([yes, forced]) |
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
526 |
else |
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
527 |
AC_MSG_RESULT([yes]) |
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
528 |
fi |
47060 | 529 |
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cds" |
50625
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
530 |
else |
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
531 |
if test "x$enable_cds" = "xno"; then |
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
532 |
AC_MSG_RESULT([no, forced]) |
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
533 |
else |
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
534 |
AC_MSG_RESULT([no]) |
d9753e3db0c6
8204965: Fix '--disable-cds' and disable CDS on AIX by default
simonis
parents:
50525
diff
changeset
|
535 |
fi |
47871
5ab3961d20dd
8191204: Post-consolidation cleaning up of the build system
ihse
parents:
47687
diff
changeset
|
536 |
fi |
37402 | 537 |
|
50113 | 538 |
# Enable features depending on variant. |
42532 | 539 |
JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal" |
51068 | 540 |
JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES" |
37402 | 541 |
JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES" |
49982 | 542 |
JVM_FEATURES_minimal="compiler1 minimal serialgc $JVM_FEATURES $JVM_FEATURES_link_time_opt" |
37402 | 543 |
JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES" |
544 |
JVM_FEATURES_custom="$JVM_FEATURES" |
|
545 |
||
546 |
AC_SUBST(JVM_FEATURES_server) |
|
547 |
AC_SUBST(JVM_FEATURES_client) |
|
548 |
AC_SUBST(JVM_FEATURES_core) |
|
549 |
AC_SUBST(JVM_FEATURES_minimal) |
|
550 |
AC_SUBST(JVM_FEATURES_zero) |
|
551 |
AC_SUBST(JVM_FEATURES_custom) |
|
552 |
||
553 |
# Used for verification of Makefiles by check-jvm-feature |
|
554 |
AC_SUBST(VALID_JVM_FEATURES) |
|
52351 | 555 |
|
556 |
# --with-cpu-port is no longer supported |
|
557 |
BASIC_DEPRECATED_ARG_WITH(with-cpu-port) |
|
37402 | 558 |
]) |
559 |
||
560 |
############################################################################### |
|
49582 | 561 |
# Finalize JVM features once all setup is complete, including custom setup. |
37402 | 562 |
# |
49582 | 563 |
AC_DEFUN_ONCE([HOTSPOT_FINALIZE_JVM_FEATURES], |
37402 | 564 |
[ |
565 |
for variant in $JVM_VARIANTS; do |
|
566 |
AC_MSG_CHECKING([JVM features for JVM variant '$variant']) |
|
567 |
features_var_name=JVM_FEATURES_$variant |
|
49582 | 568 |
JVM_FEATURES_FOR_VARIANT=${!features_var_name} |
569 |
||
570 |
# Filter out user-requested disabled features |
|
571 |
BASIC_GET_NON_MATCHING_VALUES(JVM_FEATURES_FOR_VARIANT, $JVM_FEATURES_FOR_VARIANT, $DISABLED_JVM_FEATURES) |
|
572 |
||
573 |
# Keep feature lists sorted and free of duplicates |
|
574 |
BASIC_SORT_LIST(JVM_FEATURES_FOR_VARIANT, $JVM_FEATURES_FOR_VARIANT) |
|
575 |
||
576 |
# Update real feature set variable |
|
577 |
eval $features_var_name='"'$JVM_FEATURES_FOR_VARIANT'"' |
|
578 |
AC_MSG_RESULT(["$JVM_FEATURES_FOR_VARIANT"]) |
|
579 |
||
49982 | 580 |
# Verify that we have at least one gc selected |
581 |
GC_FEATURES=`$ECHO $JVM_FEATURES_FOR_VARIANT | $GREP gc` |
|
582 |
if test "x$GC_FEATURES" = x; then |
|
583 |
AC_MSG_WARN([Invalid JVM features: No gc selected for variant $variant.]) |
|
584 |
fi |
|
585 |
||
49582 | 586 |
# Validate features (for configure script errors, not user errors) |
49705 | 587 |
BASIC_GET_NON_MATCHING_VALUES(INVALID_FEATURES, $JVM_FEATURES_FOR_VARIANT, $VALID_JVM_FEATURES) |
37402 | 588 |
if test "x$INVALID_FEATURES" != x; then |
49582 | 589 |
AC_MSG_ERROR([Internal configure script error. Invalid JVM feature(s): $INVALID_FEATURES]) |
37402 | 590 |
fi |
591 |
done |
|
592 |
]) |
|
37978
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
593 |
|
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
594 |
################################################################################ |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
595 |
# Check if gtest should be built |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
596 |
# |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
597 |
AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_GTEST], |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
598 |
[ |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
599 |
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
|
600 |
[Disables building of the Hotspot unit tests @<:@enabled@:>@])]) |
37978
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
601 |
|
47217 | 602 |
if test -e "${TOPDIR}/test/hotspot/gtest"; then |
37978
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
603 |
GTEST_DIR_EXISTS="true" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
604 |
else |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
605 |
GTEST_DIR_EXISTS="false" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
606 |
fi |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
607 |
|
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
608 |
AC_MSG_CHECKING([if Hotspot gtest unit tests should be built]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
609 |
if test "x$enable_hotspot_gtest" = "xyes"; then |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
610 |
if test "x$GTEST_DIR_EXISTS" = "xtrue"; then |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
611 |
AC_MSG_RESULT([yes, forced]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
612 |
BUILD_GTEST="true" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
613 |
else |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
614 |
AC_MSG_ERROR([Cannot build gtest without the test source]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
615 |
fi |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
616 |
elif test "x$enable_hotspot_gtest" = "xno"; then |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
617 |
AC_MSG_RESULT([no, forced]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
618 |
BUILD_GTEST="false" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
619 |
elif test "x$enable_hotspot_gtest" = "x"; then |
42855 | 620 |
if test "x$GTEST_DIR_EXISTS" = "xtrue"; then |
37978
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
621 |
AC_MSG_RESULT([yes]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
622 |
BUILD_GTEST="true" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
623 |
else |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
624 |
AC_MSG_RESULT([no]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
625 |
BUILD_GTEST="false" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
626 |
fi |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
627 |
else |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
628 |
AC_MSG_ERROR([--enable-gtest must be either yes or no]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
629 |
fi |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
630 |
|
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
631 |
AC_SUBST(BUILD_GTEST) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
632 |
]) |