From a2c5af45fd476cffc217c501e4f43e59e9c9dae9 Mon Sep 17 00:00:00 2001
From: Jie Fu <jiefu@openjdk.org>
Date: Wed, 23 Oct 2019 09:53:07 +0200
Subject: [PATCH] 8232768: Configuration with --disable-cds
--enable-generate-classlist should be reported as an error
Reviewed-by: ihse
---
make/autoconf/jdk-options.m4 | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index 5d276a88c21..2fe10bb1700 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -599,7 +599,14 @@ AC_DEFUN_ONCE([JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST],
AC_MSG_RESULT([yes, forced])
ENABLE_GENERATE_CLASSLIST="true"
if test "x$ENABLE_GENERATE_CLASSLIST_POSSIBLE" = "xfalse"; then
- AC_MSG_WARN([Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS and enable-cds=$ENABLE_CDS])
+ if test "x$ENABLE_CDS" = "xfalse"; then
+ # In GenerateLinkOptData.gmk, DumpLoadedClassList is used to generate the
+ # classlist file. It never will work in this case since the VM will report
+ # an error for DumpLoadedClassList when CDS is disabled.
+ AC_MSG_ERROR([Generation of classlist is not possible with enable-cds=false])
+ else
+ AC_MSG_WARN([Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS and enable-cds=$ENABLE_CDS])
+ fi
fi
elif test "x$enable_generate_classlist" = "xno"; then
AC_MSG_RESULT([no, forced])