8341871: Disable G1 for unsupported platforms after JDK-8334060
Reviewed-by: mdoerr, erikj
This commit is contained in:
parent
54c9348c8c
commit
6ed6dff222
@ -479,6 +479,22 @@ AC_DEFUN([JVM_FEATURES_CALCULATE_ACTIVE],
|
||||
$JVM_FEATURES_ENABLED, $JVM_FEATURES_DISABLED)
|
||||
])
|
||||
|
||||
################################################################################
|
||||
# Filter the unsupported feature combinations.
|
||||
# This is called after JVM_FEATURES_ACTIVE are fully populated.
|
||||
#
|
||||
AC_DEFUN([JVM_FEATURES_FILTER_UNSUPPORTED],
|
||||
[
|
||||
# G1 late barrier expansion in C2 is not implemented for some platforms.
|
||||
# Choose not to support G1 in this configuration.
|
||||
if JVM_FEATURES_IS_ACTIVE(compiler2); then
|
||||
if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
|
||||
AC_MSG_NOTICE([G1 cannot be used with C2 on this platform, disabling G1])
|
||||
UTIL_GET_NON_MATCHING_VALUES(JVM_FEATURES_ACTIVE, $JVM_FEATURES_ACTIVE, "g1gc")
|
||||
fi
|
||||
fi
|
||||
])
|
||||
|
||||
################################################################################
|
||||
# Helper function for JVM_FEATURES_VERIFY. Check if the specified JVM
|
||||
# feature is active. To be used in shell if constructs, like this:
|
||||
@ -554,6 +570,9 @@ AC_DEFUN_ONCE([JVM_FEATURES_SETUP],
|
||||
# The result is stored in JVM_FEATURES_ACTIVE.
|
||||
JVM_FEATURES_CALCULATE_ACTIVE($variant)
|
||||
|
||||
# Filter unsupported feature combinations from JVM_FEATURES_ACTIVE.
|
||||
JVM_FEATURES_FILTER_UNSUPPORTED
|
||||
|
||||
# Verify consistency for JVM_FEATURES_ACTIVE.
|
||||
JVM_FEATURES_VERIFY($variant)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user