From 47be2491ca4099b96c87e4f75158bff0dc8f6e36 Mon Sep 17 00:00:00 2001
From: Jason Feng <fengj@ca.ibm.com>
Date: Mon, 18 Sep 2023 14:57:57 -0400
Subject: [PATCH] CRIU adds opt_openjdkCracSupport and OPENJDK_CRAC_SUPPORT

Added opt_openjdkCracSupport and OPENJDK_CRAC_SUPPORT.

Signed-off-by: Jason Feng <fengj@ca.ibm.com>
---
 buildspecs/core.feature   | 1 +
 buildspecs/j9.flags       | 4 ++++
 jcl/jpp_configuration.xml | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/buildspecs/core.feature b/buildspecs/core.feature
index 4f45327a162..2ec6f60ec93 100644
--- a/buildspecs/core.feature
+++ b/buildspecs/core.feature
@@ -107,6 +107,7 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-ex
 		<flag id="module_verutil" value="true"/>
 		<flag id="module_vm" value="true"/>
 		<flag id="opt_criuSupport" value="false"/>
+		<flag id="opt_openjdkCracSupport" value="false"/>
 		<flag id="opt_fragmentRamClasses" value="true"/>
 		<flag id="opt_inlineJsrs" value="true"/>
 		<flag id="opt_jitserver" value="false"/>
diff --git a/buildspecs/j9.flags b/buildspecs/j9.flags
index 76c5e34c904..66b48ef0602 100644
--- a/buildspecs/j9.flags
+++ b/buildspecs/j9.flags
@@ -1705,6 +1705,10 @@ Only available on zOS</description>
 		<description>Enables support for CRIU Java API's</description>
 		<ifRemoved>No support for CRIU Java API's</ifRemoved>
 	</flag>
+	<flag id="opt_openjdkCracSupport">
+		<description>Enables support for OpenJDK CRAC</description>
+		<ifRemoved>No support for OpenJDK CRAC</ifRemoved>
+	</flag>
 	<flag id="opt_cuda">
 		<description>Add support for CUDA</description>
 		<ifRemoved></ifRemoved>
diff --git a/jcl/jpp_configuration.xml b/jcl/jpp_configuration.xml
index 3a7175a98d1..ae6bef4a329 100644
--- a/jcl/jpp_configuration.xml
+++ b/jcl/jpp_configuration.xml
@@ -37,7 +37,7 @@
 	<!-- START SET DEFINITIONS -->
 	<set
 		label="newflags"
-		flags="CRIU_SUPPORT,INLINE-TYPES,OPENJDK_METHODHANDLES"/>
+		flags="CRIU_SUPPORT,INLINE-TYPES,OPENJDK_CRAC_SUPPORT,OPENJDK_METHODHANDLES"/>
 
 	<set
 		label="oldflags"