223 AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.internal.vm.compiler sources. Remove --enable-aot.])
224 fi
225 fi
226 else
227 ENABLE_AOT="false"
228 if test "x$enable_aot" = "xyes"; then
229 AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.aot sources. Remove --enable-aot.])
230 fi
231 fi
232 else
233 ENABLE_AOT="false"
234 if test "x$enable_aot" = "xyes"; then
235 AC_MSG_ERROR([AOT is currently only supported on x86_64. Remove --enable-aot.])
236 fi
237 fi
238 fi
239
240 AC_SUBST(ENABLE_AOT)
241 ])
242
243 ###############################################################################
244 # Set up all JVM features for each JVM variant.
245 #
246 AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
247 [
248 # The user can in some cases supply additional jvm features. For the custom
249 # variant, this defines the entire variant.
250 AC_ARG_WITH([jvm-features], [AS_HELP_STRING([--with-jvm-features],
251 [additional JVM features to enable (separated by comma), use '--help' to show possible values @<:@none@:>@])])
252 if test "x$with_jvm_features" != x; then
253 AC_MSG_CHECKING([additional JVM features])
254 JVM_FEATURES=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'`
255 AC_MSG_RESULT([$JVM_FEATURES])
256 fi
257
258 # Override hotspot cpu definitions for ARM platforms
259 if test "x$OPENJDK_TARGET_CPU" = xarm; then
260 HOTSPOT_TARGET_CPU=arm_32
261 HOTSPOT_TARGET_CPU_DEFINE="ARM32"
262 JVM_LDFLAGS="$JVM_LDFLAGS -fsigned-char"
357 AC_MSG_RESULT([yes])
358 fi
359 JVM_FEATURES_aot="aot"
360 else
361 if test "x$enable_aot" = "xno"; then
362 AC_MSG_RESULT([no, forced])
363 else
364 AC_MSG_RESULT([no])
365 fi
366 JVM_FEATURES_aot=""
367 fi
368
369 if test "x$OPENJDK_TARGET_CPU" = xarm ; then
370 # Default to use link time optimizations on minimal on arm
371 JVM_FEATURES_link_time_opt="link-time-opt"
372 else
373 JVM_FEATURES_link_time_opt=""
374 fi
375
376 # All variants but minimal (and custom) get these features
377 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds"
378
379 # Enable features depending on variant.
380 JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal"
381 JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
382 JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
383 JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES $JVM_FEATURES_link_time_opt"
384 JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES"
385 JVM_FEATURES_zeroshark="zero shark $NON_MINIMAL_FEATURES $JVM_FEATURES"
386 JVM_FEATURES_custom="$JVM_FEATURES"
387
388 AC_SUBST(JVM_FEATURES_server)
389 AC_SUBST(JVM_FEATURES_client)
390 AC_SUBST(JVM_FEATURES_core)
391 AC_SUBST(JVM_FEATURES_minimal)
392 AC_SUBST(JVM_FEATURES_zero)
393 AC_SUBST(JVM_FEATURES_zeroshark)
394 AC_SUBST(JVM_FEATURES_custom)
395
396 # Used for verification of Makefiles by check-jvm-feature
397 AC_SUBST(VALID_JVM_FEATURES)
|
223 AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.internal.vm.compiler sources. Remove --enable-aot.])
224 fi
225 fi
226 else
227 ENABLE_AOT="false"
228 if test "x$enable_aot" = "xyes"; then
229 AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.aot sources. Remove --enable-aot.])
230 fi
231 fi
232 else
233 ENABLE_AOT="false"
234 if test "x$enable_aot" = "xyes"; then
235 AC_MSG_ERROR([AOT is currently only supported on x86_64. Remove --enable-aot.])
236 fi
237 fi
238 fi
239
240 AC_SUBST(ENABLE_AOT)
241 ])
242
243 ################################################################################
244 # Allow to disable CDS
245 #
246 AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_CDS],
247 [
248 AC_ARG_ENABLE([cds], [AS_HELP_STRING([--enable-cds@<:@=yes/no@:>@],
249 [enable class data sharing feature in non-minimal VM. Default is yes.])])
250
251 if test "x$enable_cds" = "x" || test "x$enable_cds" = "xyes"; then
252 ENABLE_CDS="true"
253 elif test "x$enable_cds" = "xno"; then
254 ENABLE_CDS="false"
255 else
256 AC_MSG_ERROR([Invalid value for --enable-cds: $enable_cds])
257 fi
258
259 AC_SUBST(ENABLE_CDS)
260 ])
261
262 ###############################################################################
263 # Set up all JVM features for each JVM variant.
264 #
265 AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
266 [
267 # The user can in some cases supply additional jvm features. For the custom
268 # variant, this defines the entire variant.
269 AC_ARG_WITH([jvm-features], [AS_HELP_STRING([--with-jvm-features],
270 [additional JVM features to enable (separated by comma), use '--help' to show possible values @<:@none@:>@])])
271 if test "x$with_jvm_features" != x; then
272 AC_MSG_CHECKING([additional JVM features])
273 JVM_FEATURES=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'`
274 AC_MSG_RESULT([$JVM_FEATURES])
275 fi
276
277 # Override hotspot cpu definitions for ARM platforms
278 if test "x$OPENJDK_TARGET_CPU" = xarm; then
279 HOTSPOT_TARGET_CPU=arm_32
280 HOTSPOT_TARGET_CPU_DEFINE="ARM32"
281 JVM_LDFLAGS="$JVM_LDFLAGS -fsigned-char"
376 AC_MSG_RESULT([yes])
377 fi
378 JVM_FEATURES_aot="aot"
379 else
380 if test "x$enable_aot" = "xno"; then
381 AC_MSG_RESULT([no, forced])
382 else
383 AC_MSG_RESULT([no])
384 fi
385 JVM_FEATURES_aot=""
386 fi
387
388 if test "x$OPENJDK_TARGET_CPU" = xarm ; then
389 # Default to use link time optimizations on minimal on arm
390 JVM_FEATURES_link_time_opt="link-time-opt"
391 else
392 JVM_FEATURES_link_time_opt=""
393 fi
394
395 # All variants but minimal (and custom) get these features
396 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt"
397 if test "x$ENABLE_CDS" = "xtrue"; then
398 NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cds"
399 fi
400
401 # Enable features depending on variant.
402 JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal"
403 JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
404 JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
405 JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES $JVM_FEATURES_link_time_opt"
406 JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES"
407 JVM_FEATURES_zeroshark="zero shark $NON_MINIMAL_FEATURES $JVM_FEATURES"
408 JVM_FEATURES_custom="$JVM_FEATURES"
409
410 AC_SUBST(JVM_FEATURES_server)
411 AC_SUBST(JVM_FEATURES_client)
412 AC_SUBST(JVM_FEATURES_core)
413 AC_SUBST(JVM_FEATURES_minimal)
414 AC_SUBST(JVM_FEATURES_zero)
415 AC_SUBST(JVM_FEATURES_zeroshark)
416 AC_SUBST(JVM_FEATURES_custom)
417
418 # Used for verification of Makefiles by check-jvm-feature
419 AC_SUBST(VALID_JVM_FEATURES)
|