< prev index next >
make/autoconf/hotspot.m4
Print this page
@@ -323,21 +323,17 @@
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jfr"
fi
fi
fi
- # Only enable ZGC on Linux x86_64
- AC_MSG_CHECKING([if zgc should be built])
- if HOTSPOT_CHECK_JVM_FEATURE(zgc); then
- if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
- AC_MSG_RESULT([yes])
- else
- DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES zgc"
- AC_MSG_RESULT([no, platform not supported])
- fi
+ # Only enable ZGC on supported platforms
+ AC_MSG_CHECKING([if zgc can be built])
+ if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT([no])
+ DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES zgc"
+ AC_MSG_RESULT([no, platform not supported])
fi
# Disable unsupported GCs for Zero
if HOTSPOT_CHECK_JVM_VARIANT(zero); then
DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES epsilongc g1gc zgc"
@@ -472,11 +468,11 @@
else
JVM_FEATURES_link_time_opt=""
fi
# All variants but minimal (and custom) get these features
- NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc epsilongc jni-check jvmti management nmt services vm-structs"
+ NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc epsilongc jni-check jvmti management nmt services vm-structs zgc"
# Disable CDS on AIX.
if test "x$OPENJDK_TARGET_OS" = "xaix"; then
ENABLE_CDS="false"
if test "x$enable_cds" = "xyes"; then
< prev index next >