make/autoconf/hotspot.m4
Index
Unified diffs
Context diffs
Sdiffs
Wdiffs
Patch
New
Old
Previous File
Next File
open Cdiff make/autoconf/hotspot.m4
make/autoconf/hotspot.m4
Print this page
*** 70,81 ****
AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_VARIANTS],
[
AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants],
[JVM variants (separated by commas) to build (server,client,minimal,core,zero,custom) @<:@server@:>@])])
- SETUP_HOTSPOT_TARGET_CPU_PORT
-
if test "x$with_jvm_variants" = x; then
with_jvm_variants="server"
fi
JVM_VARIANTS_OPT="$with_jvm_variants"
--- 70,79 ----
*** 305,317 ****
# Override hotspot cpu definitions for ARM platforms
if test "x$OPENJDK_TARGET_CPU" = xarm; then
HOTSPOT_TARGET_CPU=arm_32
HOTSPOT_TARGET_CPU_DEFINE="ARM32"
- elif test "x$OPENJDK_TARGET_CPU" = xaarch64 && test "x$HOTSPOT_TARGET_CPU_PORT" = xarm64; then
- HOTSPOT_TARGET_CPU=arm_64
- HOTSPOT_TARGET_CPU_ARCH=arm
fi
# Verify that dependencies are met for explicitly set features.
if HOTSPOT_CHECK_JVM_FEATURE(jvmti) && ! HOTSPOT_CHECK_JVM_FEATURE(services); then
AC_MSG_ERROR([Specified JVM feature 'jvmti' requires feature 'services'])
--- 303,312 ----
*** 515,524 ****
--- 510,522 ----
AC_SUBST(JVM_FEATURES_zero)
AC_SUBST(JVM_FEATURES_custom)
# Used for verification of Makefiles by check-jvm-feature
AC_SUBST(VALID_JVM_FEATURES)
+
+ # --with-cpu-port is no longer supported
+ BASIC_DEPRECATED_ARG_WITH(with-cpu-port)
])
###############################################################################
# Finalize JVM features once all setup is complete, including custom setup.
#
*** 552,586 ****
fi
done
])
################################################################################
- #
- # Specify which sources will be used to build the 64-bit ARM port
- #
- # --with-cpu-port=arm64 will use hotspot/src/cpu/arm
- # --with-cpu-port=aarch64 will use hotspot/src/cpu/aarch64
- #
- AC_DEFUN([SETUP_HOTSPOT_TARGET_CPU_PORT],
- [
- AC_ARG_WITH(cpu-port, [AS_HELP_STRING([--with-cpu-port],
- [specify sources to use for Hotspot 64-bit ARM port (arm64,aarch64) @<:@aarch64@:>@ ])])
-
- if test "x$with_cpu_port" != x; then
- if test "x$OPENJDK_TARGET_CPU" != xaarch64; then
- AC_MSG_ERROR([--with-cpu-port only available on aarch64])
- fi
- if test "x$with_cpu_port" != xarm64 && \
- test "x$with_cpu_port" != xaarch64; then
- AC_MSG_ERROR([--with-cpu-port must specify arm64 or aarch64])
- fi
- HOTSPOT_TARGET_CPU_PORT="$with_cpu_port"
- fi
- ])
-
-
- ################################################################################
# Check if gtest should be built
#
AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_GTEST],
[
AC_ARG_ENABLE([hotspot-gtest], [AS_HELP_STRING([--disable-hotspot-gtest],
--- 550,559 ----
make/autoconf/hotspot.m4
Index
Unified diffs
Context diffs
Sdiffs
Wdiffs
Patch
New
Old
Previous File
Next File