224 if test "x$enable_aot" = "xyes"; then
225 AC_MSG_ERROR([Cannot build AOT without src/jdk.aot sources. Remove --enable-aot.])
226 fi
227 fi
228 else
229 ENABLE_AOT="false"
230 if test "x$enable_aot" = "xyes"; then
231 AC_MSG_ERROR([AOT is currently only supported on x86_64. Remove --enable-aot.])
232 fi
233 fi
234 fi
235
236 AC_SUBST(ENABLE_AOT)
237 ])
238
239 ################################################################################
240 # Allow to disable CDS
241 #
242 AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_CDS],
243 [
244 AC_ARG_ENABLE([cds], [AS_HELP_STRING([--enable-cds@<:@=yes/no@:>@],
245 [enable class data sharing feature in non-minimal VM. Default is yes.])])
246
247 if test "x$enable_cds" = "x" || test "x$enable_cds" = "xyes"; then
248 ENABLE_CDS="true"
249 elif test "x$enable_cds" = "xno"; then
250 ENABLE_CDS="false"
251 else
252 AC_MSG_ERROR([Invalid value for --enable-cds: $enable_cds])
253 fi
254
255 AC_SUBST(ENABLE_CDS)
256 ])
257
258 ###############################################################################
259 # Set up all JVM features for each JVM variant.
260 #
261 AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
262 [
263 # Prettify the VALID_JVM_FEATURES string
264 BASIC_SORT_LIST(VALID_JVM_FEATURES, $VALID_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 [JVM features to enable (foo) or disable (-foo), separated by comma. Use '--help' to show possible values @<:@none@:>@])])
270 if test "x$with_jvm_features" != x; then
271 AC_MSG_CHECKING([user specified JVM feature list])
272 USER_JVM_FEATURE_LIST=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'`
273 AC_MSG_RESULT([$user_jvm_feature_list])
274 # These features will be added to all variant defaults
394 fi
395 JVM_FEATURES_aot="aot"
396 else
397 if test "x$enable_aot" = "xno"; then
398 AC_MSG_RESULT([no, forced])
399 else
400 AC_MSG_RESULT([no])
401 fi
402 JVM_FEATURES_aot=""
403 fi
404
405 if test "x$OPENJDK_TARGET_CPU" = xarm ; then
406 # Default to use link time optimizations on minimal on arm
407 JVM_FEATURES_link_time_opt="link-time-opt"
408 else
409 JVM_FEATURES_link_time_opt=""
410 fi
411
412 # All variants but minimal (and custom) get these features
413 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc jni-check jvmti management nmt services vm-structs"
414 if test "x$ENABLE_CDS" = "xtrue"; then
415 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cds"
416 fi
417
418 # Enable features depending on variant.
419 JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal"
420 JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
421 JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
422 JVM_FEATURES_minimal="compiler1 minimal serialgc $JVM_FEATURES $JVM_FEATURES_link_time_opt"
423 JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES"
424 JVM_FEATURES_custom="$JVM_FEATURES"
425
426 AC_SUBST(JVM_FEATURES_server)
427 AC_SUBST(JVM_FEATURES_client)
428 AC_SUBST(JVM_FEATURES_core)
429 AC_SUBST(JVM_FEATURES_minimal)
430 AC_SUBST(JVM_FEATURES_zero)
431 AC_SUBST(JVM_FEATURES_custom)
432
433 # Used for verification of Makefiles by check-jvm-feature
434 AC_SUBST(VALID_JVM_FEATURES)
435
|
224 if test "x$enable_aot" = "xyes"; then
225 AC_MSG_ERROR([Cannot build AOT without src/jdk.aot sources. Remove --enable-aot.])
226 fi
227 fi
228 else
229 ENABLE_AOT="false"
230 if test "x$enable_aot" = "xyes"; then
231 AC_MSG_ERROR([AOT is currently only supported on x86_64. Remove --enable-aot.])
232 fi
233 fi
234 fi
235
236 AC_SUBST(ENABLE_AOT)
237 ])
238
239 ################################################################################
240 # Allow to disable CDS
241 #
242 AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_CDS],
243 [
244 AC_ARG_ENABLE([cds], [AS_HELP_STRING([--enable-cds@<:@=yes/no/auto@:>@],
245 [enable class data sharing feature in non-minimal VM. Default is auto, where cds is enabled if supported on the platform.])])
246
247 if test "x$enable_cds" = "x" || test "x$enable_cds" = "xauto"; then
248 ENABLE_CDS="true"
249 elif test "x$enable_cds" = "xyes"; then
250 ENABLE_CDS="true"
251 elif test "x$enable_cds" = "xno"; then
252 ENABLE_CDS="false"
253 else
254 AC_MSG_ERROR([Invalid value for --enable-cds: $enable_cds])
255 fi
256
257 # Disable CDS on AIX.
258 if test "x$OPENJDK_TARGET_OS" = "xaix"; then
259 ENABLE_CDS="false"
260 if test "x$enable_cds" = "xyes"; then
261 AC_MSG_ERROR([CDS is currently not supported on AIX. Remove --enable-cds.])
262 fi
263 fi
264
265 AC_SUBST(ENABLE_CDS)
266 ])
267
268 ###############################################################################
269 # Set up all JVM features for each JVM variant.
270 #
271 AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
272 [
273 # Prettify the VALID_JVM_FEATURES string
274 BASIC_SORT_LIST(VALID_JVM_FEATURES, $VALID_JVM_FEATURES)
275
276 # The user can in some cases supply additional jvm features. For the custom
277 # variant, this defines the entire variant.
278 AC_ARG_WITH([jvm-features], [AS_HELP_STRING([--with-jvm-features],
279 [JVM features to enable (foo) or disable (-foo), separated by comma. Use '--help' to show possible values @<:@none@:>@])])
280 if test "x$with_jvm_features" != x; then
281 AC_MSG_CHECKING([user specified JVM feature list])
282 USER_JVM_FEATURE_LIST=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'`
283 AC_MSG_RESULT([$user_jvm_feature_list])
284 # These features will be added to all variant defaults
404 fi
405 JVM_FEATURES_aot="aot"
406 else
407 if test "x$enable_aot" = "xno"; then
408 AC_MSG_RESULT([no, forced])
409 else
410 AC_MSG_RESULT([no])
411 fi
412 JVM_FEATURES_aot=""
413 fi
414
415 if test "x$OPENJDK_TARGET_CPU" = xarm ; then
416 # Default to use link time optimizations on minimal on arm
417 JVM_FEATURES_link_time_opt="link-time-opt"
418 else
419 JVM_FEATURES_link_time_opt=""
420 fi
421
422 # All variants but minimal (and custom) get these features
423 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc jni-check jvmti management nmt services vm-structs"
424
425 AC_MSG_CHECKING([if cds should be enabled])
426 if test "x$ENABLE_CDS" = "xtrue"; then
427 if test "x$enable_cds" = "xyes"; then
428 AC_MSG_RESULT([yes, forced])
429 else
430 AC_MSG_RESULT([yes])
431 fi
432 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cds"
433 else
434 if test "x$enable_cds" = "xno"; then
435 AC_MSG_RESULT([no, forced])
436 else
437 AC_MSG_RESULT([no])
438 fi
439 fi
440
441 # Enable features depending on variant.
442 JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal"
443 JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
444 JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
445 JVM_FEATURES_minimal="compiler1 minimal serialgc $JVM_FEATURES $JVM_FEATURES_link_time_opt"
446 JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES"
447 JVM_FEATURES_custom="$JVM_FEATURES"
448
449 AC_SUBST(JVM_FEATURES_server)
450 AC_SUBST(JVM_FEATURES_client)
451 AC_SUBST(JVM_FEATURES_core)
452 AC_SUBST(JVM_FEATURES_minimal)
453 AC_SUBST(JVM_FEATURES_zero)
454 AC_SUBST(JVM_FEATURES_custom)
455
456 # Used for verification of Makefiles by check-jvm-feature
457 AC_SUBST(VALID_JVM_FEATURES)
458
|