Merge pull request #713 from JasonFengJ9/renamecrac

Rename OPENJDK_CRAC_SUPPORT to CRAC_SUPPORT
ibmruntimes · Sep 21, 2023 · cfe6941 · cfe6941
2 parents b4ea009 + afce001
commit cfe6941
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 45 deletions.
diff --git a/closed/JPP.gmk b/closed/JPP.gmk
@@ -22,16 +22,17 @@ 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_METHODHANDLES))
   JPP_TAGS += OPENJDK_METHODHANDLES
 endif # OPENJ9_ENABLE_OPENJDK_METHODHANDLES
-ifeq (true,$(OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT))
-  JPP_TAGS += OPENJDK_CRAC_SUPPORT
-endif # OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT
 
 # invoke JPP to preprocess java source files
 # $1 - configuration

diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk
@@ -276,20 +276,20 @@ else
   FEATURE_SED_SCRIPT += $(call SedDisable,opt_jitserver)
 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.
 ifeq (true,$(OPENJ9_ENABLE_OPENJDK_METHODHANDLES))
   FEATURE_SED_SCRIPT += $(call SedDisable,opt_methodHandle)
@@ -445,6 +445,12 @@ ifeq (true,$(OPENJ9_ENABLE_CMAKE))
     CMAKE_ARGS += -DJ9VM_OPT_CUDA=OFF
   endif # OPENJ9_ENABLE_CUDA
 
+  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
@@ -458,11 +464,6 @@ ifeq (true,$(OPENJ9_ENABLE_CMAKE))
     CMAKE_ARGS += -DJ9VM_OPT_METHOD_HANDLE=ON
     CMAKE_ARGS += -DJ9VM_OPT_OPENJDK_METHODHANDLE=OFF
   endif # OPENJ9_ENABLE_OPENJDK_METHODHANDLES
-  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
 
   # Propagate configure option '--disable-warnings-as-errors-omr' to OMR.
   ifeq (false,$(WARNINGS_AS_ERRORS_OMR))

diff --git a/closed/autoconf/custom-hook.m4 b/closed/autoconf/custom-hook.m4
@@ -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
@@ -333,33 +333,6 @@ AC_DEFUN([OPENJ9_PLATFORM_EXTRACT_VARS_FROM_CPU],
   esac
 ])
 
-AC_DEFUN([OPENJ9_CONFIGURE_OPENJDK_CRAC_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
-
-  if test "x$enable_openjdk_crac_support" = xyes ; then
-    AC_MSG_RESULT([yes (explicitly enabled)])
-    OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT=true
-  elif test "x$enable_openjdk_crac_support" = xno ; then
-    AC_MSG_RESULT([no (explicitly disabled)])
-  elif test "x$enable_openjdk_crac_support" = x ; then
-    case "$OPENJ9_PLATFORM_CODE" in
-      xa64)
-        AC_MSG_RESULT([yes (default)])
-        OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT=true
-        ;;
-      *)
-        AC_MSG_RESULT([no (default)])
-        ;;
-    esac
-  else
-    AC_MSG_ERROR([--enable-openjdk-crac-support accepts no argument])
-  fi
-  AC_SUBST(OPENJ9_ENABLE_OPENJDK_CRAC_SUPPORT)
-])
-
 AC_DEFUN([OPENJ9_CONFIGURE_JITSERVER],
 [
   AC_ARG_ENABLE([jitserver], [AS_HELP_STRING([--enable-jitserver], [enable JITServer support @<:@disabled@:>@])])
@@ -393,10 +366,37 @@ AC_DEFUN([OPENJ9_CONFIGURE_JITSERVER],
   AC_SUBST(OPENJ9_ENABLE_JITSERVER)
 ])
 
+AC_DEFUN([OPENJ9_CONFIGURE_CRAC_SUPPORT],
+[
+  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_crac_support" = xyes ; then
+    AC_MSG_RESULT([yes (explicitly enabled)])
+    OPENJ9_ENABLE_CRAC_SUPPORT=true
+  elif test "x$enable_crac_support" = xno ; then
+    AC_MSG_RESULT([no (explicitly disabled)])
+  elif test "x$enable_crac_support" = x ; then
+    case "$OPENJ9_PLATFORM_CODE" in
+      xa64)
+        AC_MSG_RESULT([yes (default)])
+        OPENJ9_ENABLE_CRAC_SUPPORT=true
+        ;;
+      *)
+        AC_MSG_RESULT([no (default)])
+        ;;
+    esac
+  else
+    AC_MSG_ERROR([--enable-crac-support accepts no argument])
+  fi
+  AC_SUBST(OPENJ9_ENABLE_CRAC_SUPPORT)
+])
+
 AC_DEFUN([OPENJ9_CONFIGURE_CRIU_SUPPORT],
 [
   AC_MSG_CHECKING([for CRIU support])
-  AC_ARG_ENABLE([criu-support], [AS_HELP_STRING([--enable-criu-support], [enable CRIU support @<:@disabled@:>@])])
+  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_criu_support" = xyes ; then
     AC_MSG_RESULT([yes (explicitly enabled)])

diff --git a/closed/autoconf/custom-spec.gmk.in b/closed/autoconf/custom-spec.gmk.in
@@ -55,8 +55,8 @@ export GDK_HOME         := @OPENJ9_GDK_HOME@
 endif
 
 # feature enablement flags
+OPENJ9_ENABLE_CRAC_SUPPORT          := @OPENJ9_ENABLE_CRAC_SUPPORT@
 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_JITSERVER             := @OPENJ9_ENABLE_JITSERVER@