From dd8c7151af05146c8fbc2b5d0dd94e38db6129e9 Mon Sep 17 00:00:00 2001
From: xiezhaokun <[email protected]>
Date: Thu, 2 Feb 2023 15:52:21 +0800
Subject: [PATCH 5/6] Disable no compressedOop cds on x86-32

DTS/AR: DTS2023020203620
Summary: <JDK> : Disable no compressedOop cds on x86-32
LLT: NA
Patch Type:Huawei
Bug url: NA
---
 common/autoconf/generated-configure.sh | 4 ----
 common/autoconf/jdk-options.m4         | 3 ---
 jdk/make/BuildJdk.gmk                  | 4 ++++
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index b3a9640f1..a6ba1ac93 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -14729,10 +14729,6 @@ $as_echo_n "checking if a default CDS archive should be generated... " >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, not possible with cross compilation" >&5
 $as_echo "no, not possible with cross compilation" >&6; }
     BUILD_CDS_ARCHIVE="false"
-  elif test "x$OPENJDK_TARGET_CPU_BITS" = "x32"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, not possible with x32" >&5
-$as_echo "no, not possible with x32" >&6; }
-    BUILD_CDS_ARCHIVE="false"
   elif test "x$enable_cds_archive" = "xyes"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, forced" >&5
 $as_echo "yes, forced" >&6; }
diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4
index e2f7dc907..b9f251750 100644
--- a/common/autoconf/jdk-options.m4
+++ b/common/autoconf/jdk-options.m4
@@ -814,9 +814,6 @@ AC_DEFUN_ONCE([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE],
   if test "x$COMPILE_TYPE" = "xcross"; then
     AC_MSG_RESULT([no, not possible with cross compilation])
     BUILD_CDS_ARCHIVE="false"
-  elif test "x$OPENJDK_TARGET_CPU_BITS" = "x32"; then
-    AC_MSG_RESULT([no, not possible with cross x32])
-    BUILD_CDS_ARCHIVE="false"
   elif test "x$enable_cds_archive" = "xyes"; then
     AC_MSG_RESULT([yes, forced])
     BUILD_CDS_ARCHIVE="true"
diff --git a/jdk/make/BuildJdk.gmk b/jdk/make/BuildJdk.gmk
index 67074568d..ac87d42cd 100644
--- a/jdk/make/BuildJdk.gmk
+++ b/jdk/make/BuildJdk.gmk
@@ -106,10 +106,14 @@ images:
         ifeq ($(BUILD_CDS_ARCHIVE), true)
 	  echo Creating CDS archive for jdk image
 	  $(JDK_IMAGE_DIR)/bin/java -Xshare:dump -Xmx128M -Xms128M -XX:ParallelGCThreads=1 -Xint $(LOG_INFO)
+          ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
 	  $(JDK_IMAGE_DIR)/bin/java -Xshare:dump -Xmx128M -Xms128M -XX:ParallelGCThreads=1 -Xint -XX:-UseCompressedOops $(LOG_INFO)
+          endif
 	  echo Creating CDS archive for jre image
 	  $(JRE_IMAGE_DIR)/bin/java -Xshare:dump -Xmx128M -Xms128M -XX:ParallelGCThreads=1 -Xint $(LOG_INFO)
+          ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
 	  $(JDK_IMAGE_DIR)/bin/java -Xshare:dump -Xmx128M -Xms128M -XX:ParallelGCThreads=1 -Xint -XX:-UseCompressedOops $(LOG_INFO)
+          endif
         endif
 
 
-- 
2.22.0