8191927: Enable AppCDS for custom loaders on all 64-bit Linux and AIX

Added "@requires vm.cds.custom.loaders" to mark tests related to custom loaders

Reviewed-by: simonis, mseledtsov
This commit is contained in:
Volker Simonis 2017-11-28 09:47:04 -08:00 committed by Ioi Lam
parent 66c00b4184
commit 7617012f55
23 changed files with 58 additions and 60 deletions

View file

@ -272,9 +272,11 @@ 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(LINUX) && defined(X86) && defined(_LP64)) || \
(defined(SOLARIS) && defined(_LP64)))
// The only supported platforms are: (1) Linux/AMD64; (2) Solaris/64-bit
#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
//
// This #if condition should be in sync with the areCustomLoadersSupportedForCDS
// method in test/lib/jdk/test/lib/Platform.java.
error("AppCDS custom class loaders not supported on this platform");
#endif