338     if test "x$OPENJDK_TARGET_OS" != xaix; then
 339       if test "x$OPENJDK_TARGET_OS" != xlinux || test "x$OPENJDK_TARGET_CPU" != xsparcv9; then
 340         NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jfr"
 341       fi
 342     fi
 343   fi
 344 
 345   # Only enable Shenandoah on supported arches
 346   AC_MSG_CHECKING([if shenandoah can be built])
 347   # Temp diasable for Valhalla, working in Access API
 348   if $VALHALLA_TEMP && (test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86" || test "x$OPENJDK_TARGET_CPU" = "xaarch64"); then
 349     AC_MSG_RESULT([yes])
 350   else
 351     DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES shenandoahgc"
 352     AC_MSG_RESULT([no, platform not supported])
 353   fi
 354 
 355   # Only enable ZGC on supported platforms
 356   # Temp diasable for Valhalla, working in Access API
 357   AC_MSG_CHECKING([if zgc can be built])
 358   if $VALHALLA_TEMP && ((test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xx86_64") || \
 359      (test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xaarch64")); then
 360     AC_MSG_RESULT([yes])
 361   else
 362     DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES zgc"
 363     AC_MSG_RESULT([no, platform not supported])
 364   fi
 365 
 366   # Disable unsupported GCs for Zero
 367   if HOTSPOT_CHECK_JVM_VARIANT(zero); then
 368     DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES epsilongc g1gc zgc shenandoahgc"
 369   fi
 370 
 371   # Turn on additional features based on other parts of configure
 372   if test "x$INCLUDE_DTRACE" = "xtrue"; then
 373     JVM_FEATURES="$JVM_FEATURES dtrace"
 374   else
 375     if HOTSPOT_CHECK_JVM_FEATURE(dtrace); then
 376       AC_MSG_ERROR([To enable dtrace, you must use --enable-dtrace])
 377     fi
 378   fi

 338     if test "x$OPENJDK_TARGET_OS" != xaix; then
 339       if test "x$OPENJDK_TARGET_OS" != xlinux || test "x$OPENJDK_TARGET_CPU" != xsparcv9; then
 340         NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jfr"
 341       fi
 342     fi
 343   fi
 344 
 345   # Only enable Shenandoah on supported arches
 346   AC_MSG_CHECKING([if shenandoah can be built])
 347   # Temp diasable for Valhalla, working in Access API
 348   if $VALHALLA_TEMP && (test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86" || test "x$OPENJDK_TARGET_CPU" = "xaarch64"); then
 349     AC_MSG_RESULT([yes])
 350   else
 351     DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES shenandoahgc"
 352     AC_MSG_RESULT([no, platform not supported])
 353   fi
 354 
 355   # Only enable ZGC on supported platforms
 356   # Temp diasable for Valhalla, working in Access API
 357   AC_MSG_CHECKING([if zgc can be built])
 358   if ((test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xx86_64") || \
 359      (test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xaarch64")); then
 360     AC_MSG_RESULT([yes])
 361   else
 362     DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES zgc"
 363     AC_MSG_RESULT([no, platform not supported])
 364   fi
 365 
 366   # Disable unsupported GCs for Zero
 367   if HOTSPOT_CHECK_JVM_VARIANT(zero); then
 368     DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES epsilongc g1gc zgc shenandoahgc"
 369   fi
 370 
 371   # Turn on additional features based on other parts of configure
 372   if test "x$INCLUDE_DTRACE" = "xtrue"; then
 373     JVM_FEATURES="$JVM_FEATURES dtrace"
 374   else
 375     if HOTSPOT_CHECK_JVM_FEATURE(dtrace); then
 376       AC_MSG_ERROR([To enable dtrace, you must use --enable-dtrace])
 377     fi
 378   fi