426 # Finalize JVM features once all setup is complete, including custom setup.
427 #
428 AC_DEFUN_ONCE([HOTSPOT_FINALIZE_JVM_FEATURES],
429 [
430 for variant in $JVM_VARIANTS; do
431 AC_MSG_CHECKING([JVM features for JVM variant '$variant'])
432 features_var_name=JVM_FEATURES_$variant
433 JVM_FEATURES_FOR_VARIANT=${!features_var_name}
434
435 # Filter out user-requested disabled features
436 BASIC_GET_NON_MATCHING_VALUES(JVM_FEATURES_FOR_VARIANT, $JVM_FEATURES_FOR_VARIANT, $DISABLED_JVM_FEATURES)
437
438 # Keep feature lists sorted and free of duplicates
439 BASIC_SORT_LIST(JVM_FEATURES_FOR_VARIANT, $JVM_FEATURES_FOR_VARIANT)
440
441 # Update real feature set variable
442 eval $features_var_name='"'$JVM_FEATURES_FOR_VARIANT'"'
443 AC_MSG_RESULT(["$JVM_FEATURES_FOR_VARIANT"])
444
445 # Validate features (for configure script errors, not user errors)
446 INVALID_FEATURES=`$GREP -Fvx "${VALID_JVM_FEATURES// /$'\n'}" <<< "${JVM_FEATURES_FOR_VARIANT// /$'\n'}"`
447 if test "x$INVALID_FEATURES" != x; then
448 AC_MSG_ERROR([Internal configure script error. Invalid JVM feature(s): $INVALID_FEATURES])
449 fi
450 done
451 ])
452
453 ################################################################################
454 #
455 # Specify which sources will be used to build the 64-bit ARM port
456 #
457 # --with-cpu-port=arm64 will use hotspot/src/cpu/arm
458 # --with-cpu-port=aarch64 will use hotspot/src/cpu/aarch64
459 #
460 AC_DEFUN([SETUP_HOTSPOT_TARGET_CPU_PORT],
461 [
462 AC_ARG_WITH(cpu-port, [AS_HELP_STRING([--with-cpu-port],
463 [specify sources to use for Hotspot 64-bit ARM port (arm64,aarch64) @<:@aarch64@:>@ ])])
464
465 if test "x$with_cpu_port" != x; then
466 if test "x$OPENJDK_TARGET_CPU" != xaarch64; then
|
426 # Finalize JVM features once all setup is complete, including custom setup.
427 #
428 AC_DEFUN_ONCE([HOTSPOT_FINALIZE_JVM_FEATURES],
429 [
430 for variant in $JVM_VARIANTS; do
431 AC_MSG_CHECKING([JVM features for JVM variant '$variant'])
432 features_var_name=JVM_FEATURES_$variant
433 JVM_FEATURES_FOR_VARIANT=${!features_var_name}
434
435 # Filter out user-requested disabled features
436 BASIC_GET_NON_MATCHING_VALUES(JVM_FEATURES_FOR_VARIANT, $JVM_FEATURES_FOR_VARIANT, $DISABLED_JVM_FEATURES)
437
438 # Keep feature lists sorted and free of duplicates
439 BASIC_SORT_LIST(JVM_FEATURES_FOR_VARIANT, $JVM_FEATURES_FOR_VARIANT)
440
441 # Update real feature set variable
442 eval $features_var_name='"'$JVM_FEATURES_FOR_VARIANT'"'
443 AC_MSG_RESULT(["$JVM_FEATURES_FOR_VARIANT"])
444
445 # Validate features (for configure script errors, not user errors)
446 # Notice that the original variant fails on SLES 10 and 11
447 NEEDLE=${VALID_JVM_FEATURES// /$'\n'}
448 STACK=${JVM_FEATURES_FOR_VARIANT// /$'\n'}
449 INVALID_FEATURES=`$GREP -Fvx "${NEEDLE}" <<< "${STACK}"`
450 if test "x$INVALID_FEATURES" != x; then
451 AC_MSG_ERROR([Internal configure script error. Invalid JVM feature(s): $INVALID_FEATURES])
452 fi
453 done
454 ])
455
456 ################################################################################
457 #
458 # Specify which sources will be used to build the 64-bit ARM port
459 #
460 # --with-cpu-port=arm64 will use hotspot/src/cpu/arm
461 # --with-cpu-port=aarch64 will use hotspot/src/cpu/aarch64
462 #
463 AC_DEFUN([SETUP_HOTSPOT_TARGET_CPU_PORT],
464 [
465 AC_ARG_WITH(cpu-port, [AS_HELP_STRING([--with-cpu-port],
466 [specify sources to use for Hotspot 64-bit ARM port (arm64,aarch64) @<:@aarch64@:>@ ])])
467
468 if test "x$with_cpu_port" != x; then
469 if test "x$OPENJDK_TARGET_CPU" != xaarch64; then
|