equal
deleted
inserted
replaced
24 # |
24 # |
25 |
25 |
26 # All valid JVM features, regardless of platform |
26 # All valid JVM features, regardless of platform |
27 VALID_JVM_FEATURES="compiler1 compiler2 zero minimal dtrace jvmti jvmci \ |
27 VALID_JVM_FEATURES="compiler1 compiler2 zero minimal dtrace jvmti jvmci \ |
28 graal vm-structs jni-check services management cmsgc g1gc parallelgc serialgc nmt cds \ |
28 graal vm-structs jni-check services management cmsgc g1gc parallelgc serialgc nmt cds \ |
29 static-build link-time-opt aot" |
29 static-build link-time-opt aot jfr" |
30 |
30 |
31 # All valid JVM variants |
31 # All valid JVM variants |
32 VALID_JVM_VARIANTS="server client minimal core zero custom" |
32 VALID_JVM_VARIANTS="server client minimal core zero custom" |
33 |
33 |
34 ############################################################################### |
34 ############################################################################### |
307 |
307 |
308 if HOTSPOT_CHECK_JVM_FEATURE(cmsgc) && ! HOTSPOT_CHECK_JVM_FEATURE(serialgc); then |
308 if HOTSPOT_CHECK_JVM_FEATURE(cmsgc) && ! HOTSPOT_CHECK_JVM_FEATURE(serialgc); then |
309 AC_MSG_ERROR([Specified JVM feature 'cmsgc' requires feature 'serialgc']) |
309 AC_MSG_ERROR([Specified JVM feature 'cmsgc' requires feature 'serialgc']) |
310 fi |
310 fi |
311 |
311 |
|
312 # Enable JFR by default, except on linux-sparcv9 and on minimal. |
|
313 if test "x$OPENJDK_TARGET_OS" != xlinux || test "x$OPENJDK_TARGET_CPU" != xsparcv9; then |
|
314 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jfr" |
|
315 fi |
|
316 |
312 # Turn on additional features based on other parts of configure |
317 # Turn on additional features based on other parts of configure |
313 if test "x$INCLUDE_DTRACE" = "xtrue"; then |
318 if test "x$INCLUDE_DTRACE" = "xtrue"; then |
314 JVM_FEATURES="$JVM_FEATURES dtrace" |
319 JVM_FEATURES="$JVM_FEATURES dtrace" |
315 else |
320 else |
316 if HOTSPOT_CHECK_JVM_FEATURE(dtrace); then |
321 if HOTSPOT_CHECK_JVM_FEATURE(dtrace); then |
394 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc jni-check jvmti management nmt services vm-structs" |
399 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc jni-check jvmti management nmt services vm-structs" |
395 if test "x$ENABLE_CDS" = "xtrue"; then |
400 if test "x$ENABLE_CDS" = "xtrue"; then |
396 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cds" |
401 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cds" |
397 fi |
402 fi |
398 |
403 |
399 # Enable default features depending on variant. |
404 # Enable features depending on variant. |
400 JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal" |
405 JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal" |
401 JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci" |
406 JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci" |
402 JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES" |
407 JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES" |
403 JVM_FEATURES_minimal="compiler1 minimal serialgc $JVM_FEATURES $JVM_FEATURES_link_time_opt" |
408 JVM_FEATURES_minimal="compiler1 minimal serialgc $JVM_FEATURES $JVM_FEATURES_link_time_opt" |
404 JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES" |
409 JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES" |