author | erikj |
Fri, 08 Jul 2016 08:55:54 +0200 (2016-07-08) | |
changeset 39384 | adde8cb7d01b |
parent 39191 | 08671ca5c778 |
child 39947 | 0ec49c6ce9b8 |
permissions | -rw-r--r-- |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1 |
# |
35747 | 2 |
# Copyright (c) 2011, 2016, 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 |
27 |
VALID_JVM_FEATURES="compiler1 compiler2 zero shark minimal dtrace jvmti jvmci \ |
|
28 |
fprof vm-structs jni-check services management all-gcs nmt cds static-build" |
|
29 |
||
30 |
# All valid JVM variants |
|
31 |
VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom" |
|
22460
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
32 |
|
37402 | 33 |
############################################################################### |
34 |
# Check if the specified JVM variant should be built. To be used in shell if |
|
35 |
# constructs, like this: |
|
36 |
# if HOTSPOT_CHECK_JVM_VARIANT(server); then |
|
37 |
# |
|
38 |
# 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
|
39 |
|
37402 | 40 |
# Definition kept in one line to allow inlining in if statements. |
41 |
# Additional [] needed to keep m4 from mangling shell constructs. |
|
42 |
AC_DEFUN([HOTSPOT_CHECK_JVM_VARIANT], |
|
43 |
[ [ [[ " $JVM_VARIANTS " =~ " $1 " ]] ] ]) |
|
22460
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
44 |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34495
diff
changeset
|
45 |
############################################################################### |
37402 | 46 |
# Check if the specified JVM features are explicitly enabled. To be used in |
47 |
# shell if constructs, like this: |
|
48 |
# if HOTSPOT_CHECK_JVM_FEATURE(jvmti); then |
|
49 |
# |
|
50 |
# Only valid to use after HOTSPOT_SETUP_JVM_FEATURES has setup features. |
|
51 |
||
52 |
# Definition kept in one line to allow inlining in if statements. |
|
53 |
# Additional [] needed to keep m4 from mangling shell constructs. |
|
54 |
AC_DEFUN([HOTSPOT_CHECK_JVM_FEATURE], |
|
55 |
[ [ [[ " $JVM_FEATURES " =~ " $1 " ]] ] ]) |
|
56 |
||
57 |
############################################################################### |
|
58 |
# Check which variants of the JVM that we want to build. Available variants are: |
|
59 |
# server: normal interpreter, and a tiered C1/C2 compiler |
|
60 |
# client: normal interpreter, and C1 (no C2 compiler) |
|
61 |
# minimal: reduced form of client with optional features stripped out |
|
62 |
# core: normal interpreter only, no compiler |
|
63 |
# zero: C++ based interpreter only, no compiler |
|
64 |
# zeroshark: C++ based interpreter, and a llvm-based 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], |
37402 | 70 |
[JVM variants (separated by commas) to build (server,client,minimal,core,zero,zeroshark,custom) @<:@server@:>@])]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
71 |
|
20363 | 72 |
if test "x$with_jvm_variants" = x; then |
73 |
with_jvm_variants="server" |
|
74 |
fi |
|
37402 | 75 |
JVM_VARIANTS_OPT="$with_jvm_variants" |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
76 |
|
37402 | 77 |
# Has the user listed more than one variant? |
78 |
# Additional [] needed to keep m4 from mangling shell constructs. |
|
79 |
if [ [[ "$JVM_VARIANTS_OPT" =~ "," ]] ]; then |
|
80 |
BUILDING_MULTIPLE_JVM_VARIANTS=true |
|
81 |
else |
|
82 |
BUILDING_MULTIPLE_JVM_VARIANTS=false |
|
83 |
fi |
|
84 |
# Replace the commas with AND for use in the build directory name. |
|
85 |
JVM_VARIANTS_WITH_AND=`$ECHO "$JVM_VARIANTS_OPT" | $SED -e 's/,/AND/g'` |
|
86 |
||
87 |
AC_MSG_CHECKING([which variants of the JVM to build]) |
|
88 |
# JVM_VARIANTS is a space-separated list. |
|
89 |
# Also use minimal, not minimal1 (which is kept for backwards compatibility). |
|
90 |
JVM_VARIANTS=`$ECHO $JVM_VARIANTS_OPT | $SED -e 's/,/ /g' -e 's/minimal1/minimal/'` |
|
91 |
AC_MSG_RESULT([$JVM_VARIANTS]) |
|
92 |
||
93 |
# Check that the selected variants are valid |
|
94 |
||
95 |
# 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
|
96 |
# 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
|
97 |
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
|
98 |
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
|
99 |
INVALID_VARIANTS=`$GREP -Fvx "${NEEDLE}" <<< "${STACK}"` |
37402 | 100 |
if test "x$INVALID_VARIANTS" != x; then |
101 |
AC_MSG_NOTICE([Unknown variant(s) specified: $INVALID_VARIANTS]) |
|
102 |
AC_MSG_ERROR([The available JVM variants are: $VALID_JVM_VARIANTS]) |
|
103 |
fi |
|
104 |
||
105 |
# All "special" variants share the same output directory ("server") |
|
106 |
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
|
107 |
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
|
108 |
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
|
109 |
INVALID_MULTIPLE_VARIANTS=`$GREP -Fvx "${NEEDLE}" <<< "${STACK}"` |
37402 | 110 |
if test "x$INVALID_MULTIPLE_VARIANTS" != x && test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = xtrue; then |
111 |
AC_MSG_ERROR([You cannot build multiple variants with anything else than $VALID_MULTIPLE_JVM_VARIANTS.]) |
|
112 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
113 |
|
37402 | 114 |
AC_SUBST(JVM_VARIANTS) |
115 |
AC_SUBST(VALID_JVM_VARIANTS) |
|
116 |
||
117 |
if HOTSPOT_CHECK_JVM_VARIANT(zero) || HOTSPOT_CHECK_JVM_VARIANT(zeroshark); then |
|
118 |
# zero behaves as a platform and rewrites these values. This is really weird. :( |
|
119 |
# We are guaranteed that we do not build any other variants when building zero. |
|
120 |
HOTSPOT_TARGET_CPU=zero |
|
121 |
HOTSPOT_TARGET_CPU_ARCH=zero |
|
20363 | 122 |
fi |
37402 | 123 |
]) |
124 |
||
125 |
############################################################################### |
|
126 |
# Check if dtrace should be enabled and has all prerequisites present. |
|
127 |
# |
|
128 |
AC_DEFUN_ONCE([HOTSPOT_SETUP_DTRACE], |
|
129 |
[ |
|
130 |
# Test for dtrace dependencies |
|
131 |
AC_ARG_ENABLE([dtrace], [AS_HELP_STRING([--enable-dtrace@<:@=yes/no/auto@:>@], |
|
132 |
[enable dtrace. Default is auto, where dtrace is enabled if all dependencies |
|
133 |
are present.])]) |
|
134 |
||
135 |
DTRACE_DEP_MISSING=false |
|
136 |
||
137 |
AC_MSG_CHECKING([for dtrace tool]) |
|
138 |
if test "x$DTRACE" != "x" && test -x "$DTRACE"; then |
|
139 |
AC_MSG_RESULT([$DTRACE]) |
|
140 |
else |
|
141 |
AC_MSG_RESULT([not found, cannot build dtrace]) |
|
142 |
DTRACE_DEP_MISSING=true |
|
143 |
fi |
|
144 |
||
145 |
AC_CHECK_HEADERS([sys/sdt.h], [DTRACE_HEADERS_OK=yes],[DTRACE_HEADERS_OK=no]) |
|
146 |
if test "x$DTRACE_HEADERS_OK" != "xyes"; then |
|
147 |
DTRACE_DEP_MISSING=true |
|
148 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
149 |
|
37402 | 150 |
AC_MSG_CHECKING([if dtrace should be built]) |
151 |
if test "x$enable_dtrace" = "xyes"; then |
|
152 |
if test "x$DTRACE_DEP_MISSING" = "xtrue"; then |
|
153 |
AC_MSG_RESULT([no, missing dependencies]) |
|
154 |
HELP_MSG_MISSING_DEPENDENCY([dtrace]) |
|
155 |
AC_MSG_ERROR([Cannot enable dtrace with missing dependencies. See above. $HELP_MSG]) |
|
156 |
else |
|
157 |
INCLUDE_DTRACE=true |
|
158 |
AC_MSG_RESULT([yes, forced]) |
|
159 |
fi |
|
160 |
elif test "x$enable_dtrace" = "xno"; then |
|
161 |
INCLUDE_DTRACE=false |
|
162 |
AC_MSG_RESULT([no, forced]) |
|
163 |
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
|
164 |
if test "x$DTRACE_DEP_MISSING" = "xtrue"; then |
37402 | 165 |
INCLUDE_DTRACE=false |
166 |
AC_MSG_RESULT([no, missing dependencies]) |
|
167 |
else |
|
168 |
INCLUDE_DTRACE=true |
|
169 |
AC_MSG_RESULT([yes, dependencies present]) |
|
170 |
fi |
|
171 |
else |
|
172 |
AC_MSG_ERROR([Invalid value for --enable-dtrace: $enable_dtrace]) |
|
173 |
fi |
|
174 |
AC_SUBST(INCLUDE_DTRACE) |
|
175 |
]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
176 |
|
37402 | 177 |
############################################################################### |
178 |
# Set up all JVM features for each JVM variant. |
|
179 |
# |
|
180 |
AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES], |
|
181 |
[ |
|
182 |
# The user can in some cases supply additional jvm features. For the custom |
|
183 |
# variant, this defines the entire variant. |
|
184 |
AC_ARG_WITH([jvm-features], [AS_HELP_STRING([--with-jvm-features], |
|
185 |
[additional JVM features to enable (separated by comma), use '--help' to show possible values @<:@none@:>@])]) |
|
186 |
if test "x$with_jvm_features" != x; then |
|
187 |
AC_MSG_CHECKING([additional JVM features]) |
|
188 |
JVM_FEATURES=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'` |
|
189 |
AC_MSG_RESULT([$JVM_FEATURES]) |
|
190 |
fi |
|
191 |
||
192 |
# Verify that dependencies are met for explicitly set features. |
|
193 |
if HOTSPOT_CHECK_JVM_FEATURE(jvmti) && ! HOTSPOT_CHECK_JVM_FEATURE(services); then |
|
194 |
AC_MSG_ERROR([Specified JVM feature 'jvmti' requires feature 'services']) |
|
20363 | 195 |
fi |
37402 | 196 |
|
197 |
if HOTSPOT_CHECK_JVM_FEATURE(management) && ! HOTSPOT_CHECK_JVM_FEATURE(nmt); then |
|
198 |
AC_MSG_ERROR([Specified JVM feature 'management' requires feature 'nmt']) |
|
199 |
fi |
|
200 |
||
201 |
if HOTSPOT_CHECK_JVM_FEATURE(jvmci) && ! HOTSPOT_CHECK_JVM_FEATURE(compiler2); then |
|
202 |
AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2']) |
|
203 |
fi |
|
204 |
||
205 |
if HOTSPOT_CHECK_JVM_FEATURE(compiler2) && ! HOTSPOT_CHECK_JVM_FEATURE(all-gcs); then |
|
206 |
AC_MSG_ERROR([Specified JVM feature 'compiler2' requires feature 'all-gcs']) |
|
207 |
fi |
|
208 |
||
209 |
if HOTSPOT_CHECK_JVM_FEATURE(vm-structs) && ! HOTSPOT_CHECK_JVM_FEATURE(all-gcs); then |
|
210 |
AC_MSG_ERROR([Specified JVM feature 'vm-structs' requires feature 'all-gcs']) |
|
211 |
fi |
|
212 |
||
213 |
# Turn on additional features based on other parts of configure |
|
214 |
if test "x$INCLUDE_DTRACE" = "xtrue"; then |
|
215 |
JVM_FEATURES="$JVM_FEATURES dtrace" |
|
216 |
else |
|
217 |
if HOTSPOT_CHECK_JVM_FEATURE(dtrace); then |
|
218 |
AC_MSG_ERROR([To enable dtrace, you must use --enable-dtrace]) |
|
14810 | 219 |
fi |
20363 | 220 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
221 |
|
37402 | 222 |
if test "x$STATIC_BUILD" = "xtrue"; then |
223 |
JVM_FEATURES="$JVM_FEATURES static-build" |
|
20363 | 224 |
else |
37402 | 225 |
if HOTSPOT_CHECK_JVM_FEATURE(static-build); then |
226 |
AC_MSG_ERROR([To enable static-build, you must use --enable-static-build]) |
|
227 |
fi |
|
228 |
fi |
|
229 |
||
230 |
if ! HOTSPOT_CHECK_JVM_VARIANT(zero) && ! HOTSPOT_CHECK_JVM_VARIANT(zeroshark); then |
|
231 |
if HOTSPOT_CHECK_JVM_FEATURE(zero); then |
|
232 |
AC_MSG_ERROR([To enable zero/zeroshark, you must use --with-jvm-variants=zero/zeroshark]) |
|
233 |
fi |
|
234 |
fi |
|
235 |
||
236 |
if ! HOTSPOT_CHECK_JVM_VARIANT(zeroshark); then |
|
237 |
if HOTSPOT_CHECK_JVM_FEATURE(shark); then |
|
238 |
AC_MSG_ERROR([To enable shark, you must use --with-jvm-variants=zeroshark]) |
|
239 |
fi |
|
240 |
fi |
|
241 |
||
242 |
# Only enable jvmci on x86_64, sparcv9 and aarch64, and only on server. |
|
243 |
if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \ |
|
244 |
test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \ |
|
245 |
test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then |
|
246 |
JVM_FEATURES_jvmci="jvmci" |
|
247 |
else |
|
248 |
JVM_FEATURES_jvmci="" |
|
20363 | 249 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
250 |
|
37402 | 251 |
# All variants but minimal (and custom) get these features |
252 |
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds" |
|
253 |
||
254 |
# Enable features depending on variant. |
|
255 |
JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci" |
|
256 |
JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES" |
|
257 |
JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES" |
|
258 |
JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES" |
|
259 |
JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES" |
|
260 |
JVM_FEATURES_zeroshark="zero shark $NON_MINIMAL_FEATURES $JVM_FEATURES" |
|
261 |
JVM_FEATURES_custom="$JVM_FEATURES" |
|
262 |
||
263 |
AC_SUBST(JVM_FEATURES_server) |
|
264 |
AC_SUBST(JVM_FEATURES_client) |
|
265 |
AC_SUBST(JVM_FEATURES_core) |
|
266 |
AC_SUBST(JVM_FEATURES_minimal) |
|
267 |
AC_SUBST(JVM_FEATURES_zero) |
|
268 |
AC_SUBST(JVM_FEATURES_zeroshark) |
|
269 |
AC_SUBST(JVM_FEATURES_custom) |
|
270 |
||
271 |
# Used for verification of Makefiles by check-jvm-feature |
|
272 |
AC_SUBST(VALID_JVM_FEATURES) |
|
273 |
||
274 |
# We don't support --with-jvm-interpreter anymore, use zero instead. |
|
275 |
BASIC_DEPRECATED_ARG_WITH(jvm-interpreter) |
|
276 |
]) |
|
277 |
||
278 |
############################################################################### |
|
279 |
# Validate JVM features once all setup is complete, including custom setup. |
|
280 |
# |
|
281 |
AC_DEFUN_ONCE([HOTSPOT_VALIDATE_JVM_FEATURES], |
|
282 |
[ |
|
283 |
# Keep feature lists sorted and free of duplicates |
|
284 |
JVM_FEATURES_server="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_server | $SORT -u))" |
|
285 |
JVM_FEATURES_client="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_client | $SORT -u))" |
|
286 |
JVM_FEATURES_core="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_core | $SORT -u))" |
|
287 |
JVM_FEATURES_minimal="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_minimal | $SORT -u))" |
|
288 |
JVM_FEATURES_zero="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_zero | $SORT -u))" |
|
289 |
JVM_FEATURES_zeroshark="$($ECHO $($PRINTF '%s\n' $JVM_FEATURES_zeroshark | $SORT -u))" |
|
290 |
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
|
291 |
|
37402 | 292 |
# Validate features |
293 |
for variant in $JVM_VARIANTS; do |
|
294 |
AC_MSG_CHECKING([JVM features for JVM variant '$variant']) |
|
295 |
features_var_name=JVM_FEATURES_$variant |
|
296 |
JVM_FEATURES_TO_TEST=${!features_var_name} |
|
297 |
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
|
298 |
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
|
299 |
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
|
300 |
INVALID_FEATURES=`$GREP -Fvx "${NEEDLE}" <<< "${STACK}"` |
37402 | 301 |
if test "x$INVALID_FEATURES" != x; then |
302 |
AC_MSG_ERROR([Invalid JVM feature(s): $INVALID_FEATURES]) |
|
303 |
fi |
|
304 |
done |
|
305 |
]) |
|
37978
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
306 |
|
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
307 |
################################################################################ |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
308 |
# Check if gtest should be built |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
309 |
# |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
310 |
AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_GTEST], |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
311 |
[ |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
312 |
AC_ARG_ENABLE([hotspot-gtest], [AS_HELP_STRING([--disable-hotspot-gtest], |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
313 |
[Disables building of the Hotspot unit tests])]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
314 |
|
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
315 |
if test -e "$HOTSPOT_TOPDIR/test/native"; then |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
316 |
GTEST_DIR_EXISTS="true" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
317 |
else |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
318 |
GTEST_DIR_EXISTS="false" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
319 |
fi |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
320 |
|
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
321 |
AC_MSG_CHECKING([if Hotspot gtest unit tests should be built]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
322 |
if test "x$enable_hotspot_gtest" = "xyes"; then |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
323 |
if test "x$GTEST_DIR_EXISTS" = "xtrue"; then |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
324 |
AC_MSG_RESULT([yes, forced]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
325 |
BUILD_GTEST="true" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
326 |
else |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
327 |
AC_MSG_ERROR([Cannot build gtest without the test source]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
328 |
fi |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
329 |
elif test "x$enable_hotspot_gtest" = "xno"; then |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
330 |
AC_MSG_RESULT([no, forced]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
331 |
BUILD_GTEST="false" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
332 |
elif test "x$enable_hotspot_gtest" = "x"; then |
39191 | 333 |
if test "x$GTEST_DIR_EXISTS" = "xtrue" && test "x$OPENJDK_TARGET_OS" != "xaix"; then |
37978
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
334 |
AC_MSG_RESULT([yes]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
335 |
BUILD_GTEST="true" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
336 |
else |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
337 |
AC_MSG_RESULT([no]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
338 |
BUILD_GTEST="false" |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
339 |
fi |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
340 |
else |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
341 |
AC_MSG_ERROR([--enable-gtest must be either yes or no]) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
342 |
fi |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
343 |
|
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
344 |
AC_SUBST(BUILD_GTEST) |
2614022b9fa5
8157348: Build fails with certain source configurations
erikj
parents:
37960
diff
changeset
|
345 |
]) |