equal
deleted
inserted
replaced
196 |
196 |
197 if HOTSPOT_CHECK_JVM_FEATURE(management) && ! HOTSPOT_CHECK_JVM_FEATURE(nmt); then |
197 if HOTSPOT_CHECK_JVM_FEATURE(management) && ! HOTSPOT_CHECK_JVM_FEATURE(nmt); then |
198 AC_MSG_ERROR([Specified JVM feature 'management' requires feature 'nmt']) |
198 AC_MSG_ERROR([Specified JVM feature 'management' requires feature 'nmt']) |
199 fi |
199 fi |
200 |
200 |
201 if HOTSPOT_CHECK_JVM_FEATURE(jvmci) && ! HOTSPOT_CHECK_JVM_FEATURE(compiler2); then |
201 if HOTSPOT_CHECK_JVM_FEATURE(jvmci) && ! (HOTSPOT_CHECK_JVM_FEATURE(compiler1) || HOTSPOT_CHECK_JVM_FEATURE(compiler2)); then |
202 AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2']) |
202 AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1']) |
203 fi |
203 fi |
204 |
204 |
205 if HOTSPOT_CHECK_JVM_FEATURE(compiler2) && ! HOTSPOT_CHECK_JVM_FEATURE(all-gcs); then |
205 if HOTSPOT_CHECK_JVM_FEATURE(compiler2) && ! HOTSPOT_CHECK_JVM_FEATURE(all-gcs); then |
206 AC_MSG_ERROR([Specified JVM feature 'compiler2' requires feature 'all-gcs']) |
206 AC_MSG_ERROR([Specified JVM feature 'compiler2' requires feature 'all-gcs']) |
207 fi |
207 fi |
237 if HOTSPOT_CHECK_JVM_FEATURE(shark); then |
237 if HOTSPOT_CHECK_JVM_FEATURE(shark); then |
238 AC_MSG_ERROR([To enable shark, you must use --with-jvm-variants=zeroshark]) |
238 AC_MSG_ERROR([To enable shark, you must use --with-jvm-variants=zeroshark]) |
239 fi |
239 fi |
240 fi |
240 fi |
241 |
241 |
242 # Only enable jvmci on x86_64, sparcv9 and aarch64, and only on server. |
242 # Only enable jvmci on x86_64, sparcv9 and aarch64. |
243 if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \ |
243 if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \ |
244 test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \ |
244 test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \ |
245 test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then |
245 test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then |
246 JVM_FEATURES_jvmci="jvmci" |
246 JVM_FEATURES_jvmci="jvmci" |
247 else |
247 else |
251 # All variants but minimal (and custom) get these features |
251 # All variants but minimal (and custom) get these features |
252 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds" |
252 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds" |
253 |
253 |
254 # Enable features depending on variant. |
254 # Enable features depending on variant. |
255 JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci" |
255 JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci" |
256 JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES" |
256 JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci" |
257 JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES" |
257 JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES" |
258 JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES" |
258 JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES" |
259 JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES" |
259 JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES" |
260 JVM_FEATURES_zeroshark="zero shark $NON_MINIMAL_FEATURES $JVM_FEATURES" |
260 JVM_FEATURES_zeroshark="zero shark $NON_MINIMAL_FEATURES $JVM_FEATURES" |
261 JVM_FEATURES_custom="$JVM_FEATURES" |
261 JVM_FEATURES_custom="$JVM_FEATURES" |