48 lines
1.9 KiB
Diff
48 lines
1.9 KiB
Diff
From d7ff4af3e604f4763815fde1753b38c115b23beb Mon Sep 17 00:00:00 2001
|
|
From: hedongbo <hedongbo@huawei.com>
|
|
Date: Thu, 2 Feb 2023 11:53:48 +0000
|
|
Subject: [PATCH 4/6] Disable cds on x86-32
|
|
|
|
DTS/AR: DTS2023020203620
|
|
Summary: <JDK> :Disable cds on x86-32
|
|
LLT: NA
|
|
Patch Type: huawei
|
|
Bug url: NA
|
|
---
|
|
common/autoconf/generated-configure.sh | 4 ++++
|
|
common/autoconf/jdk-options.m4 | 3 +++
|
|
2 files changed, 7 insertions(+)
|
|
|
|
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
|
|
index a6ba1ac93..b3a9640f1 100644
|
|
--- a/common/autoconf/generated-configure.sh
|
|
+++ b/common/autoconf/generated-configure.sh
|
|
@@ -14729,6 +14729,10 @@ $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 b9f251750..e2f7dc907 100644
|
|
--- a/common/autoconf/jdk-options.m4
|
|
+++ b/common/autoconf/jdk-options.m4
|
|
@@ -814,6 +814,9 @@ 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"
|
|
--
|
|
2.22.0
|
|
|