Skip to content

Commit

Permalink
Merge pull request ibmruntimes#264 from JasonFengJ9/renamecrac
Browse files Browse the repository at this point in the history
Rename OPENJDK_CRAC_SUPPORT to CRAC_SUPPORT
  • Loading branch information
keithc-ca authored Sep 21, 2023
2 parents e2061db + bfaed99 commit eda5e2c
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 48 deletions.
8 changes: 4 additions & 4 deletions closed/JPP.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ J9TOOLS_DIR := $(SUPPORT_OUTPUTDIR)/j9tools
JPP_JAR := $(J9TOOLS_DIR)/jpp.jar
JPP_TAGS := PLATFORM-$(OPENJ9_PLATFORM_CODE)

ifeq (true,$(OPENJ9_ENABLE_CRAC_SUPPORT))
JPP_TAGS += CRAC_SUPPORT
endif # OPENJ9_ENABLE_CRAC_SUPPORT

ifeq (true,$(OPENJ9_ENABLE_CRIU_SUPPORT))
JPP_TAGS += CRIU_SUPPORT
endif # OPENJ9_ENABLE_CRIU_SUPPORT

ifeq (true,$(OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT))
JPP_TAGS += OPENJDK_CRAC_SUPPORT
endif # OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT

ifeq (true,$(OPENJ9_ENABLE_INLINE_TYPES))
JPP_TAGS += INLINE-TYPES
endif # OPENJ9_ENABLE_INLINE_TYPES
Expand Down
26 changes: 13 additions & 13 deletions closed/OpenJ9.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -285,20 +285,20 @@ else
SPEC_SED_SCRIPT += $(call SedDisable,opt_valhallaValueTypes)
endif

# Adjust CRAC Support enablement flags.
ifeq (true,$(OPENJ9_ENABLE_CRAC_SUPPORT))
FEATURE_SED_SCRIPT += $(call SedEnable,opt_cracSupport)
else # OPENJ9_ENABLE_CRAC_SUPPORT
FEATURE_SED_SCRIPT += $(call SedDisable,opt_cracSupport)
endif # OPENJ9_ENABLE_CRAC_SUPPORT

# Adjust CRIU Support enablement flags.
ifeq (true,$(OPENJ9_ENABLE_CRIU_SUPPORT))
FEATURE_SED_SCRIPT += $(call SedEnable,opt_criuSupport)
else # OPENJ9_ENABLE_CRIU_SUPPORT
FEATURE_SED_SCRIPT += $(call SedDisable,opt_criuSupport)
endif # OPENJ9_ENABLE_CRIU_SUPPORT

# Adjust OpenJDK CRAC Support enablement flags.
ifeq (true,$(OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT))
FEATURE_SED_SCRIPT += $(call SedEnable,opt_openjdkCracSupport)
else # OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT
FEATURE_SED_SCRIPT += $(call SedDisable,opt_openjdkCracSupport)
endif # OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT

# Adjust OpenJDK MethodHandles enablement flags.
FEATURE_SED_SCRIPT += $(call SedDisable,opt_methodHandle)
FEATURE_SED_SCRIPT += $(call SedEnable,opt_openjdkMethodhandle)
Expand Down Expand Up @@ -454,18 +454,18 @@ ifeq (true,$(OPENJ9_ENABLE_CMAKE))
CMAKE_ARGS += -DJ9VM_OPT_VALHALLA_VALUE_TYPES=OFF
endif # OPENJ9_ENABLE_INLINE_TYPES

ifeq (true,$(OPENJ9_ENABLE_CRAC_SUPPORT))
CMAKE_ARGS += -DJ9VM_OPT_CRAC_SUPPORT=ON
else # OPENJ9_ENABLE_CRAC_SUPPORT
CMAKE_ARGS += -DJ9VM_OPT_CRAC_SUPPORT=OFF
endif # OPENJ9_ENABLE_CRAC_SUPPORT

ifeq (true,$(OPENJ9_ENABLE_CRIU_SUPPORT))
CMAKE_ARGS += -DJ9VM_OPT_CRIU_SUPPORT=ON
else # OPENJ9_ENABLE_CRIU_SUPPORT
CMAKE_ARGS += -DJ9VM_OPT_CRIU_SUPPORT=OFF
endif # OPENJ9_ENABLE_CRIU_SUPPORT

ifeq (true,$(OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT))
CMAKE_ARGS += -DJ9VM_OPT_OPENJDK_CRAC_SUPPORT=ON
else # OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT
CMAKE_ARGS += -DJ9VM_OPT_OPENJDK_CRAC_SUPPORT=OFF
endif # OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT

CMAKE_ARGS += -DJ9VM_OPT_METHOD_HANDLE=OFF
CMAKE_ARGS += -DJ9VM_OPT_OPENJDK_METHODHANDLE=ON

Expand Down
50 changes: 25 additions & 25 deletions closed/autoconf/custom-hook.m4
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK],
OPENJ9_PLATFORM_SETUP
OPENJ9_CONFIGURE_CMAKE
OPENJ9_CONFIGURE_COMPILERS
OPENJ9_CONFIGURE_CRAC_SUPPORT
OPENJ9_CONFIGURE_CRIU_SUPPORT
OPENJ9_CONFIGURE_OPENJDK_CRAC_SUPPORT
OPENJ9_CONFIGURE_CUDA
OPENJ9_CONFIGURE_DDR
OPENJ9_CONFIGURE_DEMOS
Expand Down Expand Up @@ -341,58 +341,58 @@ AC_DEFUN([OPENJ9_PLATFORM_EXTRACT_VARS_FROM_CPU],
esac
])

