equal
deleted
inserted
replaced
23 # questions. |
23 # questions. |
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 epsilongc g1gc parallelgc serialgc shenandoahgc zgc nmt cds \ |
28 graal vm-structs jni-check services management epsilongc g1gc parallelgc serialgc shenandoahgc zgc nmt cds \ |
29 static-build link-time-opt aot jfr" |
29 static-build link-time-opt aot jfr" |
30 |
30 |
31 # Deprecated JVM features (these are ignored, but with a warning) |
31 # Deprecated JVM features (these are ignored, but with a warning) |
32 DEPRECATED_JVM_FEATURES="trace" |
32 DEPRECATED_JVM_FEATURES="trace cmsgc" |
33 |
33 |
34 # All valid JVM variants |
34 # All valid JVM variants |
35 VALID_JVM_VARIANTS="server client minimal core zero custom" |
35 VALID_JVM_VARIANTS="server client minimal core zero custom" |
36 |
36 |
37 ############################################################################### |
37 ############################################################################### |
324 |
324 |
325 if HOTSPOT_CHECK_JVM_FEATURE(jvmci) && ! (HOTSPOT_CHECK_JVM_FEATURE(compiler1) || HOTSPOT_CHECK_JVM_FEATURE(compiler2)); then |
325 if HOTSPOT_CHECK_JVM_FEATURE(jvmci) && ! (HOTSPOT_CHECK_JVM_FEATURE(compiler1) || HOTSPOT_CHECK_JVM_FEATURE(compiler2)); then |
326 AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1']) |
326 AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1']) |
327 fi |
327 fi |
328 |
328 |
329 if HOTSPOT_CHECK_JVM_FEATURE(cmsgc) && ! HOTSPOT_CHECK_JVM_FEATURE(serialgc); then |
|
330 AC_MSG_ERROR([Specified JVM feature 'cmsgc' requires feature 'serialgc']) |
|
331 fi |
|
332 |
|
333 # Enable JFR by default, except for Zero, linux-sparcv9 and on minimal. |
329 # Enable JFR by default, except for Zero, linux-sparcv9 and on minimal. |
334 if ! HOTSPOT_CHECK_JVM_VARIANT(zero); then |
330 if ! HOTSPOT_CHECK_JVM_VARIANT(zero); then |
335 if test "x$OPENJDK_TARGET_OS" != xaix; then |
331 if test "x$OPENJDK_TARGET_OS" != xaix; then |
336 if test "x$OPENJDK_TARGET_OS" != xlinux || test "x$OPENJDK_TARGET_CPU" != xsparcv9; then |
332 if test "x$OPENJDK_TARGET_OS" != xlinux || test "x$OPENJDK_TARGET_CPU" != xsparcv9; then |
337 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jfr" |
333 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jfr" |
489 else |
485 else |
490 JVM_FEATURES_link_time_opt="" |
486 JVM_FEATURES_link_time_opt="" |
491 fi |
487 fi |
492 |
488 |
493 # All variants but minimal (and custom) get these features |
489 # All variants but minimal (and custom) get these features |
494 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc epsilongc shenandoahgc jni-check jvmti management nmt services vm-structs zgc" |
490 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES g1gc parallelgc serialgc epsilongc shenandoahgc jni-check jvmti management nmt services vm-structs zgc" |
495 |
491 |
496 # Disable CDS on AIX. |
492 # Disable CDS on AIX. |
497 if test "x$OPENJDK_TARGET_OS" = "xaix"; then |
493 if test "x$OPENJDK_TARGET_OS" = "xaix"; then |
498 ENABLE_CDS="false" |
494 ENABLE_CDS="false" |
499 if test "x$enable_cds" = "xyes"; then |
495 if test "x$enable_cds" = "xyes"; then |