From 02293daa6438a07723e63cf23917d5ab1c6bc688 Mon Sep 17 00:00:00 2001
From: Yumin Qi <minqi@openjdk.org>
Date: Mon, 18 May 2020 09:28:06 -0700
Subject: [PATCH] 8245070: 32-bit builds are broken after JDK-8242524

Reviewed-by: erikj, ihse
---
 make/Images.gmk | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/make/Images.gmk b/make/Images.gmk
index 1770c0abe88..7864c0f6774 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -147,31 +147,34 @@ ifeq ($(BUILD_CDS_ARCHIVE), true)
 
   JRE_TARGETS += $(gen_cds_archive_jre)
 
-  $(eval $(call SetupExecute, gen_cds_nocoops_archive_jdk, \
-      WARN := Creating CDS-NOCOOPS archive for jdk image, \
-      DEPS := $(jlink_jdk), \
-      OUTPUT_FILE := $(JDK_IMAGE_DIR)/$(CDS_NOCOOPS_ARCHIVE), \
-      SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jdk, \
-      COMMAND := $(FIXPATH) $(JDK_IMAGE_DIR)/bin/java -Xshare:dump \
-          -XX:SharedArchiveFile=$(JDK_IMAGE_DIR)/$(CDS_NOCOOPS_ARCHIVE) \
-          -XX:-UseCompressedOops \
-          -Xmx128M -Xms128M $(LOG_INFO), \
-  ))
+  ifeq ($(call isTargetCpuBits, 64), true)
+    $(eval $(call SetupExecute, gen_cds_nocoops_archive_jdk, \
+        WARN := Creating CDS-NOCOOPS archive for jdk image, \
+        DEPS := $(jlink_jdk), \
+        OUTPUT_FILE := $(JDK_IMAGE_DIR)/$(CDS_NOCOOPS_ARCHIVE), \
+        SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jdk, \
+        COMMAND := $(FIXPATH) $(JDK_IMAGE_DIR)/bin/java -Xshare:dump \
+            -XX:SharedArchiveFile=$(JDK_IMAGE_DIR)/$(CDS_NOCOOPS_ARCHIVE) \
+            -XX:-UseCompressedOops \
+            -Xmx128M -Xms128M $(LOG_INFO), \
+    ))
 
-  JDK_TARGETS += $(gen_cds_nocoops_archive_jdk)
+    JDK_TARGETS += $(gen_cds_nocoops_archive_jdk)
 
-  $(eval $(call SetupExecute, gen_cds_nocoops_archive_jre, \
-      WARN := Creating CDS-NOCOOPS archive for jre image, \
-      DEPS := $(jlink_jre), \
-      OUTPUT_FILE := $(JRE_IMAGE_DIR)/$(CDS_NOCOOPS_ARCHIVE), \
-      SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jre, \
-      COMMAND := $(FIXPATH) $(JRE_IMAGE_DIR)/bin/java -Xshare:dump \
-          -XX:SharedArchiveFile=$(JRE_IMAGE_DIR)/$(CDS_NOCOOPS_ARCHIVE) \
-          -XX:-UseCompressedOops \
-          -Xmx128M -Xms128M $(LOG_INFO), \
-  ))
+    $(eval $(call SetupExecute, gen_cds_nocoops_archive_jre, \
+        WARN := Creating CDS-NOCOOPS archive for jre image, \
+        DEPS := $(jlink_jre), \
+        OUTPUT_FILE := $(JRE_IMAGE_DIR)/$(CDS_NOCOOPS_ARCHIVE), \
+        SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jre, \
+        COMMAND := $(FIXPATH) $(JRE_IMAGE_DIR)/bin/java -Xshare:dump \
+            -XX:SharedArchiveFile=$(JRE_IMAGE_DIR)/$(CDS_NOCOOPS_ARCHIVE) \
+            -XX:-UseCompressedOops \
+            -Xmx128M -Xms128M $(LOG_INFO), \
+    ))
+
+    JRE_TARGETS += $(gen_cds_nocoops_archive_jre)
+  endif
 
-  JRE_TARGETS += $(gen_cds_nocoops_archive_jre)
 endif
 
 ################################################################################