AC_DEFUN([OPENJ9_CONFIGURE_CRIU_SUPPORT],
AC_DEFUN([OPENJ9_CONFIGURE_CRAC_SUPPORT],
[
AC_MSG_CHECKING([for CRIU support])
AC_ARG_ENABLE([criu-support], [AS_HELP_STRING([--enable-criu-support], [enable CRIU support @<:@disabled@:>@])])
OPENJ9_ENABLE_CRIU_SUPPORT=false
AC_MSG_CHECKING([for CRAC support])
AC_ARG_ENABLE([crac-support], [AS_HELP_STRING([--enable-crac-support], [enable CRAC support @<:@platform dependent@:>@])])
OPENJ9_ENABLE_CRAC_SUPPORT=false
if test "x$enable_criu_support" = xyes ; then
if test "x$enable_crac_support" = xyes ; then
AC_MSG_RESULT([yes (explicitly enabled)])
OPENJ9_ENABLE_CRIU_SUPPORT=true
elif test "x$enable_criu_support" = xno ; then
OPENJ9_ENABLE_CRAC_SUPPORT=true
elif test "x$enable_crac_support" = xno ; then
AC_MSG_RESULT([no (explicitly disabled)])
elif test "x$enable_criu_support" = x ; then
elif test "x$enable_crac_support" = x ; then
case "$OPENJ9_PLATFORM_CODE" in
xa64|xl64|xr64|xz64)
xa64)
AC_MSG_RESULT([yes (default)])
OPENJ9_ENABLE_CRIU_SUPPORT=true
OPENJ9_ENABLE_CRAC_SUPPORT=true
;;
*)
AC_MSG_RESULT([no (default)])
;;
esac
else
AC_MSG_ERROR([--enable-criu-support accepts no argument])
AC_MSG_ERROR([--enable-crac-support accepts no argument])
fi
AC_SUBST(OPENJ9_ENABLE_CRIU_SUPPORT)
AC_SUBST(OPENJ9_ENABLE_CRAC_SUPPORT)
])

AC_DEFUN([OPENJ9_CONFIGURE_OPENJDK_CRAC_SUPPORT],
AC_DEFUN([OPENJ9_CONFIGURE_CRIU_SUPPORT],
[
AC_MSG_CHECKING([for OpenJDK CRAC support])
AC_ARG_ENABLE([openjdk-crac-support], [AS_HELP_STRING([--enable-openjdk-crac-support], [enable OpenJDK CRAC support @<:@disabled@:>@])])
OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT=false
AC_MSG_CHECKING([for CRIU support])
AC_ARG_ENABLE([criu-support], [AS_HELP_STRING([--enable-criu-support], [enable CRIU support @<:@platform dependent@:>@])])
OPENJ9_ENABLE_CRIU_SUPPORT=false
if test "x$enable_openjdk_crac_support" = xyes ; then
if test "x$enable_criu_support" = xyes ; then
AC_MSG_RESULT([yes (explicitly enabled)])
OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT=true
elif test "x$enable_openjdk_crac_support" = xno ; then
OPENJ9_ENABLE_CRIU_SUPPORT=true
elif test "x$enable_criu_support" = xno ; then
AC_MSG_RESULT([no (explicitly disabled)])
elif test "x$enable_openjdk_crac_support" = x ; then
elif test "x$enable_criu_support" = x ; then
case "$OPENJ9_PLATFORM_CODE" in
xa64)
xa64|xl64|xr64|xz64)
AC_MSG_RESULT([yes (default)])
OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT=true
OPENJ9_ENABLE_CRIU_SUPPORT=true
;;
*)
AC_MSG_RESULT([no (default)])
;;
esac
else
AC_MSG_ERROR([--enable-openjdk-crac-support accepts no argument])
AC_MSG_ERROR([--enable-criu-support accepts no argument])
fi
AC_SUBST(OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT)
AC_SUBST(OPENJ9_ENABLE_CRIU_SUPPORT)
])

AC_DEFUN([OPENJ9_CONFIGURE_INLINE_TYPES],
Expand Down
12 changes: 6 additions & 6 deletions closed/autoconf/custom-spec.gmk.in
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ export GDK_HOME := @OPENJ9_GDK_HOME@
endif

# feature enablement flags
OPENJ9_ENABLE_CRIU_SUPPORT := @OPENJ9_ENABLE_CRIU_SUPPORT@
OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT := @OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT@
OPENJ9_ENABLE_DDR := @OPENJ9_ENABLE_DDR@
OPENJ9_ENABLE_DEMOS := @OPENJ9_ENABLE_DEMOS@
OPENJ9_ENABLE_INLINE_TYPES := @OPENJ9_ENABLE_INLINE_TYPES@
OPENJ9_ENABLE_JITSERVER := @OPENJ9_ENABLE_JITSERVER@
OPENJ9_ENABLE_CRAC_SUPPORT := @OPENJ9_ENABLE_CRAC_SUPPORT@
OPENJ9_ENABLE_CRIU_SUPPORT := @OPENJ9_ENABLE_CRIU_SUPPORT@
OPENJ9_ENABLE_DDR := @OPENJ9_ENABLE_DDR@
OPENJ9_ENABLE_DEMOS := @OPENJ9_ENABLE_DEMOS@
OPENJ9_ENABLE_INLINE_TYPES := @OPENJ9_ENABLE_INLINE_TYPES@
OPENJ9_ENABLE_JITSERVER := @OPENJ9_ENABLE_JITSERVER@

# for constructing version output
COMPILER_VERSION_STRING := @COMPILER_VERSION_STRING@
Expand Down

0 comments on commit eda5e2c

Please sign in to comment.