8204965: Fix '--disable-cds' and disable CDS on AIX by default

Reviewed-by: erikj, jiangli, stuefe, dholmes
This commit is contained in:
Volker Simonis 2018-06-19 09:43:53 +02:00
parent 9ae0be2289
commit 79a09bd98b
5 changed files with 38 additions and 12 deletions

View file

@ -274,8 +274,8 @@ void ClassListParser::error(const char *msg, ...) {
// This function is used for loading classes for customized class loaders
// during archive dumping.
InstanceKlass* ClassListParser::load_class_from_source(Symbol* class_name, TRAPS) {
#if !(defined(_LP64) && (defined(LINUX)|| defined(SOLARIS) || defined(AIX)))
// The only supported platforms are: (1) Linux/64-bit; (2) Solaris/64-bit; (3) AIX/64-bit
#if !(defined(_LP64) && (defined(LINUX)|| defined(SOLARIS)))
// The only supported platforms are: (1) Linux/64-bit and (2) Solaris/64-bit
//
// This #if condition should be in sync with the areCustomLoadersSupportedForCDS
// method in test/lib/jdk/test/lib/Platform.java.